Repository: cloudstack Updated Branches: refs/heads/master b65ce7e75 -> f52982356
Add ReflectionUse annotation for marking up *un-used* methods Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f5298235 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f5298235 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f5298235 Branch: refs/heads/master Commit: f5298235669f442674ccfebd0c69f83967278bde Parents: b65ce7e Author: Kelven Yang <kelv...@gmail.com> Authored: Tue Jun 17 17:30:33 2014 -0700 Committer: Kelven Yang <kelv...@gmail.com> Committed: Tue Jun 17 17:31:29 2014 -0700 ---------------------------------------------------------------------- .../com/cloud/vm/VirtualMachineManagerImpl.java | 15 +++++++++- .../com/cloud/storage/VolumeApiServiceImpl.java | 6 ++++ .../vm/snapshot/VMSnapshotManagerImpl.java | 5 ++++ utils/src/com/cloud/utils/ReflectionUse.java | 31 ++++++++++++++++++++ 4 files changed, 56 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f5298235/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java ---------------------------------------------------------------------- diff --git a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java index 4aa5fc8..d0fcd4a 100755 --- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java +++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java @@ -178,6 +178,7 @@ import com.cloud.utils.DateUtil; import com.cloud.utils.Journal; import com.cloud.utils.Pair; import com.cloud.utils.Predicate; +import com.cloud.utils.ReflectionUse; import com.cloud.utils.StringUtils; import com.cloud.utils.Ternary; import com.cloud.utils.component.ManagerBase; @@ -3238,7 +3239,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac this.name = name; this.state = state; this.vm = vm; - this.hostUuid = host; + hostUuid = host; } public AgentVmInfo(String name, VMInstanceVO vm, State state) { @@ -5124,6 +5125,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac return new VmJobVirtualMachineOutcome((VmWorkJobVO)result[0], vm.getId()); } + @ReflectionUse private Pair<JobInfo.Status, String> orchestrateStart(VmWorkStart work) throws Exception { VMInstanceVO vm = _entityMgr.findById(VMInstanceVO.class, work.getVmId()); if (vm == null) { @@ -5135,6 +5137,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac return new Pair<JobInfo.Status, String>(JobInfo.Status.SUCCEEDED, null); } + @ReflectionUse private Pair<JobInfo.Status, String> orchestrateStop(VmWorkStop work) throws Exception { VMInstanceVO vm = _entityMgr.findById(VMInstanceVO.class, work.getVmId()); if (vm == null) { @@ -5146,6 +5149,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac return new Pair<JobInfo.Status, String>(JobInfo.Status.SUCCEEDED, null); } + @ReflectionUse private Pair<JobInfo.Status, String> orchestrateMigrate(VmWorkMigrate work) throws Exception { VMInstanceVO vm = _entityMgr.findById(VMInstanceVO.class, work.getVmId()); if (vm == null) { @@ -5157,6 +5161,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac return new Pair<JobInfo.Status, String>(JobInfo.Status.SUCCEEDED, null); } + @ReflectionUse private Pair<JobInfo.Status, String> orchestrateMigrateAway(VmWorkMigrateAway work) throws Exception { VMInstanceVO vm = _entityMgr.findById(VMInstanceVO.class, work.getVmId()); if (vm == null) { @@ -5174,6 +5179,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac return new Pair<JobInfo.Status, String>(JobInfo.Status.SUCCEEDED, null); } + @ReflectionUse private Pair<JobInfo.Status, String> orchestrateMigrateWithStorage(VmWorkMigrateWithStorage work) throws Exception { VMInstanceVO vm = _entityMgr.findById(VMInstanceVO.class, work.getVmId()); if (vm == null) { @@ -5187,6 +5193,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac return new Pair<JobInfo.Status, String>(JobInfo.Status.SUCCEEDED, null); } + @ReflectionUse private Pair<JobInfo.Status, String> orchestrateMigrateForScale(VmWorkMigrateForScale work) throws Exception { VMInstanceVO vm = _entityMgr.findById(VMInstanceVO.class, work.getVmId()); if (vm == null) { @@ -5200,6 +5207,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac return new Pair<JobInfo.Status, String>(JobInfo.Status.SUCCEEDED, null); } + @ReflectionUse private Pair<JobInfo.Status, String> orchestrateReboot(VmWorkReboot work) throws Exception { VMInstanceVO vm = _entityMgr.findById(VMInstanceVO.class, work.getVmId()); if (vm == null) { @@ -5210,6 +5218,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac return new Pair<JobInfo.Status, String>(JobInfo.Status.SUCCEEDED, null); } + @ReflectionUse private Pair<JobInfo.Status, String> orchestrateAddVmToNetwork(VmWorkAddVmToNetwork work) throws Exception { VMInstanceVO vm = _entityMgr.findById(VMInstanceVO.class, work.getVmId()); if (vm == null) { @@ -5224,6 +5233,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac return new Pair<JobInfo.Status, String>(JobInfo.Status.SUCCEEDED, _jobMgr.marshallResultObject(nic)); } + @ReflectionUse private Pair<JobInfo.Status, String> orchestrateRemoveNicFromVm(VmWorkRemoveNicFromVm work) throws Exception { VMInstanceVO vm = _entityMgr.findById(VMInstanceVO.class, work.getVmId()); if (vm == null) { @@ -5236,6 +5246,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac _jobMgr.marshallResultObject(result)); } + @ReflectionUse private Pair<JobInfo.Status, String> orchestrateRemoveVmFromNetwork(VmWorkRemoveVmFromNetwork work) throws Exception { VMInstanceVO vm = _entityMgr.findById(VMInstanceVO.class, work.getVmId()); if (vm == null) { @@ -5248,6 +5259,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac _jobMgr.marshallResultObject(result)); } + @ReflectionUse private Pair<JobInfo.Status, String> orchestrateReconfigure(VmWorkReconfigure work) throws Exception { VMInstanceVO vm = _entityMgr.findById(VMInstanceVO.class, work.getVmId()); if (vm == null) { @@ -5262,6 +5274,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac return new Pair<JobInfo.Status, String>(JobInfo.Status.SUCCEEDED, null); } + @ReflectionUse private Pair<JobInfo.Status, String> orchestrateStorageMigration(VmWorkStorageMigration work) throws Exception { VMInstanceVO vm = _entityMgr.findById(VMInstanceVO.class, work.getVmId()); if (vm == null) { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f5298235/server/src/com/cloud/storage/VolumeApiServiceImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/storage/VolumeApiServiceImpl.java b/server/src/com/cloud/storage/VolumeApiServiceImpl.java index 9b034e9..de46ee3 100644 --- a/server/src/com/cloud/storage/VolumeApiServiceImpl.java +++ b/server/src/com/cloud/storage/VolumeApiServiceImpl.java @@ -120,6 +120,7 @@ import com.cloud.utils.EnumUtils; import com.cloud.utils.NumbersUtil; import com.cloud.utils.Pair; import com.cloud.utils.Predicate; +import com.cloud.utils.ReflectionUse; import com.cloud.utils.UriUtils; import com.cloud.utils.component.ManagerBase; import com.cloud.utils.db.DB; @@ -2479,6 +2480,7 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic snapshotId); } + @ReflectionUse private Pair<JobInfo.Status, String> orchestrateAttachVolumeToVM(VmWorkAttachVolume work) throws Exception { Volume vol = orchestrateAttachVolumeToVM(work.getVmId(), work.getVolumeId(), work.getDeviceId()); @@ -2486,12 +2488,14 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic _jobMgr.marshallResultObject(new Long(vol.getId()))); } + @ReflectionUse private Pair<JobInfo.Status, String> orchestrateDetachVolumeFromVM(VmWorkDetachVolume work) throws Exception { Volume vol = orchestrateDetachVolumeFromVM(work.getVmId(), work.getVolumeId()); return new Pair<JobInfo.Status, String>(JobInfo.Status.SUCCEEDED, _jobMgr.marshallResultObject(new Long(vol.getId()))); } + @ReflectionUse private Pair<JobInfo.Status, String> orchestrateResizeVolume(VmWorkResizeVolume work) throws Exception { Volume vol = orchestrateResizeVolume(work.getVolumeId(), work.getCurrentSize(), work.getNewSize(), work.getNewServiceOfferingId(), work.isShrinkOk()); @@ -2499,12 +2503,14 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic _jobMgr.marshallResultObject(new Long(vol.getId()))); } + @ReflectionUse private Pair<JobInfo.Status, String> orchestrateMigrateVolume(VmWorkMigrateVolume work) throws Exception { Volume newVol = orchestrateMigrateVolume(work.getVolumeId(), work.getDestPoolId(), work.isLiveMigrate()); return new Pair<JobInfo.Status, String>(JobInfo.Status.SUCCEEDED, _jobMgr.marshallResultObject(new Long(newVol.getId()))); } + @ReflectionUse private Pair<JobInfo.Status, String> orchestrateTakeVolumeSnapshot(VmWorkTakeVolumeSnapshot work) throws Exception { Account account = _accountDao.findById(work.getAccountId()); orchestrateTakeVolumeSnapshot(work.getVolumeId(), work.getPolicyId(), work.getSnapshotId(), http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f5298235/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java b/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java index 3238cb5..e085b8d 100644 --- a/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java +++ b/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java @@ -73,6 +73,7 @@ import com.cloud.utils.DateUtil; import com.cloud.utils.NumbersUtil; import com.cloud.utils.Pair; import com.cloud.utils.Predicate; +import com.cloud.utils.ReflectionUse; import com.cloud.utils.Ternary; import com.cloud.utils.component.ManagerBase; import com.cloud.utils.db.EntityManager; @@ -1043,23 +1044,27 @@ public class VMSnapshotManagerImpl extends ManagerBase implements VMSnapshotMana vmId); } + @ReflectionUse public Pair<JobInfo.Status, String> orchestrateCreateVMSnapshot(VmWorkCreateVMSnapshot work) throws Exception { VMSnapshot snapshot = orchestrateCreateVMSnapshot(work.getVmId(), work.getVmSnapshotId(), work.isQuiesceVm()); return new Pair<JobInfo.Status, String>(JobInfo.Status.SUCCEEDED, _jobMgr.marshallResultObject(new Long(snapshot.getId()))); } + @ReflectionUse public Pair<JobInfo.Status, String> orchestrateDeleteVMSnapshot(VmWorkDeleteVMSnapshot work) { boolean result = orchestrateDeleteVMSnapshot(work.getVmSnapshotId()); return new Pair<JobInfo.Status, String>(JobInfo.Status.SUCCEEDED, _jobMgr.marshallResultObject(result)); } + @ReflectionUse public Pair<JobInfo.Status, String> orchestrateRevertToVMSnapshot(VmWorkRevertToVMSnapshot work) throws Exception { orchestrateRevertToVMSnapshot(work.getVmSnapshotId()); return new Pair<JobInfo.Status, String>(JobInfo.Status.SUCCEEDED, null); } + @ReflectionUse public Pair<JobInfo.Status, String> orchestrateDeleteAllVMSnapshots(VmWorkDeleteAllVMSnapshots work) { boolean result = orchestrateDeleteAllVMSnapshots(work.getVmId(), work.getSnapshotType()); return new Pair<JobInfo.Status, String>(JobInfo.Status.SUCCEEDED, http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f5298235/utils/src/com/cloud/utils/ReflectionUse.java ---------------------------------------------------------------------- diff --git a/utils/src/com/cloud/utils/ReflectionUse.java b/utils/src/com/cloud/utils/ReflectionUse.java new file mode 100644 index 0000000..a5a78e2 --- /dev/null +++ b/utils/src/com/cloud/utils/ReflectionUse.java @@ -0,0 +1,31 @@ +// +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +// + +package com.cloud.utils; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +@Target({METHOD}) +@Retention(RUNTIME) +public @interface ReflectionUse { +}
