You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mc...@apache.org on 2012/12/23 07:35:44 UTC
[1/4] git commit: Add back Identity interface to most VO class to
avoid cast error in ApiDispatcher.setupParameter call.
Updated Branches:
refs/heads/api_refactoring e5fc51325 -> 503db1412
Add back Identity interface to most VO class to avoid cast error in
ApiDispatcher.setupParameter 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/503db141
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/503db141
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/503db141
Branch: refs/heads/api_refactoring
Commit: 503db14127807ef69933f5dcf6a3cef91cb5ca45
Parents: 3aad2ba
Author: Min Chen <mi...@citrix.com>
Authored: Sat Dec 22 22:35:09 2012 -0800
Committer: Min Chen <mi...@citrix.com>
Committed: Sat Dec 22 22:35:09 2012 -0800
----------------------------------------------------------------------
api/src/com/cloud/storage/Snapshot.java | 2 +-
core/src/com/cloud/host/HostVO.java | 2 +-
core/src/com/cloud/network/VpnUserVO.java | 2 +-
core/src/com/cloud/storage/DiskOfferingVO.java | 2 +-
core/src/com/cloud/storage/GuestOSCategoryVO.java | 2 +-
core/src/com/cloud/storage/GuestOSVO.java | 2 +-
core/src/com/cloud/storage/SnapshotVO.java | 4 ++--
core/src/com/cloud/user/AccountVO.java | 2 +-
.../com/cloud/network/CiscoNexusVSMDeviceVO.java | 2 +-
server/src/com/cloud/dc/ClusterVO.java | 2 +-
server/src/com/cloud/dc/DataCenterVO.java | 2 +-
server/src/com/cloud/dc/VlanVO.java | 2 +-
server/src/com/cloud/domain/DomainVO.java | 2 +-
server/src/com/cloud/network/IPAddressVO.java | 2 +-
server/src/com/cloud/network/NetworkVO.java | 2 +-
.../com/cloud/network/as/AutoScaleVmProfileVO.java | 2 +-
.../com/cloud/network/rules/FirewallRuleVO.java | 2 +-
17 files changed, 18 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/503db141/api/src/com/cloud/storage/Snapshot.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/storage/Snapshot.java b/api/src/com/cloud/storage/Snapshot.java
index c60b19a..a81234a 100644
--- a/api/src/com/cloud/storage/Snapshot.java
+++ b/api/src/com/cloud/storage/Snapshot.java
@@ -67,7 +67,7 @@ public interface Snapshot extends ControlledEntity {
public static final long MANUAL_POLICY_ID = 0L;
- Long getId();
+ long getId();
String getUuid();
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/503db141/core/src/com/cloud/host/HostVO.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/host/HostVO.java b/core/src/com/cloud/host/HostVO.java
index 850211e..069b263 100755
--- a/core/src/com/cloud/host/HostVO.java
+++ b/core/src/com/cloud/host/HostVO.java
@@ -48,7 +48,7 @@ import com.cloud.utils.db.GenericDao;
@Table(name="host")
@Inheritance(strategy=InheritanceType.TABLE_PER_CLASS)
@DiscriminatorColumn(name="type", discriminatorType=DiscriminatorType.STRING, length=32)
-public class HostVO implements Host {
+public class HostVO implements Host, Identity {
@Id
@GeneratedValue(strategy=GenerationType.IDENTITY)
@Column(name="id")
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/503db141/core/src/com/cloud/network/VpnUserVO.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/network/VpnUserVO.java b/core/src/com/cloud/network/VpnUserVO.java
index 54e0d89..02c5368 100644
--- a/core/src/com/cloud/network/VpnUserVO.java
+++ b/core/src/com/cloud/network/VpnUserVO.java
@@ -32,7 +32,7 @@ import com.cloud.utils.db.Encrypt;
@Entity
@Table(name=("vpn_users"))
-public class VpnUserVO implements VpnUser {
+public class VpnUserVO implements VpnUser, Identity {
@Id
@GeneratedValue(strategy=GenerationType.IDENTITY)
@Column(name="id")
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/503db141/core/src/com/cloud/storage/DiskOfferingVO.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/DiskOfferingVO.java b/core/src/com/cloud/storage/DiskOfferingVO.java
index a526712..8b3a2de 100755
--- a/core/src/com/cloud/storage/DiskOfferingVO.java
+++ b/core/src/com/cloud/storage/DiskOfferingVO.java
@@ -42,7 +42,7 @@ import com.cloud.utils.db.GenericDao;
@Table(name="disk_offering")
@Inheritance(strategy=InheritanceType.JOINED)
@DiscriminatorColumn(name="type", discriminatorType=DiscriminatorType.STRING, length=32)
-public class DiskOfferingVO implements DiskOffering {
+public class DiskOfferingVO implements DiskOffering, Identity {
public enum Type {
Disk,
Service
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/503db141/core/src/com/cloud/storage/GuestOSCategoryVO.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/GuestOSCategoryVO.java b/core/src/com/cloud/storage/GuestOSCategoryVO.java
index dfe7028..b67fb87 100644
--- a/core/src/com/cloud/storage/GuestOSCategoryVO.java
+++ b/core/src/com/cloud/storage/GuestOSCategoryVO.java
@@ -29,7 +29,7 @@ import org.apache.cloudstack.api.Identity;
@Entity
@Table(name="guest_os_category")
-public class GuestOSCategoryVO implements GuestOsCategory {
+public class GuestOSCategoryVO implements GuestOsCategory, Identity {
@Id
@GeneratedValue(strategy=GenerationType.IDENTITY)
@Column(name="id")
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/503db141/core/src/com/cloud/storage/GuestOSVO.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/GuestOSVO.java b/core/src/com/cloud/storage/GuestOSVO.java
index 7fe7f6d..4281917 100644
--- a/core/src/com/cloud/storage/GuestOSVO.java
+++ b/core/src/com/cloud/storage/GuestOSVO.java
@@ -29,7 +29,7 @@ import org.apache.cloudstack.api.Identity;
@Entity
@Table(name="guest_os")
-public class GuestOSVO implements GuestOS {
+public class GuestOSVO implements GuestOS, Identity {
@Id
@GeneratedValue(strategy=GenerationType.IDENTITY)
@Column(name="id")
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/503db141/core/src/com/cloud/storage/SnapshotVO.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/SnapshotVO.java b/core/src/com/cloud/storage/SnapshotVO.java
index 0569225..928cd2d 100644
--- a/core/src/com/cloud/storage/SnapshotVO.java
+++ b/core/src/com/cloud/storage/SnapshotVO.java
@@ -35,7 +35,7 @@ import com.google.gson.annotations.Expose;
@Entity
@Table(name="snapshots")
-public class SnapshotVO implements Snapshot {
+public class SnapshotVO implements Snapshot, Identity {
@Id
@GeneratedValue(strategy=GenerationType.IDENTITY)
@@ -131,7 +131,7 @@ public class SnapshotVO implements Snapshot {
}
@Override
- public Long getId() {
+ public long getId() {
return id;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/503db141/core/src/com/cloud/user/AccountVO.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/user/AccountVO.java b/core/src/com/cloud/user/AccountVO.java
index f5d9884..5958d49 100644
--- a/core/src/com/cloud/user/AccountVO.java
+++ b/core/src/com/cloud/user/AccountVO.java
@@ -33,7 +33,7 @@ import com.cloud.utils.db.GenericDao;
@Entity
@Table(name="account")
-public class AccountVO implements Account {
+public class AccountVO implements Account, Identity {
@Id
@GeneratedValue(strategy=GenerationType.IDENTITY)
@Column(name="id")
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/503db141/plugins/hypervisors/vmware/src/com/cloud/network/CiscoNexusVSMDeviceVO.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/network/CiscoNexusVSMDeviceVO.java b/plugins/hypervisors/vmware/src/com/cloud/network/CiscoNexusVSMDeviceVO.java
index 48a3889..4f6c080 100644
--- a/plugins/hypervisors/vmware/src/com/cloud/network/CiscoNexusVSMDeviceVO.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/network/CiscoNexusVSMDeviceVO.java
@@ -37,7 +37,7 @@ import com.cloud.utils.db.Encrypt;
@Entity
@Table(name="virtual_supervisor_module")
-public class CiscoNexusVSMDeviceVO implements CiscoNexusVSMDevice{
+public class CiscoNexusVSMDeviceVO implements CiscoNexusVSMDevice, Identity{
// We need to know what properties a VSM has. Put them here.
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/503db141/server/src/com/cloud/dc/ClusterVO.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/dc/ClusterVO.java b/server/src/com/cloud/dc/ClusterVO.java
index 28e4893..dbed37b 100644
--- a/server/src/com/cloud/dc/ClusterVO.java
+++ b/server/src/com/cloud/dc/ClusterVO.java
@@ -38,7 +38,7 @@ import com.cloud.utils.db.GenericDao;
@Entity
@Table(name="cluster")
-public class ClusterVO implements Cluster {
+public class ClusterVO implements Cluster, Identity {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/503db141/server/src/com/cloud/dc/DataCenterVO.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/dc/DataCenterVO.java b/server/src/com/cloud/dc/DataCenterVO.java
index d156927..d9b660f 100644
--- a/server/src/com/cloud/dc/DataCenterVO.java
+++ b/server/src/com/cloud/dc/DataCenterVO.java
@@ -39,7 +39,7 @@ import com.cloud.utils.db.GenericDao;
@Entity
@Table(name="data_center")
-public class DataCenterVO implements DataCenter {
+public class DataCenterVO implements DataCenter, Identity {
@Id
@GeneratedValue(strategy=GenerationType.IDENTITY)
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/503db141/server/src/com/cloud/dc/VlanVO.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/dc/VlanVO.java b/server/src/com/cloud/dc/VlanVO.java
index 83e8fe6..b322949 100644
--- a/server/src/com/cloud/dc/VlanVO.java
+++ b/server/src/com/cloud/dc/VlanVO.java
@@ -31,7 +31,7 @@ import org.apache.cloudstack.api.Identity;
@Entity
@Table(name="vlan")
-public class VlanVO implements Vlan {
+public class VlanVO implements Vlan, Identity {
@Id
@GeneratedValue(strategy=GenerationType.IDENTITY)
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/503db141/server/src/com/cloud/domain/DomainVO.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/domain/DomainVO.java b/server/src/com/cloud/domain/DomainVO.java
index 1c9d3e0..e6e745e 100644
--- a/server/src/com/cloud/domain/DomainVO.java
+++ b/server/src/com/cloud/domain/DomainVO.java
@@ -33,7 +33,7 @@ import com.cloud.utils.db.GenericDao;
@Entity
@Table(name="domain")
-public class DomainVO implements Domain {
+public class DomainVO implements Domain, Identity {
public static final Logger s_logger = Logger.getLogger(DomainVO.class.getName());
@Id
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/503db141/server/src/com/cloud/network/IPAddressVO.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/IPAddressVO.java b/server/src/com/cloud/network/IPAddressVO.java
index 82c38ba..4adab35 100644
--- a/server/src/com/cloud/network/IPAddressVO.java
+++ b/server/src/com/cloud/network/IPAddressVO.java
@@ -40,7 +40,7 @@ import com.cloud.utils.net.Ip;
*/
@Entity
@Table(name=("user_ip_address"))
-public class IPAddressVO implements IpAddress {
+public class IPAddressVO implements IpAddress, Identity {
@Id
@GeneratedValue(strategy=GenerationType.IDENTITY)
@Column(name="id")
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/503db141/server/src/com/cloud/network/NetworkVO.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkVO.java b/server/src/com/cloud/network/NetworkVO.java
index 22b4d9b..5fcaa98 100644
--- a/server/src/com/cloud/network/NetworkVO.java
+++ b/server/src/com/cloud/network/NetworkVO.java
@@ -44,7 +44,7 @@ import com.cloud.utils.net.NetUtils;
*/
@Entity
@Table(name="networks")
-public class NetworkVO implements Network {
+public class NetworkVO implements Network, Identity {
@Id
@TableGenerator(name="networks_sq", table="sequence", pkColumnName="name", valueColumnName="value", pkColumnValue="networks_seq", allocationSize=1)
@Column(name="id")
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/503db141/server/src/com/cloud/network/as/AutoScaleVmProfileVO.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/as/AutoScaleVmProfileVO.java b/server/src/com/cloud/network/as/AutoScaleVmProfileVO.java
index 22e8778..453cedd 100644
--- a/server/src/com/cloud/network/as/AutoScaleVmProfileVO.java
+++ b/server/src/com/cloud/network/as/AutoScaleVmProfileVO.java
@@ -41,7 +41,7 @@ import com.cloud.utils.net.NetUtils;
@Entity
@Table(name = "autoscale_vmprofiles")
@Inheritance(strategy = InheritanceType.JOINED)
-public class AutoScaleVmProfileVO implements AutoScaleVmProfile{
+public class AutoScaleVmProfileVO implements AutoScaleVmProfile, Identity{
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/503db141/server/src/com/cloud/network/rules/FirewallRuleVO.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/rules/FirewallRuleVO.java b/server/src/com/cloud/network/rules/FirewallRuleVO.java
index d9f558a..4ea48b1 100644
--- a/server/src/com/cloud/network/rules/FirewallRuleVO.java
+++ b/server/src/com/cloud/network/rules/FirewallRuleVO.java
@@ -44,7 +44,7 @@ import com.cloud.utils.net.NetUtils;
@Table(name="firewall_rules")
@Inheritance(strategy=InheritanceType.JOINED)
@DiscriminatorColumn(name="purpose", discriminatorType=DiscriminatorType.STRING, length=32)
-public class FirewallRuleVO implements FirewallRule {
+public class FirewallRuleVO implements FirewallRule, Identity {
protected final FirewallRulesCidrsDaoImpl _firewallRulesCidrsDao = ComponentLocator.inject(FirewallRulesCidrsDaoImpl.class);
@Id