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/11/20 16:35:11 UTC
[24/51] [partial] Reformat all source code. Added checkstyle to check
the source code
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/org/apache/cloudstack/api/response/UserResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/UserResponse.java b/api/src/org/apache/cloudstack/api/response/UserResponse.java
index e70a310..f8211cb 100644
--- a/api/src/org/apache/cloudstack/api/response/UserResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/UserResponse.java
@@ -28,55 +28,72 @@ import com.google.gson.annotations.SerializedName;
@EntityReference(value = User.class)
public class UserResponse extends BaseResponse {
- @SerializedName("id") @Param(description="the user ID")
+ @SerializedName("id")
+ @Param(description = "the user ID")
private String id;
- @SerializedName("username") @Param(description="the user name")
+ @SerializedName("username")
+ @Param(description = "the user name")
private String username;
- @SerializedName("firstname") @Param(description="the user firstname")
+ @SerializedName("firstname")
+ @Param(description = "the user firstname")
private String firstname;
- @SerializedName("lastname") @Param(description="the user lastname")
+ @SerializedName("lastname")
+ @Param(description = "the user lastname")
private String lastname;
- @SerializedName("email") @Param(description="the user email address")
+ @SerializedName("email")
+ @Param(description = "the user email address")
private String email;
- @SerializedName("created") @Param(description="the date and time the user account was created")
+ @SerializedName("created")
+ @Param(description = "the date and time the user account was created")
private Date created;
- @SerializedName("state") @Param(description="the user state")
+ @SerializedName("state")
+ @Param(description = "the user state")
private String state;
- @SerializedName("account") @Param(description="the account name of the user")
+ @SerializedName("account")
+ @Param(description = "the account name of the user")
private String accountName;
- @SerializedName("accounttype") @Param(description="the account type of the user")
+ @SerializedName("accounttype")
+ @Param(description = "the account type of the user")
private Short accountType;
- @SerializedName("domainid") @Param(description="the domain ID of the user")
+ @SerializedName("domainid")
+ @Param(description = "the domain ID of the user")
private String domainId;
- @SerializedName("domain") @Param(description="the domain name of the user")
+ @SerializedName("domain")
+ @Param(description = "the domain name of the user")
private String domainName;
- @SerializedName("timezone") @Param(description="the timezone user was created in")
+ @SerializedName("timezone")
+ @Param(description = "the timezone user was created in")
private String timezone;
- @SerializedName("apikey") @Param(description="the api key of the user")
+ @SerializedName("apikey")
+ @Param(description = "the api key of the user")
private String apiKey;
- @SerializedName("secretkey") @Param(description="the secret key of the user")
+ @SerializedName("secretkey")
+ @Param(description = "the secret key of the user")
private String secretKey;
- @SerializedName("accountid") @Param(description="the account ID of the user")
+ @SerializedName("accountid")
+ @Param(description = "the account ID of the user")
private String accountId;
- @SerializedName("iscallerchilddomain") @Param(description="the boolean value representing if the updating target is in caller's child domain")
+ @SerializedName("iscallerchilddomain")
+ @Param(description = "the boolean value representing if the updating target is in caller's child domain")
private boolean isCallerChildDomain;
-
- @SerializedName(ApiConstants.IS_DEFAULT) @Param(description="true if user is default, false otherwise", since="4.2.0")
+
+ @SerializedName(ApiConstants.IS_DEFAULT)
+ @Param(description = "true if user is default, false otherwise", since = "4.2.0")
private Boolean isDefault;
@Override
@@ -195,6 +212,7 @@ public class UserResponse extends BaseResponse {
public void setSecretKey(String secretKey) {
this.secretKey = secretKey;
}
+
public String getAccountId() {
return accountId;
}
@@ -210,7 +228,7 @@ public class UserResponse extends BaseResponse {
public void setIsCallerChildDomain(boolean isCallerChildDomain) {
this.isCallerChildDomain = isCallerChildDomain;
}
-
+
public void setIsDefault(Boolean isDefault) {
this.isDefault = isDefault;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/org/apache/cloudstack/api/response/UserVmResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/UserVmResponse.java b/api/src/org/apache/cloudstack/api/response/UserVmResponse.java
index 9a7f91c..3dccf9d 100644
--- a/api/src/org/apache/cloudstack/api/response/UserVmResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/UserVmResponse.java
@@ -33,631 +33,684 @@ import com.cloud.vm.VirtualMachine;
import com.google.gson.annotations.SerializedName;
@SuppressWarnings("unused")
-@EntityReference(value={VirtualMachine.class, UserVm.class, VirtualRouter.class})
+@EntityReference(value = {VirtualMachine.class, UserVm.class, VirtualRouter.class})
public class UserVmResponse extends BaseResponse implements ControlledEntityResponse {
- @SerializedName(ApiConstants.ID) @Param(description="the ID of the virtual machine")
- private String id;
+ @SerializedName(ApiConstants.ID)
+ @Param(description = "the ID of the virtual machine")
+ private String id;
- @SerializedName(ApiConstants.NAME) @Param(description="the name of the virtual machine")
- private String name;
+ @SerializedName(ApiConstants.NAME)
+ @Param(description = "the name of the virtual machine")
+ private String name;
- @SerializedName("displayname") @Param(description="user generated name. The name of the virtual machine is returned if no displayname exists.")
- private String displayName;
+ @SerializedName("displayname")
+ @Param(description = "user generated name. The name of the virtual machine is returned if no displayname exists.")
+ private String displayName;
- @SerializedName(ApiConstants.ACCOUNT) @Param(description="the account associated with the virtual machine")
- private String accountName;
+ @SerializedName(ApiConstants.ACCOUNT)
+ @Param(description = "the account associated with the virtual machine")
+ private String accountName;
- @SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id of the vm")
- private String projectId;
+ @SerializedName(ApiConstants.PROJECT_ID)
+ @Param(description = "the project id of the vm")
+ private String projectId;
- @SerializedName(ApiConstants.PROJECT) @Param(description="the project name of the vm")
- private String projectName;
+ @SerializedName(ApiConstants.PROJECT)
+ @Param(description = "the project name of the vm")
+ private String projectName;
- @SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the ID of the domain in which the virtual machine exists")
- private String domainId;
+ @SerializedName(ApiConstants.DOMAIN_ID)
+ @Param(description = "the ID of the domain in which the virtual machine exists")
+ private String domainId;
- @SerializedName(ApiConstants.DOMAIN) @Param(description="the name of the domain in which the virtual machine exists")
- private String domainName;
+ @SerializedName(ApiConstants.DOMAIN)
+ @Param(description = "the name of the domain in which the virtual machine exists")
+ private String domainName;
- @SerializedName(ApiConstants.CREATED) @Param(description="the date when this virtual machine was created")
- private Date created;
+ @SerializedName(ApiConstants.CREATED)
+ @Param(description = "the date when this virtual machine was created")
+ private Date created;
- @SerializedName(ApiConstants.STATE) @Param(description="the state of the virtual machine")
- private String state;
+ @SerializedName(ApiConstants.STATE)
+ @Param(description = "the state of the virtual machine")
+ private String state;
- @SerializedName(ApiConstants.HA_ENABLE) @Param(description="true if high-availability is enabled, false otherwise")
- private Boolean haEnable;
+ @SerializedName(ApiConstants.HA_ENABLE)
+ @Param(description = "true if high-availability is enabled, false otherwise")
+ private Boolean haEnable;
- @SerializedName(ApiConstants.GROUP_ID) @Param(description="the group ID of the virtual machine")
- private String groupId;
+ @SerializedName(ApiConstants.GROUP_ID)
+ @Param(description = "the group ID of the virtual machine")
+ private String groupId;
- @SerializedName(ApiConstants.GROUP) @Param(description="the group name of the virtual machine")
- private String group;
+ @SerializedName(ApiConstants.GROUP)
+ @Param(description = "the group name of the virtual machine")
+ private String group;
- @SerializedName(ApiConstants.ZONE_ID) @Param(description="the ID of the availablility zone for the virtual machine")
- private String zoneId;
+ @SerializedName(ApiConstants.ZONE_ID)
+ @Param(description = "the ID of the availablility zone for the virtual machine")
+ private String zoneId;
- @SerializedName(ApiConstants.ZONE_NAME) @Param(description="the name of the availability zone for the virtual machine")
- private String zoneName;
+ @SerializedName(ApiConstants.ZONE_NAME)
+ @Param(description = "the name of the availability zone for the virtual machine")
+ private String zoneName;
- @SerializedName(ApiConstants.HOST_ID) @Param(description="the ID of the host for the virtual machine")
- private String hostId;
+ @SerializedName(ApiConstants.HOST_ID)
+ @Param(description = "the ID of the host for the virtual machine")
+ private String hostId;
- @SerializedName("hostname") @Param(description="the name of the host for the virtual machine")
- private String hostName;
+ @SerializedName("hostname")
+ @Param(description = "the name of the host for the virtual machine")
+ private String hostName;
- @SerializedName(ApiConstants.TEMPLATE_ID) @Param(description="the ID of the template for the virtual machine. A -1 is returned if the virtual machine was created from an ISO file.")
- private String templateId;
+ @SerializedName(ApiConstants.TEMPLATE_ID)
+ @Param(description = "the ID of the template for the virtual machine. A -1 is returned if the virtual machine was created from an ISO file.")
+ private String templateId;
- @SerializedName("templatename") @Param(description="the name of the template for the virtual machine")
- private String templateName;
+ @SerializedName("templatename")
+ @Param(description = "the name of the template for the virtual machine")
+ private String templateName;
- @SerializedName("templatedisplaytext") @Param(description=" an alternate display text of the template for the virtual machine")
- private String templateDisplayText;
+ @SerializedName("templatedisplaytext")
+ @Param(description = " an alternate display text of the template for the virtual machine")
+ private String templateDisplayText;
- @SerializedName(ApiConstants.PASSWORD_ENABLED) @Param(description="true if the password rest feature is enabled, false otherwise")
- private Boolean passwordEnabled;
+ @SerializedName(ApiConstants.PASSWORD_ENABLED)
+ @Param(description = "true if the password rest feature is enabled, false otherwise")
+ private Boolean passwordEnabled;
- @SerializedName("isoid") @Param(description="the ID of the ISO attached to the virtual machine")
- private String isoId;
+ @SerializedName("isoid")
+ @Param(description = "the ID of the ISO attached to the virtual machine")
+ private String isoId;
- @SerializedName("isoname") @Param(description="the name of the ISO attached to the virtual machine")
- private String isoName;
+ @SerializedName("isoname")
+ @Param(description = "the name of the ISO attached to the virtual machine")
+ private String isoName;
- @SerializedName("isodisplaytext") @Param(description="an alternate display text of the ISO attached to the virtual machine")
- private String isoDisplayText;
+ @SerializedName("isodisplaytext")
+ @Param(description = "an alternate display text of the ISO attached to the virtual machine")
+ private String isoDisplayText;
- @SerializedName(ApiConstants.SERVICE_OFFERING_ID) @Param(description="the ID of the service offering of the virtual machine")
- private String serviceOfferingId;
+ @SerializedName(ApiConstants.SERVICE_OFFERING_ID)
+ @Param(description = "the ID of the service offering of the virtual machine")
+ private String serviceOfferingId;
- @SerializedName("serviceofferingname") @Param(description="the name of the service offering of the virtual machine")
- private String serviceOfferingName;
+ @SerializedName("serviceofferingname")
+ @Param(description = "the name of the service offering of the virtual machine")
+ private String serviceOfferingName;
- @SerializedName("forvirtualnetwork") @Param(description="the virtual network for the service offering")
- private Boolean forVirtualNetwork;
+ @SerializedName("forvirtualnetwork")
+ @Param(description = "the virtual network for the service offering")
+ private Boolean forVirtualNetwork;
- @SerializedName(ApiConstants.CPU_NUMBER) @Param(description="the number of cpu this virtual machine is running with")
- private Integer cpuNumber;
+ @SerializedName(ApiConstants.CPU_NUMBER)
+ @Param(description = "the number of cpu this virtual machine is running with")
+ private Integer cpuNumber;
- @SerializedName(ApiConstants.CPU_SPEED) @Param(description="the speed of each cpu")
- private Integer cpuSpeed;
+ @SerializedName(ApiConstants.CPU_SPEED)
+ @Param(description = "the speed of each cpu")
+ private Integer cpuSpeed;
- @SerializedName(ApiConstants.MEMORY) @Param(description="the memory allocated for the virtual machine")
- private Integer memory;
+ @SerializedName(ApiConstants.MEMORY)
+ @Param(description = "the memory allocated for the virtual machine")
+ private Integer memory;
- @SerializedName("cpuused") @Param(description="the amount of the vm's CPU currently used")
- private String cpuUsed;
+ @SerializedName("cpuused")
+ @Param(description = "the amount of the vm's CPU currently used")
+ private String cpuUsed;
- @SerializedName("networkkbsread") @Param(description="the incoming network traffic on the vm")
- private Long networkKbsRead;
+ @SerializedName("networkkbsread")
+ @Param(description = "the incoming network traffic on the vm")
+ private Long networkKbsRead;
- @SerializedName("networkkbswrite") @Param(description="the outgoing network traffic on the host")
- private Long networkKbsWrite;
+ @SerializedName("networkkbswrite")
+ @Param(description = "the outgoing network traffic on the host")
+ private Long networkKbsWrite;
- @SerializedName("diskkbsread") @Param(description="the read (bytes) of disk on the vm")
- private Long diskKbsRead;
+ @SerializedName("diskkbsread")
+ @Param(description = "the read (bytes) of disk on the vm")
+ private Long diskKbsRead;
- @SerializedName("diskkbswrite") @Param(description="the write (bytes) of disk on the vm")
- private Long diskKbsWrite;
+ @SerializedName("diskkbswrite")
+ @Param(description = "the write (bytes) of disk on the vm")
+ private Long diskKbsWrite;
- @SerializedName("diskioread") @Param(description="the read (io) of disk on the vm")
- private Long diskIORead;
+ @SerializedName("diskioread")
+ @Param(description = "the read (io) of disk on the vm")
+ private Long diskIORead;
- @SerializedName("diskiowrite") @Param(description="the write (io) of disk on the vm")
- private Long diskIOWrite;
+ @SerializedName("diskiowrite")
+ @Param(description = "the write (io) of disk on the vm")
+ private Long diskIOWrite;
- @SerializedName("guestosid") @Param(description="Os type ID of the virtual machine")
- private String guestOsId;
+ @SerializedName("guestosid")
+ @Param(description = "Os type ID of the virtual machine")
+ private String guestOsId;
- @SerializedName("rootdeviceid") @Param(description="device ID of the root volume")
- private Long rootDeviceId;
+ @SerializedName("rootdeviceid")
+ @Param(description = "device ID of the root volume")
+ private Long rootDeviceId;
- @SerializedName("rootdevicetype") @Param(description="device type of the root volume")
- private String rootDeviceType;
+ @SerializedName("rootdevicetype")
+ @Param(description = "device type of the root volume")
+ private String rootDeviceType;
- @SerializedName("securitygroup") @Param(description="list of security groups associated with the virtual machine", responseObject = SecurityGroupResponse.class)
- private Set<SecurityGroupResponse> securityGroupList;
+ @SerializedName("securitygroup")
+ @Param(description = "list of security groups associated with the virtual machine", responseObject = SecurityGroupResponse.class)
+ private Set<SecurityGroupResponse> securityGroupList;
- @SerializedName(ApiConstants.PASSWORD) @Param(description="the password (if exists) of the virtual machine")
- private String password;
+ @SerializedName(ApiConstants.PASSWORD)
+ @Param(description = "the password (if exists) of the virtual machine")
+ private String password;
- @SerializedName("nic") @Param(description="the list of nics associated with vm", responseObject = NicResponse.class)
- private Set<NicResponse> nics;
+ @SerializedName("nic")
+ @Param(description = "the list of nics associated with vm", responseObject = NicResponse.class)
+ private Set<NicResponse> nics;
- @SerializedName("hypervisor") @Param(description="the hypervisor on which the template runs")
- private String hypervisor;
+ @SerializedName("hypervisor")
+ @Param(description = "the hypervisor on which the template runs")
+ private String hypervisor;
- @SerializedName(ApiConstants.PUBLIC_IP_ID) @Param(description="public IP address id associated with vm via Static nat rule")
- private String publicIpId;
+ @SerializedName(ApiConstants.PUBLIC_IP_ID)
+ @Param(description = "public IP address id associated with vm via Static nat rule")
+ private String publicIpId;
- @SerializedName(ApiConstants.PUBLIC_IP) @Param(description="public IP address id associated with vm via Static nat rule")
- private String publicIp;
+ @SerializedName(ApiConstants.PUBLIC_IP)
+ @Param(description = "public IP address id associated with vm via Static nat rule")
+ private String publicIp;
- @SerializedName(ApiConstants.INSTANCE_NAME) @Param(description="instance name of the user vm; this parameter is returned to the ROOT admin only", since="3.0.1")
- private String instanceName;
+ @SerializedName(ApiConstants.INSTANCE_NAME)
+ @Param(description = "instance name of the user vm; this parameter is returned to the ROOT admin only", since = "3.0.1")
+ private String instanceName;
- @SerializedName(ApiConstants.TAGS) @Param(description="the list of resource tags associated with vm", responseObject = ResourceTagResponse.class)
- private Set<ResourceTagResponse> tags;
-
- @SerializedName(ApiConstants.DETAILS) @Param(description="Template details in key/value pairs.", since="4.2.1")
+ @SerializedName(ApiConstants.TAGS)
+ @Param(description = "the list of resource tags associated with vm", responseObject = ResourceTagResponse.class)
+ private Set<ResourceTagResponse> tags;
+
+ @SerializedName(ApiConstants.DETAILS)
+ @Param(description = "Template details in key/value pairs.", since = "4.2.1")
private Map details;
- @SerializedName(ApiConstants.SSH_KEYPAIR) @Param(description="ssh key-pair")
- private String keyPairName;
+ @SerializedName(ApiConstants.SSH_KEYPAIR)
+ @Param(description = "ssh key-pair")
+ private String keyPairName;
+
+ @SerializedName("affinitygroup")
+ @Param(description = "list of affinity groups associated with the virtual machine", responseObject = AffinityGroupResponse.class)
+ private Set<AffinityGroupResponse> affinityGroupList;
+
+ @SerializedName(ApiConstants.DISPLAY_VM)
+ @Param(description = "an optional field whether to the display the vm to the end user or not.")
+ private Boolean displayVm;
+
+ @SerializedName(ApiConstants.IS_DYNAMICALLY_SCALABLE)
+ @Param(description = "true if vm contains XS/VMWare tools inorder to support dynamic scaling of VM cpu/memory.")
+ private Boolean isDynamicallyScalable;
+ @SerializedName(ApiConstants.SERVICE_STATE)
+ @Param(description = "State of the Service from LB rule")
+ private String serviceState;
+
+ public UserVmResponse() {
+ securityGroupList = new LinkedHashSet<SecurityGroupResponse>();
+ nics = new LinkedHashSet<NicResponse>();
+ tags = new LinkedHashSet<ResourceTagResponse>();
+ affinityGroupList = new LinkedHashSet<AffinityGroupResponse>();
+ }
- @SerializedName("affinitygroup")
- @Param(description = "list of affinity groups associated with the virtual machine", responseObject = AffinityGroupResponse.class)
- private Set<AffinityGroupResponse> affinityGroupList;
+ public void setHypervisor(String hypervisor) {
+ this.hypervisor = hypervisor;
+ }
- @SerializedName(ApiConstants.DISPLAY_VM) @Param(description="an optional field whether to the display the vm to the end user or not.")
- private Boolean displayVm;
+ public void setId(String id) {
+ this.id = id;
+ }
- @SerializedName(ApiConstants.IS_DYNAMICALLY_SCALABLE) @Param(description="true if vm contains XS/VMWare tools inorder to support dynamic scaling of VM cpu/memory.")
- private Boolean isDynamicallyScalable;
- @SerializedName(ApiConstants.SERVICE_STATE) @Param(description="State of the Service from LB rule")
- private String serviceState;
+ public String getId() {
+ return this.id;
+ }
- public UserVmResponse(){
- securityGroupList = new LinkedHashSet<SecurityGroupResponse>();
- nics = new LinkedHashSet<NicResponse>();
- tags = new LinkedHashSet<ResourceTagResponse>();
- affinityGroupList = new LinkedHashSet<AffinityGroupResponse>();
- }
+ public Boolean getDisplayVm() {
+ return displayVm;
+ }
- public void setHypervisor(String hypervisor) {
- this.hypervisor = hypervisor;
- }
+ public void setDisplayVm(Boolean displayVm) {
+ this.displayVm = displayVm;
+ }
- public void setId(String id) {
- this.id = id;
- }
+ @Override
+ public String getObjectId() {
+ return this.getId();
+ }
- public String getId() {
- return this.id;
- }
+ public String getName() {
+ return name;
+ }
- public Boolean getDisplayVm() {
- return displayVm;
- }
+ public String getDisplayName() {
+ return displayName;
+ }
- public void setDisplayVm(Boolean displayVm) {
- this.displayVm = displayVm;
- }
+ public String getAccountName() {
+ return accountName;
+ }
- @Override
- public String getObjectId() {
- return this.getId();
- }
+ public String getProjectId() {
+ return projectId;
+ }
- public String getName() {
- return name;
- }
+ public String getProjectName() {
+ return projectName;
+ }
- public String getDisplayName() {
- return displayName;
- }
+ public String getDomainId() {
+ return domainId;
+ }
- public String getAccountName() {
- return accountName;
- }
+ public String getDomainName() {
+ return domainName;
+ }
- public String getProjectId() {
- return projectId;
- }
+ public Date getCreated() {
+ return created;
+ }
- public String getProjectName() {
- return projectName;
- }
+ public String getState() {
+ return state;
+ }
- public String getDomainId() {
- return domainId;
- }
+ public Boolean getHaEnable() {
+ return haEnable;
+ }
- public String getDomainName() {
- return domainName;
- }
+ public String getGroupId() {
+ return groupId;
+ }
- public Date getCreated() {
- return created;
- }
+ public String getGroup() {
+ return group;
+ }
- public String getState() {
- return state;
- }
+ public String getZoneId() {
+ return zoneId;
+ }
- public Boolean getHaEnable() {
- return haEnable;
- }
+ public String getZoneName() {
+ return zoneName;
+ }
- public String getGroupId() {
- return groupId;
- }
+ public String getHostId() {
+ return hostId;
+ }
- public String getGroup() {
- return group;
- }
+ public String getHostName() {
+ return hostName;
+ }
- public String getZoneId() {
- return zoneId;
- }
+ public String getTemplateId() {
+ return templateId;
+ }
- public String getZoneName() {
- return zoneName;
- }
+ public String getTemplateName() {
+ return templateName;
+ }
- public String getHostId() {
- return hostId;
- }
+ public String getTemplateDisplayText() {
+ return templateDisplayText;
+ }
- public String getHostName() {
- return hostName;
- }
-
- public String getTemplateId() {
- return templateId;
- }
+ public Boolean getPasswordEnabled() {
+ return passwordEnabled;
+ }
- public String getTemplateName() {
- return templateName;
- }
+ public String getIsoId() {
+ return isoId;
+ }
- public String getTemplateDisplayText() {
- return templateDisplayText;
- }
+ public String getIsoName() {
+ return isoName;
+ }
- public Boolean getPasswordEnabled() {
- return passwordEnabled;
- }
+ public String getIsoDisplayText() {
+ return isoDisplayText;
+ }
- public String getIsoId() {
- return isoId;
- }
+ public String getServiceOfferingId() {
+ return serviceOfferingId;
+ }
- public String getIsoName() {
- return isoName;
- }
+ public String getServiceOfferingName() {
+ return serviceOfferingName;
+ }
- public String getIsoDisplayText() {
- return isoDisplayText;
- }
+ public Boolean getForVirtualNetwork() {
+ return forVirtualNetwork;
+ }
- public String getServiceOfferingId() {
- return serviceOfferingId;
- }
+ public Integer getCpuNumber() {
+ return cpuNumber;
+ }
- public String getServiceOfferingName() {
- return serviceOfferingName;
- }
+ public Integer getCpuSpeed() {
+ return cpuSpeed;
+ }
- public Boolean getForVirtualNetwork() {
- return forVirtualNetwork;
- }
+ public Integer getMemory() {
+ return memory;
+ }
- public Integer getCpuNumber() {
- return cpuNumber;
- }
+ public String getCpuUsed() {
+ return cpuUsed;
+ }
- public Integer getCpuSpeed() {
- return cpuSpeed;
- }
+ public Long getNetworkKbsRead() {
+ return networkKbsRead;
+ }
- public Integer getMemory() {
- return memory;
- }
+ public Long getNetworkKbsWrite() {
+ return networkKbsWrite;
+ }
- public String getCpuUsed() {
- return cpuUsed;
- }
+ public Long getDiskKbsRead() {
+ return diskKbsRead;
+ }
- public Long getNetworkKbsRead() {
- return networkKbsRead;
- }
+ public Long getDiskKbsWrite() {
+ return diskKbsWrite;
+ }
- public Long getNetworkKbsWrite() {
- return networkKbsWrite;
- }
+ public Long getDiskIORead() {
+ return diskIORead;
+ }
- public Long getDiskKbsRead() {
- return diskKbsRead;
- }
+ public Long getDiskIOWrite() {
+ return diskIOWrite;
+ }
- public Long getDiskKbsWrite() {
- return diskKbsWrite;
- }
+ public String getGuestOsId() {
+ return guestOsId;
+ }
- public Long getDiskIORead() {
- return diskIORead;
- }
+ public Long getRootDeviceId() {
+ return rootDeviceId;
+ }
- public Long getDiskIOWrite() {
- return diskIOWrite;
- }
+ public String getRootDeviceType() {
+ return rootDeviceType;
+ }
- public String getGuestOsId() {
- return guestOsId;
- }
+ public Set<SecurityGroupResponse> getSecurityGroupList() {
+ return securityGroupList;
+ }
- public Long getRootDeviceId() {
- return rootDeviceId;
- }
+ public String getPassword() {
+ return password;
+ }
- public String getRootDeviceType() {
- return rootDeviceType;
- }
+ public Set<NicResponse> getNics() {
+ return nics;
+ }
- public Set<SecurityGroupResponse> getSecurityGroupList() {
- return securityGroupList;
- }
+ public String getHypervisor() {
+ return hypervisor;
+ }
- public String getPassword() {
- return password;
- }
+ public String getPublicIpId() {
+ return publicIpId;
+ }
- public Set<NicResponse> getNics() {
- return nics;
- }
+ public String getPublicIp() {
+ return publicIp;
+ }
- public String getHypervisor() {
- return hypervisor;
- }
+ public String getInstanceName() {
+ return instanceName;
+ }
- public String getPublicIpId() {
- return publicIpId;
- }
+ public Set<ResourceTagResponse> getTags() {
+ return tags;
+ }
- public String getPublicIp() {
- return publicIp;
- }
+ public String getKeyPairName() {
+ return keyPairName;
+ }
- public String getInstanceName() {
- return instanceName;
- }
+ public Set<AffinityGroupResponse> getAffinityGroupList() {
+ return affinityGroupList;
+ }
- public Set<ResourceTagResponse> getTags() {
- return tags;
- }
+ public Boolean getIsDynamicallyScalable() {
+ return isDynamicallyScalable;
+ }
- public String getKeyPairName() {
- return keyPairName;
- }
+ public String getServiceState() {
+ return serviceState;
+ }
- public Set<AffinityGroupResponse> getAffinityGroupList() {
- return affinityGroupList;
- }
+ public void setIsDynamicallyScalable(Boolean isDynamicallyScalable) {
+ this.isDynamicallyScalable = isDynamicallyScalable;
+ }
- public Boolean getIsDynamicallyScalable() {
- return isDynamicallyScalable;
- }
+ public void setName(String name) {
+ this.name = name;
+ }
- public String getServiceState() {
- return serviceState;
- }
+ public void setDisplayName(String displayName) {
+ this.displayName = displayName;
+ }
- public void setIsDynamicallyScalable(Boolean isDynamicallyScalable) {
- this.isDynamicallyScalable = isDynamicallyScalable;
- }
+ @Override
+ public void setAccountName(String accountName) {
+ this.accountName = accountName;
+ }
- public void setName(String name) {
- this.name = name;
- }
+ @Override
+ public void setDomainId(String domainId) {
+ this.domainId = domainId;
+ }
- public void setDisplayName(String displayName) {
- this.displayName = displayName;
- }
+ @Override
+ public void setDomainName(String domainName) {
+ this.domainName = domainName;
+ }
- @Override
- public void setAccountName(String accountName) {
- this.accountName = accountName;
- }
-
- @Override
- public void setDomainId(String domainId) {
- this.domainId = domainId;
- }
-
- @Override
- public void setDomainName(String domainName) {
- this.domainName = domainName;
- }
+ public void setCreated(Date created) {
+ this.created = created;
+ }
- public void setCreated(Date created) {
- this.created = created;
- }
+ public void setState(String state) {
+ this.state = state;
+ }
- public void setState(String state) {
- this.state = state;
- }
+ public void setHaEnable(Boolean haEnable) {
+ this.haEnable = haEnable;
+ }
- public void setHaEnable(Boolean haEnable) {
- this.haEnable = haEnable;
- }
+ public void setGroupId(String groupId) {
+ this.groupId = groupId;
+ }
- public void setGroupId(String groupId) {
- this.groupId = groupId;
- }
+ public void setGroup(String group) {
+ this.group = group;
+ }
+
+ public void setZoneId(String zoneId) {
+ this.zoneId = zoneId;
+ }
+
+ public void setZoneName(String zoneName) {
+ this.zoneName = zoneName;
+ }
+
+ public void setHostId(String hostId) {
+ this.hostId = hostId;
+ }
+
+ public void setHostName(String hostName) {
+ this.hostName = hostName;
+ }
+
+ public void setTemplateId(String templateId) {
+ this.templateId = templateId;
+ }
+
+ public void setTemplateName(String templateName) {
+ this.templateName = templateName;
+ }
+
+ public void setTemplateDisplayText(String templateDisplayText) {
+ this.templateDisplayText = templateDisplayText;
+ }
+
+ public void setPasswordEnabled(Boolean passwordEnabled) {
+ this.passwordEnabled = passwordEnabled;
+ }
+
+ public void setIsoId(String isoId) {
+ this.isoId = isoId;
+ }
+
+ public void setIsoName(String isoName) {
+ this.isoName = isoName;
+ }
+
+ public void setIsoDisplayText(String isoDisplayText) {
+ this.isoDisplayText = isoDisplayText;
+ }
+
+ public void setDiskKbsRead(Long diskKbsRead) {
+ this.diskKbsRead = diskKbsRead;
+ }
+
+ public void setDiskKbsWrite(Long diskKbsWrite) {
+ this.diskKbsWrite = diskKbsWrite;
+ }
+
+ public void setDiskIORead(Long diskIORead) {
+ this.diskIORead = diskIORead;
+ }
+
+ public void setDiskIOWrite(Long diskIOWrite) {
+ this.diskIOWrite = diskIOWrite;
+ }
+
+ public void setServiceOfferingId(String serviceOfferingId) {
+ this.serviceOfferingId = serviceOfferingId;
+ }
+
+ public void setServiceOfferingName(String serviceOfferingName) {
+ this.serviceOfferingName = serviceOfferingName;
+ }
- public void setGroup(String group) {
- this.group = group;
- }
+ public void setCpuNumber(Integer cpuNumber) {
+ this.cpuNumber = cpuNumber;
+ }
- public void setZoneId(String zoneId) {
- this.zoneId = zoneId;
- }
+ public void setCpuSpeed(Integer cpuSpeed) {
+ this.cpuSpeed = cpuSpeed;
+ }
- public void setZoneName(String zoneName) {
- this.zoneName = zoneName;
- }
+ public void setMemory(Integer memory) {
+ this.memory = memory;
+ }
- public void setHostId(String hostId) {
- this.hostId = hostId;
- }
+ public void setCpuUsed(String cpuUsed) {
+ this.cpuUsed = cpuUsed;
+ }
+
+ public void setNetworkKbsRead(Long networkKbsRead) {
+ this.networkKbsRead = networkKbsRead;
+ }
+
+ public void setNetworkKbsWrite(Long networkKbsWrite) {
+ this.networkKbsWrite = networkKbsWrite;
+ }
+
+ public void setGuestOsId(String guestOsId) {
+ this.guestOsId = guestOsId;
+ }
+
+ public void setRootDeviceId(Long rootDeviceId) {
+ this.rootDeviceId = rootDeviceId;
+ }
+
+ public void setRootDeviceType(String rootDeviceType) {
+ this.rootDeviceType = rootDeviceType;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
- public void setHostName(String hostName) {
- this.hostName = hostName;
- }
+ public void setForVirtualNetwork(Boolean forVirtualNetwork) {
+ this.forVirtualNetwork = forVirtualNetwork;
+ }
- public void setTemplateId(String templateId) {
- this.templateId = templateId;
- }
+ public void setNics(Set<NicResponse> nics) {
+ this.nics = nics;
+ }
- public void setTemplateName(String templateName) {
- this.templateName = templateName;
- }
+ public void addNic(NicResponse nic) {
+ this.nics.add(nic);
+ }
- public void setTemplateDisplayText(String templateDisplayText) {
- this.templateDisplayText = templateDisplayText;
- }
+ public void setSecurityGroupList(Set<SecurityGroupResponse> securityGroups) {
+ this.securityGroupList = securityGroups;
+ }
- public void setPasswordEnabled(Boolean passwordEnabled) {
- this.passwordEnabled = passwordEnabled;
- }
-
- public void setIsoId(String isoId) {
- this.isoId = isoId;
- }
-
- public void setIsoName(String isoName) {
- this.isoName = isoName;
- }
-
- public void setIsoDisplayText(String isoDisplayText) {
- this.isoDisplayText = isoDisplayText;
- }
-
- public void setDiskKbsRead(Long diskKbsRead) {
- this.diskKbsRead = diskKbsRead;
- }
-
- public void setDiskKbsWrite(Long diskKbsWrite) {
- this.diskKbsWrite = diskKbsWrite;
- }
-
- public void setDiskIORead(Long diskIORead) {
- this.diskIORead = diskIORead;
- }
-
- public void setDiskIOWrite(Long diskIOWrite) {
- this.diskIOWrite = diskIOWrite;
- }
-
- public void setServiceOfferingId(String serviceOfferingId) {
- this.serviceOfferingId = serviceOfferingId;
- }
-
- public void setServiceOfferingName(String serviceOfferingName) {
- this.serviceOfferingName = serviceOfferingName;
- }
-
- public void setCpuNumber(Integer cpuNumber) {
- this.cpuNumber = cpuNumber;
- }
-
- public void setCpuSpeed(Integer cpuSpeed) {
- this.cpuSpeed = cpuSpeed;
- }
-
- public void setMemory(Integer memory) {
- this.memory = memory;
- }
+ public void addSecurityGroup(SecurityGroupResponse securityGroup) {
+ this.securityGroupList.add(securityGroup);
+ }
- public void setCpuUsed(String cpuUsed) {
- this.cpuUsed = cpuUsed;
- }
+ @Override
+ public void setProjectId(String projectId) {
+ this.projectId = projectId;
+ }
- public void setNetworkKbsRead(Long networkKbsRead) {
- this.networkKbsRead = networkKbsRead;
- }
+ @Override
+ public void setProjectName(String projectName) {
+ this.projectName = projectName;
+ }
- public void setNetworkKbsWrite(Long networkKbsWrite) {
- this.networkKbsWrite = networkKbsWrite;
- }
+ public void setPublicIpId(String publicIpId) {
+ this.publicIpId = publicIpId;
+ }
- public void setGuestOsId(String guestOsId) {
- this.guestOsId = guestOsId;
- }
+ public void setPublicIp(String publicIp) {
+ this.publicIp = publicIp;
+ }
- public void setRootDeviceId(Long rootDeviceId) {
- this.rootDeviceId = rootDeviceId;
- }
+ public void setInstanceName(String instanceName) {
+ this.instanceName = instanceName;
+ }
- public void setRootDeviceType(String rootDeviceType) {
- this.rootDeviceType = rootDeviceType;
- }
+ public void setTags(Set<ResourceTagResponse> tags) {
+ this.tags = tags;
+ }
- public void setPassword(String password) {
- this.password = password;
- }
+ public void addTag(ResourceTagResponse tag) {
+ this.tags.add(tag);
+ }
- public void setForVirtualNetwork(Boolean forVirtualNetwork) {
- this.forVirtualNetwork = forVirtualNetwork;
- }
+ public void setKeyPairName(String keyPairName) {
+ this.keyPairName = keyPairName;
+ }
- public void setNics(Set<NicResponse> nics) {
- this.nics = nics;
- }
+ public void setAffinityGroupList(Set<AffinityGroupResponse> affinityGroups) {
+ this.affinityGroupList = affinityGroups;
+ }
- public void addNic(NicResponse nic) {
- this.nics.add(nic);
- }
+ public void addAffinityGroup(AffinityGroupResponse affinityGroup) {
+ this.affinityGroupList.add(affinityGroup);
+ }
- public void setSecurityGroupList(Set<SecurityGroupResponse> securityGroups) {
- this.securityGroupList = securityGroups;
- }
+ public void setDynamicallyScalable(boolean isDynamicallyScalable) {
+ this.isDynamicallyScalable = isDynamicallyScalable;
+ }
- public void addSecurityGroup(SecurityGroupResponse securityGroup){
- this.securityGroupList.add(securityGroup);
- }
+ public void setServiceState(String state) {
+ this.serviceState = state;
+ }
- @Override
- public void setProjectId(String projectId) {
- this.projectId = projectId;
- }
-
- @Override
- public void setProjectName(String projectName) {
- this.projectName = projectName;
- }
-
- public void setPublicIpId(String publicIpId) {
- this.publicIpId = publicIpId;
- }
-
- public void setPublicIp(String publicIp) {
- this.publicIp = publicIp;
- }
-
- public void setInstanceName(String instanceName) {
- this.instanceName = instanceName;
- }
-
- public void setTags(Set<ResourceTagResponse> tags) {
- this.tags = tags;
- }
-
- public void addTag(ResourceTagResponse tag){
- this.tags.add(tag);
- }
-
- public void setKeyPairName(String keyPairName) {
- this.keyPairName = keyPairName;
- }
-
- public void setAffinityGroupList(Set<AffinityGroupResponse> affinityGroups) {
- this.affinityGroupList = affinityGroups;
- }
-
- public void addAffinityGroup(AffinityGroupResponse affinityGroup) {
- this.affinityGroupList.add(affinityGroup);
- }
-
- public void setDynamicallyScalable(boolean isDynamicallyScalable) {
- this.isDynamicallyScalable = isDynamicallyScalable;
- }
-
- public void setServiceState(String state) {
- this.serviceState = state;
- }
-
public void setDetails(Map details) {
this.details = details;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/org/apache/cloudstack/api/response/VMSnapshotResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/VMSnapshotResponse.java b/api/src/org/apache/cloudstack/api/response/VMSnapshotResponse.java
index 3b30ab6..25ad686 100644
--- a/api/src/org/apache/cloudstack/api/response/VMSnapshotResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/VMSnapshotResponse.java
@@ -27,8 +27,8 @@ import com.cloud.serializer.Param;
import com.cloud.vm.snapshot.VMSnapshot;
import com.google.gson.annotations.SerializedName;
-@EntityReference(value=VMSnapshot.class)
-public class VMSnapshotResponse extends BaseResponse implements ControlledEntityResponse{
+@EntityReference(value = VMSnapshot.class)
+public class VMSnapshotResponse extends BaseResponse implements ControlledEntityResponse {
@SerializedName(ApiConstants.ID)
@Param(description = "the ID of the vm snapshot")
@@ -60,38 +60,40 @@ public class VMSnapshotResponse extends BaseResponse implements ControlledEntity
@SerializedName("parent")
@Param(description = "the parent ID of the vm snapshot")
- private String parent;
-
+ private String parent;
+
@SerializedName("parentName")
@Param(description = "the parent displayName of the vm snapshot")
- private String parentName;
-
+ private String parentName;
+
@SerializedName("current")
@Param(description = "indiates if this is current snapshot")
- private Boolean current;
-
+ private Boolean current;
+
@SerializedName("type")
@Param(description = "VM Snapshot type")
- private String type;
-
+ private String type;
+
@SerializedName(ApiConstants.CREATED)
@Param(description = "the create date of the vm snapshot")
private Date created;
-
+
@SerializedName(ApiConstants.ACCOUNT)
@Param(description = "the account associated with the disk volume")
private String accountName;
- @SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id of the vpn")
+ @SerializedName(ApiConstants.PROJECT_ID)
+ @Param(description = "the project id of the vpn")
private String projectId;
- @SerializedName(ApiConstants.PROJECT) @Param(description="the project name of the vpn")
+ @SerializedName(ApiConstants.PROJECT)
+ @Param(description = "the project name of the vpn")
private String projectName;
@SerializedName(ApiConstants.DOMAIN_ID)
@Param(description = "the ID of the domain associated with the disk volume")
private String domainId;
-
+
@SerializedName(ApiConstants.DOMAIN)
@Param(description = "the domain associated with the disk volume")
private String domainName;
@@ -172,7 +174,7 @@ public class VMSnapshotResponse extends BaseResponse implements ControlledEntity
public void setCurrent(Boolean current) {
this.current = current;
}
-
+
public void setParentName(String parentName) {
this.parentName = parentName;
}
@@ -192,19 +194,19 @@ public class VMSnapshotResponse extends BaseResponse implements ControlledEntity
@Override
public void setAccountName(String accountName) {
this.accountName = accountName;
-
+
}
@Override
public void setProjectId(String projectId) {
this.projectId = projectId;
-
+
}
@Override
public void setProjectName(String projectName) {
this.projectName = projectName;
-
+
}
@Override
@@ -215,6 +217,6 @@ public class VMSnapshotResponse extends BaseResponse implements ControlledEntity
@Override
public void setDomainName(String domainName) {
this.domainName = domainName;
-
+
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/org/apache/cloudstack/api/response/VirtualRouterProviderResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/VirtualRouterProviderResponse.java b/api/src/org/apache/cloudstack/api/response/VirtualRouterProviderResponse.java
index de355bd..4189d64 100644
--- a/api/src/org/apache/cloudstack/api/response/VirtualRouterProviderResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/VirtualRouterProviderResponse.java
@@ -24,31 +24,39 @@ import com.cloud.network.VirtualRouterProvider;
import com.cloud.serializer.Param;
import com.google.gson.annotations.SerializedName;
-@EntityReference(value=VirtualRouterProvider.class)
+@EntityReference(value = VirtualRouterProvider.class)
@SuppressWarnings("unused")
public class VirtualRouterProviderResponse extends BaseResponse implements ControlledEntityResponse {
- @SerializedName(ApiConstants.ID) @Param(description="the id of the router")
+ @SerializedName(ApiConstants.ID)
+ @Param(description = "the id of the router")
private String id;
- @SerializedName(ApiConstants.NSP_ID) @Param(description="the physical network service provider id of the provider")
+ @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")
+ @SerializedName(ApiConstants.ENABLED)
+ @Param(description = "Enabled/Disabled the service provider")
private Boolean enabled;
- @SerializedName(ApiConstants.ACCOUNT) @Param(description="the account associated with the provider")
+ @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")
+ @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")
+ @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")
+ @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")
+ @SerializedName(ApiConstants.DOMAIN)
+ @Param(description = "the domain associated with the provider")
private String domainName;
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/org/apache/cloudstack/api/response/VlanIpRangeResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/VlanIpRangeResponse.java b/api/src/org/apache/cloudstack/api/response/VlanIpRangeResponse.java
index 6c5c364..aff486a 100644
--- a/api/src/org/apache/cloudstack/api/response/VlanIpRangeResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/VlanIpRangeResponse.java
@@ -24,75 +24,96 @@ import com.cloud.dc.Vlan;
import com.cloud.serializer.Param;
import com.google.gson.annotations.SerializedName;
-@EntityReference(value=Vlan.class)
+@EntityReference(value = Vlan.class)
@SuppressWarnings("unused")
-public class VlanIpRangeResponse extends BaseResponse implements ControlledEntityResponse{
- @SerializedName(ApiConstants.ID) @Param(description="the ID of the VLAN IP range")
+public class VlanIpRangeResponse extends BaseResponse implements ControlledEntityResponse {
+ @SerializedName(ApiConstants.ID)
+ @Param(description = "the ID of the VLAN IP range")
private String id;
- @SerializedName("forvirtualnetwork") @Param(description="the virtual network for the VLAN IP range")
+ @SerializedName("forvirtualnetwork")
+ @Param(description = "the virtual network for the VLAN IP range")
private Boolean forVirtualNetwork;
- @SerializedName(ApiConstants.ZONE_ID) @Param(description="the Zone ID of the VLAN IP range")
+ @SerializedName(ApiConstants.ZONE_ID)
+ @Param(description = "the Zone ID of the VLAN IP range")
private String zoneId;
- @SerializedName(ApiConstants.VLAN) @Param(description="the ID or VID of the VLAN.")
+ @SerializedName(ApiConstants.VLAN)
+ @Param(description = "the ID or VID of the VLAN.")
private String vlan;
- @SerializedName(ApiConstants.ACCOUNT) @Param(description="the account of the VLAN IP range")
+ @SerializedName(ApiConstants.ACCOUNT)
+ @Param(description = "the account of the VLAN IP range")
private String accountName;
- @SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the domain ID of the VLAN IP range")
+ @SerializedName(ApiConstants.DOMAIN_ID)
+ @Param(description = "the domain ID of the VLAN IP range")
private String domainId;
- @SerializedName(ApiConstants.DOMAIN) @Param(description="the domain name of the VLAN IP range")
+ @SerializedName(ApiConstants.DOMAIN)
+ @Param(description = "the domain name of the VLAN IP range")
private String domainName;
- @SerializedName(ApiConstants.POD_ID) @Param(description="the Pod ID for the VLAN IP range")
+ @SerializedName(ApiConstants.POD_ID)
+ @Param(description = "the Pod ID for the VLAN IP range")
private String podId;
- @SerializedName("podname") @Param(description="the Pod name for the VLAN IP range")
+ @SerializedName("podname")
+ @Param(description = "the Pod name for the VLAN IP range")
private String podName;
- @SerializedName(ApiConstants.GATEWAY) @Param(description="the gateway of the VLAN IP range")
+ @SerializedName(ApiConstants.GATEWAY)
+ @Param(description = "the gateway of the VLAN IP range")
private String gateway;
- @SerializedName(ApiConstants.NETMASK) @Param(description="the netmask of the VLAN IP range")
+ @SerializedName(ApiConstants.NETMASK)
+ @Param(description = "the netmask of the VLAN IP range")
private String netmask;
- @SerializedName(ApiConstants.DESCRIPTION) @Param(description="the description of the VLAN IP range")
+ @SerializedName(ApiConstants.DESCRIPTION)
+ @Param(description = "the description of the VLAN IP range")
private String description;
- @SerializedName(ApiConstants.START_IP) @Param(description="the start ip of the VLAN IP range")
+ @SerializedName(ApiConstants.START_IP)
+ @Param(description = "the start ip of the VLAN IP range")
private String startIp;
- @SerializedName(ApiConstants.END_IP) @Param(description="the end ip of the VLAN IP range")
+ @SerializedName(ApiConstants.END_IP)
+ @Param(description = "the end ip of the VLAN IP range")
private String endIp;
- @SerializedName(ApiConstants.NETWORK_ID) @Param(description="the network id of vlan range")
+ @SerializedName(ApiConstants.NETWORK_ID)
+ @Param(description = "the network id of vlan range")
private String networkId;
- @SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id of the vlan range")
+ @SerializedName(ApiConstants.PROJECT_ID)
+ @Param(description = "the project id of the vlan range")
private String projectId;
- @SerializedName(ApiConstants.PROJECT) @Param(description="the project name of the vlan range")
+ @SerializedName(ApiConstants.PROJECT)
+ @Param(description = "the project name of the vlan range")
private String projectName;
- @SerializedName(ApiConstants.PHYSICAL_NETWORK_ID) @Param(description="the physical network this belongs to")
+ @SerializedName(ApiConstants.PHYSICAL_NETWORK_ID)
+ @Param(description = "the physical network this belongs to")
private String physicalNetworkId;
- @SerializedName(ApiConstants.START_IPV6) @Param(description="the start ipv6 of the VLAN IP range")
+ @SerializedName(ApiConstants.START_IPV6)
+ @Param(description = "the start ipv6 of the VLAN IP range")
private String startIpv6;
- @SerializedName(ApiConstants.END_IPV6) @Param(description="the end ipv6 of the VLAN IP range")
+ @SerializedName(ApiConstants.END_IPV6)
+ @Param(description = "the end ipv6 of the VLAN IP range")
private String endIpv6;
-
- @SerializedName(ApiConstants.IP6_GATEWAY) @Param(description="the gateway of IPv6 network")
+
+ @SerializedName(ApiConstants.IP6_GATEWAY)
+ @Param(description = "the gateway of IPv6 network")
private String ip6Gateway;
-
- @SerializedName(ApiConstants.IP6_CIDR) @Param(description="the cidr of IPv6 network")
+
+ @SerializedName(ApiConstants.IP6_CIDR)
+ @Param(description = "the cidr of IPv6 network")
private String ip6Cidr;
-
public void setId(String id) {
this.id = id;
@@ -172,23 +193,23 @@ public class VlanIpRangeResponse extends BaseResponse implements ControlledEntit
return physicalNetworkId;
}
- public String getStartIpv6() {
- return startIpv6;
- }
+ public String getStartIpv6() {
+ return startIpv6;
+ }
- public void setStartIpv6(String startIpv6) {
- this.startIpv6 = startIpv6;
- }
+ public void setStartIpv6(String startIpv6) {
+ this.startIpv6 = startIpv6;
+ }
- public void setEndIpv6(String endIpv6) {
- this.endIpv6 = endIpv6;
- }
+ public void setEndIpv6(String endIpv6) {
+ this.endIpv6 = endIpv6;
+ }
- public void setIp6Gateway(String ip6Gateway) {
- this.ip6Gateway = ip6Gateway;
- }
+ public void setIp6Gateway(String ip6Gateway) {
+ this.ip6Gateway = ip6Gateway;
+ }
- public void setIp6Cidr(String ip6Cidr) {
- this.ip6Cidr = ip6Cidr;
- }
+ public void setIp6Cidr(String ip6Cidr) {
+ this.ip6Cidr = ip6Cidr;
+ }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/org/apache/cloudstack/api/response/VolumeDetailResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/VolumeDetailResponse.java b/api/src/org/apache/cloudstack/api/response/VolumeDetailResponse.java
index 04d280d..b4170a9 100644
--- a/api/src/org/apache/cloudstack/api/response/VolumeDetailResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/VolumeDetailResponse.java
@@ -30,7 +30,7 @@ import com.cloud.storage.Volume;
import com.google.gson.annotations.SerializedName;
@SuppressWarnings("unused")
-public class VolumeDetailResponse extends BaseResponse{
+public class VolumeDetailResponse extends BaseResponse {
@SerializedName(ApiConstants.ID)
@Param(description = "ID of the volume")
private String id;
@@ -39,12 +39,12 @@ public class VolumeDetailResponse extends BaseResponse{
@Param(description = "name of the volume detail")
private String name;
-
@SerializedName(ApiConstants.VALUE)
@Param(description = "value of the volume detail")
private String value;
- @SerializedName(ApiConstants.DISPLAY_VOLUME) @Param(description="an optional field whether to the display the volume to the end user or not.")
+ @SerializedName(ApiConstants.DISPLAY_VOLUME)
+ @Param(description = "an optional field whether to the display the volume to the end user or not.")
private Boolean displayVm;
public String getId() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/org/apache/cloudstack/api/response/VolumeResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/VolumeResponse.java b/api/src/org/apache/cloudstack/api/response/VolumeResponse.java
index 56c007f..25fc553 100644
--- a/api/src/org/apache/cloudstack/api/response/VolumeResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/VolumeResponse.java
@@ -28,9 +28,9 @@ import com.cloud.serializer.Param;
import com.cloud.storage.Volume;
import com.google.gson.annotations.SerializedName;
-@EntityReference(value=Volume.class)
+@EntityReference(value = Volume.class)
@SuppressWarnings("unused")
-public class VolumeResponse extends BaseResponse implements ControlledViewEntityResponse{
+public class VolumeResponse extends BaseResponse implements ControlledViewEntityResponse {
@SerializedName(ApiConstants.ID)
@Param(description = "ID of the disk volume")
private String id;
@@ -95,10 +95,12 @@ public class VolumeResponse extends BaseResponse implements ControlledViewEntity
@Param(description = "the account associated with the disk volume")
private String accountName;
- @SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id of the vpn")
+ @SerializedName(ApiConstants.PROJECT_ID)
+ @Param(description = "the project id of the vpn")
private String projectId;
- @SerializedName(ApiConstants.PROJECT) @Param(description="the project name of the vpn")
+ @SerializedName(ApiConstants.PROJECT)
+ @Param(description = "the project name of the vpn")
private String projectName;
@SerializedName(ApiConstants.DOMAIN_ID)
@@ -113,16 +115,20 @@ public class VolumeResponse extends BaseResponse implements ControlledViewEntity
@Param(description = "shared or local storage")
private String storageType;
- @SerializedName("diskBytesReadRate") @Param(description="bytes read rate of the disk volume")
+ @SerializedName("diskBytesReadRate")
+ @Param(description = "bytes read rate of the disk volume")
private Long bytesReadRate;
- @SerializedName("diskBytesWriteRate") @Param(description="bytes write rate of the disk volume")
+ @SerializedName("diskBytesWriteRate")
+ @Param(description = "bytes write rate of the disk volume")
private Long bytesWriteRate;
- @SerializedName("diskIopsReadRate") @Param(description="io requests read rate of the disk volume")
+ @SerializedName("diskIopsReadRate")
+ @Param(description = "io requests read rate of the disk volume")
private Long iopsReadRate;
- @SerializedName("diskIopsWriteRate") @Param(description="io requests write rate of the disk volume")
+ @SerializedName("diskIopsWriteRate")
+ @Param(description = "io requests write rate of the disk volume")
private Long iopsWriteRate;
@SerializedName(ApiConstants.HYPERVISOR)
@@ -174,23 +180,23 @@ public class VolumeResponse extends BaseResponse implements ControlledViewEntity
private Boolean extractable;
@SerializedName(ApiConstants.STATUS)
- @Param(description="the status of the volume")
+ @Param(description = "the status of the volume")
private String status;
@SerializedName(ApiConstants.TAGS)
- @Param(description="the list of resource tags associated with volume", responseObject = ResourceTagResponse.class)
+ @Param(description = "the list of resource tags associated with volume", responseObject = ResourceTagResponse.class)
private Set<ResourceTagResponse> tags;
@SerializedName(ApiConstants.DISPLAY_VOLUME)
- @Param(description="an optional field whether to the display the volume to the end user or not.")
+ @Param(description = "an optional field whether to the display the volume to the end user or not.")
private Boolean displayVm;
@SerializedName(ApiConstants.PATH)
- @Param(description="The path of the volume")
+ @Param(description = "The path of the volume")
private String path;
-
+
@SerializedName(ApiConstants.STORAGE_ID)
- @Param(description = "id of the primary storage hosting the disk volume; returned to admin user only", since="4.3")
+ @Param(description = "id of the primary storage hosting the disk volume; returned to admin user only", since = "4.3")
private String storagePoolId;
public String getPath() {
@@ -201,7 +207,7 @@ public class VolumeResponse extends BaseResponse implements ControlledViewEntity
this.path = path;
}
- public VolumeResponse(){
+ public VolumeResponse() {
tags = new LinkedHashSet<ResourceTagResponse>();
}
@@ -393,7 +399,7 @@ public class VolumeResponse extends BaseResponse implements ControlledViewEntity
this.tags = tags;
}
- public void addTag(ResourceTagResponse tag){
+ public void addTag(ResourceTagResponse tag) {
this.tags.add(tag);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/org/apache/cloudstack/api/response/VpcOfferingResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/VpcOfferingResponse.java b/api/src/org/apache/cloudstack/api/response/VpcOfferingResponse.java
index 70120d1..7d555d7 100644
--- a/api/src/org/apache/cloudstack/api/response/VpcOfferingResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/VpcOfferingResponse.java
@@ -27,31 +27,37 @@ import com.cloud.network.vpc.VpcOffering;
import com.cloud.serializer.Param;
import com.google.gson.annotations.SerializedName;
-@EntityReference(value=VpcOffering.class)
+@EntityReference(value = VpcOffering.class)
@SuppressWarnings("unused")
public class VpcOfferingResponse extends BaseResponse {
- @SerializedName("id") @Param(description="the id of the vpc offering")
+ @SerializedName("id")
+ @Param(description = "the id of the vpc offering")
private String id;
- @SerializedName(ApiConstants.NAME) @Param(description="the name of the vpc offering")
+ @SerializedName(ApiConstants.NAME)
+ @Param(description = "the name of the vpc offering")
private String name;
- @SerializedName(ApiConstants.DISPLAY_TEXT) @Param(description="an alternate display text of the vpc offering.")
+ @SerializedName(ApiConstants.DISPLAY_TEXT)
+ @Param(description = "an alternate display text of the vpc offering.")
private String displayText;
- @SerializedName(ApiConstants.CREATED) @Param(description="the date this vpc offering was created")
+ @SerializedName(ApiConstants.CREATED)
+ @Param(description = "the date this vpc offering was created")
private Date created;
- @SerializedName(ApiConstants.IS_DEFAULT) @Param(description="true if vpc offering is default, false otherwise")
+ @SerializedName(ApiConstants.IS_DEFAULT)
+ @Param(description = "true if vpc offering is default, false otherwise")
private Boolean isDefault;
- @SerializedName(ApiConstants.STATE) @Param(description="state of the vpc offering. Can be Disabled/Enabled")
+ @SerializedName(ApiConstants.STATE)
+ @Param(description = "state of the vpc offering. Can be Disabled/Enabled")
private String state;
- @SerializedName(ApiConstants.SERVICE) @Param(description="the list of supported services", responseObject = ServiceResponse.class)
+ @SerializedName(ApiConstants.SERVICE)
+ @Param(description = "the list of supported services", responseObject = ServiceResponse.class)
private List<ServiceResponse> services;
-
public void setId(String id) {
this.id = id;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/org/apache/cloudstack/api/response/VpcResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/VpcResponse.java b/api/src/org/apache/cloudstack/api/response/VpcResponse.java
index 3dfd23b..aaa7d79 100644
--- a/api/src/org/apache/cloudstack/api/response/VpcResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/VpcResponse.java
@@ -27,64 +27,83 @@ import com.cloud.network.vpc.Vpc;
import com.cloud.serializer.Param;
import com.google.gson.annotations.SerializedName;
-@EntityReference(value=Vpc.class)
+@EntityReference(value = Vpc.class)
@SuppressWarnings("unused")
-public class VpcResponse extends BaseResponse implements ControlledEntityResponse{
- @SerializedName("id") @Param(description="the id of the VPC")
+public class VpcResponse extends BaseResponse implements ControlledEntityResponse {
+ @SerializedName("id")
+ @Param(description = "the id of the VPC")
private String id;
- @SerializedName(ApiConstants.NAME) @Param(description="the name of the VPC")
+ @SerializedName(ApiConstants.NAME)
+ @Param(description = "the name of the VPC")
private String name;
- @SerializedName(ApiConstants.DISPLAY_TEXT) @Param(description="an alternate display text of the VPC.")
+ @SerializedName(ApiConstants.DISPLAY_TEXT)
+ @Param(description = "an alternate display text of the VPC.")
private String displayText;
- @SerializedName(ApiConstants.STATE) @Param(description="state of the VPC. Can be Inactive/Enabled")
+ @SerializedName(ApiConstants.STATE)
+ @Param(description = "state of the VPC. Can be Inactive/Enabled")
private String state;
- @SerializedName(ApiConstants.ZONE_ID) @Param(description="zone id of the vpc")
+ @SerializedName(ApiConstants.ZONE_ID)
+ @Param(description = "zone id of the vpc")
private String zoneId;
- @SerializedName(ApiConstants.ZONE_NAME) @Param(description="the name of the zone the VPC belongs to")
+ @SerializedName(ApiConstants.ZONE_NAME)
+ @Param(description = "the name of the zone the VPC belongs to")
private String zoneName;
- @SerializedName(ApiConstants.SERVICE) @Param(description="the list of supported services", responseObject = ServiceResponse.class)
+ @SerializedName(ApiConstants.SERVICE)
+ @Param(description = "the list of supported services", responseObject = ServiceResponse.class)
private List<ServiceResponse> services;
- @SerializedName(ApiConstants.CIDR) @Param(description="the cidr the VPC")
+ @SerializedName(ApiConstants.CIDR)
+ @Param(description = "the cidr the VPC")
private String cidr;
- @SerializedName(ApiConstants.VPC_OFF_ID) @Param(description="vpc offering id the VPC is created from")
+ @SerializedName(ApiConstants.VPC_OFF_ID)
+ @Param(description = "vpc offering id the VPC is created from")
private String vpcOfferingId;
- @SerializedName(ApiConstants.CREATED) @Param(description="the date this VPC was created")
+ @SerializedName(ApiConstants.CREATED)
+ @Param(description = "the date this VPC was created")
private Date created;
- @SerializedName(ApiConstants.ACCOUNT) @Param(description="the owner of the VPC")
+ @SerializedName(ApiConstants.ACCOUNT)
+ @Param(description = "the owner of the VPC")
private String accountName;
- @SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id of the VPC")
+ @SerializedName(ApiConstants.PROJECT_ID)
+ @Param(description = "the project id of the VPC")
private String projectId;
- @SerializedName(ApiConstants.PROJECT) @Param(description="the project name of the VPC")
+ @SerializedName(ApiConstants.PROJECT)
+ @Param(description = "the project name of the VPC")
private String projectName;
- @SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the domain id of the VPC owner")
+ @SerializedName(ApiConstants.DOMAIN_ID)
+ @Param(description = "the domain id of the VPC owner")
private String domainId;
- @SerializedName(ApiConstants.DOMAIN) @Param(description="the domain name of the owner")
+ @SerializedName(ApiConstants.DOMAIN)
+ @Param(description = "the domain name of the owner")
private String domain;
- @SerializedName(ApiConstants.NETWORK) @Param(description="the list of networks belongign to the VPC", responseObject = NetworkResponse.class)
+ @SerializedName(ApiConstants.NETWORK)
+ @Param(description = "the list of networks belongign to the VPC", responseObject = NetworkResponse.class)
private List<NetworkResponse> networks;
- @SerializedName(ApiConstants.RESTART_REQUIRED) @Param(description="true VPC requires restart")
+ @SerializedName(ApiConstants.RESTART_REQUIRED)
+ @Param(description = "true VPC requires restart")
private Boolean restartRequired;
- @SerializedName(ApiConstants.NETWORK_DOMAIN) @Param(description="the network domain of the VPC")
+ @SerializedName(ApiConstants.NETWORK_DOMAIN)
+ @Param(description = "the network domain of the VPC")
private String networkDomain;
- @SerializedName(ApiConstants.TAGS) @Param(description="the list of resource tags associated with the project", responseObject = ResourceTagResponse.class)
+ @SerializedName(ApiConstants.TAGS)
+ @Param(description = "the list of resource tags associated with the project", responseObject = ResourceTagResponse.class)
private List<ResourceTagResponse> tags;
public void setId(String id) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/org/apache/cloudstack/api/response/VpnUsersResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/VpnUsersResponse.java b/api/src/org/apache/cloudstack/api/response/VpnUsersResponse.java
index c29a37e..8b70290 100644
--- a/api/src/org/apache/cloudstack/api/response/VpnUsersResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/VpnUsersResponse.java
@@ -26,29 +26,37 @@ import com.google.gson.annotations.SerializedName;
@EntityReference(value = VpnUser.class)
@SuppressWarnings("unused")
-public class VpnUsersResponse extends BaseResponse implements ControlledEntityResponse{
- @SerializedName(ApiConstants.ID) @Param(description="the vpn userID")
+public class VpnUsersResponse extends BaseResponse implements ControlledEntityResponse {
+ @SerializedName(ApiConstants.ID)
+ @Param(description = "the vpn userID")
private String id;
- @SerializedName(ApiConstants.USERNAME) @Param(description="the username of the vpn user")
+ @SerializedName(ApiConstants.USERNAME)
+ @Param(description = "the username of the vpn user")
private String userName;
- @SerializedName(ApiConstants.ACCOUNT) @Param(description="the account of the remote access vpn")
+ @SerializedName(ApiConstants.ACCOUNT)
+ @Param(description = "the account of the remote access vpn")
private String accountName;
- @SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the domain id of the account of the remote access vpn")
+ @SerializedName(ApiConstants.DOMAIN_ID)
+ @Param(description = "the domain id of the account of the remote access vpn")
private String domainId;
- @SerializedName(ApiConstants.DOMAIN) @Param(description="the domain name of the account of the remote access vpn")
+ @SerializedName(ApiConstants.DOMAIN)
+ @Param(description = "the domain name of the account of the remote access vpn")
private String domainName;
- @SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id of the vpn")
+ @SerializedName(ApiConstants.PROJECT_ID)
+ @Param(description = "the project id of the vpn")
private String projectId;
- @SerializedName(ApiConstants.PROJECT) @Param(description="the project name of the vpn")
+ @SerializedName(ApiConstants.PROJECT)
+ @Param(description = "the project name of the vpn")
private String projectName;
- @SerializedName(ApiConstants.STATE) @Param(description="the state of the Vpn User")
+ @SerializedName(ApiConstants.STATE)
+ @Param(description = "the state of the Vpn User")
private String state;
public void setId(String id) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/org/apache/cloudstack/api/response/ZoneResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/ZoneResponse.java b/api/src/org/apache/cloudstack/api/response/ZoneResponse.java
index 2f93e91..7f4687a 100644
--- a/api/src/org/apache/cloudstack/api/response/ZoneResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/ZoneResponse.java
@@ -32,86 +32,107 @@ import com.google.gson.annotations.SerializedName;
@SuppressWarnings("unused")
@EntityReference(value = DataCenter.class)
public class ZoneResponse extends BaseResponse {
- @SerializedName(ApiConstants.ID) @Param(description="Zone id")
+ @SerializedName(ApiConstants.ID)
+ @Param(description = "Zone id")
private String id;
- @SerializedName(ApiConstants.NAME) @Param(description="Zone name")
+ @SerializedName(ApiConstants.NAME)
+ @Param(description = "Zone name")
private String name;
- @SerializedName(ApiConstants.DESCRIPTION) @Param(description="Zone description")
+ @SerializedName(ApiConstants.DESCRIPTION)
+ @Param(description = "Zone description")
private String description;
- @SerializedName(ApiConstants.DNS1) @Param(description="the first DNS for the Zone")
+ @SerializedName(ApiConstants.DNS1)
+ @Param(description = "the first DNS for the Zone")
private String dns1;
- @SerializedName(ApiConstants.DNS2) @Param(description="the second DNS for the Zone")
+ @SerializedName(ApiConstants.DNS2)
+ @Param(description = "the second DNS for the Zone")
private String dns2;
- @SerializedName(ApiConstants.IP6_DNS1) @Param(description="the first IPv6 DNS for the Zone")
+ @SerializedName(ApiConstants.IP6_DNS1)
+ @Param(description = "the first IPv6 DNS for the Zone")
private String ip6Dns1;
- @SerializedName(ApiConstants.IP6_DNS2) @Param(description="the second IPv6 DNS for the Zone")
+ @SerializedName(ApiConstants.IP6_DNS2)
+ @Param(description = "the second IPv6 DNS for the Zone")
private String ip6Dns2;
- @SerializedName(ApiConstants.INTERNAL_DNS1) @Param(description="the first internal DNS for the Zone")
+ @SerializedName(ApiConstants.INTERNAL_DNS1)
+ @Param(description = "the first internal DNS for the Zone")
private String internalDns1;
- @SerializedName(ApiConstants.INTERNAL_DNS2) @Param(description="the second internal DNS for the Zone")
+ @SerializedName(ApiConstants.INTERNAL_DNS2)
+ @Param(description = "the second internal DNS for the Zone")
private String internalDns2;
- @SerializedName(ApiConstants.VLAN) @Param(description="the vlan range of the zone")
+ @SerializedName(ApiConstants.VLAN)
+ @Param(description = "the vlan range of the zone")
private String vlan;
- @SerializedName(ApiConstants.GUEST_CIDR_ADDRESS) @Param(description="the guest CIDR address for the Zone")
+ @SerializedName(ApiConstants.GUEST_CIDR_ADDRESS)
+ @Param(description = "the guest CIDR address for the Zone")
private String guestCidrAddress;
//TODO - generate description
@SerializedName("status")
private String status;
- @SerializedName(ApiConstants.DISPLAY_TEXT) @Param(description="the display text of the zone")
+ @SerializedName(ApiConstants.DISPLAY_TEXT)
+ @Param(description = "the display text of the zone")
private String displayText;
- @SerializedName(ApiConstants.DOMAIN) @Param(description="Network domain name for the networks in the zone")
+ @SerializedName(ApiConstants.DOMAIN)
+ @Param(description = "Network domain name for the networks in the zone")
private String domain;
- @SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the UUID of the containing domain, null for public zones")
+ @SerializedName(ApiConstants.DOMAIN_ID)
+ @Param(description = "the UUID of the containing domain, null for public zones")
private String domainId;
- @SerializedName("domainname") @Param(description="the name of the containing domain, null for public zones")
+ @SerializedName("domainname")
+ @Param(description = "the name of the containing domain, null for public zones")
private String domainName;
- @SerializedName(ApiConstants.NETWORK_TYPE) @Param(description="the network type of the zone; can be Basic or Advanced")
+ @SerializedName(ApiConstants.NETWORK_TYPE)
+ @Param(description = "the network type of the zone; can be Basic or Advanced")
private String networkType;
- @SerializedName("securitygroupsenabled") @Param(description="true if security groups support is enabled, false otherwise")
+ @SerializedName("securitygroupsenabled")
+ @Param(description = "true if security groups support is enabled, false otherwise")
private boolean securityGroupsEnabled;
- @SerializedName("allocationstate") @Param(description="the allocation state of the cluster")
+ @SerializedName("allocationstate")
+ @Param(description = "the allocation state of the cluster")
private String allocationState;
- @SerializedName(ApiConstants.ZONE_TOKEN) @Param(description="Zone Token")
+ @SerializedName(ApiConstants.ZONE_TOKEN)
+ @Param(description = "Zone Token")
private String zoneToken;
- @SerializedName(ApiConstants.DHCP_PROVIDER) @Param(description="the dhcp Provider for the Zone")
+ @SerializedName(ApiConstants.DHCP_PROVIDER)
+ @Param(description = "the dhcp Provider for the Zone")
private String dhcpProvider;
- @SerializedName("capacity") @Param(description="the capacity of the Zone", responseObject = CapacityResponse.class)
+ @SerializedName("capacity")
+ @Param(description = "the capacity of the Zone", responseObject = CapacityResponse.class)
private List<CapacityResponse> capacitites;
- @SerializedName(ApiConstants.LOCAL_STORAGE_ENABLED) @Param(description="true if local storage offering enabled, false otherwise")
+ @SerializedName(ApiConstants.LOCAL_STORAGE_ENABLED)
+ @Param(description = "true if local storage offering enabled, false otherwise")
private boolean localStorageEnabled;
-
- @SerializedName(ApiConstants.TAGS) @Param(description="the list of resource tags associated with zone.",
- responseObject = ResourceTagResponse.class, since="4.3")
+
+ @SerializedName(ApiConstants.TAGS)
+ @Param(description = "the list of resource tags associated with zone.", responseObject = ResourceTagResponse.class, since = "4.3")
private Set<ResourceTagResponse> tags;
-
+
@SerializedName(ApiConstants.RESOURCE_DETAILS)
@Param(description = "Meta data associated with the zone (key/value pairs)", since = "4.3.0")
private Map<String, String> resourceDetails;
-
-
- public ZoneResponse(){
+
+ public ZoneResponse() {
tags = new LinkedHashSet<ResourceTagResponse>();
}
@@ -199,26 +220,26 @@ public class ZoneResponse extends BaseResponse {
this.localStorageEnabled = localStorageEnabled;
}
- public String getIp6Dns1() {
- return ip6Dns1;
- }
+ public String getIp6Dns1() {
+ return ip6Dns1;
+ }
- public void setIp6Dns1(String ip6Dns1) {
- this.ip6Dns1 = ip6Dns1;
- }
+ public void setIp6Dns1(String ip6Dns1) {
+ this.ip6Dns1 = ip6Dns1;
+ }
- public String getIp6Dns2() {
- return ip6Dns2;
- }
+ public String getIp6Dns2() {
+ return ip6Dns2;
+ }
+
+ public void setIp6Dns2(String ip6Dns2) {
+ this.ip6Dns2 = ip6Dns2;
+ }
- public void setIp6Dns2(String ip6Dns2) {
- this.ip6Dns2 = ip6Dns2;
- }
-
- public void addTag(ResourceTagResponse tag){
+ public void addTag(ResourceTagResponse tag) {
this.tags.add(tag);
}
-
+
public void setResourceDetails(Map<String, String> details) {
this.resourceDetails = details;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/org/apache/cloudstack/context/CallContext.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/context/CallContext.java b/api/src/org/apache/cloudstack/context/CallContext.java
index 5439aee..0645583 100644
--- a/api/src/org/apache/cloudstack/context/CallContext.java
+++ b/api/src/org/apache/cloudstack/context/CallContext.java
@@ -40,12 +40,11 @@ import com.cloud.utils.exception.CloudRuntimeException;
public class CallContext {
private static final Logger s_logger = Logger.getLogger(CallContext.class);
private static ManagedThreadLocal<CallContext> s_currentContext = new ManagedThreadLocal<CallContext>();
- private static ManagedThreadLocal<Stack<CallContext>> s_currentContextStack =
- new ManagedThreadLocal<Stack<CallContext>>() {
- @Override
- protected Stack<CallContext> initialValue() {
- return new Stack<CallContext>();
- }
+ private static ManagedThreadLocal<Stack<CallContext>> s_currentContextStack = new ManagedThreadLocal<Stack<CallContext>>() {
+ @Override
+ protected Stack<CallContext> initialValue() {
+ return new Stack<CallContext>();
+ }
};
private String contextId;
@@ -149,9 +148,9 @@ public class CallContext {
if (s_logger.isTraceEnabled()) {
s_logger.trace("Registered: " + callingContext);
}
-
+
s_currentContextStack.get().push(callingContext);
-
+
return callingContext;
}
@@ -199,11 +198,11 @@ public class CallContext {
}
public static void unregisterAll() {
- while ( unregister() != null ) {
+ while (unregister() != null) {
// NOOP
}
}
-
+
public static CallContext unregister() {
CallContext context = s_currentContext.get();
if (context == null) {
@@ -228,7 +227,7 @@ public class CallContext {
Stack<CallContext> stack = s_currentContextStack.get();
stack.pop();
- if ( ! stack.isEmpty() ) {
+ if (!stack.isEmpty()) {
s_currentContext.set(stack.peek());
}
@@ -262,7 +261,7 @@ public class CallContext {
public String getEventDetails() {
return eventDetails;
}
-
+
public String getEventType() {
return eventType;
}
@@ -270,7 +269,7 @@ public class CallContext {
public void setEventType(String eventType) {
this.eventType = eventType;
}
-
+
public String getEventDescription() {
return eventDescription;
}
@@ -281,7 +280,7 @@ public class CallContext {
public static void setActionEventInfo(String eventType, String description) {
CallContext context = CallContext.current();
- if ( context != null ) {
+ if (context != null) {
context.setEventType(eventType);
context.setEventDescription(description);
}
@@ -289,9 +288,6 @@ public class CallContext {
@Override
public String toString() {
- return new StringBuilder("CCtxt[acct=").append(getCallingAccountId())
- .append("; user=").append(getCallingUserId())
- .append("; id=").append(contextId)
- .append("]").toString();
+ return new StringBuilder("CCtxt[acct=").append(getCallingAccountId()).append("; user=").append(getCallingUserId()).append("; id=").append(contextId).append("]").toString();
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/org/apache/cloudstack/context/CallContextListener.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/context/CallContextListener.java b/api/src/org/apache/cloudstack/context/CallContextListener.java
index 9464f3d..49866e0 100644
--- a/api/src/org/apache/cloudstack/context/CallContextListener.java
+++ b/api/src/org/apache/cloudstack/context/CallContextListener.java
@@ -26,22 +26,22 @@ import org.apache.cloudstack.managed.context.ManagedContextListener;
import com.cloud.utils.db.EntityManager;
public class CallContextListener implements ManagedContextListener<Object> {
-
+
@Inject
EntityManager entityMgr;
-
+
@Override
public Object onEnterContext(boolean reentry) {
- if ( ! reentry ) {
+ if (!reentry) {
CallContext.registerSystemCallContextOnceOnly();
}
-
+
return null;
}
@Override
public void onLeaveContext(Object unused, boolean reentry) {
- if ( ! reentry ) {
+ if (!reentry) {
CallContext.unregisterAll();
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/org/apache/cloudstack/jobs/JobInfo.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/jobs/JobInfo.java b/api/src/org/apache/cloudstack/jobs/JobInfo.java
index ac8ffc3..c7c9b96 100644
--- a/api/src/org/apache/cloudstack/jobs/JobInfo.java
+++ b/api/src/org/apache/cloudstack/jobs/JobInfo.java
@@ -23,17 +23,14 @@ import org.apache.cloudstack.api.InternalIdentity;
public interface JobInfo extends Identity, InternalIdentity {
public enum Status {
- IN_PROGRESS(false),
- SUCCEEDED(true),
- FAILED(true),
- CANCELLED(true);
-
+ IN_PROGRESS(false), SUCCEEDED(true), FAILED(true), CANCELLED(true);
+
private final boolean done;
private Status(boolean done) {
this.done = done;
}
-
+
public boolean done() {
return done;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/org/apache/cloudstack/network/element/InternalLoadBalancerElementService.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/network/element/InternalLoadBalancerElementService.java b/api/src/org/apache/cloudstack/network/element/InternalLoadBalancerElementService.java
index 33a0c64..76706a4 100644
--- a/api/src/org/apache/cloudstack/network/element/InternalLoadBalancerElementService.java
+++ b/api/src/org/apache/cloudstack/network/element/InternalLoadBalancerElementService.java
@@ -18,11 +18,10 @@ package org.apache.cloudstack.network.element;
import java.util.List;
-
import com.cloud.network.VirtualRouterProvider;
import com.cloud.utils.component.PluggableService;
-public interface InternalLoadBalancerElementService extends PluggableService{
+public interface InternalLoadBalancerElementService extends PluggableService {
/**
* Configures existing Internal Load Balancer Element (enables or disables it)
* @param id
@@ -30,21 +29,21 @@ public interface InternalLoadBalancerElementService extends PluggableService{
* @return
*/
VirtualRouterProvider configureInternalLoadBalancerElement(long id, boolean enable);
-
+
/**
* Adds Internal Load Balancer element to the Network Service Provider
* @param ntwkSvcProviderId
* @return
*/
VirtualRouterProvider addInternalLoadBalancerElement(long ntwkSvcProviderId);
-
+
/**
* Retrieves existing Internal Load Balancer element
* @param id
* @return
*/
VirtualRouterProvider getInternalLoadBalancerElement(long id);
-
+
/**
* Searches for existing Internal Load Balancer elements based on parameters passed to the call
* @param id
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d627446/api/src/org/apache/cloudstack/network/lb/ApplicationLoadBalancerContainer.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/network/lb/ApplicationLoadBalancerContainer.java b/api/src/org/apache/cloudstack/network/lb/ApplicationLoadBalancerContainer.java
index df94d3d..d83270b 100644
--- a/api/src/org/apache/cloudstack/network/lb/ApplicationLoadBalancerContainer.java
+++ b/api/src/org/apache/cloudstack/network/lb/ApplicationLoadBalancerContainer.java
@@ -19,10 +19,10 @@ package org.apache.cloudstack.network.lb;
import com.cloud.network.rules.LoadBalancerContainer;
import com.cloud.utils.net.Ip;
-public interface ApplicationLoadBalancerContainer extends LoadBalancerContainer{
-
+public interface ApplicationLoadBalancerContainer extends LoadBalancerContainer {
+
public Long getSourceIpNetworkId();
-
+
public Ip getSourceIp();
}