cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From edi...@apache.org
Subject [3/4] git commit: updated refs/heads/master to aad1cda
Date Mon, 14 Oct 2013 22:41:34 GMT
Removed setters from *JoinVO classes


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e514da2c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e514da2c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e514da2c

Branch: refs/heads/master
Commit: e514da2c48cd92a0a0c8722f53f401b0e8f01269
Parents: 350c944
Author: Chris Suich <chris.suich@netapp.com>
Authored: Thu Oct 10 12:54:40 2013 -0400
Committer: Edison Su <sudison@gmail.com>
Committed: Mon Oct 14 15:20:17 2013 -0700

----------------------------------------------------------------------
 .../com/cloud/api/query/vo/AccountJoinVO.java   | 319 +------
 .../cloud/api/query/vo/AffinityGroupJoinVO.java |  79 --
 .../com/cloud/api/query/vo/AsyncJobJoinVO.java  | 142 +--
 .../src/com/cloud/api/query/vo/BaseViewVO.java  |   3 -
 .../cloud/api/query/vo/DataCenterJoinVO.java    | 118 +--
 .../cloud/api/query/vo/DiskOfferingJoinVO.java  | 109 +--
 .../cloud/api/query/vo/DomainRouterJoinVO.java  | 531 +----------
 .../src/com/cloud/api/query/vo/EventJoinVO.java | 109 +--
 .../src/com/cloud/api/query/vo/HostJoinVO.java  | 181 +---
 .../cloud/api/query/vo/ImageStoreJoinVO.java    |  68 +-
 .../cloud/api/query/vo/InstanceGroupJoinVO.java |  74 --
 .../api/query/vo/ProjectAccountJoinVO.java      |  90 +-
 .../api/query/vo/ProjectInvitationJoinVO.java   |  72 --
 .../com/cloud/api/query/vo/ProjectJoinVO.java   | 104 +--
 .../cloud/api/query/vo/ResourceTagJoinVO.java   |  87 --
 .../cloud/api/query/vo/SecurityGroupJoinVO.java | 147 ----
 .../api/query/vo/ServiceOfferingJoinVO.java     | 123 ---
 .../cloud/api/query/vo/StoragePoolJoinVO.java   | 120 ---
 .../com/cloud/api/query/vo/TemplateJoinVO.java  | 542 +-----------
 .../cloud/api/query/vo/UserAccountJoinVO.java   | 124 +--
 .../com/cloud/api/query/vo/UserVmJoinVO.java    | 869 +------------------
 .../com/cloud/api/query/vo/VolumeJoinVO.java    | 406 ---------
 22 files changed, 63 insertions(+), 4354 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e514da2c/server/src/com/cloud/api/query/vo/AccountJoinVO.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/vo/AccountJoinVO.java b/server/src/com/cloud/api/query/vo/AccountJoinVO.java
index fbcc934..2ec45d3 100644
--- a/server/src/com/cloud/api/query/vo/AccountJoinVO.java
+++ b/server/src/com/cloud/api/query/vo/AccountJoinVO.java
@@ -17,17 +17,20 @@
 package com.cloud.api.query.vo;
 
 import java.util.Date;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
 import javax.persistence.Id;
 import javax.persistence.Table;
-import com.cloud.user.Account.State;
-import com.cloud.utils.db.GenericDao;
+
 import org.apache.cloudstack.api.Identity;
 import org.apache.cloudstack.api.InternalIdentity;
 
+import com.cloud.user.Account.State;
+import com.cloud.utils.db.GenericDao;
+
 @Entity
 @Table(name="account_view")
 public class AccountJoinVO extends BaseViewVO implements InternalIdentity, Identity {
@@ -45,7 +48,6 @@ public class AccountJoinVO extends BaseViewVO implements InternalIdentity, Ident
     @Column(name="type")
     private short type;
 
-
     @Column(name="state")
     @Enumerated(value=EnumType.STRING)
     private State state;
@@ -59,7 +61,6 @@ public class AccountJoinVO extends BaseViewVO implements InternalIdentity, Ident
     @Column(name="network_domain")
     private String networkDomain;
 
-
     @Column(name="domain_id")
     private long domainId;
 
@@ -72,7 +73,6 @@ public class AccountJoinVO extends BaseViewVO implements InternalIdentity, Ident
     @Column(name="domain_path")
     private String domainPath = null;
 
-
     @Column(name="data_center_id")
     private long dataCenterId;
 
@@ -94,7 +94,6 @@ public class AccountJoinVO extends BaseViewVO implements InternalIdentity, Ident
     @Column(name="vmTotal")
     private Long vmTotal;
 
-
     @Column(name="ipLimit")
     private Long ipLimit;
 
@@ -134,42 +133,36 @@ public class AccountJoinVO extends BaseViewVO implements InternalIdentity, Ident
     @Column(name="projectTotal")
     private Long projectTotal;
 
-
     @Column(name="networkLimit")
     private Long networkLimit;
 
     @Column(name="networkTotal")
     private Long networkTotal;
 
-
     @Column(name="vpcLimit")
     private Long vpcLimit;
 
     @Column(name="vpcTotal")
     private Long vpcTotal;
 
-
     @Column(name="cpuLimit")
     private Long cpuLimit;
 
     @Column(name="cpuTotal")
     private Long cpuTotal;
 
-
     @Column(name="memoryLimit")
     private Long memoryLimit;
 
     @Column(name="memoryTotal")
     private Long memoryTotal;
 
-
     @Column(name="primaryStorageLimit")
     private Long primaryStorageLimit;
 
     @Column(name="primaryStorageTotal")
     private Long primaryStorageTotal;
 
-
     @Column(name="secondaryStorageLimit")
     private Long secondaryStorageLimit;
 
@@ -184,504 +177,204 @@ public class AccountJoinVO extends BaseViewVO implements InternalIdentity, Ident
 
     @Column(name="job_status")
     private int jobStatus;
-    
+
     @Column(name = "default")
     boolean isDefault;
 
     public AccountJoinVO() {
     }
 
-
     @Override
     public long getId() {
         return id;
     }
 
-
-    @Override
-    public void setId(long id) {
-        this.id = id;
-    }
-
-
     @Override
     public String getUuid() {
         return uuid;
     }
 
-
-    public void setUuid(String uuid) {
-        this.uuid = uuid;
-    }
-
-
     public String getAccountName() {
         return accountName;
     }
 
-
-    public void setAccountName(String accountName) {
-        this.accountName = accountName;
-    }
-
-
     public short getType() {
         return type;
     }
 
-
-    public void setType(short type) {
-        this.type = type;
-    }
-
-
     public State getState() {
         return state;
     }
 
-
-    public void setState(State state) {
-        this.state = state;
-    }
-
-
     public Date getRemoved() {
         return removed;
     }
 
-
-    public void setRemoved(Date removed) {
-        this.removed = removed;
-    }
-
-
     public boolean isNeedsCleanup() {
         return needsCleanup;
     }
 
-
-    public void setNeedsCleanup(boolean needsCleanup) {
-        this.needsCleanup = needsCleanup;
-    }
-
-
     public String getNetworkDomain() {
         return networkDomain;
     }
 
-
-    public void setNetworkDomain(String networkDomain) {
-        this.networkDomain = networkDomain;
-    }
-
-
     public long getDomainId() {
         return domainId;
     }
 
-
-    public void setDomainId(long domainId) {
-        this.domainId = domainId;
-    }
-
-
     public String getDomainUuid() {
         return domainUuid;
     }
 
-
-    public void setDomainUuid(String domainUuid) {
-        this.domainUuid = domainUuid;
-    }
-
-
     public String getDomainName() {
         return domainName;
     }
 
-
-    public void setDomainName(String domainName) {
-        this.domainName = domainName;
-    }
-
-
     public String getDomainPath() {
         return domainPath;
     }
 
-
-    public void setDomainPath(String domainPath) {
-        this.domainPath = domainPath;
-    }
-
-
     public long getDataCenterId() {
         return dataCenterId;
     }
 
-
-    public void setDataCenterId(long dataCenterId) {
-        this.dataCenterId = dataCenterId;
-    }
-
-
     public String getDataCenterUuid() {
         return dataCenterUuid;
     }
 
-
-    public void setDataCenterUuid(String dataCenterUuid) {
-        this.dataCenterUuid = dataCenterUuid;
-    }
-
-
     public String getDataCenterName() {
         return dataCenterName;
     }
 
-
-    public void setDataCenterName(String dataCenterName) {
-        this.dataCenterName = dataCenterName;
-    }
-
-
     public Long getBytesReceived() {
         return bytesReceived;
     }
 
-
-    public void setBytesReceived(Long bytesReceived) {
-        this.bytesReceived = bytesReceived;
-    }
-
-
     public Long getBytesSent() {
         return bytesSent;
     }
 
-
-    public void setBytesSent(Long bytesSent) {
-        this.bytesSent = bytesSent;
-    }
-
-
-
-
     public Long getVmTotal() {
         return vmTotal;
     }
 
-
-    public void setVmTotal(Long vmTotal) {
-        this.vmTotal = vmTotal;
-    }
-
-
-
-
-
     public Long getIpTotal() {
         return ipTotal;
     }
 
-
-    public void setIpTotal(Long ipTotal) {
-        this.ipTotal = ipTotal;
-    }
-
-
     public Long getIpFree() {
         return ipFree;
     }
 
-
-    public void setIpFree(Long ipFree) {
-        this.ipFree = ipFree;
-    }
-
-
-
     public Long getVolumeTotal() {
         return volumeTotal;
     }
 
-
-    public void setVolumeTotal(Long volumeTotal) {
-        this.volumeTotal = volumeTotal;
-    }
-
-
-
     public Long getSnapshotTotal() {
         return snapshotTotal;
     }
 
-
-    public void setSnapshotTotal(Long snapshotTotal) {
-        this.snapshotTotal = snapshotTotal;
-    }
-
-
-
-
     public Long getTemplateTotal() {
         return templateTotal;
     }
 
-
-    public void setTemplateTotal(Long templateTotal) {
-        this.templateTotal = templateTotal;
-    }
-
-
     public Integer getVmStopped() {
         return vmStopped;
     }
 
-
-    public void setVmStopped(Integer vmStopped) {
-        this.vmStopped = vmStopped;
-    }
-
-
     public Integer getVmRunning() {
         return vmRunning;
     }
 
-
-    public void setVmRunning(Integer vmRunning) {
-        this.vmRunning = vmRunning;
-    }
-
-
-
     public Long getProjectTotal() {
         return projectTotal;
     }
 
-
-    public void setProjectTotal(Long projectTotal) {
-        this.projectTotal = projectTotal;
-    }
-
-
-
     public Long getNetworkTotal() {
         return networkTotal;
     }
 
-
-    public void setNetworkTotal(Long networkTotal) {
-        this.networkTotal = networkTotal;
-    }
-
-
     public Long getVpcTotal() {
         return vpcTotal;
     }
 
-
-    public void setVpcTotal(Long vpcTotal) {
-        this.vpcTotal = vpcTotal;
-    }
-
-
     public Long getCpuTotal() {
         return cpuTotal;
     }
 
-
-    public void setCpuTotal(Long cpuTotal) {
-        this.cpuTotal = cpuTotal;
-    }
-
-
     public Long getMemoryTotal() {
         return memoryTotal;
     }
 
-
-    public void setMemoryTotal(Long memoryTotal) {
-        this.memoryTotal = memoryTotal;
-    }
-
-
     public Long getPrimaryStorageTotal() {
         return primaryStorageTotal;
     }
 
-
-    public void setPrimaryStorageTotal(Long primaryStorageTotal) {
-        this.primaryStorageTotal = primaryStorageTotal;
-    }
-
     public Long getSecondaryStorageTotal() {
         return secondaryStorageTotal;
     }
 
-
-    public void setSecondaryStorageTotal(Long secondaryStorageTotal) {
-        this.secondaryStorageTotal = secondaryStorageTotal;
-    }
-
-
     public Long getVmLimit() {
         return vmLimit;
     }
 
-
-    public void setVmLimit(Long vmLimit) {
-        this.vmLimit = vmLimit;
-    }
-
-
     public Long getIpLimit() {
         return ipLimit;
     }
 
-
-    public void setIpLimit(Long ipLimit) {
-        this.ipLimit = ipLimit;
-    }
-
-
     public Long getVolumeLimit() {
         return volumeLimit;
     }
 
-
-    public void setVolumeLimit(Long volumeLimit) {
-        this.volumeLimit = volumeLimit;
-    }
-
-
     public Long getSnapshotLimit() {
         return snapshotLimit;
     }
 
-
-    public void setSnapshotLimit(Long snapshotLimit) {
-        this.snapshotLimit = snapshotLimit;
-    }
-
-
     public Long getTemplateLimit() {
         return templateLimit;
     }
 
-
-    public void setTemplateLimit(Long templateLimit) {
-        this.templateLimit = templateLimit;
-    }
-
-
     public Long getProjectLimit() {
         return projectLimit;
     }
 
-
-    public void setProjectLimit(Long projectLimit) {
-        this.projectLimit = projectLimit;
-    }
-
-
     public Long getNetworkLimit() {
         return networkLimit;
     }
 
-
-    public void setNetworkLimit(Long networkLimit) {
-        this.networkLimit = networkLimit;
-    }
-
-
     public Long getVpcLimit() {
         return vpcLimit;
     }
 
-
-    public void setVpcLimit(Long vpcLimit) {
-        this.vpcLimit = vpcLimit;
-    }
-
-
     public Long getCpuLimit() {
         return cpuLimit;
     }
 
-
-    public void setCpuLimit(Long cpuLimit) {
-        this.cpuLimit = cpuLimit;
-    }
-
-
     public Long getMemoryLimit() {
         return memoryLimit;
     }
 
-
-    public void setMemoryLimit(Long memoryLimit) {
-        this.memoryLimit = memoryLimit;
-    }
-
-
     public Long getPrimaryStorageLimit() {
         return primaryStorageLimit;
     }
 
-
-    public void setPrimaryStorageLimit(Long primaryStorageLimit) {
-        this.primaryStorageLimit = primaryStorageLimit;
-    }
-
-
     public Long getSecondaryStorageLimit() {
         return secondaryStorageLimit;
     }
 
-
-    public void setSecondaryStorageLimit(Long secondaryStorageLimit) {
-        this.secondaryStorageLimit = secondaryStorageLimit;
-    }
-
-
     public Long getJobId() {
         return jobId;
     }
 
-
-    public void setJobId(Long jobId) {
-        this.jobId = jobId;
-    }
-
-
     public String getJobUuid() {
         return jobUuid;
     }
 
-
-    public void setJobUuid(String jobUuid) {
-        this.jobUuid = jobUuid;
-    }
-
-
     public int getJobStatus() {
         return jobStatus;
     }
 
-
-    public void setJobStatus(int jobStatus) {
-        this.jobStatus = jobStatus;
-    }
-
-
     public boolean isDefault() {
         return isDefault;
     }
-
-
-    public void setDefault(boolean isDefault) {
-        this.isDefault = isDefault;
-    }
- 
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e514da2c/server/src/com/cloud/api/query/vo/AffinityGroupJoinVO.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/vo/AffinityGroupJoinVO.java b/server/src/com/cloud/api/query/vo/AffinityGroupJoinVO.java
index ae63a8a..3710957 100644
--- a/server/src/com/cloud/api/query/vo/AffinityGroupJoinVO.java
+++ b/server/src/com/cloud/api/query/vo/AffinityGroupJoinVO.java
@@ -91,7 +91,6 @@ public class AffinityGroupJoinVO extends BaseViewVO implements ControlledViewEnt
     @Enumerated(value = EnumType.STRING)
     ControlledEntity.ACLType aclType;
 
-
     public AffinityGroupJoinVO() {
     }
 
@@ -101,156 +100,82 @@ public class AffinityGroupJoinVO extends BaseViewVO implements ControlledViewEnt
     }
 
     @Override
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    @Override
     public String getUuid() {
         return uuid;
     }
 
-    public void setUuid(String uuid) {
-        this.uuid = uuid;
-    }
-
-
     public String getName() {
         return name;
     }
 
-    public void setName(String name) {
-        this.name = name;
-    }
-
     public String getType() {
         return type;
     }
 
-    public void setType(String type) {
-        this.type = type;
-    }
-
     @Override
     public long getAccountId() {
         return accountId;
     }
 
-    public void setAccountId(long accountId) {
-        this.accountId = accountId;
-    }
-
     @Override
     public String getAccountUuid() {
         return accountUuid;
     }
 
-    public void setAccountUuid(String accountUuid) {
-        this.accountUuid = accountUuid;
-    }
-
     @Override
     public String getAccountName() {
         return accountName;
     }
 
-    public void setAccountName(String accountName) {
-        this.accountName = accountName;
-    }
-
     @Override
     public short getAccountType() {
         return accountType;
     }
 
-    public void setAccountType(short accountType) {
-        this.accountType = accountType;
-    }
-
     @Override
     public long getDomainId() {
         return domainId;
     }
 
-    public void setDomainId(long domainId) {
-        this.domainId = domainId;
-    }
-
     @Override
     public String getDomainUuid() {
         return domainUuid;
     }
 
-    public void setDomainUuid(String domainUuid) {
-        this.domainUuid = domainUuid;
-    }
-
     @Override
     public String getDomainName() {
         return domainName;
     }
 
-    public void setDomainName(String domainName) {
-        this.domainName = domainName;
-    }
-
     @Override
     public String getDomainPath() {
         return domainPath;
     }
 
-    public void setDomainPath(String domainPath) {
-        this.domainPath = domainPath;
-    }
-
     public String getDescription() {
         return description;
     }
 
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
     public long getVmId() {
         return vmId;
     }
 
-    public void setVmId(long vmId) {
-        this.vmId = vmId;
-    }
-
     public String getVmUuid() {
         return vmUuid;
     }
 
-    public void setVmUuid(String vmUuid) {
-        this.vmUuid = vmUuid;
-    }
-
     public String getVmName() {
         return vmName;
     }
 
-    public void setVmName(String vmName) {
-        this.vmName = vmName;
-    }
-
     public String getVmDisplayName() {
         return vmDisplayName;
     }
 
-    public void setVmDisplayName(String vmDisplayName) {
-        this.vmDisplayName = vmDisplayName;
-    }
-
     public VirtualMachine.State getVmState() {
         return vmState;
     }
 
-    public void setVmState(VirtualMachine.State vmState) {
-        this.vmState = vmState;
-    }
-
     @Override
     public String getProjectUuid() {
         // TODO Auto-generated method stub
@@ -267,9 +192,5 @@ public class AffinityGroupJoinVO extends BaseViewVO implements ControlledViewEnt
         return aclType;
     }
 
-    public void setAclType(ControlledEntity.ACLType aclType) {
-        this.aclType = aclType;
-    }
-
 }
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e514da2c/server/src/com/cloud/api/query/vo/AsyncJobJoinVO.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/vo/AsyncJobJoinVO.java b/server/src/com/cloud/api/query/vo/AsyncJobJoinVO.java
index c45be1c..a30e253 100644
--- a/server/src/com/cloud/api/query/vo/AsyncJobJoinVO.java
+++ b/server/src/com/cloud/api/query/vo/AsyncJobJoinVO.java
@@ -17,6 +17,7 @@
 package com.cloud.api.query.vo;
 
 import java.util.Date;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
@@ -24,12 +25,12 @@ import javax.persistence.Enumerated;
 import javax.persistence.Id;
 import javax.persistence.Table;
 
-import com.cloud.utils.db.GenericDao;
-
 import org.apache.cloudstack.api.ApiCommandJobType;
 import org.apache.cloudstack.api.Identity;
 import org.apache.cloudstack.api.InternalIdentity;
 
+import com.cloud.utils.db.GenericDao;
+
 @Entity
 @Table(name="async_job_view")
 public class AsyncJobJoinVO extends BaseViewVO implements InternalIdentity, Identity {
@@ -53,7 +54,6 @@ public class AsyncJobJoinVO extends BaseViewVO implements InternalIdentity, Iden
     @Column(name="account_type")
     private short accountType;
 
-
     @Column(name="domain_id")
     private long domainId;
 
@@ -66,7 +66,6 @@ public class AsyncJobJoinVO extends BaseViewVO implements InternalIdentity, Iden
     @Column(name="domain_path")
     private String domainPath = null;
 
-
     @Column(name="user_id")
     private long userId;
 
@@ -104,231 +103,96 @@ public class AsyncJobJoinVO extends BaseViewVO implements InternalIdentity, Iden
     @Column(name="instance_uuid")
     private String instanceUuid;
 
-
     public AsyncJobJoinVO() {
     }
 
-
     @Override
     public long getId() {
         return id;
     }
 
-
-    @Override
-    public void setId(long id) {
-        this.id = id;
-    }
-
-
     @Override
     public String getUuid() {
         return uuid;
     }
 
-
-    public void setUuid(String uuid) {
-        this.uuid = uuid;
-    }
-
-
     public long getAccountId() {
         return accountId;
     }
 
-
-    public void setAccountId(long accountId) {
-        this.accountId = accountId;
-    }
-
-
     public String getAccountUuid() {
         return accountUuid;
     }
 
-
-    public void setAccountUuid(String accountUuid) {
-        this.accountUuid = accountUuid;
-    }
-
-
     public String getAccountName() {
         return accountName;
     }
 
-
-    public void setAccountName(String accountName) {
-        this.accountName = accountName;
-    }
-
-
     public short getAccountType() {
         return accountType;
     }
 
-
-    public void setAccountType(short accountType) {
-        this.accountType = accountType;
-    }
-
-
     public long getDomainId() {
         return domainId;
     }
 
-
-    public void setDomainId(long domainId) {
-        this.domainId = domainId;
-    }
-
-
     public String getDomainUuid() {
         return domainUuid;
     }
 
-
-    public void setDomainUuid(String domainUuid) {
-        this.domainUuid = domainUuid;
-    }
-
-
     public String getDomainName() {
         return domainName;
     }
 
-
-    public void setDomainName(String domainName) {
-        this.domainName = domainName;
-    }
-
-
     public String getDomainPath() {
         return domainPath;
     }
 
-
-    public void setDomainPath(String domainPath) {
-        this.domainPath = domainPath;
-    }
-
-
     public long getUserId() {
         return userId;
     }
 
-
-    public void setUserId(long userId) {
-        this.userId = userId;
-    }
-
-
     public String getUserUuid() {
         return userUuid;
     }
 
-
-    public void setUserUuid(String userUuid) {
-        this.userUuid = userUuid;
-    }
-
-
     public String getCmd() {
         return cmd;
     }
 
-
-    public void setCmd(String cmd) {
-        this.cmd = cmd;
-    }
-
-
     public int getStatus() {
         return status;
     }
 
-
-    public void setStatus(int status) {
-        this.status = status;
-    }
-
-
     public int getProcessStatus() {
         return processStatus;
     }
 
-
-    public void setProcessStatus(int processStatus) {
-        this.processStatus = processStatus;
-    }
-
-
     public int getResultCode() {
         return resultCode;
     }
 
-
-    public void setResultCode(int resultCode) {
-        this.resultCode = resultCode;
-    }
-
-
     public String getResult() {
         return result;
     }
 
-
-    public void setResult(String result) {
-        this.result = result;
-    }
-
-
     public Date getCreated() {
         return created;
     }
 
-
-    public void setCreated(Date created) {
-        this.created = created;
-    }
-
-
     public Date getRemoved() {
         return removed;
     }
 
-
-    public void setRemoved(Date removed) {
-        this.removed = removed;
-    }
-
-
     public ApiCommandJobType getInstanceType() {
         return instanceType;
     }
 
-
-    public void setInstanceType(ApiCommandJobType instanceType) {
-        this.instanceType = instanceType;
-    }
-
-
     public Long getInstanceId() {
         return instanceId;
     }
 
-
-    public void setInstanceId(Long instanceId) {
-        this.instanceId = instanceId;
-    }
-
-
     public String getInstanceUuid() {
         return instanceUuid;
     }
-
-
-    public void setInstanceUuid(String instanceUuid) {
-        this.instanceUuid = instanceUuid;
-    }
-
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e514da2c/server/src/com/cloud/api/query/vo/BaseViewVO.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/vo/BaseViewVO.java b/server/src/com/cloud/api/query/vo/BaseViewVO.java
index 6b1ddd6..923bfd9 100644
--- a/server/src/com/cloud/api/query/vo/BaseViewVO.java
+++ b/server/src/com/cloud/api/query/vo/BaseViewVO.java
@@ -20,9 +20,6 @@ public abstract class BaseViewVO {
 
     public abstract long getId();
 
-    public abstract void setId(long id);
-
-
     @Override
     public int hashCode() {
         final int prime = 31;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e514da2c/server/src/com/cloud/api/query/vo/DataCenterJoinVO.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/vo/DataCenterJoinVO.java b/server/src/com/cloud/api/query/vo/DataCenterJoinVO.java
index c6a80e7..70fc35d 100644
--- a/server/src/com/cloud/api/query/vo/DataCenterJoinVO.java
+++ b/server/src/com/cloud/api/query/vo/DataCenterJoinVO.java
@@ -25,13 +25,13 @@ import javax.persistence.Enumerated;
 import javax.persistence.Id;
 import javax.persistence.Table;
 
+import org.apache.cloudstack.api.Identity;
+import org.apache.cloudstack.api.InternalIdentity;
+
 import com.cloud.dc.DataCenter.NetworkType;
 import com.cloud.org.Grouping.AllocationState;
 import com.cloud.utils.db.GenericDao;
 
-import org.apache.cloudstack.api.Identity;
-import org.apache.cloudstack.api.InternalIdentity;
-
 @Entity
 @Table(name="data_center_view")
 public class DataCenterJoinVO extends BaseViewVO implements InternalIdentity, Identity {
@@ -117,7 +117,6 @@ public class DataCenterJoinVO extends BaseViewVO implements InternalIdentity, Id
     @Column(name = "account_id")
     private long accountId;
 
-
     public DataCenterJoinVO() {
     }
 
@@ -127,190 +126,93 @@ public class DataCenterJoinVO extends BaseViewVO implements InternalIdentity, Id
     }
 
     @Override
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    @Override
     public String getUuid() {
         return uuid;
     }
 
-    public void setUuid(String uuid) {
-        this.uuid = uuid;
-    }
-
     public String getName() {
         return name;
     }
 
-    public void setName(String name) {
-        this.name = name;
-    }
-
-
-
     public String getDescription() {
         return description;
     }
 
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
     public String getDns1() {
         return dns1;
     }
 
-    public void setDns1(String dns1) {
-        this.dns1 = dns1;
-    }
-
     public String getDns2() {
         return dns2;
     }
 
-    public void setDns2(String dns2) {
-        this.dns2 = dns2;
-    }
-
     public String getInternalDns1() {
         return internalDns1;
     }
 
-    public void setInternalDns1(String internalDns1) {
-        this.internalDns1 = internalDns1;
-    }
-
     public String getInternalDns2() {
         return internalDns2;
     }
 
-    public void setInternalDns2(String internalDns2) {
-        this.internalDns2 = internalDns2;
-    }
-
     public String getGuestNetworkCidr() {
         return guestNetworkCidr;
     }
 
-    public void setGuestNetworkCidr(String guestNetworkCidr) {
-        this.guestNetworkCidr = guestNetworkCidr;
-    }
-
     public String getDomain() {
         return domain;
     }
 
-    public void setDomain(String domain) {
-        this.domain = domain;
-    }
-
     public NetworkType getNetworkType() {
         return networkType;
     }
 
-    public void setNetworkType(NetworkType networkType) {
-        this.networkType = networkType;
-    }
-
     public String getDhcpProvider() {
         return dhcpProvider;
     }
 
-    public void setDhcpProvider(String dhcpProvider) {
-        this.dhcpProvider = dhcpProvider;
-    }
-
     public String getZoneToken() {
         return zoneToken;
     }
 
-    public void setZoneToken(String zoneToken) {
-        this.zoneToken = zoneToken;
-    }
-
     public AllocationState getAllocationState() {
         return allocationState;
     }
 
-    public void setAllocationState(AllocationState allocationState) {
-        this.allocationState = allocationState;
-    }
-
     public boolean isSecurityGroupEnabled() {
         return securityGroupEnabled;
     }
 
-    public void setSecurityGroupEnabled(boolean securityGroupEnabled) {
-        this.securityGroupEnabled = securityGroupEnabled;
-    }
-
-
     public boolean isLocalStorageEnabled() {
         return localStorageEnabled;
     }
 
-    public void setLocalStorageEnabled(boolean localStorageEnabled) {
-        this.localStorageEnabled = localStorageEnabled;
-    }
-
     public Date getRemoved() {
         return removed;
     }
 
-    public void setRemoved(Date removed) {
-        this.removed = removed;
-    }
-
     public long getDomainId() {
         return domainId;
     }
 
-    public void setDomainId(long domainId) {
-        this.domainId = domainId;
-    }
-
     public String getDomainUuid() {
         return domainUuid;
     }
 
-    public void setDomainUuid(String domainUuid) {
-        this.domainUuid = domainUuid;
-    }
-
     public String getDomainName() {
         return domainName;
     }
 
-    public void setDomainName(String domainName) {
-        this.domainName = domainName;
-    }
-
     public String getDomainPath() {
         return domainPath;
     }
 
-    public void setDomainPath(String domainPath) {
-        this.domainPath = domainPath;
+    public String getIp6Dns1() {
+        return ip6Dns1;
     }
 
-	public String getIp6Dns1() {
-		return ip6Dns1;
-	}
-
-	public void setIp6Dns1(String ip6Dns1) {
-		this.ip6Dns1 = ip6Dns1;
-	}
-
-	public String getIp6Dns2() {
-		return ip6Dns2;
-	}
-
-	public void setIp6Dns2(String ip6Dns2) {
-		this.ip6Dns2 = ip6Dns2;
-	}
-
+    public String getIp6Dns2() {
+        return ip6Dns2;
+    }
 
     public String getAffinityGroupUuid() {
         return affinityGroupUuid;
@@ -319,8 +221,4 @@ public class DataCenterJoinVO extends BaseViewVO implements InternalIdentity, Id
     public long getAccountId() {
         return accountId;
     }
-
-    public void setAccountId(long accountId) {
-        this.accountId = accountId;
-    }
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e514da2c/server/src/com/cloud/api/query/vo/DiskOfferingJoinVO.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/vo/DiskOfferingJoinVO.java b/server/src/com/cloud/api/query/vo/DiskOfferingJoinVO.java
index 58e8370..9a679de 100644
--- a/server/src/com/cloud/api/query/vo/DiskOfferingJoinVO.java
+++ b/server/src/com/cloud/api/query/vo/DiskOfferingJoinVO.java
@@ -23,12 +23,12 @@ import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Table;
 
-import com.cloud.storage.DiskOfferingVO.Type;
-import com.cloud.utils.db.GenericDao;
-
 import org.apache.cloudstack.api.Identity;
 import org.apache.cloudstack.api.InternalIdentity;
 
+import com.cloud.storage.DiskOfferingVO.Type;
+import com.cloud.utils.db.GenericDao;
+
 @Entity
 @Table(name="disk_offering_view")
 public class DiskOfferingJoinVO extends BaseViewVO implements InternalIdentity, Identity {
@@ -109,7 +109,6 @@ public class DiskOfferingJoinVO extends BaseViewVO implements InternalIdentity,
     @Column(name="display_offering")
     boolean displayOffering;
 
-
     public DiskOfferingJoinVO() {
     }
 
@@ -119,201 +118,99 @@ public class DiskOfferingJoinVO extends BaseViewVO implements InternalIdentity,
     }
 
     @Override
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    @Override
     public String getUuid() {
         return uuid;
     }
 
-    public void setUuid(String uuid) {
-        this.uuid = uuid;
-    }
-
     public String getName() {
         return name;
     }
 
-    public void setName(String name) {
-        this.name = name;
-    }
-
     public String getDisplayText() {
         return displayText;
     }
 
-    public void setDisplayText(String displayText) {
-        this.displayText = displayText;
-    }
-
     public long getDiskSize() {
         return diskSize;
     }
 
-    public void setDiskSize(long diskSize) {
-        this.diskSize = diskSize;
-    }
-
     public String getTags() {
         return tags;
     }
 
-    public void setTags(String tags) {
-        this.tags = tags;
-    }
-
     public boolean isUseLocalStorage() {
         return useLocalStorage;
     }
 
-    public void setUseLocalStorage(boolean useLocalStorage) {
-        this.useLocalStorage = useLocalStorage;
-    }
-
     public boolean isSystemUse() {
         return systemUse;
     }
 
-    public void setSystemUse(boolean systemUse) {
-        this.systemUse = systemUse;
-    }
-
     public boolean isCustomized() {
         return customized;
     }
 
-    public void setCustomized(boolean customized) {
-        this.customized = customized;
-    }
-
     public Boolean isCustomizedIops() {
         return customizedIops;
     }
 
-    public void setCustomizedIops(Boolean customizedIops) {
-        this.customizedIops = customizedIops;
-    }
-
     public Long getMinIops() {
         return minIops;
     }
 
-    public void setMinIops(Long minIops) {
-        this.minIops = minIops;
-    }
-
     public Long getMaxIops() {
         return maxIops;
     }
 
-    public void setMaxIops(Long maxIops) {
-        this.maxIops = maxIops;
-    }
-
     public boolean isDisplayOffering() {
         return displayOffering;
     }
 
-    public void setDisplayOffering(boolean displayOffering) {
-        this.displayOffering = displayOffering;
-    }
-
     public Date getCreated() {
         return created;
     }
 
-    public void setCreated(Date created) {
-        this.created = created;
-    }
-
     public Date getRemoved() {
         return removed;
     }
 
-    public void setRemoved(Date removed) {
-        this.removed = removed;
-    }
-
     public long getDomainId() {
         return domainId;
     }
 
-    public void setDomainId(long domainId) {
-        this.domainId = domainId;
-    }
-
     public String getDomainUuid() {
         return domainUuid;
     }
 
-    public void setDomainUuid(String domainUuid) {
-        this.domainUuid = domainUuid;
-    }
-
     public String getDomainName() {
         return domainName;
     }
 
-    public void setDomainName(String domainName) {
-        this.domainName = domainName;
-    }
-
     public String getDomainPath() {
         return domainPath;
     }
 
-    public void setDomainPath(String domainPath) {
-        this.domainPath = domainPath;
-    }
-
     public int getSortKey() {
         return sortKey;
     }
 
-    public void setSortKey(int sortKey) {
-        this.sortKey = sortKey;
-    }
-
     public Type getType() {
         return type;
     }
 
-    public void setType(Type type) {
-        this.type = type;
-    }
-
-    public void setBytesReadRate(Long bytesReadRate) {
-        this.bytesReadRate = bytesReadRate;
-    }
-
     public Long getBytesReadRate() {
         return bytesReadRate;
     }
 
-    public void setBytesWriteRate(Long bytesWriteRate) {
-        this.bytesWriteRate = bytesWriteRate;
-    }
-
     public Long getBytesWriteRate() {
         return bytesWriteRate;
     }
 
-    public void setIopsReadRate(Long iopsReadRate) {
-        this.iopsReadRate = iopsReadRate;
-    }
-
     public Long getIopsReadRate() {
         return iopsReadRate;
     }
 
-    public void setIopsWriteRate(Long iopsWriteRate) {
-        this.iopsWriteRate = iopsWriteRate;
-    }
-
     public Long getIopsWriteRate() {
         return iopsWriteRate;
     }
-
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e514da2c/server/src/com/cloud/api/query/vo/DomainRouterJoinVO.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/vo/DomainRouterJoinVO.java b/server/src/com/cloud/api/query/vo/DomainRouterJoinVO.java
index bfe4486..33865e2 100644
--- a/server/src/com/cloud/api/query/vo/DomainRouterJoinVO.java
+++ b/server/src/com/cloud/api/query/vo/DomainRouterJoinVO.java
@@ -44,7 +44,6 @@ public class DomainRouterJoinVO extends BaseViewVO implements ControlledViewEnti
     @Column(name="name", updatable=false, nullable=false, length=255)
     private String name = null;
 
-
     @Column(name="account_id")
     private long accountId;
 
@@ -138,7 +137,6 @@ public class DomainRouterJoinVO extends BaseViewVO implements ControlledViewEnti
     @Column(name="service_offering_name")
     private String serviceOfferingName;
 
-
     @Column(name = "vpc_id")
     private long vpcId;
 
@@ -197,7 +195,6 @@ public class DomainRouterJoinVO extends BaseViewVO implements ControlledViewEnti
     @Enumerated(value=EnumType.STRING)
     private TrafficType trafficType;
 
-
     @Column(name="project_id")
     private long projectId;
 
@@ -216,7 +213,6 @@ public class DomainRouterJoinVO extends BaseViewVO implements ControlledViewEnti
     @Column(name="job_status")
     private int jobStatus;
 
-
     @Column(name="uuid")
     private String uuid;
 
@@ -236,772 +232,275 @@ public class DomainRouterJoinVO extends BaseViewVO implements ControlledViewEnti
     @Column(name="guest_type")
     @Enumerated(value=EnumType.STRING)
     private GuestType guestType;
-    
+
     @Column(name="role")
     @Enumerated(value=EnumType.STRING)
     private VirtualRouter.Role role;
 
-
     public DomainRouterJoinVO() {
     }
 
-
     @Override
     public long getId() {
         return id;
     }
 
-
-    @Override
-    public void setId(long id) {
-        this.id = id;
-
-    }
-
-
-
-
     @Override
     public String getUuid() {
         return uuid;
     }
 
-
-
-
-    public void setUuid(String uuid) {
-        this.uuid = uuid;
-    }
-
-
-
     public String getName() {
         return name;
     }
 
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-
-
-
     @Override
     public long getAccountId() {
         return accountId;
     }
 
-
-    public void setAccountId(long accountId) {
-        this.accountId = accountId;
-    }
-
-
     @Override
     public String getAccountUuid() {
         return accountUuid;
     }
 
-
-
-
-    public void setAccountUuid(String accountUuid) {
-        this.accountUuid = accountUuid;
-    }
-
-
-
-
     @Override
     public String getAccountName() {
         return accountName;
     }
 
-
-    public void setAccountName(String accountName) {
-        this.accountName = accountName;
-    }
-
-
     @Override
     public short getAccountType() {
         return accountType;
     }
 
-
-    public void setAccountType(short accountType) {
-        this.accountType = accountType;
-    }
-
-
     @Override
     public long getDomainId() {
         return domainId;
     }
 
-
-    public void setDomainId(long domainId) {
-        this.domainId = domainId;
-    }
-
     @Override
     public String getDomainUuid() {
         return domainUuid;
     }
 
-
-
-
-    public void setDomainUuid(String domainUuid) {
-        this.domainUuid = domainUuid;
-    }
-
-
-
-
     @Override
     public String getDomainName() {
         return domainName;
     }
 
-
-    public void setDomainName(String domainName) {
-        this.domainName = domainName;
-    }
-
     @Override
     public String getDomainPath() {
         return domainPath;
     }
 
-
-    public void setDomainPath(String domainPath) {
-        this.domainPath = domainPath;
-    }
-
-
     public State getState() {
         return state;
     }
 
-
-    public void setState(State state) {
-        this.state = state;
-    }
-
-
     public Date getCreated() {
         return created;
     }
 
-
-    public void setCreated(Date created) {
-        this.created = created;
-    }
-
-
     public Date getRemoved() {
         return removed;
     }
 
-
-    public void setRemoved(Date removed) {
-        this.removed = removed;
-    }
-
-
     public String getInstanceName() {
         return instanceName;
     }
 
-
-    public void setInstanceName(String instanceName) {
-        this.instanceName = instanceName;
-    }
-
-
     public String getPodUuid() {
         return podUuid;
     }
 
-
-
-
-    public void setPodUuid(String podUuid) {
-        this.podUuid = podUuid;
-    }
-
-
     public String getDataCenterUuid() {
         return dataCenterUuid;
     }
 
-    public void setDataCenterUuid(String zoneUuid) {
-        this.dataCenterUuid = zoneUuid;
-    }
-
     public String getDataCenterName() {
         return dataCenterName;
     }
 
-
-    public void setDataCenterName(String zoneName) {
-        this.dataCenterName = zoneName;
-    }
-
-
     public Long getHostId() {
         return hostId;
     }
 
-
-    public void setHostId(long hostId) {
-        this.hostId = hostId;
-    }
-
-
     public String getHostUuid() {
         return hostUuid;
     }
 
-
-
-
-    public void setHostUuid(String hostUuid) {
-        this.hostUuid = hostUuid;
-    }
-
-
-
-
     public String getHostName() {
         return hostName;
     }
 
-
-    public void setHostName(String hostName) {
-        this.hostName = hostName;
-    }
-
-
     public long getTemplateId() {
         return templateId;
     }
 
-
-    public void setTemplateId(long templateId) {
-        this.templateId = templateId;
-    }
-
-
-
     public String getTemplateUuid() {
         return templateUuid;
     }
 
-
-
-
-    public void setTemplateUuid(String templateUuid) {
-        this.templateUuid = templateUuid;
-    }
-
-
-
-
-
     public String getServiceOfferingUuid() {
         return serviceOfferingUuid;
     }
 
-
-    public void setServiceOfferingUuid(String serviceOfferingUuid) {
-        this.serviceOfferingUuid = serviceOfferingUuid;
-    }
-
-
-
-
     public String getServiceOfferingName() {
         return serviceOfferingName;
     }
 
-
-    public void setServiceOfferingName(String serviceOfferingName) {
-        this.serviceOfferingName = serviceOfferingName;
-    }
-
     public long getVpcId() {
         return vpcId;
     }
 
-    public void setVpcId(long vpcId) {
-        this.vpcId = vpcId;
-    }
-
-
-
-
     public long getNicId() {
         return nicId;
     }
 
-
-    public void setNicId(long nicId) {
-        this.nicId = nicId;
-    }
-
-
     public boolean isDefaultNic() {
         return isDefaultNic;
     }
 
-
-    public void setDefaultNic(boolean isDefaultNic) {
-        this.isDefaultNic = isDefaultNic;
-    }
-
-
     public String getIpAddress() {
         return ipAddress;
     }
 
-
-    public void setIpAddress(String ipAddress) {
-        this.ipAddress = ipAddress;
-    }
-
-
     public String getGateway() {
         return gateway;
     }
 
-
-    public void setGateway(String gateway) {
-        this.gateway = gateway;
-    }
-
-
     public String getNetmask() {
         return netmask;
     }
 
-
-    public void setNetmask(String netmask) {
-        this.netmask = netmask;
-    }
-
-
     public String getMacAddress() {
         return macAddress;
     }
 
-
-    public void setMacAddress(String macAddress) {
-        this.macAddress = macAddress;
-    }
-
-
     public URI getBroadcastUri() {
         return broadcastUri;
     }
 
-
-    public void setBroadcastUri(URI broadcastUri) {
-        this.broadcastUri = broadcastUri;
-    }
-
-
     public URI getIsolationUri() {
         return isolationUri;
     }
 
-
-    public void setIsolationUri(URI isolationUri) {
-        this.isolationUri = isolationUri;
-    }
-
-
     public long getNetworkId() {
         return networkId;
     }
 
-
-    public void setNetworkId(long networkId) {
-        this.networkId = networkId;
-    }
-
-
     public String getNetworkName() {
         return networkName;
     }
 
-
-
-
-    public void setNetworkName(String networkName) {
-        this.networkName = networkName;
-    }
-
-
-
-
     public String getNetworkDomain() {
         return networkDomain;
     }
 
-
-
-
-    public void setNetworkDomain(String networkDomain) {
-        this.networkDomain = networkDomain;
-    }
-
-
-
-
     public TrafficType getTrafficType() {
         return trafficType;
     }
 
-
-    public void setTrafficType(TrafficType trafficType) {
-        this.trafficType = trafficType;
-    }
-
-
-
     public long getServiceOfferingId() {
         return serviceOfferingId;
     }
 
-
-
-
-    public void setServiceOfferingId(long serviceOfferingId) {
-        this.serviceOfferingId = serviceOfferingId;
-    }
-
-
-
-
     public long getProjectId() {
         return projectId;
     }
 
-
-
-
-    public void setProjectId(long projectId) {
-        this.projectId = projectId;
-    }
-
-
-
-
     @Override
     public String getProjectUuid() {
         return projectUuid;
     }
 
-
-
-
-    public void setProjectUuid(String projectUuid) {
-        this.projectUuid = projectUuid;
-    }
-
-
-
-
     @Override
     public String getProjectName() {
         return projectName;
     }
 
-
-
-
-    public void setProjectName(String projectName) {
-        this.projectName = projectName;
-    }
-
-
-
-
-
-
     public String getVpcUuid() {
         return vpcUuid;
     }
 
-
-
-
-    public void setVpcUuid(String vpcUuid) {
-        this.vpcUuid = vpcUuid;
-    }
-
-
-
-
     public String getNicUuid() {
         return nicUuid;
     }
 
-
-
-
-    public void setNicUuid(String nicUuid) {
-        this.nicUuid = nicUuid;
-    }
-
-
-
-
     public String getNetworkUuid() {
         return networkUuid;
     }
 
-
-
-
-    public void setNetworkUuid(String networkUuid) {
-        this.networkUuid = networkUuid;
-    }
-
-
     public Long getJobId() {
         return jobId;
     }
 
-
-
-
-    public void setJobId(Long jobId) {
-        this.jobId = jobId;
-    }
-
-
-
-
     public String getJobUuid() {
         return jobUuid;
     }
 
-
-
-
-    public void setJobUuid(String jobUuid) {
-        this.jobUuid = jobUuid;
-    }
-
-
-
-
     public int getJobStatus() {
         return jobStatus;
     }
 
-
-
-
-    public void setJobStatus(int jobStatus) {
-        this.jobStatus = jobStatus;
-    }
-
-
-
     public Long getPodId() {
         return podId;
     }
 
-
-
-
-    public void setPodId(Long podId) {
-        this.podId = podId;
-    }
-
-
-
-
     public long getDataCenterId() {
         return dataCenterId;
     }
 
-
-
-
-    public void setDataCenterId(long zoneId) {
-        this.dataCenterId = zoneId;
-    }
-
-
-
-
     public String getDns1() {
         return dns1;
     }
 
-
-
-
-    public void setDns1(String dns1) {
-        this.dns1 = dns1;
-    }
-
-
-
-
     public String getDns2() {
         return dns2;
     }
 
-
-
-
-    public void setDns2(String dns2) {
-        this.dns2 = dns2;
-    }
-
-
-
-
     public String getTemplateVersion() {
         return templateVersion;
     }
 
-
-
-
-    public void setTemplateVersion(String templateVersion) {
-        this.templateVersion = templateVersion;
-    }
-
-
-
-
     public String getScriptsVersion() {
         return scriptsVersion;
     }
 
-
-
-
-    public void setScriptsVersion(String scriptsVersion) {
-        this.scriptsVersion = scriptsVersion;
-    }
-
-
-
-
     public RedundantState getRedundantState() {
         return redundantState;
     }
 
-
-
-
-    public void setRedundantState(RedundantState redundantState) {
-        this.redundantState = redundantState;
-    }
-
-
-
-
     public boolean isRedundantRouter() {
         return isRedundantRouter;
     }
 
-
-
-
-    public void setRedundantRouter(boolean isRedundantRouter) {
-        this.isRedundantRouter = isRedundantRouter;
-    }
-
-
-
-
     public GuestType getGuestType() {
         return guestType;
     }
 
-
-
-
-    public void setGuestType(GuestType guestType) {
-        this.guestType = guestType;
+    public String getIp6Address() {
+        return ip6Address;
     }
 
+    public String getIp6Gateway() {
+        return ip6Gateway;
+    }
 
+    public String getIp6Cidr() {
+        return ip6Cidr;
+    }
 
+    public String getIp6Dns1() {
+        return ip6Dns1;
+    }
 
-	public String getIp6Address() {
-		return ip6Address;
-	}
-
-
-
-
-	public void setIp6Address(String ip6Address) {
-		this.ip6Address = ip6Address;
-	}
-
-
-
-
-	public String getIp6Gateway() {
-		return ip6Gateway;
-	}
-
-
-
-
-	public void setIp6Gateway(String ip6Gateway) {
-		this.ip6Gateway = ip6Gateway;
-	}
-
-
-
-
-	public String getIp6Cidr() {
-		return ip6Cidr;
-	}
-
-
-
-
-	public void setIp6Cidr(String ip6Cidr) {
-		this.ip6Cidr = ip6Cidr;
-	}
-
-
-	public String getIp6Dns1() {
-		return ip6Dns1;
-	}
-
-	public void setIp6Dns1(String ip6Dns1) {
-		this.ip6Dns1 = ip6Dns1;
-	}
-
-	public String getIp6Dns2() {
-		return ip6Dns2;
-	}
-
-	public void setIp6Dns2(String ip6Dns2) {
-		this.ip6Dns2 = ip6Dns2;
-	}
-
+    public String getIp6Dns2() {
+        return ip6Dns2;
+    }
 
     public VirtualRouter.Role getRole() {
         return role;
     }
-
-
-    public void setRole(VirtualRouter.Role role) {
-        this.role = role;
-    }
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e514da2c/server/src/com/cloud/api/query/vo/EventJoinVO.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/vo/EventJoinVO.java b/server/src/com/cloud/api/query/vo/EventJoinVO.java
index 12d7e5a..87d20b9 100644
--- a/server/src/com/cloud/api/query/vo/EventJoinVO.java
+++ b/server/src/com/cloud/api/query/vo/EventJoinVO.java
@@ -25,8 +25,8 @@ import javax.persistence.Enumerated;
 import javax.persistence.Id;
 import javax.persistence.Table;
 
-import com.cloud.utils.db.GenericDao;
 import com.cloud.event.Event.State;
+import com.cloud.utils.db.GenericDao;
 
 @Entity
 @Table(name="event_view")
@@ -70,7 +70,6 @@ public class EventJoinVO extends BaseViewVO implements ControlledViewEntity {
     @Column(name="parameters", length=1024)
     private String parameters;
 
-
     @Column(name="account_id")
     private long accountId;
 
@@ -107,7 +106,6 @@ public class EventJoinVO extends BaseViewVO implements ControlledViewEntity {
     @Column(name="archived")
     private boolean archived;
 
-
     public EventJoinVO() {
     }
 
@@ -117,210 +115,105 @@ public class EventJoinVO extends BaseViewVO implements ControlledViewEntity {
     }
 
     @Override
-    public void setId(long id) {
-        this.id = id;
-
-    }
-
-    @Override
     public String getUuid() {
         return uuid;
     }
 
-    public void setUuid(String uuid) {
-        this.uuid = uuid;
-    }
-
-
     @Override
     public long getAccountId() {
         return accountId;
     }
 
-    public void setAccountId(long accountId) {
-        this.accountId = accountId;
-    }
-
     @Override
     public String getAccountUuid() {
         return accountUuid;
     }
 
-    public void setAccountUuid(String accountUuid) {
-        this.accountUuid = accountUuid;
-    }
-
     @Override
     public String getAccountName() {
         return accountName;
     }
 
-    public void setAccountName(String accountName) {
-        this.accountName = accountName;
-    }
-
     @Override
     public short getAccountType() {
         return accountType;
     }
 
-    public void setAccountType(short accountType) {
-        this.accountType = accountType;
-    }
-
     @Override
     public long getDomainId() {
         return domainId;
     }
 
-    public void setDomainId(long domainId) {
-        this.domainId = domainId;
-    }
-
     @Override
     public String getDomainUuid() {
         return domainUuid;
     }
 
-    public void setDomainUuid(String domainUuid) {
-        this.domainUuid = domainUuid;
-    }
-
     @Override
     public String getDomainName() {
         return domainName;
     }
 
-    public void setDomainName(String domainName) {
-        this.domainName = domainName;
-    }
-
     @Override
     public String getDomainPath() {
         return domainPath;
     }
 
-    public void setDomainPath(String domainPath) {
-        this.domainPath = domainPath;
-    }
-
     public long getProjectId() {
         return projectId;
     }
 
-    public void setProjectId(long projectId) {
-        this.projectId = projectId;
-    }
-
     @Override
     public String getProjectUuid() {
         return projectUuid;
     }
 
-    public void setProjectUuid(String projectUuid) {
-        this.projectUuid = projectUuid;
-    }
-
     @Override
     public String getProjectName() {
         return projectName;
     }
 
-    public void setProjectName(String projectName) {
-        this.projectName = projectName;
-    }
-
-
-
-
-
     public String getType() {
         return type;
     }
 
-    public void setType(String type) {
-        this.type = type;
-    }
-
     public State getState() {
         return state;
     }
 
-    public void setState(State state) {
-        this.state = state;
-    }
-
     public String getDescription() {
         return description;
     }
 
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
     public Date getCreateDate() {
         return createDate;
     }
 
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-
     public long getUserId() {
         return userId;
     }
 
-    public void setUserId(long userId) {
-        this.userId = userId;
-    }
-
     public String getUserName() {
         return userName;
     }
 
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
     public String getLevel() {
         return level;
     }
 
-    public void setLevel(String level) {
-        this.level = level;
-    }
-
     public long getStartId() {
         return startId;
     }
 
-    public void setStartId(long startId) {
-        this.startId = startId;
-    }
-
-
     public String getStartUuid() {
         return startUuid;
     }
 
-    public void setStartUuid(String startUuid) {
-        this.startUuid = startUuid;
-    }
-
     public String getParameters() {
         return parameters;
     }
 
-    public void setParameters(String parameters) {
-        this.parameters = parameters;
-    }
-
     public boolean getArchived() {
         return archived;
     }
-
-    public void setArchived(Boolean archived) {
-        this.archived = archived;
-    }
-
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e514da2c/server/src/com/cloud/api/query/vo/HostJoinVO.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/vo/HostJoinVO.java b/server/src/com/cloud/api/query/vo/HostJoinVO.java
index cf3cfdc..fbc59cd 100644
--- a/server/src/com/cloud/api/query/vo/HostJoinVO.java
+++ b/server/src/com/cloud/api/query/vo/HostJoinVO.java
@@ -27,16 +27,16 @@ import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 
-import com.cloud.host.Status;
+import org.apache.cloudstack.api.Identity;
+import org.apache.cloudstack.api.InternalIdentity;
+
 import com.cloud.host.Host.Type;
+import com.cloud.host.Status;
 import com.cloud.hypervisor.Hypervisor.HypervisorType;
 import com.cloud.org.Cluster;
 import com.cloud.resource.ResourceState;
 import com.cloud.utils.db.GenericDao;
 
-import org.apache.cloudstack.api.Identity;
-import org.apache.cloudstack.api.InternalIdentity;
-
 /**
  * Host DB view.
  *
@@ -55,7 +55,6 @@ public class HostJoinVO extends BaseViewVO implements InternalIdentity, Identity
     @Column(name="name")
     private String name;
 
-
     @Column(name="status")
     private Status status = null;
 
@@ -139,7 +138,6 @@ public class HostJoinVO extends BaseViewVO implements InternalIdentity, Identity
     @Column(name="pod_name")
     private String podName;
 
-
     @Column(name="guest_os_category_id")
     private long osCategoryId;
 
@@ -173,336 +171,165 @@ public class HostJoinVO extends BaseViewVO implements InternalIdentity, Identity
     @Column(name="job_status")
     private int jobStatus;
 
-
-    /* (non-Javadoc)
-     * @see com.cloud.api.query.vo.BaseViewVO#getId()
-     */
     @Override
     public long getId() {
         return this.id;
     }
 
-    /* (non-Javadoc)
-     * @see com.cloud.api.query.vo.BaseViewVO#setId(long)
-     */
-    @Override
-    public void setId(long id) {
-        this.id = id;
-    }
-
-
     @Override
     public String getUuid() {
         return uuid;
     }
 
-    public void setUuid(String uuid) {
-        this.uuid = uuid;
-    }
-
     public String getVersion() {
         return version;
     }
 
-    public void setVersion(String version) {
-        this.version = version;
-    }
-
     public long getZoneId() {
         return zoneId;
     }
 
-    public void setZoneId(long zoneId) {
-        this.zoneId = zoneId;
-    }
-
     public String getZoneUuid() {
         return zoneUuid;
     }
 
-    public void setZoneUuid(String zoneUuid) {
-        this.zoneUuid = zoneUuid;
-    }
-
     public String getZoneName() {
         return zoneName;
     }
 
-    public void setZoneName(String zoneName) {
-        this.zoneName = zoneName;
-    }
-
     public String getName() {
         return name;
     }
 
-    public void setName(String name) {
-        this.name = name;
-    }
-
     public Status getStatus() {
         return status;
     }
 
-    public void setStatus(Status status) {
-        this.status = status;
-    }
-
     public Type getType() {
         return type;
     }
 
-    public void setType(Type type) {
-        this.type = type;
-    }
-
     public String getPrivateIpAddress() {
         return privateIpAddress;
     }
 
-    public void setPrivateIpAddress(String privateIpAddress) {
-        this.privateIpAddress = privateIpAddress;
-    }
-
     public Date getDisconnectedOn() {
         return disconnectedOn;
     }
 
-    public void setDisconnectedOn(Date disconnectedOn) {
-        this.disconnectedOn = disconnectedOn;
-    }
-
     public HypervisorType getHypervisorType() {
         return hypervisorType;
     }
 
-    public void setHypervisorType(HypervisorType hypervisorType) {
-        this.hypervisorType = hypervisorType;
-    }
-
     public String getHypervisorVersion() {
         return hypervisorVersion;
     }
 
-    public void setHypervisorVersion(String hypervisorVersion) {
-        this.hypervisorVersion = hypervisorVersion;
-    }
-
     public String getCapabilities() {
         return caps;
     }
 
-    public void setCapabilities(String caps) {
-        this.caps = caps;
-    }
-
     public long getLastPinged() {
         return lastPinged;
     }
 
-    public void setLastPinged(long lastPinged) {
-        this.lastPinged = lastPinged;
-    }
-
     public Date getCreated() {
         return created;
     }
 
-    public void setCreated(Date created) {
-        this.created = created;
-    }
-
     public Date getRemoved() {
         return removed;
     }
 
-    public void setRemoved(Date removed) {
-        this.removed = removed;
-    }
-
     public ResourceState getResourceState() {
         return resourceState;
     }
 
-    public void setResourceState(ResourceState resourceState) {
-        this.resourceState = resourceState;
-    }
-
     public Long getManagementServerId() {
         return managementServerId;
     }
 
-    public void setManagementServerId(Long managementServerId) {
-        this.managementServerId = managementServerId;
-    }
-
     public Integer getCpus() {
         return cpus;
     }
 
-    public void setCpus(Integer cpus) {
-        this.cpus = cpus;
-    }
-
     public Long getSpeed() {
         return speed;
     }
 
-    public void setSpeed(Long speed) {
-        this.speed = speed;
-    }
-
     public long getTotalMemory() {
         return totalMemory;
     }
 
-    public void setTotalMemory(long totalMemory) {
-        this.totalMemory = totalMemory;
-    }
-
     public long getClusterId() {
         return clusterId;
     }
 
-    public void setClusterId(long clusterId) {
-        this.clusterId = clusterId;
-    }
-
     public String getClusterUuid() {
         return clusterUuid;
     }
 
-    public void setClusterUuid(String clusterUuid) {
-        this.clusterUuid = clusterUuid;
-    }
-
     public String getClusterName() {
         return clusterName;
     }
 
-    public void setClusterName(String clusterName) {
-        this.clusterName = clusterName;
-    }
-
     public Cluster.ClusterType getClusterType() {
         return clusterType;
     }
 
-    public void setClusterType(Cluster.ClusterType clusterType) {
-        this.clusterType = clusterType;
-    }
-
     public long getOsCategoryId() {
         return osCategoryId;
     }
 
-    public void setOsCategoryId(long osCategoryId) {
-        this.osCategoryId = osCategoryId;
-    }
-
     public String getOsCategoryUuid() {
         return osCategoryUuid;
     }
 
-    public void setOsCategoryUuid(String osCategoryUuid) {
-        this.osCategoryUuid = osCategoryUuid;
-    }
-
     public String getOsCategoryName() {
         return osCategoryName;
     }
 
-    public void setOsCategoryName(String osCategoryName) {
-        this.osCategoryName = osCategoryName;
-    }
-
     public Long getJobId() {
         return jobId;
     }
 
-    public void setJobId(Long jobId) {
-        this.jobId = jobId;
-    }
-
     public String getJobUuid() {
         return jobUuid;
     }
 
-    public void setJobUuid(String jobUuid) {
-        this.jobUuid = jobUuid;
-    }
-
     public int getJobStatus() {
         return jobStatus;
     }
 
-    public void setJobStatus(int jobStatus) {
-        this.jobStatus = jobStatus;
-    }
-
     public long getPodId() {
         return podId;
     }
 
-    public void setPodId(long podId) {
-        this.podId = podId;
-    }
-
     public String getPodUuid() {
         return podUuid;
     }
 
-    public void setPodUuid(String podUuid) {
-        this.podUuid = podUuid;
-    }
-
     public String getPodName() {
         return podName;
     }
 
-    public void setPodName(String podName) {
-        this.podName = podName;
-    }
-
     public long getMemUsedCapacity() {
         return memUsedCapacity;
     }
 
-    public void setMemUsedCapacity(long memUsedCapacity) {
-        this.memUsedCapacity = memUsedCapacity;
-    }
-
     public long getMemReservedCapacity() {
         return memReservedCapacity;
     }
 
-    public void setMemReservedCapacity(long memReservedCapacity) {
-        this.memReservedCapacity = memReservedCapacity;
-    }
-
     public long getCpuUsedCapacity() {
         return cpuUsedCapacity;
     }
 
-    public void setCpuUsedCapacity(long cpuUsedCapacity) {
-        this.cpuUsedCapacity = cpuUsedCapacity;
-    }
-
     public long getCpuReservedCapacity() {
         return cpuReservedCapacity;
     }
 
-    public void setCpuReservedCapacity(long cpuReservedCapacity) {
-        this.cpuReservedCapacity = cpuReservedCapacity;
-    }
-
     public String getTag() {
         return tag;
     }
-
-    public void setTag(String tag) {
-        this.tag = tag;
-    }
-
-
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e514da2c/server/src/com/cloud/api/query/vo/ImageStoreJoinVO.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/vo/ImageStoreJoinVO.java b/server/src/com/cloud/api/query/vo/ImageStoreJoinVO.java
index ac161af..5003ea7 100644
--- a/server/src/com/cloud/api/query/vo/ImageStoreJoinVO.java
+++ b/server/src/com/cloud/api/query/vo/ImageStoreJoinVO.java
@@ -25,14 +25,13 @@ import javax.persistence.Enumerated;
 import javax.persistence.Id;
 import javax.persistence.Table;
 
+import org.apache.cloudstack.api.Identity;
+import org.apache.cloudstack.api.InternalIdentity;
+
 import com.cloud.storage.DataStoreRole;
-import com.cloud.storage.ImageStore;
 import com.cloud.storage.ScopeType;
 import com.cloud.utils.db.GenericDao;
 
-import org.apache.cloudstack.api.Identity;
-import org.apache.cloudstack.api.InternalIdentity;
-
 /**
  * Image Data Store DB view.
  *
@@ -92,116 +91,55 @@ public class ImageStoreJoinVO extends BaseViewVO implements InternalIdentity, Id
     }
 
     @Override
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    @Override
     public String getUuid() {
         return uuid;
     }
 
-    public void setUuid(String uuid) {
-        this.uuid = uuid;
-    }
-
     public String getName() {
         return name;
     }
 
-
-
     public long getZoneId() {
         return zoneId;
     }
 
-    public void setZoneId(long zoneId) {
-        this.zoneId = zoneId;
-    }
-
     public String getZoneUuid() {
         return zoneUuid;
     }
 
-    public void setZoneUuid(String zoneUuid) {
-        this.zoneUuid = zoneUuid;
-    }
-
     public String getZoneName() {
         return zoneName;
     }
 
-    public void setZoneName(String zoneName) {
-        this.zoneName = zoneName;
-    }
-
     public String getUrl() {
         return url;
     }
 
-    public void setUrl(String url) {
-        this.url = url;
-    }
-
     public String getProtocol() {
         return protocol;
     }
 
-    public void setProtocol(String protocol) {
-        this.protocol = protocol;
-    }
-
     public String getProviderName() {
         return providerName;
     }
 
-    public void setProviderName(String providerName) {
-        this.providerName = providerName;
-    }
-
     public ScopeType getScope() {
         return scope;
     }
 
-    public void setScope(ScopeType scope) {
-        this.scope = scope;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
     public String getDetailName() {
         return detailName;
     }
 
-    public void setDetailName(String detailName) {
-        this.detailName = detailName;
-    }
-
     public String getDetailValue() {
         return detailValue;
     }
 
-    public void setDetailValue(String detailValue) {
-        this.detailValue = detailValue;
-    }
-
     public DataStoreRole getRole() {
         return role;
     }
 
-    public void setRole(DataStoreRole role) {
-        this.role = role;
-    }
-
     public Date getRemoved() {
         return removed;
     }
-
-    public void setRemoved(Date removed) {
-        this.removed = removed;
-    }
-
-
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e514da2c/server/src/com/cloud/api/query/vo/InstanceGroupJoinVO.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/vo/InstanceGroupJoinVO.java b/server/src/com/cloud/api/query/vo/InstanceGroupJoinVO.java
index 3fb4309..f4ce8d6 100644
--- a/server/src/com/cloud/api/query/vo/InstanceGroupJoinVO.java
+++ b/server/src/com/cloud/api/query/vo/InstanceGroupJoinVO.java
@@ -39,14 +39,12 @@ public class InstanceGroupJoinVO extends BaseViewVO implements ControlledViewEnt
     @Column(name="name")
     String name;
 
-
     @Column(name=GenericDao.REMOVED_COLUMN)
     private Date removed;
 
     @Column(name=GenericDao.CREATED_COLUMN)
     private Date created;
 
-
     @Column(name="account_id")
     private long accountId;
 
@@ -80,8 +78,6 @@ public class InstanceGroupJoinVO extends BaseViewVO implements ControlledViewEnt
     @Column(name="project_name")
     private String projectName;
 
-
-
     public InstanceGroupJoinVO() {
     }
 
@@ -90,144 +86,74 @@ public class InstanceGroupJoinVO extends BaseViewVO implements ControlledViewEnt
         return id;
     }
 
-
-    @Override
-    public void setId(long id) {
-        this.id = id;
-
-    }
-
     @Override
     public String getUuid() {
         return uuid;
     }
 
-    public void setUuid(String uuid) {
-        this.uuid = uuid;
-    }
-
-
     @Override
     public long getAccountId() {
         return accountId;
     }
 
-    public void setAccountId(long accountId) {
-        this.accountId = accountId;
-    }
-
     @Override
     public String getAccountUuid() {
         return accountUuid;
     }
 
-    public void setAccountUuid(String accountUuid) {
-        this.accountUuid = accountUuid;
-    }
-
     @Override
     public String getAccountName() {
         return accountName;
     }
 
-    public void setAccountName(String accountName) {
-        this.accountName = accountName;
-    }
-
     @Override
     public short getAccountType() {
         return accountType;
     }
 
-    public void setAccountType(short accountType) {
-        this.accountType = accountType;
-    }
-
     @Override
     public long getDomainId() {
         return domainId;
     }
 
-    public void setDomainId(long domainId) {
-        this.domainId = domainId;
-    }
-
     @Override
     public String getDomainUuid() {
         return domainUuid;
     }
 
-    public void setDomainUuid(String domainUuid) {
-        this.domainUuid = domainUuid;
-    }
-
     @Override
     public String getDomainName() {
         return domainName;
     }
 
-    public void setDomainName(String domainName) {
-        this.domainName = domainName;
-    }
-
     @Override
     public String getDomainPath() {
         return domainPath;
     }
 
-    public void setDomainPath(String domainPath) {
-        this.domainPath = domainPath;
-    }
-
     public long getProjectId() {
         return projectId;
     }
 
-    public void setProjectId(long projectId) {
-        this.projectId = projectId;
-    }
-
     @Override
     public String getProjectUuid() {
         return projectUuid;
     }
 
-    public void setProjectUuid(String projectUuid) {
-        this.projectUuid = projectUuid;
-    }
-
     @Override
     public String getProjectName() {
         return projectName;
     }
 
-    public void setProjectName(String projectName) {
-        this.projectName = projectName;
-    }
-
     public String getName() {
         return name;
     }
 
-    public void setName(String name) {
-        this.name = name;
-    }
-
     public Date getRemoved() {
         return removed;
     }
 
-    public void setRemoved(Date removed) {
-        this.removed = removed;
-    }
-
     public Date getCreated() {
         return created;
     }
-
-    public void setCreated(Date created) {
-        this.created = created;
-    }
-
-
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e514da2c/server/src/com/cloud/api/query/vo/ProjectAccountJoinVO.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/vo/ProjectAccountJoinVO.java b/server/src/com/cloud/api/query/vo/ProjectAccountJoinVO.java
index 1a8818a..91ff561 100644
--- a/server/src/com/cloud/api/query/vo/ProjectAccountJoinVO.java
+++ b/server/src/com/cloud/api/query/vo/ProjectAccountJoinVO.java
@@ -23,9 +23,10 @@ import javax.persistence.Enumerated;
 import javax.persistence.Id;
 import javax.persistence.Table;
 
-import com.cloud.projects.ProjectAccount.Role;
 import org.apache.cloudstack.api.InternalIdentity;
 
+import com.cloud.projects.ProjectAccount.Role;
+
 @Entity
 @Table(name="project_account_view")
 public class ProjectAccountJoinVO extends BaseViewVO implements InternalIdentity {
@@ -71,7 +72,6 @@ public class ProjectAccountJoinVO extends BaseViewVO implements InternalIdentity
     @Column(name="project_name")
     private String projectName;
 
-
     public ProjectAccountJoinVO() {
     }
 
@@ -80,137 +80,51 @@ public class ProjectAccountJoinVO extends BaseViewVO implements InternalIdentity
         return id;
     }
 
-
-    @Override
-    public void setId(long id) {
-        this.id = id;
-
-    }
-
     public long getDomainId() {
         return domainId;
     }
 
-    public void setDomainId(long domainId) {
-        this.domainId = domainId;
-    }
-
     public String getDomainUuid() {
         return domainUuid;
     }
 
-    public void setDomainUuid(String domainUuid) {
-        this.domainUuid = domainUuid;
-    }
-
     public String getDomainName() {
         return domainName;
     }
 
-    public void setDomainName(String domainName) {
-        this.domainName = domainName;
-    }
-
     public String getDomainPath() {
         return domainPath;
     }
 
-    public void setDomainPath(String domainPath) {
-        this.domainPath = domainPath;
-    }
-
     public long getAccountId() {
         return accountId;
     }
 
-    public void setAccountId(long accountId) {
-        this.accountId = accountId;
-    }
-
-
-
     public String getAccountUuid() {
         return accountUuid;
     }
 
-
-
-    public void setAccountUuid(String accountUuid) {
-        this.accountUuid = accountUuid;
-    }
-
-
-
     public String getAccountName() {
         return accountName;
     }
 
-
-
-    public void setAccountName(String accountName) {
-        this.accountName = accountName;
-    }
-
-
-
     public short getAccountType() {
         return accountType;
     }
 
-
-
-    public void setAccountType(short accountType) {
-        this.accountType = accountType;
-    }
-
-
-
     public Role getAccountRole() {
         return accountRole;
     }
 
-
-
-    public void setAccountRole(Role accountRole) {
-        this.accountRole = accountRole;
-    }
-
-
-
     public long getProjectId() {
         return projectId;
     }
 
-
-
-    public void setProjectId(long projectId) {
-        this.projectId = projectId;
-    }
-
-
-
     public String getProjectUuid() {
         return projectUuid;
     }
 
-
-
-    public void setProjectUuid(String projectUuid) {
-        this.projectUuid = projectUuid;
-    }
-
-
-
     public String getProjectName() {
         return projectName;
     }
-
-
-
-    public void setProjectName(String projectName) {
-        this.projectName = projectName;
-    }
-
-
-
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e514da2c/server/src/com/cloud/api/query/vo/ProjectInvitationJoinVO.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/vo/ProjectInvitationJoinVO.java b/server/src/com/cloud/api/query/vo/ProjectInvitationJoinVO.java
index f6e6760..b598ba1 100644
--- a/server/src/com/cloud/api/query/vo/ProjectInvitationJoinVO.java
+++ b/server/src/com/cloud/api/query/vo/ProjectInvitationJoinVO.java
@@ -91,146 +91,74 @@ public class ProjectInvitationJoinVO extends BaseViewVO implements ControlledVie
         return id;
     }
 
-
-    @Override
-    public void setId(long id) {
-        this.id = id;
-
-    }
-
     @Override
     public String getUuid() {
         return uuid;
     }
 
-    public void setUuid(String uuid) {
-        this.uuid = uuid;
-    }
-
-
     @Override
     public long getDomainId() {
         return domainId;
     }
 
-    public void setDomainId(long domainId) {
-        this.domainId = domainId;
-    }
-
     @Override
     public String getDomainUuid() {
         return domainUuid;
     }
 
-    public void setDomainUuid(String domainUuid) {
-        this.domainUuid = domainUuid;
-    }
-
     @Override
     public String getDomainName() {
         return domainName;
     }
 
-    public void setDomainName(String domainName) {
-        this.domainName = domainName;
-    }
-
-
-
     public State getState() {
         return state;
     }
 
-    public void setState(State state) {
-        this.state = state;
-    }
-
     @Override
     public long getAccountId() {
         return accountId;
     }
 
-    public void setAccountId(long accountId) {
-        this.accountId = accountId;
-    }
-
     public String getEmail() {
         return email;
     }
 
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
     @Override
     public String getAccountName() {
         return accountName;
     }
 
-    public void setAccountName(String accountName) {
-        this.accountName = accountName;
-    }
-
     public long getProjectId() {
         return projectId;
     }
 
-    public void setProjectId(long projectId) {
-        this.projectId = projectId;
-    }
-
     @Override
     public String getProjectUuid() {
         return projectUuid;
     }
 
-    public void setProjectUuid(String projectUuid) {
-        this.projectUuid = projectUuid;
-    }
-
     @Override
     public String getProjectName() {
         return projectName;
     }
 
-    public void setProjectName(String projectName) {
-        this.projectName = projectName;
-    }
-
     public Date getCreated() {
         return created;
     }
 
-    public void setCreated(Date created) {
-        this.created = created;
-    }
-
     @Override
     public String getAccountUuid() {
         return accountUuid;
     }
 
-    public void setAccountUuid(String accountUuid) {
-        this.accountUuid = accountUuid;
-    }
-
     @Override
     public short getAccountType() {
         return accountType;
     }
 
-    public void setAccountType(short accountType) {
-        this.accountType = accountType;
-    }
-
     @Override
     public String getDomainPath() {
         return domainPath;
     }
-
-    public void setDomainPath(String domainPath) {
-        this.domainPath = domainPath;
-    }
-
-
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e514da2c/server/src/com/cloud/api/query/vo/ProjectJoinVO.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/vo/ProjectJoinVO.java b/server/src/com/cloud/api/query/vo/ProjectJoinVO.java
index 3885fa0..77b0131 100644
--- a/server/src/com/cloud/api/query/vo/ProjectJoinVO.java
+++ b/server/src/com/cloud/api/query/vo/ProjectJoinVO.java
@@ -25,13 +25,13 @@ import javax.persistence.Enumerated;
 import javax.persistence.Id;
 import javax.persistence.Table;
 
+import org.apache.cloudstack.api.Identity;
+import org.apache.cloudstack.api.InternalIdentity;
+
 import com.cloud.projects.Project.State;
 import com.cloud.server.ResourceTag.TaggedResourceType;
 import com.cloud.utils.db.GenericDao;
 
-import org.apache.cloudstack.api.Identity;
-import org.apache.cloudstack.api.InternalIdentity;
-
 @Entity
 @Table(name="project_view")
 public class ProjectJoinVO extends BaseViewVO implements InternalIdentity, Identity {
@@ -107,10 +107,9 @@ public class ProjectJoinVO extends BaseViewVO implements InternalIdentity, Ident
 
     @Column(name="tag_customer")
     private String tagCustomer;
-    
+
     @Column(name="project_account_id")
     private long projectAccountId;
-    
 
     public ProjectJoinVO() {
     }
@@ -120,190 +119,95 @@ public class ProjectJoinVO extends BaseViewVO implements InternalIdentity, Ident
         return id;
     }
 
-
-    @Override
-    public void setId(long id) {
-        this.id = id;
-
-    }
-
     @Override
     public String getUuid() {
         return uuid;
     }
 
-    public void setUuid(String uuid) {
-        this.uuid = uuid;
-    }
-
     public String getName() {
         return name;
     }
 
-    public void setName(String name) {
-        this.name = name;
-    }
-
     public long getDomainId() {
         return domainId;
     }
 
-    public void setDomainId(long domainId) {
-        this.domainId = domainId;
-    }
-
     public String getDomainUuid() {
         return domainUuid;
     }
 
-    public void setDomainUuid(String domainUuid) {
-        this.domainUuid = domainUuid;
-    }
-
     public String getDomainName() {
         return domainName;
     }
 
-    public void setDomainName(String domainName) {
-        this.domainName = domainName;
-    }
-
     public String getDomainPath() {
         return domainPath;
     }
 
-    public void setDomainPath(String domainPath) {
-        this.domainPath = domainPath;
-    }
-
     public State getState() {
         return state;
     }
 
-    public void setState(State state) {
-        this.state = state;
-    }
-
     public Date getCreated() {
         return created;
     }
 
-    public void setCreated(Date created) {
-        this.created = created;
-    }
-
     public Date getRemoved() {
         return removed;
     }
 
-    public void setRemoved(Date removed) {
-        this.removed = removed;
-    }
-
     public String getDisplayText() {
         return displayText;
     }
 
-    public void setDisplayText(String displayText) {
-        this.displayText = displayText;
-    }
-
     public String getOwner() {
         return owner;
     }
 
-    public void setOwner(String owner) {
-        this.owner = owner;
-    }
-
     public long getTagId() {
         return tagId;
     }
 
-    public void setTagId(long tagId) {
-        this.tagId = tagId;
-    }
-
     public String getTagUuid() {
         return tagUuid;
     }
 
-    public void setTagUuid(String tagUuid) {
-        this.tagUuid = tagUuid;
-    }
-
     public String getTagKey() {
         return tagKey;
     }
 
-    public void setTagKey(String tagKey) {
-        this.tagKey = tagKey;
-    }
-
     public String getTagValue() {
         return tagValue;
     }
 
-    public void setTagValue(String tagValue) {
-        this.tagValue = tagValue;
-    }
-
     public long getTagDomainId() {
         return tagDomainId;
     }
 
-    public void setTagDomainId(long tagDomainId) {
-        this.tagDomainId = tagDomainId;
-    }
-
     public long getTagAccountId() {
         return tagAccountId;
     }
 
-    public void setTagAccountId(long tagAccountId) {
-        this.tagAccountId = tagAccountId;
-    }
-
     public long getTagResourceId() {
         return tagResourceId;
     }
 
-    public void setTagResourceId(long tagResourceId) {
-        this.tagResourceId = tagResourceId;
-    }
-
     public String getTagResourceUuid() {
         return tagResourceUuid;
     }
 
-    public void setTagResourceUuid(String tagResourceUuid) {
-        this.tagResourceUuid = tagResourceUuid;
-    }
-
     public TaggedResourceType getTagResourceType() {
         return tagResourceType;
     }
 
-    public void setTagResourceType(TaggedResourceType tagResourceType) {
-        this.tagResourceType = tagResourceType;
-    }
-
     public String getTagCustomer() {
         return tagCustomer;
     }
 
-    public void setTagCustomer(String tagCustomer) {
-        this.tagCustomer = tagCustomer;
-    }
-
     public long getAccountId() {
         return accountId;
     }
 
-    public void setAccountId(long accountId) {
-        this.accountId = accountId;
-    }
-
     public long getProjectAccountId() {
         return projectAccountId;
     }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e514da2c/server/src/com/cloud/api/query/vo/ResourceTagJoinVO.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/vo/ResourceTagJoinVO.java b/server/src/com/cloud/api/query/vo/ResourceTagJoinVO.java
index 9ce9555..a13d107 100644
--- a/server/src/com/cloud/api/query/vo/ResourceTagJoinVO.java
+++ b/server/src/com/cloud/api/query/vo/ResourceTagJoinVO.java
@@ -42,7 +42,6 @@ public class ResourceTagJoinVO extends BaseViewVO implements ControlledViewEntit
     @Column(name="value")
     String value;
 
-
     @Column(name="resource_id")
     long resourceId;
 
@@ -56,8 +55,6 @@ public class ResourceTagJoinVO extends BaseViewVO implements ControlledViewEntit
     @Column(name="customer")
     String customer;
 
-
-
     @Column(name="account_id")
     private long accountId;
 
@@ -91,8 +88,6 @@ public class ResourceTagJoinVO extends BaseViewVO implements ControlledViewEntit
     @Column(name="project_name")
     private String projectName;
 
-
-
     public ResourceTagJoinVO() {
     }
 
@@ -101,168 +96,86 @@ public class ResourceTagJoinVO extends BaseViewVO implements ControlledViewEntit
         return uuid;
     }
 
-    public void setUuid(String uuid) {
-        this.uuid = uuid;
-    }
-
     @Override
     public long getId() {
         return id;
     }
 
     @Override
-    public void setId(long id) {
-        this.id = id;
-    }
-
-
-    @Override
     public long getAccountId() {
         return accountId;
     }
 
-    public void setAccountId(long accountId) {
-        this.accountId = accountId;
-    }
-
     @Override
     public String getAccountUuid() {
         return accountUuid;
     }
 
-    public void setAccountUuid(String accountUuid) {
-        this.accountUuid = accountUuid;
-    }
-
     @Override
     public String getAccountName() {
         return accountName;
     }
 
-    public void setAccountName(String accountName) {
-        this.accountName = accountName;
-    }
-
     @Override
     public short getAccountType() {
         return accountType;
     }
 
-    public void setAccountType(short accountType) {
-        this.accountType = accountType;
-    }
-
     @Override
     public long getDomainId() {
         return domainId;
     }
 
-    public void setDomainId(long domainId) {
-        this.domainId = domainId;
-    }
-
     @Override
     public String getDomainUuid() {
         return domainUuid;
     }
 
-    public void setDomainUuid(String domainUuid) {
-        this.domainUuid = domainUuid;
-    }
-
     @Override
     public String getDomainName() {
         return domainName;
     }
 
-    public void setDomainName(String domainName) {
-        this.domainName = domainName;
-    }
-
     @Override
     public String getDomainPath() {
         return domainPath;
     }
 
-    public void setDomainPath(String domainPath) {
-        this.domainPath = domainPath;
-    }
-
     public long getProjectId() {
         return projectId;
     }
 
-    public void setProjectId(long projectId) {
-        this.projectId = projectId;
-    }
-
     @Override
     public String getProjectUuid() {
         return projectUuid;
     }
 
-    public void setProjectUuid(String projectUuid) {
-        this.projectUuid = projectUuid;
-    }
-
     @Override
     public String getProjectName() {
         return projectName;
     }
 
-    public void setProjectName(String projectName) {
-        this.projectName = projectName;
-    }
-
-
-
     public String getKey() {
         return key;
     }
 
-    public void setKey(String key) {
-        this.key = key;
-    }
-
     public String getValue() {
         return value;
     }
 
-    public void setValue(String value) {
-        this.value = value;
-    }
-
     public long getResourceId() {
         return resourceId;
     }
 
-    public void setResourceId(long resourceId) {
-        this.resourceId = resourceId;
-    }
-
     public String getResourceUuid() {
         return resourceUuid;
     }
 
-    public void setResourceUuid(String resourceUuid) {
-        this.resourceUuid = resourceUuid;
-    }
-
     public TaggedResourceType getResourceType() {
         return resourceType;
     }
 
-    public void setResourceType(TaggedResourceType resourceType) {
-        this.resourceType = resourceType;
-    }
-
     public String getCustomer() {
         return customer;
     }
-
-    public void setCustomer(String customer) {
-        this.customer = customer;
-    }
-
-
 }


Mime
View raw message