Apply sugestions from code review

Author: Nicole Schmidt

api/src/main/java/com/cloud/server/ManagementService.java

@@ -35,7 +35,7 @@
 import org.apache.cloudstack.api.command.admin.guest.UpdateGuestOsMappingCmd;
 import org.apache.cloudstack.api.command.admin.host.ListHostsCmd;
 import org.apache.cloudstack.api.command.admin.host.UpdateHostPasswordCmd;
-import org.apache.cloudstack.api.command.admin.management.RemoveMgmtCmd;
+import org.apache.cloudstack.api.command.admin.management.RemoveManagementServerCmd;
 import org.apache.cloudstack.api.command.admin.pod.ListPodsByCmd;
 import org.apache.cloudstack.api.command.admin.resource.ArchiveAlertsCmd;
 import org.apache.cloudstack.api.command.admin.resource.DeleteAlertsCmd;
@@ -482,6 +482,6 @@ VirtualMachine upgradeSystemVM(ScaleSystemVMCmd cmd) throws ResourceUnavailableE
 
     Pair<Boolean, String> patchSystemVM(PatchSystemVMCmd cmd);
 
-    boolean removeManagementServer(RemoveMgmtCmd cmd);
+    boolean removeManagementServer(RemoveManagementServerCmd cmd);
 
 }

…mand/admin/management/RemoveMgmtCmd.java …anagement/RemoveManagementServerCmd.javaapi/src/main/java/org/apache/cloudstack/api/command/admin/management/RemoveMgmtCmd.java renamed to api/src/main/java/org/apache/cloudstack/api/command/admin/management/RemoveManagementServerCmd.java api/src/main/java/org/apache/cloudstack/api/command/admin/management/RemoveMgmtCmd.java renamed to api/src/main/java/org/apache/cloudstack/api/command/admin/management/RemoveManagementServerCmd.java

@@ -36,7 +36,7 @@
 
 @APICommand(name = "removeManagementServer", description = "Removes a Management Server.", responseObject = SuccessResponse.class,
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, authorized = RoleType.Admin)
-public class RemoveMgmtCmd extends BaseCmd {
+public class RemoveManagementServerCmd extends BaseCmd {
 
     @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = ManagementServerResponse.class, required = true, description = "the ID of the Management Server")
     private Long id;

server/src/main/java/com/cloud/server/ManagementServerImpl.java

@@ -127,7 +127,7 @@
 import org.apache.cloudstack.api.command.admin.iso.RegisterIsoCmdByAdmin;
 import org.apache.cloudstack.api.command.admin.loadbalancer.ListLoadBalancerRuleInstancesCmdByAdmin;
 import org.apache.cloudstack.api.command.admin.management.ListMgmtsCmd;
-import org.apache.cloudstack.api.command.admin.management.RemoveMgmtCmd;
+import org.apache.cloudstack.api.command.admin.management.RemoveManagementServerCmd;
 import org.apache.cloudstack.api.command.admin.network.AddNetworkDeviceCmd;
 import org.apache.cloudstack.api.command.admin.network.AddNetworkServiceProviderCmd;
 import org.apache.cloudstack.api.command.admin.network.CreateManagementNetworkIpRangeCmd;
@@ -1020,7 +1020,7 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
     @Inject
     StoragePoolTagsDao storagePoolTagsDao;
     @Inject
-    protected ManagementServerJoinDao _managementServerJoinDao;
+    protected ManagementServerJoinDao managementServerJoinDao;
 
     @Inject
     private PublicIpQuarantineDao publicIpQuarantineDao;
@@ -4047,7 +4047,7 @@ public List<Class<?>> getCommands() {
         cmdList.add(ListTemplateDirectDownloadCertificatesCmd.class);
         cmdList.add(ProvisionTemplateDirectDownloadCertificateCmd.class);
         cmdList.add(ListMgmtsCmd.class);
-        cmdList.add(RemoveMgmtCmd.class);
+        cmdList.add(RemoveManagementServerCmd.class);
         cmdList.add(GetUploadParamsForIsoCmd.class);
         cmdList.add(GetRouterHealthCheckResultsCmd.class);
         cmdList.add(StartRollingMaintenanceCmd.class);
@@ -5562,20 +5562,20 @@ public void setLockControllerListener(final LockControllerListener lockControlle
     @Override
     @DB
     @ActionEvent(eventType = EventTypes.EVENT_MANAGEMENT_SERVER_REMOVE, eventDescription = "removing Management Server")
-    public boolean removeManagementServer(RemoveMgmtCmd cmd) {
+    public boolean removeManagementServer(RemoveManagementServerCmd cmd) {
         final Long id = cmd.getId();
-        ManagementServerJoinVO managementServer = _managementServerJoinDao.findById(id);
+        ManagementServerJoinVO managementServer = managementServerJoinDao.findById(id);
 
         if (managementServer == null) {
             throw new InvalidParameterValueException(String.format("Unable to find a Management Server with ID equal to [%s]", managementServer.getUuid()));
         }
 
-        if (ManagementServerHost.State.Up.equals(managementServer.getState())) {
+        if (!ManagementServerHost.State.Down.equals(managementServer.getState())) {
             throw new InvalidParameterValueException(String.format("Unable to remove Management Server with ID [%s]. It can only be removed when it is in the [%s] state, however currently it is in the [%s] state", managementServer.getUuid(), ManagementServerHost.State.Down.name(), ManagementServerHost.State.Up.name()));
         }
 
         managementServer.setRemoved(new Date());
-        return _managementServerJoinDao.update(id, managementServer);
+        return managementServerJoinDao.update(id, managementServer);
 
     }