You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ah...@apache.org on 2013/12/12 22:01:45 UTC
[45/48] All Checkstyle problems corrected
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java b/api/src/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java
index 2c31dfd..517807d 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java
@@ -55,25 +55,25 @@ public class ListCfgsByCmd extends BaseListCmd {
type = CommandType.UUID,
entityType = ZoneResponse.class,
description = "the ID of the Zone to update the parameter value for corresponding zone")
- private Long zone_id;
+ private Long zoneId;
@Parameter(name = ApiConstants.CLUSTER_ID,
type = CommandType.UUID,
entityType = ClusterResponse.class,
description = "the ID of the Cluster to update the parameter value for corresponding cluster")
- private Long cluster_id;
+ private Long clusterId;
@Parameter(name = ApiConstants.STORAGE_ID,
type = CommandType.UUID,
entityType = StoragePoolResponse.class,
description = "the ID of the Storage pool to update the parameter value for corresponding storage pool")
- private Long storagepool_id;
+ private Long storagePoolId;
@Parameter(name = ApiConstants.ACCOUNT_ID,
type = CommandType.UUID,
entityType = AccountResponse.class,
description = "the ID of the Account to update the parameter value for corresponding account")
- private Long account_id;
+ private Long accountId;
// ///////////////////////////////////////////////////
// ///////////////// Accessors ///////////////////////
@@ -88,19 +88,19 @@ public class ListCfgsByCmd extends BaseListCmd {
}
public Long getZoneId() {
- return zone_id;
+ return zoneId;
}
public Long getClusterId() {
- return cluster_id;
+ return clusterId;
}
public Long getStoragepoolId() {
- return storagepool_id;
+ return storagePoolId;
}
public Long getAccountId() {
- return account_id;
+ return accountId;
}
@Override
@@ -108,7 +108,7 @@ public class ListCfgsByCmd extends BaseListCmd {
Long defaultPageSize = 500L;
Integer pageSizeInt = getPageSize();
if (pageSizeInt != null) {
- if (pageSizeInt.longValue() == PAGESIZE_UNLIMITED) {
+ if (pageSizeInt.longValue() == s_pageSizeUnlimited) {
defaultPageSize = null;
} else {
defaultPageSize = pageSizeInt.longValue();
@@ -151,6 +151,6 @@ public class ListCfgsByCmd extends BaseListCmd {
response.setResponses(configResponses, result.second());
response.setResponseName(getCommandName());
- this.setResponseObject(response);
+ setResponseObject(response);
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java b/api/src/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java
index fe6e3d6..9bc9b3c 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java
@@ -52,25 +52,25 @@ public class UpdateCfgCmd extends BaseCmd {
type = CommandType.UUID,
entityType = ZoneResponse.class,
description = "the ID of the Zone to update the parameter value for corresponding zone")
- private Long zone_id;
+ private Long zoneId;
@Parameter(name = ApiConstants.CLUSTER_ID,
type = CommandType.UUID,
entityType = ClusterResponse.class,
description = "the ID of the Cluster to update the parameter value for corresponding cluster")
- private Long cluster_id;
+ private Long clusterId;
@Parameter(name = ApiConstants.STORAGE_ID,
type = CommandType.UUID,
entityType = StoragePoolResponse.class,
description = "the ID of the Storage pool to update the parameter value for corresponding storage pool")
- private Long storagepool_id;
+ private Long storagePoolId;
@Parameter(name = ApiConstants.ACCOUNT_ID,
type = CommandType.UUID,
entityType = AccountResponse.class,
description = "the ID of the Account to update the parameter value for corresponding account")
- private Long account_id;
+ private Long accountId;
/////////////////////////////////////////////////////
/////////////////// Accessors ///////////////////////
@@ -85,19 +85,19 @@ public class UpdateCfgCmd extends BaseCmd {
}
public Long getZoneId() {
- return zone_id;
+ return zoneId;
}
public Long getClusterId() {
- return cluster_id;
+ return clusterId;
}
public Long getStoragepoolId() {
- return storagepool_id;
+ return storagePoolId;
}
public Long getAccountId() {
- return account_id;
+ return accountId;
}
/////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLoadBalancerElementsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLoadBalancerElementsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLoadBalancerElementsCmd.java
index df7135a..a42a0b3 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLoadBalancerElementsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLoadBalancerElementsCmd.java
@@ -45,7 +45,7 @@ import com.cloud.network.VirtualRouterProvider;
since = "4.2.0")
public class ListInternalLoadBalancerElementsCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListInternalLoadBalancerElementsCmd.class.getName());
- private static final String _name = "listinternalloadbalancerelementsresponse";
+ private static final String Name = "listinternalloadbalancerelementsresponse";
@Inject
private InternalLoadBalancerElementService _service;
@@ -86,7 +86,7 @@ public class ListInternalLoadBalancerElementsCmd extends BaseListCmd {
@Override
public String getCommandName() {
- return _name;
+ return Name;
}
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
index bdf0472..5614295 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
@@ -44,7 +44,7 @@ import com.cloud.user.Account;
@APICommand(name = "createNetworkOffering", description = "Creates a network offering.", responseObject = NetworkOfferingResponse.class, since = "3.0.0")
public class CreateNetworkOfferingCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(CreateNetworkOfferingCmd.class.getName());
- private static final String _name = "createnetworkofferingresponse";
+ private static final String Name = "createnetworkofferingresponse";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@@ -164,7 +164,7 @@ public class CreateNetworkOfferingCmd extends BaseCmd {
}
public static String getName() {
- return _name;
+ return Name;
}
public Long getServiceOfferingId() {
@@ -281,7 +281,7 @@ public class CreateNetworkOfferingCmd extends BaseCmd {
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
- return _name;
+ return Name;
}
@Override
@@ -295,7 +295,7 @@ public class CreateNetworkOfferingCmd extends BaseCmd {
if (result != null) {
NetworkOfferingResponse response = _responseGenerator.createNetworkOfferingResponse(result);
response.setResponseName(getCommandName());
- this.setResponseObject(response);
+ setResponseObject(response);
} else {
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to create network offering");
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkServiceProvidersCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkServiceProvidersCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkServiceProvidersCmd.java
index 25d5d0f..5a1235b 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkServiceProvidersCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkServiceProvidersCmd.java
@@ -39,7 +39,7 @@ import com.cloud.utils.Pair;
since = "3.0.0")
public class ListNetworkServiceProvidersCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListNetworkServiceProvidersCmd.class.getName());
- private static final String _name = "listnetworkserviceprovidersresponse";
+ private static final String Name = "listnetworkserviceprovidersresponse";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@@ -79,7 +79,7 @@ public class ListNetworkServiceProvidersCmd extends BaseListCmd {
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
- return _name;
+ return Name;
}
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/org/apache/cloudstack/api/command/admin/network/ListStorageNetworkIpRangeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/ListStorageNetworkIpRangeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/ListStorageNetworkIpRangeCmd.java
index 0b17666..89cba47 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/network/ListStorageNetworkIpRangeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/network/ListStorageNetworkIpRangeCmd.java
@@ -43,7 +43,7 @@ import com.cloud.user.Account;
public class ListStorageNetworkIpRangeCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListStorageNetworkIpRangeCmd.class);
- String s_name = "liststoragenetworkiprangeresponse";
+ String _name = "liststoragenetworkiprangeresponse";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@@ -105,7 +105,7 @@ public class ListStorageNetworkIpRangeCmd extends BaseListCmd {
@Override
public String getCommandName() {
- return s_name;
+ return _name;
}
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/org/apache/cloudstack/api/command/admin/network/ListSupportedNetworkServicesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/ListSupportedNetworkServicesCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/ListSupportedNetworkServicesCmd.java
index 240c033..342f9b0 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/network/ListSupportedNetworkServicesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/network/ListSupportedNetworkServicesCmd.java
@@ -39,7 +39,7 @@ import com.cloud.user.Account;
since = "3.0.0")
public class ListSupportedNetworkServicesCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListSupportedNetworkServicesCmd.class.getName());
- private static final String _name = "listsupportednetworkservicesresponse";
+ private static final String Name = "listsupportednetworkservicesresponse";
@Parameter(name = ApiConstants.PROVIDER, type = CommandType.STRING, description = "network service provider name")
private String providerName;
@@ -72,7 +72,7 @@ public class ListSupportedNetworkServicesCmd extends BaseListCmd {
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
- return _name;
+ return Name;
}
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkOfferingCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkOfferingCmd.java
index aaff5a1..957450f 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkOfferingCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkOfferingCmd.java
@@ -32,7 +32,7 @@ import com.cloud.user.Account;
@APICommand(name = "updateNetworkOffering", description = "Updates a network offering.", responseObject = NetworkOfferingResponse.class)
public class UpdateNetworkOfferingCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(UpdateNetworkOfferingCmd.class.getName());
- private static final String _name = "updatenetworkofferingresponse";
+ private static final String Name = "updatenetworkofferingresponse";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@@ -109,7 +109,7 @@ public class UpdateNetworkOfferingCmd extends BaseCmd {
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
- return _name;
+ return Name;
}
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java
index 7dd87e1..6f9693c 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java
@@ -36,7 +36,7 @@ import com.cloud.user.Account;
@APICommand(name = "createServiceOffering", description = "Creates a service offering.", responseObject = ServiceOfferingResponse.class)
public class CreateServiceOfferingCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(CreateServiceOfferingCmd.class.getName());
- private static final String _name = "createserviceofferingresponse";
+ private static final String Name = "createserviceofferingresponse";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@@ -220,7 +220,7 @@ public class CreateServiceOfferingCmd extends BaseCmd {
@Override
public String getCommandName() {
- return _name;
+ return Name;
}
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java
index 2fc4084..397b00a 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java
@@ -46,8 +46,8 @@ public class ListAlertsCmd extends BaseListCmd {
@Parameter(name = ApiConstants.TYPE, type = CommandType.STRING, description = "list by alert type")
private String type;
-
- @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, description = "list by alert name", since="4.3")
+
+ @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, description = "list by alert name", since = "4.3")
private String name;
// ///////////////////////////////////////////////////
@@ -61,7 +61,7 @@ public class ListAlertsCmd extends BaseListCmd {
public String getType() {
return type;
}
-
+
public String getName() {
return name;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/org/apache/cloudstack/api/command/admin/router/ConfigureOvsElementCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/ConfigureOvsElementCmd.java b/api/src/org/apache/cloudstack/api/command/admin/router/ConfigureOvsElementCmd.java
index 26cfb31..75b08b1 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/router/ConfigureOvsElementCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/router/ConfigureOvsElementCmd.java
@@ -41,92 +41,92 @@ import com.cloud.user.Account;
@APICommand(name = "configureOvsElement", responseObject = OvsProviderResponse.class, description = "Configures an ovs element.")
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<VirtualRouterElementService> _service;
-
- // ///////////////////////////////////////////////////
- // ////////////// API parameters /////////////////////
- // ///////////////////////////////////////////////////
-
- @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = OvsProviderResponse.class, required = true, description = "the ID of the ovs provider")
- private Long id;
-
- @Parameter(name = ApiConstants.ENABLED, type = CommandType.BOOLEAN, required = true, description = "Enabled/Disabled the service provider")
- private Boolean enabled;
-
- // ///////////////////////////////////////////////////
- // ///////////////// Accessors ///////////////////////
- // ///////////////////////////////////////////////////
- public void setId(Long id) {
- this.id = id;
- }
-
- public Long getId() {
- return id;
- }
-
- public void setEnabled(Boolean enabled) {
- this.enabled = enabled;
- }
-
- public Boolean getEnabled() {
- return enabled;
- }
-
- // ///////////////////////////////////////////////////
- // ///////////// API Implementation///////////////////
- // ///////////////////////////////////////////////////
-
- @Override
- public String getCommandName() {
- return s_name;
- }
-
- public static String getResultObjectName() {
- return "boolean";
- }
-
- @Override
- public long getEntityOwnerId() {
- return Account.ACCOUNT_ID_SYSTEM;
- }
-
- @Override
- public String getEventType() {
- return EventTypes.EVENT_NETWORK_ELEMENT_CONFIGURE;
- }
-
- @Override
- public String getEventDescription() {
- return "configuring ovs provider: " + id;
- }
-
- @Override
- public ApiCommandJobType getInstanceType() {
- return ApiCommandJobType.None;
- }
-
- @Override
- public Long getInstanceId() {
- return id;
- }
-
- @Override
- public void execute() throws ConcurrentOperationException,
- ResourceUnavailableException, InsufficientCapacityException {
- CallContext.current().setEventDetails("Ovs element: " + id);
- OvsProvider result = _service.get(0).configure(this);
- if (result != null) {
- OvsProviderResponse ovsResponse = _responseGenerator
- .createOvsProviderResponse(result);
- ovsResponse.setResponseName(getCommandName());
- this.setResponseObject(ovsResponse);
- } else {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR,
- "Failed to configure the ovs provider");
- }
- }
+ public static final Logger s_logger = Logger
+ .getLogger(ConfigureOvsElementCmd.class.getName());
+ private static final String s_name = "configureovselementresponse";
+ @Inject
+ private List<VirtualRouterElementService> _service;
+
+ // ///////////////////////////////////////////////////
+ // ////////////// API parameters /////////////////////
+ // ///////////////////////////////////////////////////
+
+ @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = OvsProviderResponse.class, required = true, description = "the ID of the ovs provider")
+ private Long id;
+
+ @Parameter(name = ApiConstants.ENABLED, type = CommandType.BOOLEAN, required = true, description = "Enabled/Disabled the service provider")
+ private Boolean enabled;
+
+ // ///////////////////////////////////////////////////
+ // ///////////////// Accessors ///////////////////////
+ // ///////////////////////////////////////////////////
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setEnabled(Boolean enabled) {
+ this.enabled = enabled;
+ }
+
+ public Boolean getEnabled() {
+ return enabled;
+ }
+
+ // ///////////////////////////////////////////////////
+ // ///////////// API Implementation///////////////////
+ // ///////////////////////////////////////////////////
+
+ @Override
+ public String getCommandName() {
+ return s_name;
+ }
+
+ public static String getResultObjectName() {
+ return "boolean";
+ }
+
+ @Override
+ public long getEntityOwnerId() {
+ return Account.ACCOUNT_ID_SYSTEM;
+ }
+
+ @Override
+ public String getEventType() {
+ return EventTypes.EVENT_NETWORK_ELEMENT_CONFIGURE;
+ }
+
+ @Override
+ public String getEventDescription() {
+ return "configuring ovs provider: " + id;
+ }
+
+ @Override
+ public ApiCommandJobType getInstanceType() {
+ return ApiCommandJobType.None;
+ }
+
+ @Override
+ public Long getInstanceId() {
+ return id;
+ }
+
+ @Override
+ public void execute() throws ConcurrentOperationException,
+ ResourceUnavailableException, InsufficientCapacityException {
+ CallContext.current().setEventDetails("Ovs element: " + id);
+ OvsProvider result = _service.get(0).configure(this);
+ if (result != null) {
+ OvsProviderResponse ovsResponse = _responseGenerator
+ .createOvsProviderResponse(result);
+ ovsResponse.setResponseName(getCommandName());
+ this.setResponseObject(ovsResponse);
+ } else {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR,
+ "Failed to configure the ovs provider");
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/org/apache/cloudstack/api/command/admin/router/ListOvsElementsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/ListOvsElementsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/router/ListOvsElementsCmd.java
index 9f5feee..d5f73fd 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/router/ListOvsElementsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/router/ListOvsElementsCmd.java
@@ -41,62 +41,64 @@ import com.cloud.network.element.VirtualRouterElementService;
@APICommand(name = "listOvsElements", description = "Lists all available ovs elements.", responseObject = OvsProviderResponse.class)
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<VirtualRouterElementService> _service;
- // ///////////////////////////////////////////////////
- // ////////////// API parameters /////////////////////
- // ///////////////////////////////////////////////////
- @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = OvsProviderResponse.class, description = "list ovs elements by id")
- private Long id;
-
- @Parameter(name = ApiConstants.NSP_ID, type = CommandType.UUID, entityType = ProviderResponse.class, description = "list ovs elements by network service provider id")
- private Long nspId;
-
- @Parameter(name = ApiConstants.ENABLED, type = CommandType.BOOLEAN, description = "list network offerings by enabled state")
- private Boolean enabled;
-
- // ///////////////////////////////////////////////////
- // ///////////////// Accessors ///////////////////////
- // ///////////////////////////////////////////////////
-
- public void setId(Long id) {
- this.id = id;
- }
-
- public Long getId() {
- return id;
- }
-
- public void setNspId(Long nspId) {
- this.nspId = nspId;
- }
-
- public Long getNspId() {
- return nspId;
- }
-
- public void setEnabled(Boolean enabled) {
- this.enabled = enabled;
- }
-
- public Boolean getEnabled() {
- return enabled;
- }
-
- @Override
- public String getCommandName() {
- return _name;
- }
- @Override
- public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException {
+ public static final Logger s_logger = Logger
+ .getLogger(ListNetworkOfferingsCmd.class.getName());
+ private static final String Name = "listovselementsresponse";
+ @Inject
+ private List<VirtualRouterElementService> _service;
+ // ///////////////////////////////////////////////////
+ // ////////////// API parameters /////////////////////
+ // ///////////////////////////////////////////////////
+ @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = OvsProviderResponse.class, description = "list ovs elements by id")
+ private Long id;
+
+ @Parameter(name = ApiConstants.NSP_ID, type = CommandType.UUID, entityType = ProviderResponse.class, description = "list ovs elements by network service provider id")
+ private Long nspId;
+
+ @Parameter(name = ApiConstants.ENABLED, type = CommandType.BOOLEAN, description = "list network offerings by enabled state")
+ private Boolean enabled;
+
+ // ///////////////////////////////////////////////////
+ // ///////////////// Accessors ///////////////////////
+ // ///////////////////////////////////////////////////
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setNspId(Long nspId) {
+ this.nspId = nspId;
+ }
+
+ public Long getNspId() {
+ return nspId;
+ }
+
+ public void setEnabled(Boolean enabled) {
+ this.enabled = enabled;
+ }
+
+ public Boolean getEnabled() {
+ return enabled;
+ }
+
+ @Override
+ public String getCommandName() {
+ return Name;
+ }
+
+ @Override
+ public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException,
+ ResourceAllocationException {
List<? extends OvsProvider> providers = _service.get(0).searchForOvsElement(this);
ListResponse<OvsProviderResponse> response = new ListResponse<OvsProviderResponse>();
List<OvsProviderResponse> providerResponses = new ArrayList<OvsProviderResponse>();
for (OvsProvider provider : providers) {
- OvsProviderResponse providerResponse = _responseGenerator.createOvsProviderResponse(provider);
+ OvsProviderResponse providerResponse = _responseGenerator.createOvsProviderResponse(provider);
providerResponses.add(providerResponse);
}
response.setResponses(providerResponses);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/org/apache/cloudstack/api/command/admin/router/ListVirtualRouterElementsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/ListVirtualRouterElementsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/router/ListVirtualRouterElementsCmd.java
index 4f04018..6f17921 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/router/ListVirtualRouterElementsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/router/ListVirtualRouterElementsCmd.java
@@ -43,7 +43,7 @@ import com.cloud.network.element.VirtualRouterElementService;
@APICommand(name = "listVirtualRouterElements", description = "Lists all available virtual router elements.", responseObject = VirtualRouterProviderResponse.class)
public class ListVirtualRouterElementsCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListNetworkOfferingsCmd.class.getName());
- private static final String _name = "listvirtualrouterelementsresponse";
+ private static final String Name = "listvirtualrouterelementsresponse";
// TODO, VirtualRouterElementServer is not singleton in system!
@Inject
@@ -94,7 +94,7 @@ public class ListVirtualRouterElementsCmd extends BaseListCmd {
@Override
public String getCommandName() {
- return _name;
+ return Name;
}
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/org/apache/cloudstack/api/command/admin/storage/AddS3Cmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/AddS3Cmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/AddS3Cmd.java
index cc6680b..e665b7d 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/storage/AddS3Cmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/storage/AddS3Cmd.java
@@ -56,7 +56,7 @@ import com.cloud.storage.ImageStore;
public final class AddS3Cmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(AddS3Cmd.class.getName());
- private static String COMMAND_NAME = "adds3response";
+ private static final String COMMAND_NAME = "adds3response";
@Parameter(name = S3_ACCESS_KEY, type = STRING, required = true, description = "S3 access key")
private String accessKey;
@@ -65,22 +65,22 @@ public final class AddS3Cmd extends BaseCmd {
private String secretKey;
@Parameter(name = S3_END_POINT, type = STRING, required = false, description = "S3 host name")
- private String endPoint = null;
+ private final String endPoint = null;
@Parameter(name = S3_BUCKET_NAME, type = STRING, required = true, description = "name of the template storage bucket")
private String bucketName;
@Parameter(name = S3_HTTPS_FLAG, type = BOOLEAN, required = false, description = "connect to the S3 endpoint via HTTPS?")
- private Boolean httpsFlag = null;
+ private final Boolean httpsFlag = null;
@Parameter(name = S3_CONNECTION_TIMEOUT, type = INTEGER, required = false, description = "connection timeout (milliseconds)")
- private Integer connectionTimeout = null;
+ private final Integer connectionTimeout = null;
@Parameter(name = S3_MAX_ERROR_RETRY, type = INTEGER, required = false, description = "maximum number of times to retry on error")
- private Integer maxErrorRetry = null;
+ private final Integer maxErrorRetry = null;
@Parameter(name = S3_SOCKET_TIMEOUT, type = INTEGER, required = false, description = "socket timeout (milliseconds)")
- private Integer socketTimeout = null;
+ private final Integer socketTimeout = null;
@Override
public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException,
@@ -118,7 +118,7 @@ public final class AddS3Cmd extends BaseCmd {
storeResponse = _responseGenerator.createImageStoreResponse(result);
storeResponse.setResponseName(getCommandName());
storeResponse.setObjectName("secondarystorage");
- this.setResponseObject(storeResponse);
+ setResponseObject(storeResponse);
} else {
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to add S3 secondary storage");
}
@@ -141,35 +141,35 @@ public final class AddS3Cmd extends BaseCmd {
final AddS3Cmd thatAddS3Cmd = (AddS3Cmd)thatObject;
- if (this.httpsFlag != null ? !this.httpsFlag.equals(thatAddS3Cmd.httpsFlag) : thatAddS3Cmd.httpsFlag != null) {
+ if (httpsFlag != null ? !httpsFlag.equals(thatAddS3Cmd.httpsFlag) : thatAddS3Cmd.httpsFlag != null) {
return false;
}
- if (this.accessKey != null ? !this.accessKey.equals(thatAddS3Cmd.accessKey) : thatAddS3Cmd.accessKey != null) {
+ if (accessKey != null ? !accessKey.equals(thatAddS3Cmd.accessKey) : thatAddS3Cmd.accessKey != null) {
return false;
}
- if (this.connectionTimeout != null ? !this.connectionTimeout.equals(thatAddS3Cmd.connectionTimeout) : thatAddS3Cmd.connectionTimeout != null) {
+ if (connectionTimeout != null ? !connectionTimeout.equals(thatAddS3Cmd.connectionTimeout) : thatAddS3Cmd.connectionTimeout != null) {
return false;
}
- if (this.endPoint != null ? !this.endPoint.equals(thatAddS3Cmd.endPoint) : thatAddS3Cmd.endPoint != null) {
+ if (endPoint != null ? !endPoint.equals(thatAddS3Cmd.endPoint) : thatAddS3Cmd.endPoint != null) {
return false;
}
- if (this.maxErrorRetry != null ? !this.maxErrorRetry.equals(thatAddS3Cmd.maxErrorRetry) : thatAddS3Cmd.maxErrorRetry != null) {
+ if (maxErrorRetry != null ? !maxErrorRetry.equals(thatAddS3Cmd.maxErrorRetry) : thatAddS3Cmd.maxErrorRetry != null) {
return false;
}
- if (this.secretKey != null ? !this.secretKey.equals(thatAddS3Cmd.secretKey) : thatAddS3Cmd.secretKey != null) {
+ if (secretKey != null ? !secretKey.equals(thatAddS3Cmd.secretKey) : thatAddS3Cmd.secretKey != null) {
return false;
}
- if (this.socketTimeout != null ? !this.socketTimeout.equals(thatAddS3Cmd.socketTimeout) : thatAddS3Cmd.socketTimeout != null) {
+ if (socketTimeout != null ? !socketTimeout.equals(thatAddS3Cmd.socketTimeout) : thatAddS3Cmd.socketTimeout != null) {
return false;
}
- if (this.bucketName != null ? !this.bucketName.equals(thatAddS3Cmd.bucketName) : thatAddS3Cmd.bucketName != null) {
+ if (bucketName != null ? !bucketName.equals(thatAddS3Cmd.bucketName) : thatAddS3Cmd.bucketName != null) {
return false;
}
@@ -180,14 +180,14 @@ public final class AddS3Cmd extends BaseCmd {
@Override
public int hashCode() {
- int result = this.accessKey != null ? this.accessKey.hashCode() : 0;
- result = 31 * result + (this.secretKey != null ? this.secretKey.hashCode() : 0);
- result = 31 * result + (this.endPoint != null ? this.endPoint.hashCode() : 0);
- result = 31 * result + (this.bucketName != null ? this.bucketName.hashCode() : 0);
- result = 31 * result + (this.httpsFlag != null && this.httpsFlag == true ? 1 : 0);
- result = 31 * result + (this.connectionTimeout != null ? this.connectionTimeout.hashCode() : 0);
- result = 31 * result + (this.maxErrorRetry != null ? this.maxErrorRetry.hashCode() : 0);
- result = 31 * result + (this.socketTimeout != null ? this.socketTimeout.hashCode() : 0);
+ int result = accessKey != null ? accessKey.hashCode() : 0;
+ result = 31 * result + (secretKey != null ? secretKey.hashCode() : 0);
+ result = 31 * result + (endPoint != null ? endPoint.hashCode() : 0);
+ result = 31 * result + (bucketName != null ? bucketName.hashCode() : 0);
+ result = 31 * result + (httpsFlag != null && httpsFlag == true ? 1 : 0);
+ result = 31 * result + (connectionTimeout != null ? connectionTimeout.hashCode() : 0);
+ result = 31 * result + (maxErrorRetry != null ? maxErrorRetry.hashCode() : 0);
+ result = 31 * result + (socketTimeout != null ? socketTimeout.hashCode() : 0);
return result;
@@ -204,35 +204,35 @@ public final class AddS3Cmd extends BaseCmd {
}
public String getAccessKey() {
- return this.accessKey;
+ return accessKey;
}
public String getSecretKey() {
- return this.secretKey;
+ return secretKey;
}
public String getEndPoint() {
- return this.endPoint;
+ return endPoint;
}
public String getBucketName() {
- return this.bucketName;
+ return bucketName;
}
public Boolean getHttpsFlag() {
- return this.httpsFlag;
+ return httpsFlag;
}
public Integer getConnectionTimeout() {
- return this.connectionTimeout;
+ return connectionTimeout;
}
public Integer getMaxErrorRetry() {
- return this.maxErrorRetry;
+ return maxErrorRetry;
}
public Integer getSocketTimeout() {
- return this.socketTimeout;
+ return socketTimeout;
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/org/apache/cloudstack/api/command/admin/systemvm/ScaleSystemVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/systemvm/ScaleSystemVMCmd.java b/api/src/org/apache/cloudstack/api/command/admin/systemvm/ScaleSystemVMCmd.java
index 247df1e..fdb81ea 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/systemvm/ScaleSystemVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/systemvm/ScaleSystemVMCmd.java
@@ -66,9 +66,9 @@ public class ScaleSystemVMCmd extends BaseAsyncCmd {
description = "the service offering ID to apply to the system vm")
private Long serviceOfferingId;
- @Parameter(name=ApiConstants.CUSTOM_PARAMETERS,
- type = CommandType.MAP,
- description = "name value pairs of custom parameters for cpu, memory and cpunumber. example customparameters[i].name=value")
+ @Parameter(name = ApiConstants.CUSTOM_PARAMETERS,
+ type = CommandType.MAP,
+ description = "name value pairs of custom parameters for cpu, memory and cpunumber. example customparameters[i].name=value")
private Map<String, String> customParameters;
/////////////////////////////////////////////////////
@@ -84,12 +84,12 @@ public class ScaleSystemVMCmd extends BaseAsyncCmd {
}
public Map<String, String> getCustomParameters() {
- Map<String,String> customparameterMap = new HashMap<String, String>();
+ Map<String, String> customparameterMap = new HashMap<String, String>();
if (customParameters != null && customParameters.size() != 0) {
Collection parameterCollection = customParameters.values();
Iterator iter = parameterCollection.iterator();
while (iter.hasNext()) {
- HashMap<String, String> value = (HashMap<String, String>) iter.next();
+ HashMap<String, String> value = (HashMap<String, String>)iter.next();
for (String key : value.keySet()) {
customparameterMap.put(key, value.get(key));
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java b/api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java
index a49828b..a89abb8 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java
@@ -61,9 +61,9 @@ public class UpgradeSystemVMCmd extends BaseCmd {
description = "the service offering ID to apply to the system vm")
private Long serviceOfferingId;
- @Parameter(name=ApiConstants.CUSTOM_PARAMETERS,
- type = CommandType.MAP,
- description = "name value pairs of custom parameters for cpu, memory and cpunumber. example customparameters[i].name=value")
+ @Parameter(name = ApiConstants.CUSTOM_PARAMETERS,
+ type = CommandType.MAP,
+ description = "name value pairs of custom parameters for cpu, memory and cpunumber. example customparameters[i].name=value")
private Map<String, String> customParameters;
/////////////////////////////////////////////////////
@@ -79,12 +79,12 @@ public class UpgradeSystemVMCmd extends BaseCmd {
}
public Map<String, String> getCustomParameters() {
- Map<String,String> customparameterMap = new HashMap<String, String>();
- if (customParameters != null && customParameters.size() !=0){
+ Map<String, String> customparameterMap = new HashMap<String, String>();
+ if (customParameters != null && customParameters.size() != 0) {
Collection parameterCollection = customParameters.values();
Iterator iter = parameterCollection.iterator();
while (iter.hasNext()) {
- HashMap<String, String> value = (HashMap<String, String>) iter.next();
+ HashMap<String, String> value = (HashMap<String, String>)iter.next();
for (String key : value.keySet()) {
customparameterMap.put(key, value.get(key));
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypeImplementorsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypeImplementorsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypeImplementorsCmd.java
index 3a1dfba..159608e 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypeImplementorsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypeImplementorsCmd.java
@@ -43,7 +43,7 @@ import com.cloud.utils.Pair;
since = "3.0.0")
public class ListTrafficTypeImplementorsCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListTrafficTypeImplementorsCmd.class);
- private static final String _name = "listtraffictypeimplementorsresponse";
+ private static final String Name = "listtraffictypeimplementorsresponse";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@@ -87,6 +87,6 @@ public class ListTrafficTypeImplementorsCmd extends BaseListCmd {
@Override
public String getCommandName() {
- return _name;
+ return Name;
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypesCmd.java b/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypesCmd.java
index 378058f..47ba781 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypesCmd.java
@@ -37,7 +37,7 @@ import com.cloud.utils.Pair;
@APICommand(name = "listTrafficTypes", description = "Lists traffic types of a given physical network.", responseObject = ProviderResponse.class, since = "3.0.0")
public class ListTrafficTypesCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListTrafficTypesCmd.class.getName());
- private static final String _name = "listtraffictypesresponse";
+ private static final String Name = "listtraffictypesresponse";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@@ -66,7 +66,7 @@ public class ListTrafficTypesCmd extends BaseListCmd {
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
- return _name;
+ return Name;
}
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java
index e3c0433..96d5c6a 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java
@@ -42,7 +42,7 @@ import com.cloud.user.Account;
@APICommand(name = "createVPCOffering", description = "Creates VPC offering", responseObject = VpcOfferingResponse.class)
public class CreateVPCOfferingCmd extends BaseAsyncCreateCmd {
public static final Logger s_logger = Logger.getLogger(CreateVPCOfferingCmd.class.getName());
- private static final String _name = "createvpcofferingresponse";
+ private static final String Name = "createvpcofferingresponse";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@@ -150,7 +150,7 @@ public class CreateVPCOfferingCmd extends BaseAsyncCreateCmd {
@Override
public String getCommandName() {
- return _name;
+ return Name;
}
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCOfferingCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCOfferingCmd.java
index 05b6f9d..3526b4b 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCOfferingCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCOfferingCmd.java
@@ -33,7 +33,7 @@ import com.cloud.user.Account;
@APICommand(name = "updateVPCOffering", description = "Updates VPC offering", responseObject = VpcOfferingResponse.class)
public class UpdateVPCOfferingCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(UpdateVPCOfferingCmd.class.getName());
- private static final String _name = "updatevpcofferingresponse";
+ private static final String Name = "updatevpcofferingresponse";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@@ -76,7 +76,7 @@ public class UpdateVPCOfferingCmd extends BaseAsyncCmd {
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
- return _name;
+ return Name;
}
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLListsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLListsCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLListsCmd.java
index 56aad94..2e50bb8 100644
--- a/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLListsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLListsCmd.java
@@ -23,7 +23,6 @@ import org.apache.log4j.Logger;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
-import org.apache.cloudstack.api.BaseListCmd;
import org.apache.cloudstack.api.BaseListProjectAndAccountResourcesCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.ListResponse;
@@ -34,7 +33,7 @@ import org.apache.cloudstack.api.response.VpcResponse;
import com.cloud.network.vpc.NetworkACL;
import com.cloud.utils.Pair;
-@APICommand(name = "listNetworkACLLists", description="Lists all network ACLs", responseObject=NetworkACLResponse.class)
+@APICommand(name = "listNetworkACLLists", description = "Lists all network ACLs", responseObject = NetworkACLResponse.class)
public class ListNetworkACLListsCmd extends BaseListProjectAndAccountResourcesCmd {
public static final Logger s_logger = Logger.getLogger(ListNetworkACLListsCmd.class.getName());
@@ -85,8 +84,8 @@ public class ListNetworkACLListsCmd extends BaseListProjectAndAccountResourcesCm
}
@Override
- public void execute(){
- Pair<List<? extends NetworkACL>,Integer> result = _networkACLService.listNetworkACLs(this);
+ public void execute() {
+ Pair<List<? extends NetworkACL>, Integer> result = _networkACLService.listNetworkACLs(this);
ListResponse<NetworkACLResponse> response = new ListResponse<NetworkACLResponse>();
List<NetworkACLResponse> aclResponses = new ArrayList<NetworkACLResponse>();
@@ -96,6 +95,6 @@ public class ListNetworkACLListsCmd extends BaseListProjectAndAccountResourcesCm
}
response.setResponses(aclResponses, result.second());
response.setResponseName(getCommandName());
- this.setResponseObject(response);
+ setResponseObject(response);
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLsCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLsCmd.java
index 99c620c..7f8aef4 100644
--- a/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLsCmd.java
@@ -25,7 +25,6 @@ import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListTaggedResourcesCmd;
import org.apache.cloudstack.api.Parameter;
-import org.apache.cloudstack.api.response.FirewallRuleResponse;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.NetworkACLItemResponse;
import org.apache.cloudstack.api.response.NetworkACLResponse;
@@ -43,8 +42,8 @@ public class ListNetworkACLsCmd extends BaseListTaggedResourcesCmd {
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
/////////////////////////////////////////////////////
- @Parameter(name=ApiConstants.ID, type=CommandType.UUID, entityType = NetworkACLItemResponse.class,
- description="Lists network ACL Item with the specified ID")
+ @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = NetworkACLItemResponse.class,
+ description = "Lists network ACL Item with the specified ID")
private Long id;
@Parameter(name = ApiConstants.NETWORK_ID, type = CommandType.UUID, entityType = NetworkResponse.class, description = "list network ACL Items by network Id")
@@ -111,6 +110,6 @@ public class ListNetworkACLsCmd extends BaseListTaggedResourcesCmd {
}
response.setResponses(aclResponses, result.second());
response.setResponseName(getCommandName());
- this.setResponseObject(response);
+ setResponseObject(response);
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkOfferingsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkOfferingsCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkOfferingsCmd.java
index 2c2b1e1..552a64a 100644
--- a/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkOfferingsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkOfferingsCmd.java
@@ -35,7 +35,7 @@ import com.cloud.offering.NetworkOffering;
@APICommand(name = "listNetworkOfferings", description = "Lists all available network offerings.", responseObject = NetworkOfferingResponse.class)
public class ListNetworkOfferingsCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListNetworkOfferingsCmd.class.getName());
- private static final String _name = "listnetworkofferingsresponse";
+ private static final String Name = "listnetworkofferingsresponse";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@@ -181,7 +181,7 @@ public class ListNetworkOfferingsCmd extends BaseListCmd {
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
- return _name;
+ return Name;
}
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/org/apache/cloudstack/api/command/user/network/ListNetworksCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/ListNetworksCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/ListNetworksCmd.java
index fa27a4a..72c52df 100644
--- a/api/src/org/apache/cloudstack/api/command/user/network/ListNetworksCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/network/ListNetworksCmd.java
@@ -36,7 +36,7 @@ import com.cloud.network.Network;
@APICommand(name = "listNetworks", description = "Lists all available networks.", responseObject = NetworkResponse.class)
public class ListNetworksCmd extends BaseListTaggedResourcesCmd {
public static final Logger s_logger = Logger.getLogger(ListNetworksCmd.class.getName());
- private static final String _name = "listnetworksresponse";
+ private static final String Name = "listnetworksresponse";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@@ -149,7 +149,7 @@ public class ListNetworksCmd extends BaseListTaggedResourcesCmd {
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
- return _name;
+ return Name;
}
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
index fee6db2..2472a42 100755
--- a/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
@@ -24,7 +24,6 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import org.apache.cloudstack.api.BaseAsyncCreateCustomIdCmd;
import org.apache.log4j.Logger;
import org.apache.cloudstack.acl.SecurityChecker.AccessType;
@@ -34,7 +33,7 @@ import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
-import org.apache.cloudstack.api.BaseAsyncCreateCmd;
+import org.apache.cloudstack.api.BaseAsyncCreateCustomIdCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.DiskOfferingResponse;
@@ -232,9 +231,9 @@ public class DeployVMCmd extends BaseAsyncCreateCustomIdCmd {
@Parameter(name = ApiConstants.CUSTOM_PARAMETERS,
type = CommandType.MAP,
- since= "4.3",
+ since = "4.3",
description = "used to specify the custom parameters.")
- private Map customParameters;
+ private Map customParameters;
/////////////////////////////////////////////////////
/////////////////// Accessors ///////////////////////
@@ -263,12 +262,12 @@ public class DeployVMCmd extends BaseAsyncCreateCustomIdCmd {
}
public Map<String, String> getCustomParameters() {
- Map<String,String> customparameterMap = new HashMap<String, String>();
- if (customParameters != null && customParameters.size() !=0){
+ Map<String, String> customparameterMap = new HashMap<String, String>();
+ if (customParameters != null && customParameters.size() != 0) {
Collection parameterCollection = customParameters.values();
Iterator iter = parameterCollection.iterator();
while (iter.hasNext()) {
- HashMap<String, String> value = (HashMap<String, String>) iter.next();
+ HashMap<String, String> value = (HashMap<String, String>)iter.next();
for (String key : value.keySet()) {
customparameterMap.put(key, value.get(key));
}
@@ -289,7 +288,6 @@ public class DeployVMCmd extends BaseAsyncCreateCustomIdCmd {
return displayVm;
}
-
public List<Long> getSecurityGroupIdList() {
if (securityGroupNameList != null && securityGroupIdList != null) {
throw new InvalidParameterValueException("securitygroupids parameter is mutually exclusive with securitygroupnames parameter");
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/org/apache/cloudstack/api/command/user/vm/ScaleVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/ScaleVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/ScaleVMCmd.java
index 08a4a56..e122834 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vm/ScaleVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/ScaleVMCmd.java
@@ -44,7 +44,6 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-
@APICommand(name = "scaleVirtualMachine", description = "Scales the virtual machine to a new service offering.", responseObject = SuccessResponse.class)
public class ScaleVMCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(ScaleVMCmd.class.getName());
@@ -66,9 +65,9 @@ public class ScaleVMCmd extends BaseAsyncCmd {
description = "the ID of the service offering for the virtual machine")
private Long serviceOfferingId;
- @Parameter(name=ApiConstants.CUSTOM_PARAMETERS,
- type = CommandType.MAP,
- description = "name value pairs of custom parameters for cpu, memory and cpunumber. example customparameters[i].name=value")
+ @Parameter(name = ApiConstants.CUSTOM_PARAMETERS,
+ type = CommandType.MAP,
+ description = "name value pairs of custom parameters for cpu, memory and cpunumber. example customparameters[i].name=value")
private Map<String, String> customParameters;
/////////////////////////////////////////////////////
@@ -87,12 +86,12 @@ public class ScaleVMCmd extends BaseAsyncCmd {
//it is because customParameters.values() cannot be cast to a map.
//it gives a exception
public Map<String, String> getCustomParameters() {
- Map<String,String> customparameterMap = new HashMap<String, String>();
- if (customParameters != null && customParameters.size() !=0){
+ Map<String, String> customparameterMap = new HashMap<String, String>();
+ if (customParameters != null && customParameters.size() != 0) {
Collection parameterCollection = customParameters.values();
Iterator iter = parameterCollection.iterator();
while (iter.hasNext()) {
- HashMap<String, String> value = (HashMap<String, String>) iter.next();
+ HashMap<String, String> value = (HashMap<String, String>)iter.next();
for (String key : value.keySet()) {
customparameterMap.put(key, value.get(key));
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java
index 967d8f4..e0ca787 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java
@@ -16,13 +16,12 @@
// under the License.
package org.apache.cloudstack.api.command.user.vm;
-import org.apache.cloudstack.api.BaseCustomIdCmd;
import org.apache.log4j.Logger;
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.BaseCustomIdCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.GuestOSResponse;
@@ -143,7 +142,7 @@ public class UpdateVMCmd extends BaseCustomIdCmd {
if (result != null) {
UserVmResponse response = _responseGenerator.createUserVmResponse("virtualmachine", result).get(0);
response.setResponseName(getCommandName());
- this.setResponseObject(response);
+ setResponseObject(response);
} else {
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to update vm");
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/org/apache/cloudstack/api/command/user/vm/UpgradeVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/UpgradeVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/UpgradeVMCmd.java
index 4349781..033717d 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vm/UpgradeVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/UpgradeVMCmd.java
@@ -59,9 +59,9 @@ public class UpgradeVMCmd extends BaseCmd {
description = "the service offering ID to apply to the virtual machine")
private Long serviceOfferingId;
- @Parameter(name=ApiConstants.CUSTOM_PARAMETERS,
- type = CommandType.MAP,
- description = "name value pairs of custom parameters for cpu, memory and cpunumber. example customparameters[i].name=value")
+ @Parameter(name = ApiConstants.CUSTOM_PARAMETERS,
+ type = CommandType.MAP,
+ description = "name value pairs of custom parameters for cpu, memory and cpunumber. example customparameters[i].name=value")
private Map<String, String> customParameters;
/////////////////////////////////////////////////////
@@ -77,12 +77,12 @@ public class UpgradeVMCmd extends BaseCmd {
}
public Map<String, String> getCustomParameters() {
- Map<String,String> customparameterMap = new HashMap<String, String>();
- if (customParameters != null && customParameters.size() !=0){
+ Map<String, String> customparameterMap = new HashMap<String, String>();
+ if (customParameters != null && customParameters.size() != 0) {
Collection parameterCollection = customParameters.values();
Iterator iter = parameterCollection.iterator();
while (iter.hasNext()) {
- HashMap<String, String> value = (HashMap<String, String>) iter.next();
+ HashMap<String, String> value = (HashMap<String, String>)iter.next();
for (String key : value.keySet()) {
customparameterMap.put(key, value.get(key));
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/org/apache/cloudstack/api/command/user/volume/CreateVolumeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/CreateVolumeCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/CreateVolumeCmd.java
index cb7b13a..c6457c6 100644
--- a/api/src/org/apache/cloudstack/api/command/user/volume/CreateVolumeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/volume/CreateVolumeCmd.java
@@ -100,7 +100,10 @@ public class CreateVolumeCmd extends BaseAsyncCreateCustomIdCmd {
@Parameter(name = ApiConstants.DISPLAY_VOLUME, type = CommandType.BOOLEAN, description = "an optional field, whether to display the volume to the end user or not.")
private Boolean displayVolume;
- @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID, type = CommandType.UUID, entityType = UserVmResponse.class, description = "the ID of the virtual machine; to be used with snapshot Id, VM to which the volume gets attached after creation")
+ @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID,
+ type = CommandType.UUID,
+ entityType = UserVmResponse.class,
+ description = "the ID of the virtual machine; to be used with snapshot Id, VM to which the volume gets attached after creation")
private Long virtualMachineId;
/////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/org/apache/cloudstack/api/command/user/volume/UpdateVolumeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/UpdateVolumeCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/UpdateVolumeCmd.java
index 7233b4f..b57f2b4 100644
--- a/api/src/org/apache/cloudstack/api/command/user/volume/UpdateVolumeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/volume/UpdateVolumeCmd.java
@@ -16,14 +16,13 @@
// under the License.
package org.apache.cloudstack.api.command.user.volume;
-import org.apache.cloudstack.api.BaseAsyncCustomIdCmd;
import org.apache.log4j.Logger;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
-import org.apache.cloudstack.api.BaseAsyncCmd;
+import org.apache.cloudstack.api.BaseAsyncCustomIdCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.StoragePoolResponse;
@@ -145,7 +144,7 @@ public class UpdateVolumeCmd extends BaseAsyncCustomIdCmd {
if (result != null) {
VolumeResponse response = _responseGenerator.createVolumeResponse(result);
response.setResponseName(getCommandName());
- this.setResponseObject(response);
+ setResponseObject(response);
} else {
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to update volume");
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/org/apache/cloudstack/api/command/user/vpc/CreateVPCCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpc/CreateVPCCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpc/CreateVPCCmd.java
index f12d15b..d4c52b8 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpc/CreateVPCCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpc/CreateVPCCmd.java
@@ -47,44 +47,44 @@ public class CreateVPCCmd extends BaseAsyncCreateCmd {
// ///////////////////////////////////////////////////
@Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, description = "the account associated with the VPC. " +
- "Must be used with the domainId parameter.")
+ "Must be used with the domainId parameter.")
private String accountName;
@Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, entityType = DomainResponse.class,
- description = "the domain ID associated with the VPC. " +
- "If used with the account parameter returns the VPC associated with the account for the specified domain.")
+ description = "the domain ID associated with the VPC. " +
+ "If used with the account parameter returns the VPC associated with the account for the specified domain.")
private Long domainId;
@Parameter(name = ApiConstants.PROJECT_ID, type = CommandType.UUID, entityType = ProjectResponse.class,
- description = "create VPC for the project")
+ description = "create VPC for the project")
private Long projectId;
@Parameter(name = ApiConstants.ZONE_ID, type = CommandType.UUID, entityType = ZoneResponse.class,
- required = true, description = "the ID of the availability zone")
+ required = true, description = "the ID of the availability zone")
private Long zoneId;
@Parameter(name = ApiConstants.NAME, type = CommandType.STRING, required = true, description = "the name of the VPC")
private String vpcName;
@Parameter(name = ApiConstants.DISPLAY_TEXT, type = CommandType.STRING, required = true, description = "the display text of " +
- "the VPC")
+ "the VPC")
private String displayText;
@Parameter(name = ApiConstants.CIDR, type = CommandType.STRING, required = true, description = "the cidr of the VPC. All VPC " +
- "guest networks' cidrs should be within this CIDR")
+ "guest networks' cidrs should be within this CIDR")
private String cidr;
@Parameter(name = ApiConstants.VPC_OFF_ID, type = CommandType.UUID, entityType = VpcOfferingResponse.class,
- required = true, description = "the ID of the VPC offering")
+ required = true, description = "the ID of the VPC offering")
private Long vpcOffering;
@Parameter(name = ApiConstants.NETWORK_DOMAIN, type = CommandType.STRING,
- description = "VPC network domain. All networks inside the VPC will belong to this domain")
+ description = "VPC network domain. All networks inside the VPC will belong to this domain")
private String networkDomain;
@Parameter(name = ApiConstants.START, type = CommandType.BOOLEAN,
- description = "If set to false, the VPC won't start (VPC VR will not get allocated) until its first network gets implemented. " +
- "True by default.", since = "4.3")
+ description = "If set to false, the VPC won't start (VPC VR will not get allocated) until its first network gets implemented. " +
+ "True by default.", since = "4.3")
private Boolean start;
// ///////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/org/apache/cloudstack/api/command/user/vpc/ListVPCOfferingsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpc/ListVPCOfferingsCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpc/ListVPCOfferingsCmd.java
index 85051cf..e3d0bc6 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpc/ListVPCOfferingsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpc/ListVPCOfferingsCmd.java
@@ -33,7 +33,7 @@ import com.cloud.network.vpc.VpcOffering;
@APICommand(name = "listVPCOfferings", description = "Lists VPC offerings", responseObject = VpcOfferingResponse.class)
public class ListVPCOfferingsCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListVPCOfferingsCmd.class.getName());
- private static final String _name = "listvpcofferingsresponse";
+ private static final String Name = "listvpcofferingsresponse";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@@ -109,7 +109,7 @@ public class ListVPCOfferingsCmd extends BaseListCmd {
@Override
public String getCommandName() {
- return _name;
+ return Name;
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/org/apache/cloudstack/api/command/user/vpc/RestartVPCCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpc/RestartVPCCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpc/RestartVPCCmd.java
index ce14451..eb048ce 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpc/RestartVPCCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpc/RestartVPCCmd.java
@@ -37,7 +37,7 @@ import com.cloud.user.Account;
@APICommand(name = "restartVPC", description = "Restarts a VPC", responseObject = VpcResponse.class)
public class RestartVPCCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(RestartVPCCmd.class.getName());
- private static final String _name = "restartvpcresponse";
+ private static final String Name = "restartvpcresponse";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@@ -59,7 +59,7 @@ public class RestartVPCCmd extends BaseAsyncCmd {
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
- return _name;
+ return Name;
}
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/org/apache/cloudstack/api/command/user/vpc/UpdateVPCCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpc/UpdateVPCCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpc/UpdateVPCCmd.java
index 7358524..5732c65 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpc/UpdateVPCCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpc/UpdateVPCCmd.java
@@ -33,7 +33,7 @@ import com.cloud.user.Account;
@APICommand(name = "updateVPC", description = "Updates a VPC", responseObject = VpcResponse.class)
public class UpdateVPCCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(UpdateVPCCmd.class.getName());
- private static final String _name = "updatevpcresponse";
+ private static final String Name = "updatevpcresponse";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@@ -69,7 +69,7 @@ public class UpdateVPCCmd extends BaseAsyncCmd {
/////////////////////////////////////////////////////
@Override
public String getCommandName() {
- return _name;
+ return Name;
}
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/org/apache/cloudstack/api/response/AlertResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/AlertResponse.java b/api/src/org/apache/cloudstack/api/response/AlertResponse.java
index a2554c3..2016bcf 100644
--- a/api/src/org/apache/cloudstack/api/response/AlertResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/AlertResponse.java
@@ -42,8 +42,9 @@ public class AlertResponse extends BaseResponse {
+ "MANAGMENT_NODE = 13: lost connection to default route (to the gateway), "
+ "DOMAIN_ROUTER_MIGRATE = 14, CONSOLE_PROXY_MIGRATE = 15, USERVM_MIGRATE = 16, VLAN = 17, SSVM = 18, " + "USAGE_SERVER_RESULT = 19")
private Short alertType;
-
- @SerializedName(ApiConstants.NAME) @Param(description="the name of the alert", since="4.3")
+
+ @SerializedName(ApiConstants.NAME)
+ @Param(description = "the name of the alert", since = "4.3")
private String alertName;
@SerializedName(ApiConstants.DESCRIPTION)
@@ -69,7 +70,7 @@ public class AlertResponse extends BaseResponse {
public void setLastSent(Date lastSent) {
this.lastSent = lastSent;
}
-
+
public void setName(String name) {
this.alertName = name;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/org/apache/cloudstack/api/response/CapabilitiesResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/CapabilitiesResponse.java b/api/src/org/apache/cloudstack/api/response/CapabilitiesResponse.java
index 4840c60..c8de587 100644
--- a/api/src/org/apache/cloudstack/api/response/CapabilitiesResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/CapabilitiesResponse.java
@@ -63,7 +63,7 @@ public class CapabilitiesResponse extends BaseResponse {
@SerializedName("kvmsnapshotenabled")
@Param(description = "true if snapshot is supported for KVM host, false otherwise")
- private boolean KVMSnapshotEnabled;
+ private boolean kvmSnapshotEnabled;
@SerializedName("apilimitmax")
@Param(description = "Max allowed number of api requests within the specified interval")
@@ -101,8 +101,8 @@ public class CapabilitiesResponse extends BaseResponse {
this.regionSecondaryEnabled = regionSecondaryEnabled;
}
- public void setKVMSnapshotEnabled(boolean KVMSnapshotEnabled) {
- this.KVMSnapshotEnabled = KVMSnapshotEnabled;
+ public void setKVMSnapshotEnabled(boolean kvmSnapshotEnabled) {
+ this.kvmSnapshotEnabled = kvmSnapshotEnabled;
}
public void setApiLimitInterval(Integer apiLimitInterval) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/org/apache/cloudstack/api/response/DiskOfferingResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/DiskOfferingResponse.java b/api/src/org/apache/cloudstack/api/response/DiskOfferingResponse.java
index 3917cb5..ebc2242 100644
--- a/api/src/org/apache/cloudstack/api/response/DiskOfferingResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/DiskOfferingResponse.java
@@ -97,7 +97,8 @@ public class DiskOfferingResponse extends BaseResponse {
@Param(description = "io requests write rate of the disk offering")
private Long iopsWriteRate;
- @SerializedName("cacheMode") @Param(description="the cache mode to use for this disk offering. none, writeback or writethrough")
+ @SerializedName("cacheMode")
+ @Param(description = "the cache mode to use for this disk offering. none, writeback or writethrough")
private String cacheMode;
@SerializedName("displayoffering")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/org/apache/cloudstack/api/response/OvsProviderResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/OvsProviderResponse.java b/api/src/org/apache/cloudstack/api/response/OvsProviderResponse.java
index 223576d..ac5b9e3 100644
--- a/api/src/org/apache/cloudstack/api/response/OvsProviderResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/OvsProviderResponse.java
@@ -27,67 +27,67 @@ import com.google.gson.annotations.SerializedName;
@EntityReference(value = OvsProvider.class)
@SuppressWarnings("unused")
public class OvsProviderResponse extends BaseResponse implements
- ControlledEntityResponse {
- @SerializedName(ApiConstants.ID)
- @Param(description = "the id of the ovs")
- private String id;
- @SerializedName(ApiConstants.NSP_ID)
- @Param(description = "the physical network service provider id of the provider")
- private String nspId;
- @SerializedName(ApiConstants.ENABLED)
- @Param(description = "Enabled/Disabled the service provider")
- private Boolean enabled;
- @SerializedName(ApiConstants.ACCOUNT)
- @Param(description = "the account associated with the provider")
- private String accountName;
- @SerializedName(ApiConstants.PROJECT_ID)
- @Param(description = "the project id of the ipaddress")
- private String projectId;
- @SerializedName(ApiConstants.PROJECT)
- @Param(description = "the project name of the address")
- private String projectName;
- @SerializedName(ApiConstants.DOMAIN_ID)
- @Param(description = "the domain ID associated with the provider")
- private String domainId;
+ ControlledEntityResponse {
+ @SerializedName(ApiConstants.ID)
+ @Param(description = "the id of the ovs")
+ private String id;
+ @SerializedName(ApiConstants.NSP_ID)
+ @Param(description = "the physical network service provider id of the provider")
+ private String nspId;
+ @SerializedName(ApiConstants.ENABLED)
+ @Param(description = "Enabled/Disabled the service provider")
+ private Boolean enabled;
+ @SerializedName(ApiConstants.ACCOUNT)
+ @Param(description = "the account associated with the provider")
+ private String accountName;
+ @SerializedName(ApiConstants.PROJECT_ID)
+ @Param(description = "the project id of the ipaddress")
+ private String projectId;
+ @SerializedName(ApiConstants.PROJECT)
+ @Param(description = "the project name of the address")
+ private String projectName;
+ @SerializedName(ApiConstants.DOMAIN_ID)
+ @Param(description = "the domain ID associated with the provider")
+ private String domainId;
- @SerializedName(ApiConstants.DOMAIN)
- @Param(description = "the domain associated with the provider")
- private String domainName;
+ @SerializedName(ApiConstants.DOMAIN)
+ @Param(description = "the domain associated with the provider")
+ private String domainName;
- @Override
- public void setAccountName(String accountName) {
- this.accountName = accountName;
- }
+ @Override
+ public void setAccountName(String accountName) {
+ this.accountName = accountName;
+ }
- public void setId(String id) {
- this.id = id;
- }
+ public void setId(String id) {
+ this.id = id;
+ }
- @Override
- public void setDomainId(String domainId) {
- this.domainId = domainId;
- }
+ @Override
+ public void setDomainId(String domainId) {
+ this.domainId = domainId;
+ }
- @Override
- public void setDomainName(String domainName) {
- this.domainName = domainName;
- }
+ @Override
+ public void setDomainName(String domainName) {
+ this.domainName = domainName;
+ }
- @Override
- public void setProjectId(String projectId) {
- this.projectId = projectId;
- }
+ @Override
+ public void setProjectId(String projectId) {
+ this.projectId = projectId;
+ }
- @Override
- public void setProjectName(String projectName) {
- this.projectName = projectName;
- }
+ @Override
+ public void setProjectName(String projectName) {
+ this.projectName = projectName;
+ }
- public void setNspId(String nspId) {
- this.nspId = nspId;
- }
+ public void setNspId(String nspId) {
+ this.nspId = nspId;
+ }
- public void setEnabled(Boolean enabled) {
- this.enabled = enabled;
- }
+ public void setEnabled(Boolean enabled) {
+ this.enabled = enabled;
+ }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/org/apache/cloudstack/api/response/ServiceOfferingResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/ServiceOfferingResponse.java b/api/src/org/apache/cloudstack/api/response/ServiceOfferingResponse.java
index c8dee14..526e52b 100644
--- a/api/src/org/apache/cloudstack/api/response/ServiceOfferingResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/ServiceOfferingResponse.java
@@ -100,7 +100,7 @@ public class ServiceOfferingResponse extends BaseResponse {
@SerializedName(ApiConstants.SYSTEM_VM_TYPE)
@Param(description = "is this a the systemvm type for system vm offering")
- private String vm_type;
+ private String vmType;
@SerializedName(ApiConstants.NETWORKRATE)
@Param(description = "data transfer rate in megabits per second allowed.")
@@ -170,11 +170,11 @@ public class ServiceOfferingResponse extends BaseResponse {
}
public String getSystemVmType() {
- return vm_type;
+ return vmType;
}
public void setSystemVmType(String vmtype) {
- vm_type = vmtype;
+ vmType = vmtype;
}
public String getDisplayText() {