Updated Branches: refs/heads/api_refactoring c0a0318f2 -> ff8fdbd19
Add missing @Id annotation to id fields for all the join VOs to support findById call. Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/ff8fdbd1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/ff8fdbd1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/ff8fdbd1 Branch: refs/heads/api_refactoring Commit: ff8fdbd1942e6206eba02d9db3c36730b0c0d7d1 Parents: c0a0318 Author: Min Chen <[email protected]> Authored: Thu Jan 3 14:12:15 2013 -0800 Committer: Min Chen <[email protected]> Committed: Thu Jan 3 14:12:15 2013 -0800 ---------------------------------------------------------------------- .../src/com/cloud/api/query/vo/AccountJoinVO.java | 2 ++ .../com/cloud/api/query/vo/DomainRouterJoinVO.java | 2 ++ server/src/com/cloud/api/query/vo/EventJoinVO.java | 2 ++ server/src/com/cloud/api/query/vo/HostJoinVO.java | 2 ++ .../cloud/api/query/vo/InstanceGroupJoinVO.java | 2 ++ .../cloud/api/query/vo/ProjectAccountJoinVO.java | 2 ++ .../api/query/vo/ProjectInvitationJoinVO.java | 2 ++ .../src/com/cloud/api/query/vo/ProjectJoinVO.java | 2 ++ .../com/cloud/api/query/vo/ResourceTagJoinVO.java | 2 ++ .../cloud/api/query/vo/SecurityGroupJoinVO.java | 2 ++ .../com/cloud/api/query/vo/UserAccountJoinVO.java | 2 ++ .../src/com/cloud/api/query/vo/UserVmJoinVO.java | 2 ++ .../src/com/cloud/api/query/vo/VolumeJoinVO.java | 2 ++ 13 files changed, 26 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ff8fdbd1/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 f9b4318..6d37f4d 100644 --- a/server/src/com/cloud/api/query/vo/AccountJoinVO.java +++ b/server/src/com/cloud/api/query/vo/AccountJoinVO.java @@ -21,6 +21,7 @@ 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; @@ -31,6 +32,7 @@ import org.apache.cloudstack.api.InternalIdentity; @Table(name="account_view") public class AccountJoinVO extends BaseViewVO implements InternalIdentity, Identity { + @Id @Column(name="id") private long id; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ff8fdbd1/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 f3d904b..a9c0458 100644 --- a/server/src/com/cloud/api/query/vo/DomainRouterJoinVO.java +++ b/server/src/com/cloud/api/query/vo/DomainRouterJoinVO.java @@ -23,6 +23,7 @@ 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.network.Network.GuestType; @@ -35,6 +36,7 @@ import com.cloud.vm.VirtualMachine.State; @Table(name="domain_router_view") public class DomainRouterJoinVO extends BaseViewVO implements ControlledViewEntity { + @Id @Column(name="id", updatable=false, nullable = false) private long id; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ff8fdbd1/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 2511d96..f29a942 100644 --- a/server/src/com/cloud/api/query/vo/EventJoinVO.java +++ b/server/src/com/cloud/api/query/vo/EventJoinVO.java @@ -22,6 +22,7 @@ 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.utils.db.GenericDao; @@ -31,6 +32,7 @@ import com.cloud.event.Event.State; @Table(name="event_view") public class EventJoinVO extends BaseViewVO implements ControlledViewEntity { + @Id @Column(name="id", updatable=false, nullable = false) private long id; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ff8fdbd1/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 1eb82fb..a3796b9 100644 --- a/server/src/com/cloud/api/query/vo/HostJoinVO.java +++ b/server/src/com/cloud/api/query/vo/HostJoinVO.java @@ -22,6 +22,7 @@ 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 javax.persistence.Temporal; import javax.persistence.TemporalType; @@ -45,6 +46,7 @@ import org.apache.cloudstack.api.InternalIdentity; @Table(name="host_view") public class HostJoinVO extends BaseViewVO implements InternalIdentity, Identity { + @Id @Column(name="id") private long id; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ff8fdbd1/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 02c53e9..3fb4309 100644 --- a/server/src/com/cloud/api/query/vo/InstanceGroupJoinVO.java +++ b/server/src/com/cloud/api/query/vo/InstanceGroupJoinVO.java @@ -20,6 +20,7 @@ import java.util.Date; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Id; import javax.persistence.Table; import com.cloud.utils.db.GenericDao; @@ -28,6 +29,7 @@ import com.cloud.utils.db.GenericDao; @Table(name="instance_group_view") public class InstanceGroupJoinVO extends BaseViewVO implements ControlledViewEntity { + @Id @Column(name="id", updatable=false, nullable = false) private long id; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ff8fdbd1/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 cbc9531..1a8818a 100644 --- a/server/src/com/cloud/api/query/vo/ProjectAccountJoinVO.java +++ b/server/src/com/cloud/api/query/vo/ProjectAccountJoinVO.java @@ -20,6 +20,7 @@ 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.projects.ProjectAccount.Role; @@ -29,6 +30,7 @@ import org.apache.cloudstack.api.InternalIdentity; @Table(name="project_account_view") public class ProjectAccountJoinVO extends BaseViewVO implements InternalIdentity { + @Id @Column(name="id", updatable=false, nullable = false) private long id; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ff8fdbd1/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 8571c26..a60c937 100644 --- a/server/src/com/cloud/api/query/vo/ProjectInvitationJoinVO.java +++ b/server/src/com/cloud/api/query/vo/ProjectInvitationJoinVO.java @@ -22,6 +22,7 @@ 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.utils.db.GenericDao; @@ -31,6 +32,7 @@ import com.cloud.vm.VirtualMachine.State; @Table(name="project_invitation_view") public class ProjectInvitationJoinVO extends BaseViewVO implements ControlledViewEntity { + @Id @Column(name="id", updatable=false, nullable = false) private long id; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ff8fdbd1/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 cc9e21f..73ec931 100644 --- a/server/src/com/cloud/api/query/vo/ProjectJoinVO.java +++ b/server/src/com/cloud/api/query/vo/ProjectJoinVO.java @@ -22,6 +22,7 @@ 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.server.ResourceTag.TaggedResourceType; @@ -35,6 +36,7 @@ import org.apache.cloudstack.api.InternalIdentity; @Table(name="project_view") public class ProjectJoinVO extends BaseViewVO implements InternalIdentity, Identity { + @Id @Column(name="id", updatable=false, nullable = false) private long id; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ff8fdbd1/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 fadb350..9ce9555 100644 --- a/server/src/com/cloud/api/query/vo/ResourceTagJoinVO.java +++ b/server/src/com/cloud/api/query/vo/ResourceTagJoinVO.java @@ -20,6 +20,7 @@ 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.server.ResourceTag.TaggedResourceType; @@ -28,6 +29,7 @@ import com.cloud.server.ResourceTag.TaggedResourceType; @Table(name="resource_tag_view") public class ResourceTagJoinVO extends BaseViewVO implements ControlledViewEntity { + @Id @Column(name="id", updatable=false, nullable = false) private long id; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ff8fdbd1/server/src/com/cloud/api/query/vo/SecurityGroupJoinVO.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/query/vo/SecurityGroupJoinVO.java b/server/src/com/cloud/api/query/vo/SecurityGroupJoinVO.java index eb89ea9..922e130 100644 --- a/server/src/com/cloud/api/query/vo/SecurityGroupJoinVO.java +++ b/server/src/com/cloud/api/query/vo/SecurityGroupJoinVO.java @@ -20,6 +20,7 @@ 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.network.security.SecurityRule.SecurityRuleType; @@ -29,6 +30,7 @@ import com.cloud.server.ResourceTag.TaggedResourceType; @Table(name="security_group_view") public class SecurityGroupJoinVO extends BaseViewVO implements ControlledViewEntity{ + @Id @Column(name="id", updatable=false, nullable = false) private long id; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ff8fdbd1/server/src/com/cloud/api/query/vo/UserAccountJoinVO.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/query/vo/UserAccountJoinVO.java b/server/src/com/cloud/api/query/vo/UserAccountJoinVO.java index 3a438ab..44637db 100644 --- a/server/src/com/cloud/api/query/vo/UserAccountJoinVO.java +++ b/server/src/com/cloud/api/query/vo/UserAccountJoinVO.java @@ -20,6 +20,7 @@ import java.util.Date; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Id; import javax.persistence.Table; import com.cloud.utils.db.Encrypt; @@ -32,6 +33,7 @@ import org.apache.cloudstack.api.InternalIdentity; @Table(name="user_view") public class UserAccountJoinVO extends BaseViewVO implements InternalIdentity, Identity { + @Id @Column(name="id", updatable=false, nullable = false) private long id; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ff8fdbd1/server/src/com/cloud/api/query/vo/UserVmJoinVO.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/query/vo/UserVmJoinVO.java b/server/src/com/cloud/api/query/vo/UserVmJoinVO.java index db400ff..025db47 100644 --- a/server/src/com/cloud/api/query/vo/UserVmJoinVO.java +++ b/server/src/com/cloud/api/query/vo/UserVmJoinVO.java @@ -24,6 +24,7 @@ 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 javax.persistence.Transient; @@ -42,6 +43,7 @@ import com.cloud.vm.VirtualMachine.State; @Table(name="user_vm_view") public class UserVmJoinVO extends BaseViewVO implements ControlledViewEntity { + @Id @Column(name="id", updatable=false, nullable = false) private long id; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ff8fdbd1/server/src/com/cloud/api/query/vo/VolumeJoinVO.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/query/vo/VolumeJoinVO.java b/server/src/com/cloud/api/query/vo/VolumeJoinVO.java index 907b02b..4f6b35b 100644 --- a/server/src/com/cloud/api/query/vo/VolumeJoinVO.java +++ b/server/src/com/cloud/api/query/vo/VolumeJoinVO.java @@ -21,6 +21,7 @@ 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 javax.persistence.Temporal; import javax.persistence.TemporalType; @@ -36,6 +37,7 @@ import com.cloud.vm.VirtualMachine; @Table(name="volume_view") public class VolumeJoinVO extends BaseViewVO implements ControlledViewEntity { + @Id @Column(name="id") private long id;
