Create Base view VO object to remove some code duplication.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/9a3632d8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/9a3632d8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/9a3632d8 Branch: refs/heads/api_refactoring Commit: 9a3632d807ee899a08938b4b343a52514e21181f Parents: e398b1e Author: Min Chen <[email protected]> Authored: Mon Dec 10 11:21:01 2012 -0800 Committer: Rohit Yadav <[email protected]> Committed: Mon Dec 10 11:30:28 2012 -0800 ---------------------------------------------------------------------- .../apache/cloudstack/api/view/vo/BaseViewVO.java | 44 +++++++++++++++ .../cloudstack/api/view/vo/DomainRouterJoinVO.java | 36 +------------ .../apache/cloudstack/api/view/vo/EventJoinVO.java | 33 +----------- .../cloudstack/api/view/vo/ResourceTagJoinVO.java | 25 +-------- .../api/view/vo/SecurityGroupJoinVO.java | 32 +---------- .../cloudstack/api/view/vo/UserVmJoinVO.java | 35 +----------- 6 files changed, 49 insertions(+), 156 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9a3632d8/api/src/org/apache/cloudstack/api/view/vo/BaseViewVO.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/view/vo/BaseViewVO.java b/api/src/org/apache/cloudstack/api/view/vo/BaseViewVO.java new file mode 100644 index 0000000..f6149b7 --- /dev/null +++ b/api/src/org/apache/cloudstack/api/view/vo/BaseViewVO.java @@ -0,0 +1,44 @@ +package org.apache.cloudstack.api.view.vo; + +import javax.persistence.Column; + +/** + * Base class for all VO objects for db views. + * @author minc + * + */ +public abstract class BaseViewVO { + + @Column(name="id", updatable=false, nullable = false) + protected long id; + + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + (int) (id ^ (id >>> 32)); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + BaseViewVO other = (BaseViewVO) obj; + if (id != other.id) + return false; + return true; + } +} http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9a3632d8/api/src/org/apache/cloudstack/api/view/vo/DomainRouterJoinVO.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/view/vo/DomainRouterJoinVO.java b/api/src/org/apache/cloudstack/api/view/vo/DomainRouterJoinVO.java index 747cde5..d7d31b0 100644 --- a/api/src/org/apache/cloudstack/api/view/vo/DomainRouterJoinVO.java +++ b/api/src/org/apache/cloudstack/api/view/vo/DomainRouterJoinVO.java @@ -33,10 +33,8 @@ import com.cloud.vm.VirtualMachine.State; @Entity @Table(name="domain_router_view") -public class DomainRouterJoinVO implements ControlledViewEntity { +public class DomainRouterJoinVO extends BaseViewVO implements ControlledViewEntity { - @Column(name="id", updatable=false, nullable = false) - private long id; @Column(name="name", updatable=false, nullable=false, length=255) private String name = null; @@ -239,15 +237,6 @@ public class DomainRouterJoinVO implements ControlledViewEntity { } - public long getId() { - return id; - } - - - public void setId(long id) { - this.id = id; - } - public String getName() { return name; @@ -902,27 +891,4 @@ public class DomainRouterJoinVO implements ControlledViewEntity { } - - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + (int) (id ^ (id >>> 32)); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - DomainRouterJoinVO other = (DomainRouterJoinVO) obj; - if (id != other.id) - return false; - return true; - } } http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9a3632d8/api/src/org/apache/cloudstack/api/view/vo/EventJoinVO.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/view/vo/EventJoinVO.java b/api/src/org/apache/cloudstack/api/view/vo/EventJoinVO.java index da322fb..e8619d6 100644 --- a/api/src/org/apache/cloudstack/api/view/vo/EventJoinVO.java +++ b/api/src/org/apache/cloudstack/api/view/vo/EventJoinVO.java @@ -29,10 +29,7 @@ import com.cloud.event.Event.State; @Entity @Table(name="event_view") -public class EventJoinVO implements ControlledViewEntity { - - @Column(name="id", updatable=false, nullable = false) - private long id; +public class EventJoinVO extends BaseViewVO implements ControlledViewEntity { @Column(name="uuid") private String uuid; @@ -115,14 +112,6 @@ public class EventJoinVO implements ControlledViewEntity { this.uuid = uuid; } - public long getId() { - return id; - } - - public void setId(long id) { - this.id = id; - } - @Override public long getAccountId() { @@ -307,25 +296,5 @@ public class EventJoinVO implements ControlledViewEntity { this.parameters = parameters; } - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + (int) (id ^ (id >>> 32)); - return result; - } - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - EventJoinVO other = (EventJoinVO) obj; - if (id != other.id) - return false; - return true; - } } http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9a3632d8/api/src/org/apache/cloudstack/api/view/vo/ResourceTagJoinVO.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/view/vo/ResourceTagJoinVO.java b/api/src/org/apache/cloudstack/api/view/vo/ResourceTagJoinVO.java index e39c115..052149b 100644 --- a/api/src/org/apache/cloudstack/api/view/vo/ResourceTagJoinVO.java +++ b/api/src/org/apache/cloudstack/api/view/vo/ResourceTagJoinVO.java @@ -26,10 +26,8 @@ import com.cloud.server.ResourceTag.TaggedResourceType; @Entity @Table(name="resource_tag_view") -public class ResourceTagJoinVO implements ControlledViewEntity { +public class ResourceTagJoinVO extends BaseViewVO implements ControlledViewEntity { - @Column(name="id", updatable=false, nullable = false) - private long id; @Column(name="uuid") private String uuid; @@ -41,7 +39,6 @@ public class ResourceTagJoinVO implements ControlledViewEntity { String value; - @Column(name="resource_id") long resourceId; @@ -260,25 +257,5 @@ public class ResourceTagJoinVO implements ControlledViewEntity { this.customer = customer; } - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + (int) (id ^ (id >>> 32)); - return result; - } - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - ResourceTagJoinVO other = (ResourceTagJoinVO) obj; - if (id != other.id) - return false; - return true; - } } http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9a3632d8/api/src/org/apache/cloudstack/api/view/vo/SecurityGroupJoinVO.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/view/vo/SecurityGroupJoinVO.java b/api/src/org/apache/cloudstack/api/view/vo/SecurityGroupJoinVO.java index 725ee90..80cab11 100644 --- a/api/src/org/apache/cloudstack/api/view/vo/SecurityGroupJoinVO.java +++ b/api/src/org/apache/cloudstack/api/view/vo/SecurityGroupJoinVO.java @@ -27,10 +27,7 @@ import com.cloud.server.ResourceTag.TaggedResourceType; @Entity @Table(name="security_group_view") -public class SecurityGroupJoinVO implements ControlledViewEntity { - - @Column(name="id", updatable=false, nullable = false) - private long id; +public class SecurityGroupJoinVO extends BaseViewVO implements ControlledViewEntity { @Column(name="name") private String name; @@ -149,13 +146,6 @@ public class SecurityGroupJoinVO implements ControlledViewEntity { this.uuid = uuid; } - public long getId() { - return id; - } - - public void setId(long id) { - this.id = id; - } public String getName() { return name; @@ -443,25 +433,5 @@ public class SecurityGroupJoinVO implements ControlledViewEntity { this.tagCustomer = tagCustomer; } - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + (int) (id ^ (id >>> 32)); - return result; - } - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - SecurityGroupJoinVO other = (SecurityGroupJoinVO) obj; - if (id != other.id) - return false; - return true; - } } http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9a3632d8/api/src/org/apache/cloudstack/api/view/vo/UserVmJoinVO.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/view/vo/UserVmJoinVO.java b/api/src/org/apache/cloudstack/api/view/vo/UserVmJoinVO.java index aff2a1b..0edf0be 100644 --- a/api/src/org/apache/cloudstack/api/view/vo/UserVmJoinVO.java +++ b/api/src/org/apache/cloudstack/api/view/vo/UserVmJoinVO.java @@ -40,10 +40,8 @@ import com.cloud.vm.VirtualMachine.State; @Entity @Table(name="user_vm_view") -public class UserVmJoinVO implements ControlledViewEntity { +public class UserVmJoinVO extends BaseViewVO implements ControlledViewEntity { - @Column(name="id", updatable=false, nullable = false) - private long id; @Column(name="name", updatable=false, nullable=false, length=255) private String name = null; @@ -388,15 +386,6 @@ public class UserVmJoinVO implements ControlledViewEntity { this.password = password; } - public long getId() { - return id; - } - - - public void setId(long id) { - this.id = id; - } - public String getName() { return name; @@ -1598,26 +1587,4 @@ public class UserVmJoinVO implements ControlledViewEntity { return toString; } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + (int) (id ^ (id >>> 32)); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - UserVmJoinVO other = (UserVmJoinVO) obj; - if (id != other.id) - return false; - return true; - } }
