diff --git a/api/src/main/java/org/apache/cloudstack/api/BaseCmd.java b/api/src/main/java/org/apache/cloudstack/api/BaseCmd.java index c2ff5a844f1..23354454e32 100644 --- a/api/src/main/java/org/apache/cloudstack/api/BaseCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/BaseCmd.java @@ -247,30 +247,36 @@ public abstract class BaseCmd { this.responseType = responseType; } - /** - * For some reason this method does not return the actual command name, but more a name that - * is used to create the response. So you can expect for a XCmd a value like xcmdresponse. Anyways - * this methods is used in too many places so for now instead of changing it we just create another - * method {@link BaseCmd#getActualCommandName()} that returns the value from {@link APICommand#name()} - * - * @return - */ - public abstract String getCommandName(); - - /** * Gets the CommandName based on the class annotations: the value from {@link APICommand#name()} * * @return the value from {@link APICommand#name()} */ - public String getActualCommandName() { + public static String getCommandNameByClass(Class clazz) { String cmdName = null; - if (this.getClass().getAnnotation(APICommand.class) != null) { - cmdName = this.getClass().getAnnotation(APICommand.class).name(); + APICommand apiClassAnnotation = clazz.getAnnotation(APICommand.class); + + if (apiClassAnnotation != null && apiClassAnnotation.name() != null) { + cmdName = apiClassAnnotation.name(); } else { - cmdName = this.getClass().getName(); + cmdName = clazz.getName(); } - return cmdName; + return cmdName; + } + + public String getActualCommandName() { + return getCommandNameByClass(this.getClass()); + } + + public String getCommandName() { + return getResponseNameByClass(this.getClass()); + } + + /** + * Retrieves the name defined in {@link APICommand#name()}, in lower case, with the prefix {@link BaseCmd#RESPONSE_SUFFIX} + */ + public static String getResponseNameByClass(Class clazz) { + return getCommandNameByClass(clazz).toLowerCase() + BaseCmd.RESPONSE_SUFFIX; } /** diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java index 7d1150597f6..945bb956c3e 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java @@ -45,7 +45,6 @@ import com.cloud.user.UserAccount; public class CreateAccountCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(CreateAccountCmd.class.getName()); - private static final String s_name = "createaccountresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -172,11 +171,6 @@ public class CreateAccountCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java index 22eec04c57b..9a0ea4e9ec0 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java @@ -40,7 +40,6 @@ import com.cloud.user.Account; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class DeleteAccountCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DeleteAccountCmd.class.getName()); - private static final String s_name = "deleteaccountresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -64,15 +63,6 @@ public class DeleteAccountCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - public static String getStaticName() { - return s_name; - } - - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { Account account = CallContext.current().getCallingAccount();// Let's give the caller here for event logging. diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/account/DisableAccountCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/account/DisableAccountCmd.java index f71484c2dea..91b0673e186 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/account/DisableAccountCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/account/DisableAccountCmd.java @@ -44,7 +44,6 @@ import com.cloud.user.Account; requestHasSensitiveInfo = false, responseHasSensitiveInfo = true) public class DisableAccountCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DisableAccountCmd.class.getName()); - private static final String s_name = "disableaccountresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -89,11 +88,6 @@ public class DisableAccountCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public String getEventType() { return EventTypes.EVENT_ACCOUNT_DISABLE; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/account/EnableAccountCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/account/EnableAccountCmd.java index e9dc9f611d8..cc37dc23713 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/account/EnableAccountCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/account/EnableAccountCmd.java @@ -40,7 +40,6 @@ import com.cloud.user.Account; requestHasSensitiveInfo = false, responseHasSensitiveInfo = true) public class EnableAccountCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(EnableAccountCmd.class.getName()); - private static final String s_name = "enableaccountresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -78,11 +77,6 @@ public class EnableAccountCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { Account account = _entityMgr.findById(Account.class, getId()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/account/LockAccountCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/account/LockAccountCmd.java index d02902d9800..a430914a25a 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/account/LockAccountCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/account/LockAccountCmd.java @@ -37,7 +37,6 @@ import com.cloud.utils.exception.CloudRuntimeException; public class LockAccountCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(LockAccountCmd.class.getName()); - private static final String s_name = "lockaccountresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -69,11 +68,6 @@ public class LockAccountCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { final Account account = _accountService.getActiveAccountByName(getAccountName(), getDomainId()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmd.java index 0dd7a37bb91..36d299bcfc8 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmd.java @@ -44,7 +44,6 @@ import com.cloud.user.Account; requestHasSensitiveInfo = false, responseHasSensitiveInfo = true) public class UpdateAccountCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(UpdateAccountCmd.class.getName()); - private static final String s_name = "updateaccountresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -116,11 +115,6 @@ public class UpdateAccountCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { Account account = _entityMgr.findById(Account.class, getId()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/CreateRoleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/CreateRoleCmd.java index 73c5ca2d759..2b8800319f6 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/CreateRoleCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/CreateRoleCmd.java @@ -23,7 +23,6 @@ import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandResourceType; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; -import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.RoleResponse; @@ -31,12 +30,11 @@ import org.apache.cloudstack.context.CallContext; import com.cloud.user.Account; -@APICommand(name = CreateRoleCmd.APINAME, description = "Creates a role", responseObject = RoleResponse.class, +@APICommand(name = "createRole", description = "Creates a role", responseObject = RoleResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.9.0", authorized = {RoleType.Admin}) public class CreateRoleCmd extends RoleCmd { - public static final String APINAME = "createRole"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -66,11 +64,6 @@ public class CreateRoleCmd extends RoleCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/CreateRolePermissionCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/CreateRolePermissionCmd.java index d7d6ef125df..232c4760e1e 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/CreateRolePermissionCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/CreateRolePermissionCmd.java @@ -24,7 +24,6 @@ import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiArgValidator; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; -import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.RolePermissionResponse; @@ -33,12 +32,11 @@ import org.apache.cloudstack.context.CallContext; import com.cloud.user.Account; -@APICommand(name = CreateRolePermissionCmd.APINAME, description = "Adds an API permission to a role", responseObject = RolePermissionResponse.class, +@APICommand(name = "createRolePermission", description = "Adds an API permission to a role", responseObject = RolePermissionResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.9.0", authorized = {RoleType.Admin}) public class CreateRolePermissionCmd extends BaseRolePermissionCmd { - public static final String APINAME = "createRolePermission"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -60,11 +58,6 @@ public class CreateRolePermissionCmd extends BaseRolePermissionCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/DeleteRoleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/DeleteRoleCmd.java index 89f82500da8..fd2d11aeda0 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/DeleteRoleCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/DeleteRoleCmd.java @@ -33,12 +33,11 @@ import org.apache.cloudstack.context.CallContext; import com.cloud.user.Account; -@APICommand(name = DeleteRoleCmd.APINAME, description = "Deletes a role", responseObject = SuccessResponse.class, +@APICommand(name = "deleteRole", description = "Deletes a role", responseObject = SuccessResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.9.0", authorized = {RoleType.Admin}) public class DeleteRoleCmd extends BaseCmd { - public static final String APINAME = "deleteRole"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -60,11 +59,6 @@ public class DeleteRoleCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/DeleteRolePermissionCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/DeleteRolePermissionCmd.java index 9c7dc7c9861..bedaca9e23a 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/DeleteRolePermissionCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/DeleteRolePermissionCmd.java @@ -31,12 +31,11 @@ import org.apache.cloudstack.api.response.RolePermissionResponse; import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.context.CallContext; -@APICommand(name = DeleteRolePermissionCmd.APINAME, description = "Deletes a role permission", responseObject = SuccessResponse.class, +@APICommand(name = "deleteRolePermission", description = "Deletes a role permission", responseObject = SuccessResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.9.0", authorized = {RoleType.Admin}) public class DeleteRolePermissionCmd extends BaseCmd { - public static final String APINAME = "deleteRolePermission"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -58,11 +57,6 @@ public class DeleteRolePermissionCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/ImportRoleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/ImportRoleCmd.java index b51cb42e1df..4f3e9d15af7 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/ImportRoleCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/ImportRoleCmd.java @@ -33,7 +33,6 @@ import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.ApiServerService; -import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.RoleResponse; @@ -43,12 +42,11 @@ import org.apache.commons.lang3.StringUtils; import com.cloud.user.Account; -@APICommand(name = ImportRoleCmd.APINAME, description = "Imports a role based on provided map of rule permissions", responseObject = RoleResponse.class, +@APICommand(name = "importRole", description = "Imports a role based on provided map of rule permissions", responseObject = RoleResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.15.0", authorized = {RoleType.Admin}) public class ImportRoleCmd extends RoleCmd { - public static final String APINAME = "importRole"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -120,11 +118,6 @@ public class ImportRoleCmd extends RoleCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/ListRolePermissionsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/ListRolePermissionsCmd.java index f20abf40146..ce002f1455e 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/ListRolePermissionsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/ListRolePermissionsCmd.java @@ -37,12 +37,11 @@ import java.util.ArrayList; import java.util.List; -@APICommand(name = ListRolePermissionsCmd.APINAME, description = "Lists role permissions", responseObject = RolePermissionResponse.class, +@APICommand(name = "listRolePermissions", description = "Lists role permissions", responseObject = RolePermissionResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.9.0", authorized = {RoleType.Admin}) public class ListRolePermissionsCmd extends BaseCmd { - public static final String APINAME = "listRolePermissions"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -64,11 +63,6 @@ public class ListRolePermissionsCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/ListRolesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/ListRolesCmd.java index 9a23618911d..dfe401596f4 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/ListRolesCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/ListRolesCmd.java @@ -34,10 +34,9 @@ import org.apache.commons.lang3.StringUtils; import com.cloud.user.Account; import com.cloud.utils.Pair; -@APICommand(name = ListRolesCmd.APINAME, description = "Lists dynamic roles in CloudStack", responseObject = RoleResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.9.0", authorized = { +@APICommand(name = "listRoles", description = "Lists dynamic roles in CloudStack", responseObject = RoleResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.9.0", authorized = { RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin }) public class ListRolesCmd extends BaseListCmd { - public static final String APINAME = "listRoles"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -75,11 +74,6 @@ public class ListRolesCmd extends BaseListCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseListCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/UpdateRoleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/UpdateRoleCmd.java index 7b7b4e44294..227aaf54f7f 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/UpdateRoleCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/UpdateRoleCmd.java @@ -32,12 +32,11 @@ import org.apache.cloudstack.context.CallContext; import com.cloud.user.Account; -@APICommand(name = UpdateRoleCmd.APINAME, description = "Updates a role", responseObject = RoleResponse.class, +@APICommand(name = "updateRole", description = "Updates a role", responseObject = RoleResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.9.0", authorized = {RoleType.Admin}) public class UpdateRoleCmd extends RoleCmd { - public static final String APINAME = "updateRole"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -69,11 +68,6 @@ public class UpdateRoleCmd extends RoleCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/UpdateRolePermissionCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/UpdateRolePermissionCmd.java index 9faf1b93a7b..3f926092ec3 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/UpdateRolePermissionCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/UpdateRolePermissionCmd.java @@ -38,12 +38,11 @@ import org.apache.cloudstack.context.CallContext; import com.cloud.user.Account; -@APICommand(name = UpdateRolePermissionCmd.APINAME, description = "Updates a role permission order", responseObject = SuccessResponse.class, +@APICommand(name = "updateRolePermission", description = "Updates a role permission order", responseObject = SuccessResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.9.0", authorized = {RoleType.Admin}) public class UpdateRolePermissionCmd extends BaseCmd { - public static final String APINAME = "updateRolePermission"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -96,11 +95,6 @@ public class UpdateRolePermissionCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; @@ -142,4 +136,4 @@ public class UpdateRolePermissionCmd extends BaseCmd { response.setSuccess(result); setResponseObject(response); } -} \ No newline at end of file +} diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/CreateProjectRoleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/CreateProjectRoleCmd.java index d3adbc88fd5..c03e6112ea7 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/CreateProjectRoleCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/CreateProjectRoleCmd.java @@ -30,11 +30,10 @@ import org.apache.cloudstack.context.CallContext; import com.cloud.user.Account; -@APICommand(name = CreateProjectRoleCmd.APINAME, description = "Creates a Project role", responseObject = ProjectRoleResponse.class, +@APICommand(name = "createProjectRole", description = "Creates a Project role", responseObject = ProjectRoleResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, authorized = {RoleType.Admin, RoleType.DomainAdmin, RoleType.ResourceAdmin, RoleType.User}, since = "4.15.0") public class CreateProjectRoleCmd extends ProjectRoleCmd { - public static final String APINAME = "createProjectRole"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -66,11 +65,6 @@ public class CreateProjectRoleCmd extends ProjectRoleCmd { setupProjectRoleResponse(projectRole); } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/CreateProjectRolePermissionCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/CreateProjectRolePermissionCmd.java index 7b04764b6a0..9b6c2e633fc 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/CreateProjectRolePermissionCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/CreateProjectRolePermissionCmd.java @@ -32,11 +32,10 @@ import org.apache.cloudstack.api.response.ProjectRolePermissionResponse; import org.apache.cloudstack.api.response.ProjectRoleResponse; import org.apache.cloudstack.context.CallContext; -@APICommand(name = CreateProjectRolePermissionCmd.APINAME, description = "Adds API permissions to a project role", responseObject = ProjectRolePermissionResponse.class, +@APICommand(name = "createProjectRolePermission", description = "Adds API permissions to a project role", responseObject = ProjectRolePermissionResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, authorized = { RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User}, since = "4.15.0") public class CreateProjectRolePermissionCmd extends BaseRolePermissionCmd { - public static final String APINAME = "createProjectRolePermission"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -80,11 +79,6 @@ public class CreateProjectRolePermissionCmd extends BaseRolePermissionCmd { setupResponse(projectRolePermission, projectRole); } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccountId(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/DeleteProjectRoleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/DeleteProjectRoleCmd.java index c1a4d391251..4bb460c63f7 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/DeleteProjectRoleCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/DeleteProjectRoleCmd.java @@ -31,11 +31,10 @@ import org.apache.cloudstack.api.response.ProjectRoleResponse; import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.context.CallContext; -@APICommand(name = DeleteProjectRoleCmd.APINAME, description = "Delete Project roles in CloudStack", responseObject = SuccessResponse.class, +@APICommand(name = "deleteProjectRole", description = "Delete Project roles in CloudStack", responseObject = SuccessResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.15.0", authorized = { RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User}) public class DeleteProjectRoleCmd extends BaseCmd { - public static final String APINAME = "deleteProjectRole" ; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -76,11 +75,6 @@ public class DeleteProjectRoleCmd extends BaseCmd { setResponseObject(response); } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccountId(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/DeleteProjectRolePermissionCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/DeleteProjectRolePermissionCmd.java index 17e74824102..8b83253c869 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/DeleteProjectRolePermissionCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/DeleteProjectRolePermissionCmd.java @@ -31,11 +31,10 @@ import org.apache.cloudstack.api.response.ProjectRolePermissionResponse; import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.context.CallContext; -@APICommand(name = DeleteProjectRolePermissionCmd.APINAME, description = "Deletes a project role permission in the project", responseObject = SuccessResponse.class, +@APICommand(name = "deleteProjectRolePermission", description = "Deletes a project role permission in the project", responseObject = SuccessResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, authorized = { RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User}, since = "4.15.0") public class DeleteProjectRolePermissionCmd extends BaseCmd { - public static final String APINAME = "deleteProjectRolePermission"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -77,11 +76,6 @@ public class DeleteProjectRolePermissionCmd extends BaseCmd { setResponseObject(response); } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccountId(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/ListProjectRolePermissionsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/ListProjectRolePermissionsCmd.java index 55ec8a68eb3..b0cd08c8e47 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/ListProjectRolePermissionsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/ListProjectRolePermissionsCmd.java @@ -34,11 +34,10 @@ import org.apache.cloudstack.api.response.ProjectRolePermissionResponse; import org.apache.cloudstack.api.response.ProjectRoleResponse; import org.apache.cloudstack.context.CallContext; -@APICommand(name = ListProjectRolePermissionsCmd.APINAME, description = "Lists a project's project role permissions", responseObject = ProjectRolePermissionResponse.class, +@APICommand(name = "listProjectRolePermissions", description = "Lists a project's project role permissions", responseObject = ProjectRolePermissionResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, authorized = { RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User}, since = "4.15.0") public class ListProjectRolePermissionsCmd extends BaseCmd { - public static final String APINAME = "listProjectRolePermissions"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -99,11 +98,6 @@ public class ListProjectRolePermissionsCmd extends BaseCmd { return rolePermissionResponse; } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccountId(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/ListProjectRolesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/ListProjectRolesCmd.java index 68ee8714d7f..e876dbc9b58 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/ListProjectRolesCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/ListProjectRolesCmd.java @@ -33,11 +33,10 @@ import org.apache.cloudstack.api.response.ProjectRoleResponse; import org.apache.cloudstack.context.CallContext; import org.apache.commons.lang3.StringUtils; -@APICommand(name = ListProjectRolesCmd.APINAME, description = "Lists Project roles in CloudStack", responseObject = ProjectRoleResponse.class, +@APICommand(name = "listProjectRoles", description = "Lists Project roles in CloudStack", responseObject = ProjectRoleResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.15.0", authorized = { RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User}) public class ListProjectRolesCmd extends BaseListCmd { - public static final String APINAME = "listProjectRoles"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -104,11 +103,6 @@ public class ListProjectRolesCmd extends BaseListCmd { return response; } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccountId(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/UpdateProjectRoleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/UpdateProjectRoleCmd.java index 41f68645e9b..202daa3d49c 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/UpdateProjectRoleCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/UpdateProjectRoleCmd.java @@ -28,11 +28,10 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.ProjectRoleResponse; -@APICommand(name = UpdateProjectRoleCmd.APINAME, description = "Creates a Project role", responseObject = ProjectRoleResponse.class, +@APICommand(name = "updateProjectRole", description = "Creates a Project role", responseObject = ProjectRoleResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, authorized = {RoleType.Admin, RoleType.DomainAdmin, RoleType.ResourceAdmin, RoleType.User}, since = "4.15.0") public class UpdateProjectRoleCmd extends ProjectRoleCmd { - public static final String APINAME = "updateProjectRole"; ///////////////////////////////////////////////////// //////////////// API Parameters ///////////////////// @@ -73,11 +72,6 @@ public class UpdateProjectRoleCmd extends ProjectRoleCmd { } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return 0; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/UpdateProjectRolePermissionCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/UpdateProjectRolePermissionCmd.java index 6f02962d683..d27235e5aae 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/UpdateProjectRolePermissionCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/UpdateProjectRolePermissionCmd.java @@ -38,11 +38,10 @@ import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.context.CallContext; import org.apache.commons.lang3.EnumUtils; -@APICommand(name = UpdateProjectRolePermissionCmd.APINAME, description = "Updates a project role permission and/or order", responseObject = SuccessResponse.class, +@APICommand(name = "updateProjectRolePermission", description = "Updates a project role permission and/or order", responseObject = SuccessResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, authorized = { RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User}, since = "4.15.0") public class UpdateProjectRolePermissionCmd extends BaseCmd { - public static final String APINAME = "updateProjectRolePermission"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -151,11 +150,6 @@ public class UpdateProjectRolePermissionCmd extends BaseCmd { return projRoleService.updateProjectRolePermission(projectId, projectRole, rolePermissionsOrder); } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccountId(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/alert/GenerateAlertCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/alert/GenerateAlertCmd.java index 58920d7dd74..9446272df6e 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/alert/GenerateAlertCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/alert/GenerateAlertCmd.java @@ -37,7 +37,6 @@ public class GenerateAlertCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(GenerateAlertCmd.class.getName()); - private static final String s_name = "generatealertresponse"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// @@ -61,11 +60,6 @@ public class GenerateAlertCmd extends BaseAsyncCmd { // /////////////////////////////////////////////////// // ///////////////// Accessors /////////////////////// // /////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - public Short getType() { return type; } @@ -118,4 +112,4 @@ public class GenerateAlertCmd extends BaseAsyncCmd { public long getEntityOwnerId() { return 0; } -} \ No newline at end of file +} diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/AddAnnotationCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/AddAnnotationCmd.java index eff25d929e5..00e0adcfb0d 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/AddAnnotationCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/AddAnnotationCmd.java @@ -33,11 +33,10 @@ import org.apache.cloudstack.api.response.AnnotationResponse; import org.apache.cloudstack.context.CallContext; import org.apache.commons.lang3.BooleanUtils; -@APICommand(name = AddAnnotationCmd.APINAME, description = "add an annotation.", responseObject = AnnotationResponse.class, +@APICommand(name = "addAnnotation", description = "add an annotation.", responseObject = AnnotationResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.11", authorized = {RoleType.Admin}) public class AddAnnotationCmd extends BaseCmd { - public static final String APINAME = "addAnnotation"; @Parameter(name = ApiConstants.ANNOTATION, type = CommandType.STRING, description = "the annotation text") private String annotation; @@ -85,11 +84,6 @@ public class AddAnnotationCmd extends BaseCmd { this.setResponseObject(annotationResponse); } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccount().getAccountId(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/ListAnnotationsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/ListAnnotationsCmd.java index 97d24ed9384..3df4536786f 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/ListAnnotationsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/ListAnnotationsCmd.java @@ -25,7 +25,6 @@ import com.google.common.base.Preconditions; import org.apache.cloudstack.acl.RoleType; import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; -import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.BaseListCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; @@ -33,11 +32,10 @@ import org.apache.cloudstack.api.response.AnnotationResponse; import org.apache.cloudstack.api.response.ListResponse; import org.apache.commons.lang3.StringUtils; -@APICommand(name = ListAnnotationsCmd.APINAME, description = "Lists annotations.", responseObject = AnnotationResponse.class, +@APICommand(name = "listAnnotations", description = "Lists annotations.", responseObject = AnnotationResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.11", authorized = {RoleType.Admin}) public class ListAnnotationsCmd extends BaseListCmd { - public static final String APINAME = "listAnnotations"; @Parameter(name = ApiConstants.ID, type = CommandType.STRING, description = "the id of the annotation") private String uuid; @@ -94,9 +92,4 @@ public class ListAnnotationsCmd extends BaseListCmd { response.setResponseName(getCommandName()); this.setResponseObject(response); response.setObjectName("annotations"); - } - - @Override public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } -} + }} diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/RemoveAnnotationCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/RemoveAnnotationCmd.java index 581ce45f252..693ad09bfa9 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/RemoveAnnotationCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/RemoveAnnotationCmd.java @@ -30,11 +30,10 @@ import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.AnnotationResponse; import org.apache.cloudstack.context.CallContext; -@APICommand(name = RemoveAnnotationCmd.APINAME, description = "remove an annotation.", responseObject = AnnotationResponse.class, +@APICommand(name = "removeAnnotation", description = "remove an annotation.", responseObject = AnnotationResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.11", authorized = {RoleType.Admin}) public class RemoveAnnotationCmd extends BaseCmd { - public static final String APINAME = "removeAnnotation"; @Parameter(name = ApiConstants.ID, type = CommandType.STRING, required = true, description = "the id of the annotation") private String uuid; @@ -52,11 +51,6 @@ public class RemoveAnnotationCmd extends BaseCmd { this.setResponseObject(annotationResponse); } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccount().getAccountId(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/UpdateAnnotationVisibilityCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/UpdateAnnotationVisibilityCmd.java index d152e10e5d1..b1b7295510c 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/UpdateAnnotationVisibilityCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/UpdateAnnotationVisibilityCmd.java @@ -30,13 +30,12 @@ import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.AnnotationResponse; import org.apache.cloudstack.context.CallContext; -@APICommand(name = UpdateAnnotationVisibilityCmd.APINAME, description = "update an annotation visibility.", +@APICommand(name = "updateAnnotationVisibility", description = "update an annotation visibility.", responseObject = AnnotationResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.16", authorized = {RoleType.Admin}) public class UpdateAnnotationVisibilityCmd extends BaseCmd { - public static final String APINAME = "updateAnnotationVisibility"; @Parameter(name = ApiConstants.ID, type = CommandType.STRING, required = true, description = "the id of the annotation") @@ -62,11 +61,6 @@ public class UpdateAnnotationVisibilityCmd extends BaseCmd { this.setResponseObject(annotationResponse); } - @Override - public String getCommandName() { - return String.format("%s%s", APINAME.toLowerCase(), BaseCmd.RESPONSE_SUFFIX); - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccount().getAccountId(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/autoscale/DeleteCounterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/autoscale/DeleteCounterCmd.java index 16406b730e1..e1f7859a56b 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/autoscale/DeleteCounterCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/autoscale/DeleteCounterCmd.java @@ -37,7 +37,6 @@ import com.cloud.user.Account; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class DeleteCounterCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DeleteCounterCmd.class.getName()); - private static final String s_name = "deletecounterresponse"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// @@ -73,11 +72,6 @@ public class DeleteCounterCmd extends BaseAsyncCmd { // ///////////////// Accessors /////////////////////// // /////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - public Long getId() { return id; } diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/DeleteBackupOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/DeleteBackupOfferingCmd.java index a405fd6d4a7..08523712d12 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/DeleteBackupOfferingCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/DeleteBackupOfferingCmd.java @@ -37,12 +37,11 @@ import com.cloud.exception.NetworkRuleConflictException; import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; -@APICommand(name = DeleteBackupOfferingCmd.APINAME, +@APICommand(name = "deleteBackupOffering", description = "Deletes a backup offering", responseObject = SuccessResponse.class, since = "4.14.0", authorized = {RoleType.Admin}) public class DeleteBackupOfferingCmd extends BaseCmd { - public static final String APINAME = "deleteBackupOffering"; @Inject private BackupManager backupManager; @@ -80,11 +79,6 @@ public class DeleteBackupOfferingCmd extends BaseCmd { } } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccount().getId(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/ImportBackupOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/ImportBackupOfferingCmd.java index f682f4cddd1..7d3902bc490 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/ImportBackupOfferingCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/ImportBackupOfferingCmd.java @@ -41,12 +41,11 @@ import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.utils.exception.CloudRuntimeException; -@APICommand(name = ImportBackupOfferingCmd.APINAME, +@APICommand(name = "importBackupOffering", description = "Imports a backup offering using a backup provider", responseObject = BackupOfferingResponse.class, since = "4.14.0", authorized = {RoleType.Admin}) public class ImportBackupOfferingCmd extends BaseAsyncCmd { - public static final String APINAME = "importBackupOffering"; @Inject private BackupManager backupManager; @@ -123,11 +122,6 @@ public class ImportBackupOfferingCmd extends BaseAsyncCmd { } } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccount().getId(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/ListBackupProviderOfferingsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/ListBackupProviderOfferingsCmd.java index 2e5657d7d79..e60a598913f 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/ListBackupProviderOfferingsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/ListBackupProviderOfferingsCmd.java @@ -38,12 +38,11 @@ import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.utils.exception.CloudRuntimeException; -@APICommand(name = ListBackupProviderOfferingsCmd.APINAME, +@APICommand(name = "listBackupProviderOfferings", description = "Lists external backup offerings of the provider", responseObject = BackupOfferingResponse.class, since = "4.14.0", authorized = {RoleType.Admin}) public class ListBackupProviderOfferingsCmd extends BaseBackupListCmd { - public static final String APINAME = "listBackupProviderOfferings"; @Inject private BackupManager backupManager; @@ -87,8 +86,4 @@ public class ListBackupProviderOfferingsCmd extends BaseBackupListCmd { } } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + RESPONSE_SUFFIX; } -} \ No newline at end of file diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/ListBackupProvidersCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/ListBackupProvidersCmd.java index 2b4b735be2a..17575076444 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/ListBackupProvidersCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/ListBackupProvidersCmd.java @@ -33,12 +33,11 @@ import org.apache.cloudstack.backup.BackupProvider; import com.cloud.user.Account; -@APICommand(name = ListBackupProvidersCmd.APINAME, +@APICommand(name = "listBackupProviders", description = "Lists Backup and Recovery providers", responseObject = BackupProviderResponse.class, since = "4.14.0", authorized = {RoleType.Admin}) public class ListBackupProvidersCmd extends BaseCmd { - public static final String APINAME = "listBackupProviders"; @Inject private BackupManager backupManager; @@ -58,11 +57,6 @@ public class ListBackupProvidersCmd extends BaseCmd { return name; } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/UpdateBackupOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/UpdateBackupOfferingCmd.java index 2a8ee2b8313..1cd6f4a8328 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/UpdateBackupOfferingCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/UpdateBackupOfferingCmd.java @@ -40,7 +40,6 @@ import com.cloud.utils.exception.CloudRuntimeException; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.16.0") public class UpdateBackupOfferingCmd extends BaseCmd { private static final Logger LOGGER = Logger.getLogger(UpdateBackupOfferingCmd.class.getName()); - private static final String APINAME = "updateBackupOffering"; @Inject private BackupManager backupManager; @@ -106,11 +105,6 @@ public class UpdateBackupOfferingCmd extends BaseCmd { } } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; @@ -125,4 +119,4 @@ public class UpdateBackupOfferingCmd extends BaseCmd { public ApiCommandResourceType getApiResourceType() { return ApiCommandResourceType.BackupOffering; } -} \ No newline at end of file +} diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/ca/IssueCertificateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/ca/IssueCertificateCmd.java index f26c97408ce..4c543fdb6a8 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/ca/IssueCertificateCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/ca/IssueCertificateCmd.java @@ -41,7 +41,7 @@ import org.apache.log4j.Logger; import com.cloud.event.EventTypes; -@APICommand(name = IssueCertificateCmd.APINAME, +@APICommand(name = "issueCertificate", description = "Issues a client certificate using configured or provided CA plugin", responseObject = CertificateResponse.class, requestHasSensitiveInfo = true, @@ -51,7 +51,6 @@ import com.cloud.event.EventTypes; public class IssueCertificateCmd extends BaseAsyncCmd { private static final Logger LOG = Logger.getLogger(IssueCertificateCmd.class); - public static final String APINAME = "issueCertificate"; @Inject private CAManager caManager; @@ -140,11 +139,6 @@ public class IssueCertificateCmd extends BaseAsyncCmd { setResponseObject(certificateResponse); } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccount().getId(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/ca/ListCAProvidersCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/ca/ListCAProvidersCmd.java index e1e8e375163..13cf7550c93 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/ca/ListCAProvidersCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/ca/ListCAProvidersCmd.java @@ -34,7 +34,7 @@ import org.apache.cloudstack.framework.ca.CAProvider; import com.cloud.user.Account; -@APICommand(name = ListCAProvidersCmd.APINAME, +@APICommand(name = "listCAProviders", description = "Lists available certificate authority providers in CloudStack", responseObject = CAProviderResponse.class, requestHasSensitiveInfo = false, @@ -42,7 +42,6 @@ import com.cloud.user.Account; since = "4.11.0", authorized = {RoleType.Admin}) public class ListCAProvidersCmd extends BaseCmd { - public static final String APINAME = "listCAProviders"; @Inject private CAManager caManager; @@ -66,11 +65,6 @@ public class ListCAProvidersCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/ca/ListCaCertificateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/ca/ListCaCertificateCmd.java index 9f0e0530eba..feb69e167ac 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/ca/ListCaCertificateCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/ca/ListCaCertificateCmd.java @@ -32,7 +32,7 @@ import org.apache.cloudstack.ca.CAManager; import com.cloud.user.Account; import com.cloud.utils.exception.CloudRuntimeException; -@APICommand(name = ListCaCertificateCmd.APINAME, +@APICommand(name = "listCaCertificate", description = "Lists the CA public certificate(s) as support by the configured/provided CA plugin", responseObject = CertificateResponse.class, requestHasSensitiveInfo = false, @@ -40,7 +40,6 @@ import com.cloud.utils.exception.CloudRuntimeException; since = "4.11.0", authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User}) public class ListCaCertificateCmd extends BaseCmd { - public static final String APINAME = "listCaCertificate"; @Inject private CAManager caManager; @@ -78,11 +77,6 @@ public class ListCaCertificateCmd extends BaseCmd { setResponseObject(certificateResponse); } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return Account.Type.NORMAL.ordinal(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/ca/ProvisionCertificateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/ca/ProvisionCertificateCmd.java index 99f3eae2aea..a39985549ac 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/ca/ProvisionCertificateCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/ca/ProvisionCertificateCmd.java @@ -25,7 +25,6 @@ import org.apache.cloudstack.api.ApiCommandResourceType; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseAsyncCmd; -import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.HostResponse; @@ -36,7 +35,7 @@ import org.apache.cloudstack.context.CallContext; import com.cloud.event.EventTypes; import com.cloud.host.Host; -@APICommand(name = ProvisionCertificateCmd.APINAME, +@APICommand(name = "provisionCertificate", description = "Issues and propagates client certificate on a connected host/agent using configured CA plugin", responseObject = SuccessResponse.class, requestHasSensitiveInfo = false, @@ -44,7 +43,6 @@ import com.cloud.host.Host; since = "4.11.0", authorized = {RoleType.Admin}) public class ProvisionCertificateCmd extends BaseAsyncCmd { - public static final String APINAME = "provisionCertificate"; @Inject private CAManager caManager; @@ -98,11 +96,6 @@ public class ProvisionCertificateCmd extends BaseAsyncCmd { setResponseObject(response); } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccount().getId(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/ca/RevokeCertificateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/ca/RevokeCertificateCmd.java index f3277b5d4e0..381bed65f95 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/ca/RevokeCertificateCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/ca/RevokeCertificateCmd.java @@ -36,7 +36,7 @@ import org.apache.commons.lang3.StringUtils; import com.cloud.event.EventTypes; -@APICommand(name = RevokeCertificateCmd.APINAME, +@APICommand(name = "revokeCertificate", description = "Revokes certificate using configured CA plugin", responseObject = SuccessResponse.class, requestHasSensitiveInfo = true, @@ -45,7 +45,6 @@ import com.cloud.event.EventTypes; authorized = {RoleType.Admin}) public class RevokeCertificateCmd extends BaseAsyncCmd { - public static final String APINAME = "revokeCertificate"; @Inject private CAManager caManager; @@ -94,11 +93,6 @@ public class RevokeCertificateCmd extends BaseAsyncCmd { setResponseObject(response); } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccount().getId(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java index e258d72ca38..df48b2511b6 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java @@ -44,7 +44,6 @@ import com.cloud.user.Account; public class AddClusterCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(AddClusterCmd.class.getName()); - private static final String s_name = "addclusterresponse"; @Parameter(name = ApiConstants.CLUSTER_NAME, type = CommandType.STRING, required = true, description = "the cluster name") private String clusterName; @@ -181,11 +180,6 @@ public class AddClusterCmd extends BaseCmd { return hypervisor; } - @Override - public String getCommandName() { - return s_name; - } - public String getClusterType() { return clusterType; } diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/DeleteClusterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/DeleteClusterCmd.java index 7493c7c45e5..497cef4c3ec 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/DeleteClusterCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/DeleteClusterCmd.java @@ -35,7 +35,6 @@ import com.cloud.user.Account; public class DeleteClusterCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(DeleteClusterCmd.class.getName()); - private static final String s_name = "deleteclusterresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -56,11 +55,6 @@ public class DeleteClusterCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java index d03c6743880..d83330c664a 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java @@ -38,7 +38,6 @@ import com.cloud.utils.Pair; public class ListClustersCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(ListClustersCmd.class.getName()); - private static final String s_name = "listclustersresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -119,11 +118,6 @@ public class ListClustersCmd extends BaseListCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - protected Pair, Integer> getClusterResponses() { Pair, Integer> result = _mgr.searchForClusters(this); List clusterResponses = new ArrayList(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java index 99c62a17ebc..dd527fb409a 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java @@ -36,7 +36,6 @@ import com.cloud.user.Account; public class UpdateClusterCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(AddClusterCmd.class.getName()); - private static final String s_name = "updateclusterresponse"; @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = ClusterResponse.class, required = true, description = "the ID of the Cluster") private Long id; @@ -72,11 +71,6 @@ public class UpdateClusterCmd extends BaseCmd { return hypervisor; } - @Override - public String getCommandName() { - return s_name; - } - public String getClusterType() { return clusterType; } diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java index 80ebaf43f64..b47bb6b87d5 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java @@ -42,7 +42,6 @@ import com.cloud.utils.Pair; public class ListCfgsByCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(ListCfgsByCmd.class.getName()); - private static final String s_name = "listconfigurationsresponse"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// @@ -144,11 +143,6 @@ public class ListCfgsByCmd extends BaseListCmd { // ///////////// API Implementation/////////////////// // /////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() { Pair, Integer> result = _mgr.searchForConfigurations(this); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/config/ListDeploymentPlannersCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/config/ListDeploymentPlannersCmd.java index b5a24b9bda8..4f5186a6df6 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/config/ListDeploymentPlannersCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/config/ListDeploymentPlannersCmd.java @@ -31,7 +31,6 @@ import org.apache.cloudstack.api.response.ListResponse; public class ListDeploymentPlannersCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(ListDeploymentPlannersCmd.class.getName()); - private static final String s_name = "listdeploymentplannersresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -45,11 +44,6 @@ public class ListDeploymentPlannersCmd extends BaseListCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() { List planners = _mgr.listDeploymentPlanners(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/config/ListHypervisorCapabilitiesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/config/ListHypervisorCapabilitiesCmd.java index 6d3c2012af7..64f1c19b70c 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/config/ListHypervisorCapabilitiesCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/config/ListHypervisorCapabilitiesCmd.java @@ -41,7 +41,6 @@ import com.cloud.utils.Pair; public class ListHypervisorCapabilitiesCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(ListHypervisorCapabilitiesCmd.class.getName()); - private static final String s_name = "listhypervisorcapabilitiesresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -73,11 +72,6 @@ public class ListHypervisorCapabilitiesCmd extends BaseListCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() { Pair, Integer> hpvCapabilities = diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/config/ResetCfgCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/config/ResetCfgCmd.java index 28a69cebc1e..ada389e0093 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/config/ResetCfgCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/config/ResetCfgCmd.java @@ -42,7 +42,6 @@ import com.cloud.utils.Pair; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.16.0") public class ResetCfgCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(ResetCfgCmd.class.getName()); - private static final String s_name = "resetconfigurationresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -123,11 +122,6 @@ public class ResetCfgCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java index 0770f3c5a54..abe7e31cfa2 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java @@ -41,7 +41,6 @@ import com.cloud.user.Account; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class UpdateCfgCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(UpdateCfgCmd.class.getName()); - private static final String s_name = "updateconfigurationresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -134,11 +133,6 @@ public class UpdateCfgCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/config/UpdateHypervisorCapabilitiesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/config/UpdateHypervisorCapabilitiesCmd.java index 8eb844614f7..02cdf1a0717 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/config/UpdateHypervisorCapabilitiesCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/config/UpdateHypervisorCapabilitiesCmd.java @@ -37,7 +37,6 @@ import com.cloud.user.Account; responseHasSensitiveInfo = false) public class UpdateHypervisorCapabilitiesCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(UpdateHypervisorCapabilitiesCmd.class.getName()); - private static final String s_name = "updatehypervisorcapabilitiesresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -100,11 +99,6 @@ public class UpdateHypervisorCapabilitiesCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/diagnostics/GetDiagnosticsDataCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/diagnostics/GetDiagnosticsDataCmd.java index b414857908e..553ba6b1729 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/diagnostics/GetDiagnosticsDataCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/diagnostics/GetDiagnosticsDataCmd.java @@ -43,7 +43,7 @@ import com.cloud.user.Account; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.vm.VirtualMachine; -@APICommand(name = GetDiagnosticsDataCmd.APINAME, +@APICommand(name = "getDiagnosticsData", responseObject = GetDiagnosticsDataResponse.class, entityType = {VirtualMachine.class}, responseHasSensitiveInfo = false, @@ -52,7 +52,6 @@ import com.cloud.vm.VirtualMachine; since = "4.14.0.0", authorized = {RoleType.Admin}) public class GetDiagnosticsDataCmd extends BaseAsyncCmd { - public static final String APINAME = "getDiagnosticsData"; @Inject private DiagnosticsService diagnosticsService; @@ -90,11 +89,6 @@ public class GetDiagnosticsDataCmd extends BaseAsyncCmd { /////////////////// Implementation ////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { Account account = CallContext.current().getCallingAccount(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/diagnostics/RunDiagnosticsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/diagnostics/RunDiagnosticsCmd.java index f4e15d78643..3d3c7410dc5 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/diagnostics/RunDiagnosticsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/diagnostics/RunDiagnosticsCmd.java @@ -30,7 +30,6 @@ import org.apache.cloudstack.api.ApiCommandResourceType; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseAsyncCmd; -import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.RunDiagnosticsResponse; @@ -47,7 +46,7 @@ import com.cloud.exception.ResourceUnavailableException; import com.cloud.user.Account; import com.cloud.vm.VirtualMachine; -@APICommand(name = RunDiagnosticsCmd.APINAME, responseObject = RunDiagnosticsResponse.class, entityType = {VirtualMachine.class}, +@APICommand(name = "runDiagnostics", responseObject = RunDiagnosticsResponse.class, entityType = {VirtualMachine.class}, responseHasSensitiveInfo = false, requestHasSensitiveInfo = false, description = "Execute network-utility command (ping/arping/tracert) on system VMs remotely", @@ -55,7 +54,6 @@ import com.cloud.vm.VirtualMachine; since = "4.12.0.0") public class RunDiagnosticsCmd extends BaseAsyncCmd { private static final Logger LOGGER = Logger.getLogger(RunDiagnosticsCmd.class); - public static final String APINAME = "runDiagnostics"; @Inject private DiagnosticsService diagnosticsService; @@ -108,11 +106,6 @@ public class RunDiagnosticsCmd extends BaseAsyncCmd { ///////////////////////////////////////////////////// /////////////////// Implementation ////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { Account account = CallContext.current().getCallingAccount(); @@ -182,4 +175,4 @@ public class RunDiagnosticsCmd extends BaseAsyncCmd { throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage()); } } -} \ No newline at end of file +} diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/direct/download/ListTemplateDirectDownloadCertificatesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/direct/download/ListTemplateDirectDownloadCertificatesCmd.java index 21480c1ef53..53b29a37f8f 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/direct/download/ListTemplateDirectDownloadCertificatesCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/direct/download/ListTemplateDirectDownloadCertificatesCmd.java @@ -24,7 +24,6 @@ import com.cloud.exception.ResourceUnavailableException; import org.apache.cloudstack.acl.RoleType; import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; -import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.BaseListCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; @@ -42,7 +41,7 @@ import javax.inject.Inject; import java.util.ArrayList; import java.util.List; -@APICommand(name = ListTemplateDirectDownloadCertificatesCmd.APINAME, +@APICommand(name = "listTemplateDirectDownloadCertificates", description = "List the uploaded certificates for direct download templates", responseObject = DirectDownloadCertificateResponse.class, since = "4.17.0", @@ -65,7 +64,6 @@ public class ListTemplateDirectDownloadCertificatesCmd extends BaseListCmd { private Boolean listHosts; private static final Logger LOG = Logger.getLogger(ListTemplateDirectDownloadCertificatesCmd.class); - public static final String APINAME = "listTemplateDirectDownloadCertificates"; public boolean isListHosts() { return listHosts != null && listHosts; @@ -98,11 +96,6 @@ public class ListTemplateDirectDownloadCertificatesCmd extends BaseListCmd { createResponse(certificates); } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccount().getId(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/direct/download/ProvisionTemplateDirectDownloadCertificateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/direct/download/ProvisionTemplateDirectDownloadCertificateCmd.java index b7574b438d0..88f538547e1 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/direct/download/ProvisionTemplateDirectDownloadCertificateCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/direct/download/ProvisionTemplateDirectDownloadCertificateCmd.java @@ -38,14 +38,13 @@ import org.apache.cloudstack.direct.download.DirectDownloadManager; import javax.inject.Inject; -@APICommand(name = ProvisionTemplateDirectDownloadCertificateCmd.APINAME, +@APICommand(name = "provisionTemplateDirectDownloadCertificate", description = "Provisions a host with a direct download certificate", responseObject = DirectDownloadCertificateHostStatusResponse.class, since = "4.17.0", authorized = {RoleType.Admin}) public class ProvisionTemplateDirectDownloadCertificateCmd extends BaseCmd { - public static final String APINAME = "provisionTemplateDirectDownloadCertificate"; @Inject DirectDownloadManager directDownloadManager; @@ -66,11 +65,6 @@ public class ProvisionTemplateDirectDownloadCertificateCmd extends BaseCmd { setResponseObject(response); } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccount().getId(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/direct/download/RevokeTemplateDirectDownloadCertificateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/direct/download/RevokeTemplateDirectDownloadCertificateCmd.java index 507d73f134e..e44ebd31274 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/direct/download/RevokeTemplateDirectDownloadCertificateCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/direct/download/RevokeTemplateDirectDownloadCertificateCmd.java @@ -47,7 +47,7 @@ import javax.inject.Inject; import java.util.ArrayList; import java.util.List; -@APICommand(name = RevokeTemplateDirectDownloadCertificateCmd.APINAME, +@APICommand(name = "revokeTemplateDirectDownloadCertificate", description = "Revoke a direct download certificate from hosts in a zone", responseObject = DirectDownloadCertificateHostStatusResponse.class, since = "4.13", @@ -58,7 +58,6 @@ public class RevokeTemplateDirectDownloadCertificateCmd extends BaseCmd { DirectDownloadManager directDownloadManager; private static final Logger LOG = Logger.getLogger(RevokeTemplateDirectDownloadCertificateCmd.class); - public static final String APINAME = "revokeTemplateDirectDownloadCertificate"; @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = DirectDownloadCertificateResponse.class, @@ -120,13 +119,8 @@ public class RevokeTemplateDirectDownloadCertificateCmd extends BaseCmd { } } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccount().getId(); } -} \ No newline at end of file +} diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/direct/download/UploadTemplateDirectDownloadCertificateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/direct/download/UploadTemplateDirectDownloadCertificateCmd.java index e403f11baac..d41cf667907 100755 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/direct/download/UploadTemplateDirectDownloadCertificateCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/direct/download/UploadTemplateDirectDownloadCertificateCmd.java @@ -1,123 +1,117 @@ -// 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 org.apache.cloudstack.api.command.admin.direct.download; - -import com.cloud.utils.Pair; -import com.cloud.utils.exception.CloudRuntimeException; -import org.apache.cloudstack.acl.RoleType; -import org.apache.cloudstack.api.APICommand; -import org.apache.cloudstack.api.ApiConstants; -import org.apache.cloudstack.api.BaseCmd; -import org.apache.cloudstack.api.Parameter; -import org.apache.cloudstack.api.ServerApiException; -import org.apache.cloudstack.api.ApiErrorCode; -import org.apache.cloudstack.api.response.DirectDownloadCertificateResponse; -import org.apache.cloudstack.api.response.HostResponse; -import org.apache.cloudstack.api.response.DirectDownloadCertificateHostStatusResponse; -import org.apache.cloudstack.api.response.ZoneResponse; -import org.apache.cloudstack.context.CallContext; -import org.apache.cloudstack.direct.download.DirectDownloadCertificate; -import org.apache.cloudstack.direct.download.DirectDownloadManager; -import org.apache.cloudstack.direct.download.DirectDownloadManager.HostCertificateStatus; -import org.apache.log4j.Logger; - -import javax.inject.Inject; -import java.util.ArrayList; -import java.util.List; - -@APICommand(name = UploadTemplateDirectDownloadCertificateCmd.APINAME, - description = "Upload a certificate for HTTPS direct template download on KVM hosts", - responseObject = DirectDownloadCertificateResponse.class, - since = "4.11.0", - authorized = {RoleType.Admin}) -public class UploadTemplateDirectDownloadCertificateCmd extends BaseCmd { - - @Inject - DirectDownloadManager directDownloadManager; - - private static final Logger LOG = Logger.getLogger(UploadTemplateDirectDownloadCertificateCmd.class); - public static final String APINAME = "uploadTemplateDirectDownloadCertificate"; - - @Parameter(name = ApiConstants.CERTIFICATE, type = BaseCmd.CommandType.STRING, required = true, length = 65535, - description = "SSL certificate") - private String certificate; - - @Parameter(name = ApiConstants.NAME , type = BaseCmd.CommandType.STRING, required = true, - description = "Name for the uploaded certificate") - private String name; - - @Parameter(name = ApiConstants.HYPERVISOR, type = BaseCmd.CommandType.STRING, required = true, description = "Hypervisor type") - private String hypervisor; - - @Parameter(name = ApiConstants.ZONE_ID, type = CommandType.UUID, entityType = ZoneResponse.class, - description = "Zone to upload certificate", required = true) - private Long zoneId; - - @Parameter(name = ApiConstants.HOST_ID, type = CommandType.UUID, entityType = HostResponse.class, - description = "(optional) the host ID to upload certificate") - private Long hostId; - - private void createResponse(DirectDownloadCertificate certificate, final List hostStatusList) { - final List hostMapsResponse = new ArrayList<>(); - if (certificate == null) { - throw new CloudRuntimeException("Unable to upload certificate"); - } - DirectDownloadCertificateResponse response = _responseGenerator.createDirectDownloadCertificateResponse(certificate); - for (final HostCertificateStatus status : hostStatusList) { - if (status == null) { - continue; - } - DirectDownloadCertificateHostStatusResponse uploadResponse = - _responseGenerator.createDirectDownloadCertificateHostStatusResponse(status); - hostMapsResponse.add(uploadResponse); - } - response.setHostsMap(hostMapsResponse); - response.setResponseName(getCommandName()); - response.setObjectName("uploadtemplatedirectdownloadcertificate"); - setResponseObject(response); - } - - @Override - public void execute() { - if (!hypervisor.equalsIgnoreCase("kvm")) { - throw new ServerApiException(ApiErrorCode.PARAM_ERROR, "Currently supporting KVM hosts only"); - } - - try { - LOG.debug("Uploading certificate " + name + " to agents for Direct Download"); - Pair> uploadStatus = - directDownloadManager.uploadCertificateToHosts(certificate, name, hypervisor, zoneId, hostId); - DirectDownloadCertificate certificate = uploadStatus.first(); - List hostStatus = uploadStatus.second(); - createResponse(certificate, hostStatus); - } catch (Exception e) { - throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage()); - } - } - - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - - @Override - public long getEntityOwnerId() { - return CallContext.current().getCallingAccount().getId(); - } -} - - +// 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 org.apache.cloudstack.api.command.admin.direct.download; + +import com.cloud.utils.Pair; +import com.cloud.utils.exception.CloudRuntimeException; +import org.apache.cloudstack.acl.RoleType; +import org.apache.cloudstack.api.APICommand; +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.BaseCmd; +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.ServerApiException; +import org.apache.cloudstack.api.ApiErrorCode; +import org.apache.cloudstack.api.response.DirectDownloadCertificateResponse; +import org.apache.cloudstack.api.response.HostResponse; +import org.apache.cloudstack.api.response.DirectDownloadCertificateHostStatusResponse; +import org.apache.cloudstack.api.response.ZoneResponse; +import org.apache.cloudstack.context.CallContext; +import org.apache.cloudstack.direct.download.DirectDownloadCertificate; +import org.apache.cloudstack.direct.download.DirectDownloadManager; +import org.apache.cloudstack.direct.download.DirectDownloadManager.HostCertificateStatus; +import org.apache.log4j.Logger; + +import javax.inject.Inject; +import java.util.ArrayList; +import java.util.List; + +@APICommand(name = "uploadTemplateDirectDownloadCertificate", + description = "Upload a certificate for HTTPS direct template download on KVM hosts", + responseObject = DirectDownloadCertificateResponse.class, + since = "4.11.0", + authorized = {RoleType.Admin}) +public class UploadTemplateDirectDownloadCertificateCmd extends BaseCmd { + + @Inject + DirectDownloadManager directDownloadManager; + + private static final Logger LOG = Logger.getLogger(UploadTemplateDirectDownloadCertificateCmd.class); + + @Parameter(name = ApiConstants.CERTIFICATE, type = BaseCmd.CommandType.STRING, required = true, length = 65535, + description = "SSL certificate") + private String certificate; + + @Parameter(name = ApiConstants.NAME , type = BaseCmd.CommandType.STRING, required = true, + description = "Name for the uploaded certificate") + private String name; + + @Parameter(name = ApiConstants.HYPERVISOR, type = BaseCmd.CommandType.STRING, required = true, description = "Hypervisor type") + private String hypervisor; + + @Parameter(name = ApiConstants.ZONE_ID, type = CommandType.UUID, entityType = ZoneResponse.class, + description = "Zone to upload certificate", required = true) + private Long zoneId; + + @Parameter(name = ApiConstants.HOST_ID, type = CommandType.UUID, entityType = HostResponse.class, + description = "(optional) the host ID to upload certificate") + private Long hostId; + + private void createResponse(DirectDownloadCertificate certificate, final List hostStatusList) { + final List hostMapsResponse = new ArrayList<>(); + if (certificate == null) { + throw new CloudRuntimeException("Unable to upload certificate"); + } + DirectDownloadCertificateResponse response = _responseGenerator.createDirectDownloadCertificateResponse(certificate); + for (final HostCertificateStatus status : hostStatusList) { + if (status == null) { + continue; + } + DirectDownloadCertificateHostStatusResponse uploadResponse = + _responseGenerator.createDirectDownloadCertificateHostStatusResponse(status); + hostMapsResponse.add(uploadResponse); + } + response.setHostsMap(hostMapsResponse); + response.setResponseName(getCommandName()); + response.setObjectName("uploadtemplatedirectdownloadcertificate"); + setResponseObject(response); + } + + @Override + public void execute() { + if (!hypervisor.equalsIgnoreCase("kvm")) { + throw new ServerApiException(ApiErrorCode.PARAM_ERROR, "Currently supporting KVM hosts only"); + } + + try { + LOG.debug("Uploading certificate " + name + " to agents for Direct Download"); + Pair> uploadStatus = + directDownloadManager.uploadCertificateToHosts(certificate, name, hypervisor, zoneId, hostId); + DirectDownloadCertificate certificate = uploadStatus.first(); + List hostStatus = uploadStatus.second(); + createResponse(certificate, hostStatus); + } catch (Exception e) { + throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage()); + } + } + + @Override + public long getEntityOwnerId() { + return CallContext.current().getCallingAccount().getId(); + } +} + + diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/domain/CreateDomainCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/domain/CreateDomainCmd.java index 149ddab6ffa..f6e09695f88 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/domain/CreateDomainCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/domain/CreateDomainCmd.java @@ -37,7 +37,6 @@ import com.cloud.user.Account; public class CreateDomainCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(CreateDomainCmd.class.getName()); - private static final String s_name = "createdomainresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -82,11 +81,6 @@ public class CreateDomainCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/domain/DeleteDomainCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/domain/DeleteDomainCmd.java index 4302089dbc3..e0783b63098 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/domain/DeleteDomainCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/domain/DeleteDomainCmd.java @@ -41,7 +41,6 @@ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, authorized = RoleType.Admin, RoleType.DomainAdmin }) public class DeleteDomainCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DeleteDomainCmd.class.getName()); - private static final String s_name = "deletedomainresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -74,11 +73,6 @@ public class DeleteDomainCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { Domain domain = _entityMgr.findById(Domain.class, getId()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/domain/ListDomainChildrenCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/domain/ListDomainChildrenCmd.java index fb6c5be56ac..72614627f31 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/domain/ListDomainChildrenCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/domain/ListDomainChildrenCmd.java @@ -39,7 +39,6 @@ import com.cloud.utils.Pair; public class ListDomainChildrenCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(ListDomainChildrenCmd.class.getName()); - private static final String s_name = "listdomainchildrenresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -93,11 +92,6 @@ public class ListDomainChildrenCmd extends BaseListCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() { Pair, Integer> result = _domainService.searchForDomainChildren(this); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/domain/UpdateDomainCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/domain/UpdateDomainCmd.java index 76cc3292c9f..db4030da772 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/domain/UpdateDomainCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/domain/UpdateDomainCmd.java @@ -38,7 +38,6 @@ import com.cloud.user.Account; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class UpdateDomainCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(UpdateDomainCmd.class.getName()); - private static final String s_name = "updatedomainresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -78,11 +77,6 @@ public class UpdateDomainCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/AddGuestOsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/AddGuestOsCmd.java index 891ecb6d47b..3adc711f35f 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/AddGuestOsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/AddGuestOsCmd.java @@ -43,7 +43,6 @@ import java.util.Map; public class AddGuestOsCmd extends BaseAsyncCreateCmd { public static final Logger s_logger = Logger.getLogger(AddGuestOsCmd.class.getName()); - private static final String s_name = "addguestosresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -98,11 +97,6 @@ public class AddGuestOsCmd extends BaseAsyncCreateCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/AddGuestOsMappingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/AddGuestOsMappingCmd.java index 79e82d6f5d4..6d9ac5286c8 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/AddGuestOsMappingCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/AddGuestOsMappingCmd.java @@ -37,7 +37,6 @@ import com.cloud.user.Account; public class AddGuestOsMappingCmd extends BaseAsyncCreateCmd { public static final Logger s_logger = Logger.getLogger(AddGuestOsMappingCmd.class.getName()); - private static final String s_name = "addguestosmappingresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -86,11 +85,6 @@ public class AddGuestOsMappingCmd extends BaseAsyncCreateCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/ListGuestOsMappingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/ListGuestOsMappingCmd.java index a7fc9e0decd..70c039fef7d 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/ListGuestOsMappingCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/ListGuestOsMappingCmd.java @@ -37,7 +37,6 @@ import com.cloud.utils.Pair; public class ListGuestOsMappingCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(ListGuestOsMappingCmd.class.getName()); - private static final String s_name = "listguestosmappingresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -79,11 +78,6 @@ public class ListGuestOsMappingCmd extends BaseListCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() { Pair, Integer> result = _mgr.listGuestOSMappingByCriteria(this); @@ -98,4 +92,4 @@ public class ListGuestOsMappingCmd extends BaseListCmd { response.setResponseName(getCommandName()); setResponseObject(response); } -} \ No newline at end of file +} diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/RemoveGuestOsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/RemoveGuestOsCmd.java index fc8c9e641a2..14beb83e073 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/RemoveGuestOsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/RemoveGuestOsCmd.java @@ -37,7 +37,6 @@ import com.cloud.user.Account; public class RemoveGuestOsCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(RemoveGuestOsCmd.class.getName()); - private static final String s_name = "removeguestosresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -58,11 +57,6 @@ public class RemoveGuestOsCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/RemoveGuestOsMappingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/RemoveGuestOsMappingCmd.java index 690bc9f94b7..0a72b7e0451 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/RemoveGuestOsMappingCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/RemoveGuestOsMappingCmd.java @@ -37,7 +37,6 @@ import com.cloud.user.Account; public class RemoveGuestOsMappingCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(RemoveGuestOsMappingCmd.class.getName()); - private static final String s_name = "removeguestosmappingresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -58,11 +57,6 @@ public class RemoveGuestOsMappingCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/UpdateGuestOsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/UpdateGuestOsCmd.java index d67ffc66e95..1168bf00ffc 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/UpdateGuestOsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/UpdateGuestOsCmd.java @@ -42,7 +42,6 @@ public class UpdateGuestOsCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(UpdateGuestOsCmd.class.getName()); - private static final String s_name = "updateguestosresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -89,11 +88,6 @@ public class UpdateGuestOsCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/UpdateGuestOsMappingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/UpdateGuestOsMappingCmd.java index 2683a21dfcf..679ec35c049 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/UpdateGuestOsMappingCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/UpdateGuestOsMappingCmd.java @@ -36,7 +36,6 @@ import com.cloud.user.Account; public class UpdateGuestOsMappingCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(UpdateGuestOsMappingCmd.class.getName()); - private static final String s_name = "updateguestosmappingresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -74,11 +73,6 @@ public class UpdateGuestOsMappingCmd extends BaseAsyncCmd { } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/ConfigureHAForHostCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/ConfigureHAForHostCmd.java index 2fe76420781..12033c04b80 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/ConfigureHAForHostCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/ConfigureHAForHostCmd.java @@ -31,7 +31,6 @@ import org.apache.cloudstack.api.ApiArgValidator; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseAsyncCmd; -import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.HostHAResponse; @@ -42,12 +41,11 @@ import org.apache.cloudstack.ha.HAResource; import javax.inject.Inject; -@APICommand(name = ConfigureHAForHostCmd.APINAME, description = "Configures HA for a host", +@APICommand(name = "configureHAForHost", description = "Configures HA for a host", responseObject = HostHAResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.11", authorized = {RoleType.Admin}) public final class ConfigureHAForHostCmd extends BaseAsyncCmd { - public static final String APINAME = "configureHAForHost"; @Inject private HAConfigManager haConfigManager; @@ -80,11 +78,6 @@ public final class ConfigureHAForHostCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/DisableHAForClusterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/DisableHAForClusterCmd.java index 053c978b831..d570746765b 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/DisableHAForClusterCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/DisableHAForClusterCmd.java @@ -40,12 +40,11 @@ import org.apache.cloudstack.ha.HAConfigManager; import javax.inject.Inject; -@APICommand(name = DisableHAForClusterCmd.APINAME, description = "Disables HA cluster-wide", +@APICommand(name = "disableHAForCluster", description = "Disables HA cluster-wide", responseObject = SuccessResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.11", authorized = {RoleType.Admin}) public final class DisableHAForClusterCmd extends BaseAsyncCmd { - public static final String APINAME = "disableHAForCluster"; @Inject private HAConfigManager haConfigManager; @@ -70,11 +69,6 @@ public final class DisableHAForClusterCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccountId(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/DisableHAForHostCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/DisableHAForHostCmd.java index 87ebe878ceb..5a8b1f1954f 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/DisableHAForHostCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/DisableHAForHostCmd.java @@ -30,7 +30,6 @@ import org.apache.cloudstack.api.ApiArgValidator; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseAsyncCmd; -import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.HostHAResponse; @@ -41,12 +40,11 @@ import org.apache.cloudstack.ha.HAResource; import javax.inject.Inject; -@APICommand(name = DisableHAForHostCmd.APINAME, description = "Disables HA for a host", +@APICommand(name = "disableHAForHost", description = "Disables HA for a host", responseObject = HostHAResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.11", authorized = {RoleType.Admin}) public final class DisableHAForHostCmd extends BaseAsyncCmd { - public static final String APINAME = "disableHAForHost"; @Inject private HAConfigManager haConfigManager; @@ -71,11 +69,6 @@ public final class DisableHAForHostCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccountId(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/DisableHAForZoneCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/DisableHAForZoneCmd.java index 845c4a663b5..fbd57fa82a1 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/DisableHAForZoneCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/DisableHAForZoneCmd.java @@ -40,12 +40,11 @@ import org.apache.cloudstack.ha.HAConfigManager; import javax.inject.Inject; -@APICommand(name = DisableHAForZoneCmd.APINAME, description = "Disables HA for a zone", +@APICommand(name = "disableHAForZone", description = "Disables HA for a zone", responseObject = SuccessResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.11", authorized = {RoleType.Admin}) public final class DisableHAForZoneCmd extends BaseAsyncCmd { - public static final String APINAME = "disableHAForZone"; @Inject private HAConfigManager haConfigManager; @@ -70,11 +69,6 @@ public final class DisableHAForZoneCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccountId(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/EnableHAForClusterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/EnableHAForClusterCmd.java index e06d0d2c1b0..7e627939ca5 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/EnableHAForClusterCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/EnableHAForClusterCmd.java @@ -40,12 +40,11 @@ import org.apache.cloudstack.ha.HAConfigManager; import javax.inject.Inject; -@APICommand(name = EnableHAForClusterCmd.APINAME, description = "Enables HA cluster-wide", +@APICommand(name = "enableHAForCluster", description = "Enables HA cluster-wide", responseObject = SuccessResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.11", authorized = {RoleType.Admin}) public final class EnableHAForClusterCmd extends BaseAsyncCmd { - public static final String APINAME = "enableHAForCluster"; @Inject private HAConfigManager haConfigManager; @@ -70,11 +69,6 @@ public final class EnableHAForClusterCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccountId(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/EnableHAForHostCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/EnableHAForHostCmd.java index b23841ad56f..aac3d350519 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/EnableHAForHostCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/EnableHAForHostCmd.java @@ -30,7 +30,6 @@ import org.apache.cloudstack.api.ApiArgValidator; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseAsyncCmd; -import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.HostHAResponse; @@ -41,12 +40,11 @@ import org.apache.cloudstack.ha.HAResource; import javax.inject.Inject; -@APICommand(name = EnableHAForHostCmd.APINAME, description = "Enables HA for a host", +@APICommand(name = "enableHAForHost", description = "Enables HA for a host", responseObject = HostHAResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.11", authorized = {RoleType.Admin}) public final class EnableHAForHostCmd extends BaseAsyncCmd { - public static final String APINAME = "enableHAForHost"; @Inject private HAConfigManager haConfigManager; @@ -71,11 +69,6 @@ public final class EnableHAForHostCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccountId(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/EnableHAForZoneCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/EnableHAForZoneCmd.java index 443d303c296..f9b1560bd8a 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/EnableHAForZoneCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/EnableHAForZoneCmd.java @@ -40,12 +40,11 @@ import org.apache.cloudstack.ha.HAConfigManager; import javax.inject.Inject; -@APICommand(name = EnableHAForZoneCmd.APINAME, description = "Enables HA for a zone", +@APICommand(name = "enableHAForZone", description = "Enables HA for a zone", responseObject = SuccessResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.11", authorized = {RoleType.Admin}) public final class EnableHAForZoneCmd extends BaseAsyncCmd { - public static final String APINAME = "enableHAForZone"; @Inject private HAConfigManager haConfigManager; @@ -70,11 +69,6 @@ public final class EnableHAForZoneCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccountId(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/ListHostHAProvidersCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/ListHostHAProvidersCmd.java index 58f227cca13..808e0b4e801 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/ListHostHAProvidersCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/ListHostHAProvidersCmd.java @@ -42,11 +42,10 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -@APICommand(name = ListHostHAProvidersCmd.APINAME, description = "Lists HA providers", responseObject = HostHAResponse.class, +@APICommand(name = "listHostHAProviders", description = "Lists HA providers", responseObject = HostHAResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.11", authorized = {RoleType.Admin}) public final class ListHostHAProvidersCmd extends BaseCmd { - public static final String APINAME = "listHostHAProviders"; @Inject private HAConfigManager haConfigManager; @@ -71,11 +70,6 @@ public final class ListHostHAProvidersCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/ListHostHAResourcesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/ListHostHAResourcesCmd.java index 75a900c2198..c610a605277 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/ListHostHAResourcesCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/ListHostHAResourcesCmd.java @@ -42,11 +42,10 @@ import javax.inject.Inject; import java.util.ArrayList; import java.util.List; -@APICommand(name = ListHostHAResourcesCmd.APINAME, description = "Lists host HA resources", responseObject = HostHAResponse.class, +@APICommand(name = "listHostHAResources", description = "Lists host HA resources", responseObject = HostHAResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.11", authorized = {RoleType.Admin}) public final class ListHostHAResourcesCmd extends BaseCmd { - public static final String APINAME = "listHostHAResources"; @Inject private HAConfigManager haConfigManager; @@ -71,11 +70,6 @@ public final class ListHostHAResourcesCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/AddHostCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/AddHostCmd.java index b58aaf345ae..15955b9f0a8 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/AddHostCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/AddHostCmd.java @@ -42,7 +42,6 @@ import com.cloud.user.Account; public class AddHostCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(AddHostCmd.class.getName()); - private static final String s_name = "addhostresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -126,11 +125,6 @@ public class AddHostCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/AddSecondaryStorageCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/AddSecondaryStorageCmd.java index 9108d600419..225eb1dfecd 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/AddSecondaryStorageCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/AddSecondaryStorageCmd.java @@ -35,7 +35,6 @@ import com.cloud.user.Account; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class AddSecondaryStorageCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(AddSecondaryStorageCmd.class.getName()); - private static final String s_name = "addsecondarystorageresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -63,11 +62,6 @@ public class AddSecondaryStorageCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/CancelHostAsDegradedCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/CancelHostAsDegradedCmd.java index 9d6a575bc62..4e9d997b3b7 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/CancelHostAsDegradedCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/CancelHostAsDegradedCmd.java @@ -62,11 +62,6 @@ public class CancelHostAsDegradedCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return COMMAND_RESPONSE_NAME; - } - public static String getResultObjectName() { return "host"; } diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/CancelMaintenanceCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/CancelMaintenanceCmd.java index a584c057595..cca449f570b 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/CancelMaintenanceCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/CancelMaintenanceCmd.java @@ -37,7 +37,6 @@ import com.cloud.user.Account; public class CancelMaintenanceCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(CancelMaintenanceCmd.class.getName()); - private static final String s_name = "cancelhostmaintenanceresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -58,11 +57,6 @@ public class CancelMaintenanceCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - public static String getResultObjectName() { return "host"; } diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/DeclareHostAsDegradedCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/DeclareHostAsDegradedCmd.java index c6188eadb8d..6bb8f382e54 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/DeclareHostAsDegradedCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/DeclareHostAsDegradedCmd.java @@ -62,11 +62,6 @@ public class DeclareHostAsDegradedCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return COMMAND_RESPONSE_NAME; - } - public static String getResultObjectName() { return "host"; } diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/DeleteHostCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/DeleteHostCmd.java index b9945281296..609d189b0ca 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/DeleteHostCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/DeleteHostCmd.java @@ -34,7 +34,6 @@ import com.cloud.user.Account; public class DeleteHostCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(DeleteHostCmd.class.getName()); - private static final String s_name = "deletehostresponse"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// @@ -73,11 +72,6 @@ public class DeleteHostCmd extends BaseCmd { // ///////////// API Implementation/////////////////// // /////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/FindHostsForMigrationCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/FindHostsForMigrationCmd.java index ad9b6af3436..2b6ccb68eea 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/FindHostsForMigrationCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/FindHostsForMigrationCmd.java @@ -39,7 +39,6 @@ import com.cloud.utils.Ternary; public class FindHostsForMigrationCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(FindHostsForMigrationCmd.class.getName()); - private static final String s_name = "findhostsformigrationresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -64,11 +63,6 @@ public class FindHostsForMigrationCmd extends BaseListCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() { ListResponse response = null; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/ListHostTagsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/ListHostTagsCmd.java index 7adb3a14d19..ed4f9a09bc5 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/ListHostTagsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/ListHostTagsCmd.java @@ -29,7 +29,6 @@ import org.apache.cloudstack.api.response.HostTagResponse; public class ListHostTagsCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(ListHostTagsCmd.class.getName()); - private static final String s_name = "listhosttagsresponse"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// @@ -43,11 +42,6 @@ public class ListHostTagsCmd extends BaseListCmd { // ///////////// API Implementation/////////////////// // /////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public ApiCommandResourceType getApiResourceType() { return ApiCommandResourceType.Host; @@ -61,4 +55,4 @@ public class ListHostTagsCmd extends BaseListCmd { setResponseObject(response); } -} \ No newline at end of file +} diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java index 1ec8f6bf5dc..75fe339b710 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java @@ -47,7 +47,6 @@ import com.cloud.utils.Ternary; public class ListHostsCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(ListHostsCmd.class.getName()); - private static final String s_name = "listhostsresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -192,11 +191,6 @@ public class ListHostsCmd extends BaseListCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public ApiCommandResourceType getApiResourceType() { return ApiCommandResourceType.Host; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/PrepareForMaintenanceCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/PrepareForMaintenanceCmd.java index fc228225c2e..a89965e822e 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/PrepareForMaintenanceCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/PrepareForMaintenanceCmd.java @@ -37,7 +37,6 @@ import com.cloud.utils.exception.CloudRuntimeException; public class PrepareForMaintenanceCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(PrepareForMaintenanceCmd.class.getName()); - private static final String s_name = "preparehostformaintenanceresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -58,11 +57,6 @@ public class PrepareForMaintenanceCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - public static String getResultObjectName() { return "host"; } diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/ReconnectHostCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/ReconnectHostCmd.java index 82625280270..7439d9da514 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/ReconnectHostCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/ReconnectHostCmd.java @@ -38,7 +38,6 @@ import com.cloud.utils.exception.CloudRuntimeException; public class ReconnectHostCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(ReconnectHostCmd.class.getName()); - private static final String s_name = "reconnecthostresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -59,11 +58,6 @@ public class ReconnectHostCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - public static String getResultObjectName() { return "host"; } diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/ReleaseHostReservationCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/ReleaseHostReservationCmd.java index c0d339e86b7..90c388bc7dc 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/ReleaseHostReservationCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/ReleaseHostReservationCmd.java @@ -37,7 +37,6 @@ import com.cloud.user.Account; public class ReleaseHostReservationCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(ReleaseHostReservationCmd.class.getName()); - private static final String s_name = "releasehostreservationresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -58,11 +57,6 @@ public class ReleaseHostReservationCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { Account account = CallContext.current().getCallingAccount(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java index 40f19388934..5ca53c07740 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java @@ -36,7 +36,6 @@ import java.util.List; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class UpdateHostCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(UpdateHostCmd.class.getName()); - private static final String s_name = "updatehostresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -104,11 +103,6 @@ public class UpdateHostCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - public static String getResultObjectName() { return "updatehost"; } diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/UpdateHostPasswordCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/UpdateHostPasswordCmd.java index 5a884cf72ab..f94d23c4b0b 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/UpdateHostPasswordCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/UpdateHostPasswordCmd.java @@ -32,7 +32,6 @@ requestHasSensitiveInfo = true, responseHasSensitiveInfo = false) public class UpdateHostPasswordCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(UpdateHostPasswordCmd.class.getName()); - private static final String s_name = "updatehostpasswordresponse"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// @@ -82,11 +81,6 @@ public class UpdateHostPasswordCmd extends BaseCmd { // ///////////// API Implementation/////////////////// // /////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/internallb/ConfigureInternalLoadBalancerElementCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/internallb/ConfigureInternalLoadBalancerElementCmd.java index 7e39749ff17..1c7e4a0ce21 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/internallb/ConfigureInternalLoadBalancerElementCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/internallb/ConfigureInternalLoadBalancerElementCmd.java @@ -48,7 +48,6 @@ import com.cloud.user.Account; responseHasSensitiveInfo = false) public class ConfigureInternalLoadBalancerElementCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(ConfigureInternalLoadBalancerElementCmd.class.getName()); - private static final String s_name = "configureinternalloadbalancerelementresponse"; @Inject private List _service; @@ -83,11 +82,6 @@ public class ConfigureInternalLoadBalancerElementCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/internallb/CreateInternalLoadBalancerElementCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/internallb/CreateInternalLoadBalancerElementCmd.java index b9c61f3bf90..f11f081031a 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/internallb/CreateInternalLoadBalancerElementCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/internallb/CreateInternalLoadBalancerElementCmd.java @@ -46,7 +46,6 @@ import com.cloud.user.Account; responseHasSensitiveInfo = false) public class CreateInternalLoadBalancerElementCmd extends BaseAsyncCreateCmd { public static final Logger s_logger = Logger.getLogger(CreateInternalLoadBalancerElementCmd.class.getName()); - private static final String s_name = "createinternalloadbalancerelementresponse"; @Inject private List _service; @@ -78,11 +77,6 @@ public class CreateInternalLoadBalancerElementCmd extends BaseAsyncCreateCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/internallb/ListInternalLoadBalancerElementsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/internallb/ListInternalLoadBalancerElementsCmd.java index 8f62b419691..82d373e3119 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/internallb/ListInternalLoadBalancerElementsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/internallb/ListInternalLoadBalancerElementsCmd.java @@ -47,7 +47,6 @@ import com.cloud.network.VirtualRouterProvider; responseHasSensitiveInfo = false) public class ListInternalLoadBalancerElementsCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(ListInternalLoadBalancerElementsCmd.class.getName()); - private static final String s_name = "listinternalloadbalancerelementsresponse"; @Inject private InternalLoadBalancerElementService _service; @@ -86,11 +85,6 @@ public class ListInternalLoadBalancerElementsCmd extends BaseListCmd { return enabled; } - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/management/ListMgmtsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/management/ListMgmtsCmd.java index 4e2ae10da54..3af772d332f 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/management/ListMgmtsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/management/ListMgmtsCmd.java @@ -19,19 +19,17 @@ package org.apache.cloudstack.api.command.admin.management; import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandResourceType; import org.apache.cloudstack.api.ApiConstants; -import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.BaseListCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.ManagementServerResponse; import org.apache.log4j.Logger; -@APICommand(name = ListMgmtsCmd.APINAME, description = "Lists management servers.", responseObject = ManagementServerResponse.class, +@APICommand(name = "listManagementServers", description = "Lists management servers.", responseObject = ManagementServerResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class ListMgmtsCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(ListMgmtsCmd.class.getName()); - public static final String APINAME = "listManagementServers"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -59,11 +57,6 @@ public class ListMgmtsCmd extends BaseListCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public ApiCommandResourceType getApiResourceType() { return ApiCommandResourceType.Host; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/AddNetworkDeviceCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/AddNetworkDeviceCmd.java index 68c43c449e2..be0cd9f2fa7 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/AddNetworkDeviceCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/AddNetworkDeviceCmd.java @@ -45,7 +45,6 @@ import com.cloud.utils.exception.CloudRuntimeException; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class AddNetworkDeviceCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(AddNetworkDeviceCmd.class); - private static final String s_name = "addnetworkdeviceresponse"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// @@ -86,11 +85,6 @@ public class AddNetworkDeviceCmd extends BaseCmd { } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { // TODO Auto-generated method stub diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/AddNetworkServiceProviderCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/AddNetworkServiceProviderCmd.java index 756c35fc233..176375ce181 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/AddNetworkServiceProviderCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/AddNetworkServiceProviderCmd.java @@ -45,7 +45,6 @@ import com.cloud.user.Account; public class AddNetworkServiceProviderCmd extends BaseAsyncCreateCmd { public static final Logger s_logger = Logger.getLogger(AddNetworkServiceProviderCmd.class.getName()); - private static final String s_name = "addnetworkserviceproviderresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -97,11 +96,6 @@ public class AddNetworkServiceProviderCmd extends BaseAsyncCreateCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateGuestNetworkIpv6PrefixCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateGuestNetworkIpv6PrefixCmd.java index 4f69be1b417..d7c7bec99f9 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateGuestNetworkIpv6PrefixCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateGuestNetworkIpv6PrefixCmd.java @@ -37,7 +37,7 @@ import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.user.Account; -@APICommand(name = CreateGuestNetworkIpv6PrefixCmd.APINAME, +@APICommand(name = "createGuestNetworkIpv6Prefix", description = "Creates a guest network IPv6 prefix.", responseObject = DataCenterGuestIpv6PrefixResponse.class, since = "4.17.0.0", @@ -47,7 +47,6 @@ import com.cloud.user.Account; public class CreateGuestNetworkIpv6PrefixCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(CreateGuestNetworkIpv6PrefixCmd.class); - public static final String APINAME = "createGuestNetworkIpv6Prefix"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -102,11 +101,6 @@ public class CreateGuestNetworkIpv6PrefixCmd extends BaseAsyncCmd { } } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseAsyncCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateManagementNetworkIpRangeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateManagementNetworkIpRangeCmd.java index d7aa7484cff..2bab4f05352 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateManagementNetworkIpRangeCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateManagementNetworkIpRangeCmd.java @@ -36,7 +36,7 @@ import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.user.Account; -@APICommand(name = CreateManagementNetworkIpRangeCmd.APINAME, +@APICommand(name = "createManagementNetworkIpRange", description = "Creates a Management network IP range.", responseObject = PodResponse.class, since = "4.11.0.0", @@ -46,7 +46,6 @@ import com.cloud.user.Account; public class CreateManagementNetworkIpRangeCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(CreateManagementNetworkIpRangeCmd.class); - public static final String APINAME = "createManagementNetworkIpRange"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -150,11 +149,6 @@ public class CreateManagementNetworkIpRangeCmd extends BaseAsyncCmd { } } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseAsyncCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java index eb8e9c6ec8e..1126edd1d44 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java @@ -50,7 +50,6 @@ import com.cloud.user.Account; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class CreateNetworkOfferingCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(CreateNetworkOfferingCmd.class.getName()); - private static final String s_name = "createnetworkofferingresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -201,10 +200,6 @@ public class CreateNetworkOfferingCmd extends BaseCmd { return networkRate; } - public static String getName() { - return s_name; - } - public Long getServiceOfferingId() { return serviceOfferingId; } @@ -362,11 +357,6 @@ public class CreateNetworkOfferingCmd extends BaseCmd { ///////////////////////////////////////////////////// /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreatePhysicalNetworkCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreatePhysicalNetworkCmd.java index 9819cde6b4e..294ee047fe6 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreatePhysicalNetworkCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreatePhysicalNetworkCmd.java @@ -42,7 +42,6 @@ import com.cloud.user.Account; public class CreatePhysicalNetworkCmd extends BaseAsyncCreateCmd { public static final Logger s_logger = Logger.getLogger(CreatePhysicalNetworkCmd.class.getName()); - private static final String s_name = "createphysicalnetworkresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -120,11 +119,6 @@ public class CreatePhysicalNetworkCmd extends BaseAsyncCreateCmd { return networkName; } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateStorageNetworkIpRangeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateStorageNetworkIpRangeCmd.java index 6d3e9f0549b..d2dc3d8688f 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateStorageNetworkIpRangeCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateStorageNetworkIpRangeCmd.java @@ -44,7 +44,6 @@ import com.cloud.user.Account; public class CreateStorageNetworkIpRangeCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(CreateStorageNetworkIpRangeCmd.class); - private static final String s_name = "createstoragenetworkiprangeresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -125,11 +124,6 @@ public class CreateStorageNetworkIpRangeCmd extends BaseAsyncCmd { } } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DedicateGuestVlanRangeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DedicateGuestVlanRangeCmd.java index e8fc7b383b9..e6a289d096b 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DedicateGuestVlanRangeCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DedicateGuestVlanRangeCmd.java @@ -41,7 +41,6 @@ import com.cloud.user.Account; public class DedicateGuestVlanRangeCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(DedicateGuestVlanRangeCmd.class.getName()); - private static final String s_name = "dedicateguestvlanrangeresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -94,11 +93,6 @@ public class DedicateGuestVlanRangeCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteGuestNetworkIpv6PrefixCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteGuestNetworkIpv6PrefixCmd.java index 830aeac8dae..67d309456d6 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteGuestNetworkIpv6PrefixCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteGuestNetworkIpv6PrefixCmd.java @@ -37,7 +37,7 @@ import com.cloud.exception.ResourceUnavailableException; import com.cloud.user.Account; import com.cloud.utils.exception.CloudRuntimeException; -@APICommand(name = DeleteGuestNetworkIpv6PrefixCmd.APINAME, +@APICommand(name = "deleteGuestNetworkIpv6Prefix", description = "Deletes an existing guest network IPv6 prefix.", responseObject = SuccessResponse.class, since = "4.17.0.0", @@ -46,7 +46,6 @@ import com.cloud.utils.exception.CloudRuntimeException; authorized = {RoleType.Admin}) public class DeleteGuestNetworkIpv6PrefixCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DeleteGuestNetworkIpv6PrefixCmd.class); - public static final String APINAME = "deleteGuestNetworkIpv6Prefix"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -89,11 +88,6 @@ public class DeleteGuestNetworkIpv6PrefixCmd extends BaseAsyncCmd { } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteManagementNetworkIpRangeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteManagementNetworkIpRangeCmd.java index ae7a0f70473..abb72eb2724 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteManagementNetworkIpRangeCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteManagementNetworkIpRangeCmd.java @@ -34,7 +34,7 @@ import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.user.Account; -@APICommand(name = DeleteManagementNetworkIpRangeCmd.APINAME, +@APICommand(name = "deleteManagementNetworkIpRange", description = "Deletes a management network IP range. This action is only allowed when no IPs in this range are allocated.", responseObject = SuccessResponse.class, since = "4.11.0.0", @@ -44,7 +44,6 @@ import com.cloud.user.Account; public class DeleteManagementNetworkIpRangeCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DeleteManagementNetworkIpRangeCmd.class); - public static final String APINAME = "deleteManagementNetworkIpRange"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -124,14 +123,9 @@ public class DeleteManagementNetworkIpRangeCmd extends BaseAsyncCmd { } } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseAsyncCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; } -} \ No newline at end of file +} diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteNetworkDeviceCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteNetworkDeviceCmd.java index abd9c11e7f0..d7e8744d6b7 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteNetworkDeviceCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteNetworkDeviceCmd.java @@ -41,7 +41,6 @@ import com.cloud.utils.exception.CloudRuntimeException; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class DeleteNetworkDeviceCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(DeleteNetworkDeviceCmd.class); - private static final String s_name = "deletenetworkdeviceresponse"; @Inject ExternalNetworkDeviceManager nwDeviceMgr; @@ -77,11 +76,6 @@ public class DeleteNetworkDeviceCmd extends BaseCmd { } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { // TODO Auto-generated method stub diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteNetworkOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteNetworkOfferingCmd.java index 62de3dd1752..80ce48cc7d9 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteNetworkOfferingCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteNetworkOfferingCmd.java @@ -33,7 +33,6 @@ import com.cloud.user.Account; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class DeleteNetworkOfferingCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(DeleteNetworkOfferingCmd.class.getName()); - private static final String s_name = "deletenetworkofferingresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -58,11 +57,6 @@ public class DeleteNetworkOfferingCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteNetworkServiceProviderCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteNetworkServiceProviderCmd.java index fc752e8f881..1ccfff5d7ba 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteNetworkServiceProviderCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteNetworkServiceProviderCmd.java @@ -38,7 +38,6 @@ import com.cloud.user.Account; public class DeleteNetworkServiceProviderCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DeleteNetworkServiceProviderCmd.class.getName()); - private static final String s_name = "deletenetworkserviceproviderresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -63,11 +62,6 @@ public class DeleteNetworkServiceProviderCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeletePhysicalNetworkCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeletePhysicalNetworkCmd.java index 06619aecc36..79f0685c6c6 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeletePhysicalNetworkCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeletePhysicalNetworkCmd.java @@ -37,7 +37,6 @@ import com.cloud.user.Account; public class DeletePhysicalNetworkCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DeletePhysicalNetworkCmd.class.getName()); - private static final String s_name = "deletephysicalnetworkresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -61,11 +60,6 @@ public class DeletePhysicalNetworkCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteStorageNetworkIpRangeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteStorageNetworkIpRangeCmd.java index c4317278af6..b5de43dc5e2 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteStorageNetworkIpRangeCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteStorageNetworkIpRangeCmd.java @@ -39,7 +39,6 @@ import com.cloud.user.Account; public class DeleteStorageNetworkIpRangeCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DeleteStorageNetworkIpRangeCmd.class); - private static final String s_name = "deletestoragenetworkiprangeresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -83,11 +82,6 @@ public class DeleteStorageNetworkIpRangeCmd extends BaseAsyncCmd { } } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListDedicatedGuestVlanRangesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListDedicatedGuestVlanRangesCmd.java index 617a07b5c8c..67324d81927 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListDedicatedGuestVlanRangesCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListDedicatedGuestVlanRangesCmd.java @@ -41,7 +41,6 @@ import com.cloud.utils.Pair; public class ListDedicatedGuestVlanRangesCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(ListDedicatedGuestVlanRangesCmd.class.getName()); - private static final String s_name = "listdedicatedguestvlanrangesresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -112,11 +111,6 @@ public class ListDedicatedGuestVlanRangesCmd extends BaseListCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListGuestNetworkIpv6PrefixesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListGuestNetworkIpv6PrefixesCmd.java index d31a3ba3351..a9885ffbd63 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListGuestNetworkIpv6PrefixesCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListGuestNetworkIpv6PrefixesCmd.java @@ -29,7 +29,7 @@ import org.apache.cloudstack.api.response.ZoneResponse; import com.cloud.dc.DataCenterGuestIpv6Prefix; -@APICommand(name = ListGuestNetworkIpv6PrefixesCmd.APINAME, +@APICommand(name = "listGuestNetworkIpv6Prefixes", description = "Lists guest network IPv6 prefixes", responseObject = DataCenterGuestIpv6PrefixResponse.class, since = "4.17.0", @@ -38,7 +38,6 @@ import com.cloud.dc.DataCenterGuestIpv6Prefix; public class ListGuestNetworkIpv6PrefixesCmd extends BaseListCmd { - public static final String APINAME = "listGuestNetworkIpv6Prefixes"; @Parameter(name = ApiConstants.ID, type = CommandType.UUID, @@ -80,9 +79,4 @@ public class ListGuestNetworkIpv6PrefixesCmd extends BaseListCmd { this.setResponseObject(response); } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + RESPONSE_SUFFIX; } - -} diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListGuestVlansCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListGuestVlansCmd.java index dc9df12467b..1daeac9c53d 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListGuestVlansCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListGuestVlansCmd.java @@ -41,7 +41,6 @@ import com.cloud.utils.Pair; public class ListGuestVlansCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(ListGuestVlansCmd.class.getName()); - private static final String s_name = "listguestvlansresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -90,11 +89,6 @@ public class ListGuestVlansCmd extends BaseListCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() { Pair, Integer> vlans = _networkService.listGuestVlans(this); @@ -110,4 +104,4 @@ public class ListGuestVlansCmd extends BaseListCmd { response.setResponseName(getCommandName()); this.setResponseObject(response); } -} \ No newline at end of file +} diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListNetworkIsolationMethodsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListNetworkIsolationMethodsCmd.java index 8242df94025..04b9584b819 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListNetworkIsolationMethodsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListNetworkIsolationMethodsCmd.java @@ -34,7 +34,6 @@ import com.cloud.network.Networks; responseHasSensitiveInfo = false) public class ListNetworkIsolationMethodsCmd extends BaseListCmd { - private static final String s_name = "listnetworkisolationmethodsresponse"; @Override public void execute() { @@ -54,9 +53,4 @@ public class ListNetworkIsolationMethodsCmd extends BaseListCmd { } - @Override - public String getCommandName() { - return s_name; } - -} diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListNetworkServiceProvidersCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListNetworkServiceProvidersCmd.java index 94b859716e4..67fc8292a93 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListNetworkServiceProvidersCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListNetworkServiceProvidersCmd.java @@ -41,7 +41,6 @@ import com.cloud.utils.Pair; responseHasSensitiveInfo = false) public class ListNetworkServiceProvidersCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(ListNetworkServiceProvidersCmd.class.getName()); - private static final String Name = "listnetworkserviceprovidersresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -79,11 +78,6 @@ public class ListNetworkServiceProvidersCmd extends BaseListCmd { ///////////////////////////////////////////////////// /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return Name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListPhysicalNetworksCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListPhysicalNetworksCmd.java index e495fd6a398..b8f30d3f7a1 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListPhysicalNetworksCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListPhysicalNetworksCmd.java @@ -40,7 +40,6 @@ import com.cloud.utils.Pair; public class ListPhysicalNetworksCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(ListPhysicalNetworksCmd.class.getName()); - private static final String s_name = "listphysicalnetworksresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -75,11 +74,6 @@ public class ListPhysicalNetworksCmd extends BaseListCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListStorageNetworkIpRangeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListStorageNetworkIpRangeCmd.java index b3f8b8197a4..c22ec8ee19b 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListStorageNetworkIpRangeCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListStorageNetworkIpRangeCmd.java @@ -104,11 +104,6 @@ public class ListStorageNetworkIpRangeCmd extends BaseListCmd { } } - @Override - public String getCommandName() { - return _name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListSupportedNetworkServicesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListSupportedNetworkServicesCmd.java index 39e99a43a6c..361da2d0db4 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListSupportedNetworkServicesCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListSupportedNetworkServicesCmd.java @@ -41,7 +41,6 @@ import com.cloud.user.Account; responseHasSensitiveInfo = false) public class ListSupportedNetworkServicesCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(ListSupportedNetworkServicesCmd.class.getName()); - private static final String s_name = "listsupportednetworkservicesresponse"; @Parameter(name = ApiConstants.PROVIDER, type = CommandType.STRING, description = "network service provider name") private String providerName; @@ -72,11 +71,6 @@ public class ListSupportedNetworkServicesCmd extends BaseListCmd { ///////////////////////////////////////////////////// /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/MigrateNetworkCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/MigrateNetworkCmd.java index 95ed1234cf9..b38e8f453b0 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/MigrateNetworkCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/MigrateNetworkCmd.java @@ -25,7 +25,6 @@ import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseAsyncCmd; -import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ResponseObject.ResponseView; import org.apache.cloudstack.api.ServerApiException; @@ -40,7 +39,7 @@ import com.cloud.offering.NetworkOffering; import com.cloud.user.Account; import com.cloud.user.User; -@APICommand(name = MigrateNetworkCmd.APINAME, description = "moves a network to another physical network", +@APICommand(name = "migrateNetwork", description = "moves a network to another physical network", responseObject = NetworkResponse.class, responseView = ResponseView.Restricted, entityType = {Network.class}, @@ -51,7 +50,6 @@ import com.cloud.user.User; public class MigrateNetworkCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(MigrateNetworkCmd.class.getName()); - public static final String APINAME = "migrateNetwork"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -86,11 +84,6 @@ public class MigrateNetworkCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { Network network = _networkService.getNetwork(id); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/MigrateVPCCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/MigrateVPCCmd.java index a5611c67aa4..cca367ce750 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/MigrateVPCCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/MigrateVPCCmd.java @@ -28,7 +28,6 @@ import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseAsyncCmd; -import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ResponseObject; import org.apache.cloudstack.api.ServerApiException; @@ -41,7 +40,7 @@ import com.cloud.network.vpc.Vpc; import com.cloud.user.Account; import com.cloud.user.User; -@APICommand(name = MigrateVPCCmd.APINAME, +@APICommand(name = "migrateVPC", description = "moves a vpc to another physical network", responseObject = VpcResponse.class, responseView = ResponseObject.ResponseView.Restricted, @@ -53,7 +52,6 @@ import com.cloud.user.User; public class MigrateVPCCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(MigrateVPCCmd.class.getName()); - public static final String APINAME = "migrateVPC"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -106,11 +104,6 @@ public class MigrateVPCCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public void execute() { User callerUser = _accountService.getActiveUser(CallContext.current().getCallingUserId()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ReleaseDedicatedGuestVlanRangeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ReleaseDedicatedGuestVlanRangeCmd.java index f6e49491fdf..916357920a1 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ReleaseDedicatedGuestVlanRangeCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ReleaseDedicatedGuestVlanRangeCmd.java @@ -37,7 +37,6 @@ import com.cloud.user.Account; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class ReleaseDedicatedGuestVlanRangeCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(ReleaseDedicatedGuestVlanRangeCmd.class.getName()); - private static final String s_name = "releasededicatedguestvlanrangeresponse"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// @@ -54,11 +53,6 @@ public class ReleaseDedicatedGuestVlanRangeCmd extends BaseAsyncCmd { // ///////////////// Accessors /////////////////////// // /////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - public Long getId() { return id; } diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdateNetworkOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdateNetworkOfferingCmd.java index 61a2d8a8fdc..57c34822759 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdateNetworkOfferingCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdateNetworkOfferingCmd.java @@ -40,7 +40,6 @@ import com.cloud.user.Account; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class UpdateNetworkOfferingCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(UpdateNetworkOfferingCmd.class.getName()); - private static final String s_name = "updatenetworkofferingresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -194,11 +193,6 @@ public class UpdateNetworkOfferingCmd extends BaseCmd { ///////////////////////////////////////////////////// /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdateNetworkServiceProviderCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdateNetworkServiceProviderCmd.java index a448ed77df3..1bbf21b85ed 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdateNetworkServiceProviderCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdateNetworkServiceProviderCmd.java @@ -42,7 +42,6 @@ import com.cloud.user.Account; public class UpdateNetworkServiceProviderCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(UpdateNetworkServiceProviderCmd.class.getName()); - private static final String s_name = "updatenetworkserviceproviderresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -79,11 +78,6 @@ public class UpdateNetworkServiceProviderCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdatePhysicalNetworkCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdatePhysicalNetworkCmd.java index 6f0cc3f6015..24fd93f49d1 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdatePhysicalNetworkCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdatePhysicalNetworkCmd.java @@ -36,7 +36,6 @@ import com.cloud.user.Account; public class UpdatePhysicalNetworkCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(UpdatePhysicalNetworkCmd.class.getName()); - private static final String s_name = "updatephysicalnetworkresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -84,11 +83,6 @@ public class UpdatePhysicalNetworkCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdatePodManagementNetworkIpRangeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdatePodManagementNetworkIpRangeCmd.java index ee59631b9eb..4e880f122d8 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdatePodManagementNetworkIpRangeCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdatePodManagementNetworkIpRangeCmd.java @@ -33,7 +33,7 @@ import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InvalidParameterValueException; import com.cloud.user.Account; -@APICommand(name = UpdatePodManagementNetworkIpRangeCmd.APINAME, +@APICommand(name = "updatePodManagementNetworkIpRange", description = "Updates a management network IP range. Only allowed when no IPs are allocated.", responseObject = SuccessResponse.class, since = "4.16.0.0", @@ -44,7 +44,6 @@ public class UpdatePodManagementNetworkIpRangeCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(UpdatePodManagementNetworkIpRangeCmd.class); - public static final String APINAME = "updatePodManagementNetworkIpRange"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -119,11 +118,6 @@ public class UpdatePodManagementNetworkIpRangeCmd extends BaseAsyncCmd { return "Updating pod management IP range " + getNewStartIP() + "-" + getNewEndIP() + " of Pod: " + getPodId(); } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseAsyncCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdateStorageNetworkIpRangeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdateStorageNetworkIpRangeCmd.java index d82c28d1bff..459c89debc9 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdateStorageNetworkIpRangeCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdateStorageNetworkIpRangeCmd.java @@ -42,7 +42,6 @@ import com.cloud.user.Account; responseHasSensitiveInfo = false) public class UpdateStorageNetworkIpRangeCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(UpdateStorageNetworkIpRangeCmd.class); - private static final String s_name = "updatestoragenetworkiprangeresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -114,11 +113,6 @@ public class UpdateStorageNetworkIpRangeCmd extends BaseAsyncCmd { } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateDiskOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateDiskOfferingCmd.java index 46a8936e498..304b29071e6 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateDiskOfferingCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateDiskOfferingCmd.java @@ -48,7 +48,6 @@ import com.cloud.user.Account; public class CreateDiskOfferingCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(CreateDiskOfferingCmd.class.getName()); - private static final String s_name = "creatediskofferingresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -326,11 +325,6 @@ public class CreateDiskOfferingCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java index a1c28d21981..24f5682a218 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java @@ -48,7 +48,6 @@ import com.cloud.user.Account; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class CreateServiceOfferingCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(CreateServiceOfferingCmd.class.getName()); - private static final String s_name = "createserviceofferingresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -487,11 +486,6 @@ public class CreateServiceOfferingCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/DeleteDiskOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/DeleteDiskOfferingCmd.java index 8987d50066e..0159cd297f9 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/DeleteDiskOfferingCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/DeleteDiskOfferingCmd.java @@ -33,7 +33,6 @@ import com.cloud.user.Account; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class DeleteDiskOfferingCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(DeleteDiskOfferingCmd.class.getName()); - private static final String s_name = "deletediskofferingresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -54,11 +53,6 @@ public class DeleteDiskOfferingCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/DeleteServiceOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/DeleteServiceOfferingCmd.java index 2a07fff9b15..9b7f9d48e30 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/DeleteServiceOfferingCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/DeleteServiceOfferingCmd.java @@ -33,7 +33,6 @@ import com.cloud.user.Account; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class DeleteServiceOfferingCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(DeleteServiceOfferingCmd.class.getName()); - private static final String s_name = "deleteserviceofferingresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -58,11 +57,6 @@ public class DeleteServiceOfferingCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/UpdateDiskOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/UpdateDiskOfferingCmd.java index f05c74eef7c..fe7ac869dbb 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/UpdateDiskOfferingCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/UpdateDiskOfferingCmd.java @@ -41,7 +41,6 @@ import com.cloud.user.Account; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class UpdateDiskOfferingCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(UpdateDiskOfferingCmd.class.getName()); - private static final String s_name = "updatediskofferingresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -270,11 +269,6 @@ public class UpdateDiskOfferingCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/UpdateServiceOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/UpdateServiceOfferingCmd.java index 42532932dca..68f40df60fc 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/UpdateServiceOfferingCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/UpdateServiceOfferingCmd.java @@ -41,7 +41,6 @@ import com.cloud.user.Account; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class UpdateServiceOfferingCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(UpdateServiceOfferingCmd.class.getName()); - private static final String s_name = "updateserviceofferingresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -180,11 +179,6 @@ public class UpdateServiceOfferingCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/ChangeOutOfBandManagementPasswordCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/ChangeOutOfBandManagementPasswordCmd.java index 0bd029afbd3..dad6506729a 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/ChangeOutOfBandManagementPasswordCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/ChangeOutOfBandManagementPasswordCmd.java @@ -29,7 +29,6 @@ import org.apache.cloudstack.api.ApiArgValidator; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseAsyncCmd; -import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.HostResponse; @@ -40,11 +39,10 @@ import org.apache.commons.lang3.StringUtils; import javax.inject.Inject; -@APICommand(name = ChangeOutOfBandManagementPasswordCmd.APINAME, description = "Changes out-of-band management interface password on the host and updates the interface configuration in CloudStack if the operation succeeds, else reverts the old password", +@APICommand(name = "changeOutOfBandManagementPassword", description = "Changes out-of-band management interface password on the host and updates the interface configuration in CloudStack if the operation succeeds, else reverts the old password", responseObject = OutOfBandManagementResponse.class, requestHasSensitiveInfo = true, responseHasSensitiveInfo = false, since = "4.9.0", authorized = {RoleType.Admin}) public class ChangeOutOfBandManagementPasswordCmd extends BaseAsyncCmd { - public static final String APINAME = "changeOutOfBandManagementPassword"; @Inject private OutOfBandManagementService outOfBandManagementService; @@ -79,11 +77,6 @@ public class ChangeOutOfBandManagementPasswordCmd extends BaseAsyncCmd { setResponseObject(response); } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccountId(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/ConfigureOutOfBandManagementCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/ConfigureOutOfBandManagementCmd.java index f58d52100c2..699e2855185 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/ConfigureOutOfBandManagementCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/ConfigureOutOfBandManagementCmd.java @@ -40,11 +40,10 @@ import org.apache.commons.lang3.StringUtils; import javax.inject.Inject; -@APICommand(name = ConfigureOutOfBandManagementCmd.APINAME, description = "Configures a host's out-of-band management interface", +@APICommand(name = "configureOutOfBandManagement", description = "Configures a host's out-of-band management interface", responseObject = OutOfBandManagementResponse.class, requestHasSensitiveInfo = true, responseHasSensitiveInfo = false, since = "4.9.0", authorized = {RoleType.Admin}) public class ConfigureOutOfBandManagementCmd extends BaseCmd { - public static final String APINAME = "configureOutOfBandManagement"; @Inject private OutOfBandManagementService outOfBandManagementService; @@ -89,11 +88,6 @@ public class ConfigureOutOfBandManagementCmd extends BaseCmd { setResponseObject(response); } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccountId(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/DisableOutOfBandManagementForClusterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/DisableOutOfBandManagementForClusterCmd.java index 67d84d50966..604aae66889 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/DisableOutOfBandManagementForClusterCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/DisableOutOfBandManagementForClusterCmd.java @@ -40,11 +40,10 @@ import org.apache.cloudstack.outofbandmanagement.OutOfBandManagementService; import javax.inject.Inject; -@APICommand(name = DisableOutOfBandManagementForClusterCmd.APINAME, description = "Disables out-of-band management for a cluster", +@APICommand(name = "disableOutOfBandManagementForCluster", description = "Disables out-of-band management for a cluster", responseObject = OutOfBandManagementResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.9.0", authorized = {RoleType.Admin}) public class DisableOutOfBandManagementForClusterCmd extends BaseAsyncCmd { - public static final String APINAME = "disableOutOfBandManagementForCluster"; @Inject private OutOfBandManagementService outOfBandManagementService; @@ -77,11 +76,6 @@ public class DisableOutOfBandManagementForClusterCmd extends BaseAsyncCmd { setResponseObject(response); } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - final public Long getClusterId() { return clusterId; } diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/DisableOutOfBandManagementForHostCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/DisableOutOfBandManagementForHostCmd.java index 009d0d3fd16..51c0fbcc3db 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/DisableOutOfBandManagementForHostCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/DisableOutOfBandManagementForHostCmd.java @@ -40,11 +40,10 @@ import org.apache.cloudstack.outofbandmanagement.OutOfBandManagementService; import javax.inject.Inject; -@APICommand(name = DisableOutOfBandManagementForHostCmd.APINAME, description = "Disables out-of-band management for a host", +@APICommand(name = "disableOutOfBandManagementForHost", description = "Disables out-of-band management for a host", responseObject = OutOfBandManagementResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.9.0", authorized = {RoleType.Admin}) public class DisableOutOfBandManagementForHostCmd extends BaseAsyncCmd { - public static final String APINAME = "disableOutOfBandManagementForHost"; @Inject private OutOfBandManagementService outOfBandManagementService; @@ -78,11 +77,6 @@ public class DisableOutOfBandManagementForHostCmd extends BaseAsyncCmd { setResponseObject(response); } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - final public Long getHostId() { return hostId; } diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/DisableOutOfBandManagementForZoneCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/DisableOutOfBandManagementForZoneCmd.java index 82e92a75ea6..4c3e92cf05d 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/DisableOutOfBandManagementForZoneCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/DisableOutOfBandManagementForZoneCmd.java @@ -40,11 +40,10 @@ import org.apache.cloudstack.outofbandmanagement.OutOfBandManagementService; import javax.inject.Inject; -@APICommand(name = DisableOutOfBandManagementForZoneCmd.APINAME, description = "Disables out-of-band management for a zone", +@APICommand(name = "disableOutOfBandManagementForZone", description = "Disables out-of-band management for a zone", responseObject = OutOfBandManagementResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.9.0", authorized = {RoleType.Admin}) public class DisableOutOfBandManagementForZoneCmd extends BaseAsyncCmd { - public static final String APINAME = "disableOutOfBandManagementForZone"; @Inject private OutOfBandManagementService outOfBandManagementService; @@ -77,11 +76,6 @@ public class DisableOutOfBandManagementForZoneCmd extends BaseAsyncCmd { setResponseObject(response); } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - final public Long getZoneId() { return zoneId; } diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/EnableOutOfBandManagementForClusterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/EnableOutOfBandManagementForClusterCmd.java index 64279c3a6db..a69f27fb3ac 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/EnableOutOfBandManagementForClusterCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/EnableOutOfBandManagementForClusterCmd.java @@ -40,11 +40,10 @@ import org.apache.cloudstack.outofbandmanagement.OutOfBandManagementService; import javax.inject.Inject; -@APICommand(name = EnableOutOfBandManagementForClusterCmd.APINAME, description = "Enables out-of-band management for a cluster", +@APICommand(name = "enableOutOfBandManagementForCluster", description = "Enables out-of-band management for a cluster", responseObject = OutOfBandManagementResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.9.0", authorized = {RoleType.Admin}) public class EnableOutOfBandManagementForClusterCmd extends BaseAsyncCmd { - public static final String APINAME = "enableOutOfBandManagementForCluster"; @Inject private OutOfBandManagementService outOfBandManagementService; @@ -77,11 +76,6 @@ public class EnableOutOfBandManagementForClusterCmd extends BaseAsyncCmd { setResponseObject(response); } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - final public Long getClusterId() { return clusterId; } diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/EnableOutOfBandManagementForHostCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/EnableOutOfBandManagementForHostCmd.java index 746725602dd..5e32c8943bf 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/EnableOutOfBandManagementForHostCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/EnableOutOfBandManagementForHostCmd.java @@ -40,11 +40,10 @@ import org.apache.cloudstack.outofbandmanagement.OutOfBandManagementService; import javax.inject.Inject; -@APICommand(name = EnableOutOfBandManagementForHostCmd.APINAME, description = "Enables out-of-band management for a host", +@APICommand(name = "enableOutOfBandManagementForHost", description = "Enables out-of-band management for a host", responseObject = OutOfBandManagementResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.9.0", authorized = {RoleType.Admin}) public class EnableOutOfBandManagementForHostCmd extends BaseAsyncCmd { - public static final String APINAME = "enableOutOfBandManagementForHost"; @Inject private OutOfBandManagementService outOfBandManagementService; @@ -78,11 +77,6 @@ public class EnableOutOfBandManagementForHostCmd extends BaseAsyncCmd { setResponseObject(response); } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - final public Long getHostId() { return hostId; } diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/EnableOutOfBandManagementForZoneCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/EnableOutOfBandManagementForZoneCmd.java index cae21813303..4eea4d50fe0 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/EnableOutOfBandManagementForZoneCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/EnableOutOfBandManagementForZoneCmd.java @@ -40,11 +40,10 @@ import org.apache.cloudstack.outofbandmanagement.OutOfBandManagementService; import javax.inject.Inject; -@APICommand(name = EnableOutOfBandManagementForZoneCmd.APINAME, description = "Enables out-of-band management for a zone", +@APICommand(name = "enableOutOfBandManagementForZone", description = "Enables out-of-band management for a zone", responseObject = OutOfBandManagementResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.9.0", authorized = {RoleType.Admin}) public class EnableOutOfBandManagementForZoneCmd extends BaseAsyncCmd { - public static final String APINAME = "enableOutOfBandManagementForZone"; @Inject private OutOfBandManagementService outOfBandManagementService; @@ -77,11 +76,6 @@ public class EnableOutOfBandManagementForZoneCmd extends BaseAsyncCmd { setResponseObject(response); } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - final public Long getZoneId() { return zoneId; } diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/IssueOutOfBandManagementPowerActionCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/IssueOutOfBandManagementPowerActionCmd.java index d61f62c1b0a..d10664f0a25 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/IssueOutOfBandManagementPowerActionCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/IssueOutOfBandManagementPowerActionCmd.java @@ -30,7 +30,6 @@ import org.apache.cloudstack.api.ApiCommandResourceType; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseAsyncCmd; -import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.HostResponse; @@ -41,11 +40,10 @@ import org.apache.cloudstack.outofbandmanagement.OutOfBandManagementService; import javax.inject.Inject; -@APICommand(name = IssueOutOfBandManagementPowerActionCmd.APINAME, description = "Initiates the specified power action to the host's out-of-band management interface", +@APICommand(name = "issueOutOfBandManagementPowerAction", description = "Initiates the specified power action to the host's out-of-band management interface", responseObject = OutOfBandManagementResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.9.0", authorized = {RoleType.Admin}) public class IssueOutOfBandManagementPowerActionCmd extends BaseAsyncCmd { - public static final String APINAME = "issueOutOfBandManagementPowerAction"; @Inject private OutOfBandManagementService outOfBandManagementService; @@ -85,11 +83,6 @@ public class IssueOutOfBandManagementPowerActionCmd extends BaseAsyncCmd { setResponseObject(response); } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccountId(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/pod/CreatePodCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/pod/CreatePodCmd.java index 9a060e01345..33fe6c759b2 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/pod/CreatePodCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/pod/CreatePodCmd.java @@ -36,7 +36,6 @@ import com.cloud.user.Account; public class CreatePodCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(CreatePodCmd.class.getName()); - private static final String s_name = "createpodresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -102,13 +101,6 @@ public class CreatePodCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - - - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/pod/DeletePodCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/pod/DeletePodCmd.java index 454bfd079b0..bdb9ef26694 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/pod/DeletePodCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/pod/DeletePodCmd.java @@ -35,7 +35,6 @@ import com.cloud.user.Account; public class DeletePodCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(DeletePodCmd.class.getName()); - private static final String s_name = "deletepodresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -56,11 +55,6 @@ public class DeletePodCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/pod/ListPodsByCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/pod/ListPodsByCmd.java index 3cc03f24d7c..c0e26a32eee 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/pod/ListPodsByCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/pod/ListPodsByCmd.java @@ -37,7 +37,6 @@ import com.cloud.utils.Pair; public class ListPodsByCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(ListPodsByCmd.class.getName()); - private static final String s_name = "listpodsresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -86,11 +85,6 @@ public class ListPodsByCmd extends BaseListCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() { Pair, Integer> result = _mgr.searchForPods(this); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/pod/UpdatePodCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/pod/UpdatePodCmd.java index d49e9bd981e..99ab5e1cee4 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/pod/UpdatePodCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/pod/UpdatePodCmd.java @@ -35,7 +35,6 @@ import com.cloud.user.Account; public class UpdatePodCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(UpdatePodCmd.class.getName()); - private static final String s_name = "updatepodresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -98,11 +97,6 @@ public class UpdatePodCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/region/AddRegionCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/region/AddRegionCmd.java index f6743baf625..61bf32ab822 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/region/AddRegionCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/region/AddRegionCmd.java @@ -37,7 +37,6 @@ import com.cloud.user.Account; public class AddRegionCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(AddRegionCmd.class.getName()); - private static final String s_name = "addregionresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -74,11 +73,6 @@ public class AddRegionCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/region/CreatePortableIpRangeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/region/CreatePortableIpRangeCmd.java index c28a29c6e9f..61deceb0691 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/region/CreatePortableIpRangeCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/region/CreatePortableIpRangeCmd.java @@ -45,7 +45,6 @@ public class CreatePortableIpRangeCmd extends BaseAsyncCreateCmd { public static final Logger s_logger = Logger.getLogger(CreatePortableIpRangeCmd.class.getName()); - private static final String s_name = "createportableiprangeresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -101,11 +100,6 @@ public class CreatePortableIpRangeCmd extends BaseAsyncCreateCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/region/RemoveRegionCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/region/RemoveRegionCmd.java index 415456f9414..180e34c7a8f 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/region/RemoveRegionCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/region/RemoveRegionCmd.java @@ -35,7 +35,6 @@ import com.cloud.user.Account; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class RemoveRegionCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(RemoveRegionCmd.class.getName()); - private static final String s_name = "removeregionresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -59,11 +58,6 @@ public class RemoveRegionCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/region/UpdateRegionCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/region/UpdateRegionCmd.java index b08cbbbb10c..c772efd5e1f 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/region/UpdateRegionCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/region/UpdateRegionCmd.java @@ -36,7 +36,6 @@ import com.cloud.user.Account; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class UpdateRegionCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(UpdateRegionCmd.class.getName()); - private static final String s_name = "updateregionresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -74,11 +73,6 @@ public class UpdateRegionCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/ArchiveAlertsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/ArchiveAlertsCmd.java index 79b3520b0b4..003b823e106 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/ArchiveAlertsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/ArchiveAlertsCmd.java @@ -39,7 +39,6 @@ public class ArchiveAlertsCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(ArchiveAlertsCmd.class.getName()); - private static final String s_name = "archivealertsresponse"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// @@ -87,11 +86,6 @@ public class ArchiveAlertsCmd extends BaseCmd { // ///////////// API Implementation/////////////////// // /////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/DeleteAlertsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/DeleteAlertsCmd.java index 246b25785b3..eb384892758 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/DeleteAlertsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/DeleteAlertsCmd.java @@ -39,7 +39,6 @@ public class DeleteAlertsCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(DeleteAlertsCmd.class.getName()); - private static final String s_name = "deletealertsresponse"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// @@ -87,11 +86,6 @@ public class DeleteAlertsCmd extends BaseCmd { // ///////////// API Implementation/////////////////// // /////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java index 8f21263b85c..3471ab60837 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java @@ -36,7 +36,6 @@ public class ListAlertsCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(ListAlertsCmd.class.getName()); - private static final String s_name = "listalertsresponse"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// @@ -71,11 +70,6 @@ public class ListAlertsCmd extends BaseListCmd { // ///////////// API Implementation/////////////////// // /////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() { Pair, Integer> result = _mgr.searchForAlerts(this); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/ListCapacityCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/ListCapacityCmd.java index 76ca3a79b11..253677616f0 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/ListCapacityCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/ListCapacityCmd.java @@ -43,7 +43,6 @@ public class ListCapacityCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(ListCapacityCmd.class.getName()); private static final DecimalFormat s_percentFormat = new DecimalFormat("##.##"); - private static final String s_name = "listcapacityresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -114,11 +113,6 @@ public class ListCapacityCmd extends BaseListCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() { List result = null; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/StartRollingMaintenanceCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/StartRollingMaintenanceCmd.java index a3f9fe9df76..7ee3e50e0cd 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/StartRollingMaintenanceCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/StartRollingMaintenanceCmd.java @@ -26,7 +26,6 @@ import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandResourceType; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseAsyncCmd; -import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.ClusterResponse; @@ -47,7 +46,7 @@ import com.cloud.resource.RollingMaintenanceManager; import com.cloud.utils.Pair; import com.cloud.utils.Ternary; -@APICommand(name = StartRollingMaintenanceCmd.APINAME, description = "Start rolling maintenance", +@APICommand(name = "startRollingMaintenance", description = "Start rolling maintenance", responseObject = RollingMaintenanceResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, authorized = {RoleType.Admin}) @@ -58,7 +57,6 @@ public class StartRollingMaintenanceCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(StartRollingMaintenanceCmd.class.getName()); - public static final String APINAME = "startRollingMaintenance"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -142,11 +140,6 @@ public class StartRollingMaintenanceCmd extends BaseAsyncCmd { this.setResponseObject(response); } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccountId(); @@ -210,4 +203,4 @@ public class StartRollingMaintenanceCmd extends BaseAsyncCmd { } return null; } -} \ No newline at end of file +} diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/UploadCustomCertificateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/UploadCustomCertificateCmd.java index e8d6cc55d6d..5dfada57216 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/UploadCustomCertificateCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/UploadCustomCertificateCmd.java @@ -36,7 +36,6 @@ import com.cloud.user.Account; public class UploadCustomCertificateCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(UploadCustomCertificateCmd.class.getName()); - private static final String s_name = "uploadcustomcertificateresponse"; @Parameter(name = ApiConstants.CERTIFICATE, type = CommandType.STRING, required = true, description = "The certificate to be uploaded.", length = 65535) private String certificate; @@ -90,11 +89,6 @@ public class UploadCustomCertificateCmd extends BaseAsyncCmd { return ("Uploading custom certificate to the db, and applying it to all the cpvms in the system"); } - @Override - public String getCommandName() { - return s_name; - } - public static String getResultObjectName() { return "certificate"; } diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/icon/DeleteResourceIconCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/icon/DeleteResourceIconCmd.java index de45839bb09..8fb02ea7054 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/icon/DeleteResourceIconCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/icon/DeleteResourceIconCmd.java @@ -39,7 +39,6 @@ import java.util.List; public class DeleteResourceIconCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(DeleteResourceIconCmd.class.getName()); - private static final String s_name = "deleteresourceiconresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// @@ -87,11 +86,6 @@ public class DeleteResourceIconCmd extends BaseCmd { } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { Account account = CallContext.current().getCallingAccount();// Let's give the caller here for event logging. diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/icon/ListResourceIconCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/icon/ListResourceIconCmd.java index bc8eb009072..0af11ceec22 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/icon/ListResourceIconCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/icon/ListResourceIconCmd.java @@ -37,7 +37,6 @@ import java.util.List; public class ListResourceIconCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(ListResourceIconCmd.class.getName()); - private static final String s_name = "listresourceiconresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// @@ -74,11 +73,6 @@ public class ListResourceIconCmd extends BaseCmd { setResponseObject(response); } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/icon/UploadResourceIconCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/icon/UploadResourceIconCmd.java index 3075bf3a1ab..ea5d8995a2a 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/icon/UploadResourceIconCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/icon/UploadResourceIconCmd.java @@ -48,7 +48,6 @@ import java.util.List; public class UploadResourceIconCmd extends BaseCmd { public static final Logger LOGGER = Logger.getLogger(UploadResourceIconCmd.class.getName()); - private static final String s_name = "uploadresourceiconresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -126,11 +125,6 @@ public class UploadResourceIconCmd extends BaseCmd { } return true; } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { Account account = CallContext.current().getCallingAccount();// Let's give the caller here for event logging. diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/ConfigureOvsElementCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/ConfigureOvsElementCmd.java index d3b4896e53b..a1b01a1c04f 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/ConfigureOvsElementCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/ConfigureOvsElementCmd.java @@ -44,7 +44,6 @@ import com.cloud.user.Account; public class ConfigureOvsElementCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger .getLogger(ConfigureOvsElementCmd.class.getName()); - private static final String s_name = "configureovselementresponse"; @Inject private List _service; @@ -81,11 +80,6 @@ public class ConfigureOvsElementCmd extends BaseAsyncCmd { // ///////////// API Implementation/////////////////// // /////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - public static String getResultObjectName() { return "boolean"; } diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/ConfigureVirtualRouterElementCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/ConfigureVirtualRouterElementCmd.java index 575920cc327..b7f7a050d07 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/ConfigureVirtualRouterElementCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/ConfigureVirtualRouterElementCmd.java @@ -44,7 +44,6 @@ import com.cloud.user.Account; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class ConfigureVirtualRouterElementCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(ConfigureVirtualRouterElementCmd.class.getName()); - private static final String s_name = "configurevirtualrouterelementresponse"; @Inject private List _service; @@ -87,11 +86,6 @@ public class ConfigureVirtualRouterElementCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - public static String getResultObjectName() { return "boolean"; } diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/CreateVirtualRouterElementCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/CreateVirtualRouterElementCmd.java index 4bb6d9066c7..f93ca35a06a 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/CreateVirtualRouterElementCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/CreateVirtualRouterElementCmd.java @@ -44,7 +44,6 @@ import com.cloud.user.Account; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class CreateVirtualRouterElementCmd extends BaseAsyncCreateCmd { public static final Logger s_logger = Logger.getLogger(CreateVirtualRouterElementCmd.class.getName()); - private static final String s_name = "createvirtualrouterelementresponse"; @Inject private List _service; @@ -94,11 +93,6 @@ public class CreateVirtualRouterElementCmd extends BaseAsyncCreateCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/DestroyRouterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/DestroyRouterCmd.java index b6b370a6ba4..d2dce6b9ff3 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/DestroyRouterCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/DestroyRouterCmd.java @@ -39,7 +39,6 @@ import com.cloud.vm.VirtualMachine; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class DestroyRouterCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DestroyRouterCmd.class.getName()); - private static final String s_name = "destroyrouterresponse"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// @@ -60,11 +59,6 @@ public class DestroyRouterCmd extends BaseAsyncCmd { // ///////////// API Implementation/////////////////// // /////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { VirtualRouter router = _entityMgr.findById(VirtualRouter.class, getId()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/GetRouterHealthCheckResultsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/GetRouterHealthCheckResultsCmd.java index dc1020b4a3b..93a48eba49c 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/GetRouterHealthCheckResultsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/GetRouterHealthCheckResultsCmd.java @@ -39,7 +39,7 @@ import com.cloud.user.Account; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.vm.VirtualMachine; -@APICommand(name = GetRouterHealthCheckResultsCmd.APINAME, +@APICommand(name = "getRouterHealthCheckResults", responseObject = RouterHealthCheckResultsListResponse.class, description = "Starts a router.", entityType = {VirtualMachine.class}, @@ -48,7 +48,6 @@ import com.cloud.vm.VirtualMachine; since = "4.14.0") public class GetRouterHealthCheckResultsCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(GetRouterHealthCheckResultsCmd.class.getName()); - public static final String APINAME = "getRouterHealthCheckResults"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -78,11 +77,6 @@ public class GetRouterHealthCheckResultsCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { VirtualRouter router = _entityMgr.findById(VirtualRouter.class, getRouterId()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/ListOvsElementsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/ListOvsElementsCmd.java index 75c69564188..89b39f87e44 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/ListOvsElementsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/ListOvsElementsCmd.java @@ -44,7 +44,6 @@ import com.cloud.network.element.VirtualRouterElementService; public class ListOvsElementsCmd extends BaseListCmd { public static final Logger s_logger = Logger .getLogger(ListNetworkOfferingsCmd.class.getName()); - private static final String Name = "listovselementsresponse"; @Inject private List _service; // /////////////////////////////////////////////////// @@ -87,11 +86,6 @@ public class ListOvsElementsCmd extends BaseListCmd { return enabled; } - @Override - public String getCommandName() { - return Name; - } - @Override public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/ListRoutersCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/ListRoutersCmd.java index e5c689dcd87..6e955e46212 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/ListRoutersCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/ListRoutersCmd.java @@ -42,7 +42,6 @@ import com.cloud.vm.VirtualMachine; public class ListRoutersCmd extends BaseListProjectAndAccountResourcesCmd { public static final Logger s_logger = Logger.getLogger(ListRoutersCmd.class.getName()); - private static final String s_name = "listroutersresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -154,11 +153,6 @@ public class ListRoutersCmd extends BaseListProjectAndAccountResourcesCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public ApiCommandResourceType getApiResourceType() { return ApiCommandResourceType.DomainRouter; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/ListVirtualRouterElementsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/ListVirtualRouterElementsCmd.java index b77aa06ad76..6eb24dce074 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/ListVirtualRouterElementsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/ListVirtualRouterElementsCmd.java @@ -43,7 +43,6 @@ import com.cloud.network.element.VirtualRouterElementService; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class ListVirtualRouterElementsCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(ListVirtualRouterElementsCmd.class.getName()); - private static final String s_name = "listvirtualrouterelementsresponse"; // TODO, VirtualRouterElementServer is not singleton in system! @Inject @@ -92,11 +91,6 @@ public class ListVirtualRouterElementsCmd extends BaseListCmd { return enabled; } - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/RebootRouterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/RebootRouterCmd.java index bc0e6e8dee7..6e334d7e442 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/RebootRouterCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/RebootRouterCmd.java @@ -40,7 +40,6 @@ import com.cloud.vm.VirtualMachine; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class RebootRouterCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(RebootRouterCmd.class.getName()); - private static final String s_name = "rebootrouterresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -64,11 +63,6 @@ public class RebootRouterCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { VirtualRouter router = _entityMgr.findById(VirtualRouter.class, getId()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/StartRouterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/StartRouterCmd.java index 25235cb0434..121b2a1bd11 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/StartRouterCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/StartRouterCmd.java @@ -42,7 +42,6 @@ import com.cloud.vm.VirtualMachine; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class StartRouterCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(StartRouterCmd.class.getName()); - private static final String s_name = "startrouterresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -63,11 +62,6 @@ public class StartRouterCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - public static String getResultObjectName() { return "router"; } diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/StopRouterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/StopRouterCmd.java index dc970ce61ad..b9e15661268 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/StopRouterCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/StopRouterCmd.java @@ -41,7 +41,6 @@ import com.cloud.vm.VirtualMachine; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class StopRouterCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(StopRouterCmd.class.getName()); - private static final String s_name = "stoprouterresponse"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// @@ -65,11 +64,6 @@ public class StopRouterCmd extends BaseAsyncCmd { // ///////////// API Implementation/////////////////// // /////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { VirtualRouter router = _entityMgr.findById(VirtualRouter.class, getId()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/UpgradeRouterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/UpgradeRouterCmd.java index 067d344337b..2d5255614c6 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/UpgradeRouterCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/UpgradeRouterCmd.java @@ -35,7 +35,6 @@ import com.cloud.vm.VirtualMachine; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class UpgradeRouterCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(UpgradeRouterCmd.class.getName()); - private static final String s_name = "changeserviceforrouterresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -67,11 +66,6 @@ public class UpgradeRouterCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { VirtualRouter router = _entityMgr.findById(VirtualRouter.class, getId()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/UpgradeRouterTemplateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/UpgradeRouterTemplateCmd.java index 2004910c9f4..fa0fe5800ee 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/UpgradeRouterTemplateCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/UpgradeRouterTemplateCmd.java @@ -44,7 +44,6 @@ import com.cloud.user.Account; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class UpgradeRouterTemplateCmd extends org.apache.cloudstack.api.BaseCmd { public static final Logger s_logger = Logger.getLogger(UpgradeRouterTemplateCmd.class.getName()); - private static final String s_name = "upgraderoutertemplateresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -107,11 +106,6 @@ public class UpgradeRouterTemplateCmd extends org.apache.cloudstack.api.BaseCmd /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; // no account info given, parent this command to SYSTEM so ERROR events are tracked diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/AddImageStoreCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/AddImageStoreCmd.java index 839d64dcf9d..b8ab1461a2b 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/AddImageStoreCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/AddImageStoreCmd.java @@ -40,7 +40,6 @@ import com.cloud.user.Account; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class AddImageStoreCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(AddImageStoreCmd.class.getName()); - private static final String s_name = "addimagestoreresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -119,11 +118,6 @@ public class AddImageStoreCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/CreateSecondaryStagingStoreCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/CreateSecondaryStagingStoreCmd.java index b3c0437e9bf..08069446893 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/CreateSecondaryStagingStoreCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/CreateSecondaryStagingStoreCmd.java @@ -39,7 +39,6 @@ import com.cloud.user.Account; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class CreateSecondaryStagingStoreCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(CreateSecondaryStagingStoreCmd.class.getName()); - private static final String s_name = "createsecondarystagingstoreresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -95,11 +94,6 @@ public class CreateSecondaryStagingStoreCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/CreateStoragePoolCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/CreateStoragePoolCmd.java index ae44bc93732..0eacc5cda6b 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/CreateStoragePoolCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/CreateStoragePoolCmd.java @@ -43,7 +43,6 @@ import com.cloud.user.Account; public class CreateStoragePoolCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(CreateStoragePoolCmd.class.getName()); - private static final String s_name = "createstoragepoolresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -147,11 +146,6 @@ public class CreateStoragePoolCmd extends BaseCmd { return hypervisor; } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/DeleteImageStoreCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/DeleteImageStoreCmd.java index ad812adf0cb..194f0baf603 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/DeleteImageStoreCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/DeleteImageStoreCmd.java @@ -34,7 +34,6 @@ import com.cloud.user.Account; public class DeleteImageStoreCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(DeleteImageStoreCmd.class.getName()); - private static final String s_name = "deleteimagestoreresponse"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// @@ -55,11 +54,6 @@ public class DeleteImageStoreCmd extends BaseCmd { // ///////////// API Implementation/////////////////// // /////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/DeletePoolCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/DeletePoolCmd.java index 5465fd1440f..d87768e7f39 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/DeletePoolCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/DeletePoolCmd.java @@ -35,7 +35,6 @@ import com.cloud.user.Account; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class DeletePoolCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(DeletePoolCmd.class.getName()); - private static final String s_name = "deletestoragepoolresponse"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// @@ -64,11 +63,6 @@ public class DeletePoolCmd extends BaseCmd { // ///////////// API Implementation/////////////////// // /////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/DeleteSecondaryStagingStoreCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/DeleteSecondaryStagingStoreCmd.java index 16398623359..34a26461fa8 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/DeleteSecondaryStagingStoreCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/DeleteSecondaryStagingStoreCmd.java @@ -34,7 +34,6 @@ import com.cloud.user.Account; public class DeleteSecondaryStagingStoreCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(DeleteSecondaryStagingStoreCmd.class.getName()); - private static final String s_name = "deletesecondarystagingstoreresponse"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// @@ -55,11 +54,6 @@ public class DeleteSecondaryStagingStoreCmd extends BaseCmd { // ///////////// API Implementation/////////////////// // /////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmd.java index 8133806cbc6..699f4831415 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmd.java @@ -40,7 +40,6 @@ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class FindStoragePoolsForMigrationCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(FindStoragePoolsForMigrationCmd.class.getName()); - private static final String s_name = "findstoragepoolsformigrationresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -61,11 +60,6 @@ public class FindStoragePoolsForMigrationCmd extends BaseListCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public ApiCommandResourceType getApiResourceType() { return ApiCommandResourceType.StoragePool; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ListImageStoresCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ListImageStoresCmd.java index 4f7cf81f20d..a9eac3ed76d 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ListImageStoresCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ListImageStoresCmd.java @@ -30,7 +30,6 @@ import org.apache.log4j.Logger; public class ListImageStoresCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(ListImageStoresCmd.class.getName()); - private static final String s_name = "listimagestoresresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -90,11 +89,6 @@ public class ListImageStoresCmd extends BaseListCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() { ListResponse response = _queryService.searchForImageStores(this); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ListStoragePoolsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ListStoragePoolsCmd.java index b2455c3037a..ce1164000fc 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ListStoragePoolsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ListStoragePoolsCmd.java @@ -34,7 +34,6 @@ import org.apache.cloudstack.api.response.ZoneResponse; public class ListStoragePoolsCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(ListStoragePoolsCmd.class.getName()); - private static final String s_name = "liststoragepoolsresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -106,11 +105,6 @@ public class ListStoragePoolsCmd extends BaseListCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public ApiCommandResourceType getApiResourceType() { return ApiCommandResourceType.StoragePool; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ListStorageProvidersCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ListStorageProvidersCmd.java index 3e960ee84a8..347b66061f6 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ListStorageProvidersCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ListStorageProvidersCmd.java @@ -41,16 +41,10 @@ import com.cloud.exception.ResourceUnavailableException; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class ListStorageProvidersCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(ListStorageProvidersCmd.class.getName()); - private static final String s_name = "liststorageprovidersresponse"; @Parameter(name = ApiConstants.TYPE, type = CommandType.STRING, description = "the type of storage provider: either primary or image", required = true) private String type; - @Override - public String getCommandName() { - return s_name; - } - public String getType() { return this.type; } diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ListStorageTagsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ListStorageTagsCmd.java index d740d04cff7..43981ee1a3d 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ListStorageTagsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ListStorageTagsCmd.java @@ -29,7 +29,6 @@ import org.apache.cloudstack.api.response.StorageTagResponse; public class ListStorageTagsCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(ListStorageTagsCmd.class.getName()); - private static final String s_name = "liststoragetagsresponse"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// @@ -43,11 +42,6 @@ public class ListStorageTagsCmd extends BaseListCmd { // ///////////// API Implementation/////////////////// // /////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public ApiCommandResourceType getApiResourceType() { return ApiCommandResourceType.StoragePool; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/MigrateSecondaryStorageDataCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/MigrateSecondaryStorageDataCmd.java index e8a287552b6..de9b55a9ff1 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/MigrateSecondaryStorageDataCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/MigrateSecondaryStorageDataCmd.java @@ -32,7 +32,7 @@ import org.apache.log4j.Logger; import com.cloud.event.EventTypes; -@APICommand(name = MigrateSecondaryStorageDataCmd.APINAME, +@APICommand(name = "migrateSecondaryStorageData", description = "migrates data objects from one secondary storage to destination image store(s)", responseObject = MigrationResponse.class, requestHasSensitiveInfo = false, @@ -43,7 +43,6 @@ public class MigrateSecondaryStorageDataCmd extends BaseAsyncCmd { public static final Logger LOGGER = Logger.getLogger(MigrateSecondaryStorageDataCmd.class.getName()); - public static final String APINAME = "migrateSecondaryStorageData"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -104,11 +103,6 @@ public class MigrateSecondaryStorageDataCmd extends BaseAsyncCmd { CallContext.current().setEventDetails(response.getMessage()); } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseAsyncCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccountId(); @@ -123,4 +117,4 @@ public class MigrateSecondaryStorageDataCmd extends BaseAsyncCmd { public ApiCommandResourceType getApiResourceType() { return ApiCommandResourceType.ImageStore; } -} \ No newline at end of file +} diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/SyncStoragePoolCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/SyncStoragePoolCmd.java index 9761e330a4c..d7a783a4ff4 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/SyncStoragePoolCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/SyncStoragePoolCmd.java @@ -35,7 +35,7 @@ import org.apache.cloudstack.context.CallContext; import java.util.logging.Logger; -@APICommand(name = SyncStoragePoolCmd.APINAME, +@APICommand(name = "syncStoragePool", description = "Sync storage pool with management server (currently supported for Datastore Cluster in VMware and syncs the datastores in it)", responseObject = StoragePoolResponse.class, requestHasSensitiveInfo = false, @@ -45,7 +45,6 @@ import java.util.logging.Logger; ) public class SyncStoragePoolCmd extends BaseAsyncCmd { - public static final String APINAME = "syncStoragePool"; public static final Logger LOGGER = Logger.getLogger(SyncStoragePoolCmd.class.getName()); ///////////////////////////////////////////////////// @@ -85,11 +84,6 @@ public class SyncStoragePoolCmd extends BaseAsyncCmd { } } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseAsyncCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccountId(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/UpdateCloudToUseObjectStoreCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/UpdateCloudToUseObjectStoreCmd.java index a99c5e5d75c..3351d389c6f 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/UpdateCloudToUseObjectStoreCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/UpdateCloudToUseObjectStoreCmd.java @@ -39,7 +39,6 @@ import com.cloud.user.Account; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class UpdateCloudToUseObjectStoreCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(UpdateCloudToUseObjectStoreCmd.class.getName()); - private static final String s_name = "updatecloudtouseobjectstoreresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -112,11 +111,6 @@ public class UpdateCloudToUseObjectStoreCmd extends BaseCmd { - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/UpdateStorageCapabilitiesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/UpdateStorageCapabilitiesCmd.java index b6fb03dd798..8403d3c6241 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/UpdateStorageCapabilitiesCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/UpdateStorageCapabilitiesCmd.java @@ -31,13 +31,11 @@ import org.apache.cloudstack.api.response.StoragePoolResponse; import org.apache.cloudstack.context.CallContext; import org.apache.log4j.Logger; -import java.util.Locale; -@APICommand(name = UpdateStorageCapabilitiesCmd.APINAME, description = "Syncs capabilities of storage pools", +@APICommand(name = "updateStorageCapabilities", description = "Syncs capabilities of storage pools", responseObject = StoragePoolResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.16.0") public class UpdateStorageCapabilitiesCmd extends BaseCmd { - public static final String APINAME = "updateStorageCapabilities"; private static final Logger LOG = Logger.getLogger(UpdateStorageCapabilitiesCmd.class.getName()); ///////////////////////////////////////////////////// @@ -74,11 +72,6 @@ public class UpdateStorageCapabilitiesCmd extends BaseCmd { this.setResponseObject(listResponse); } - @Override - public String getCommandName() { - return APINAME.toLowerCase(Locale.ROOT) + "response" ; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccountId(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/UpdateStoragePoolCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/UpdateStoragePoolCmd.java index 0128a218a7c..9e34684a09d 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/UpdateStoragePoolCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/UpdateStoragePoolCmd.java @@ -37,7 +37,6 @@ import com.cloud.user.Account; public class UpdateStoragePoolCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(UpdateStoragePoolCmd.class.getName()); - private static final String s_name = "updatestoragepoolresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -94,11 +93,6 @@ public class UpdateStoragePoolCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/swift/AddSwiftCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/swift/AddSwiftCmd.java index 19a84252dd7..7eb87006d0d 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/swift/AddSwiftCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/swift/AddSwiftCmd.java @@ -37,7 +37,6 @@ import com.cloud.user.Account; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class AddSwiftCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(AddSwiftCmd.class.getName()); - private static final String s_name = "addswiftresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -79,11 +78,6 @@ public class AddSwiftCmd extends BaseCmd { return key; } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/swift/ListSwiftsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/swift/ListSwiftsCmd.java index f80cfab4bdd..6d7bfbaf1b1 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/swift/ListSwiftsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/swift/ListSwiftsCmd.java @@ -32,7 +32,6 @@ import com.cloud.user.Account; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class ListSwiftsCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(ListSwiftsCmd.class.getName()); - private static final String s_name = "listswiftsresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -49,11 +48,6 @@ public class ListSwiftsCmd extends BaseListCmd { return id; } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/DestroySystemVmCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/DestroySystemVmCmd.java index 408c3855feb..7ed536f6d4c 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/DestroySystemVmCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/DestroySystemVmCmd.java @@ -39,7 +39,6 @@ import com.cloud.vm.VirtualMachine; public class DestroySystemVmCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DestroySystemVmCmd.class.getName()); - private static final String s_name = "destroysystemvmresponse"; @ACL(accessType = AccessType.OperateEntry) @Parameter(name = ApiConstants.ID, @@ -53,11 +52,6 @@ public class DestroySystemVmCmd extends BaseAsyncCmd { return id; } - @Override - public String getCommandName() { - return s_name; - } - public static String getResultObjectName() { return "systemvm"; } diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/ListSystemVMsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/ListSystemVMsCmd.java index aee2084c2e8..b6f8c92fa17 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/ListSystemVMsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/ListSystemVMsCmd.java @@ -41,7 +41,6 @@ import com.cloud.vm.VirtualMachine; public class ListSystemVMsCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(ListSystemVMsCmd.class.getName()); - private static final String s_name = "listsystemvmsresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -117,11 +116,6 @@ public class ListSystemVMsCmd extends BaseListCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public ApiCommandResourceType getApiResourceType() { return ApiCommandResourceType.SystemVm; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/MigrateSystemVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/MigrateSystemVMCmd.java index decc722e86f..f0f7aca16c8 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/MigrateSystemVMCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/MigrateSystemVMCmd.java @@ -49,7 +49,6 @@ import com.cloud.vm.VirtualMachine; public class MigrateSystemVMCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(MigrateSystemVMCmd.class.getName()); - private static final String s_name = "migratesystemvmresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -106,11 +105,6 @@ public class MigrateSystemVMCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { Account account = CallContext.current().getCallingAccount(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/PatchSystemVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/PatchSystemVMCmd.java index a0c066ce0e8..ae3c36b4948 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/PatchSystemVMCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/PatchSystemVMCmd.java @@ -25,7 +25,6 @@ import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseAsyncCmd; -import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.SuccessResponse; @@ -33,12 +32,11 @@ import org.apache.cloudstack.api.response.SystemVmResponse; import org.apache.cloudstack.context.CallContext; import org.apache.log4j.Logger; -@APICommand(name = PatchSystemVMCmd.APINAME, description = "Attempts to live patch systemVMs - CPVM, SSVM ", +@APICommand(name = "patchSystemVm", description = "Attempts to live patch systemVMs - CPVM, SSVM ", responseObject = SuccessResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, authorized = { RoleType.Admin }, since = "4.17.0") public class PatchSystemVMCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(PatchSystemVMCmd.class.getName()); - public static final String APINAME = "patchSystemVm"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -79,11 +77,6 @@ public class PatchSystemVMCmd extends BaseAsyncCmd { return String.format("Attempting to live patch System VM with Id: %s ", this._uuidMgr.getUuid(VirtualMachine.class, getId())); } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { Account account = CallContext.current().getCallingAccount(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/RebootSystemVmCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/RebootSystemVmCmd.java index 6c440ff2ba8..0ba7e0c2edf 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/RebootSystemVmCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/RebootSystemVmCmd.java @@ -39,7 +39,6 @@ import com.cloud.vm.VirtualMachine; public class RebootSystemVmCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(RebootSystemVmCmd.class.getName()); - private static final String s_name = "rebootsystemvmresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -67,11 +66,6 @@ public class RebootSystemVmCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { Account account = CallContext.current().getCallingAccount(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/StartSystemVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/StartSystemVMCmd.java index a3dd5a032d9..0cb517f4058 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/StartSystemVMCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/StartSystemVMCmd.java @@ -39,7 +39,6 @@ import com.cloud.vm.VirtualMachine; public class StartSystemVMCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(StartSystemVMCmd.class.getName()); - private static final String s_name = "startsystemvmresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -64,11 +63,6 @@ public class StartSystemVMCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - public static String getResultObjectName() { return "systemvm"; } diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/StopSystemVmCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/StopSystemVmCmd.java index 44056671044..755c8e46205 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/StopSystemVmCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/StopSystemVmCmd.java @@ -41,7 +41,6 @@ import com.cloud.vm.VirtualMachine; public class StopSystemVmCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(StopSystemVmCmd.class.getName()); - private static final String s_name = "stopsystemvmresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -70,11 +69,6 @@ public class StopSystemVmCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { Account account = CallContext.current().getCallingAccount(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java index a13b9bb9bd2..12f80f32b06 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java @@ -42,7 +42,6 @@ import com.cloud.vm.VirtualMachine; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class UpgradeSystemVMCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(UpgradeSystemVMCmd.class.getName()); - private static final String s_name = "changeserviceforsystemvmresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -78,11 +77,6 @@ public class UpgradeSystemVMCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { Account account = CallContext.current().getCallingAccount(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/template/PrepareTemplateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/template/PrepareTemplateCmd.java index 0537c01fd3c..9b8d402864a 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/template/PrepareTemplateCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/template/PrepareTemplateCmd.java @@ -40,7 +40,6 @@ import com.cloud.user.Account; public class PrepareTemplateCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(PrepareTemplateCmd.class.getName()); - private static final String s_name = "preparetemplateresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -90,11 +89,6 @@ public class PrepareTemplateCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/AddTrafficMonitorCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/AddTrafficMonitorCmd.java index e0d755518f9..95593714feb 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/AddTrafficMonitorCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/AddTrafficMonitorCmd.java @@ -36,7 +36,6 @@ import com.cloud.utils.exception.CloudRuntimeException; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class AddTrafficMonitorCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(AddTrafficMonitorCmd.class.getName()); - private static final String s_name = "addtrafficmonitorresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -82,11 +81,6 @@ public class AddTrafficMonitorCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java index 1111434c660..809129402a8 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java @@ -39,7 +39,6 @@ import com.cloud.user.Account; public class AddTrafficTypeCmd extends BaseAsyncCreateCmd { public static final Logger s_logger = Logger.getLogger(AddTrafficTypeCmd.class.getName()); - private static final String s_name = "addtraffictyperesponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -144,11 +143,6 @@ public class AddTrafficTypeCmd extends BaseAsyncCreateCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficMonitorCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficMonitorCmd.java index 4c2bac23a17..ff371d6e83d 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficMonitorCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficMonitorCmd.java @@ -34,7 +34,6 @@ import com.cloud.user.Account; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class DeleteTrafficMonitorCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(DeleteTrafficMonitorCmd.class.getName()); - private static final String s_name = "deletetrafficmonitorresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -55,11 +54,6 @@ public class DeleteTrafficMonitorCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficTypeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficTypeCmd.java index 0dda89b2a5c..a728690a09d 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficTypeCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficTypeCmd.java @@ -36,7 +36,6 @@ import com.cloud.user.Account; public class DeleteTrafficTypeCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DeleteTrafficTypeCmd.class.getName()); - private static final String s_name = "deletetraffictyperesponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -56,11 +55,6 @@ public class DeleteTrafficTypeCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/GenerateUsageRecordsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/GenerateUsageRecordsCmd.java index 184f88aed24..65b864f2ab6 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/GenerateUsageRecordsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/GenerateUsageRecordsCmd.java @@ -39,7 +39,6 @@ import com.cloud.user.Account; public class GenerateUsageRecordsCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(GenerateUsageRecordsCmd.class.getName()); - private static final String s_name = "generateusagerecordsresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -80,11 +79,6 @@ public class GenerateUsageRecordsCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListTrafficMonitorsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListTrafficMonitorsCmd.java index ac632cecda1..f3a65bbfffd 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListTrafficMonitorsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListTrafficMonitorsCmd.java @@ -35,7 +35,6 @@ import com.cloud.host.Host; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class ListTrafficMonitorsCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(ListTrafficMonitorsCmd.class.getName()); - private static final String s_name = "listtrafficmonitorsresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -56,11 +55,6 @@ public class ListTrafficMonitorsCmd extends BaseListCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() { List trafficMonitors = _networkUsageService.listTrafficMonitors(this); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypeImplementorsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypeImplementorsCmd.java index bd634bbe5c2..97f43155be6 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypeImplementorsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypeImplementorsCmd.java @@ -45,7 +45,6 @@ import com.cloud.utils.Pair; responseHasSensitiveInfo = false) public class ListTrafficTypeImplementorsCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(ListTrafficTypeImplementorsCmd.class); - private static final String s_name = "listtraffictypeimplementorsresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -87,8 +86,4 @@ public class ListTrafficTypeImplementorsCmd extends BaseListCmd { return Account.ACCOUNT_ID_SYSTEM; } - @Override - public String getCommandName() { - return s_name; } -} diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypesCmd.java index a5a5a5d8d3d..6e36ca3bd8d 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypesCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypesCmd.java @@ -38,7 +38,6 @@ import com.cloud.utils.Pair; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class ListTrafficTypesCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(ListTrafficTypesCmd.class.getName()); - private static final String s_name = "listtraffictypesresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -65,11 +64,6 @@ public class ListTrafficTypesCmd extends BaseListCmd { ///////////////////////////////////////////////////// /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListUsageRecordsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListUsageRecordsCmd.java index 91a38b0021c..3cb148c2af0 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListUsageRecordsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListUsageRecordsCmd.java @@ -24,7 +24,6 @@ import java.util.Set; import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; -import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.BaseListCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.response.AccountResponse; @@ -37,13 +36,12 @@ import org.apache.cloudstack.usage.Usage; import com.cloud.utils.Pair; -@APICommand(name = ListUsageRecordsCmd.APINAME, +@APICommand(name = "listUsageRecords", description = "Lists usage records for accounts", responseObject = UsageRecordResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class ListUsageRecordsCmd extends BaseListCmd { - public static final String APINAME = "listUsageRecords"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -166,11 +164,6 @@ public class ListUsageRecordsCmd extends BaseListCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public void execute() { Pair, Integer> usageRecords = _usageService.getUsageRecords(this); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListUsageTypesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListUsageTypesCmd.java index 2c5a7866cbb..15f9dd20e29 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListUsageTypesCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListUsageTypesCmd.java @@ -31,12 +31,6 @@ import com.cloud.user.Account; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class ListUsageTypesCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(ListUsageTypesCmd.class.getName()); - private static final String s_name = "listusagetypesresponse"; - - @Override - public String getCommandName() { - return s_name; - } @Override public long getEntityOwnerId() { diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/RemoveRawUsageRecordsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/RemoveRawUsageRecordsCmd.java index da7871cbb9d..710a11c0d7f 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/RemoveRawUsageRecordsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/RemoveRawUsageRecordsCmd.java @@ -35,7 +35,6 @@ import org.apache.log4j.Logger; public class RemoveRawUsageRecordsCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(RemoveRawUsageRecordsCmd.class.getName()); - private static final String s_name = "removerawusagerecordsresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -48,11 +47,6 @@ public class RemoveRawUsageRecordsCmd extends BaseCmd { return interval; } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/UpdateTrafficTypeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/UpdateTrafficTypeCmd.java index 3c7548583c3..103e58c4e03 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/UpdateTrafficTypeCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/UpdateTrafficTypeCmd.java @@ -36,7 +36,6 @@ import com.cloud.user.Account; public class UpdateTrafficTypeCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(UpdateTrafficTypeCmd.class.getName()); - private static final String s_name = "updatetraffictyperesponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -102,11 +101,6 @@ public class UpdateTrafficTypeCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/user/CreateUserCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/CreateUserCmd.java index 63d532bd275..e8f5944e407 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/user/CreateUserCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/CreateUserCmd.java @@ -37,7 +37,6 @@ import com.cloud.user.User; public class CreateUserCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(CreateUserCmd.class.getName()); - private static final String s_name = "createuserresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -125,11 +124,6 @@ public class CreateUserCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { Account account = CallContext.current().getCallingAccount(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/user/DeleteUserCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/DeleteUserCmd.java index e8ac7fd3720..a4f13d5e9c7 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/user/DeleteUserCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/DeleteUserCmd.java @@ -40,7 +40,6 @@ import com.cloud.user.User; public class DeleteUserCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(DeleteUserCmd.class.getName()); - private static final String s_name = "deleteuserresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -63,11 +62,6 @@ public class DeleteUserCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { User user = _entityMgr.findById(User.class, getId()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/user/DisableUserCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/DisableUserCmd.java index 89c7af4cec2..f7a51d0b1d3 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/user/DisableUserCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/DisableUserCmd.java @@ -40,7 +40,6 @@ import com.cloud.user.UserAccount; requestHasSensitiveInfo = false, responseHasSensitiveInfo = true) public class DisableUserCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DisableUserCmd.class.getName()); - private static final String s_name = "disableuserresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -64,11 +63,6 @@ public class DisableUserCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public String getEventType() { return EventTypes.EVENT_USER_DISABLE; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/user/EnableUserCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/EnableUserCmd.java index d69eccf9342..f13eac8f2a9 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/user/EnableUserCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/EnableUserCmd.java @@ -38,7 +38,6 @@ import com.cloud.user.UserAccount; requestHasSensitiveInfo = false, responseHasSensitiveInfo = true) public class EnableUserCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(EnableUserCmd.class.getName()); - private static final String s_name = "enableuserresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -62,11 +61,6 @@ public class EnableUserCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { User user = _entityMgr.findById(User.class, getId()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/user/GetUserCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/GetUserCmd.java index d58f6959632..5fcad8068b1 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/user/GetUserCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/GetUserCmd.java @@ -32,7 +32,6 @@ import com.cloud.user.UserAccount; public class GetUserCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(GetUserCmd.class.getName()); - private static final String s_name = "getuserresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -53,11 +52,6 @@ public class GetUserCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return 0; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/user/GetUserKeysCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/GetUserKeysCmd.java index f86204c68a9..253a55652ea 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/user/GetUserKeysCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/GetUserKeysCmd.java @@ -31,7 +31,7 @@ import org.apache.cloudstack.api.response.UserResponse; import java.util.Map; import org.apache.log4j.Logger; -@APICommand(name = GetUserKeysCmd.APINAME, +@APICommand(name = "getUserKeys", description = "This command allows the user to query the seceret and API keys for the account", responseObject = RegisterResponse.class, requestHasSensitiveInfo = false, @@ -45,17 +45,10 @@ public class GetUserKeysCmd extends BaseCmd{ private Long id; public static final Logger s_logger = Logger.getLogger(GetUserKeysCmd.class.getName()); - public static final String APINAME = "getUserKeys"; public Long getID(){ return id; - } - - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - - public long getEntityOwnerId(){ + }public long getEntityOwnerId(){ User user = _entityMgr.findById(User.class, getID()); if(user != null){ return user.getAccountId(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/user/ListUsersCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/ListUsersCmd.java index 313ff22e972..a516a30e769 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/user/ListUsersCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/ListUsersCmd.java @@ -36,7 +36,6 @@ import java.util.List; public class ListUsersCmd extends BaseListAccountResourcesCmd { public static final Logger s_logger = Logger.getLogger(ListUsersCmd.class.getName()); - private static final String s_name = "listusersresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -88,11 +87,6 @@ public class ListUsersCmd extends BaseListAccountResourcesCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() { ListResponse response = _queryService.searchForUsers(this); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/user/LockUserCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/LockUserCmd.java index 69623d013d4..df6ef4f7b0b 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/user/LockUserCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/LockUserCmd.java @@ -35,7 +35,6 @@ import com.cloud.user.UserAccount; public class LockUserCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(LockUserCmd.class.getName()); - private static final String s_name = "lockuserresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -56,11 +55,6 @@ public class LockUserCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { User user = _entityMgr.findById(User.class, getId()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/user/MoveUserCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/MoveUserCmd.java index 1d4096f37e3..56552ba95df 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/user/MoveUserCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/MoveUserCmd.java @@ -48,7 +48,6 @@ import com.google.common.base.Preconditions; public class MoveUserCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(MoveUserCmd.class.getName()); - public static final String APINAME = "moveUser"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -94,11 +93,6 @@ public class MoveUserCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { User user = _entityMgr.findById(User.class, getId()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/user/RegisterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/RegisterCmd.java index f0d92322f39..4199015b9ca 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/user/RegisterCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/RegisterCmd.java @@ -36,7 +36,6 @@ import com.cloud.user.User; public class RegisterCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(RegisterCmd.class.getName()); - private static final String s_name = "registeruserkeysresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -61,11 +60,6 @@ public class RegisterCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { User user = _entityMgr.findById(User.class, getId()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/user/UpdateUserCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/UpdateUserCmd.java index 5035b32d14d..5cfb5c4a649 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/user/UpdateUserCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/UpdateUserCmd.java @@ -39,7 +39,6 @@ requestHasSensitiveInfo = true, responseHasSensitiveInfo = true) public class UpdateUserCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(UpdateUserCmd.class.getName()); - private static final String s_name = "updateuserresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -131,11 +130,6 @@ public class UpdateUserCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { User user = _entityMgr.findById(User.class, getId()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/CreateVlanIpRangeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/CreateVlanIpRangeCmd.java index a2c77cecf94..66aefd46966 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/CreateVlanIpRangeCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/CreateVlanIpRangeCmd.java @@ -45,7 +45,6 @@ import com.cloud.user.Account; public class CreateVlanIpRangeCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(CreateVlanIpRangeCmd.class.getName()); - private static final String s_name = "createvlaniprangeresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -210,11 +209,6 @@ public class CreateVlanIpRangeCmd extends BaseCmd { return physicalNetworkId; } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/DedicatePublicIpRangeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/DedicatePublicIpRangeCmd.java index 58a8458312d..7c122dfc22e 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/DedicatePublicIpRangeCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/DedicatePublicIpRangeCmd.java @@ -38,7 +38,6 @@ import com.cloud.user.Account; public class DedicatePublicIpRangeCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(DedicatePublicIpRangeCmd.class.getName()); - private static final String s_name = "dedicatepubliciprangeresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -84,11 +83,6 @@ public class DedicatePublicIpRangeCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/DeleteVlanIpRangeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/DeleteVlanIpRangeCmd.java index af32fc4ebd7..15f0bde37a1 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/DeleteVlanIpRangeCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/DeleteVlanIpRangeCmd.java @@ -34,7 +34,6 @@ import com.cloud.user.Account; public class DeleteVlanIpRangeCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(DeleteVlanIpRangeCmd.class.getName()); - private static final String s_name = "deletevlaniprangeresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -55,11 +54,6 @@ public class DeleteVlanIpRangeCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/ListVlanIpRangesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/ListVlanIpRangesCmd.java index d5edd301a66..3b5370e3f15 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/ListVlanIpRangesCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/ListVlanIpRangesCmd.java @@ -42,7 +42,6 @@ import com.cloud.utils.Pair; public class ListVlanIpRangesCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(ListVlanIpRangesCmd.class.getName()); - private static final String s_name = "listvlaniprangesresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -135,11 +134,6 @@ public class ListVlanIpRangesCmd extends BaseListCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() { Pair, Integer> vlans = _mgr.searchForVlans(this); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/ReleasePublicIpRangeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/ReleasePublicIpRangeCmd.java index 15cfbc64e30..846433a60fc 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/ReleasePublicIpRangeCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/ReleasePublicIpRangeCmd.java @@ -34,7 +34,6 @@ import com.cloud.user.Account; public class ReleasePublicIpRangeCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(ReleasePublicIpRangeCmd.class.getName()); - private static final String s_name = "releasepubliciprangeresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -55,11 +54,6 @@ public class ReleasePublicIpRangeCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/UpdateVlanIpRangeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/UpdateVlanIpRangeCmd.java index 7a7775e4863..caaf4c5ae01 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/UpdateVlanIpRangeCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/UpdateVlanIpRangeCmd.java @@ -33,13 +33,12 @@ import com.cloud.exception.ResourceUnavailableException; import com.cloud.user.Account; import com.cloud.utils.net.NetUtils; -@APICommand(name = UpdateVlanIpRangeCmd.APINAME, description = "Updates a VLAN IP range.", responseObject = +@APICommand(name = "updateVlanIpRange", description = "Updates a VLAN IP range.", responseObject = VlanIpRangeResponse.class, since = "4.16.0", requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, authorized = {RoleType.Admin}) public class UpdateVlanIpRangeCmd extends BaseCmd { - public static final String APINAME = "updateVlanIpRange"; public static final Logger s_logger = Logger.getLogger(UpdateVlanIpRangeCmd.class.getName()); ///////////////////////////////////////////////////// @@ -155,13 +154,8 @@ public class UpdateVlanIpRangeCmd extends BaseCmd { } } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; } -} \ No newline at end of file +} diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/AssignVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/AssignVMCmd.java index 290349070d5..1d53bbb39ad 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/AssignVMCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/AssignVMCmd.java @@ -48,7 +48,6 @@ import com.cloud.vm.VirtualMachine; public class AssignVMCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(AssignVMCmd.class.getName()); - private static final String s_name = "assignvirtualmachineresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -120,11 +119,6 @@ public class AssignVMCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() { try { diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ExpungeVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ExpungeVMCmd.java index cd9b89b6ffe..4cd7f541c4e 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ExpungeVMCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ExpungeVMCmd.java @@ -45,7 +45,6 @@ import com.cloud.vm.VirtualMachine; public class ExpungeVMCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(ExpungeVMCmd.class.getName()); - private static final String s_name = "expungevirtualmachineresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -67,11 +66,6 @@ public class ExpungeVMCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { UserVm vm = _responseGenerator.findUserVmById(getId()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/GetVMUserDataCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/GetVMUserDataCmd.java index bf39f99519f..98af820201c 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/GetVMUserDataCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/GetVMUserDataCmd.java @@ -33,7 +33,6 @@ import com.cloud.uservm.UserVm; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class GetVMUserDataCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(GetVMUserDataCmd.class); - private static final String s_name = "getvirtualmachineuserdataresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -75,8 +74,4 @@ public class GetVMUserDataCmd extends BaseCmd { return Account.ACCOUNT_ID_SYSTEM; // no account info given, parent this command to SYSTEM so ERROR events are tracked } - @Override - public String getCommandName() { - return s_name; } -} diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ImportUnmanagedInstanceCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ImportUnmanagedInstanceCmd.java index dca683f787f..70233317cc5 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ImportUnmanagedInstanceCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ImportUnmanagedInstanceCmd.java @@ -56,7 +56,7 @@ import com.cloud.user.Account; import com.cloud.utils.net.NetUtils; import com.cloud.vm.VmDetailConstants; -@APICommand(name = ImportUnmanagedInstanceCmd.API_NAME, +@APICommand(name = "importUnmanagedInstance", description = "Import unmanaged virtual machine from a given cluster.", responseObject = UserVmResponse.class, responseView = ResponseObject.ResponseView.Full, @@ -66,7 +66,6 @@ import com.cloud.vm.VmDetailConstants; since = "4.14.0") public class ImportUnmanagedInstanceCmd extends BaseAsyncCmd { public static final Logger LOGGER = Logger.getLogger(ImportUnmanagedInstanceCmd.class); - public static final String API_NAME = "importUnmanagedInstance"; @Inject public VmImportService vmImportService; @@ -298,11 +297,6 @@ public class ImportUnmanagedInstanceCmd extends BaseAsyncCmd { setResponseObject(response); } - @Override - public String getCommandName() { - return API_NAME.toLowerCase() + BaseAsyncCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { Long accountId = _accountService.finalyzeAccountId(accountName, domainId, projectId, true); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ListUnmanagedInstancesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ListUnmanagedInstancesCmd.java index a991ef4e03d..13b6748c74d 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ListUnmanagedInstancesCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ListUnmanagedInstancesCmd.java @@ -22,7 +22,6 @@ import javax.inject.Inject; import org.apache.cloudstack.acl.RoleType; import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; -import org.apache.cloudstack.api.BaseAsyncCmd; import org.apache.cloudstack.api.BaseListCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ResponseObject; @@ -42,7 +41,7 @@ import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.user.Account; -@APICommand(name = ListUnmanagedInstancesCmd.API_NAME, +@APICommand(name = "listUnmanagedInstances", description = "Lists unmanaged virtual machines for a given cluster.", responseObject = UnmanagedInstanceResponse.class, responseView = ResponseObject.ResponseView.Full, @@ -53,7 +52,6 @@ import com.cloud.user.Account; since = "4.14.0") public class ListUnmanagedInstancesCmd extends BaseListCmd { public static final Logger LOGGER = Logger.getLogger(ListUnmanagedInstancesCmd.class.getName()); - public static final String API_NAME = "listUnmanagedInstances"; @Inject public VmImportService vmImportService; @@ -97,11 +95,6 @@ public class ListUnmanagedInstancesCmd extends BaseListCmd { setResponseObject(response); } - @Override - public String getCommandName() { - return API_NAME.toLowerCase() + BaseAsyncCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { Account account = CallContext.current().getCallingAccount(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/MigrateVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/MigrateVMCmd.java index 2962dd4a68f..b685b366cd1 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/MigrateVMCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/MigrateVMCmd.java @@ -52,7 +52,6 @@ import com.cloud.vm.VirtualMachine; public class MigrateVMCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(MigrateVMCmd.class.getName()); - private static final String s_name = "migratevirtualmachineresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -109,11 +108,6 @@ public class MigrateVMCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { UserVm userVm = _entityMgr.findById(UserVm.class, getVirtualMachineId()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/MigrateVirtualMachineWithVolumeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/MigrateVirtualMachineWithVolumeCmd.java index 8778d8ccbcd..731cb67aa83 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/MigrateVirtualMachineWithVolumeCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/MigrateVirtualMachineWithVolumeCmd.java @@ -54,7 +54,6 @@ import com.cloud.vm.VirtualMachine; public class MigrateVirtualMachineWithVolumeCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(MigrateVirtualMachineWithVolumeCmd.class.getName()); - private static final String s_name = "migratevirtualmachinewithvolumeresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -115,11 +114,6 @@ public class MigrateVirtualMachineWithVolumeCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { UserVm userVm = _entityMgr.findById(UserVm.class, getVirtualMachineId()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/RecoverVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/RecoverVMCmd.java index 50062acfab3..b0698ed1e7a 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/RecoverVMCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/RecoverVMCmd.java @@ -40,7 +40,6 @@ import com.cloud.vm.VirtualMachine; public class RecoverVMCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(RecoverVMCmd.class.getName()); - private static final String s_name = "recovervirtualmachineresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -62,11 +61,6 @@ public class RecoverVMCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { UserVm userVm = _entityMgr.findById(UserVm.class, getId()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/UnmanageVMInstanceCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/UnmanageVMInstanceCmd.java index db729b7f8d7..20c7c536c45 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/UnmanageVMInstanceCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/UnmanageVMInstanceCmd.java @@ -44,7 +44,7 @@ import org.apache.log4j.Logger; import javax.inject.Inject; -@APICommand(name = UnmanageVMInstanceCmd.API_NAME, +@APICommand(name = "unmanageVirtualMachine", description = "Unmanage a guest virtual machine.", entityType = {VirtualMachine.class}, responseObject = UnmanageVMInstanceResponse.class, @@ -54,7 +54,6 @@ import javax.inject.Inject; public class UnmanageVMInstanceCmd extends BaseAsyncCmd { public static final Logger LOGGER = Logger.getLogger(UnmanageVMInstanceCmd.class); - public static final String API_NAME = "unmanageVirtualMachine"; @Inject private UnmanagedVMsManager unmanagedVMsManager; @@ -109,11 +108,6 @@ public class UnmanageVMInstanceCmd extends BaseAsyncCmd { this.setResponseObject(response); } - @Override - public String getCommandName() { - return API_NAME.toLowerCase() + BaseAsyncCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { UserVm vm = _responseGenerator.findUserVmById(vmId); @@ -133,4 +127,4 @@ public class UnmanageVMInstanceCmd extends BaseAsyncCmd { return vmId; } -} \ No newline at end of file +} diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/CreatePrivateGatewayByAdminCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/CreatePrivateGatewayByAdminCmd.java index b42e3d95285..b5ba70cf5e2 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/CreatePrivateGatewayByAdminCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/CreatePrivateGatewayByAdminCmd.java @@ -71,4 +71,4 @@ public class CreatePrivateGatewayByAdminCmd extends CreatePrivateGatewayCmd impl public Boolean getBypassVlanOverlapCheck() { return BooleanUtils.toBoolean(bypassVlanOverlapCheck); } -} \ No newline at end of file +} diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java index 6539c5c226d..f1c2a5b48a9 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java @@ -48,7 +48,6 @@ import com.cloud.user.Account; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class CreateVPCOfferingCmd extends BaseAsyncCreateCmd { public static final Logger s_logger = Logger.getLogger(CreateVPCOfferingCmd.class.getName()); - private static final String s_name = "createvpcofferingresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -221,11 +220,6 @@ public class CreateVPCOfferingCmd extends BaseAsyncCreateCmd { return "creating VPC offering. Id: " + getEntityId(); } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/DeletePrivateGatewayCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/DeletePrivateGatewayCmd.java index 063faf96a98..d6c3cac68c7 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/DeletePrivateGatewayCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/DeletePrivateGatewayCmd.java @@ -42,7 +42,6 @@ import com.cloud.user.Account; authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User}) public class DeletePrivateGatewayCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DeletePrivateGatewayCmd.class.getName()); - private static final String s_name = "deleteprivategatewayresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -62,11 +61,6 @@ public class DeletePrivateGatewayCmd extends BaseAsyncCmd { ///////////////////////////////////////////////////// /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public String getEventType() { return EventTypes.EVENT_PRIVATE_GATEWAY_DELETE; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/DeleteVPCOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/DeleteVPCOfferingCmd.java index a5e1b7c90a5..aba4c857b0b 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/DeleteVPCOfferingCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/DeleteVPCOfferingCmd.java @@ -35,7 +35,6 @@ import com.cloud.user.Account; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class DeleteVPCOfferingCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DeleteVPCOfferingCmd.class.getName()); - private static final String s_name = "deletevpcofferingresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -56,11 +55,6 @@ public class DeleteVPCOfferingCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCOfferingCmd.java index 0d1a57a6612..12babad504e 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCOfferingCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCOfferingCmd.java @@ -41,7 +41,6 @@ import com.cloud.user.Account; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class UpdateVPCOfferingCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(UpdateVPCOfferingCmd.class.getName()); - private static final String s_name = "updatevpcofferingresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -161,11 +160,6 @@ public class UpdateVPCOfferingCmd extends BaseAsyncCmd { ///////////////////////////////////////////////////// /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/zone/CreateZoneCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/zone/CreateZoneCmd.java index af377cd347a..263d3c824b0 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/zone/CreateZoneCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/zone/CreateZoneCmd.java @@ -37,7 +37,6 @@ import com.cloud.user.Account; public class CreateZoneCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(CreateZoneCmd.class.getName()); - private static final String s_name = "createzoneresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -156,11 +155,6 @@ public class CreateZoneCmd extends BaseCmd { ///////////////////////////////////////////////////// /////////////// API Implementation/////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/zone/DeleteZoneCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/zone/DeleteZoneCmd.java index c7029b052ec..c530e999bf8 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/zone/DeleteZoneCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/zone/DeleteZoneCmd.java @@ -35,7 +35,6 @@ import com.cloud.user.Account; public class DeleteZoneCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(DeleteZoneCmd.class.getName()); - private static final String s_name = "deletezoneresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -56,11 +55,6 @@ public class DeleteZoneCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/zone/MarkDefaultZoneForAccountCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/zone/MarkDefaultZoneForAccountCmd.java index 9dd0337a83f..264aea3f449 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/zone/MarkDefaultZoneForAccountCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/zone/MarkDefaultZoneForAccountCmd.java @@ -39,7 +39,6 @@ import com.cloud.user.Account; public class MarkDefaultZoneForAccountCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(MarkDefaultZoneForAccountCmd.class.getName()); - private static final String s_name = "markdefaultzoneforaccountresponse"; ///////////////////////////////////////////////////// ////////////////API parameters ////////////////////// @@ -86,11 +85,6 @@ public class MarkDefaultZoneForAccountCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/zone/UpdateZoneCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/zone/UpdateZoneCmd.java index ac80ca59f92..1379050cbf7 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/zone/UpdateZoneCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/zone/UpdateZoneCmd.java @@ -39,7 +39,6 @@ import com.cloud.user.Account; public class UpdateZoneCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(UpdateZoneCmd.class.getName()); - private static final String s_name = "updatezoneresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -174,11 +173,6 @@ public class UpdateZoneCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/account/AddAccountToProjectCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/account/AddAccountToProjectCmd.java index 1ccb18ffaa6..57c0e484843 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/account/AddAccountToProjectCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/account/AddAccountToProjectCmd.java @@ -46,7 +46,6 @@ import com.cloud.projects.ProjectAccount; public class AddAccountToProjectCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(AddAccountToProjectCmd.class.getName()); - private static final String s_name = "addaccounttoprojectresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -104,11 +103,6 @@ public class AddAccountToProjectCmd extends BaseAsyncCmd { return null; } - @Override - public String getCommandName() { - return s_name; - } - ///////////////////////////////////////////////////// /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/account/AddUserToProjectCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/account/AddUserToProjectCmd.java index 906927e041e..d38ae057f05 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/account/AddUserToProjectCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/account/AddUserToProjectCmd.java @@ -38,10 +38,9 @@ import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; import com.cloud.projects.ProjectAccount; -@APICommand(name = AddUserToProjectCmd.APINAME, description = "Adds user to a project", responseObject = SuccessResponse.class, since = "4.14", +@APICommand(name = "addUserToProject", description = "Adds user to a project", responseObject = SuccessResponse.class, since = "4.14", requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, authorized = {RoleType.Admin, RoleType.DomainAdmin, RoleType.ResourceAdmin, RoleType.User}) public class AddUserToProjectCmd extends BaseAsyncCmd { - public static final String APINAME = "addUserToProject"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -139,11 +138,6 @@ public class AddUserToProjectCmd extends BaseAsyncCmd { } } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccountId(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/account/DeleteAccountFromProjectCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/account/DeleteAccountFromProjectCmd.java index 6804f091e71..34935f506ec 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/account/DeleteAccountFromProjectCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/account/DeleteAccountFromProjectCmd.java @@ -40,7 +40,6 @@ import com.cloud.projects.Project; public class DeleteAccountFromProjectCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DeleteAccountFromProjectCmd.class.getName()); - private static final String s_name = "deleteaccountfromprojectresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -59,11 +58,6 @@ public class DeleteAccountFromProjectCmd extends BaseAsyncCmd { /////////////////// Accessors /////////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - ///////////////////////////////////////////////////// /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/account/DeleteUserFromProjectCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/account/DeleteUserFromProjectCmd.java index 7cd90125041..596fb876008 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/account/DeleteUserFromProjectCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/account/DeleteUserFromProjectCmd.java @@ -38,11 +38,10 @@ import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; import com.cloud.projects.Project; -@APICommand(name = DeleteUserFromProjectCmd.APINAME, description = "Deletes user from the project", responseObject = SuccessResponse.class, since = "4.15.0", +@APICommand(name = "deleteUserFromProject", description = "Deletes user from the project", responseObject = SuccessResponse.class, since = "4.15.0", requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, authorized = {RoleType.Admin, RoleType.DomainAdmin, RoleType.ResourceAdmin, RoleType.User}) public class DeleteUserFromProjectCmd extends BaseAsyncCmd { public static final Logger LOGGER = Logger.getLogger(DeleteUserFromProjectCmd.class.getName()); - public static final String APINAME = "deleteUserFromProject"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -85,11 +84,6 @@ public class DeleteUserFromProjectCmd extends BaseAsyncCmd { } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { Project project = _projectService.getProject(projectId); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/account/ListProjectAccountsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/account/ListProjectAccountsCmd.java index bcfedd2262d..3d50fc553b8 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/account/ListProjectAccountsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/account/ListProjectAccountsCmd.java @@ -35,7 +35,6 @@ import com.cloud.user.Account; public class ListProjectAccountsCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(ListProjectAccountsCmd.class.getName()); - private static final String s_name = "listprojectaccountsresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -78,11 +77,6 @@ public class ListProjectAccountsCmd extends BaseListCmd { return projectRoleId; } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { //TODO - return project entity ownerId diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/address/DisassociateIPAddrCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/address/DisassociateIPAddrCmd.java index 17b17632ca5..b31520e1b88 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/address/DisassociateIPAddrCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/address/DisassociateIPAddrCmd.java @@ -41,7 +41,6 @@ import com.cloud.user.Account; public class DisassociateIPAddrCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DisassociateIPAddrCmd.class.getName()); - private static final String s_name = "disassociateipaddressresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -67,11 +66,6 @@ public class DisassociateIPAddrCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() throws InsufficientAddressCapacityException { CallContext.current().setEventDetails("IP ID: " + getIpAddressId()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/address/ReleaseIPAddrCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/address/ReleaseIPAddrCmd.java index ba8a512b183..eb908300283 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/address/ReleaseIPAddrCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/address/ReleaseIPAddrCmd.java @@ -43,7 +43,6 @@ import com.cloud.network.IpAddress; public class ReleaseIPAddrCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(ReleaseIPAddrCmd.class.getName()); - private static final String s_name = "releaseipaddressresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -65,11 +64,6 @@ public class ReleaseIPAddrCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { IpAddress ip = getIpAddress(id); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/address/ReserveIPAddrCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/address/ReserveIPAddrCmd.java index 030a16b7a98..5e72986fb58 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/address/ReserveIPAddrCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/address/ReserveIPAddrCmd.java @@ -52,7 +52,6 @@ import com.cloud.user.Account; authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User}) public class ReserveIPAddrCmd extends BaseCmd implements UserCmd { public static final Logger s_logger = Logger.getLogger(ReserveIPAddrCmd.class.getName()); - private static final String s_name = "reserveipaddressresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -145,11 +144,6 @@ public class ReserveIPAddrCmd extends BaseCmd implements UserCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() throws ResourceUnavailableException, ResourceAllocationException, ConcurrentOperationException { IpAddress result = _networkService.reserveIpAddress(_accountService.getAccount(getEntityOwnerId()), isDisplay(), getIpAddressId()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/address/UpdateIPAddrCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/address/UpdateIPAddrCmd.java index 9ed66b0935e..7055e1d5cb2 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/address/UpdateIPAddrCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/address/UpdateIPAddrCmd.java @@ -43,7 +43,6 @@ import com.cloud.user.Account; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, entityType = { IpAddress.class }) public class UpdateIPAddrCmd extends BaseAsyncCustomIdCmd { public static final Logger s_logger = Logger.getLogger(UpdateIPAddrCmd.class.getName()); - private static final String s_name = "updateipaddressresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -62,11 +61,6 @@ public class UpdateIPAddrCmd extends BaseAsyncCustomIdCmd { ///////////////////////////////////////////////////// /////////////////// Accessors /////////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - public Long getId() { return id; } @@ -144,4 +138,4 @@ public class UpdateIPAddrCmd extends BaseAsyncCustomIdCmd { public ApiCommandResourceType getApiResourceType() { return ApiCommandResourceType.IpAddress; } -} \ No newline at end of file +} diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/affinitygroup/CreateAffinityGroupCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/affinitygroup/CreateAffinityGroupCmd.java index 052b98719d7..60dbc2a6e9a 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/affinitygroup/CreateAffinityGroupCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/affinitygroup/CreateAffinityGroupCmd.java @@ -39,7 +39,6 @@ import com.cloud.user.Account; public class CreateAffinityGroupCmd extends BaseAsyncCreateCmd { public static final Logger s_logger = Logger.getLogger(CreateAffinityGroupCmd.class.getName()); - private static final String s_name = "createaffinitygroupresponse"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// @@ -104,11 +103,6 @@ public class CreateAffinityGroupCmd extends BaseAsyncCreateCmd { // ///////////// API Implementation/////////////////// // /////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { Account caller = CallContext.current().getCallingAccount(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/affinitygroup/DeleteAffinityGroupCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/affinitygroup/DeleteAffinityGroupCmd.java index e96ba433474..c8967b08020 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/affinitygroup/DeleteAffinityGroupCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/affinitygroup/DeleteAffinityGroupCmd.java @@ -41,7 +41,6 @@ import com.cloud.user.Account; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class DeleteAffinityGroupCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DeleteAffinityGroupCmd.class.getName()); - private static final String s_name = "deleteaffinitygroupresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -93,11 +92,6 @@ public class DeleteAffinityGroupCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { Account caller = CallContext.current().getCallingAccount(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupTypesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupTypesCmd.java index 84ad0328463..2d6f45cc06e 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupTypesCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupTypesCmd.java @@ -33,17 +33,11 @@ import com.cloud.user.Account; public class ListAffinityGroupTypesCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(ListAffinityGroupTypesCmd.class.getName()); - private static final String s_name = "listaffinitygrouptypesresponse"; ///////////////////////////////////////////////////// /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupsCmd.java index de70361c331..ed6c3145198 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupsCmd.java @@ -33,7 +33,6 @@ import org.apache.cloudstack.api.response.UserVmResponse; public class ListAffinityGroupsCmd extends BaseListProjectAndAccountResourcesCmd { public static final Logger s_logger = Logger.getLogger(ListAffinityGroupsCmd.class.getName()); - private static final String s_name = "listaffinitygroupsresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -77,11 +76,6 @@ public class ListAffinityGroupsCmd extends BaseListProjectAndAccountResourcesCmd /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() { ListResponse response = _queryService.searchForAffinityGroups(this); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScalePolicyCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScalePolicyCmd.java index a33a6200906..cf5ff366096 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScalePolicyCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScalePolicyCmd.java @@ -39,7 +39,6 @@ import com.cloud.user.Account; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class DeleteAutoScalePolicyCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DeleteAutoScalePolicyCmd.class.getName()); - private static final String s_name = "deleteautoscalepolicyresponse"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// // /////////////////////////////////////////////////// @@ -64,11 +63,6 @@ public class DeleteAutoScalePolicyCmd extends BaseAsyncCmd { // ///////////// API Implementation/////////////////// // /////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { AutoScalePolicy autoScalePolicy = _entityMgr.findById(AutoScalePolicy.class, getId()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmGroupCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmGroupCmd.java index cb458b2daf2..badfcc0957e 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmGroupCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmGroupCmd.java @@ -39,7 +39,6 @@ import com.cloud.user.Account; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class DeleteAutoScaleVmGroupCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DeleteAutoScaleVmGroupCmd.class.getName()); - private static final String s_name = "deleteautoscalevmgroupresponse"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// // /////////////////////////////////////////////////// @@ -74,11 +73,6 @@ public class DeleteAutoScaleVmGroupCmd extends BaseAsyncCmd { // ///////////// API Implementation/////////////////// // /////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { AutoScaleVmGroup autoScaleVmGroup = _entityMgr.findById(AutoScaleVmGroup.class, getId()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmProfileCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmProfileCmd.java index 5f9fd8a5f74..06bf7a9d378 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmProfileCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmProfileCmd.java @@ -39,7 +39,6 @@ import com.cloud.user.Account; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class DeleteAutoScaleVmProfileCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DeleteAutoScaleVmProfileCmd.class.getName()); - private static final String s_name = "deleteautoscalevmprofileresponse"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// // /////////////////////////////////////////////////// @@ -64,11 +63,6 @@ public class DeleteAutoScaleVmProfileCmd extends BaseAsyncCmd { // ///////////// API Implementation/////////////////// // /////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { AutoScaleVmProfile autoScaleVmProfile = _entityMgr.findById(AutoScaleVmProfile.class, getId()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DeleteConditionCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DeleteConditionCmd.java index 3d21c3c0412..840484e45ad 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DeleteConditionCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DeleteConditionCmd.java @@ -40,7 +40,6 @@ import com.cloud.user.Account; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class DeleteConditionCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DeleteConditionCmd.class.getName()); - private static final String s_name = "deleteconditionresponse"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// @@ -85,11 +84,6 @@ public class DeleteConditionCmd extends BaseAsyncCmd { return ApiCommandResourceType.Condition; } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { Condition condition = _entityMgr.findById(Condition.class, getId()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListAutoScalePoliciesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListAutoScalePoliciesCmd.java index 18d52092828..dc0baf4c786 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListAutoScalePoliciesCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListAutoScalePoliciesCmd.java @@ -37,7 +37,6 @@ import com.cloud.network.as.AutoScalePolicy; public class ListAutoScalePoliciesCmd extends BaseListProjectAndAccountResourcesCmd { public static final Logger s_logger = Logger.getLogger(ListAutoScalePoliciesCmd.class.getName()); - private static final String s_name = "listautoscalepoliciesresponse"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// @@ -88,11 +87,6 @@ public class ListAutoScalePoliciesCmd extends BaseListProjectAndAccountResources // ///////////// API Implementation/////////////////// // /////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() { List autoScalePolicies = _autoScaleService.listAutoScalePolicies(this); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmGroupsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmGroupsCmd.java index 8035117b3e1..8404fbbb49f 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmGroupsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmGroupsCmd.java @@ -41,7 +41,6 @@ import com.cloud.network.as.AutoScaleVmGroup; public class ListAutoScaleVmGroupsCmd extends BaseListProjectAndAccountResourcesCmd { public static final Logger s_logger = Logger.getLogger(ListAutoScaleVmGroupsCmd.class.getName()); - private static final String s_name = "listautoscalevmgroupsresponse"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// @@ -108,11 +107,6 @@ public class ListAutoScaleVmGroupsCmd extends BaseListProjectAndAccountResources // ///////////// API Implementation/////////////////// // /////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() { if (id != null && (loadBalancerId != null || profileId != null || policyId != null)) diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java index 554b48854a4..435471faf13 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java @@ -39,7 +39,6 @@ import com.cloud.network.as.AutoScaleVmProfile; public class ListAutoScaleVmProfilesCmd extends BaseListProjectAndAccountResourcesCmd { public static final Logger s_logger = Logger.getLogger(ListAutoScaleVmProfilesCmd.class.getName()); - private static final String s_name = "listautoscalevmprofilesresponse"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// @@ -100,11 +99,6 @@ public class ListAutoScaleVmProfilesCmd extends BaseListProjectAndAccountResourc // /////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() { List autoScaleProfiles = _autoScaleService.listAutoScaleVmProfiles(this); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListConditionsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListConditionsCmd.java index 00d937d28b0..fc1ca7097c8 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListConditionsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListConditionsCmd.java @@ -37,7 +37,6 @@ import com.cloud.network.as.Condition; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class ListConditionsCmd extends BaseListProjectAndAccountResourcesCmd { public static final Logger s_logger = Logger.getLogger(ListConditionsCmd.class.getName()); - private static final String s_name = "listconditionsresponse"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// @@ -92,9 +91,4 @@ public class ListConditionsCmd extends BaseListProjectAndAccountResourcesCmd { return policyId; } - @Override - public String getCommandName() { - return s_name; } - -} diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScalePolicyCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScalePolicyCmd.java index 08e0676b542..a64b5cb1680 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScalePolicyCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScalePolicyCmd.java @@ -43,7 +43,6 @@ import com.cloud.user.Account; public class UpdateAutoScalePolicyCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(UpdateAutoScalePolicyCmd.class.getName()); - private static final String s_name = "updateautoscalepolicyresponse"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// @@ -115,11 +114,6 @@ public class UpdateAutoScalePolicyCmd extends BaseAsyncCmd { return conditionIds; } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { AutoScalePolicy autoScalePolicy = _entityMgr.findById(AutoScalePolicy.class, getId()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmGroupCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmGroupCmd.java index ac3ade3c50b..87cd1fd3f4e 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmGroupCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmGroupCmd.java @@ -44,7 +44,6 @@ import com.cloud.user.Account; public class UpdateAutoScaleVmGroupCmd extends BaseAsyncCustomIdCmd { public static final Logger s_logger = Logger.getLogger(UpdateAutoScaleVmGroupCmd.class.getName()); - private static final String s_name = "updateautoscalevmgroupresponse"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// @@ -157,11 +156,6 @@ public class UpdateAutoScaleVmGroupCmd extends BaseAsyncCustomIdCmd { return "Updating AutoScale Vm Group. Vm Group Id: " + getId(); } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { AutoScaleVmGroup autoScaleVmGroup = _entityMgr.findById(AutoScaleVmGroup.class, getId()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmProfileCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmProfileCmd.java index 0056051b336..c0b385932a9 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmProfileCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmProfileCmd.java @@ -47,7 +47,6 @@ import com.cloud.user.Account; public class UpdateAutoScaleVmProfileCmd extends BaseAsyncCustomIdCmd { public static final Logger s_logger = Logger.getLogger(UpdateAutoScaleVmProfileCmd.class.getName()); - private static final String s_name = "updateautoscalevmprofileresponse"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// @@ -179,11 +178,6 @@ public class UpdateAutoScaleVmProfileCmd extends BaseAsyncCustomIdCmd { return "Updating AutoScale Vm Profile. Vm Profile Id: " + getId(); } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { AutoScaleVmProfile vmProfile = _entityMgr.findById(AutoScaleVmProfile.class, getId()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/UpdateConditionCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/UpdateConditionCmd.java index b0e79e7e8ae..e946dd370c1 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/UpdateConditionCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/UpdateConditionCmd.java @@ -27,7 +27,6 @@ import org.apache.cloudstack.api.ApiCommandResourceType; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseAsyncCmd; -import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.ConditionResponse; @@ -38,12 +37,11 @@ import com.cloud.exception.ResourceInUseException; import com.cloud.network.as.Condition; import com.cloud.user.Account; -@APICommand(name = UpdateConditionCmd.API_NAME, description = "Updates a condition for VM auto scaling", responseObject = SuccessResponse.class, entityType = {Condition.class}, +@APICommand(name = "updateCondition", description = "Updates a condition for VM auto scaling", responseObject = SuccessResponse.class, entityType = {Condition.class}, authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User}, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.18.0") public class UpdateConditionCmd extends BaseAsyncCmd { public static final Logger LOGGER = Logger.getLogger(UpdateConditionCmd.class.getName()); - public static final String API_NAME = "updateCondition"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// @@ -97,11 +95,6 @@ public class UpdateConditionCmd extends BaseAsyncCmd { return ApiCommandResourceType.Condition; } - @Override - public String getCommandName() { - return API_NAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { Condition condition = _entityMgr.findById(Condition.class, getId()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/AssignVirtualMachineToBackupOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/AssignVirtualMachineToBackupOfferingCmd.java index 05bfc52b44b..0e6b2bc165e 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/AssignVirtualMachineToBackupOfferingCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/AssignVirtualMachineToBackupOfferingCmd.java @@ -24,7 +24,6 @@ import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseAsyncCmd; -import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.BackupOfferingResponse; @@ -40,12 +39,11 @@ import com.cloud.exception.NetworkRuleConflictException; import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; -@APICommand(name = AssignVirtualMachineToBackupOfferingCmd.APINAME, +@APICommand(name = "assignVirtualMachineToBackupOffering", description = "Assigns a VM to a backup offering", responseObject = SuccessResponse.class, since = "4.14.0", authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User}) public class AssignVirtualMachineToBackupOfferingCmd extends BaseAsyncCmd { - public static final String APINAME = "assignVirtualMachineToBackupOffering"; @Inject private BackupManager backupManager; @@ -99,11 +97,6 @@ public class AssignVirtualMachineToBackupOfferingCmd extends BaseAsyncCmd { } } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccount().getId(); @@ -118,4 +111,4 @@ public class AssignVirtualMachineToBackupOfferingCmd extends BaseAsyncCmd { public String getEventDescription() { return "Assigning VM to backup offering ID: " + offeringId; } -} \ No newline at end of file +} diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/CreateBackupCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/CreateBackupCmd.java index 189ebe2f69d..558f92e4006 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/CreateBackupCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/CreateBackupCmd.java @@ -25,7 +25,6 @@ import org.apache.cloudstack.api.ApiCommandResourceType; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseAsyncCreateCmd; -import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.SuccessResponse; @@ -41,12 +40,11 @@ import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.utils.exception.CloudRuntimeException; -@APICommand(name = CreateBackupCmd.APINAME, +@APICommand(name = "createBackup", description = "Create VM backup", responseObject = SuccessResponse.class, since = "4.14.0", authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User}) public class CreateBackupCmd extends BaseAsyncCreateCmd { - public static final String APINAME = "createBackup"; @Inject private BackupManager backupManager; @@ -90,11 +88,6 @@ public class CreateBackupCmd extends BaseAsyncCreateCmd { } } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public ApiCommandResourceType getApiResourceType() { return ApiCommandResourceType.Backup; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/CreateBackupScheduleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/CreateBackupScheduleCmd.java index e10386de987..5dc06af2123 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/CreateBackupScheduleCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/CreateBackupScheduleCmd.java @@ -36,12 +36,11 @@ import org.apache.cloudstack.context.CallContext; import com.cloud.utils.DateUtil; import com.cloud.utils.exception.CloudRuntimeException; -@APICommand(name = CreateBackupScheduleCmd.APINAME, +@APICommand(name = "createBackupSchedule", description = "Creates a user-defined VM backup schedule", responseObject = BackupResponse.class, since = "4.14.0", authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User}) public class CreateBackupScheduleCmd extends BaseCmd { - public static final String APINAME = "createBackupSchedule"; @Inject private BackupManager backupManager; @@ -116,11 +115,6 @@ public class CreateBackupScheduleCmd extends BaseCmd { } } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccount().getId(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/DeleteBackupCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/DeleteBackupCmd.java index 4098158a833..7f0a63ecc91 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/DeleteBackupCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/DeleteBackupCmd.java @@ -24,7 +24,6 @@ import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseAsyncCmd; -import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.BackupResponse; @@ -41,12 +40,11 @@ import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.utils.exception.CloudRuntimeException; -@APICommand(name = DeleteBackupCmd.APINAME, +@APICommand(name = "deleteBackup", description = "Delete VM backup", responseObject = SuccessResponse.class, since = "4.14.0", authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User}) public class DeleteBackupCmd extends BaseAsyncCmd { - public static final String APINAME = "deleteBackup"; @Inject private BackupManager backupManager; @@ -101,11 +99,6 @@ public class DeleteBackupCmd extends BaseAsyncCmd { } } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccount().getId(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/DeleteBackupScheduleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/DeleteBackupScheduleCmd.java index 1c7b65c8edc..0245f228b89 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/DeleteBackupScheduleCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/DeleteBackupScheduleCmd.java @@ -38,12 +38,11 @@ import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.utils.exception.CloudRuntimeException; -@APICommand(name = DeleteBackupScheduleCmd.APINAME, +@APICommand(name = "deleteBackupSchedule", description = "Deletes the backup schedule of a VM", responseObject = SuccessResponse.class, since = "4.14.0", authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User}) public class DeleteBackupScheduleCmd extends BaseCmd { - public static final String APINAME = "deleteBackupSchedule"; @Inject private BackupManager backupManager; @@ -87,11 +86,6 @@ public class DeleteBackupScheduleCmd extends BaseCmd { } } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccount().getId(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/ListBackupOfferingsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/ListBackupOfferingsCmd.java index e745a6ba66d..d3c0f16d8d1 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/ListBackupOfferingsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/ListBackupOfferingsCmd.java @@ -39,12 +39,11 @@ import com.cloud.exception.ResourceUnavailableException; import com.cloud.utils.Pair; import com.cloud.utils.exception.CloudRuntimeException; -@APICommand(name = ListBackupOfferingsCmd.APINAME, +@APICommand(name = "listBackupOfferings", description = "Lists backup offerings", responseObject = BackupOfferingResponse.class, since = "4.14.0", authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User}) public class ListBackupOfferingsCmd extends BaseBackupListCmd { - public static final String APINAME = "listBackupOfferings"; @Inject private BackupManager backupManager; @@ -89,8 +88,4 @@ public class ListBackupOfferingsCmd extends BaseBackupListCmd { } } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + RESPONSE_SUFFIX; } -} diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/ListBackupScheduleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/ListBackupScheduleCmd.java index 4068dc295dc..6cc765328f6 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/ListBackupScheduleCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/ListBackupScheduleCmd.java @@ -39,12 +39,11 @@ import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.utils.exception.CloudRuntimeException; -@APICommand(name = ListBackupScheduleCmd.APINAME, +@APICommand(name = "listBackupSchedule", description = "List backup schedule of a VM", responseObject = BackupScheduleResponse.class, since = "4.14.0", authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User}) public class ListBackupScheduleCmd extends BaseCmd { - public static final String APINAME = "listBackupSchedule"; @Inject private BackupManager backupManager; @@ -88,13 +87,8 @@ public class ListBackupScheduleCmd extends BaseCmd { } } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccount().getId(); } -} \ No newline at end of file +} diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/ListBackupsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/ListBackupsCmd.java index 1e1e7312897..8597d97278c 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/ListBackupsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/ListBackupsCmd.java @@ -26,7 +26,6 @@ import org.apache.cloudstack.acl.RoleType; import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; -import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.BaseListProjectAndAccountResourcesCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; @@ -45,12 +44,11 @@ import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.utils.Pair; -@APICommand(name = ListBackupsCmd.APINAME, +@APICommand(name = "listBackups", description = "Lists VM backups", responseObject = BackupResponse.class, since = "4.14.0", authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User}) public class ListBackupsCmd extends BaseListProjectAndAccountResourcesCmd { - public static final String APINAME = "listBackups"; @Inject private BackupManager backupManager; @@ -122,11 +120,6 @@ public class ListBackupsCmd extends BaseListProjectAndAccountResourcesCmd { } } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccount().getId(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/RemoveVirtualMachineFromBackupOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/RemoveVirtualMachineFromBackupOfferingCmd.java index 28f03f8c853..c451bff5456 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/RemoveVirtualMachineFromBackupOfferingCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/RemoveVirtualMachineFromBackupOfferingCmd.java @@ -24,7 +24,6 @@ import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseAsyncCmd; -import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.SuccessResponse; @@ -39,12 +38,11 @@ import com.cloud.exception.NetworkRuleConflictException; import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; -@APICommand(name = RemoveVirtualMachineFromBackupOfferingCmd.APINAME, +@APICommand(name = "removeVirtualMachineFromBackupOffering", description = "Removes a VM from any existing backup offering", responseObject = SuccessResponse.class, since = "4.14.0", authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User}) public class RemoveVirtualMachineFromBackupOfferingCmd extends BaseAsyncCmd { - public static final String APINAME = "removeVirtualMachineFromBackupOffering"; @Inject private BackupManager backupManager; @@ -96,11 +94,6 @@ public class RemoveVirtualMachineFromBackupOfferingCmd extends BaseAsyncCmd { } } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccount().getId(); @@ -115,4 +108,4 @@ public class RemoveVirtualMachineFromBackupOfferingCmd extends BaseAsyncCmd { public String getEventDescription() { return "Removing VM ID" + vmId + " from backup offering"; } -} \ No newline at end of file +} diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/RestoreBackupCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/RestoreBackupCmd.java index 62fa9a17b77..6d02a084b70 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/RestoreBackupCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/RestoreBackupCmd.java @@ -24,7 +24,6 @@ import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseAsyncCmd; -import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.SuccessResponse; @@ -40,12 +39,11 @@ import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.utils.exception.CloudRuntimeException; -@APICommand(name = RestoreBackupCmd.APINAME, +@APICommand(name = "restoreBackup", description = "Restores an existing stopped or deleted VM using a VM backup", responseObject = SuccessResponse.class, since = "4.14.0", authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User}) public class RestoreBackupCmd extends BaseAsyncCmd { - public static final String APINAME = "restoreBackup"; @Inject private BackupManager backupManager; @@ -89,11 +87,6 @@ public class RestoreBackupCmd extends BaseAsyncCmd { } } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccount().getId(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/RestoreVolumeFromBackupAndAttachToVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/RestoreVolumeFromBackupAndAttachToVMCmd.java index b5966a737df..310b0bd9bf1 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/RestoreVolumeFromBackupAndAttachToVMCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/RestoreVolumeFromBackupAndAttachToVMCmd.java @@ -24,7 +24,6 @@ import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseAsyncCmd; -import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.SuccessResponse; @@ -41,12 +40,11 @@ import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.utils.exception.CloudRuntimeException; -@APICommand(name = RestoreVolumeFromBackupAndAttachToVMCmd.APINAME, +@APICommand(name = "restoreVolumeFromBackupAndAttachToVM", description = "Restore and attach a backed up volume to VM", responseObject = SuccessResponse.class, since = "4.14.0", authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User}) public class RestoreVolumeFromBackupAndAttachToVMCmd extends BaseAsyncCmd { - public static final String APINAME = "restoreVolumeFromBackupAndAttachToVM"; @Inject private BackupManager backupManager; @@ -91,11 +89,6 @@ public class RestoreVolumeFromBackupAndAttachToVMCmd extends BaseAsyncCmd { return backupId; } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccount().getId(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/UpdateBackupScheduleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/UpdateBackupScheduleCmd.java index 5a02cf9ac78..47c8dc42fac 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/UpdateBackupScheduleCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/UpdateBackupScheduleCmd.java @@ -21,10 +21,9 @@ import org.apache.cloudstack.acl.RoleType; import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.response.BackupResponse; -@APICommand(name = UpdateBackupScheduleCmd.APINAME, +@APICommand(name = "updateBackupSchedule", description = "Updates a user-defined VM backup schedule", responseObject = BackupResponse.class, since = "4.14.0", authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User}) public class UpdateBackupScheduleCmd extends CreateBackupScheduleCmd { - public static final String APINAME = "updateBackupSchedule"; } diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/config/ListCapabilitiesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/config/ListCapabilitiesCmd.java index 05176f58a72..fa65101778c 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/config/ListCapabilitiesCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/config/ListCapabilitiesCmd.java @@ -31,12 +31,6 @@ import com.cloud.user.Account; public class ListCapabilitiesCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(ListCapabilitiesCmd.class.getName()); - private static final String s_name = "listcapabilitiesresponse"; - - @Override - public String getCommandName() { - return s_name; - } @Override public long getEntityOwnerId() { diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/consoleproxy/CreateConsoleEndpointCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/consoleproxy/CreateConsoleEndpointCmd.java index 37b9871ceae..11e84f1bef9 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/consoleproxy/CreateConsoleEndpointCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/consoleproxy/CreateConsoleEndpointCmd.java @@ -40,13 +40,12 @@ import org.apache.log4j.Logger; import javax.inject.Inject; import java.util.Map; -@APICommand(name = CreateConsoleEndpointCmd.APINAME, description = "Create a console endpoint to connect to a VM console", +@APICommand(name = "createConsoleEndpoint", description = "Create a console endpoint to connect to a VM console", responseObject = CreateConsoleEndpointResponse.class, since = "4.18.0", requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User}) public class CreateConsoleEndpointCmd extends BaseCmd { - public static final String APINAME = "createConsoleEndpoint"; public static final Logger s_logger = Logger.getLogger(CreateConsoleEndpointCmd.class.getName()); @Inject @@ -108,11 +107,6 @@ public class CreateConsoleEndpointCmd extends BaseCmd { return getParameterBase(ConsoleAccessUtils.CLIENT_INET_ADDRESS_KEY); } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccount().getId(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/event/ArchiveEventsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/event/ArchiveEventsCmd.java index e4970d6530e..cdff7882e65 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/event/ArchiveEventsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/event/ArchiveEventsCmd.java @@ -41,7 +41,6 @@ public class ArchiveEventsCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(ArchiveEventsCmd.class.getName()); - private static final String s_name = "archiveeventsresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -89,11 +88,6 @@ public class ArchiveEventsCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { Account account = CallContext.current().getCallingAccount(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/event/DeleteEventsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/event/DeleteEventsCmd.java index defb0096962..9d049ac5f06 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/event/DeleteEventsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/event/DeleteEventsCmd.java @@ -41,7 +41,6 @@ public class DeleteEventsCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(DeleteEventsCmd.class.getName()); - private static final String s_name = "deleteeventsresponse"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// @@ -89,11 +88,6 @@ public class DeleteEventsCmd extends BaseCmd { // ///////////// API Implementation/////////////////// // /////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { Account account = CallContext.current().getCallingAccount(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/event/ListEventTypesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/event/ListEventTypesCmd.java index 91f316c3d00..dd0f5179278 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/event/ListEventTypesCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/event/ListEventTypesCmd.java @@ -31,12 +31,6 @@ import com.cloud.user.Account; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class ListEventTypesCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(ListEventTypesCmd.class.getName()); - private static final String s_name = "listeventtypesresponse"; - - @Override - public String getCommandName() { - return s_name; - } @Override public long getEntityOwnerId() { diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/event/ListEventsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/event/ListEventsCmd.java index 66aff30e52d..202bd36bdb5 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/event/ListEventsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/event/ListEventsCmd.java @@ -33,7 +33,6 @@ import com.cloud.event.Event; public class ListEventsCmd extends BaseListProjectAndAccountResourcesCmd { public static final Logger s_logger = Logger.getLogger(ListEventsCmd.class.getName()); - private static final String s_name = "listeventsresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -121,11 +120,6 @@ public class ListEventsCmd extends BaseListProjectAndAccountResourcesCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() { diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/CreateEgressFirewallRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/CreateEgressFirewallRuleCmd.java index 65539346a13..bedb073b880 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/CreateEgressFirewallRuleCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/CreateEgressFirewallRuleCmd.java @@ -50,7 +50,6 @@ import com.cloud.utils.net.NetUtils; public class CreateEgressFirewallRuleCmd extends BaseAsyncCreateCmd implements FirewallRule { public static final Logger s_logger = Logger.getLogger(CreateEgressFirewallRuleCmd.class.getName()); - private static final String s_name = "createegressfirewallruleresponse"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// @@ -136,11 +135,6 @@ public class CreateEgressFirewallRuleCmd extends BaseAsyncCreateCmd implements F // ///////////// API Implementation/////////////////// // /////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - public void setSourceCidrList(List cidrs) { cidrlist = cidrs; } diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java index 878561d5e36..b77041ee174 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java @@ -48,7 +48,6 @@ import com.cloud.utils.net.NetUtils; public class CreateFirewallRuleCmd extends BaseAsyncCreateCmd implements FirewallRule { public static final Logger s_logger = Logger.getLogger(CreateFirewallRuleCmd.class.getName()); - private static final String s_name = "createfirewallruleresponse"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// @@ -118,11 +117,6 @@ public class CreateFirewallRuleCmd extends BaseAsyncCreateCmd implements Firewal // ///////////// API Implementation/////////////////// // /////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - public void setSourceCidrList(List cidrs) { cidrlist = cidrs; } diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java index a90367c8ac4..5e136210150 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java @@ -56,7 +56,6 @@ import com.cloud.vm.VirtualMachine; public class CreatePortForwardingRuleCmd extends BaseAsyncCreateCmd implements PortForwardingRule { public static final Logger s_logger = Logger.getLogger(CreatePortForwardingRuleCmd.class.getName()); - private static final String s_name = "createportforwardingruleresponse"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// @@ -196,11 +195,6 @@ public class CreatePortForwardingRuleCmd extends BaseAsyncCreateCmd implements P // ///////////// API Implementation/////////////////// // /////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() throws ResourceUnavailableException { CallContext callerContext = CallContext.current(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/DeleteEgressFirewallRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/DeleteEgressFirewallRuleCmd.java index bcb25890135..f0ba8a92d01 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/DeleteEgressFirewallRuleCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/DeleteEgressFirewallRuleCmd.java @@ -42,7 +42,6 @@ import com.cloud.network.rules.FirewallRule; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class DeleteEgressFirewallRuleCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DeleteEgressFirewallRuleCmd.class.getName()); - private static final String s_name = "deleteegressfirewallruleresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -67,11 +66,6 @@ public class DeleteEgressFirewallRuleCmd extends BaseAsyncCmd { ///////////////////////////////////////////////////// /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public String getEventType() { return EventTypes.EVENT_FIREWALL_EGRESS_CLOSE; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/DeleteFirewallRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/DeleteFirewallRuleCmd.java index 7bd5836f99e..da1f6b62eca 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/DeleteFirewallRuleCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/DeleteFirewallRuleCmd.java @@ -41,7 +41,6 @@ import com.cloud.network.rules.FirewallRule; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class DeleteFirewallRuleCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DeleteFirewallRuleCmd.class.getName()); - private static final String s_name = "deletefirewallruleresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -65,11 +64,6 @@ public class DeleteFirewallRuleCmd extends BaseAsyncCmd { ///////////////////////////////////////////////////// /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public String getEventType() { return EventTypes.EVENT_FIREWALL_CLOSE; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/DeletePortForwardingRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/DeletePortForwardingRuleCmd.java index 505777b64f9..aebf8da159b 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/DeletePortForwardingRuleCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/DeletePortForwardingRuleCmd.java @@ -40,7 +40,6 @@ import com.cloud.network.rules.PortForwardingRule; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class DeletePortForwardingRuleCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DeletePortForwardingRuleCmd.class.getName()); - private static final String s_name = "deleteportforwardingruleresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -69,11 +68,6 @@ public class DeletePortForwardingRuleCmd extends BaseAsyncCmd { ///////////////////////////////////////////////////// /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public String getEventType() { return EventTypes.EVENT_NET_RULE_DELETE; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/ListEgressFirewallRulesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/ListEgressFirewallRulesCmd.java index 3664031d550..c8c0e85252b 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/ListEgressFirewallRulesCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/ListEgressFirewallRulesCmd.java @@ -40,7 +40,6 @@ import com.cloud.utils.Pair; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class ListEgressFirewallRulesCmd extends BaseListTaggedResourcesCmd implements IListFirewallRulesCmd { public static final Logger s_logger = Logger.getLogger(ListEgressFirewallRulesCmd.class.getName()); - private static final String s_name = "listegressfirewallrulesresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -95,11 +94,6 @@ public class ListEgressFirewallRulesCmd extends BaseListTaggedResourcesCmd imple /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() { Pair, Integer> result = _firewallService.listFirewallRules(this); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/ListFirewallRulesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/ListFirewallRulesCmd.java index 3c3feeabfe1..f79b77893d2 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/ListFirewallRulesCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/ListFirewallRulesCmd.java @@ -39,7 +39,6 @@ import com.cloud.utils.Pair; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class ListFirewallRulesCmd extends BaseListTaggedResourcesCmd implements IListFirewallRulesCmd { public static final Logger s_logger = Logger.getLogger(ListFirewallRulesCmd.class.getName()); - private static final String s_name = "listfirewallrulesresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -99,11 +98,6 @@ public class ListFirewallRulesCmd extends BaseListTaggedResourcesCmd implements /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() { Pair, Integer> result = _firewallService.listFirewallRules(this); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/ListPortForwardingRulesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/ListPortForwardingRulesCmd.java index d5c49a9a4d2..3a942c485fc 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/ListPortForwardingRulesCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/ListPortForwardingRulesCmd.java @@ -39,7 +39,6 @@ import com.cloud.utils.Pair; public class ListPortForwardingRulesCmd extends BaseListTaggedResourcesCmd { public static final Logger s_logger = Logger.getLogger(ListPortForwardingRulesCmd.class.getName()); - private static final String s_name = "listportforwardingrulesresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -92,11 +91,6 @@ public class ListPortForwardingRulesCmd extends BaseListTaggedResourcesCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() { Pair, Integer> result = _rulesService.listPortForwardingRules(this); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/UpdateEgressFirewallRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/UpdateEgressFirewallRuleCmd.java index ddaaf7135b4..1aa06074367 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/UpdateEgressFirewallRuleCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/UpdateEgressFirewallRuleCmd.java @@ -39,7 +39,6 @@ import com.cloud.network.rules.FirewallRule.TrafficType; public class UpdateEgressFirewallRuleCmd extends BaseAsyncCustomIdCmd { public static final Logger s_logger = Logger.getLogger(UpdateEgressFirewallRuleCmd.class.getName()); - private static final String s_name = "updateegressfirewallruleresponse"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// @@ -70,11 +69,6 @@ public class UpdateEgressFirewallRuleCmd extends BaseAsyncCustomIdCmd { // ///////////// API Implementation/////////////////// // /////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() throws ResourceUnavailableException { CallContext.current().setEventDetails("Rule Id: " + id); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/UpdateFirewallRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/UpdateFirewallRuleCmd.java index 3d11ed0f3f5..b39efa01350 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/UpdateFirewallRuleCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/UpdateFirewallRuleCmd.java @@ -39,7 +39,6 @@ import com.cloud.network.rules.FirewallRule.TrafficType; public class UpdateFirewallRuleCmd extends BaseAsyncCustomIdCmd { public static final Logger s_logger = Logger.getLogger(UpdateFirewallRuleCmd.class.getName()); - private static final String s_name = "updatefirewallruleresponse"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// @@ -71,11 +70,6 @@ public class UpdateFirewallRuleCmd extends BaseAsyncCustomIdCmd { // ///////////// API Implementation/////////////////// // /////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() throws ResourceUnavailableException { CallContext.current().setEventDetails("Rule ID: " + id); @@ -120,4 +114,4 @@ public class UpdateFirewallRuleCmd extends BaseAsyncCustomIdCmd { } return ownerId; } -} \ No newline at end of file +} diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/UpdatePortForwardingRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/UpdatePortForwardingRuleCmd.java index 7de50761630..2afc0bb66ad 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/UpdatePortForwardingRuleCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/UpdatePortForwardingRuleCmd.java @@ -39,7 +39,6 @@ import com.cloud.utils.net.Ip; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class UpdatePortForwardingRuleCmd extends BaseAsyncCustomIdCmd { public static final Logger s_logger = Logger.getLogger(UpdatePortForwardingRuleCmd.class.getName()); - private static final String s_name = "updateportforwardingruleresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -103,11 +102,6 @@ public class UpdatePortForwardingRuleCmd extends BaseAsyncCustomIdCmd { - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { PortForwardingRule rule = _entityMgr.findById(PortForwardingRule.class, getId()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/guest/ListGuestOsCategoriesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/guest/ListGuestOsCategoriesCmd.java index 5e89a2b05f0..18a209011c1 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/guest/ListGuestOsCategoriesCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/guest/ListGuestOsCategoriesCmd.java @@ -36,7 +36,6 @@ import com.cloud.utils.Pair; public class ListGuestOsCategoriesCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(ListGuestOsCategoriesCmd.class.getName()); - private static final String s_name = "listoscategoriesresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -64,11 +63,6 @@ public class ListGuestOsCategoriesCmd extends BaseListCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() { Pair, Integer> result = _mgr.listGuestOSCategoriesByCriteria(this); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/guest/ListGuestOsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/guest/ListGuestOsCmd.java index 78fd112d0a6..7419cd8f759 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/guest/ListGuestOsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/guest/ListGuestOsCmd.java @@ -37,7 +37,6 @@ import com.cloud.utils.Pair; public class ListGuestOsCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(ListGuestOsCmd.class.getName()); - private static final String s_name = "listostypesresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -72,11 +71,6 @@ public class ListGuestOsCmd extends BaseListCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() { Pair, Integer> result = _mgr.listGuestOSByCriteria(this); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/ipv6/CreateIpv6FirewallRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/ipv6/CreateIpv6FirewallRuleCmd.java index 6151b6a29db..d4c59cd8d47 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/ipv6/CreateIpv6FirewallRuleCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/ipv6/CreateIpv6FirewallRuleCmd.java @@ -43,7 +43,7 @@ import com.cloud.network.rules.FirewallRule; import com.cloud.user.Account; import com.cloud.utils.net.NetUtils; -@APICommand(name = CreateIpv6FirewallRuleCmd.APINAME, +@APICommand(name = "createIpv6FirewallRule", description = "Creates an Ipv6 firewall rule in the given network (the network has to belong to VPC)", responseObject = FirewallRuleResponse.class, requestHasSensitiveInfo = false, @@ -52,7 +52,6 @@ import com.cloud.utils.net.NetUtils; public class CreateIpv6FirewallRuleCmd extends BaseAsyncCreateCmd { public static final Logger s_logger = Logger.getLogger(CreateIpv6FirewallRuleCmd.class.getName()); - public static final String APINAME = "createIpv6FirewallRule"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// @@ -159,11 +158,6 @@ public class CreateIpv6FirewallRuleCmd extends BaseAsyncCreateCmd { // ///////////// API Implementation/////////////////// // /////////////////////////////////////////////////// - @Override - public String getCommandName() { - return APINAME.toLowerCase() + RESPONSE_SUFFIX; - } - public Integer getSourcePortStart() { return publicStartPort; } diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/ipv6/DeleteIpv6FirewallRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/ipv6/DeleteIpv6FirewallRuleCmd.java index 274f736a62b..5e176a3fabf 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/ipv6/DeleteIpv6FirewallRuleCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/ipv6/DeleteIpv6FirewallRuleCmd.java @@ -34,7 +34,7 @@ import com.cloud.exception.ResourceUnavailableException; import com.cloud.network.rules.FirewallRule; import com.cloud.user.Account; -@APICommand(name = DeleteIpv6FirewallRuleCmd.APINAME, +@APICommand(name = "deleteIpv6FirewallRule", description = "Deletes a IPv6 firewall rule", responseObject = SuccessResponse.class, requestHasSensitiveInfo = false, @@ -42,7 +42,6 @@ import com.cloud.user.Account; authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User}) public class DeleteIpv6FirewallRuleCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DeleteIpv6FirewallRuleCmd.class.getName()); - public static final String APINAME = "deleteIpv6FirewallRule"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -62,11 +61,6 @@ public class DeleteIpv6FirewallRuleCmd extends BaseAsyncCmd { ///////////////////////////////////////////////////// /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return APINAME.toLowerCase() + RESPONSE_SUFFIX; - } - @Override public String getEventType() { return EventTypes.EVENT_IPV6_FIREWALL_RULE_DELETE; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/ipv6/ListIpv6FirewallRulesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/ipv6/ListIpv6FirewallRulesCmd.java index fc2714cf1bf..23941316275 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/ipv6/ListIpv6FirewallRulesCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/ipv6/ListIpv6FirewallRulesCmd.java @@ -34,7 +34,7 @@ import org.apache.log4j.Logger; import com.cloud.network.rules.FirewallRule; import com.cloud.utils.Pair; -@APICommand(name = ListIpv6FirewallRulesCmd.APINAME, +@APICommand(name = "listIpv6FirewallRules", description = "Lists all IPv6 firewall rules", responseObject = FirewallRuleResponse.class, requestHasSensitiveInfo = false, @@ -43,7 +43,6 @@ import com.cloud.utils.Pair; public class ListIpv6FirewallRulesCmd extends BaseListTaggedResourcesCmd implements IListFirewallRulesCmd { public static final Logger s_logger = Logger.getLogger(ListIpv6FirewallRulesCmd.class.getName()); - public static final String APINAME = "listIpv6FirewallRules"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -100,11 +99,6 @@ public class ListIpv6FirewallRulesCmd extends BaseListTaggedResourcesCmd impleme /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return APINAME.toLowerCase() + RESPONSE_SUFFIX; - } - @Override public void execute() { Pair, Integer> result = ipv6Service.listIpv6FirewallRules(this); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/ipv6/UpdateIpv6FirewallRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/ipv6/UpdateIpv6FirewallRuleCmd.java index 2295a17db83..49765c58daf 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/ipv6/UpdateIpv6FirewallRuleCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/ipv6/UpdateIpv6FirewallRuleCmd.java @@ -34,7 +34,7 @@ import com.cloud.exception.ResourceUnavailableException; import com.cloud.network.rules.FirewallRule; import com.cloud.user.Account; -@APICommand(name = UpdateIpv6FirewallRuleCmd.APINAME, +@APICommand(name = "updateIpv6FirewallRule", description = "Updates Ipv6 firewall rule with specified ID", responseObject = FirewallRuleResponse.class, requestHasSensitiveInfo = false, @@ -43,7 +43,6 @@ import com.cloud.user.Account; public class UpdateIpv6FirewallRuleCmd extends BaseAsyncCustomIdCmd { public static final Logger s_logger = Logger.getLogger(UpdateIpv6FirewallRuleCmd.class.getName()); - public static final String APINAME = "updateIpv6FirewallRule"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// @@ -121,11 +120,6 @@ public class UpdateIpv6FirewallRuleCmd extends BaseAsyncCustomIdCmd { // ///////////// API Implementation/////////////////// // /////////////////////////////////////////////////// - @Override - public String getCommandName() { - return APINAME.toLowerCase() + RESPONSE_SUFFIX; - } - public Integer getSourcePortStart() { return publicStartPort; } diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/iso/DeleteIsoCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/iso/DeleteIsoCmd.java index 8e6750cc3e3..504e7c1b5cf 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/iso/DeleteIsoCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/iso/DeleteIsoCmd.java @@ -38,7 +38,6 @@ import com.cloud.user.Account; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class DeleteIsoCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DeleteIsoCmd.class.getName()); - private static final String s_name = "deleteisoresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -73,15 +72,6 @@ public class DeleteIsoCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - - public static String getStaticName() { - return s_name; - } - @Override public long getEntityOwnerId() { VirtualMachineTemplate iso = _entityMgr.findById(VirtualMachineTemplate.class, getId()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/iso/ExtractIsoCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/iso/ExtractIsoCmd.java index 9e63ce00910..03ba2fab722 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/iso/ExtractIsoCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/iso/ExtractIsoCmd.java @@ -40,7 +40,6 @@ import com.cloud.user.Account; public class ExtractIsoCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(ExtractIsoCmd.class.getName()); - private static final String s_name = "extractisoresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -86,11 +85,6 @@ public class ExtractIsoCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public String getEventType() { return EventTypes.EVENT_ISO_EXTRACT; @@ -112,10 +106,6 @@ public class ExtractIsoCmd extends BaseAsyncCmd { return "extracting ISO: " + getId() + " from zone: " + getZoneId(); } - public static String getStaticName() { - return s_name; - } - @Override public ApiCommandResourceType getApiResourceType() { return ApiCommandResourceType.Iso; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/job/ListAsyncJobsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/job/ListAsyncJobsCmd.java index d2ffcf3cd9f..3f035d45ae6 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/job/ListAsyncJobsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/job/ListAsyncJobsCmd.java @@ -28,7 +28,6 @@ import org.apache.cloudstack.api.response.ListResponse; @APICommand(name = "listAsyncJobs", description = "Lists all pending asynchronous jobs for the account.", responseObject = AsyncJobResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class ListAsyncJobsCmd extends BaseListAccountResourcesCmd { - private static final String s_name = "listasyncjobsresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -48,11 +47,6 @@ public class ListAsyncJobsCmd extends BaseListAccountResourcesCmd { ///////////////////////////////////////////////////// /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() { diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/job/QueryAsyncJobResultCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/job/QueryAsyncJobResultCmd.java index 8a75552bfb8..f578078e3a1 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/job/QueryAsyncJobResultCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/job/QueryAsyncJobResultCmd.java @@ -31,7 +31,6 @@ import com.cloud.user.Account; public class QueryAsyncJobResultCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(QueryAsyncJobResultCmd.class.getName()); - private static final String s_name = "queryasyncjobresultresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -52,11 +51,6 @@ public class QueryAsyncJobResultCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/AssignCertToLoadBalancerCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/AssignCertToLoadBalancerCmd.java index 663815106e5..50d69c8d3ae 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/AssignCertToLoadBalancerCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/AssignCertToLoadBalancerCmd.java @@ -44,7 +44,6 @@ public class AssignCertToLoadBalancerCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(AssignCertToLoadBalancerCmd.class.getName()); - private static final String s_name = "assigncerttoloadbalancerresponse"; @Parameter(name = ApiConstants.LBID, type = CommandType.UUID, @@ -77,11 +76,6 @@ public class AssignCertToLoadBalancerCmd extends BaseAsyncCmd { return EventTypes.EVENT_LB_CERT_ASSIGN; } - @Override - public String getCommandName() { - return s_name; - } - @Override public String getEventDescription() { return "Assigning a certificate to a load balancer"; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/AssignToLoadBalancerRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/AssignToLoadBalancerRuleCmd.java index 0e2e86de1c7..7647b017f29 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/AssignToLoadBalancerRuleCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/AssignToLoadBalancerRuleCmd.java @@ -53,7 +53,6 @@ import com.cloud.vm.VirtualMachine; public class AssignToLoadBalancerRuleCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(AssignToLoadBalancerRuleCmd.class.getName()); - private static final String s_name = "assigntoloadbalancerruleresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -99,11 +98,6 @@ public class AssignToLoadBalancerRuleCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { LoadBalancer lb = _entityMgr.findById(LoadBalancer.class, getLoadBalancerId()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/CreateApplicationLoadBalancerCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/CreateApplicationLoadBalancerCmd.java index 0b581f410a8..8c63c8f7951 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/CreateApplicationLoadBalancerCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/CreateApplicationLoadBalancerCmd.java @@ -46,7 +46,6 @@ import com.cloud.utils.net.NetUtils; public class CreateApplicationLoadBalancerCmd extends BaseAsyncCreateCmd { public static final Logger s_logger = Logger.getLogger(CreateApplicationLoadBalancerCmd.class.getName()); - private static final String s_name = "createloadbalancerresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -192,11 +191,6 @@ public class CreateApplicationLoadBalancerCmd extends BaseAsyncCreateCmd { ///////////////////////////////////////////////////// /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() throws ResourceAllocationException, ResourceUnavailableException { ApplicationLoadBalancerRule rule = null; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBHealthCheckPolicyCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBHealthCheckPolicyCmd.java index 94c5324c23e..57cb8078738 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBHealthCheckPolicyCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBHealthCheckPolicyCmd.java @@ -46,7 +46,6 @@ import com.cloud.user.Account; public class CreateLBHealthCheckPolicyCmd extends BaseAsyncCreateCmd { public static final Logger s_logger = Logger.getLogger(CreateLBHealthCheckPolicyCmd.class.getName()); - private static final String s_name = "createlbhealthcheckpolicyresponse"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// @@ -126,11 +125,6 @@ public class CreateLBHealthCheckPolicyCmd extends BaseAsyncCreateCmd { // ///////////// API Implementation/////////////////// // /////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { Account account = CallContext.current().getCallingAccount(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java index 8f384513ce3..ef9e46f3a76 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java @@ -54,7 +54,6 @@ import com.cloud.utils.net.NetUtils; public class CreateLoadBalancerRuleCmd extends BaseAsyncCreateCmd /*implements LoadBalancer */{ public static final Logger s_logger = Logger.getLogger(CreateLoadBalancerRuleCmd.class.getName()); - private static final String s_name = "createloadbalancerruleresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -263,11 +262,6 @@ public class CreateLoadBalancerRuleCmd extends BaseAsyncCreateCmd /*implements L /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() throws ResourceAllocationException, ResourceUnavailableException { diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/DeleteApplicationLoadBalancerCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/DeleteApplicationLoadBalancerCmd.java index d945e81a8b3..912c760168b 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/DeleteApplicationLoadBalancerCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/DeleteApplicationLoadBalancerCmd.java @@ -37,7 +37,6 @@ import com.cloud.exception.InvalidParameterValueException; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class DeleteApplicationLoadBalancerCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DeleteApplicationLoadBalancerCmd.class.getName()); - private static final String s_name = "deleteloadbalancerresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// @@ -57,11 +56,6 @@ public class DeleteApplicationLoadBalancerCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { ApplicationLoadBalancerRule lb = _entityMgr.findById(ApplicationLoadBalancerRule.class, getId()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBHealthCheckPolicyCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBHealthCheckPolicyCmd.java index 74df888b810..159d6b21cbc 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBHealthCheckPolicyCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBHealthCheckPolicyCmd.java @@ -38,7 +38,6 @@ import com.cloud.user.Account; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class DeleteLBHealthCheckPolicyCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DeleteLBHealthCheckPolicyCmd.class.getName()); - private static final String s_name = "deletelbhealthcheckpolicyresponse"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// // /////////////////////////////////////////////////// @@ -62,11 +61,6 @@ public class DeleteLBHealthCheckPolicyCmd extends BaseAsyncCmd { // ///////////// API Implementation/////////////////// // /////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { Account account = CallContext.current().getCallingAccount(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLoadBalancerRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLoadBalancerRuleCmd.java index 2c6ba178b38..f05d4cd2be3 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLoadBalancerRuleCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLoadBalancerRuleCmd.java @@ -38,7 +38,6 @@ import com.cloud.user.Account; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class DeleteLoadBalancerRuleCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DeleteLoadBalancerRuleCmd.class.getName()); - private static final String s_name = "deleteloadbalancerruleresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// @@ -62,11 +61,6 @@ public class DeleteLoadBalancerRuleCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { LoadBalancer lb = _entityMgr.findById(LoadBalancer.class, getId()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/DeleteSslCertCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/DeleteSslCertCmd.java index 656c14c1048..3db733182a1 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/DeleteSslCertCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/DeleteSslCertCmd.java @@ -42,7 +42,6 @@ import com.cloud.utils.exception.CloudRuntimeException; public class DeleteSslCertCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(DeleteSslCertCmd.class.getName()); - private static final String s_name = "deletesslcertresponse"; @Inject CertService _certService; @@ -80,14 +79,9 @@ public class DeleteSslCertCmd extends BaseCmd { } } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccount().getId(); } -} \ No newline at end of file +} diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListApplicationLoadBalancersCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListApplicationLoadBalancersCmd.java index a925b880a22..ad68b301844 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListApplicationLoadBalancersCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListApplicationLoadBalancersCmd.java @@ -40,7 +40,6 @@ import com.cloud.utils.Pair; public class ListApplicationLoadBalancersCmd extends BaseListTaggedResourcesCmd { public static final Logger s_logger = Logger.getLogger(ListApplicationLoadBalancersCmd.class.getName()); - private static final String s_name = "listloadbalancersresponse"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// @@ -102,11 +101,6 @@ public class ListApplicationLoadBalancersCmd extends BaseListTaggedResourcesCmd return super.getDisplay(); } - @Override - public String getCommandName() { - return s_name; - } - public Scheme getScheme() { if (scheme != null) { if (scheme.equalsIgnoreCase(Scheme.Internal.toString())) { diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListLBHealthCheckPoliciesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListLBHealthCheckPoliciesCmd.java index ad0486f31cc..1c1f5d1f9af 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListLBHealthCheckPoliciesCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListLBHealthCheckPoliciesCmd.java @@ -39,7 +39,6 @@ import com.cloud.network.rules.LoadBalancer; public class ListLBHealthCheckPoliciesCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(ListLBHealthCheckPoliciesCmd.class.getName()); - private static final String s_name = "listlbhealthcheckpoliciesresponse"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// @@ -78,11 +77,6 @@ public class ListLBHealthCheckPoliciesCmd extends BaseListCmd { // ///////////// API Implementation/////////////////// // /////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() { List hcpResponses = new ArrayList(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListLBStickinessPoliciesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListLBStickinessPoliciesCmd.java index 4e11430d0b4..3d08d925797 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListLBStickinessPoliciesCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListLBStickinessPoliciesCmd.java @@ -40,7 +40,6 @@ import com.cloud.user.Account; public class ListLBStickinessPoliciesCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(ListLBStickinessPoliciesCmd.class.getName()); - private static final String s_name = "listlbstickinesspoliciesresponse"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// @@ -83,11 +82,6 @@ public class ListLBStickinessPoliciesCmd extends BaseListCmd { // ///////////// API Implementation/////////////////// // /////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() { diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRulesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRulesCmd.java index d1fa8da48f4..51a8fa4bfc8 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRulesCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRulesCmd.java @@ -41,7 +41,6 @@ import com.cloud.utils.Pair; public class ListLoadBalancerRulesCmd extends BaseListTaggedResourcesCmd { public static final Logger s_logger = Logger.getLogger(ListLoadBalancerRulesCmd.class.getName()); - private static final String s_name = "listloadbalancerrulesresponse"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// @@ -114,11 +113,6 @@ public class ListLoadBalancerRulesCmd extends BaseListTaggedResourcesCmd { // ///////////// API Implementation/////////////////// // /////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() { Pair, Integer> loadBalancers = _lbService.searchForLoadBalancers(this); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListSslCertsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListSslCertsCmd.java index a917c58de60..3f422801780 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListSslCertsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListSslCertsCmd.java @@ -41,7 +41,6 @@ import com.cloud.utils.exception.CloudRuntimeException; public class ListSslCertsCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(ListSslCertsCmd.class.getName()); - private static final String s_name = "listsslcertsresponse"; @Inject CertService _certService; @@ -102,11 +101,6 @@ public class ListSslCertsCmd extends BaseCmd { } } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccount().getId(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/RemoveCertFromLoadBalancerCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/RemoveCertFromLoadBalancerCmd.java index d794384b4fa..38593629f78 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/RemoveCertFromLoadBalancerCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/RemoveCertFromLoadBalancerCmd.java @@ -42,7 +42,6 @@ public class RemoveCertFromLoadBalancerCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(RemoveCertFromLoadBalancerCmd.class.getName()); - private static final String s_name = "removecertfromloadbalancerresponse"; @Parameter(name = ApiConstants.LBID, type = CommandType.UUID, @@ -68,11 +67,6 @@ public class RemoveCertFromLoadBalancerCmd extends BaseAsyncCmd { return EventTypes.EVENT_LB_CERT_REMOVE; } - @Override - public String getCommandName() { - return s_name; - } - @Override public String getEventDescription() { return "Removing a certificate from a load balancer with ID " + getLbRuleId(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/RemoveFromLoadBalancerRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/RemoveFromLoadBalancerRuleCmd.java index b0be9613748..01c30c4b3c7 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/RemoveFromLoadBalancerRuleCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/RemoveFromLoadBalancerRuleCmd.java @@ -51,7 +51,6 @@ import com.cloud.user.Account; public class RemoveFromLoadBalancerRuleCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(RemoveFromLoadBalancerRuleCmd.class.getName()); - private static final String s_name = "removefromloadbalancerruleresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -97,11 +96,6 @@ public class RemoveFromLoadBalancerRuleCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { LoadBalancer lb = _entityMgr.findById(LoadBalancer.class, getId()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UpdateApplicationLoadBalancerCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UpdateApplicationLoadBalancerCmd.java index 2c91f934f7d..27d49096ed6 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UpdateApplicationLoadBalancerCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UpdateApplicationLoadBalancerCmd.java @@ -36,7 +36,6 @@ import com.cloud.network.rules.FirewallRule; public class UpdateApplicationLoadBalancerCmd extends BaseAsyncCustomIdCmd { public static final Logger s_logger = Logger.getLogger(UpdateApplicationLoadBalancerCmd.class.getName()); - private static final String s_name = "updateloadbalancerresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -50,11 +49,6 @@ public class UpdateApplicationLoadBalancerCmd extends BaseAsyncCustomIdCmd { ///////////////////////////////////////////////////// /////////////////// Accessors /////////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - public Long getId() { return id; } diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLBHealthCheckPolicyCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLBHealthCheckPolicyCmd.java index 06d9263c954..b6bb59e60dc 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLBHealthCheckPolicyCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLBHealthCheckPolicyCmd.java @@ -32,7 +32,6 @@ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class UpdateLBHealthCheckPolicyCmd extends BaseAsyncCustomIdCmd{ public static final Logger s_logger = Logger.getLogger(UpdateLBHealthCheckPolicyCmd.class.getName()); - private static final String s_name = "updatelbhealthcheckpolicyresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -54,11 +53,6 @@ public class UpdateLBHealthCheckPolicyCmd extends BaseAsyncCustomIdCmd{ return display; } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { Account account = CallContext.current().getCallingAccount(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLBStickinessPolicyCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLBStickinessPolicyCmd.java index 55b3d578c67..2b1f1cc38f6 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLBStickinessPolicyCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLBStickinessPolicyCmd.java @@ -31,7 +31,6 @@ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class UpdateLBStickinessPolicyCmd extends BaseAsyncCustomIdCmd{ public static final Logger s_logger = Logger.getLogger(UpdateLBStickinessPolicyCmd.class.getName()); - private static final String s_name = "updatelbstickinesspolicyresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -53,11 +52,6 @@ public class UpdateLBStickinessPolicyCmd extends BaseAsyncCustomIdCmd{ return display; } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { Account account = CallContext.current().getCallingAccount(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLoadBalancerRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLoadBalancerRuleCmd.java index 6ee277a354c..b09c01adee6 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLoadBalancerRuleCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLoadBalancerRuleCmd.java @@ -39,7 +39,6 @@ import com.cloud.user.Account; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class UpdateLoadBalancerRuleCmd extends BaseAsyncCustomIdCmd { public static final Logger s_logger = Logger.getLogger(UpdateLoadBalancerRuleCmd.class.getName()); - private static final String s_name = "updateloadbalancerruleresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -99,11 +98,6 @@ public class UpdateLoadBalancerRuleCmd extends BaseAsyncCustomIdCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { LoadBalancer lb = _entityMgr.findById(LoadBalancer.class, getId()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UploadSslCertCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UploadSslCertCmd.java index c206a165bc6..abafde85615 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UploadSslCertCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UploadSslCertCmd.java @@ -43,7 +43,6 @@ import org.apache.cloudstack.network.tls.CertService; public class UploadSslCertCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(UploadSslCertCmd.class.getName()); - private static final String s_name = "uploadsslcertresponse"; @Inject CertService _certService; @@ -138,11 +137,6 @@ public class UploadSslCertCmd extends BaseCmd { } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccount().getId(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/nat/CreateIpForwardingRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/nat/CreateIpForwardingRuleCmd.java index 70b721b96ee..62c4906b1b7 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/nat/CreateIpForwardingRuleCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/nat/CreateIpForwardingRuleCmd.java @@ -47,7 +47,6 @@ import com.cloud.user.Account; public class CreateIpForwardingRuleCmd extends BaseAsyncCreateCmd implements StaticNatRule { public static final Logger s_logger = Logger.getLogger(CreateIpForwardingRuleCmd.class.getName()); - private static final String s_name = "createipforwardingruleresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -105,11 +104,6 @@ public class CreateIpForwardingRuleCmd extends BaseAsyncCreateCmd implements Sta /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() throws ResourceUnavailableException { diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/nat/DeleteIpForwardingRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/nat/DeleteIpForwardingRuleCmd.java index d40a63fc67d..5b1335ccf22 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/nat/DeleteIpForwardingRuleCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/nat/DeleteIpForwardingRuleCmd.java @@ -39,7 +39,6 @@ import com.cloud.network.rules.FirewallRule; public class DeleteIpForwardingRuleCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DeleteIpForwardingRuleCmd.class.getName()); - private static final String s_name = "deleteipforwardingruleresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -64,11 +63,6 @@ public class DeleteIpForwardingRuleCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() { CallContext.current().setEventDetails("Rule ID: " + id); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/nat/DisableStaticNatCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/nat/DisableStaticNatCmd.java index c42670d2bc9..9afdfa3642e 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/nat/DisableStaticNatCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/nat/DisableStaticNatCmd.java @@ -39,7 +39,6 @@ import com.cloud.network.IpAddress; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class DisableStaticNatCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DisableStaticNatCmd.class.getName()); - private static final String s_name = "disablestaticnatresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -63,11 +62,6 @@ public class DisableStaticNatCmd extends BaseAsyncCmd { ///////////////////////////////////////////////////// /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public String getEventType() { return EventTypes.EVENT_DISABLE_STATIC_NAT; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/nat/EnableStaticNatCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/nat/EnableStaticNatCmd.java index 60e579196c4..ba97356582a 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/nat/EnableStaticNatCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/nat/EnableStaticNatCmd.java @@ -42,7 +42,6 @@ import com.cloud.uservm.UserVm; public class EnableStaticNatCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(EnableStaticNatCmd.class.getName()); - private static final String s_name = "enablestaticnatresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -113,11 +112,6 @@ public class EnableStaticNatCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { UserVm userVm = _entityMgr.findById(UserVm.class, getVirtualMachineId()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/nat/ListIpForwardingRulesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/nat/ListIpForwardingRulesCmd.java index bc157fc9e1f..5e9da328bc8 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/nat/ListIpForwardingRulesCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/nat/ListIpForwardingRulesCmd.java @@ -40,7 +40,6 @@ import com.cloud.utils.Pair; public class ListIpForwardingRulesCmd extends BaseListProjectAndAccountResourcesCmd { public static final Logger s_logger = Logger.getLogger(ListIpForwardingRulesCmd.class.getName()); - private static final String s_name = "listipforwardingrulesresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -68,11 +67,6 @@ public class ListIpForwardingRulesCmd extends BaseListProjectAndAccountResources ///////////////////////////////////////////////////// /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - public Long getPublicIpAddressId() { return publicIpAddressId; } diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/network/CreateNetworkACLCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/CreateNetworkACLCmd.java index 28416ef9793..70e67151c1d 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/network/CreateNetworkACLCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/network/CreateNetworkACLCmd.java @@ -45,7 +45,6 @@ import com.cloud.utils.net.NetUtils; public class CreateNetworkACLCmd extends BaseAsyncCreateCmd { public static final Logger s_logger = Logger.getLogger(CreateNetworkACLCmd.class.getName()); - private static final String s_name = "createnetworkaclresponse"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// @@ -143,11 +142,6 @@ public class CreateNetworkACLCmd extends BaseAsyncCreateCmd { // ///////////// API Implementation/////////////////// // /////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - public String getAction() { return action; } diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/network/CreateNetworkACLListCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/CreateNetworkACLListCmd.java index 884ca53f05f..14dbfcafd7b 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/network/CreateNetworkACLListCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/network/CreateNetworkACLListCmd.java @@ -40,7 +40,6 @@ import com.cloud.user.Account; public class CreateNetworkACLListCmd extends BaseAsyncCreateCmd { public static final Logger s_logger = Logger.getLogger(CreateNetworkACLListCmd.class.getName()); - private static final String s_name = "createnetworkacllistresponse"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// @@ -91,11 +90,6 @@ public class CreateNetworkACLListCmd extends BaseAsyncCreateCmd { // ///////////// API Implementation/////////////////// // /////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public void create() { NetworkACL result = _networkACLService.createNetworkACL(getName(), getDescription(), getVpcId(), isDisplay()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/network/CreateNetworkPermissionsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/CreateNetworkPermissionsCmd.java index 8224562da76..4a1f65ba7a2 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/network/CreateNetworkPermissionsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/network/CreateNetworkPermissionsCmd.java @@ -35,7 +35,7 @@ import com.cloud.user.Account; import java.util.List; -@APICommand(name = CreateNetworkPermissionsCmd.APINAME, description = "Updates network permissions.", +@APICommand(name = "createNetworkPermissions", description = "Updates network permissions.", responseObject = SuccessResponse.class, entityType = {Network.class}, requestHasSensitiveInfo = false, @@ -45,7 +45,6 @@ import java.util.List; public class CreateNetworkPermissionsCmd extends BaseCmd { public static final Logger LOGGER = Logger.getLogger(CreateNetworkPermissionsCmd.class.getName()); - public static final String APINAME = "createNetworkPermissions"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// @@ -99,11 +98,6 @@ public class CreateNetworkPermissionsCmd extends BaseCmd { // ///////////// API Implementation/////////////////// // /////////////////////////////////////////////////// - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public void execute() { if (accountIds != null && accountNames != null) { diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLCmd.java index 6243826c745..f171492b2f6 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLCmd.java @@ -37,7 +37,6 @@ import com.cloud.user.Account; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class DeleteNetworkACLCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DeleteNetworkACLCmd.class.getName()); - private static final String s_name = "deletenetworkaclresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -57,11 +56,6 @@ public class DeleteNetworkACLCmd extends BaseAsyncCmd { ///////////////////////////////////////////////////// /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public String getEventType() { return EventTypes.EVENT_NETWORK_ACL_ITEM_DELETE; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLListCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLListCmd.java index e6868dbbbdf..5c24efae6eb 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLListCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLListCmd.java @@ -37,7 +37,6 @@ import com.cloud.user.Account; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class DeleteNetworkACLListCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DeleteNetworkACLListCmd.class.getName()); - private static final String s_name = "deletenetworkacllistresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -57,11 +56,6 @@ public class DeleteNetworkACLListCmd extends BaseAsyncCmd { ///////////////////////////////////////////////////// /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public String getEventType() { return EventTypes.EVENT_NETWORK_ACL_DELETE; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/network/DeleteNetworkCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/DeleteNetworkCmd.java index 9f2106139f8..5f15c23e23f 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/network/DeleteNetworkCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/network/DeleteNetworkCmd.java @@ -38,7 +38,6 @@ import com.cloud.network.Network; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class DeleteNetworkCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DeleteNetworkCmd.class.getName()); - private static final String s_name = "deletenetworkresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -67,11 +66,6 @@ public class DeleteNetworkCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() { CallContext.current().setEventDetails("Network Id: " + id); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworkACLListsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworkACLListsCmd.java index 80d616ab6fc..f3a06142d78 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworkACLListsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworkACLListsCmd.java @@ -38,7 +38,6 @@ import com.cloud.utils.Pair; public class ListNetworkACLListsCmd extends BaseListProjectAndAccountResourcesCmd { public static final Logger s_logger = Logger.getLogger(ListNetworkACLListsCmd.class.getName()); - private static final String s_name = "listnetworkacllistsresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -89,11 +88,6 @@ public class ListNetworkACLListsCmd extends BaseListProjectAndAccountResourcesCm /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() { Pair, Integer> result = _networkACLService.listNetworkACLs(this); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworkACLsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworkACLsCmd.java index 4815bf400e4..945142f4df0 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworkACLsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworkACLsCmd.java @@ -38,7 +38,6 @@ import com.cloud.utils.Pair; public class ListNetworkACLsCmd extends BaseListTaggedResourcesCmd { public static final Logger s_logger = Logger.getLogger(ListNetworkACLsCmd.class.getName()); - private static final String s_name = "listnetworkaclsresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -105,11 +104,6 @@ public class ListNetworkACLsCmd extends BaseListTaggedResourcesCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() { Pair, Integer> result = _networkACLService.listNetworkACLItems(this); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworkOfferingsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworkOfferingsCmd.java index e294d39251d..70c01fd1d88 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworkOfferingsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworkOfferingsCmd.java @@ -37,7 +37,6 @@ import com.cloud.utils.Pair; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class ListNetworkOfferingsCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(ListNetworkOfferingsCmd.class.getName()); - private static final String s_name = "listnetworkofferingsresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -192,11 +191,6 @@ public class ListNetworkOfferingsCmd extends BaseListCmd { ///////////////////////////////////////////////////// /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() { Pair, Integer> offerings = _configService.searchForNetworkOfferings(this); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworkPermissionsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworkPermissionsCmd.java index ea5034b1be7..9e6b01d3676 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworkPermissionsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworkPermissionsCmd.java @@ -35,7 +35,7 @@ import com.cloud.user.Account; import java.util.ArrayList; import java.util.List; -@APICommand(name = ListNetworkPermissionsCmd.APINAME, description = "List network visibility and all accounts that have permissions to view this network.", +@APICommand(name = "listNetworkPermissions", description = "List network visibility and all accounts that have permissions to view this network.", responseObject = NetworkPermissionsResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, @@ -44,7 +44,6 @@ import java.util.List; public class ListNetworkPermissionsCmd extends BaseCmd implements UserCmd { public static final Logger LOGGER = Logger.getLogger(ListNetworkPermissionsCmd.class.getName()); - public static final String APINAME = "listNetworkPermissions"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -73,11 +72,6 @@ public class ListNetworkPermissionsCmd extends BaseCmd implements UserCmd { return Account.ACCOUNT_ID_SYSTEM; // no account info given, parent this command to SYSTEM so ERROR events are tracked } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public void execute() { List permissions = _networkService.listNetworkPermissions(this); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/network/RemoveNetworkPermissionsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/RemoveNetworkPermissionsCmd.java index 5f6022fc736..05785c81588 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/network/RemoveNetworkPermissionsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/network/RemoveNetworkPermissionsCmd.java @@ -35,7 +35,7 @@ import com.cloud.user.Account; import java.util.List; -@APICommand(name = RemoveNetworkPermissionsCmd.APINAME, description = "Removes network permissions.", +@APICommand(name = "removeNetworkPermissions", description = "Removes network permissions.", responseObject = SuccessResponse.class, entityType = {Network.class}, requestHasSensitiveInfo = false, @@ -45,7 +45,6 @@ import java.util.List; public class RemoveNetworkPermissionsCmd extends BaseCmd { public static final Logger LOGGER = Logger.getLogger(RemoveNetworkPermissionsCmd.class.getName()); - public static final String APINAME = "removeNetworkPermissions"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// @@ -98,11 +97,6 @@ public class RemoveNetworkPermissionsCmd extends BaseCmd { // ///////////// API Implementation/////////////////// // /////////////////////////////////////////////////// - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public void execute() { if (accountIds != null && accountNames != null) { diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/network/ReplaceNetworkACLListCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/ReplaceNetworkACLListCmd.java index fc08753a679..ea4e74149f4 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/network/ReplaceNetworkACLListCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/network/ReplaceNetworkACLListCmd.java @@ -38,7 +38,6 @@ import com.cloud.user.Account; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class ReplaceNetworkACLListCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(ReplaceNetworkACLListCmd.class.getName()); - private static final String s_name = "replacenetworkacllistresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -72,11 +71,6 @@ public class ReplaceNetworkACLListCmd extends BaseAsyncCmd { ///////////////////////////////////////////////////// /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public String getEventType() { return EventTypes.EVENT_NETWORK_ACL_REPLACE; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/network/ResetNetworkPermissionsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/ResetNetworkPermissionsCmd.java index ac0ee1f8e28..f9817f9be5f 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/network/ResetNetworkPermissionsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/network/ResetNetworkPermissionsCmd.java @@ -30,7 +30,7 @@ import org.apache.log4j.Logger; import com.cloud.network.Network; import com.cloud.user.Account; -@APICommand(name = ResetNetworkPermissionsCmd.APINAME, description = "Resets network permissions.", +@APICommand(name = "resetNetworkPermissions", description = "Resets network permissions.", responseObject = SuccessResponse.class, entityType = {Network.class}, requestHasSensitiveInfo = false, @@ -40,7 +40,6 @@ import com.cloud.user.Account; public class ResetNetworkPermissionsCmd extends BaseCmd { public static final Logger LOGGER = Logger.getLogger(ResetNetworkPermissionsCmd.class.getName()); - public static final String APINAME = "resetNetworkPermissions"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// @@ -61,11 +60,6 @@ public class ResetNetworkPermissionsCmd extends BaseCmd { // ///////////// API Implementation/////////////////// // /////////////////////////////////////////////////// - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public void execute() { boolean result = _networkService.resetNetworkPermissions(this); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/network/RestartNetworkCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/RestartNetworkCmd.java index c59dffc3efb..141dee3c9a0 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/network/RestartNetworkCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/network/RestartNetworkCmd.java @@ -44,7 +44,6 @@ import com.cloud.network.Network; responseHasSensitiveInfo = false) public class RestartNetworkCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(RestartNetworkCmd.class.getName()); - private static final String s_name = "restartnetworkresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -91,11 +90,6 @@ public class RestartNetworkCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - public static String getResultObjectName() { return "addressinfo"; } diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/network/UpdateNetworkACLListCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/UpdateNetworkACLListCmd.java index 04617086a3f..ddcb202aa8d 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/network/UpdateNetworkACLListCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/network/UpdateNetworkACLListCmd.java @@ -35,7 +35,6 @@ import com.cloud.user.Account; @APICommand(name = "updateNetworkACLList", description = "Updates network ACL list", responseObject = SuccessResponse.class, since = "4.4", requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class UpdateNetworkACLListCmd extends BaseAsyncCustomIdCmd { public static final Logger s_logger = Logger.getLogger(UpdateNetworkACLListCmd.class.getName()); - private static final String s_name = "updatenetworkacllistresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -69,11 +68,6 @@ public class UpdateNetworkACLListCmd extends BaseAsyncCustomIdCmd { ///////////////////////////////////////////////////// /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public String getEventType() { return EventTypes.EVENT_NETWORK_ACL_UPDATE; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/offering/ListDiskOfferingsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/offering/ListDiskOfferingsCmd.java index ed295f22e17..5fa24ec1630 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/offering/ListDiskOfferingsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/offering/ListDiskOfferingsCmd.java @@ -33,7 +33,6 @@ import org.apache.cloudstack.api.response.ListResponse; public class ListDiskOfferingsCmd extends BaseListDomainResourcesCmd { public static final Logger s_logger = Logger.getLogger(ListDiskOfferingsCmd.class.getName()); - private static final String s_name = "listdiskofferingsresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -89,11 +88,6 @@ public class ListDiskOfferingsCmd extends BaseListDomainResourcesCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() { diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java index 9774c88d681..3208ef58a4f 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java @@ -32,7 +32,6 @@ import org.apache.cloudstack.api.response.UserVmResponse; public class ListServiceOfferingsCmd extends BaseListDomainResourcesCmd { public static final Logger s_logger = Logger.getLogger(ListServiceOfferingsCmd.class.getName()); - private static final String s_name = "listserviceofferingsresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -135,11 +134,6 @@ public class ListServiceOfferingsCmd extends BaseListDomainResourcesCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() { ListResponse response = _queryService.searchForServiceOfferings(this); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/project/CreateProjectCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/project/CreateProjectCmd.java index 00fff78622e..a0902d6b66a 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/project/CreateProjectCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/project/CreateProjectCmd.java @@ -40,7 +40,6 @@ import com.cloud.user.Account; public class CreateProjectCmd extends BaseAsyncCreateCmd { public static final Logger s_logger = Logger.getLogger(CreateProjectCmd.class.getName()); - private static final String s_name = "createprojectresponse"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// @@ -102,11 +101,6 @@ public class CreateProjectCmd extends BaseAsyncCreateCmd { return displayText; } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { Account caller = CallContext.current().getCallingAccount(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/project/DeleteProjectCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/project/DeleteProjectCmd.java index 4e4a290f021..85b411b075d 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/project/DeleteProjectCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/project/DeleteProjectCmd.java @@ -39,7 +39,6 @@ import com.cloud.projects.Project; public class DeleteProjectCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DeleteProjectCmd.class.getName()); - private static final String s_name = "deleteprojectresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -63,11 +62,6 @@ public class DeleteProjectCmd extends BaseAsyncCmd { return cleanup; } - @Override - public String getCommandName() { - return s_name; - } - ///////////////////////////////////////////////////// /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/project/DeleteProjectInvitationCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/project/DeleteProjectInvitationCmd.java index 736a800888f..600fac350de 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/project/DeleteProjectInvitationCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/project/DeleteProjectInvitationCmd.java @@ -35,7 +35,6 @@ import com.cloud.user.Account; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class DeleteProjectInvitationCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DeleteProjectInvitationCmd.class.getName()); - private static final String s_name = "deleteprojectinvitationresponse"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// @@ -50,11 +49,6 @@ public class DeleteProjectInvitationCmd extends BaseAsyncCmd { return id; } - @Override - public String getCommandName() { - return s_name; - } - // /////////////////////////////////////////////////// // ///////////// API Implementation/////////////////// // /////////////////////////////////////////////////// diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/project/ListProjectInvitationsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/project/ListProjectInvitationsCmd.java index 4a85c9d2bcd..b8d2f9b5f1a 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/project/ListProjectInvitationsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/project/ListProjectInvitationsCmd.java @@ -35,7 +35,6 @@ import org.apache.cloudstack.api.response.ProjectResponse; responseHasSensitiveInfo = false) public class ListProjectInvitationsCmd extends BaseListAccountResourcesCmd { public static final Logger s_logger = Logger.getLogger(ListProjectInvitationsCmd.class.getName()); - private static final String s_name = "listprojectinvitationsresponse"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// @@ -80,11 +79,6 @@ public class ListProjectInvitationsCmd extends BaseListAccountResourcesCmd { return userId; } - @Override - public String getCommandName() { - return s_name; - } - // /////////////////////////////////////////////////// // ///////////// API Implementation/////////////////// // /////////////////////////////////////////////////// diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/project/ListProjectsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/project/ListProjectsCmd.java index f434b75559f..39d1c0dfeda 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/project/ListProjectsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/project/ListProjectsCmd.java @@ -45,7 +45,6 @@ import com.cloud.exception.InvalidParameterValueException; responseHasSensitiveInfo = false) public class ListProjectsCmd extends BaseListAccountResourcesCmd { public static final Logger s_logger = Logger.getLogger(ListProjectsCmd.class.getName()); - private static final String s_name = "listprojectsresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -103,11 +102,6 @@ public class ListProjectsCmd extends BaseListAccountResourcesCmd { return username; } - @Override - public String getCommandName() { - return s_name; - } - public Map getTags() { return TaggedResources.parseKeyValueMap(tags, false); } diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/project/SuspendProjectCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/project/SuspendProjectCmd.java index 57f052b3e14..4937b164aab 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/project/SuspendProjectCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/project/SuspendProjectCmd.java @@ -40,7 +40,6 @@ import com.cloud.projects.Project; public class SuspendProjectCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(SuspendProjectCmd.class.getName()); - private static final String s_name = "suspendprojectresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -57,11 +56,6 @@ public class SuspendProjectCmd extends BaseAsyncCmd { return id; } - @Override - public String getCommandName() { - return s_name; - } - ///////////////////////////////////////////////////// /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/project/UpdateProjectCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/project/UpdateProjectCmd.java index 8108bdebc74..8732f081681 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/project/UpdateProjectCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/project/UpdateProjectCmd.java @@ -42,7 +42,6 @@ import org.apache.commons.lang3.StringUtils; public class UpdateProjectCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(UpdateProjectCmd.class.getName()); - private static final String s_name = "updateprojectresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -103,11 +102,6 @@ public class UpdateProjectCmd extends BaseAsyncCmd { return ProjectAccount.Role.Regular; } - @Override - public String getCommandName() { - return s_name; - } - public Boolean isSwapOwner() { return swapOwner != null ? swapOwner : true; } diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/project/UpdateProjectInvitationCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/project/UpdateProjectInvitationCmd.java index 53fccfed1a5..e783aa64467 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/project/UpdateProjectInvitationCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/project/UpdateProjectInvitationCmd.java @@ -36,7 +36,6 @@ import com.cloud.user.Account; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class UpdateProjectInvitationCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(UpdateProjectInvitationCmd.class.getName()); - private static final String s_name = "updateprojectinvitationresponse"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// @@ -72,11 +71,6 @@ public class UpdateProjectInvitationCmd extends BaseAsyncCmd { public Long getUserId() { return userId; } - @Override - public String getCommandName() { - return s_name; - } - public String getToken() { return token; } diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/region/ListRegionsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/region/ListRegionsCmd.java index 9a0b186d9ea..d3eb8bf8b0f 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/region/ListRegionsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/region/ListRegionsCmd.java @@ -37,7 +37,6 @@ import org.apache.cloudstack.region.RegionService; public class ListRegionsCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(ListRegionsCmd.class.getName()); - private static final String s_name = "listregionsresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -68,11 +67,6 @@ public class ListRegionsCmd extends BaseListCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() { List result = _regionService.listRegions(this); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/region/ha/gslb/AssignToGlobalLoadBalancerRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/region/ha/gslb/AssignToGlobalLoadBalancerRuleCmd.java index 27723da3448..aedc363e5cc 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/region/ha/gslb/AssignToGlobalLoadBalancerRuleCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/region/ha/gslb/AssignToGlobalLoadBalancerRuleCmd.java @@ -55,7 +55,6 @@ public class AssignToGlobalLoadBalancerRuleCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(AssignToGlobalLoadBalancerRuleCmd.class.getName()); - private static final String s_name = "assigntogloballoadbalancerruleresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -132,11 +131,6 @@ public class AssignToGlobalLoadBalancerRuleCmd extends BaseAsyncCmd { @Inject public GlobalLoadBalancingRulesService _gslbService; - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { GlobalLoadBalancerRule globalLoadBalancerRule = _entityMgr.findById(GlobalLoadBalancerRule.class, getGlobalLoadBalancerRuleId()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/region/ha/gslb/CreateGlobalLoadBalancerRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/region/ha/gslb/CreateGlobalLoadBalancerRuleCmd.java index 6f3a8a6a704..3aaf0607392 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/region/ha/gslb/CreateGlobalLoadBalancerRuleCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/region/ha/gslb/CreateGlobalLoadBalancerRuleCmd.java @@ -44,7 +44,6 @@ public class CreateGlobalLoadBalancerRuleCmd extends BaseAsyncCreateCmd { public static final Logger s_logger = Logger.getLogger(CreateGlobalLoadBalancerRuleCmd.class.getName()); - private static final String s_name = "creategloballoadbalancerruleresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -140,11 +139,6 @@ public class CreateGlobalLoadBalancerRuleCmd extends BaseAsyncCreateCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() throws ResourceAllocationException, ResourceUnavailableException { GlobalLoadBalancerRule rule = _entityMgr.findById(GlobalLoadBalancerRule.class, getEntityId()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/region/ha/gslb/DeleteGlobalLoadBalancerRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/region/ha/gslb/DeleteGlobalLoadBalancerRuleCmd.java index ec84e668db1..87c4e60a90b 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/region/ha/gslb/DeleteGlobalLoadBalancerRuleCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/region/ha/gslb/DeleteGlobalLoadBalancerRuleCmd.java @@ -43,7 +43,6 @@ public class DeleteGlobalLoadBalancerRuleCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DeleteGlobalLoadBalancerRuleCmd.class.getName()); - private static final String s_name = "deletegloballoadbalancerruleresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -68,11 +67,6 @@ public class DeleteGlobalLoadBalancerRuleCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Inject public GlobalLoadBalancingRulesService _gslbService; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/region/ha/gslb/ListGlobalLoadBalancerRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/region/ha/gslb/ListGlobalLoadBalancerRuleCmd.java index e5630f87e14..7a1bcfc37a7 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/region/ha/gslb/ListGlobalLoadBalancerRuleCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/region/ha/gslb/ListGlobalLoadBalancerRuleCmd.java @@ -40,7 +40,6 @@ import com.cloud.region.ha.GlobalLoadBalancingRulesService; public class ListGlobalLoadBalancerRuleCmd extends BaseListTaggedResourcesCmd { public static final Logger s_logger = Logger.getLogger(ListGlobalLoadBalancerRuleCmd.class.getName()); - private static final String s_name = "listgloballoadbalancerrulesresponse"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// @@ -71,11 +70,6 @@ public class ListGlobalLoadBalancerRuleCmd extends BaseListTaggedResourcesCmd { @Inject public GlobalLoadBalancingRulesService _gslbService; - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() { List globalLoadBalancers = _gslbService.listGlobalLoadBalancerRule(this); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/region/ha/gslb/UpdateGlobalLoadBalancerRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/region/ha/gslb/UpdateGlobalLoadBalancerRuleCmd.java index aa9f7aab47f..c8d307e4084 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/region/ha/gslb/UpdateGlobalLoadBalancerRuleCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/region/ha/gslb/UpdateGlobalLoadBalancerRuleCmd.java @@ -39,7 +39,6 @@ import com.cloud.user.Account; public class UpdateGlobalLoadBalancerRuleCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(UpdateGlobalLoadBalancerRuleCmd.class.getName()); - private static final String s_name = "updategloballoadbalancerruleresponse"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// @@ -99,11 +98,6 @@ public class UpdateGlobalLoadBalancerRuleCmd extends BaseAsyncCmd { @Inject public GlobalLoadBalancingRulesService _gslbService; - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { GlobalLoadBalancerRule lb = _entityMgr.findById(GlobalLoadBalancerRule.class, getId()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/resource/GetCloudIdentifierCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/resource/GetCloudIdentifierCmd.java index 366401f3a6f..b513b811e46 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/resource/GetCloudIdentifierCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/resource/GetCloudIdentifierCmd.java @@ -35,7 +35,6 @@ import com.cloud.user.Account; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class GetCloudIdentifierCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(GetCloudIdentifierCmd.class.getName()); - private static final String s_name = "getcloudidentifierresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -60,11 +59,6 @@ public class GetCloudIdentifierCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/resource/ListDetailOptionsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/resource/ListDetailOptionsCmd.java index 795b4d07fdd..240852a74c5 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/resource/ListDetailOptionsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/resource/ListDetailOptionsCmd.java @@ -27,7 +27,7 @@ import org.apache.cloudstack.context.CallContext; import com.cloud.server.ResourceTag; import org.apache.commons.lang3.StringUtils; -@APICommand(name = ListDetailOptionsCmd.APINAME, +@APICommand(name = "listDetailOptions", description = "Lists all possible details and their options for a resource type such as a VM or a template", responseObject = DetailOptionsResponse.class, since = "4.13", @@ -35,7 +35,6 @@ import org.apache.commons.lang3.StringUtils; responseHasSensitiveInfo = false, authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User}) public class ListDetailOptionsCmd extends BaseCmd { - public final static String APINAME = "listDetailOptions"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -68,11 +67,6 @@ public class ListDetailOptionsCmd extends BaseCmd { /////////////////// Implementation ////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccountId(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/resource/ListHypervisorsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/resource/ListHypervisorsCmd.java index cd1cbb025f7..a0e750eb19f 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/resource/ListHypervisorsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/resource/ListHypervisorsCmd.java @@ -35,12 +35,6 @@ import com.cloud.user.Account; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class ListHypervisorsCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(ListHypervisorsCmd.class.getName()); - private static final String s_name = "listhypervisorsresponse"; - - @Override - public String getCommandName() { - return s_name; - } // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/resource/ListResourceLimitsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/resource/ListResourceLimitsCmd.java index a3d84f837fb..adf1c93e4d0 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/resource/ListResourceLimitsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/resource/ListResourceLimitsCmd.java @@ -36,7 +36,6 @@ import com.cloud.configuration.ResourceLimit; public class ListResourceLimitsCmd extends BaseListProjectAndAccountResourcesCmd { public static final Logger s_logger = Logger.getLogger(ListResourceLimitsCmd.class.getName()); - private static final String s_name = "listresourcelimitsresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -95,11 +94,6 @@ public class ListResourceLimitsCmd extends BaseListProjectAndAccountResourcesCmd /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() { List result = diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/resource/UpdateResourceCountCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/resource/UpdateResourceCountCmd.java index 0591a8439df..424087bc71e 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/resource/UpdateResourceCountCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/resource/UpdateResourceCountCmd.java @@ -40,7 +40,6 @@ import com.cloud.user.Account; public class UpdateResourceCountCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(UpdateResourceCountCmd.class.getName()); - private static final String s_name = "updateresourcecountresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -98,11 +97,6 @@ public class UpdateResourceCountCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { Account account = CallContext.current().getCallingAccount(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/resource/UpdateResourceLimitCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/resource/UpdateResourceLimitCmd.java index b88ab383f2c..41676ed23ca 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/resource/UpdateResourceLimitCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/resource/UpdateResourceLimitCmd.java @@ -35,7 +35,6 @@ import com.cloud.configuration.ResourceLimit; public class UpdateResourceLimitCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(UpdateResourceLimitCmd.class.getName()); - private static final String s_name = "updateresourcelimitresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -93,11 +92,6 @@ public class UpdateResourceLimitCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { Long accountId = _accountService.finalyzeAccountId(accountName, domainId, projectId, true); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupEgressCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupEgressCmd.java index 0e1c172bd5b..737bdc8773b 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupEgressCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupEgressCmd.java @@ -52,7 +52,6 @@ import com.cloud.network.security.SecurityRule; public class AuthorizeSecurityGroupEgressCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(AuthorizeSecurityGroupEgressCmd.class.getName()); - private static final String s_name = "authorizesecuritygroupegressresponse"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// @@ -163,11 +162,6 @@ public class AuthorizeSecurityGroupEgressCmd extends BaseAsyncCmd { // ///////////// API Implementation/////////////////// // /////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - public static String getResultObjectName() { return "securitygroup"; } diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java index 503b64397b7..b6918905f29 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java @@ -52,7 +52,6 @@ import com.cloud.network.security.SecurityRule; public class AuthorizeSecurityGroupIngressCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(AuthorizeSecurityGroupIngressCmd.class.getName()); - private static final String s_name = "authorizesecuritygroupingressresponse"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// @@ -163,11 +162,6 @@ public class AuthorizeSecurityGroupIngressCmd extends BaseAsyncCmd { // ///////////// API Implementation/////////////////// // /////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - public static String getResultObjectName() { return "securitygroup"; } diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/CreateSecurityGroupCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/CreateSecurityGroupCmd.java index d3d35bc0b33..4978aa174fc 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/CreateSecurityGroupCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/CreateSecurityGroupCmd.java @@ -37,7 +37,6 @@ import com.cloud.user.Account; public class CreateSecurityGroupCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(CreateSecurityGroupCmd.class.getName()); - private static final String s_name = "createsecuritygroupresponse"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// @@ -89,11 +88,6 @@ public class CreateSecurityGroupCmd extends BaseCmd { // ///////////// API Implementation/////////////////// // /////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { Account account = CallContext.current().getCallingAccount(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/DeleteSecurityGroupCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/DeleteSecurityGroupCmd.java index a4ef7cdce93..57d365d5ce1 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/DeleteSecurityGroupCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/DeleteSecurityGroupCmd.java @@ -40,7 +40,6 @@ import com.cloud.network.security.SecurityGroup; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class DeleteSecurityGroupCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(DeleteSecurityGroupCmd.class.getName()); - private static final String s_name = "deletesecuritygroupresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -104,11 +103,6 @@ public class DeleteSecurityGroupCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { Long accountId = _accountService.finalyzeAccountId(accountName, domainId, projectId, true); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/ListSecurityGroupsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/ListSecurityGroupsCmd.java index 2895593595d..c4c103cf98e 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/ListSecurityGroupsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/ListSecurityGroupsCmd.java @@ -34,7 +34,6 @@ import com.cloud.network.security.SecurityGroup; public class ListSecurityGroupsCmd extends BaseListTaggedResourcesCmd { public static final Logger s_logger = Logger.getLogger(ListSecurityGroupsCmd.class.getName()); - private static final String s_name = "listsecuritygroupsresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -71,11 +70,6 @@ public class ListSecurityGroupsCmd extends BaseListTaggedResourcesCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() { ListResponse response = _queryService.searchForSecurityGroups(this); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupEgressCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupEgressCmd.java index e10c7c75a7c..f4a0362fce9 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupEgressCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupEgressCmd.java @@ -40,7 +40,6 @@ import com.cloud.user.Account; public class RevokeSecurityGroupEgressCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(RevokeSecurityGroupEgressCmd.class.getName()); - private static final String s_name = "revokesecuritygroupegressresponse"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// @@ -61,11 +60,6 @@ public class RevokeSecurityGroupEgressCmd extends BaseAsyncCmd { // ///////////// API Implementation/////////////////// // /////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - public static String getResultObjectName() { return "revokesecuritygroupegress"; } diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupIngressCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupIngressCmd.java index 1b4a13f8777..c5f88c9673f 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupIngressCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupIngressCmd.java @@ -40,7 +40,6 @@ import com.cloud.user.Account; public class RevokeSecurityGroupIngressCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(RevokeSecurityGroupIngressCmd.class.getName()); - private static final String s_name = "revokesecuritygroupingressresponse"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// @@ -62,11 +61,6 @@ public class RevokeSecurityGroupIngressCmd extends BaseAsyncCmd { // ///////////// API Implementation/////////////////// // /////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - public static String getResultObjectName() { return "revokesecuritygroupingress"; } diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/UpdateSecurityGroupCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/UpdateSecurityGroupCmd.java index 154ae71d6e1..9b3000b1bf7 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/UpdateSecurityGroupCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/UpdateSecurityGroupCmd.java @@ -32,14 +32,12 @@ import org.apache.cloudstack.api.response.SecurityGroupResponse; import com.cloud.network.security.SecurityGroup; import com.cloud.user.Account; -@APICommand(name = UpdateSecurityGroupCmd.APINAME, description = "Updates a security group", responseObject = SecurityGroupResponse.class, entityType = {SecurityGroup.class}, +@APICommand(name = "updateSecurityGroup", description = "Updates a security group", responseObject = SecurityGroupResponse.class, entityType = {SecurityGroup.class}, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.14.0.0", authorized = {RoleType.Admin}) public class UpdateSecurityGroupCmd extends BaseCustomIdCmd { - public static final String APINAME = "updateSecurityGroup"; public static final Logger s_logger = Logger.getLogger(UpdateSecurityGroupCmd.class.getName()); - private static final String s_name = "updatesecuritygroupresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -68,11 +66,6 @@ public class UpdateSecurityGroupCmd extends BaseCustomIdCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { SecurityGroup securityGroup = _entityMgr.findById(SecurityGroup.class, getId()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotCmd.java index 787065f9a6d..aee72b3dbae 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotCmd.java @@ -49,7 +49,6 @@ import com.cloud.utils.exception.CloudRuntimeException; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class CreateSnapshotCmd extends BaseAsyncCreateCmd { public static final Logger s_logger = Logger.getLogger(CreateSnapshotCmd.class.getName()); - private static final String s_name = "createsnapshotresponse"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// @@ -153,11 +152,6 @@ public class CreateSnapshotCmd extends BaseAsyncCreateCmd { // ///////////// API Implementation/////////////////// // /////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - public static String getResultObjectName() { return ApiConstants.SNAPSHOT; } diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotFromVMSnapshotCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotFromVMSnapshotCmd.java index bbd6a2fe30b..1fd7cfd013b 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotFromVMSnapshotCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotFromVMSnapshotCmd.java @@ -44,7 +44,6 @@ import com.cloud.vm.snapshot.VMSnapshot; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class CreateSnapshotFromVMSnapshotCmd extends BaseAsyncCreateCmd { public static final Logger s_logger = Logger.getLogger(CreateSnapshotFromVMSnapshotCmd.class.getName()); - private static final String s_name = "createsnapshotfromvmsnapshotresponse"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// @@ -110,11 +109,6 @@ public class CreateSnapshotFromVMSnapshotCmd extends BaseAsyncCreateCmd { // ///////////// API Implementation/////////////////// // /////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - public static String getResultObjectName() { return ApiConstants.SNAPSHOT; } diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotPolicyCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotPolicyCmd.java index 45aa9313f9a..a3b798405eb 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotPolicyCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotPolicyCmd.java @@ -45,7 +45,6 @@ import com.cloud.user.Account; public class CreateSnapshotPolicyCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(CreateSnapshotPolicyCmd.class.getName()); - private static final String s_name = "createsnapshotpolicyresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -112,11 +111,6 @@ public class CreateSnapshotPolicyCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { Volume volume = _entityMgr.findById(Volume.class, getVolumeId()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotCmd.java index dada167ede5..8530e0ff584 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotCmd.java @@ -39,7 +39,6 @@ import com.cloud.user.Account; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class DeleteSnapshotCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DeleteSnapshotCmd.class.getName()); - private static final String s_name = "deletesnapshotresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -62,11 +61,6 @@ public class DeleteSnapshotCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { Snapshot snapshot = _entityMgr.findById(Snapshot.class, getId()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotPoliciesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotPoliciesCmd.java index 2d97d3df261..1a72b22f06c 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotPoliciesCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotPoliciesCmd.java @@ -36,7 +36,6 @@ import com.cloud.user.Account; public class DeleteSnapshotPoliciesCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(DeleteSnapshotPoliciesCmd.class.getName()); - private static final String s_name = "deletesnapshotpoliciesresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -68,11 +67,6 @@ public class DeleteSnapshotPoliciesCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotPoliciesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotPoliciesCmd.java index 282f82c36d7..e30ee75dee7 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotPoliciesCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotPoliciesCmd.java @@ -38,7 +38,6 @@ import com.cloud.utils.Pair; public class ListSnapshotPoliciesCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(ListSnapshotPoliciesCmd.class.getName()); - private static final String s_name = "listsnapshotpoliciesresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -76,11 +75,6 @@ public class ListSnapshotPoliciesCmd extends BaseListCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() { Pair, Integer> result = _snapshotService.listPoliciesforVolume(this); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotsCmd.java index c6a15605ed1..0b4a215733c 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotsCmd.java @@ -39,7 +39,6 @@ import com.cloud.utils.Pair; public class ListSnapshotsCmd extends BaseListTaggedResourcesCmd { public static final Logger s_logger = Logger.getLogger(ListSnapshotsCmd.class.getName()); - private static final String s_name = "listsnapshotsresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -98,11 +97,6 @@ public class ListSnapshotsCmd extends BaseListTaggedResourcesCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public ApiCommandResourceType getApiResourceType() { return ApiCommandResourceType.Snapshot; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/RevertSnapshotCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/RevertSnapshotCmd.java index 824c2b4abee..e65a03812d6 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/RevertSnapshotCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/RevertSnapshotCmd.java @@ -40,7 +40,6 @@ import com.cloud.user.Account; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class RevertSnapshotCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(RevertSnapshotCmd.class.getName()); - private static final String s_name = "revertsnapshotresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -60,11 +59,6 @@ public class RevertSnapshotCmd extends BaseAsyncCmd { ///////////////////////////////////////////////////// /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { Snapshot snapshot = _entityMgr.findById(Snapshot.class, getId()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/UpdateSnapshotPolicyCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/UpdateSnapshotPolicyCmd.java index a0bf118110d..0bedbe66199 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/UpdateSnapshotPolicyCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/UpdateSnapshotPolicyCmd.java @@ -40,7 +40,6 @@ import org.apache.log4j.Logger; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class UpdateSnapshotPolicyCmd extends BaseAsyncCustomIdCmd { public static final Logger s_logger = Logger.getLogger(UpdateSnapshotPolicyCmd.class.getName()); - private static final String s_name = "updatesnapshotpolicyresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -73,11 +72,6 @@ public class UpdateSnapshotPolicyCmd extends BaseAsyncCustomIdCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public Long getApiResourceId() { return getId(); @@ -130,4 +124,4 @@ public class UpdateSnapshotPolicyCmd extends BaseAsyncCustomIdCmd { } } -} \ No newline at end of file +} diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/ssh/CreateSSHKeyPairCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/ssh/CreateSSHKeyPairCmd.java index c275f80cf3b..28bdd4d57f6 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/ssh/CreateSSHKeyPairCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/ssh/CreateSSHKeyPairCmd.java @@ -33,7 +33,6 @@ import com.cloud.user.SSHKeyPair; requestHasSensitiveInfo = false, responseHasSensitiveInfo = true) public class CreateSSHKeyPairCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(CreateSSHKeyPairCmd.class.getName()); - private static final String s_name = "createsshkeypairresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -97,8 +96,4 @@ public class CreateSSHKeyPairCmd extends BaseCmd { setResponseObject(response); } - @Override - public String getCommandName() { - return s_name; } -} diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/ssh/DeleteSSHKeyPairCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/ssh/DeleteSSHKeyPairCmd.java index e1642b25dff..39c65c181c5 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/ssh/DeleteSSHKeyPairCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/ssh/DeleteSSHKeyPairCmd.java @@ -35,7 +35,6 @@ import com.cloud.user.SSHKeyPair; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class DeleteSSHKeyPairCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(DeleteSSHKeyPairCmd.class.getName()); - private static final String s_name = "deletesshkeypairresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -85,11 +84,6 @@ public class DeleteSSHKeyPairCmd extends BaseCmd { setResponseObject(response); } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { Account account = CallContext.current().getCallingAccount(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/ssh/ListSSHKeyPairsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/ssh/ListSSHKeyPairsCmd.java index 560974937ef..71fbb66a337 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/ssh/ListSSHKeyPairsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/ssh/ListSSHKeyPairsCmd.java @@ -35,7 +35,6 @@ import com.cloud.utils.Pair; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class ListSSHKeyPairsCmd extends BaseListProjectAndAccountResourcesCmd { public static final Logger s_logger = Logger.getLogger(ListSSHKeyPairsCmd.class.getName()); - private static final String s_name = "listsshkeypairsresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -84,9 +83,4 @@ public class ListSSHKeyPairsCmd extends BaseListProjectAndAccountResourcesCmd { setResponseObject(response); } - @Override - public String getCommandName() { - return s_name; } - -} diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/ssh/RegisterSSHKeyPairCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/ssh/RegisterSSHKeyPairCmd.java index ed9c4cd304e..8bacfde7f73 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/ssh/RegisterSSHKeyPairCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/ssh/RegisterSSHKeyPairCmd.java @@ -33,7 +33,6 @@ import com.cloud.user.SSHKeyPair; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class RegisterSSHKeyPairCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(RegisterSSHKeyPairCmd.class.getName()); - private static final String s_name = "registersshkeypairresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -105,9 +104,4 @@ public class RegisterSSHKeyPairCmd extends BaseCmd { setResponseObject(response); } - @Override - public String getCommandName() { - return s_name; } - -} diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/tag/CreateTagsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/tag/CreateTagsCmd.java index 6d34444cb37..67705859419 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/tag/CreateTagsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/tag/CreateTagsCmd.java @@ -40,7 +40,6 @@ import com.cloud.server.ResourceTag.ResourceObjectType; public class CreateTagsCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(CreateTagsCmd.class.getName()); - private static final String s_name = "createtagsresponse"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// @@ -87,11 +86,6 @@ public class CreateTagsCmd extends BaseAsyncCmd { // ///////////// API Implementation/////////////////// // /////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { //FIXME - validate the owner here diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/tag/DeleteTagsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/tag/DeleteTagsCmd.java index 3fa6b678051..55dec6e9645 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/tag/DeleteTagsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/tag/DeleteTagsCmd.java @@ -42,7 +42,6 @@ import com.cloud.server.ResourceTag.ResourceObjectType; public class DeleteTagsCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DeleteTagsCmd.class.getName()); - private static final String s_name = "deletetagsresponse"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// @@ -93,11 +92,6 @@ public class DeleteTagsCmd extends BaseAsyncCmd { // ///////////// API Implementation/////////////////// // /////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { //FIXME - validate the owner here diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/tag/ListTagsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/tag/ListTagsCmd.java index e02b25c4468..8b3c83aa20a 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/tag/ListTagsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/tag/ListTagsCmd.java @@ -29,7 +29,6 @@ import com.cloud.server.ResourceTag; @APICommand(name = "listTags", description = "List resource tag(s)", responseObject = ResourceTagResponse.class, since = "4.0.0", entityType = {ResourceTag.class}, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class ListTagsCmd extends BaseListProjectAndAccountResourcesCmd { - private static final String s_name = "listtagsresponse"; @Parameter(name = ApiConstants.RESOURCE_TYPE, type = CommandType.STRING, description = "list by resource type") private String resourceType; @@ -74,11 +73,6 @@ public class ListTagsCmd extends BaseListProjectAndAccountResourcesCmd { return value; } - @Override - public String getCommandName() { - return s_name; - } - public String getCustomer() { return customer; } diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java index 07b0f81bf82..6923751ea77 100755 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java @@ -40,7 +40,6 @@ import com.cloud.user.Account; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class DeleteTemplateCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DeleteTemplateCmd.class.getName()); - private static final String s_name = "deletetemplateresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -74,15 +73,6 @@ public class DeleteTemplateCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - - public static String getStaticName() { - return s_name; - } - @Override public long getEntityOwnerId() { VirtualMachineTemplate template = _entityMgr.findById(VirtualMachineTemplate.class, getId()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java index 13076287a32..91e8d168ecb 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java @@ -40,7 +40,6 @@ import com.cloud.user.Account; public class ExtractTemplateCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(ExtractTemplateCmd.class.getName()); - private static final String s_name = "extracttemplateresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -86,15 +85,6 @@ public class ExtractTemplateCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - - public static String getStaticName() { - return s_name; - } - @Override public long getEntityOwnerId() { VirtualMachineTemplate template = _entityMgr.findById(VirtualMachineTemplate.class, getId()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/userdata/DeleteUserDataCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/userdata/DeleteUserDataCmd.java index 24b2f5b22a8..f527d575979 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/userdata/DeleteUserDataCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/userdata/DeleteUserDataCmd.java @@ -38,7 +38,6 @@ import org.apache.cloudstack.context.CallContext; public class DeleteUserDataCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(DeleteUserDataCmd.class.getName()); - private static final String s_name = "deleteuserdataresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -96,11 +95,6 @@ public class DeleteUserDataCmd extends BaseCmd { } } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { Account account = CallContext.current().getCallingAccount(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/userdata/LinkUserDataToTemplateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/userdata/LinkUserDataToTemplateCmd.java index 8ae5a10a0fb..80044e11c53 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/userdata/LinkUserDataToTemplateCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/userdata/LinkUserDataToTemplateCmd.java @@ -38,7 +38,6 @@ import org.apache.log4j.Logger; public class LinkUserDataToTemplateCmd extends BaseCmd implements AdminCmd { public static final Logger s_logger = Logger.getLogger(LinkUserDataToTemplateCmd.class.getName()); - private static final String s_name = "linkuserdatatotemplateresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -113,11 +112,6 @@ public class LinkUserDataToTemplateCmd extends BaseCmd implements AdminCmd { } } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { VirtualMachineTemplate template = _entityMgr.findById(VirtualMachineTemplate.class, getTemplateId()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/userdata/ListUserDataCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/userdata/ListUserDataCmd.java index 21d4e3b1224..a203043646e 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/userdata/ListUserDataCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/userdata/ListUserDataCmd.java @@ -35,7 +35,6 @@ import com.cloud.utils.Pair; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.18") public class ListUserDataCmd extends BaseListProjectAndAccountResourcesCmd { public static final Logger s_logger = Logger.getLogger(ListUserDataCmd.class.getName()); - private static final String s_name = "listuserdataresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -77,9 +76,4 @@ public class ListUserDataCmd extends BaseListProjectAndAccountResourcesCmd { setResponseObject(response); } - @Override - public String getCommandName() { - return s_name; } - -} diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/userdata/RegisterUserDataCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/userdata/RegisterUserDataCmd.java index bb2e0a3d2a2..3e513efeef6 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/userdata/RegisterUserDataCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/userdata/RegisterUserDataCmd.java @@ -50,7 +50,6 @@ import java.util.List; public class RegisterUserDataCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(RegisterUserDataCmd.class.getName()); - private static final String s_name = "registeruserdataresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -141,8 +140,4 @@ public class RegisterUserDataCmd extends BaseCmd { setResponseObject(response); } - @Override - public String getCommandName() { - return s_name; } -} diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/GetVMPasswordCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/GetVMPasswordCmd.java index 0ba9db538a5..d3cbf82f755 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/GetVMPasswordCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/GetVMPasswordCmd.java @@ -37,7 +37,6 @@ import com.cloud.vm.VirtualMachine; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class GetVMPasswordCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(GetVMPasswordCmd.class.getName()); - private static final String s_name = "getvmpasswordresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -79,8 +78,4 @@ public class GetVMPasswordCmd extends BaseCmd { return Account.ACCOUNT_ID_SYSTEM; // no account info given, parent this command to SYSTEM so ERROR events are tracked } - @Override - public String getCommandName() { - return s_name; } -} diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/ListNicsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/ListNicsCmd.java index 0614e641f30..08235c56ca9 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/ListNicsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/ListNicsCmd.java @@ -46,7 +46,6 @@ import com.cloud.vm.Nic; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class ListNicsCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(ListNicsCmd.class.getName()); - private static final String s_name = "listnicsresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -110,11 +109,6 @@ public class ListNicsCmd extends BaseListCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - public static String getResultObjectName() { return "addressinfo"; } diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/RemoveIpFromVmNicCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/RemoveIpFromVmNicCmd.java index 50e2e560d31..e964cc69231 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/RemoveIpFromVmNicCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/RemoveIpFromVmNicCmd.java @@ -42,7 +42,6 @@ import com.cloud.vm.NicSecondaryIp; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class RemoveIpFromVmNicCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(RemoveIpFromVmNicCmd.class.getName()); - private static final String s_name = "removeipfromnicresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -103,11 +102,6 @@ public class RemoveIpFromVmNicCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - public static String getResultObjectName() { return "addressinfo"; } diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/UpdateVmNicIpCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/UpdateVmNicIpCmd.java index aee5307a233..40658f9b58d 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/UpdateVmNicIpCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/UpdateVmNicIpCmd.java @@ -50,7 +50,6 @@ import com.cloud.vm.Nic; @APICommand(name = "updateVmNicIp", description = "Update the default Ip of a VM Nic", responseObject = UserVmResponse.class) public class UpdateVmNicIpCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(UpdateVmNicIpCmd.class.getName()); - private static final String s_name = "updatevmnicipresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -134,11 +133,6 @@ public class UpdateVmNicIpCmd extends BaseAsyncCmd { ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - public static String getResultObjectName() { return "addressinfo"; } diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vmgroup/CreateVMGroupCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vmgroup/CreateVMGroupCmd.java index 6947f150594..154ec45873a 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/vmgroup/CreateVMGroupCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vmgroup/CreateVMGroupCmd.java @@ -36,7 +36,6 @@ import com.cloud.vm.InstanceGroup; public class CreateVMGroupCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(CreateVMGroupCmd.class.getName()); - private static final String s_name = "createinstancegroupresponse"; // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// @@ -83,11 +82,6 @@ public class CreateVMGroupCmd extends BaseCmd { // ///////////// API Implementation/////////////////// // /////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { Long accountId = _accountService.finalyzeAccountId(accountName, domainId, projectId, true); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vmgroup/DeleteVMGroupCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vmgroup/DeleteVMGroupCmd.java index 8311eccf99e..0bdda0bb9e7 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/vmgroup/DeleteVMGroupCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vmgroup/DeleteVMGroupCmd.java @@ -36,7 +36,6 @@ import com.cloud.vm.InstanceGroup; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class DeleteVMGroupCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(DeleteVMGroupCmd.class.getName()); - private static final String s_name = "deleteinstancegroupresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -58,11 +57,6 @@ public class DeleteVMGroupCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { InstanceGroup group = _entityMgr.findById(InstanceGroup.class, getId()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vmgroup/ListVMGroupsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vmgroup/ListVMGroupsCmd.java index 73fdb8aa18a..2e61c898ae0 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/vmgroup/ListVMGroupsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vmgroup/ListVMGroupsCmd.java @@ -32,7 +32,6 @@ import com.cloud.vm.InstanceGroup; public class ListVMGroupsCmd extends BaseListProjectAndAccountResourcesCmd { public static final Logger s_logger = Logger.getLogger(ListVMGroupsCmd.class.getName()); - private static final String s_name = "listinstancegroupsresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -60,11 +59,6 @@ public class ListVMGroupsCmd extends BaseListProjectAndAccountResourcesCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() { ListResponse response = _queryService.searchForVmGroups(this); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vmgroup/UpdateVMGroupCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vmgroup/UpdateVMGroupCmd.java index befa46c9ce7..8873c852460 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/vmgroup/UpdateVMGroupCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vmgroup/UpdateVMGroupCmd.java @@ -35,7 +35,6 @@ import com.cloud.vm.InstanceGroup; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class UpdateVMGroupCmd extends BaseCmd { - private static final String s_name = "updateinstancegroupresponse"; public static final Logger s_logger = Logger.getLogger(UpdateVMGroupCmd.class.getName()); ///////////////////////////////////////////////////// @@ -64,11 +63,6 @@ public class UpdateVMGroupCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { InstanceGroup group = _entityMgr.findById(InstanceGroup.class, getId()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vmsnapshot/CreateVMSnapshotCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vmsnapshot/CreateVMSnapshotCmd.java index cdd7ab0f951..2c0ea6bc4ae 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/vmsnapshot/CreateVMSnapshotCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vmsnapshot/CreateVMSnapshotCmd.java @@ -43,7 +43,6 @@ import com.cloud.vm.snapshot.VMSnapshot; public class CreateVMSnapshotCmd extends BaseAsyncCreateCmd { public static final Logger s_logger = Logger.getLogger(CreateVMSnapshotCmd.class.getName()); - private static final String s_name = "createvmsnapshotresponse"; @ACL(accessType = AccessType.OperateEntry) @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID, type = CommandType.UUID, required = true, entityType = UserVmResponse.class, description = "The ID of the vm") @@ -129,11 +128,6 @@ public class CreateVMSnapshotCmd extends BaseAsyncCreateCmd { } } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { UserVm userVM = _userVmService.getUserVm(vmId); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vmsnapshot/DeleteVMSnapshotCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vmsnapshot/DeleteVMSnapshotCmd.java index a712d44fc47..bcddc75a8e7 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/vmsnapshot/DeleteVMSnapshotCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vmsnapshot/DeleteVMSnapshotCmd.java @@ -40,7 +40,6 @@ import com.cloud.vm.snapshot.VMSnapshot; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class DeleteVMSnapshotCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DeleteVMSnapshotCmd.class.getName()); - private static final String s_name = "deletevmsnapshotresponse"; @ACL(accessType = AccessType.OperateEntry) @Parameter(name = ApiConstants.VM_SNAPSHOT_ID, @@ -54,11 +53,6 @@ public class DeleteVMSnapshotCmd extends BaseAsyncCmd { return id; } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { VMSnapshot vmSnapshot = _entityMgr.findById(VMSnapshot.class, getId()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vmsnapshot/ListVMSnapshotCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vmsnapshot/ListVMSnapshotCmd.java index 9b2634de39c..87dd6e0b478 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/vmsnapshot/ListVMSnapshotCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vmsnapshot/ListVMSnapshotCmd.java @@ -35,7 +35,6 @@ import com.cloud.vm.snapshot.VMSnapshot; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class ListVMSnapshotCmd extends BaseListTaggedResourcesCmd { - private static final String s_name = "listvmsnapshotresponse"; @Parameter(name = ApiConstants.VM_SNAPSHOT_ID, type = CommandType.UUID, entityType = VMSnapshotResponse.class, description = "The ID of the VM snapshot") private Long id; @@ -83,11 +82,6 @@ public class ListVMSnapshotCmd extends BaseListTaggedResourcesCmd { setResponseObject(response); } - @Override - public String getCommandName() { - return s_name; - } - public List getIds() { return ids; } diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/volume/AddResourceDetailCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/AddResourceDetailCmd.java index d10bbb7016f..8d472d96eef 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/volume/AddResourceDetailCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/AddResourceDetailCmd.java @@ -34,7 +34,6 @@ import com.cloud.server.ResourceTag; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class AddResourceDetailCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(AddResourceDetailCmd.class.getName()); - private static final String s_name = "addresourcedetailresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -80,11 +79,6 @@ public class AddResourceDetailCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { //FIXME - validate the owner here diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/volume/ChangeOfferingForVolumeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/ChangeOfferingForVolumeCmd.java index a45397d2b85..404a02b04b8 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/volume/ChangeOfferingForVolumeCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/ChangeOfferingForVolumeCmd.java @@ -37,7 +37,7 @@ import org.apache.cloudstack.api.response.DiskOfferingResponse; import org.apache.cloudstack.api.response.VolumeResponse; import org.apache.cloudstack.context.CallContext; -@APICommand(name = ChangeOfferingForVolumeCmd.APINAME, +@APICommand(name = "changeOfferingForVolume", description = "Change disk offering of the volume and also an option to auto migrate if required to apply the new disk offering", responseObject = VolumeResponse.class, requestHasSensitiveInfo = false, @@ -45,7 +45,6 @@ import org.apache.cloudstack.context.CallContext; authorized = { RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User}, since = "4.17") public class ChangeOfferingForVolumeCmd extends BaseAsyncCmd implements UserCmd { - public static final String APINAME = "changeOfferingForVolume"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -147,11 +146,6 @@ public class ChangeOfferingForVolumeCmd extends BaseAsyncCmd implements UserCmd } } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseAsyncCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccountId(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/volume/DeleteVolumeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/DeleteVolumeCmd.java index 020d7ca8452..4bcc8a88545 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/volume/DeleteVolumeCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/DeleteVolumeCmd.java @@ -38,7 +38,6 @@ import com.cloud.user.Account; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class DeleteVolumeCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(DeleteVolumeCmd.class.getName()); - private static final String s_name = "deletevolumeresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -61,11 +60,6 @@ public class DeleteVolumeCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - public static String getResultObjectName() { return "volume"; } diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/volume/ExtractVolumeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/ExtractVolumeCmd.java index 8534012c6bd..8f6e3a6c120 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/volume/ExtractVolumeCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/ExtractVolumeCmd.java @@ -43,7 +43,6 @@ import com.cloud.user.Account; public class ExtractVolumeCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(ExtractVolumeCmd.class.getName()); - private static final String s_name = "extractvolumeresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -91,15 +90,6 @@ public class ExtractVolumeCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - - public static String getStaticName() { - return s_name; - } - @Override public ApiCommandResourceType getApiResourceType() { return ApiCommandResourceType.Volume; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/volume/ListResourceDetailsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/ListResourceDetailsCmd.java index 33aa44a3422..318836d8d87 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/volume/ListResourceDetailsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/ListResourceDetailsCmd.java @@ -33,7 +33,6 @@ import com.cloud.server.ResourceTag; @APICommand(name = "listResourceDetails", description = "List resource detail(s)", responseObject = ResourceTagResponse.class, since = "4.2", requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class ListResourceDetailsCmd extends BaseListProjectAndAccountResourcesCmd { - private static final String s_name = "listresourcedetailsresponse"; @Parameter(name = ApiConstants.RESOURCE_TYPE, type = CommandType.STRING, description = "list by resource type", required = true) private String resourceType; @@ -64,11 +63,6 @@ public class ListResourceDetailsCmd extends BaseListProjectAndAccountResourcesCm return value; } - @Override - public String getCommandName() { - return s_name; - } - @Override public Boolean getDisplay() { if (forDisplay != null) { diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/volume/RemoveResourceDetailCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/RemoveResourceDetailCmd.java index c2daa4ff317..98fe6a7e821 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/volume/RemoveResourceDetailCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/RemoveResourceDetailCmd.java @@ -32,7 +32,6 @@ import com.cloud.server.ResourceTag; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class RemoveResourceDetailCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(RemoveResourceDetailCmd.class.getName()); - private static final String s_name = "removeresourcedetailresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -71,11 +70,6 @@ public class RemoveResourceDetailCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public ApiCommandResourceType getApiResourceType() { return ApiCommandResourceType.Volume; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/CreateStaticRouteCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/CreateStaticRouteCmd.java index 40e1932393c..68d7a77d946 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/CreateStaticRouteCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/CreateStaticRouteCmd.java @@ -42,7 +42,6 @@ import com.cloud.network.vpc.VpcGateway; @APICommand(name = "createStaticRoute", description = "Creates a static route", responseObject = StaticRouteResponse.class, entityType = {StaticRoute.class}, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class CreateStaticRouteCmd extends BaseAsyncCreateCmd { - private static final String s_name = "createstaticrouteresponse"; public static final Logger s_logger = Logger.getLogger(CreateStaticRouteCmd.class.getName()); @Parameter(name = ApiConstants.GATEWAY_ID, @@ -115,11 +114,6 @@ public class CreateStaticRouteCmd extends BaseAsyncCreateCmd { } } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { VpcGateway gateway = _entityMgr.findById(VpcGateway.class, gatewayId); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/DeleteStaticRouteCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/DeleteStaticRouteCmd.java index 8065c2fbc33..6210d80586f 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/DeleteStaticRouteCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/DeleteStaticRouteCmd.java @@ -41,7 +41,6 @@ import com.cloud.network.vpc.StaticRoute; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class DeleteStaticRouteCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DeleteStaticRouteCmd.class.getName()); - private static final String s_name = "deletestaticrouteresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -65,11 +64,6 @@ public class DeleteStaticRouteCmd extends BaseAsyncCmd { ///////////////////////////////////////////////////// /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public String getEventType() { return EventTypes.EVENT_STATIC_ROUTE_DELETE; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/DeleteVPCCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/DeleteVPCCmd.java index 89705524d4c..f408e32f62d 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/DeleteVPCCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/DeleteVPCCmd.java @@ -40,7 +40,6 @@ import com.cloud.user.Account; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class DeleteVPCCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DeleteVPCCmd.class.getName()); - private static final String s_name = "deletevpcresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -90,11 +89,6 @@ public class DeleteVPCCmd extends BaseAsyncCmd { } } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { Vpc vpc = _entityMgr.findById(Vpc.class, getId()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/ListPrivateGatewaysCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/ListPrivateGatewaysCmd.java index a985e7633c2..47861c8362e 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/ListPrivateGatewaysCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/ListPrivateGatewaysCmd.java @@ -38,7 +38,6 @@ import com.cloud.utils.Pair; public class ListPrivateGatewaysCmd extends BaseListProjectAndAccountResourcesCmd { public static final Logger s_logger = Logger.getLogger(ListPrivateGatewaysCmd.class.getName()); - private static final String s_name = "listprivategatewaysresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -85,11 +84,6 @@ public class ListPrivateGatewaysCmd extends BaseListProjectAndAccountResourcesCm ///////////////////////////////////////////////////// /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() { Pair, Integer> gateways = _vpcService.listPrivateGateway(this); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/ListStaticRoutesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/ListStaticRoutesCmd.java index 3ad2f444f69..36574e2a777 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/ListStaticRoutesCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/ListStaticRoutesCmd.java @@ -34,7 +34,6 @@ import com.cloud.utils.Pair; @APICommand(name = "listStaticRoutes", description = "Lists all static routes", responseObject = StaticRouteResponse.class, entityType = {StaticRoute.class}, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class ListStaticRoutesCmd extends BaseListTaggedResourcesCmd { - private static final String s_name = "liststaticroutesresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -70,11 +69,6 @@ public class ListStaticRoutesCmd extends BaseListTaggedResourcesCmd { ///////////////////////////////////////////////////// /////////////////// Accessors /////////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() { Pair, Integer> result = _vpcService.listStaticRoutes(this); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/ListVPCOfferingsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/ListVPCOfferingsCmd.java index a58de577e2f..b2e1371812a 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/ListVPCOfferingsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/ListVPCOfferingsCmd.java @@ -35,7 +35,6 @@ import com.cloud.utils.Pair; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class ListVPCOfferingsCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(ListVPCOfferingsCmd.class.getName()); - private static final String s_name = "listvpcofferingsresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -119,9 +118,4 @@ public class ListVPCOfferingsCmd extends BaseListCmd { this.setResponseObject(response); } - @Override - public String getCommandName() { - return s_name; } - -} diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/RestartVPCCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/RestartVPCCmd.java index a3fd58aa070..04946619c0a 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/RestartVPCCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/RestartVPCCmd.java @@ -40,7 +40,6 @@ import com.cloud.user.Account; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class RestartVPCCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(RestartVPCCmd.class.getName()); - private static final String s_name = "restartvpcresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -81,11 +80,6 @@ public class RestartVPCCmd extends BaseAsyncCmd { ///////////////////////////////////////////////////// /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { final Vpc vpc = _entityMgr.findById(Vpc.class, getId()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/AddVpnUserCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/AddVpnUserCmd.java index 0dba83b61b0..9c9f1c0f50f 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/AddVpnUserCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/AddVpnUserCmd.java @@ -39,7 +39,6 @@ import com.cloud.user.Account; public class AddVpnUserCmd extends BaseAsyncCreateCmd { public static final Logger s_logger = Logger.getLogger(AddVpnUserCmd.class.getName()); - private static final String s_name = "addvpnuserresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -90,11 +89,6 @@ public class AddVpnUserCmd extends BaseAsyncCreateCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { Long accountId = _accountService.finalyzeAccountId(accountName, domainId, projectId, true); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/CreateRemoteAccessVpnCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/CreateRemoteAccessVpnCmd.java index ea636faf05f..8ecf4b051ce 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/CreateRemoteAccessVpnCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/CreateRemoteAccessVpnCmd.java @@ -43,7 +43,6 @@ import com.cloud.network.RemoteAccessVpn; public class CreateRemoteAccessVpnCmd extends BaseAsyncCreateCmd { public static final Logger s_logger = Logger.getLogger(CreateRemoteAccessVpnCmd.class.getName()); - private static final String s_name = "createremoteaccessvpnresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -117,11 +116,6 @@ public class CreateRemoteAccessVpnCmd extends BaseAsyncCreateCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { IpAddress ip = _networkService.getIp(publicIpId); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/CreateVpnConnectionCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/CreateVpnConnectionCmd.java index c92bc894203..84aaafc60ed 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/CreateVpnConnectionCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/CreateVpnConnectionCmd.java @@ -43,7 +43,6 @@ import com.cloud.network.vpc.Vpc; public class CreateVpnConnectionCmd extends BaseAsyncCreateCmd { public static final Logger s_logger = Logger.getLogger(CreateVpnConnectionCmd.class.getName()); - private static final String s_name = "createvpnconnectionresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -105,11 +104,6 @@ public class CreateVpnConnectionCmd extends BaseAsyncCreateCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { Site2SiteVpnGateway vpnGw = getVpnGateway(); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/CreateVpnCustomerGatewayCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/CreateVpnCustomerGatewayCmd.java index 93cce3286e6..88c6c12fac7 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/CreateVpnCustomerGatewayCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/CreateVpnCustomerGatewayCmd.java @@ -39,7 +39,6 @@ import com.cloud.network.Site2SiteCustomerGateway; public class CreateVpnCustomerGatewayCmd extends BaseAsyncCreateCmd { public static final Logger s_logger = Logger.getLogger(CreateVpnCustomerGatewayCmd.class.getName()); - private static final String s_name = "createvpncustomergatewayresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -168,11 +167,6 @@ public class CreateVpnCustomerGatewayCmd extends BaseAsyncCreateCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { Long accountId = _accountService.finalyzeAccountId(accountName, domainId, projectId, true); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/CreateVpnGatewayCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/CreateVpnGatewayCmd.java index 3043edcb048..c354e972737 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/CreateVpnGatewayCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/CreateVpnGatewayCmd.java @@ -38,7 +38,6 @@ import org.apache.log4j.Logger; public class CreateVpnGatewayCmd extends BaseAsyncCreateCmd { public static final Logger s_logger = Logger.getLogger(CreateVpnGatewayCmd.class.getName()); - private static final String s_name = "createvpngatewayresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -79,11 +78,6 @@ public class CreateVpnGatewayCmd extends BaseAsyncCreateCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { Vpc vpc = _entityMgr.findById(Vpc.class, vpcId); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/DeleteRemoteAccessVpnCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/DeleteRemoteAccessVpnCmd.java index 17831d5c653..dfc80b2fabc 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/DeleteRemoteAccessVpnCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/DeleteRemoteAccessVpnCmd.java @@ -40,7 +40,6 @@ import com.cloud.network.RemoteAccessVpn; public class DeleteRemoteAccessVpnCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DeleteRemoteAccessVpnCmd.class.getName()); - private static final String s_name = "deleteremoteaccessvpnresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -65,11 +64,6 @@ public class DeleteRemoteAccessVpnCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { if (ownerId == null) { diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/DeleteVpnConnectionCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/DeleteVpnConnectionCmd.java index a76b0c804eb..8a57dfc8edd 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/DeleteVpnConnectionCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/DeleteVpnConnectionCmd.java @@ -37,7 +37,6 @@ import com.cloud.user.Account; public class DeleteVpnConnectionCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DeleteVpnConnectionCmd.class.getName()); - private static final String s_name = "deletevpnconnectionresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -57,11 +56,6 @@ public class DeleteVpnConnectionCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { Site2SiteVpnConnection conn = _entityMgr.findById(Site2SiteVpnConnection.class, getId()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/DeleteVpnCustomerGatewayCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/DeleteVpnCustomerGatewayCmd.java index cf2b895dd7b..e2f0aee90ec 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/DeleteVpnCustomerGatewayCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/DeleteVpnCustomerGatewayCmd.java @@ -39,7 +39,6 @@ import com.cloud.user.Account; public class DeleteVpnCustomerGatewayCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DeleteVpnCustomerGatewayCmd.class.getName()); - private static final String s_name = "deletevpncustomergatewayresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -64,11 +63,6 @@ public class DeleteVpnCustomerGatewayCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { Site2SiteCustomerGateway gw = _entityMgr.findById(Site2SiteCustomerGateway.class, getId()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/DeleteVpnGatewayCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/DeleteVpnGatewayCmd.java index ff927408a24..b7acc5c4506 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/DeleteVpnGatewayCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/DeleteVpnGatewayCmd.java @@ -36,7 +36,6 @@ import com.cloud.user.Account; public class DeleteVpnGatewayCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DeleteVpnGatewayCmd.class.getName()); - private static final String s_name = "deletevpngatewayresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -56,11 +55,6 @@ public class DeleteVpnGatewayCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { Site2SiteVpnGateway gw = _entityMgr.findById(Site2SiteVpnGateway.class, getId()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/ListRemoteAccessVpnsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/ListRemoteAccessVpnsCmd.java index eb876c602b4..1f2f95188e7 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/ListRemoteAccessVpnsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/ListRemoteAccessVpnsCmd.java @@ -39,7 +39,6 @@ import com.cloud.utils.Pair; public class ListRemoteAccessVpnsCmd extends BaseListProjectAndAccountResourcesCmd { public static final Logger s_logger = Logger.getLogger(ListRemoteAccessVpnsCmd.class.getName()); - private static final String s_name = "listremoteaccessvpnsresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -92,11 +91,6 @@ public class ListRemoteAccessVpnsCmd extends BaseListProjectAndAccountResourcesC /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() { Pair, Integer> vpns = _ravService.searchForRemoteAccessVpns(this); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/ListVpnConnectionsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/ListVpnConnectionsCmd.java index 74b9325eb22..763a374645b 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/ListVpnConnectionsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/ListVpnConnectionsCmd.java @@ -38,7 +38,6 @@ import com.cloud.utils.Pair; public class ListVpnConnectionsCmd extends BaseListProjectAndAccountResourcesCmd { public static final Logger s_logger = Logger.getLogger(ListVpnConnectionsCmd.class.getName()); - private static final String s_name = "listvpnconnectionsresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -76,11 +75,6 @@ public class ListVpnConnectionsCmd extends BaseListProjectAndAccountResourcesCmd /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() { Pair, Integer> conns = _s2sVpnService.searchForVpnConnections(this); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/ListVpnCustomerGatewaysCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/ListVpnCustomerGatewaysCmd.java index 6b870be138d..b66c47899f7 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/ListVpnCustomerGatewaysCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/ListVpnCustomerGatewaysCmd.java @@ -36,7 +36,6 @@ import com.cloud.utils.Pair; public class ListVpnCustomerGatewaysCmd extends BaseListProjectAndAccountResourcesCmd { public static final Logger s_logger = Logger.getLogger(ListVpnCustomerGatewaysCmd.class.getName()); - private static final String s_name = "listvpncustomergatewaysresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -57,11 +56,6 @@ public class ListVpnCustomerGatewaysCmd extends BaseListProjectAndAccountResourc /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() { Pair, Integer> gws = _s2sVpnService.searchForCustomerGateways(this); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/ListVpnGatewaysCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/ListVpnGatewaysCmd.java index 3eade028804..fb9c8262003 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/ListVpnGatewaysCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/ListVpnGatewaysCmd.java @@ -38,7 +38,6 @@ import com.cloud.utils.Pair; public class ListVpnGatewaysCmd extends BaseListProjectAndAccountResourcesCmd { public static final Logger s_logger = Logger.getLogger(ListVpnGatewaysCmd.class.getName()); - private static final String s_name = "listvpngatewaysresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -77,11 +76,6 @@ public class ListVpnGatewaysCmd extends BaseListProjectAndAccountResourcesCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() { Pair, Integer> gws = _s2sVpnService.searchForVpnGateways(this); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/ListVpnUsersCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/ListVpnUsersCmd.java index 9af060ac00f..9f8581eb014 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/ListVpnUsersCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/ListVpnUsersCmd.java @@ -36,7 +36,6 @@ import com.cloud.utils.Pair; public class ListVpnUsersCmd extends BaseListProjectAndAccountResourcesCmd { public static final Logger s_logger = Logger.getLogger(ListVpnUsersCmd.class.getName()); - private static final String s_name = "listvpnusersresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -63,11 +62,6 @@ public class ListVpnUsersCmd extends BaseListProjectAndAccountResourcesCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() { Pair, Integer> vpnUsers = _ravService.searchForVpnUsers(this); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/RemoveVpnUserCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/RemoveVpnUserCmd.java index caeb0608b6a..4adf385b127 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/RemoveVpnUserCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/RemoveVpnUserCmd.java @@ -39,7 +39,6 @@ import com.cloud.user.Account; public class RemoveVpnUserCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(RemoveVpnUserCmd.class.getName()); - private static final String s_name = "removevpnuserresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -83,11 +82,6 @@ public class RemoveVpnUserCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { Long accountId = _accountService.finalyzeAccountId(accountName, domainId, projectId, true); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/ResetVpnConnectionCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/ResetVpnConnectionCmd.java index 75e74adcda0..c63126578f2 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/ResetVpnConnectionCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/ResetVpnConnectionCmd.java @@ -38,7 +38,6 @@ import com.cloud.user.Account; public class ResetVpnConnectionCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(ResetVpnConnectionCmd.class.getName()); - private static final String s_name = "resetvpnconnectionresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -75,11 +74,6 @@ public class ResetVpnConnectionCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { Long accountId = _accountService.finalyzeAccountId(accountName, domainId, null, true); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/UpdateRemoteAccessVpnCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/UpdateRemoteAccessVpnCmd.java index 08d3b0a5cd4..d5b36f662f9 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/UpdateRemoteAccessVpnCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/UpdateRemoteAccessVpnCmd.java @@ -34,7 +34,6 @@ import com.cloud.network.RemoteAccessVpn; public class UpdateRemoteAccessVpnCmd extends BaseAsyncCustomIdCmd { public static final Logger s_logger = Logger.getLogger(UpdateRemoteAccessVpnCmd.class.getName()); - private static final String s_name = "updateremoteaccessvpnresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -58,11 +57,6 @@ public class UpdateRemoteAccessVpnCmd extends BaseAsyncCustomIdCmd { return id; } - @Override - public String getCommandName() { - return s_name; - } - public Boolean getDisplay() { return display; } @@ -108,4 +102,4 @@ public class UpdateRemoteAccessVpnCmd extends BaseAsyncCustomIdCmd { _uuidMgr.checkUuid(this.getCustomId(), RemoteAccessVpn.class); } } -} \ No newline at end of file +} diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/UpdateVpnConnectionCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/UpdateVpnConnectionCmd.java index 282afe04267..67cb65bdb93 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/UpdateVpnConnectionCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/UpdateVpnConnectionCmd.java @@ -33,7 +33,6 @@ import com.cloud.user.Account; public class UpdateVpnConnectionCmd extends BaseAsyncCustomIdCmd { public static final Logger s_logger = Logger.getLogger(UpdateVpnConnectionCmd.class.getName()); - private static final String s_name = "updatevpnconnectionresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -58,11 +57,6 @@ public class UpdateVpnConnectionCmd extends BaseAsyncCustomIdCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { Site2SiteVpnConnection conn = _entityMgr.findById(Site2SiteVpnConnection.class, getId()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/UpdateVpnCustomerGatewayCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/UpdateVpnCustomerGatewayCmd.java index 247d970e7a7..179bc0407b4 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/UpdateVpnCustomerGatewayCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/UpdateVpnCustomerGatewayCmd.java @@ -38,7 +38,6 @@ import com.cloud.network.Site2SiteCustomerGateway; public class UpdateVpnCustomerGatewayCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(UpdateVpnCustomerGatewayCmd.class.getName()); - private static final String s_name = "updatevpncustomergatewayresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -162,11 +161,6 @@ public class UpdateVpnCustomerGatewayCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { Long accountId = _accountService.finalyzeAccountId(accountName, domainId, null, true); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/UpdateVpnGatewayCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/UpdateVpnGatewayCmd.java index bbe820a83c4..c69bbb5689f 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/UpdateVpnGatewayCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/UpdateVpnGatewayCmd.java @@ -33,7 +33,6 @@ import com.cloud.user.Account; public class UpdateVpnGatewayCmd extends BaseAsyncCustomIdCmd { public static final Logger s_logger = Logger.getLogger(UpdateVpnGatewayCmd.class.getName()); - private static final String s_name = "updatevpngatewayresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -55,11 +54,6 @@ public class UpdateVpnGatewayCmd extends BaseAsyncCustomIdCmd { return display; } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { Site2SiteVpnGateway gw = _entityMgr.findById(Site2SiteVpnGateway.class, getId()); diff --git a/api/src/test/java/org/apache/cloudstack/api/command/test/AddHostCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/test/AddHostCmdTest.java index 09e4fb6937a..30ec0ade73c 100644 --- a/api/src/test/java/org/apache/cloudstack/api/command/test/AddHostCmdTest.java +++ b/api/src/test/java/org/apache/cloudstack/api/command/test/AddHostCmdTest.java @@ -52,8 +52,7 @@ public class AddHostCmdTest extends TestCase { public void setUp() { resourceService = Mockito.mock(ResourceService.class); responseGenerator = Mockito.mock(ResponseGenerator.class); - addHostCmd = new AddHostCmd() { - }; + addHostCmd = new AddHostCmd(); } @Test diff --git a/api/src/test/java/org/apache/cloudstack/api/command/test/AddSecondaryStorageCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/test/AddSecondaryStorageCmdTest.java index da5bff27ec3..46fd6905683 100644 --- a/api/src/test/java/org/apache/cloudstack/api/command/test/AddSecondaryStorageCmdTest.java +++ b/api/src/test/java/org/apache/cloudstack/api/command/test/AddSecondaryStorageCmdTest.java @@ -49,8 +49,7 @@ public class AddSecondaryStorageCmdTest extends TestCase { @Override @Before public void setUp() { - addImageStoreCmd = new AddImageStoreCmd() { - }; + addImageStoreCmd = new AddImageStoreCmd(); } diff --git a/plugins/api/discovery/src/main/java/org/apache/cloudstack/api/command/user/discovery/ListApisCmd.java b/plugins/api/discovery/src/main/java/org/apache/cloudstack/api/command/user/discovery/ListApisCmd.java index 66d8c5d64e3..8cf643edb04 100644 --- a/plugins/api/discovery/src/main/java/org/apache/cloudstack/api/command/user/discovery/ListApisCmd.java +++ b/plugins/api/discovery/src/main/java/org/apache/cloudstack/api/command/user/discovery/ListApisCmd.java @@ -43,7 +43,6 @@ import com.cloud.user.User; public class ListApisCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(ListApisCmd.class.getName()); - private static final String s_name = "listapisresponse"; @Inject ApiDiscoveryService _apiDiscoveryService; @@ -64,11 +63,6 @@ public class ListApisCmd extends BaseCmd { } } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { // no owner is needed for list command diff --git a/plugins/api/rate-limit/src/main/java/org/apache/cloudstack/api/command/admin/ratelimit/ResetApiLimitCmd.java b/plugins/api/rate-limit/src/main/java/org/apache/cloudstack/api/command/admin/ratelimit/ResetApiLimitCmd.java index 94d3465819f..7aca752252f 100644 --- a/plugins/api/rate-limit/src/main/java/org/apache/cloudstack/api/command/admin/ratelimit/ResetApiLimitCmd.java +++ b/plugins/api/rate-limit/src/main/java/org/apache/cloudstack/api/command/admin/ratelimit/ResetApiLimitCmd.java @@ -41,7 +41,6 @@ import com.cloud.user.Account; public class ResetApiLimitCmd extends BaseCmd { private static final Logger s_logger = Logger.getLogger(ResetApiLimitCmd.class.getName()); - private static final String s_name = "resetapilimitresponse"; @Inject ApiRateLimitService _apiLimitService; @@ -73,11 +72,6 @@ public class ResetApiLimitCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { Account account = CallContext.current().getCallingAccount(); diff --git a/plugins/api/rate-limit/src/main/java/org/apache/cloudstack/api/command/user/ratelimit/GetApiLimitCmd.java b/plugins/api/rate-limit/src/main/java/org/apache/cloudstack/api/command/user/ratelimit/GetApiLimitCmd.java index 51b2064fa90..027d9bef459 100644 --- a/plugins/api/rate-limit/src/main/java/org/apache/cloudstack/api/command/user/ratelimit/GetApiLimitCmd.java +++ b/plugins/api/rate-limit/src/main/java/org/apache/cloudstack/api/command/user/ratelimit/GetApiLimitCmd.java @@ -37,7 +37,6 @@ import com.cloud.user.Account; public class GetApiLimitCmd extends BaseCmd { private static final Logger s_logger = Logger.getLogger(GetApiLimitCmd.class.getName()); - private static final String s_name = "getapilimitresponse"; @Inject ApiRateLimitService _apiLimitService; @@ -49,11 +48,6 @@ public class GetApiLimitCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { Account account = CallContext.current().getCallingAccount(); diff --git a/plugins/api/solidfire-intg-test/src/main/java/org/apache/cloudstack/api/command/admin/solidfire/GetPathForVolumeCmd.java b/plugins/api/solidfire-intg-test/src/main/java/org/apache/cloudstack/api/command/admin/solidfire/GetPathForVolumeCmd.java index 5ff178a2e92..ff3c307a87b 100644 --- a/plugins/api/solidfire-intg-test/src/main/java/org/apache/cloudstack/api/command/admin/solidfire/GetPathForVolumeCmd.java +++ b/plugins/api/solidfire-intg-test/src/main/java/org/apache/cloudstack/api/command/admin/solidfire/GetPathForVolumeCmd.java @@ -30,7 +30,6 @@ import org.apache.cloudstack.util.solidfire.SolidFireIntegrationTestUtil; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class GetPathForVolumeCmd extends BaseCmd { private static final Logger LOGGER = Logger.getLogger(GetPathForVolumeCmd.class.getName()); - private static final String NAME = "getpathforvolumeresponse"; @Parameter(name = ApiConstants.VOLUME_ID, type = CommandType.STRING, description = "CloudStack Volume UUID", required = true) private String _volumeUuid; @@ -41,11 +40,6 @@ public class GetPathForVolumeCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return NAME; - } - @Override public long getEntityOwnerId() { return _util.getAccountIdForVolumeUuid(_volumeUuid); diff --git a/plugins/api/solidfire-intg-test/src/main/java/org/apache/cloudstack/api/command/admin/solidfire/GetSolidFireAccountIdCmd.java b/plugins/api/solidfire-intg-test/src/main/java/org/apache/cloudstack/api/command/admin/solidfire/GetSolidFireAccountIdCmd.java index 9bb8481c3c4..af6400ce1c5 100644 --- a/plugins/api/solidfire-intg-test/src/main/java/org/apache/cloudstack/api/command/admin/solidfire/GetSolidFireAccountIdCmd.java +++ b/plugins/api/solidfire-intg-test/src/main/java/org/apache/cloudstack/api/command/admin/solidfire/GetSolidFireAccountIdCmd.java @@ -32,7 +32,6 @@ import org.apache.cloudstack.util.solidfire.SolidFireIntegrationTestUtil; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class GetSolidFireAccountIdCmd extends BaseCmd { private static final Logger LOGGER = Logger.getLogger(GetSolidFireAccountIdCmd.class.getName()); - private static final String NAME = "getsolidfireaccountidresponse"; @Parameter(name = ApiConstants.ACCOUNT_ID, type = CommandType.STRING, description = "CloudStack Account UUID", required = true) private String csAccountUuid; @@ -46,11 +45,6 @@ public class GetSolidFireAccountIdCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return NAME; - } - @Override public long getEntityOwnerId() { return util.getAccountIdForAccountUuid(csAccountUuid); diff --git a/plugins/api/solidfire-intg-test/src/main/java/org/apache/cloudstack/api/command/admin/solidfire/GetSolidFireVolumeAccessGroupIdsCmd.java b/plugins/api/solidfire-intg-test/src/main/java/org/apache/cloudstack/api/command/admin/solidfire/GetSolidFireVolumeAccessGroupIdsCmd.java index 0516b8ebc45..31330f066e5 100644 --- a/plugins/api/solidfire-intg-test/src/main/java/org/apache/cloudstack/api/command/admin/solidfire/GetSolidFireVolumeAccessGroupIdsCmd.java +++ b/plugins/api/solidfire-intg-test/src/main/java/org/apache/cloudstack/api/command/admin/solidfire/GetSolidFireVolumeAccessGroupIdsCmd.java @@ -35,7 +35,6 @@ import org.apache.cloudstack.util.solidfire.SolidFireIntegrationTestUtil; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class GetSolidFireVolumeAccessGroupIdsCmd extends BaseCmd { private static final Logger LOGGER = Logger.getLogger(GetSolidFireVolumeAccessGroupIdsCmd.class.getName()); - private static final String NAME = "getsolidfirevolumeaccessgroupidsresponse"; @Parameter(name = ApiConstants.CLUSTER_ID, type = CommandType.STRING, description = "Cluster UUID", required = true) private String clusterUuid; @@ -49,11 +48,6 @@ public class GetSolidFireVolumeAccessGroupIdsCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return NAME; - } - @Override public long getEntityOwnerId() { Account account = CallContext.current().getCallingAccount(); @@ -78,4 +72,4 @@ public class GetSolidFireVolumeAccessGroupIdsCmd extends BaseCmd { this.setResponseObject(response); } -} \ No newline at end of file +} diff --git a/plugins/api/solidfire-intg-test/src/main/java/org/apache/cloudstack/api/command/admin/solidfire/GetSolidFireVolumeSizeCmd.java b/plugins/api/solidfire-intg-test/src/main/java/org/apache/cloudstack/api/command/admin/solidfire/GetSolidFireVolumeSizeCmd.java index d7c8acfe378..9179ec26a8b 100644 --- a/plugins/api/solidfire-intg-test/src/main/java/org/apache/cloudstack/api/command/admin/solidfire/GetSolidFireVolumeSizeCmd.java +++ b/plugins/api/solidfire-intg-test/src/main/java/org/apache/cloudstack/api/command/admin/solidfire/GetSolidFireVolumeSizeCmd.java @@ -32,7 +32,6 @@ import org.apache.cloudstack.util.solidfire.SolidFireIntegrationTestUtil; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class GetSolidFireVolumeSizeCmd extends BaseCmd { private static final Logger LOGGER = Logger.getLogger(GetSolidFireVolumeSizeCmd.class.getName()); - private static final String NAME = "getsolidfirevolumesizeresponse"; @Parameter(name = ApiConstants.VOLUME_ID, type = CommandType.STRING, description = "Volume UUID", required = true) private String volumeUuid; @@ -44,11 +43,6 @@ public class GetSolidFireVolumeSizeCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return NAME; - } - @Override public long getEntityOwnerId() { return util.getAccountIdForVolumeUuid(volumeUuid); @@ -67,4 +61,4 @@ public class GetSolidFireVolumeSizeCmd extends BaseCmd { this.setResponseObject(response); } -} \ No newline at end of file +} diff --git a/plugins/api/solidfire-intg-test/src/main/java/org/apache/cloudstack/api/command/admin/solidfire/GetVolumeSnapshotDetailsCmd.java b/plugins/api/solidfire-intg-test/src/main/java/org/apache/cloudstack/api/command/admin/solidfire/GetVolumeSnapshotDetailsCmd.java index 5b9ce373328..91fe6bba1cb 100644 --- a/plugins/api/solidfire-intg-test/src/main/java/org/apache/cloudstack/api/command/admin/solidfire/GetVolumeSnapshotDetailsCmd.java +++ b/plugins/api/solidfire-intg-test/src/main/java/org/apache/cloudstack/api/command/admin/solidfire/GetVolumeSnapshotDetailsCmd.java @@ -35,7 +35,6 @@ import org.apache.cloudstack.util.solidfire.SolidFireIntegrationTestUtil; public class GetVolumeSnapshotDetailsCmd extends BaseCmd { private static final Logger LOGGER = Logger.getLogger(GetVolumeSnapshotDetailsCmd.class.getName()); - private static final String NAME = "getvolumesnapshotdetailsresponse"; @Parameter(name = ApiConstants.SNAPSHOT_ID, type = CommandType.STRING, description = "CloudStack Snapshot UUID", required = true) private String snapshotUuid; @@ -46,11 +45,6 @@ public class GetVolumeSnapshotDetailsCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return NAME; - } - @Override public long getEntityOwnerId() { return util.getAccountIdForSnapshotUuid(snapshotUuid); @@ -70,4 +64,4 @@ public class GetVolumeSnapshotDetailsCmd extends BaseCmd { this.setResponseObject(listReponse); } -} \ No newline at end of file +} diff --git a/plugins/api/solidfire-intg-test/src/main/java/org/apache/cloudstack/api/command/admin/solidfire/GetVolumeiScsiNameCmd.java b/plugins/api/solidfire-intg-test/src/main/java/org/apache/cloudstack/api/command/admin/solidfire/GetVolumeiScsiNameCmd.java index dd6992caf36..41ed1069418 100644 --- a/plugins/api/solidfire-intg-test/src/main/java/org/apache/cloudstack/api/command/admin/solidfire/GetVolumeiScsiNameCmd.java +++ b/plugins/api/solidfire-intg-test/src/main/java/org/apache/cloudstack/api/command/admin/solidfire/GetVolumeiScsiNameCmd.java @@ -31,7 +31,6 @@ import org.apache.cloudstack.util.solidfire.SolidFireIntegrationTestUtil; public class GetVolumeiScsiNameCmd extends BaseCmd { private static final Logger LOGGER = Logger.getLogger(GetVolumeiScsiNameCmd.class.getName()); - private static final String NAME = "getvolumeiscsinameresponse"; @Parameter(name = ApiConstants.VOLUME_ID, type = CommandType.STRING, description = "CloudStack Volume UUID", required = true) private String volumeUuid; @@ -42,11 +41,6 @@ public class GetVolumeiScsiNameCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return NAME; - } - @Override public long getEntityOwnerId() { return _util.getAccountIdForVolumeUuid(volumeUuid); @@ -65,4 +59,4 @@ public class GetVolumeiScsiNameCmd extends BaseCmd { this.setResponseObject(response); } -} \ No newline at end of file +} diff --git a/plugins/api/vmware-sioc/src/main/java/org/apache/cloudstack/api/command/admin/sioc/UpdateSiocInfoCmd.java b/plugins/api/vmware-sioc/src/main/java/org/apache/cloudstack/api/command/admin/sioc/UpdateSiocInfoCmd.java index d0561aa1158..84504d13e4c 100644 --- a/plugins/api/vmware-sioc/src/main/java/org/apache/cloudstack/api/command/admin/sioc/UpdateSiocInfoCmd.java +++ b/plugins/api/vmware-sioc/src/main/java/org/apache/cloudstack/api/command/admin/sioc/UpdateSiocInfoCmd.java @@ -32,14 +32,13 @@ import org.apache.cloudstack.sioc.SiocManager; import com.cloud.user.Account; -@APICommand(name = UpdateSiocInfoCmd.APINAME, description = "Update SIOC info", responseObject = ApiUpdateSiocInfoResponse.class, +@APICommand(name = "updateSiocInfo", description = "Update SIOC info", responseObject = ApiUpdateSiocInfoResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.11.0", authorized = {RoleType.Admin}) public class UpdateSiocInfoCmd extends BaseCmd { private static final Logger s_logger = Logger.getLogger(UpdateSiocInfoCmd.class.getName()); - public static final String APINAME = "updateSiocInfo"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -66,11 +65,6 @@ public class UpdateSiocInfoCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { Account account = CallContext.current().getCallingAccount(); diff --git a/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaBalanceCmd.java b/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaBalanceCmd.java index 8efa678568e..f4e248855fd 100644 --- a/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaBalanceCmd.java +++ b/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaBalanceCmd.java @@ -38,7 +38,6 @@ public class QuotaBalanceCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(QuotaBalanceCmd.class); - private static final String s_name = "quotabalanceresponse"; @Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, required = true, description = "Account Id for which statement needs to be generated") private String accountName; @@ -103,11 +102,6 @@ public class QuotaBalanceCmd extends BaseCmd { this.startDate = startDate == null ? null : new Date(startDate.getTime()); } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return _accountService.getActiveAccountByName(accountName, domainId).getAccountId(); diff --git a/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaCreditsCmd.java b/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaCreditsCmd.java index cc707fabefb..c47c0ad2d76 100644 --- a/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaCreditsCmd.java +++ b/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaCreditsCmd.java @@ -44,7 +44,6 @@ public class QuotaCreditsCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(QuotaStatementCmd.class); - private static final String s_name = "quotacreditsresponse"; @Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, required = true, description = "Account Id for which quota credits need to be added") private String accountName; @@ -105,11 +104,6 @@ public class QuotaCreditsCmd extends BaseCmd { super(); } - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() { Long accountId = null; diff --git a/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaEmailTemplateListCmd.java b/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaEmailTemplateListCmd.java index 9d013207654..3cca09c909e 100644 --- a/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaEmailTemplateListCmd.java +++ b/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaEmailTemplateListCmd.java @@ -29,7 +29,6 @@ import javax.inject.Inject; @APICommand(name = "quotaEmailTemplateList", responseObject = QuotaEmailTemplateResponse.class, description = "Lists all quota email templates", since = "4.7.0", requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class QuotaEmailTemplateListCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(QuotaEmailTemplateListCmd.class); - private static final String s_name = "quotaemailtemplatelistresponse"; @Inject QuotaResponseBuilder _quotaResponseBuilder; @@ -53,8 +52,4 @@ public class QuotaEmailTemplateListCmd extends BaseListCmd { setResponseObject(response); } - @Override - public String getCommandName() { - return s_name; } -} diff --git a/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaEmailTemplateUpdateCmd.java b/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaEmailTemplateUpdateCmd.java index a47a7832e8c..36d09864e54 100644 --- a/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaEmailTemplateUpdateCmd.java +++ b/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaEmailTemplateUpdateCmd.java @@ -33,7 +33,6 @@ import java.util.Arrays; @APICommand(name = "quotaEmailTemplateUpdate", responseObject = SuccessResponse.class, description = "Updates existing email templates for quota alerts", since = "4.7.0", requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class QuotaEmailTemplateUpdateCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(QuotaEmailTemplateUpdateCmd.class); - private static final String s_name = "quotaemailtemplateupdateresponse"; @Inject QuotaResponseBuilder _quotaResponseBuilder; @@ -78,11 +77,6 @@ public class QuotaEmailTemplateUpdateCmd extends BaseCmd { setResponseObject(response); } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaEnabledCmd.java b/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaEnabledCmd.java index a10be67599a..ad6f12e9cc6 100644 --- a/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaEnabledCmd.java +++ b/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaEnabledCmd.java @@ -32,7 +32,6 @@ public class QuotaEnabledCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(QuotaEnabledCmd.class); - private static final String s_name = "quotaisenabledresponse"; @Inject QuotaService _quotaService; @@ -41,11 +40,6 @@ public class QuotaEnabledCmd extends BaseCmd { super(); } - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() { Boolean isEnabled = _quotaService.isQuotaServiceEnabled(); diff --git a/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaStatementCmd.java b/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaStatementCmd.java index ebf3f1c636b..4d1c233c37a 100644 --- a/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaStatementCmd.java +++ b/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaStatementCmd.java @@ -40,7 +40,6 @@ public class QuotaStatementCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(QuotaStatementCmd.class); - private static final String s_name = "quotastatementresponse"; @Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, required = true, description = "Optional, Account Id for which statement needs to be generated") private String accountName; @@ -111,11 +110,6 @@ public class QuotaStatementCmd extends BaseCmd { this.startDate = startDate == null ? null : new Date(startDate.getTime()); } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { Account activeAccountByName = _accountService.getActiveAccountByName(accountName, domainId); diff --git a/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaSummaryCmd.java b/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaSummaryCmd.java index 456213fd225..9236be1e0f8 100644 --- a/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaSummaryCmd.java +++ b/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaSummaryCmd.java @@ -37,7 +37,6 @@ import javax.inject.Inject; @APICommand(name = "quotaSummary", responseObject = QuotaSummaryResponse.class, description = "Lists balance and quota usage for all accounts", since = "4.7.0", requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class QuotaSummaryCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(QuotaSummaryCmd.class); - private static final String s_name = "quotasummaryresponse"; @Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, required = false, description = "Optional, Account Id for which statement needs to be generated") private String accountName; @@ -89,11 +88,6 @@ public class QuotaSummaryCmd extends BaseListCmd { this.domainId = domainId; } - @Override - public String getCommandName() { - return s_name; - } - public Boolean isListAll() { return listAll == null ? false: listAll; } diff --git a/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaTariffCreateCmd.java b/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaTariffCreateCmd.java index e7dc8654564..af9d8cd1294 100644 --- a/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaTariffCreateCmd.java +++ b/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaTariffCreateCmd.java @@ -34,11 +34,10 @@ import javax.inject.Inject; import java.util.Date; -@APICommand(name = QuotaTariffCreateCmd.API_NAME, responseObject = QuotaTariffResponse.class, description = "Creates a quota tariff for a resource.", since = "4.17.0.0", +@APICommand(name = "quotaTariffCreate", responseObject = QuotaTariffResponse.class, description = "Creates a quota tariff for a resource.", since = "4.17.0.0", requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, authorized = {RoleType.Admin}) public class QuotaTariffCreateCmd extends BaseCmd { protected Logger logger = Logger.getLogger(getClass()); - public static final String API_NAME = "quotaTariffCreate"; @Inject QuotaResponseBuilder responseBuilder; @@ -71,11 +70,6 @@ public class QuotaTariffCreateCmd extends BaseCmd { super(); } - @Override - public String getCommandName() { - return QuotaTariffCreateCmd.API_NAME.toLowerCase() + RESPONSE_SUFFIX; - } - @Override public void execute() { QuotaTariffVO result = responseBuilder.createQuotaTariff(this); diff --git a/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaTariffDeleteCmd.java b/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaTariffDeleteCmd.java index 0ccbd0a9647..06dcb0c4755 100644 --- a/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaTariffDeleteCmd.java +++ b/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaTariffDeleteCmd.java @@ -31,10 +31,9 @@ import org.apache.log4j.Logger; import javax.inject.Inject; -@APICommand(name = QuotaTariffDeleteCmd.API_NAME, description = "Marks a quota tariff as removed.", responseObject = SuccessResponse.class, requestHasSensitiveInfo = false, +@APICommand(name = "quotaTariffDelete", description = "Marks a quota tariff as removed.", responseObject = SuccessResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.17.0.0", authorized = {RoleType.Admin}) public class QuotaTariffDeleteCmd extends BaseCmd { - public static final String API_NAME = "quotaTariffDelete"; protected Logger logger = Logger.getLogger(getClass()); @Inject @@ -56,11 +55,6 @@ public class QuotaTariffDeleteCmd extends BaseCmd { super(); } - @Override - public String getCommandName() { - return QuotaTariffDeleteCmd.API_NAME.toLowerCase() + RESPONSE_SUFFIX; - } - @Override public void execute() { boolean result = responseBuilder.deleteQuotaTariff(getQuotaTariffUuid()); diff --git a/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaTariffListCmd.java b/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaTariffListCmd.java index b3d1134daa6..338696ed5d2 100644 --- a/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaTariffListCmd.java +++ b/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaTariffListCmd.java @@ -39,7 +39,6 @@ import java.util.List; @APICommand(name = "quotaTariffList", responseObject = QuotaTariffResponse.class, description = "Lists all quota tariff plans", since = "4.7.0", requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class QuotaTariffListCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(QuotaTariffListCmd.class); - private static final String s_name = "quotatarifflistresponse"; @Inject QuotaResponseBuilder _responseBuilder; @@ -84,11 +83,6 @@ public class QuotaTariffListCmd extends BaseListCmd { setResponseObject(response); } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaTariffUpdateCmd.java b/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaTariffUpdateCmd.java index 5d6b11c40a3..68832f0689d 100644 --- a/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaTariffUpdateCmd.java +++ b/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaTariffUpdateCmd.java @@ -38,7 +38,6 @@ import java.util.Date; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, authorized = {RoleType.Admin}) public class QuotaTariffUpdateCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(QuotaTariffUpdateCmd.class); - private static final String s_name = "quotatariffupdateresponse"; @Inject QuotaResponseBuilder _responseBuilder; @@ -110,11 +109,6 @@ public class QuotaTariffUpdateCmd extends BaseCmd { super(); } - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() { final QuotaTariffVO result = _responseBuilder.updateQuotaTariffPlan(this); diff --git a/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaUpdateCmd.java b/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaUpdateCmd.java index 75e2c2c403a..6f0e70c66e8 100644 --- a/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaUpdateCmd.java +++ b/plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaUpdateCmd.java @@ -35,7 +35,6 @@ public class QuotaUpdateCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(QuotaUpdateCmd.class); - private static final String s_name = "quotaupdateresponse"; @Inject QuotaManager _manager; @@ -48,11 +47,6 @@ public class QuotaUpdateCmd extends BaseCmd { super(); } - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() { _manager.calculateQuotaUsage(); diff --git a/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/DedicateClusterCmd.java b/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/DedicateClusterCmd.java index edc85610efe..06e0a42df85 100644 --- a/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/DedicateClusterCmd.java +++ b/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/DedicateClusterCmd.java @@ -44,7 +44,6 @@ import com.cloud.user.Account; public class DedicateClusterCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DedicateClusterCmd.class.getName()); - private static final String s_name = "dedicateclusterresponse"; @Inject DedicatedService dedicatedService; @@ -90,11 +89,6 @@ public class DedicateClusterCmd extends BaseAsyncCmd { ///////////////////////////////////////////////////// /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/DedicateHostCmd.java b/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/DedicateHostCmd.java index 978821a1f0c..cf6c5872fdd 100644 --- a/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/DedicateHostCmd.java +++ b/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/DedicateHostCmd.java @@ -43,7 +43,6 @@ import com.cloud.user.Account; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class DedicateHostCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DedicateHostCmd.class.getName()); - private static final String s_name = "dedicatehostresponse"; @Inject DedicatedService dedicatedService; @@ -84,11 +83,6 @@ public class DedicateHostCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/DedicatePodCmd.java b/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/DedicatePodCmd.java index d18f02d686f..819c4106af5 100644 --- a/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/DedicatePodCmd.java +++ b/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/DedicatePodCmd.java @@ -44,7 +44,6 @@ import com.cloud.user.Account; public class DedicatePodCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DedicatePodCmd.class.getName()); - private static final String s_name = "dedicatepodresponse"; @Inject public DedicatedService dedicatedService; @@ -85,11 +84,6 @@ public class DedicatePodCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/DedicateZoneCmd.java b/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/DedicateZoneCmd.java index ee71dfecc41..c3ce1d3baec 100644 --- a/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/DedicateZoneCmd.java +++ b/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/DedicateZoneCmd.java @@ -44,7 +44,6 @@ import com.cloud.user.Account; public class DedicateZoneCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DedicateZoneCmd.class.getName()); - private static final String s_name = "dedicatezoneresponse"; @Inject public DedicatedService dedicatedService; @@ -85,11 +84,6 @@ public class DedicateZoneCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/ListDedicatedClustersCmd.java b/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/ListDedicatedClustersCmd.java index a8c192dcd8e..c91e4470763 100644 --- a/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/ListDedicatedClustersCmd.java +++ b/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/ListDedicatedClustersCmd.java @@ -45,7 +45,6 @@ import com.cloud.utils.Pair; public class ListDedicatedClustersCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(ListDedicatedClustersCmd.class.getName()); - private static final String s_name = "listdedicatedclustersresponse"; @Inject DedicatedService dedicatedService; @@ -94,11 +93,6 @@ public class ListDedicatedClustersCmd extends BaseListCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() { Pair, Integer> result = dedicatedService.listDedicatedClusters(this); diff --git a/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/ListDedicatedHostsCmd.java b/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/ListDedicatedHostsCmd.java index 3c167e8966a..fd27662dded 100644 --- a/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/ListDedicatedHostsCmd.java +++ b/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/ListDedicatedHostsCmd.java @@ -45,7 +45,6 @@ import com.cloud.utils.Pair; public class ListDedicatedHostsCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(ListDedicatedHostsCmd.class.getName()); - private static final String s_name = "listdedicatedhostsresponse"; @Inject DedicatedService dedicatedService; @@ -91,11 +90,6 @@ public class ListDedicatedHostsCmd extends BaseListCmd { /////////////// API Implementation///////////////////l ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() { Pair, Integer> result = dedicatedService.listDedicatedHosts(this); diff --git a/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/ListDedicatedPodsCmd.java b/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/ListDedicatedPodsCmd.java index 5198e49e7a3..742c5cc96ea 100644 --- a/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/ListDedicatedPodsCmd.java +++ b/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/ListDedicatedPodsCmd.java @@ -45,7 +45,6 @@ import com.cloud.utils.Pair; public class ListDedicatedPodsCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(ListDedicatedPodsCmd.class.getName()); - private static final String s_name = "listdedicatedpodsresponse"; @Inject DedicatedService dedicatedService; @@ -91,11 +90,6 @@ public class ListDedicatedPodsCmd extends BaseListCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() { Pair, Integer> result = dedicatedService.listDedicatedPods(this); diff --git a/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/ListDedicatedZonesCmd.java b/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/ListDedicatedZonesCmd.java index e75b73b2e4b..b8874eab7cd 100644 --- a/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/ListDedicatedZonesCmd.java +++ b/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/ListDedicatedZonesCmd.java @@ -45,7 +45,6 @@ import com.cloud.utils.Pair; public class ListDedicatedZonesCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(ListDedicatedZonesCmd.class.getName()); - private static final String s_name = "listdedicatedzonesresponse"; @Inject DedicatedService _dedicatedservice; @@ -91,11 +90,6 @@ public class ListDedicatedZonesCmd extends BaseListCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public void execute() { Pair, Integer> result = _dedicatedservice.listDedicatedZones(this); diff --git a/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/ReleaseDedicatedClusterCmd.java b/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/ReleaseDedicatedClusterCmd.java index b1ec3605da5..9945ba29ca1 100644 --- a/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/ReleaseDedicatedClusterCmd.java +++ b/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/ReleaseDedicatedClusterCmd.java @@ -38,7 +38,6 @@ import com.cloud.user.Account; public class ReleaseDedicatedClusterCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(ReleaseDedicatedClusterCmd.class.getName()); - private static final String s_name = "releasededicatedclusterresponse"; @Inject DedicatedService dedicatedService; @@ -61,11 +60,6 @@ public class ReleaseDedicatedClusterCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/ReleaseDedicatedHostCmd.java b/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/ReleaseDedicatedHostCmd.java index bddef135688..22563503061 100644 --- a/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/ReleaseDedicatedHostCmd.java +++ b/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/ReleaseDedicatedHostCmd.java @@ -38,7 +38,6 @@ import com.cloud.user.Account; public class ReleaseDedicatedHostCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(ReleaseDedicatedHostCmd.class.getName()); - private static final String s_name = "releasededicatedhostresponse"; @Inject DedicatedService dedicatedService; @@ -61,11 +60,6 @@ public class ReleaseDedicatedHostCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/ReleaseDedicatedPodCmd.java b/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/ReleaseDedicatedPodCmd.java index f764e8abed1..ec47a430340 100644 --- a/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/ReleaseDedicatedPodCmd.java +++ b/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/ReleaseDedicatedPodCmd.java @@ -38,7 +38,6 @@ import com.cloud.user.Account; public class ReleaseDedicatedPodCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(ReleaseDedicatedPodCmd.class.getName()); - private static final String s_name = "releasededicatedpodresponse"; @Inject DedicatedService dedicatedService; @@ -61,11 +60,6 @@ public class ReleaseDedicatedPodCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/ReleaseDedicatedZoneCmd.java b/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/ReleaseDedicatedZoneCmd.java index df04491e2c7..4b15ddf951c 100644 --- a/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/ReleaseDedicatedZoneCmd.java +++ b/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/api/commands/ReleaseDedicatedZoneCmd.java @@ -38,7 +38,6 @@ import com.cloud.user.Account; public class ReleaseDedicatedZoneCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(ReleaseDedicatedZoneCmd.class.getName()); - private static final String s_name = "releasededicatedzoneresponse"; @Inject DedicatedService dedicatedService; @@ -61,11 +60,6 @@ public class ReleaseDedicatedZoneCmd extends BaseAsyncCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/plugins/hypervisors/baremetal/src/main/java/org/apache/cloudstack/api/AddBaremetalDhcpCmd.java b/plugins/hypervisors/baremetal/src/main/java/org/apache/cloudstack/api/AddBaremetalDhcpCmd.java index ab014d09809..22a1c4eba90 100644 --- a/plugins/hypervisors/baremetal/src/main/java/org/apache/cloudstack/api/AddBaremetalDhcpCmd.java +++ b/plugins/hypervisors/baremetal/src/main/java/org/apache/cloudstack/api/AddBaremetalDhcpCmd.java @@ -38,7 +38,6 @@ import com.cloud.exception.ResourceUnavailableException; @APICommand(name = "addBaremetalDhcp", description = "adds a baremetal dhcp server", responseObject = BaremetalDhcpResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class AddBaremetalDhcpCmd extends BaseAsyncCmd { - private static final String s_name = "addbaremetaldhcpresponse"; public static final Logger s_logger = Logger.getLogger(AddBaremetalDhcpCmd.class); @Inject @@ -90,11 +89,6 @@ public class AddBaremetalDhcpCmd extends BaseAsyncCmd { } } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccount().getId(); diff --git a/plugins/hypervisors/baremetal/src/main/java/org/apache/cloudstack/api/AddBaremetalRctCmd.java b/plugins/hypervisors/baremetal/src/main/java/org/apache/cloudstack/api/AddBaremetalRctCmd.java index 4fc5d2c9738..3227cbd24ff 100644 --- a/plugins/hypervisors/baremetal/src/main/java/org/apache/cloudstack/api/AddBaremetalRctCmd.java +++ b/plugins/hypervisors/baremetal/src/main/java/org/apache/cloudstack/api/AddBaremetalRctCmd.java @@ -1,86 +1,80 @@ -// 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 org.apache.cloudstack.api; - -import com.cloud.baremetal.manager.BaremetalVlanManager; -import com.cloud.baremetal.networkservice.BaremetalRctResponse; -import com.cloud.event.EventTypes; -import com.cloud.exception.ConcurrentOperationException; -import com.cloud.exception.InsufficientCapacityException; -import com.cloud.exception.NetworkRuleConflictException; -import com.cloud.exception.ResourceAllocationException; -import com.cloud.exception.ResourceUnavailableException; -import org.apache.cloudstack.acl.RoleType; -import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - -import javax.inject.Inject; - -/** - * Created by frank on 5/8/14. - */ -@APICommand(name = "addBaremetalRct", description = "adds baremetal rack configuration text", responseObject = BaremetalRctResponse.class, - requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, authorized = {RoleType.Admin}) -public class AddBaremetalRctCmd extends BaseAsyncCmd { - private static final String s_name = "addbaremetalrctresponse"; - public static final Logger s_logger = Logger.getLogger(AddBaremetalRctCmd.class); - - @Inject - private BaremetalVlanManager vlanMgr; - - @Parameter(name=ApiConstants.BAREMETAL_RCT_URL, required = true, description = "http url to baremetal RCT configuration") - private String rctUrl; - - public String getRctUrl() { - return rctUrl; - } - - public void setRctUrl(String rctUrl) { - this.rctUrl = rctUrl; - } - - public String getEventType() { - return EventTypes.EVENT_BAREMETAL_RCT_ADD; - } - - @Override - public String getEventDescription() { - return "Adding baremetal rct configuration"; - } - - @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException, NetworkRuleConflictException { - try { - BaremetalRctResponse rsp = vlanMgr.addRct(this); - this.setResponseObject(rsp); - } catch (Exception e) { - s_logger.warn(String.format("unable to add baremetal RCT[%s]", getRctUrl()), e); - throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage()); - } - } - - @Override - public String getCommandName() { - return s_name; - } - - @Override - public long getEntityOwnerId() { - return CallContext.current().getCallingAccount().getId(); - } -} +// 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 org.apache.cloudstack.api; + +import com.cloud.baremetal.manager.BaremetalVlanManager; +import com.cloud.baremetal.networkservice.BaremetalRctResponse; +import com.cloud.event.EventTypes; +import com.cloud.exception.ConcurrentOperationException; +import com.cloud.exception.InsufficientCapacityException; +import com.cloud.exception.NetworkRuleConflictException; +import com.cloud.exception.ResourceAllocationException; +import com.cloud.exception.ResourceUnavailableException; +import org.apache.cloudstack.acl.RoleType; +import org.apache.cloudstack.context.CallContext; +import org.apache.log4j.Logger; + +import javax.inject.Inject; + +/** + * Created by frank on 5/8/14. + */ +@APICommand(name = "addBaremetalRct", description = "adds baremetal rack configuration text", responseObject = BaremetalRctResponse.class, + requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, authorized = {RoleType.Admin}) +public class AddBaremetalRctCmd extends BaseAsyncCmd { + public static final Logger s_logger = Logger.getLogger(AddBaremetalRctCmd.class); + + @Inject + private BaremetalVlanManager vlanMgr; + + @Parameter(name=ApiConstants.BAREMETAL_RCT_URL, required = true, description = "http url to baremetal RCT configuration") + private String rctUrl; + + public String getRctUrl() { + return rctUrl; + } + + public void setRctUrl(String rctUrl) { + this.rctUrl = rctUrl; + } + + public String getEventType() { + return EventTypes.EVENT_BAREMETAL_RCT_ADD; + } + + @Override + public String getEventDescription() { + return "Adding baremetal rct configuration"; + } + + @Override + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException, NetworkRuleConflictException { + try { + BaremetalRctResponse rsp = vlanMgr.addRct(this); + this.setResponseObject(rsp); + } catch (Exception e) { + s_logger.warn(String.format("unable to add baremetal RCT[%s]", getRctUrl()), e); + throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage()); + } + } + + @Override + public long getEntityOwnerId() { + return CallContext.current().getCallingAccount().getId(); + } +} diff --git a/plugins/hypervisors/baremetal/src/main/java/org/apache/cloudstack/api/DeleteBaremetalRctCmd.java b/plugins/hypervisors/baremetal/src/main/java/org/apache/cloudstack/api/DeleteBaremetalRctCmd.java index 8157c751e0f..c2691d67ae0 100644 --- a/plugins/hypervisors/baremetal/src/main/java/org/apache/cloudstack/api/DeleteBaremetalRctCmd.java +++ b/plugins/hypervisors/baremetal/src/main/java/org/apache/cloudstack/api/DeleteBaremetalRctCmd.java @@ -1,85 +1,79 @@ -// 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 org.apache.cloudstack.api; - -import com.cloud.baremetal.manager.BaremetalVlanManager; -import com.cloud.baremetal.networkservice.BaremetalRctResponse; -import com.cloud.event.EventTypes; -import com.cloud.exception.ConcurrentOperationException; -import com.cloud.exception.InsufficientCapacityException; -import com.cloud.exception.NetworkRuleConflictException; -import com.cloud.exception.ResourceAllocationException; -import com.cloud.exception.ResourceUnavailableException; -import org.apache.cloudstack.acl.RoleType; -import org.apache.cloudstack.api.response.SuccessResponse; -import org.apache.cloudstack.context.CallContext; -import org.apache.log4j.Logger; - -import javax.inject.Inject; - -/** - * Created by frank on 10/27/14. - */ -@APICommand(name = "deleteBaremetalRct", description = "deletes baremetal rack configuration text", responseObject = SuccessResponse.class, - requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, authorized = {RoleType.Admin}) -public class DeleteBaremetalRctCmd extends BaseAsyncCmd { - private static final String s_name = "deletebaremetalrctresponse"; - public static final Logger s_logger = Logger.getLogger(DeleteBaremetalRctCmd.class); - - @Parameter(name = ApiConstants.ID, type = BaseCmd.CommandType.UUID, description = "RCT id", required = true, entityType = BaremetalRctResponse.class) - private Long id; - - @Inject - private BaremetalVlanManager vlanMgr; - - @Override - public String getEventType() { - return EventTypes.EVENT_BAREMETAL_RCT_DELETE; - } - - @Override - public String getEventDescription() { - return "Deleting baremetal rct configuration"; - } - - @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException, NetworkRuleConflictException { - try { - vlanMgr.deleteRct(this); - SuccessResponse response = new SuccessResponse(getCommandName()); - setResponseObject(response); - } catch (Exception e) { - s_logger.warn(String.format("unable to delete baremetal RCT[%s]", getId()), e); - throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage(), e); - } - } - - @Override - public String getCommandName() { - return s_name; - } - - @Override - public long getEntityOwnerId() { - return CallContext.current().getCallingAccount().getId(); - } - - public Long getId() { - return id; - } -} +// 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 org.apache.cloudstack.api; + +import com.cloud.baremetal.manager.BaremetalVlanManager; +import com.cloud.baremetal.networkservice.BaremetalRctResponse; +import com.cloud.event.EventTypes; +import com.cloud.exception.ConcurrentOperationException; +import com.cloud.exception.InsufficientCapacityException; +import com.cloud.exception.NetworkRuleConflictException; +import com.cloud.exception.ResourceAllocationException; +import com.cloud.exception.ResourceUnavailableException; +import org.apache.cloudstack.acl.RoleType; +import org.apache.cloudstack.api.response.SuccessResponse; +import org.apache.cloudstack.context.CallContext; +import org.apache.log4j.Logger; + +import javax.inject.Inject; + +/** + * Created by frank on 10/27/14. + */ +@APICommand(name = "deleteBaremetalRct", description = "deletes baremetal rack configuration text", responseObject = SuccessResponse.class, + requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, authorized = {RoleType.Admin}) +public class DeleteBaremetalRctCmd extends BaseAsyncCmd { + public static final Logger s_logger = Logger.getLogger(DeleteBaremetalRctCmd.class); + + @Parameter(name = ApiConstants.ID, type = BaseCmd.CommandType.UUID, description = "RCT id", required = true, entityType = BaremetalRctResponse.class) + private Long id; + + @Inject + private BaremetalVlanManager vlanMgr; + + @Override + public String getEventType() { + return EventTypes.EVENT_BAREMETAL_RCT_DELETE; + } + + @Override + public String getEventDescription() { + return "Deleting baremetal rct configuration"; + } + + @Override + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException, NetworkRuleConflictException { + try { + vlanMgr.deleteRct(this); + SuccessResponse response = new SuccessResponse(getCommandName()); + setResponseObject(response); + } catch (Exception e) { + s_logger.warn(String.format("unable to delete baremetal RCT[%s]", getId()), e); + throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage(), e); + } + } + + @Override + public long getEntityOwnerId() { + return CallContext.current().getCallingAccount().getId(); + } + + public Long getId() { + return id; + } +} diff --git a/plugins/hypervisors/baremetal/src/main/java/org/apache/cloudstack/api/ListBaremetalDhcpCmd.java b/plugins/hypervisors/baremetal/src/main/java/org/apache/cloudstack/api/ListBaremetalDhcpCmd.java index 36a62f86c55..fdc64de25d7 100644 --- a/plugins/hypervisors/baremetal/src/main/java/org/apache/cloudstack/api/ListBaremetalDhcpCmd.java +++ b/plugins/hypervisors/baremetal/src/main/java/org/apache/cloudstack/api/ListBaremetalDhcpCmd.java @@ -36,7 +36,6 @@ import java.util.List; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class ListBaremetalDhcpCmd extends BaseListCmd { private static final Logger s_logger = Logger.getLogger(ListBaremetalDhcpCmd.class); - private static final String s_name = "listbaremetaldhcpresponse"; @Inject BaremetalDhcpManager _dhcpMgr; @@ -97,9 +96,4 @@ public class ListBaremetalDhcpCmd extends BaseListCmd { } - @Override - public String getCommandName() { - return s_name; } - -} diff --git a/plugins/hypervisors/baremetal/src/main/java/org/apache/cloudstack/api/ListBaremetalPxeServersCmd.java b/plugins/hypervisors/baremetal/src/main/java/org/apache/cloudstack/api/ListBaremetalPxeServersCmd.java index 8707aa2b98e..5f856a5d638 100644 --- a/plugins/hypervisors/baremetal/src/main/java/org/apache/cloudstack/api/ListBaremetalPxeServersCmd.java +++ b/plugins/hypervisors/baremetal/src/main/java/org/apache/cloudstack/api/ListBaremetalPxeServersCmd.java @@ -36,7 +36,6 @@ import java.util.List; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class ListBaremetalPxeServersCmd extends BaseListCmd { private static final Logger s_logger = Logger.getLogger(ListBaremetalPxeServersCmd.class); - private static final String s_name = "listbaremetalpxeserversresponse"; @Inject BaremetalPxeManager _pxeMgr; @@ -82,8 +81,4 @@ public class ListBaremetalPxeServersCmd extends BaseListCmd { } } - @Override - public String getCommandName() { - return s_name; } -} diff --git a/plugins/hypervisors/baremetal/src/main/java/org/apache/cloudstack/api/ListBaremetalRctCmd.java b/plugins/hypervisors/baremetal/src/main/java/org/apache/cloudstack/api/ListBaremetalRctCmd.java index 3a69f3c6a0a..379c8758bf1 100644 --- a/plugins/hypervisors/baremetal/src/main/java/org/apache/cloudstack/api/ListBaremetalRctCmd.java +++ b/plugins/hypervisors/baremetal/src/main/java/org/apache/cloudstack/api/ListBaremetalRctCmd.java @@ -37,7 +37,6 @@ import java.util.List; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, authorized = {RoleType.Admin}) public class ListBaremetalRctCmd extends BaseListCmd { private static final Logger s_logger = Logger.getLogger(ListBaremetalRctCmd.class); - private static final String s_name = "listbaremetalrctresponse"; @Inject BaremetalVlanManager vlanMgr; @@ -61,9 +60,4 @@ public class ListBaremetalRctCmd extends BaseListCmd { } } - @Override - public String getCommandName() { - return s_name; } - -} diff --git a/plugins/hypervisors/ucs/src/main/java/org/apache/cloudstack/api/AssociateUcsProfileToBladeCmd.java b/plugins/hypervisors/ucs/src/main/java/org/apache/cloudstack/api/AssociateUcsProfileToBladeCmd.java index a310037a8a2..18a30ea698b 100644 --- a/plugins/hypervisors/ucs/src/main/java/org/apache/cloudstack/api/AssociateUcsProfileToBladeCmd.java +++ b/plugins/hypervisors/ucs/src/main/java/org/apache/cloudstack/api/AssociateUcsProfileToBladeCmd.java @@ -61,11 +61,6 @@ public class AssociateUcsProfileToBladeCmd extends BaseAsyncCmd { } } - @Override - public String getCommandName() { - return "associateucsprofiletobladeresponse"; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/api/commands/DeleteCiscoNexusVSMCmd.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/api/commands/DeleteCiscoNexusVSMCmd.java index 2e0e08ede68..6d04167b748 100644 --- a/plugins/hypervisors/vmware/src/main/java/com/cloud/api/commands/DeleteCiscoNexusVSMCmd.java +++ b/plugins/hypervisors/vmware/src/main/java/com/cloud/api/commands/DeleteCiscoNexusVSMCmd.java @@ -43,7 +43,6 @@ import com.cloud.user.Account; public class DeleteCiscoNexusVSMCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DeleteCiscoNexusVSMCmd.class.getName()); - private static final String s_name = "deletecisconexusvsmresponse"; @Inject CiscoNexusVSMElementService _ciscoNexusVSMService; @@ -83,11 +82,6 @@ public class DeleteCiscoNexusVSMCmd extends BaseAsyncCmd { } } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/api/commands/DisableCiscoNexusVSMCmd.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/api/commands/DisableCiscoNexusVSMCmd.java index 3c246dee3e5..75850edb1c9 100644 --- a/plugins/hypervisors/vmware/src/main/java/com/cloud/api/commands/DisableCiscoNexusVSMCmd.java +++ b/plugins/hypervisors/vmware/src/main/java/com/cloud/api/commands/DisableCiscoNexusVSMCmd.java @@ -43,7 +43,6 @@ import com.cloud.user.Account; public class DisableCiscoNexusVSMCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DisableCiscoNexusVSMCmd.class.getName()); - private static final String s_name = "disablecisconexusvsmresponse"; @Inject CiscoNexusVSMElementService _ciscoNexusVSMService; @@ -83,11 +82,6 @@ public class DisableCiscoNexusVSMCmd extends BaseAsyncCmd { } } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/api/commands/EnableCiscoNexusVSMCmd.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/api/commands/EnableCiscoNexusVSMCmd.java index 85e4584f855..862f7d1e9be 100644 --- a/plugins/hypervisors/vmware/src/main/java/com/cloud/api/commands/EnableCiscoNexusVSMCmd.java +++ b/plugins/hypervisors/vmware/src/main/java/com/cloud/api/commands/EnableCiscoNexusVSMCmd.java @@ -43,7 +43,6 @@ import com.cloud.user.Account; public class EnableCiscoNexusVSMCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(EnableCiscoNexusVSMCmd.class.getName()); - private static final String s_name = "enablecisconexusvsmresponse"; @Inject CiscoNexusVSMElementService _ciscoNexusVSMService; @@ -83,11 +82,6 @@ public class EnableCiscoNexusVSMCmd extends BaseAsyncCmd { } } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/AddVmwareDcCmd.java b/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/AddVmwareDcCmd.java index 7241b96db78..6100713ee30 100644 --- a/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/AddVmwareDcCmd.java +++ b/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/AddVmwareDcCmd.java @@ -46,7 +46,6 @@ public class AddVmwareDcCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(AddVmwareDcCmd.class.getName()); - private static final String s_name = "addvmwaredcresponse"; @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, required = true, description = "Name of VMware datacenter to be added to specified zone.") private String name; @@ -86,11 +85,6 @@ public class AddVmwareDcCmd extends BaseCmd { return zoneId; } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ImportVsphereStoragePoliciesCmd.java b/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ImportVsphereStoragePoliciesCmd.java index ea5bacfb1f4..c7ba63c02a7 100644 --- a/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ImportVsphereStoragePoliciesCmd.java +++ b/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ImportVsphereStoragePoliciesCmd.java @@ -43,7 +43,7 @@ import javax.inject.Inject; import java.util.ArrayList; import java.util.List; -@APICommand(name = ImportVsphereStoragePoliciesCmd.APINAME, description = "Import vSphere storage policies", +@APICommand(name = "importVsphereStoragePolicies", description = "Import vSphere storage policies", responseObject = VsphereStoragePoliciesResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, authorized = {RoleType.Admin}) @@ -51,7 +51,6 @@ public class ImportVsphereStoragePoliciesCmd extends BaseCmd { public static final Logger LOGGER = Logger.getLogger(ImportVsphereStoragePoliciesCmd.class.getName()); - public static final String APINAME = "importVsphereStoragePolicies"; @Inject public VmwareDatacenterService _vmwareDatacenterService; @@ -94,11 +93,6 @@ public class ImportVsphereStoragePoliciesCmd extends BaseCmd { setResponseObject(responseList); } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccountId(); diff --git a/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcsCmd.java b/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcsCmd.java index 271bc90448b..a91605c24bf 100644 --- a/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcsCmd.java +++ b/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcsCmd.java @@ -52,7 +52,6 @@ public class ListVmwareDcsCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(ListVmwareDcsCmd.class.getName()); - private static final String s_name = "listvmwaredcsresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -107,11 +106,6 @@ public class ListVmwareDcsCmd extends BaseListCmd { setResponseObject(response); } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVsphereStoragePoliciesCmd.java b/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVsphereStoragePoliciesCmd.java index 90e8e880548..ac909a0dc64 100644 --- a/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVsphereStoragePoliciesCmd.java +++ b/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVsphereStoragePoliciesCmd.java @@ -42,7 +42,7 @@ import javax.inject.Inject; import java.util.ArrayList; import java.util.List; -@APICommand(name = ListVsphereStoragePoliciesCmd.APINAME, description = "List vSphere storage policies", +@APICommand(name = "listVsphereStoragePolicies", description = "List vSphere storage policies", responseObject = VsphereStoragePoliciesResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, authorized = {RoleType.Admin}) @@ -50,7 +50,6 @@ public class ListVsphereStoragePoliciesCmd extends BaseCmd { public static final Logger LOGGER = Logger.getLogger(ListVsphereStoragePoliciesCmd.class.getName()); - public static final String APINAME = "listVsphereStoragePolicies"; @Inject public VmwareDatacenterService _vmwareDatacenterService; @@ -93,11 +92,6 @@ public class ListVsphereStoragePoliciesCmd extends BaseCmd { setResponseObject(responseList); } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccountId(); diff --git a/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVsphereStoragePolicyCompatiblePoolsCmd.java b/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVsphereStoragePolicyCompatiblePoolsCmd.java index ee7146a3a9e..d66972ded2e 100644 --- a/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVsphereStoragePolicyCompatiblePoolsCmd.java +++ b/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVsphereStoragePolicyCompatiblePoolsCmd.java @@ -36,12 +36,11 @@ import javax.inject.Inject; import java.util.ArrayList; import java.util.List; -@APICommand(name = ListVsphereStoragePolicyCompatiblePoolsCmd.APINAME, description = "List storage pools compatible with a vSphere storage policy", +@APICommand(name = "listVsphereStoragePolicyCompatiblePools", description = "List storage pools compatible with a vSphere storage policy", responseObject = StoragePoolResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, authorized = {RoleType.Admin}) public class ListVsphereStoragePolicyCompatiblePoolsCmd extends BaseListCmd { - public static final String APINAME = "listVsphereStoragePolicyCompatiblePools"; @Inject public VmwareDatacenterService vmwareDatacenterService; @@ -77,11 +76,6 @@ public class ListVsphereStoragePolicyCompatiblePoolsCmd extends BaseListCmd { this.setResponseObject(response); } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccountId(); diff --git a/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/RemoveVmwareDcCmd.java b/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/RemoveVmwareDcCmd.java index acc0adc9c20..735d00d6ca9 100644 --- a/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/RemoveVmwareDcCmd.java +++ b/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/RemoveVmwareDcCmd.java @@ -44,7 +44,6 @@ public class RemoveVmwareDcCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(RemoveVmwareDcCmd.class.getName()); - private static final String s_name = "removevmwaredcresponse"; @Parameter(name = ApiConstants.ZONE_ID, type = CommandType.UUID, @@ -83,11 +82,6 @@ public class RemoveVmwareDcCmd extends BaseCmd { } } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/UpdateVmwareDcCmd.java b/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/UpdateVmwareDcCmd.java index e428947a43c..bb62a48ad32 100644 --- a/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/UpdateVmwareDcCmd.java +++ b/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/UpdateVmwareDcCmd.java @@ -34,13 +34,12 @@ import com.cloud.hypervisor.vmware.VmwareDatacenter; import com.cloud.hypervisor.vmware.VmwareDatacenterService; import com.cloud.user.Account; -@APICommand(name = UpdateVmwareDcCmd.APINAME, description = "Updates a VMware datacenter details for a zone", +@APICommand(name = "updateVmwareDc", description = "Updates a VMware datacenter details for a zone", responseObject = VmwareDatacenterResponse.class, responseHasSensitiveInfo = false, since = "4.12.0", authorized = {RoleType.Admin}) public class UpdateVmwareDcCmd extends BaseCmd { public static final Logger LOG = Logger.getLogger(UpdateVmwareDcCmd.class); - static final String APINAME = "updateVmwareDc"; @Inject public VmwareDatacenterService vmwareDatacenterService; @@ -119,13 +118,8 @@ public class UpdateVmwareDcCmd extends BaseCmd { setResponseObject(response); } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; } -} \ No newline at end of file +} diff --git a/plugins/integrations/cloudian/src/main/java/org/apache/cloudstack/cloudian/api/CloudianIsEnabledCmd.java b/plugins/integrations/cloudian/src/main/java/org/apache/cloudstack/cloudian/api/CloudianIsEnabledCmd.java index fdca87185d0..56cb74e3cab 100644 --- a/plugins/integrations/cloudian/src/main/java/org/apache/cloudstack/cloudian/api/CloudianIsEnabledCmd.java +++ b/plugins/integrations/cloudian/src/main/java/org/apache/cloudstack/cloudian/api/CloudianIsEnabledCmd.java @@ -27,13 +27,12 @@ import org.apache.cloudstack.cloudian.response.CloudianEnabledResponse; import com.cloud.user.Account; -@APICommand(name = CloudianIsEnabledCmd.APINAME, description = "Checks if the Cloudian Connector is enabled", +@APICommand(name = "cloudianIsEnabled", description = "Checks if the Cloudian Connector is enabled", responseObject = CloudianEnabledResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.11.0", authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User}) public class CloudianIsEnabledCmd extends BaseCmd { - public static final String APINAME = "cloudianIsEnabled"; @Inject private CloudianConnector connector; @@ -42,11 +41,6 @@ public class CloudianIsEnabledCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; @@ -58,7 +52,7 @@ public class CloudianIsEnabledCmd extends BaseCmd { final CloudianEnabledResponse response = new CloudianEnabledResponse(); response.setEnabled(connector.isEnabled()); response.setCmcUrl(connector.getCmcUrl()); - response.setObjectName(APINAME.toLowerCase()); + response.setObjectName(getActualCommandName().toLowerCase()); response.setResponseName(getCommandName()); setResponseObject(response); } diff --git a/plugins/integrations/cloudian/src/main/java/org/apache/cloudstack/cloudian/api/CloudianSsoLoginCmd.java b/plugins/integrations/cloudian/src/main/java/org/apache/cloudstack/cloudian/api/CloudianSsoLoginCmd.java index 3cf2d296d43..189f3daf03e 100644 --- a/plugins/integrations/cloudian/src/main/java/org/apache/cloudstack/cloudian/api/CloudianSsoLoginCmd.java +++ b/plugins/integrations/cloudian/src/main/java/org/apache/cloudstack/cloudian/api/CloudianSsoLoginCmd.java @@ -30,12 +30,11 @@ import org.apache.cloudstack.cloudian.response.CloudianSsoLoginResponse; import com.cloud.user.Account; import org.apache.commons.lang3.StringUtils; -@APICommand(name = CloudianSsoLoginCmd.APINAME, description = "Generates single-sign-on login url for logged-in CloudStack user to access the Cloudian Management Console", +@APICommand(name = "cloudianSsoLogin", description = "Generates single-sign-on login url for logged-in CloudStack user to access the Cloudian Management Console", responseObject = CloudianSsoLoginResponse.class, since = "4.11.0", authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User}) public class CloudianSsoLoginCmd extends BaseCmd { - public static final String APINAME = "cloudianSsoLogin"; @Inject private CloudianConnector connector; @@ -44,11 +43,6 @@ public class CloudianSsoLoginCmd extends BaseCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; @@ -64,7 +58,7 @@ public class CloudianSsoLoginCmd extends BaseCmd { final CloudianSsoLoginResponse response = new CloudianSsoLoginResponse(); response.setSsoRedirectUrl(ssoUrl); response.setResponseName(getCommandName()); - response.setObjectName(APINAME.toLowerCase()); + response.setObjectName(this.getActualCommandName().toLowerCase()); setResponseObject(response); } } diff --git a/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/admin/kubernetes/version/AddKubernetesSupportedVersionCmd.java b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/admin/kubernetes/version/AddKubernetesSupportedVersionCmd.java index bd9e38980f2..48bb26c8d44 100644 --- a/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/admin/kubernetes/version/AddKubernetesSupportedVersionCmd.java +++ b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/admin/kubernetes/version/AddKubernetesSupportedVersionCmd.java @@ -40,7 +40,7 @@ import com.cloud.kubernetes.version.KubernetesVersionService; import com.cloud.utils.exception.CloudRuntimeException; import org.apache.commons.lang3.StringUtils; -@APICommand(name = AddKubernetesSupportedVersionCmd.APINAME, +@APICommand(name = "addKubernetesSupportedVersion", description = "Add a supported Kubernetes version", responseObject = KubernetesSupportedVersionResponse.class, responseView = ResponseObject.ResponseView.Full, @@ -48,7 +48,6 @@ import org.apache.commons.lang3.StringUtils; authorized = {RoleType.Admin}) public class AddKubernetesSupportedVersionCmd extends BaseCmd implements AdminCmd { public static final Logger LOGGER = Logger.getLogger(AddKubernetesSupportedVersionCmd.class.getName()); - public static final String APINAME = "addKubernetesSupportedVersion"; @Inject private KubernetesVersionService kubernetesVersionService; @@ -124,11 +123,6 @@ public class AddKubernetesSupportedVersionCmd extends BaseCmd implements AdminCm return minimumRamSize; } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + "response"; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccountId(); diff --git a/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/admin/kubernetes/version/DeleteKubernetesSupportedVersionCmd.java b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/admin/kubernetes/version/DeleteKubernetesSupportedVersionCmd.java index 8e4ca7242d7..42ac28dd16a 100644 --- a/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/admin/kubernetes/version/DeleteKubernetesSupportedVersionCmd.java +++ b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/admin/kubernetes/version/DeleteKubernetesSupportedVersionCmd.java @@ -38,14 +38,13 @@ import com.cloud.kubernetes.version.KubernetesVersionEventTypes; import com.cloud.kubernetes.version.KubernetesVersionService; import com.cloud.utils.exception.CloudRuntimeException; -@APICommand(name = DeleteKubernetesSupportedVersionCmd.APINAME, +@APICommand(name = "deleteKubernetesSupportedVersion", description = "Deletes a Kubernetes cluster", responseObject = SuccessResponse.class, entityType = {KubernetesSupportedVersion.class}, authorized = {RoleType.Admin}) public class DeleteKubernetesSupportedVersionCmd extends BaseAsyncCmd implements AdminCmd { public static final Logger LOGGER = Logger.getLogger(DeleteKubernetesSupportedVersionCmd.class.getName()); - public static final String APINAME = "deleteKubernetesSupportedVersion"; @Inject private KubernetesVersionService kubernetesVersionService; @@ -66,11 +65,6 @@ public class DeleteKubernetesSupportedVersionCmd extends BaseAsyncCmd implements return id; } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + "response"; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccountId(); diff --git a/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/admin/kubernetes/version/UpdateKubernetesSupportedVersionCmd.java b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/admin/kubernetes/version/UpdateKubernetesSupportedVersionCmd.java index bf888c54921..f932e5a9ba1 100644 --- a/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/admin/kubernetes/version/UpdateKubernetesSupportedVersionCmd.java +++ b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/admin/kubernetes/version/UpdateKubernetesSupportedVersionCmd.java @@ -36,7 +36,7 @@ import com.cloud.kubernetes.version.KubernetesSupportedVersion; import com.cloud.kubernetes.version.KubernetesVersionService; import com.cloud.utils.exception.CloudRuntimeException; -@APICommand(name = UpdateKubernetesSupportedVersionCmd.APINAME, +@APICommand(name = "updateKubernetesSupportedVersion", description = "Update a supported Kubernetes version", responseObject = KubernetesSupportedVersionResponse.class, responseView = ResponseObject.ResponseView.Full, @@ -44,7 +44,6 @@ import com.cloud.utils.exception.CloudRuntimeException; authorized = {RoleType.Admin}) public class UpdateKubernetesSupportedVersionCmd extends BaseCmd implements AdminCmd { public static final Logger LOGGER = Logger.getLogger(UpdateKubernetesSupportedVersionCmd.class.getName()); - public static final String APINAME = "updateKubernetesSupportedVersion"; @Inject private KubernetesVersionService kubernetesVersionService; @@ -74,11 +73,6 @@ public class UpdateKubernetesSupportedVersionCmd extends BaseCmd implements Admi return state; } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + "response"; - } - @Override public long getEntityOwnerId() { return 0; diff --git a/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/CreateKubernetesClusterCmd.java b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/CreateKubernetesClusterCmd.java index b634e73d490..5e4bd391587 100644 --- a/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/CreateKubernetesClusterCmd.java +++ b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/CreateKubernetesClusterCmd.java @@ -46,7 +46,7 @@ import com.cloud.kubernetes.cluster.KubernetesClusterEventTypes; import com.cloud.kubernetes.cluster.KubernetesClusterService; import com.cloud.utils.exception.CloudRuntimeException; -@APICommand(name = CreateKubernetesClusterCmd.APINAME, +@APICommand(name = "createKubernetesCluster", description = "Creates a Kubernetes cluster", responseObject = KubernetesClusterResponse.class, responseView = ResponseView.Restricted, @@ -56,7 +56,6 @@ import com.cloud.utils.exception.CloudRuntimeException; authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User}) public class CreateKubernetesClusterCmd extends BaseAsyncCreateCmd { public static final Logger LOGGER = Logger.getLogger(CreateKubernetesClusterCmd.class.getName()); - public static final String APINAME = "createKubernetesCluster"; private static final Long DEFAULT_NODE_ROOT_DISK_SIZE = 8L; @Inject @@ -237,11 +236,6 @@ public class CreateKubernetesClusterCmd extends BaseAsyncCreateCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return APINAME.toLowerCase() + "response"; - } - public static String getResultObjectName() { return "kubernetescluster"; } diff --git a/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/DeleteKubernetesClusterCmd.java b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/DeleteKubernetesClusterCmd.java index d6bc75c9c3d..564ae78b98b 100644 --- a/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/DeleteKubernetesClusterCmd.java +++ b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/DeleteKubernetesClusterCmd.java @@ -36,14 +36,13 @@ import com.cloud.kubernetes.cluster.KubernetesClusterEventTypes; import com.cloud.kubernetes.cluster.KubernetesClusterService; import com.cloud.utils.exception.CloudRuntimeException; -@APICommand(name = DeleteKubernetesClusterCmd.APINAME, +@APICommand(name = "deleteKubernetesCluster", description = "Deletes a Kubernetes cluster", responseObject = SuccessResponse.class, entityType = {KubernetesCluster.class}, authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User}) public class DeleteKubernetesClusterCmd extends BaseAsyncCmd { public static final Logger LOGGER = Logger.getLogger(DeleteKubernetesClusterCmd.class.getName()); - public static final String APINAME = "deleteKubernetesCluster"; @Inject public KubernetesClusterService kubernetesClusterService; @@ -84,11 +83,6 @@ public class DeleteKubernetesClusterCmd extends BaseAsyncCmd { } } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + "response"; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccount().getId(); diff --git a/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/GetKubernetesClusterConfigCmd.java b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/GetKubernetesClusterConfigCmd.java index c88f0eb17df..789e460ee80 100644 --- a/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/GetKubernetesClusterConfigCmd.java +++ b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/GetKubernetesClusterConfigCmd.java @@ -36,7 +36,7 @@ import com.cloud.user.Account; import com.cloud.utils.exception.CloudRuntimeException; -@APICommand(name = GetKubernetesClusterConfigCmd.APINAME, +@APICommand(name = "getKubernetesClusterConfig", description = "Get Kubernetes cluster config", responseObject = KubernetesClusterConfigResponse.class, responseView = ResponseObject.ResponseView.Restricted, @@ -45,7 +45,6 @@ import com.cloud.utils.exception.CloudRuntimeException; authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User}) public class GetKubernetesClusterConfigCmd extends BaseCmd { public static final Logger LOGGER = Logger.getLogger(GetKubernetesClusterConfigCmd.class.getName()); - public static final String APINAME = "getKubernetesClusterConfig"; @Inject public KubernetesClusterService kubernetesClusterService; @@ -80,11 +79,6 @@ public class GetKubernetesClusterConfigCmd extends BaseCmd { return Account.ACCOUNT_ID_SYSTEM; // no account info given, parent this command to SYSTEM so ERROR events are tracked } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + "response"; - } - @Override public void execute() throws ServerApiException { try { diff --git a/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/ListKubernetesClustersCmd.java b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/ListKubernetesClustersCmd.java index ef960d532ee..692b934e9fa 100644 --- a/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/ListKubernetesClustersCmd.java +++ b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/ListKubernetesClustersCmd.java @@ -33,7 +33,7 @@ import org.apache.log4j.Logger; import com.cloud.kubernetes.cluster.KubernetesClusterService; import com.cloud.utils.exception.CloudRuntimeException; -@APICommand(name = ListKubernetesClustersCmd.APINAME, +@APICommand(name = "listKubernetesClusters", description = "Lists Kubernetes clusters", responseObject = KubernetesClusterResponse.class, responseView = ResponseView.Restricted, @@ -42,7 +42,6 @@ import com.cloud.utils.exception.CloudRuntimeException; authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User}) public class ListKubernetesClustersCmd extends BaseListProjectAndAccountResourcesCmd { public static final Logger LOGGER = Logger.getLogger(ListKubernetesClustersCmd.class.getName()); - public static final String APINAME = "listKubernetesClusters"; @Inject public KubernetesClusterService kubernetesClusterService; @@ -82,11 +81,6 @@ public class ListKubernetesClustersCmd extends BaseListProjectAndAccountResource /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return APINAME.toLowerCase() + "response"; - } - @Override public void execute() throws ServerApiException { try { diff --git a/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/ScaleKubernetesClusterCmd.java b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/ScaleKubernetesClusterCmd.java index 6dbc69e4b7d..f3c9939e01c 100644 --- a/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/ScaleKubernetesClusterCmd.java +++ b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/ScaleKubernetesClusterCmd.java @@ -42,7 +42,7 @@ import com.cloud.kubernetes.cluster.KubernetesClusterEventTypes; import com.cloud.kubernetes.cluster.KubernetesClusterService; import com.cloud.utils.exception.CloudRuntimeException; -@APICommand(name = ScaleKubernetesClusterCmd.APINAME, +@APICommand(name = "scaleKubernetesCluster", description = "Scales a created, running or stopped Kubernetes cluster", responseObject = KubernetesClusterResponse.class, responseView = ResponseObject.ResponseView.Restricted, @@ -52,7 +52,6 @@ import com.cloud.utils.exception.CloudRuntimeException; authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User}) public class ScaleKubernetesClusterCmd extends BaseAsyncCmd { public static final Logger LOGGER = Logger.getLogger(ScaleKubernetesClusterCmd.class.getName()); - public static final String APINAME = "scaleKubernetesCluster"; @Inject public KubernetesClusterService kubernetesClusterService; @@ -142,11 +141,6 @@ public class ScaleKubernetesClusterCmd extends BaseAsyncCmd { return description; } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + "response"; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccount().getId(); diff --git a/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/StartKubernetesClusterCmd.java b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/StartKubernetesClusterCmd.java index d61a942e7f9..1140cac44d2 100644 --- a/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/StartKubernetesClusterCmd.java +++ b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/StartKubernetesClusterCmd.java @@ -36,7 +36,7 @@ import com.cloud.kubernetes.cluster.KubernetesClusterEventTypes; import com.cloud.kubernetes.cluster.KubernetesClusterService; import com.cloud.utils.exception.CloudRuntimeException; -@APICommand(name = StartKubernetesClusterCmd.APINAME, description = "Starts a stopped Kubernetes cluster", +@APICommand(name = "startKubernetesCluster", description = "Starts a stopped Kubernetes cluster", responseObject = KubernetesClusterResponse.class, responseView = ResponseObject.ResponseView.Restricted, entityType = {KubernetesCluster.class}, @@ -45,7 +45,6 @@ import com.cloud.utils.exception.CloudRuntimeException; authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User}) public class StartKubernetesClusterCmd extends BaseAsyncCmd { public static final Logger LOGGER = Logger.getLogger(StartKubernetesClusterCmd.class.getName()); - public static final String APINAME = "startKubernetesCluster"; @Inject public KubernetesClusterService kubernetesClusterService; @@ -83,11 +82,6 @@ public class StartKubernetesClusterCmd extends BaseAsyncCmd { return description; } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + "response"; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccount().getId(); diff --git a/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/StopKubernetesClusterCmd.java b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/StopKubernetesClusterCmd.java index d4f49bd225f..393786f966a 100644 --- a/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/StopKubernetesClusterCmd.java +++ b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/StopKubernetesClusterCmd.java @@ -37,7 +37,7 @@ import com.cloud.kubernetes.cluster.KubernetesClusterEventTypes; import com.cloud.kubernetes.cluster.KubernetesClusterService; import com.cloud.utils.exception.CloudRuntimeException; -@APICommand(name = StopKubernetesClusterCmd.APINAME, description = "Stops a running Kubernetes cluster", +@APICommand(name = "stopKubernetesCluster", description = "Stops a running Kubernetes cluster", responseObject = SuccessResponse.class, responseView = ResponseObject.ResponseView.Restricted, entityType = {KubernetesCluster.class}, @@ -46,7 +46,6 @@ import com.cloud.utils.exception.CloudRuntimeException; authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User}) public class StopKubernetesClusterCmd extends BaseAsyncCmd { public static final Logger LOGGER = Logger.getLogger(StopKubernetesClusterCmd.class.getName()); - public static final String APINAME = "stopKubernetesCluster"; @Inject public KubernetesClusterService kubernetesClusterService; @@ -84,11 +83,6 @@ public class StopKubernetesClusterCmd extends BaseAsyncCmd { return description; } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + "response"; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccount().getId(); diff --git a/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/UpgradeKubernetesClusterCmd.java b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/UpgradeKubernetesClusterCmd.java index 4a2e0b1c9a8..3283ea0e17b 100644 --- a/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/UpgradeKubernetesClusterCmd.java +++ b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/UpgradeKubernetesClusterCmd.java @@ -38,7 +38,7 @@ import com.cloud.kubernetes.cluster.KubernetesClusterEventTypes; import com.cloud.kubernetes.cluster.KubernetesClusterService; import com.cloud.utils.exception.CloudRuntimeException; -@APICommand(name = UpgradeKubernetesClusterCmd.APINAME, description = "Upgrades a running Kubernetes cluster", +@APICommand(name = "upgradeKubernetesCluster", description = "Upgrades a running Kubernetes cluster", responseObject = KubernetesClusterResponse.class, responseView = ResponseObject.ResponseView.Restricted, entityType = {KubernetesCluster.class}, @@ -47,7 +47,6 @@ import com.cloud.utils.exception.CloudRuntimeException; authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User}) public class UpgradeKubernetesClusterCmd extends BaseAsyncCmd { public static final Logger LOGGER = Logger.getLogger(UpgradeKubernetesClusterCmd.class.getName()); - public static final String APINAME = "upgradeKubernetesCluster"; @Inject public KubernetesClusterService kubernetesClusterService; @@ -94,11 +93,6 @@ public class UpgradeKubernetesClusterCmd extends BaseAsyncCmd { return description; } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + "response"; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccount().getId(); diff --git a/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/version/ListKubernetesSupportedVersionsCmd.java b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/version/ListKubernetesSupportedVersionsCmd.java index d461182aab9..15f83252c8a 100644 --- a/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/version/ListKubernetesSupportedVersionsCmd.java +++ b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/version/ListKubernetesSupportedVersionsCmd.java @@ -35,14 +35,13 @@ import com.cloud.exception.ConcurrentOperationException; import com.cloud.kubernetes.version.KubernetesVersionService; import org.apache.commons.lang3.StringUtils; -@APICommand(name = ListKubernetesSupportedVersionsCmd.APINAME, +@APICommand(name = "listKubernetesSupportedVersions", description = "Lists supported Kubernetes version", responseObject = KubernetesSupportedVersionResponse.class, responseView = ResponseObject.ResponseView.Restricted, authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User}) public class ListKubernetesSupportedVersionsCmd extends BaseListCmd { public static final Logger LOGGER = Logger.getLogger(ListKubernetesSupportedVersionsCmd.class.getName()); - public static final String APINAME = "listKubernetesSupportedVersions"; @Inject private KubernetesVersionService kubernetesVersionService; @@ -92,11 +91,6 @@ public class ListKubernetesSupportedVersionsCmd extends BaseListCmd { return minimumKubernetesVersionId; } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + "response"; - } - ///////////////////////////////////////////////////// /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// diff --git a/plugins/metrics/src/main/java/org/apache/cloudstack/api/ListClustersMetricsCmd.java b/plugins/metrics/src/main/java/org/apache/cloudstack/api/ListClustersMetricsCmd.java index cdd5a67e933..7c297b3cf9f 100644 --- a/plugins/metrics/src/main/java/org/apache/cloudstack/api/ListClustersMetricsCmd.java +++ b/plugins/metrics/src/main/java/org/apache/cloudstack/api/ListClustersMetricsCmd.java @@ -29,20 +29,14 @@ import java.util.List; import com.cloud.utils.Pair; -@APICommand(name = ListClustersMetricsCmd.APINAME, description = "Lists clusters metrics", responseObject = ClusterMetricsResponse.class, +@APICommand(name = "listClustersMetrics", description = "Lists clusters metrics", responseObject = ClusterMetricsResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, responseView = ResponseObject.ResponseView.Full, since = "4.9.3", authorized = {RoleType.Admin}) public class ListClustersMetricsCmd extends ListClustersCmd { - public static final String APINAME = "listClustersMetrics"; @Inject private MetricsService metricsService; - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public void execute() { Pair, Integer> clusterResponses = getClusterResponses(); diff --git a/plugins/metrics/src/main/java/org/apache/cloudstack/api/ListDbMetricsCmd.java b/plugins/metrics/src/main/java/org/apache/cloudstack/api/ListDbMetricsCmd.java index 1100164dc49..2aba5351caf 100644 --- a/plugins/metrics/src/main/java/org/apache/cloudstack/api/ListDbMetricsCmd.java +++ b/plugins/metrics/src/main/java/org/apache/cloudstack/api/ListDbMetricsCmd.java @@ -28,11 +28,10 @@ import org.apache.cloudstack.response.DbMetricsResponse; import javax.inject.Inject; -@APICommand(name=ListDbMetricsCmd.APINAME, description = "list the db hosts and statistics", +@APICommand(name="listDbMetrics", description = "list the db hosts and statistics", responseObject = DbMetricsResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, responseView = ResponseObject.ResponseView.Full, since = "4.17.0", authorized = {RoleType.Admin}) public class ListDbMetricsCmd extends BaseCmd { - public static final String APINAME = "listDbMetrics"; @Inject private MetricsService metricsService; @@ -44,11 +43,6 @@ public class ListDbMetricsCmd extends BaseCmd { setResponseObject(response); } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccountId(); diff --git a/plugins/metrics/src/main/java/org/apache/cloudstack/api/ListHostsMetricsCmd.java b/plugins/metrics/src/main/java/org/apache/cloudstack/api/ListHostsMetricsCmd.java index db80395a297..dfd95811ba6 100644 --- a/plugins/metrics/src/main/java/org/apache/cloudstack/api/ListHostsMetricsCmd.java +++ b/plugins/metrics/src/main/java/org/apache/cloudstack/api/ListHostsMetricsCmd.java @@ -29,20 +29,14 @@ import org.apache.cloudstack.response.HostMetricsResponse; import javax.inject.Inject; import java.util.List; -@APICommand(name = ListHostsMetricsCmd.APINAME, description = "Lists hosts metrics", responseObject = HostMetricsResponse.class, +@APICommand(name = "listHostsMetrics", description = "Lists hosts metrics", responseObject = HostMetricsResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, responseView = ResponseObject.ResponseView.Full, since = "4.9.3", authorized = {RoleType.Admin}) public class ListHostsMetricsCmd extends ListHostsCmd { - public static final String APINAME = "listHostsMetrics"; @Inject private MetricsService metricsService; - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public void execute() { setType(Host.Type.Routing.toString()); diff --git a/plugins/metrics/src/main/java/org/apache/cloudstack/api/ListInfrastructureCmd.java b/plugins/metrics/src/main/java/org/apache/cloudstack/api/ListInfrastructureCmd.java index 4ea24c3f66b..a0ea3ba1eb6 100644 --- a/plugins/metrics/src/main/java/org/apache/cloudstack/api/ListInfrastructureCmd.java +++ b/plugins/metrics/src/main/java/org/apache/cloudstack/api/ListInfrastructureCmd.java @@ -24,20 +24,14 @@ import org.apache.cloudstack.response.InfrastructureResponse; import javax.inject.Inject; -@APICommand(name = ListInfrastructureCmd.APINAME, description = "Lists infrastructure", responseObject = InfrastructureResponse.class, +@APICommand(name = "listInfrastructure", description = "Lists infrastructure", responseObject = InfrastructureResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, responseView = ResponseObject.ResponseView.Full, since = "4.9.3", authorized = {RoleType.Admin}) public class ListInfrastructureCmd extends BaseCmd { - public static final String APINAME = "listInfrastructure"; @Inject private MetricsService metricsService; - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccountId(); diff --git a/plugins/metrics/src/main/java/org/apache/cloudstack/api/ListMgmtsMetricsCmd.java b/plugins/metrics/src/main/java/org/apache/cloudstack/api/ListMgmtsMetricsCmd.java index c3c9319bf9e..700054681da 100644 --- a/plugins/metrics/src/main/java/org/apache/cloudstack/api/ListMgmtsMetricsCmd.java +++ b/plugins/metrics/src/main/java/org/apache/cloudstack/api/ListMgmtsMetricsCmd.java @@ -27,11 +27,10 @@ import org.apache.cloudstack.response.ManagementServerMetricsResponse; import javax.inject.Inject; import java.util.List; -@APICommand(name = ListMgmtsMetricsCmd.APINAME, description = "Lists Management Server metrics", responseObject = ManagementServerMetricsResponse.class, +@APICommand(name = "listManagementServersMetrics", description = "Lists Management Server metrics", responseObject = ManagementServerMetricsResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, responseView = ResponseObject.ResponseView.Full, since = "4.17.0", authorized = {RoleType.Admin}) public class ListMgmtsMetricsCmd extends ListMgmtsCmd { - public static final String APINAME = "listManagementServersMetrics"; @Parameter(name = MetricConstants.SYSTEM, type = CommandType.BOOLEAN, entityType = ManagementServerMetricsResponse.class, description = "include system level stats") private boolean system; @@ -39,11 +38,6 @@ public class ListMgmtsMetricsCmd extends ListMgmtsCmd { @Inject private MetricsService metricsService; - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public void execute() { ListResponse managementServers = _queryService.listManagementServers(this); diff --git a/plugins/metrics/src/main/java/org/apache/cloudstack/api/ListStoragePoolsMetricsCmd.java b/plugins/metrics/src/main/java/org/apache/cloudstack/api/ListStoragePoolsMetricsCmd.java index 35f2f7634f9..ad52319ec2d 100644 --- a/plugins/metrics/src/main/java/org/apache/cloudstack/api/ListStoragePoolsMetricsCmd.java +++ b/plugins/metrics/src/main/java/org/apache/cloudstack/api/ListStoragePoolsMetricsCmd.java @@ -27,20 +27,14 @@ import org.apache.cloudstack.response.StoragePoolMetricsResponse; import javax.inject.Inject; import java.util.List; -@APICommand(name = ListStoragePoolsMetricsCmd.APINAME, description = "Lists storage pool metrics", responseObject = StoragePoolMetricsResponse.class, +@APICommand(name = "listStoragePoolsMetrics", description = "Lists storage pool metrics", responseObject = StoragePoolMetricsResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, responseView = ResponseObject.ResponseView.Full, since = "4.9.3", authorized = {RoleType.Admin}) public class ListStoragePoolsMetricsCmd extends ListStoragePoolsCmd { - public static final String APINAME = "listStoragePoolsMetrics"; @Inject private MetricsService metricsService; - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public void execute() { ListResponse storagePools = _queryService.searchForStoragePools(this); diff --git a/plugins/metrics/src/main/java/org/apache/cloudstack/api/ListUsageServerMetricsCmd.java b/plugins/metrics/src/main/java/org/apache/cloudstack/api/ListUsageServerMetricsCmd.java index f39b8a47296..6b37e196738 100644 --- a/plugins/metrics/src/main/java/org/apache/cloudstack/api/ListUsageServerMetricsCmd.java +++ b/plugins/metrics/src/main/java/org/apache/cloudstack/api/ListUsageServerMetricsCmd.java @@ -29,11 +29,10 @@ import org.apache.cloudstack.response.UsageServerMetricsResponse; import javax.inject.Inject; -@APICommand(name = ListUsageServerMetricsCmd.APINAME, description = "Lists Usage Server metrics", responseObject = UsageServerMetricsResponse.class, +@APICommand(name = "listUsageServerMetrics", description = "Lists Usage Server metrics", responseObject = UsageServerMetricsResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, responseView = ResponseObject.ResponseView.Full, since = "4.17.0", authorized = {RoleType.Admin}) public class ListUsageServerMetricsCmd extends BaseCmd { - public static final String APINAME = "listUsageServerMetrics"; @Inject private MetricsService metricsService; @@ -45,11 +44,6 @@ public class ListUsageServerMetricsCmd extends BaseCmd { setResponseObject(usageServerMetrics); } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccountId(); diff --git a/plugins/metrics/src/main/java/org/apache/cloudstack/api/ListVMsMetricsCmdByAdmin.java b/plugins/metrics/src/main/java/org/apache/cloudstack/api/ListVMsMetricsCmdByAdmin.java index 80c69126bbd..d8f5eb2b80e 100644 --- a/plugins/metrics/src/main/java/org/apache/cloudstack/api/ListVMsMetricsCmdByAdmin.java +++ b/plugins/metrics/src/main/java/org/apache/cloudstack/api/ListVMsMetricsCmdByAdmin.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.response.PodResponse; import org.apache.cloudstack.api.response.StoragePoolResponse; import org.apache.cloudstack.response.VmMetricsResponse; -@APICommand(name = ListVMsMetricsCmd.APINAME, description = "Lists VM metrics", responseObject = VmMetricsResponse.class, +@APICommand(name = "listVirtualMachinesMetrics", description = "Lists VM metrics", responseObject = VmMetricsResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, responseView = ResponseObject.ResponseView.Full, authorized = {RoleType.Admin}) public class ListVMsMetricsCmdByAdmin extends ListVMsMetricsCmd implements AdminCmd { diff --git a/plugins/metrics/src/main/java/org/apache/cloudstack/api/ListVMsUsageHistoryCmd.java b/plugins/metrics/src/main/java/org/apache/cloudstack/api/ListVMsUsageHistoryCmd.java index 9c6df625231..2b2fa310d2e 100644 --- a/plugins/metrics/src/main/java/org/apache/cloudstack/api/ListVMsUsageHistoryCmd.java +++ b/plugins/metrics/src/main/java/org/apache/cloudstack/api/ListVMsUsageHistoryCmd.java @@ -28,11 +28,10 @@ import org.apache.cloudstack.api.response.UserVmResponse; import org.apache.cloudstack.metrics.MetricsService; import org.apache.cloudstack.response.VmMetricsStatsResponse; -@APICommand(name = ListVMsUsageHistoryCmd.APINAME, description = "Lists VM stats", responseObject = VmMetricsStatsResponse.class, +@APICommand(name = "listVirtualMachinesUsageHistory", description = "Lists VM stats", responseObject = VmMetricsStatsResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.17", authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User}) public class ListVMsUsageHistoryCmd extends BaseListCmd { - public static final String APINAME = "listVirtualMachinesUsageHistory"; @Inject private MetricsService metricsService; @@ -86,15 +85,10 @@ public class ListVMsUsageHistoryCmd extends BaseListCmd { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public void execute() { ListResponse response = metricsService.searchForVmMetricsStats(this); response.setResponseName(getCommandName()); setResponseObject(response); } -} \ No newline at end of file +} diff --git a/plugins/metrics/src/main/java/org/apache/cloudstack/api/ListVolumesMetricsCmd.java b/plugins/metrics/src/main/java/org/apache/cloudstack/api/ListVolumesMetricsCmd.java index efa65c0a6b6..79d0f0acf9e 100644 --- a/plugins/metrics/src/main/java/org/apache/cloudstack/api/ListVolumesMetricsCmd.java +++ b/plugins/metrics/src/main/java/org/apache/cloudstack/api/ListVolumesMetricsCmd.java @@ -28,7 +28,7 @@ import org.apache.cloudstack.api.response.VolumeResponse; import org.apache.cloudstack.metrics.MetricsService; import org.apache.cloudstack.response.VolumeMetricsResponse; -@APICommand(name = ListVolumesMetricsCmd.APINAME, +@APICommand(name = "listVolumesMetrics", description = "Lists volume metrics", responseObject = VolumeMetricsResponse.class, requestHasSensitiveInfo = false, @@ -36,16 +36,10 @@ import org.apache.cloudstack.response.VolumeMetricsResponse; since = "4.9.3", authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User}) public class ListVolumesMetricsCmd extends ListVolumesCmd { - public static final String APINAME = "listVolumesMetrics"; @Inject private MetricsService metricsService; - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public void execute() { ListResponse volumes = _queryService.searchForVolumes(this); diff --git a/plugins/metrics/src/main/java/org/apache/cloudstack/api/ListZonesMetricsCmd.java b/plugins/metrics/src/main/java/org/apache/cloudstack/api/ListZonesMetricsCmd.java index c63d05c71dd..99218b8f478 100644 --- a/plugins/metrics/src/main/java/org/apache/cloudstack/api/ListZonesMetricsCmd.java +++ b/plugins/metrics/src/main/java/org/apache/cloudstack/api/ListZonesMetricsCmd.java @@ -27,20 +27,14 @@ import org.apache.cloudstack.response.ZoneMetricsResponse; import javax.inject.Inject; import java.util.List; -@APICommand(name = ListZonesMetricsCmd.APINAME, description = "Lists zone metrics", responseObject = ZoneMetricsResponse.class, +@APICommand(name = "listZonesMetrics", description = "Lists zone metrics", responseObject = ZoneMetricsResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, responseView = ResponseObject.ResponseView.Full, since = "4.9.3", authorized = {RoleType.Admin}) public class ListZonesMetricsCmd extends ListZonesCmd { - public static final String APINAME = "listZonesMetrics"; @Inject private MetricsService metricsService; - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public void execute() { ListResponse zones = _queryService.listDataCenters(this); diff --git a/plugins/network-elements/bigswitch/src/main/java/com/cloud/api/commands/AddBigSwitchBcfDeviceCmd.java b/plugins/network-elements/bigswitch/src/main/java/com/cloud/api/commands/AddBigSwitchBcfDeviceCmd.java index 8231484840f..8a02efaccc9 100644 --- a/plugins/network-elements/bigswitch/src/main/java/com/cloud/api/commands/AddBigSwitchBcfDeviceCmd.java +++ b/plugins/network-elements/bigswitch/src/main/java/com/cloud/api/commands/AddBigSwitchBcfDeviceCmd.java @@ -43,7 +43,6 @@ import com.cloud.utils.exception.CloudRuntimeException; @APICommand(name = "addBigSwitchBcfDevice", responseObject = BigSwitchBcfDeviceResponse.class, description = "Adds a BigSwitch BCF Controller device", since = "4.6.0", requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class AddBigSwitchBcfDeviceCmd extends BaseAsyncCmd { - private static final String S_NAME = "addbigswitchbcfdeviceresponse"; @Inject private BigSwitchBcfElementService bcfElementService; @@ -120,11 +119,6 @@ public class AddBigSwitchBcfDeviceCmd extends BaseAsyncCmd { } } - @Override - public String getCommandName() { - return S_NAME; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccount().getId(); diff --git a/plugins/network-elements/bigswitch/src/main/java/com/cloud/api/commands/DeleteBigSwitchBcfDeviceCmd.java b/plugins/network-elements/bigswitch/src/main/java/com/cloud/api/commands/DeleteBigSwitchBcfDeviceCmd.java index f558562d587..9c977ffb7aa 100644 --- a/plugins/network-elements/bigswitch/src/main/java/com/cloud/api/commands/DeleteBigSwitchBcfDeviceCmd.java +++ b/plugins/network-elements/bigswitch/src/main/java/com/cloud/api/commands/DeleteBigSwitchBcfDeviceCmd.java @@ -41,7 +41,6 @@ import com.cloud.utils.exception.CloudRuntimeException; @APICommand(name = "deleteBigSwitchBcfDevice", responseObject = SuccessResponse.class, description = " delete a BigSwitch BCF Controller device", since = "4.6.0", requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class DeleteBigSwitchBcfDeviceCmd extends BaseAsyncCmd { - private static final String S_NAME = "deletebigswitchbcfdeviceresponse"; @Inject private BigSwitchBcfElementService bigswitchBcfElementService; @@ -87,11 +86,6 @@ public class DeleteBigSwitchBcfDeviceCmd extends BaseAsyncCmd { } } - @Override - public String getCommandName() { - return S_NAME; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccount().getId(); diff --git a/plugins/network-elements/brocade-vcs/src/main/java/com/cloud/api/commands/AddBrocadeVcsDeviceCmd.java b/plugins/network-elements/brocade-vcs/src/main/java/com/cloud/api/commands/AddBrocadeVcsDeviceCmd.java index 5ade8158ddb..8f5389a36c7 100644 --- a/plugins/network-elements/brocade-vcs/src/main/java/com/cloud/api/commands/AddBrocadeVcsDeviceCmd.java +++ b/plugins/network-elements/brocade-vcs/src/main/java/com/cloud/api/commands/AddBrocadeVcsDeviceCmd.java @@ -43,7 +43,6 @@ import com.cloud.utils.exception.CloudRuntimeException; @APICommand(name = "addBrocadeVcsDevice", responseObject = BrocadeVcsDeviceResponse.class, description = "Adds a Brocade VCS Switch", requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class AddBrocadeVcsDeviceCmd extends BaseAsyncCmd { - private static final String s_name = "addbrocadevcsdeviceresponse"; @Inject protected BrocadeVcsElementService brocadeVcsElementService; @@ -106,11 +105,6 @@ public class AddBrocadeVcsDeviceCmd extends BaseAsyncCmd { } } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccount().getId(); diff --git a/plugins/network-elements/brocade-vcs/src/main/java/com/cloud/api/commands/DeleteBrocadeVcsDeviceCmd.java b/plugins/network-elements/brocade-vcs/src/main/java/com/cloud/api/commands/DeleteBrocadeVcsDeviceCmd.java index 6b7ccf85d59..f62236dc8e3 100644 --- a/plugins/network-elements/brocade-vcs/src/main/java/com/cloud/api/commands/DeleteBrocadeVcsDeviceCmd.java +++ b/plugins/network-elements/brocade-vcs/src/main/java/com/cloud/api/commands/DeleteBrocadeVcsDeviceCmd.java @@ -41,7 +41,6 @@ import com.cloud.utils.exception.CloudRuntimeException; @APICommand(name = "deleteBrocadeVcsDevice", responseObject = SuccessResponse.class, description = " delete a Brocade VCS Switch", requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class DeleteBrocadeVcsDeviceCmd extends BaseAsyncCmd { - private static final String s_name = "deletebrocadevcsdeviceresponse"; @Inject protected BrocadeVcsElementService brocadeVcsElementService; @@ -82,11 +81,6 @@ public class DeleteBrocadeVcsDeviceCmd extends BaseAsyncCmd { } } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccount().getId(); diff --git a/plugins/network-elements/globodns/src/main/java/com/globo/globodns/cloudstack/api/AddGloboDnsHostCmd.java b/plugins/network-elements/globodns/src/main/java/com/globo/globodns/cloudstack/api/AddGloboDnsHostCmd.java index 1694a329520..7cf350f4ffd 100644 --- a/plugins/network-elements/globodns/src/main/java/com/globo/globodns/cloudstack/api/AddGloboDnsHostCmd.java +++ b/plugins/network-elements/globodns/src/main/java/com/globo/globodns/cloudstack/api/AddGloboDnsHostCmd.java @@ -40,7 +40,6 @@ import com.globo.globodns.cloudstack.element.GloboDnsElementService; @APICommand(name = "addGloboDnsHost", responseObject = SuccessResponse.class, description = "Adds the GloboDNS external host", since="4.5.0") public class AddGloboDnsHostCmd extends BaseAsyncCmd { - private static final String s_name = "addglobodnshostresponse"; @Inject GloboDnsElementService _globoDnsElementService; @@ -100,11 +99,6 @@ public class AddGloboDnsHostCmd extends BaseAsyncCmd { } } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccountId(); diff --git a/plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/api/command/CreateServiceInstanceCmd.java b/plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/api/command/CreateServiceInstanceCmd.java index 3a48cc90c69..db98448ec17 100644 --- a/plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/api/command/CreateServiceInstanceCmd.java +++ b/plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/api/command/CreateServiceInstanceCmd.java @@ -56,7 +56,6 @@ import com.cloud.user.Account; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class CreateServiceInstanceCmd extends BaseAsyncCreateCmd { - private static final String s_name = "createserviceinstanceresponse"; /// API parameters @Parameter(name = ApiConstants.ZONE_ID, @@ -185,11 +184,6 @@ public class CreateServiceInstanceCmd extends BaseAsyncCreateCmd { } } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { Long accountId = _accountService.finalyzeAccountId(accountName, domainId, projectId, true); diff --git a/plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/AddExternalFirewallCmd.java b/plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/AddExternalFirewallCmd.java index 89fc17d8b3c..36d542afbe4 100644 --- a/plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/AddExternalFirewallCmd.java +++ b/plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/AddExternalFirewallCmd.java @@ -39,7 +39,6 @@ import com.cloud.utils.exception.CloudRuntimeException; requestHasSensitiveInfo = true, responseHasSensitiveInfo = false) public class AddExternalFirewallCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(AddExternalFirewallCmd.class.getName()); - private static final String s_name = "addexternalfirewallresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -88,11 +87,6 @@ public class AddExternalFirewallCmd extends BaseCmd { @Inject JuniperSRXFirewallElementService _srxElementService; - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/AddSrxFirewallCmd.java b/plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/AddSrxFirewallCmd.java index 59bf17cc7f1..db3fbf7fa45 100644 --- a/plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/AddSrxFirewallCmd.java +++ b/plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/AddSrxFirewallCmd.java @@ -44,7 +44,6 @@ import com.cloud.utils.exception.CloudRuntimeException; requestHasSensitiveInfo = true, responseHasSensitiveInfo = false) public class AddSrxFirewallCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(AddSrxFirewallCmd.class.getName()); - private static final String s_name = "addsrxfirewallresponse"; @Inject JuniperSRXFirewallElementService _srxFwService; @@ -129,11 +128,6 @@ public class AddSrxFirewallCmd extends BaseAsyncCmd { return EventTypes.EVENT_EXTERNAL_FIREWALL_DEVICE_ADD; } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccount().getId(); diff --git a/plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/ConfigureSrxFirewallCmd.java b/plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/ConfigureSrxFirewallCmd.java index 482968677a0..fcf1a2b3fa7 100644 --- a/plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/ConfigureSrxFirewallCmd.java +++ b/plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/ConfigureSrxFirewallCmd.java @@ -44,7 +44,6 @@ import com.cloud.utils.exception.CloudRuntimeException; public class ConfigureSrxFirewallCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(ConfigureSrxFirewallCmd.class.getName()); - private static final String s_name = "configuresrxfirewallresponse"; @Inject JuniperSRXFirewallElementService _srxFwService; @@ -111,11 +110,6 @@ public class ConfigureSrxFirewallCmd extends BaseAsyncCmd { return EventTypes.EVENT_EXTERNAL_FIREWALL_DEVICE_CONFIGURE; } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccount().getId(); diff --git a/plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/DeleteExternalFirewallCmd.java b/plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/DeleteExternalFirewallCmd.java index 358d2e47d52..d5a3619e399 100644 --- a/plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/DeleteExternalFirewallCmd.java +++ b/plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/DeleteExternalFirewallCmd.java @@ -37,7 +37,6 @@ import com.cloud.user.Account; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class DeleteExternalFirewallCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(DeleteExternalFirewallCmd.class.getName()); - private static final String s_name = "deleteexternalfirewallresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -61,11 +60,6 @@ public class DeleteExternalFirewallCmd extends BaseCmd { @Inject JuniperSRXFirewallElementService _srxElementService; - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/DeleteSrxFirewallCmd.java b/plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/DeleteSrxFirewallCmd.java index 3fa0278b01d..b5964016ad1 100644 --- a/plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/DeleteSrxFirewallCmd.java +++ b/plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/DeleteSrxFirewallCmd.java @@ -43,7 +43,6 @@ import com.cloud.utils.exception.CloudRuntimeException; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class DeleteSrxFirewallCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DeleteSrxFirewallCmd.class.getName()); - private static final String s_name = "deletesrxfirewallresponse"; @Inject JuniperSRXFirewallElementService _srxElementService; @@ -99,11 +98,6 @@ public class DeleteSrxFirewallCmd extends BaseAsyncCmd { return EventTypes.EVENT_EXTERNAL_FIREWALL_DEVICE_DELETE; } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccount().getId(); diff --git a/plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/ListExternalFirewallsCmd.java b/plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/ListExternalFirewallsCmd.java index fcf491bc9e8..4e2c26e4b12 100644 --- a/plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/ListExternalFirewallsCmd.java +++ b/plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/ListExternalFirewallsCmd.java @@ -38,7 +38,6 @@ import com.cloud.network.element.JuniperSRXFirewallElementService; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class ListExternalFirewallsCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(ListExternalFirewallsCmd.class.getName()); - private static final String s_name = "listexternalfirewallsresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -62,11 +61,6 @@ public class ListExternalFirewallsCmd extends BaseListCmd { @Inject JuniperSRXFirewallElementService _srxElementService; - @Override - public String getCommandName() { - return s_name; - } - @SuppressWarnings("deprecation") @Override public void execute() { diff --git a/plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/ListSrxFirewallNetworksCmd.java b/plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/ListSrxFirewallNetworksCmd.java index 574985bafb2..f8d3f8f63dc 100644 --- a/plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/ListSrxFirewallNetworksCmd.java +++ b/plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/ListSrxFirewallNetworksCmd.java @@ -48,7 +48,6 @@ import com.cloud.utils.exception.CloudRuntimeException; public class ListSrxFirewallNetworksCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(ListSrxFirewallNetworksCmd.class.getName()); - private static final String s_name = "listsrxfirewallnetworksresponse"; @Inject JuniperSRXFirewallElementService _srxFwService; @@ -100,8 +99,4 @@ public class ListSrxFirewallNetworksCmd extends BaseListCmd { } } - @Override - public String getCommandName() { - return s_name; } -} diff --git a/plugins/network-elements/netscaler/src/main/java/com/cloud/api/commands/AddNetscalerLoadBalancerCmd.java b/plugins/network-elements/netscaler/src/main/java/com/cloud/api/commands/AddNetscalerLoadBalancerCmd.java index f1a6cd4b7ee..a67256b89b7 100644 --- a/plugins/network-elements/netscaler/src/main/java/com/cloud/api/commands/AddNetscalerLoadBalancerCmd.java +++ b/plugins/network-elements/netscaler/src/main/java/com/cloud/api/commands/AddNetscalerLoadBalancerCmd.java @@ -44,7 +44,6 @@ import com.cloud.utils.exception.CloudRuntimeException; public class AddNetscalerLoadBalancerCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(AddNetscalerLoadBalancerCmd.class.getName()); - private static final String s_name = "addnetscalerloadbalancerresponse"; @Inject NetscalerLoadBalancerElementService _netsclarLbService; @@ -174,11 +173,6 @@ public class AddNetscalerLoadBalancerCmd extends BaseAsyncCmd { return EventTypes.EVENT_EXTERNAL_LB_DEVICE_ADD; } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccount().getId(); diff --git a/plugins/network-elements/netscaler/src/main/java/com/cloud/api/commands/ConfigureNetscalerLoadBalancerCmd.java b/plugins/network-elements/netscaler/src/main/java/com/cloud/api/commands/ConfigureNetscalerLoadBalancerCmd.java index 9a25f3bf6a8..59f6597061d 100644 --- a/plugins/network-elements/netscaler/src/main/java/com/cloud/api/commands/ConfigureNetscalerLoadBalancerCmd.java +++ b/plugins/network-elements/netscaler/src/main/java/com/cloud/api/commands/ConfigureNetscalerLoadBalancerCmd.java @@ -45,7 +45,6 @@ import com.cloud.utils.exception.CloudRuntimeException; public class ConfigureNetscalerLoadBalancerCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(ConfigureNetscalerLoadBalancerCmd.class.getName()); - private static final String s_name = "configurenetscalerloadbalancerresponse"; @Inject NetscalerLoadBalancerElementService _netsclarLbService; @@ -146,11 +145,6 @@ public class ConfigureNetscalerLoadBalancerCmd extends BaseAsyncCmd { return EventTypes.EVENT_EXTERNAL_LB_DEVICE_CONFIGURE; } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccount().getId(); diff --git a/plugins/network-elements/netscaler/src/main/java/com/cloud/api/commands/DeleteNetscalerLoadBalancerCmd.java b/plugins/network-elements/netscaler/src/main/java/com/cloud/api/commands/DeleteNetscalerLoadBalancerCmd.java index 16990c56251..74a939c10d9 100644 --- a/plugins/network-elements/netscaler/src/main/java/com/cloud/api/commands/DeleteNetscalerLoadBalancerCmd.java +++ b/plugins/network-elements/netscaler/src/main/java/com/cloud/api/commands/DeleteNetscalerLoadBalancerCmd.java @@ -43,7 +43,6 @@ import com.cloud.utils.exception.CloudRuntimeException; public class DeleteNetscalerLoadBalancerCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DeleteNetscalerLoadBalancerCmd.class.getName()); - private static final String s_name = "deletenetscalerloadbalancerresponse"; @Inject NetscalerLoadBalancerElementService _netsclarLbService; @@ -99,11 +98,6 @@ public class DeleteNetscalerLoadBalancerCmd extends BaseAsyncCmd { return EventTypes.EVENT_EXTERNAL_NCC_DEVICE_DELETE; } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccount().getId(); diff --git a/plugins/network-elements/netscaler/src/main/java/com/cloud/api/commands/ListNetscalerLoadBalancerNetworksCmd.java b/plugins/network-elements/netscaler/src/main/java/com/cloud/api/commands/ListNetscalerLoadBalancerNetworksCmd.java index a818abc8ea6..73e0d690432 100644 --- a/plugins/network-elements/netscaler/src/main/java/com/cloud/api/commands/ListNetscalerLoadBalancerNetworksCmd.java +++ b/plugins/network-elements/netscaler/src/main/java/com/cloud/api/commands/ListNetscalerLoadBalancerNetworksCmd.java @@ -48,7 +48,6 @@ import com.cloud.utils.exception.CloudRuntimeException; public class ListNetscalerLoadBalancerNetworksCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(ListNetscalerLoadBalancerNetworksCmd.class.getName()); - private static final String s_name = "listnetscalerloadbalancernetworksresponse"; @Inject NetscalerLoadBalancerElementService _netsclarLbService; @@ -100,8 +99,4 @@ public class ListNetscalerLoadBalancerNetworksCmd extends BaseListCmd { } } - @Override - public String getCommandName() { - return s_name; } -} diff --git a/plugins/network-elements/netscaler/src/main/java/com/cloud/api/commands/RegisterNetscalerControlCenterCmd.java b/plugins/network-elements/netscaler/src/main/java/com/cloud/api/commands/RegisterNetscalerControlCenterCmd.java index fe98a7a5fba..852fa472e26 100644 --- a/plugins/network-elements/netscaler/src/main/java/com/cloud/api/commands/RegisterNetscalerControlCenterCmd.java +++ b/plugins/network-elements/netscaler/src/main/java/com/cloud/api/commands/RegisterNetscalerControlCenterCmd.java @@ -44,7 +44,6 @@ import com.cloud.utils.exception.CloudRuntimeException; public class RegisterNetscalerControlCenterCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(RegisterNetscalerControlCenterCmd.class.getName()); - private static final String s_name = "registernetscalercontrolcenterresponse"; @Inject NetscalerLoadBalancerElementService _netsclarLbService; @@ -83,10 +82,6 @@ public class RegisterNetscalerControlCenterCmd extends BaseAsyncCmd { return s_logger; } - public static String getsName() { - return s_name; - } - public NetscalerLoadBalancerElementService get_netsclarLbService() { return _netsclarLbService; } @@ -133,13 +128,8 @@ public class RegisterNetscalerControlCenterCmd extends BaseAsyncCmd { return EventTypes.EVENT_EXTERNAL_NCC_DEVICE_ADD; } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccount().getId(); } -} \ No newline at end of file +} diff --git a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/api/commands/AddNiciraNvpDeviceCmd.java b/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/api/commands/AddNiciraNvpDeviceCmd.java index 1bde3b73609..3f5b1824f90 100644 --- a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/api/commands/AddNiciraNvpDeviceCmd.java +++ b/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/api/commands/AddNiciraNvpDeviceCmd.java @@ -44,7 +44,6 @@ import com.cloud.utils.exception.CloudRuntimeException; @APICommand(name = "addNiciraNvpDevice", responseObject = NiciraNvpDeviceResponse.class, description = "Adds a Nicira NVP device", requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class AddNiciraNvpDeviceCmd extends BaseAsyncCmd { - private static final String s_name = "addniciranvpdeviceresponse"; @Inject protected NiciraNvpElementService niciraNvpElementService; @@ -142,11 +141,6 @@ public class AddNiciraNvpDeviceCmd extends BaseAsyncCmd { } } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccount().getId(); diff --git a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/api/commands/DeleteNiciraNvpDeviceCmd.java b/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/api/commands/DeleteNiciraNvpDeviceCmd.java index d3fadeaac74..47923e762a0 100644 --- a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/api/commands/DeleteNiciraNvpDeviceCmd.java +++ b/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/api/commands/DeleteNiciraNvpDeviceCmd.java @@ -43,7 +43,6 @@ import com.cloud.utils.exception.CloudRuntimeException; @APICommand(name = "deleteNiciraNvpDevice", responseObject = SuccessResponse.class, description = " delete a nicira nvp device", requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class DeleteNiciraNvpDeviceCmd extends BaseAsyncCmd { - private static final String s_name = "deleteniciranvpdeviceresponse"; @Inject protected NiciraNvpElementService niciraNvpElementService; @@ -89,11 +88,6 @@ public class DeleteNiciraNvpDeviceCmd extends BaseAsyncCmd { } } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccount().getId(); diff --git a/plugins/network-elements/palo-alto/src/main/java/com/cloud/api/commands/AddPaloAltoFirewallCmd.java b/plugins/network-elements/palo-alto/src/main/java/com/cloud/api/commands/AddPaloAltoFirewallCmd.java index a2b2cbb9e6f..ba1342496b5 100644 --- a/plugins/network-elements/palo-alto/src/main/java/com/cloud/api/commands/AddPaloAltoFirewallCmd.java +++ b/plugins/network-elements/palo-alto/src/main/java/com/cloud/api/commands/AddPaloAltoFirewallCmd.java @@ -44,7 +44,6 @@ import com.cloud.utils.exception.CloudRuntimeException; requestHasSensitiveInfo = true, responseHasSensitiveInfo = false) public class AddPaloAltoFirewallCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(AddPaloAltoFirewallCmd.class.getName()); - private static final String s_name = "addpaloaltofirewallresponse"; @Inject PaloAltoFirewallElementService _paFwService; @@ -129,11 +128,6 @@ public class AddPaloAltoFirewallCmd extends BaseAsyncCmd { return EventTypes.EVENT_EXTERNAL_FIREWALL_DEVICE_ADD; } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccount().getId(); diff --git a/plugins/network-elements/palo-alto/src/main/java/com/cloud/api/commands/ConfigurePaloAltoFirewallCmd.java b/plugins/network-elements/palo-alto/src/main/java/com/cloud/api/commands/ConfigurePaloAltoFirewallCmd.java index 0c6b3f7c9e9..a1d8ea87794 100644 --- a/plugins/network-elements/palo-alto/src/main/java/com/cloud/api/commands/ConfigurePaloAltoFirewallCmd.java +++ b/plugins/network-elements/palo-alto/src/main/java/com/cloud/api/commands/ConfigurePaloAltoFirewallCmd.java @@ -44,7 +44,6 @@ import com.cloud.utils.exception.CloudRuntimeException; public class ConfigurePaloAltoFirewallCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(ConfigurePaloAltoFirewallCmd.class.getName()); - private static final String s_name = "configurepaloaltofirewallresponse"; @Inject PaloAltoFirewallElementService _paFwService; @@ -111,11 +110,6 @@ public class ConfigurePaloAltoFirewallCmd extends BaseAsyncCmd { return EventTypes.EVENT_EXTERNAL_FIREWALL_DEVICE_CONFIGURE; } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccount().getId(); diff --git a/plugins/network-elements/palo-alto/src/main/java/com/cloud/api/commands/DeletePaloAltoFirewallCmd.java b/plugins/network-elements/palo-alto/src/main/java/com/cloud/api/commands/DeletePaloAltoFirewallCmd.java index f59cb386b37..40b93097748 100644 --- a/plugins/network-elements/palo-alto/src/main/java/com/cloud/api/commands/DeletePaloAltoFirewallCmd.java +++ b/plugins/network-elements/palo-alto/src/main/java/com/cloud/api/commands/DeletePaloAltoFirewallCmd.java @@ -43,7 +43,6 @@ import com.cloud.utils.exception.CloudRuntimeException; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class DeletePaloAltoFirewallCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DeletePaloAltoFirewallCmd.class.getName()); - private static final String s_name = "deletepaloaltofirewallresponse"; @Inject PaloAltoFirewallElementService _paElementService; @@ -99,11 +98,6 @@ public class DeletePaloAltoFirewallCmd extends BaseAsyncCmd { return EventTypes.EVENT_EXTERNAL_FIREWALL_DEVICE_DELETE; } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return CallContext.current().getCallingAccount().getId(); diff --git a/plugins/network-elements/palo-alto/src/main/java/com/cloud/api/commands/ListPaloAltoFirewallNetworksCmd.java b/plugins/network-elements/palo-alto/src/main/java/com/cloud/api/commands/ListPaloAltoFirewallNetworksCmd.java index 291663e5824..e2d5f96f06f 100644 --- a/plugins/network-elements/palo-alto/src/main/java/com/cloud/api/commands/ListPaloAltoFirewallNetworksCmd.java +++ b/plugins/network-elements/palo-alto/src/main/java/com/cloud/api/commands/ListPaloAltoFirewallNetworksCmd.java @@ -48,7 +48,6 @@ import com.cloud.utils.exception.CloudRuntimeException; public class ListPaloAltoFirewallNetworksCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(ListPaloAltoFirewallNetworksCmd.class.getName()); - private static final String s_name = "listpaloaltofirewallnetworksresponse"; @Inject PaloAltoFirewallElementService _paFwService; @@ -100,8 +99,4 @@ public class ListPaloAltoFirewallNetworksCmd extends BaseListCmd { } } - @Override - public String getCommandName() { - return s_name; } -} diff --git a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LDAPConfigCmd.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LDAPConfigCmd.java index 23f71c22235..2a643dda76f 100644 --- a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LDAPConfigCmd.java +++ b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LDAPConfigCmd.java @@ -55,7 +55,6 @@ import com.cloud.utils.Pair; public class LDAPConfigCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(LDAPConfigCmd.class.getName()); - private static final String s_name = "ldapconfigresponse"; @Inject private ConfigurationDao _configDao; @@ -265,11 +264,6 @@ public class LDAPConfigCmd extends BaseCmd { return result.first(); } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LDAPRemoveCmd.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LDAPRemoveCmd.java index 0a4dc20ee0b..b915f97fe08 100644 --- a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LDAPRemoveCmd.java +++ b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LDAPRemoveCmd.java @@ -43,7 +43,6 @@ public class LDAPRemoveCmd extends BaseCmd { @Inject private LdapManager _ldapManager; - private static final String s_name = "ldapremoveresponse"; @Override public void execute() { @@ -65,11 +64,6 @@ public class LDAPRemoveCmd extends BaseCmd { return true; } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LinkAccountToLdapCmd.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LinkAccountToLdapCmd.java index 62841501d7c..af5420ef488 100644 --- a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LinkAccountToLdapCmd.java +++ b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LinkAccountToLdapCmd.java @@ -43,11 +43,10 @@ import com.cloud.user.Account; import com.cloud.user.User; import com.cloud.user.UserAccount; -@APICommand(name = LinkAccountToLdapCmd.APINAME, description = "link a cloudstack account to a group or OU in ldap", responseObject = LinkDomainToLdapResponse.class, since = "4.11.0", +@APICommand(name = "linkAccountToLdap", description = "link a cloudstack account to a group or OU in ldap", responseObject = LinkDomainToLdapResponse.class, since = "4.11.0", requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, authorized = {RoleType.Admin,RoleType.DomainAdmin}) public class LinkAccountToLdapCmd extends BaseCmd { public static final Logger LOGGER = Logger.getLogger(LinkAccountToLdapCmd.class.getName()); - public static final String APINAME = "linkAccountToLdap"; @Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, required = true, entityType = DomainResponse.class, description = "The id of the domain that is to contain the linked account.") private Long domainId; @@ -101,7 +100,7 @@ public class LinkAccountToLdapCmd extends BaseCmd { LOGGER.debug("ldap user with username " + admin + " is disabled in the given group/ou"); } } - response.setObjectName(APINAME); + response.setObjectName(this.getActualCommandName()); response.setResponseName(getCommandName()); setResponseObject(response); } catch (final InvalidParameterValueException e) { @@ -109,11 +108,6 @@ public class LinkAccountToLdapCmd extends BaseCmd { } } - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LinkDomainToLdapCmd.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LinkDomainToLdapCmd.java index 453d7346287..db80ff345f5 100644 --- a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LinkDomainToLdapCmd.java +++ b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LinkDomainToLdapCmd.java @@ -45,7 +45,6 @@ import java.util.UUID; requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class LinkDomainToLdapCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(LinkDomainToLdapCmd.class.getName()); - private static final String s_name = "linkdomaintoldapresponse"; @Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, required = true, entityType = DomainResponse.class, description = "The id of the domain which has to be " + "linked to LDAP.") @@ -129,11 +128,6 @@ public class LinkDomainToLdapCmd extends BaseCmd { } } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; diff --git a/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/api/command/LinkAccountToLdapCmdTest.java b/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/api/command/LinkAccountToLdapCmdTest.java index a200dd82bb8..1a00a058b16 100644 --- a/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/api/command/LinkAccountToLdapCmdTest.java +++ b/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/api/command/LinkAccountToLdapCmdTest.java @@ -22,6 +22,7 @@ import com.cloud.user.AccountService; import com.cloud.user.User; import com.cloud.user.UserAccountVO; import org.apache.cloudstack.acl.RoleType; +import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.response.LinkAccountToLdapResponse; import org.apache.cloudstack.ldap.LdapManager; import org.apache.cloudstack.ldap.LdapUser; @@ -87,7 +88,7 @@ public class LinkAccountToLdapCmdTest implements LdapConfigurationChanger { linkAccountToLdapCmd.execute(); LinkAccountToLdapResponse result = (LinkAccountToLdapResponse)linkAccountToLdapCmd.getResponseObject(); - assertEquals("objectName", linkAccountToLdapCmd.APINAME, result.getObjectName()); + assertEquals("objectName", BaseCmd.getCommandNameByClass(LinkAccountToLdapCmd.class), result.getObjectName()); assertEquals("commandName", linkAccountToLdapCmd.getCommandName(), result.getResponseName()); assertEquals("domainId", String.valueOf(domainId), result.getDomainId()); assertEquals("type", type, result.getType()); diff --git a/plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/api/command/AuthorizeSAMLSSOCmd.java b/plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/api/command/AuthorizeSAMLSSOCmd.java index 54ce418b2cb..9a7dadcdb8a 100644 --- a/plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/api/command/AuthorizeSAMLSSOCmd.java +++ b/plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/api/command/AuthorizeSAMLSSOCmd.java @@ -39,7 +39,6 @@ import javax.inject.Inject; public class AuthorizeSAMLSSOCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(AuthorizeSAMLSSOCmd.class.getName()); - private static final String s_name = "authorizesamlssoresponse"; @Inject SAML2AuthManager _samlAuthManager; @@ -69,11 +68,6 @@ public class AuthorizeSAMLSSOCmd extends BaseCmd { return id; } - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; @@ -102,4 +96,4 @@ public class AuthorizeSAMLSSOCmd extends BaseCmd { response.setSuccess(status); setResponseObject(response); } -} \ No newline at end of file +} diff --git a/plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/api/command/ListAndSwitchSAMLAccountCmd.java b/plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/api/command/ListAndSwitchSAMLAccountCmd.java index a5ef8933eb5..25f056adf68 100644 --- a/plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/api/command/ListAndSwitchSAMLAccountCmd.java +++ b/plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/api/command/ListAndSwitchSAMLAccountCmd.java @@ -63,7 +63,6 @@ import com.cloud.utils.HttpUtils; @APICommand(name = "listAndSwitchSamlAccount", description = "Lists and switches to other SAML accounts owned by the SAML user", responseObject = SuccessResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class ListAndSwitchSAMLAccountCmd extends BaseCmd implements APIAuthenticator { public static final Logger s_logger = Logger.getLogger(ListAndSwitchSAMLAccountCmd.class.getName()); - private static final String s_name = "listandswitchsamlaccountresponse"; @Inject ApiServerService _apiServer; @@ -87,11 +86,6 @@ public class ListAndSwitchSAMLAccountCmd extends BaseCmd implements APIAuthentic @Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, entityType = DomainResponse.class, required = false, description = "Domain uuid") private Long domainId; - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.ACCOUNT_ID_SYSTEM; @@ -212,4 +206,4 @@ public class ListAndSwitchSAMLAccountCmd extends BaseCmd implements APIAuthentic public ApiCommandResourceType getApiResourceType() { return ApiCommandResourceType.Account; } -} \ No newline at end of file +} diff --git a/plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/api/command/ListIdpsCmd.java b/plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/api/command/ListIdpsCmd.java index 545b17eeb97..b61eae4382a 100644 --- a/plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/api/command/ListIdpsCmd.java +++ b/plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/api/command/ListIdpsCmd.java @@ -19,7 +19,6 @@ package org.apache.cloudstack.api.command; import com.cloud.api.response.ApiResponseSerializer; import com.cloud.user.Account; import org.apache.cloudstack.api.APICommand; -import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.ApiServerService; import org.apache.cloudstack.api.BaseCmd; @@ -42,10 +41,9 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -@APICommand(name = ApiConstants.LIST_IDPS, description = "Returns list of discovered SAML Identity Providers", responseObject = IdpResponse.class, entityType = {}) +@APICommand(name = "listIdps", description = "Returns list of discovered SAML Identity Providers", responseObject = IdpResponse.class, entityType = {}) public class ListIdpsCmd extends BaseCmd implements APIAuthenticator { public static final Logger s_logger = Logger.getLogger(ListIdpsCmd.class.getName()); - public static final String APINAME = ApiConstants.LIST_IDPS; @Inject ApiServerService _apiServer; @@ -56,11 +54,6 @@ public class ListIdpsCmd extends BaseCmd implements APIAuthenticator { /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return APINAME.toLowerCase() + RESPONSE_SUFFIX; - } - @Override public long getEntityOwnerId() { return Account.Type.NORMAL.ordinal(); diff --git a/server/src/main/java/com/cloud/api/ApiServlet.java b/server/src/main/java/com/cloud/api/ApiServlet.java index 1ab12d326af..f93f2dfacd6 100644 --- a/server/src/main/java/com/cloud/api/ApiServlet.java +++ b/server/src/main/java/com/cloud/api/ApiServlet.java @@ -37,6 +37,7 @@ import javax.servlet.http.HttpSession; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiServerService; +import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.auth.APIAuthenticationManager; import org.apache.cloudstack.api.auth.APIAuthenticationType; @@ -361,7 +362,7 @@ public class ApiServlet extends HttpServlet { protected void setClientAddressForConsoleEndpointAccess(String command, Map params, HttpServletRequest req) throws UnknownHostException { if (org.apache.commons.lang3.StringUtils.isNotBlank(command) && - command.equalsIgnoreCase(CreateConsoleEndpointCmd.APINAME)) { + command.equalsIgnoreCase(BaseCmd.getCommandNameByClass(CreateConsoleEndpointCmd.class))) { InetAddress addr = getClientAddress(req); String clientAddress = addr != null ? addr.getHostAddress() : null; params.put(ConsoleAccessUtils.CLIENT_INET_ADDRESS_KEY, new String[] {clientAddress}); diff --git a/server/src/main/java/com/cloud/api/auth/DefaultLoginAPIAuthenticatorCmd.java b/server/src/main/java/com/cloud/api/auth/DefaultLoginAPIAuthenticatorCmd.java index 7fb9d2ef17b..53f45c5956c 100644 --- a/server/src/main/java/com/cloud/api/auth/DefaultLoginAPIAuthenticatorCmd.java +++ b/server/src/main/java/com/cloud/api/auth/DefaultLoginAPIAuthenticatorCmd.java @@ -45,11 +45,10 @@ import java.util.List; import java.util.Map; import java.net.InetAddress; -@APICommand(name = ApiConstants.LOGIN, description = "Logs a user into the CloudStack. A successful login attempt will generate a JSESSIONID cookie value that can be passed in subsequent Query command calls until the \"logout\" command has been issued or the session has expired.", requestHasSensitiveInfo = true, responseObject = LoginCmdResponse.class, entityType = {}) +@APICommand(name = "login", description = "Logs a user into the CloudStack. A successful login attempt will generate a JSESSIONID cookie value that can be passed in subsequent Query command calls until the \"logout\" command has been issued or the session has expired.", requestHasSensitiveInfo = true, responseObject = LoginCmdResponse.class, entityType = {}) public class DefaultLoginAPIAuthenticatorCmd extends BaseCmd implements APIAuthenticator { public static final Logger s_logger = Logger.getLogger(DefaultLoginAPIAuthenticatorCmd.class.getName()); - private static final String s_name = "loginresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -93,11 +92,6 @@ public class DefaultLoginAPIAuthenticatorCmd extends BaseCmd implements APIAuthe /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.Type.NORMAL.ordinal(); diff --git a/server/src/main/java/com/cloud/api/auth/DefaultLogoutAPIAuthenticatorCmd.java b/server/src/main/java/com/cloud/api/auth/DefaultLogoutAPIAuthenticatorCmd.java index 71fd955f3f3..29d44e884c4 100644 --- a/server/src/main/java/com/cloud/api/auth/DefaultLogoutAPIAuthenticatorCmd.java +++ b/server/src/main/java/com/cloud/api/auth/DefaultLogoutAPIAuthenticatorCmd.java @@ -19,7 +19,6 @@ package com.cloud.api.auth; import com.cloud.api.response.ApiResponseSerializer; import com.cloud.user.Account; import org.apache.cloudstack.api.APICommand; -import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.ServerApiException; @@ -36,21 +35,15 @@ import java.util.List; import java.util.Map; import java.net.InetAddress; -@APICommand(name = ApiConstants.LOGOUT, description = "Logs out the user", responseObject = LogoutCmdResponse.class, entityType = {}) +@APICommand(name = "logout", description = "Logs out the user", responseObject = LogoutCmdResponse.class, entityType = {}) public class DefaultLogoutAPIAuthenticatorCmd extends BaseCmd implements APIAuthenticator { public static final Logger s_logger = Logger.getLogger(DefaultLogoutAPIAuthenticatorCmd.class.getName()); - private static final String s_name = "logoutresponse"; ///////////////////////////////////////////////////// /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - @Override public long getEntityOwnerId() { return Account.Type.NORMAL.ordinal(); diff --git a/server/src/main/java/com/cloud/storage/upload/UploadListener.java b/server/src/main/java/com/cloud/storage/upload/UploadListener.java index 838676ef0fe..1184be69300 100644 --- a/server/src/main/java/com/cloud/storage/upload/UploadListener.java +++ b/server/src/main/java/com/cloud/storage/upload/UploadListener.java @@ -24,6 +24,7 @@ import java.util.Timer; import javax.inject.Inject; +import org.apache.cloudstack.api.BaseCmd; import org.apache.log4j.Level; import org.apache.log4j.Logger; @@ -104,9 +105,9 @@ public class UploadListener implements Listener { public static final Map responseNameMap; static { Map tempMap = new HashMap(); - tempMap.put(Type.ISO.toString(), ExtractIsoCmd.getStaticName()); - tempMap.put(Type.TEMPLATE.toString(), ExtractTemplateCmd.getStaticName()); - tempMap.put(Type.VOLUME.toString(), ExtractVolumeCmd.getStaticName()); + tempMap.put(Type.ISO.toString(), BaseCmd.getResponseNameByClass(ExtractIsoCmd.class)); + tempMap.put(Type.TEMPLATE.toString(), BaseCmd.getResponseNameByClass(ExtractTemplateCmd.class)); + tempMap.put(Type.VOLUME.toString(), BaseCmd.getResponseNameByClass(ExtractVolumeCmd.class)); tempMap.put("DEFAULT", "extractresponse"); responseNameMap = Collections.unmodifiableMap(tempMap); }