You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ah...@apache.org on 2013/11/21 17:10:06 UTC
[02/58] [abbrv] [partial] Reformatted all of the code.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/host/DetailVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/host/DetailVO.java b/engine/schema/src/com/cloud/host/DetailVO.java
index 21eac2c..1c781c6 100644
--- a/engine/schema/src/com/cloud/host/DetailVO.java
+++ b/engine/schema/src/com/cloud/host/DetailVO.java
@@ -16,8 +16,6 @@
// under the License.
package com.cloud.host;
-import org.apache.cloudstack.api.InternalIdentity;
-
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
@@ -25,6 +23,8 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
+import org.apache.cloudstack.api.InternalIdentity;
+
@Entity
@Table(name = "host_details")
public class DetailVO implements InternalIdentity {
@@ -67,6 +67,7 @@ public class DetailVO implements InternalIdentity {
this.value = value;
}
+ @Override
public long getId() {
return id;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/host/HostTagVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/host/HostTagVO.java b/engine/schema/src/com/cloud/host/HostTagVO.java
index 2393006..6b8b754 100644
--- a/engine/schema/src/com/cloud/host/HostTagVO.java
+++ b/engine/schema/src/com/cloud/host/HostTagVO.java
@@ -16,8 +16,6 @@
// under the License.
package com.cloud.host;
-import org.apache.cloudstack.api.InternalIdentity;
-
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
@@ -25,6 +23,8 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
+import org.apache.cloudstack.api.InternalIdentity;
+
@Entity
@Table(name = "host_tags")
public class HostTagVO implements InternalIdentity {
@@ -59,6 +59,7 @@ public class HostTagVO implements InternalIdentity {
this.tag = tag;
}
+ @Override
public long getId() {
return id;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/host/HostVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/host/HostVO.java b/engine/schema/src/com/cloud/host/HostVO.java
index 07b87a8..56c066b 100755
--- a/engine/schema/src/com/cloud/host/HostVO.java
+++ b/engine/schema/src/com/cloud/host/HostVO.java
@@ -37,13 +37,11 @@ import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import javax.persistence.Transient;
-import org.apache.cloudstack.api.Identity;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.resource.ResourceState;
import com.cloud.storage.Storage.StoragePoolType;
import com.cloud.utils.NumbersUtil;
import com.cloud.utils.db.GenericDao;
-import org.apache.cloudstack.api.InternalIdentity;
@Entity
@Table(name = "host")
@@ -379,10 +377,10 @@ public class HostVO implements Host {
this.uuid = UUID.randomUUID().toString();
}
- public HostVO(long id, String name, Type type, String privateIpAddress, String privateNetmask, String privateMacAddress, String publicIpAddress, String publicNetmask,
- String publicMacAddress, String storageIpAddress, String storageNetmask, String storageMacAddress, String deuxStorageIpAddress, String duxStorageNetmask,
- String deuxStorageMacAddress, String guid, Status status, String version, String iqn, Date disconnectedOn, long dcId, Long podId, long serverId, long ping,
- String parent, long totalSize, StoragePoolType fsType) {
+ public HostVO(long id, String name, Type type, String privateIpAddress, String privateNetmask, String privateMacAddress, String publicIpAddress,
+ String publicNetmask, String publicMacAddress, String storageIpAddress, String storageNetmask, String storageMacAddress, String deuxStorageIpAddress,
+ String duxStorageNetmask, String deuxStorageMacAddress, String guid, Status status, String version, String iqn, Date disconnectedOn, long dcId, Long podId,
+ long serverId, long ping, String parent, long totalSize, StoragePoolType fsType) {
this(id,
name,
type,
@@ -415,9 +413,10 @@ public class HostVO implements Host {
this.uuid = UUID.randomUUID().toString();
}
- public HostVO(long id, String name, Type type, String privateIpAddress, String privateNetmask, String privateMacAddress, String publicIpAddress, String publicNetmask,
- String publicMacAddress, String storageIpAddress, String storageNetmask, String storageMacAddress, String guid, Status status, String version, String url,
- Date disconnectedOn, long dcId, Long podId, long serverId, long ping, Integer cpus, Long speed, Long totalMemory, long dom0MinMemory, String caps) {
+ public HostVO(long id, String name, Type type, String privateIpAddress, String privateNetmask, String privateMacAddress, String publicIpAddress,
+ String publicNetmask, String publicMacAddress, String storageIpAddress, String storageNetmask, String storageMacAddress, String guid, Status status,
+ String version, String url, Date disconnectedOn, long dcId, Long podId, long serverId, long ping, Integer cpus, Long speed, Long totalMemory,
+ long dom0MinMemory, String caps) {
this.id = id;
this.name = name;
this.status = status;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/host/dao/HostDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/host/dao/HostDaoImpl.java b/engine/schema/src/com/cloud/host/dao/HostDaoImpl.java
index c51e2c7..08a4366 100755
--- a/engine/schema/src/com/cloud/host/dao/HostDaoImpl.java
+++ b/engine/schema/src/com/cloud/host/dao/HostDaoImpl.java
@@ -284,8 +284,8 @@ public class HostDaoImpl extends GenericDaoBase<HostVO, Long> implements HostDao
JoinType.LEFTOUTER);
ClusterManagedSearch = _clusterDao.createSearchBuilder();
ClusterManagedSearch.and("managed", ClusterManagedSearch.entity().getManagedState(), SearchCriteria.Op.EQ);
- UnmanagedDirectConnectSearch.join("ClusterManagedSearch", ClusterManagedSearch, ClusterManagedSearch.entity().getId(),
- UnmanagedDirectConnectSearch.entity().getClusterId(), JoinType.INNER);
+ UnmanagedDirectConnectSearch.join("ClusterManagedSearch", ClusterManagedSearch, ClusterManagedSearch.entity().getId(), UnmanagedDirectConnectSearch.entity()
+ .getClusterId(), JoinType.INNER);
UnmanagedDirectConnectSearch.done();
DirectConnectSearch = createSearchBuilder();
@@ -733,7 +733,8 @@ public class HostDaoImpl extends GenericDaoBase<HostVO, Long> implements HostDao
List<HostVO> result = new ArrayList<HostVO>();
ResultSet rs = null;
try {
- String sql = "select h.id from host h left join cluster c on h.cluster_id=c.id where h.mgmt_server_id is not null and h.last_ping < ? and h.status in ('Up', 'Updating', 'Disconnected', 'Connecting') and h.type not in ('ExternalFirewall', 'ExternalLoadBalancer', 'TrafficMonitor', 'SecondaryStorage', 'LocalSecondaryStorage', 'L2Networking') and (h.cluster_id is null or c.managed_state = 'Managed') ;";
+ String sql =
+ "select h.id from host h left join cluster c on h.cluster_id=c.id where h.mgmt_server_id is not null and h.last_ping < ? and h.status in ('Up', 'Updating', 'Disconnected', 'Connecting') and h.type not in ('ExternalFirewall', 'ExternalLoadBalancer', 'TrafficMonitor', 'SecondaryStorage', 'LocalSecondaryStorage', 'L2Networking') and (h.cluster_id is null or c.managed_state = 'Managed') ;";
pstmt = txn.prepareStatement(sql);
pstmt.setLong(1, timeout);
rs = pstmt.executeQuery();
@@ -824,10 +825,11 @@ public class HostDaoImpl extends GenericDaoBase<HostVO, Long> implements HostDao
@Override
@DB
public List<RunningHostCountInfo> getRunningHostCounts(Date cutTime) {
- String sql = "select * from (" + "select h.data_center_id, h.type, count(*) as count from host as h INNER JOIN mshost as m ON h.mgmt_server_id=m.msid "
- + "where h.status='Up' and h.type='SecondaryStorage' and m.last_update > ? " + "group by h.data_center_id, h.type " + "UNION ALL "
- + "select h.data_center_id, h.type, count(*) as count from host as h INNER JOIN mshost as m ON h.mgmt_server_id=m.msid "
- + "where h.status='Up' and h.type='Routing' and m.last_update > ? " + "group by h.data_center_id, h.type) as t " + "ORDER by t.data_center_id, t.type";
+ String sql =
+ "select * from (" + "select h.data_center_id, h.type, count(*) as count from host as h INNER JOIN mshost as m ON h.mgmt_server_id=m.msid "
+ + "where h.status='Up' and h.type='SecondaryStorage' and m.last_update > ? " + "group by h.data_center_id, h.type " + "UNION ALL "
+ + "select h.data_center_id, h.type, count(*) as count from host as h INNER JOIN mshost as m ON h.mgmt_server_id=m.msid "
+ + "where h.status='Up' and h.type='Routing' and m.last_update > ? " + "group by h.data_center_id, h.type) as t " + "ORDER by t.data_center_id, t.type";
ArrayList<RunningHostCountInfo> l = new ArrayList<RunningHostCountInfo>();
@@ -946,7 +948,13 @@ public class HostDaoImpl extends GenericDaoBase<HostVO, Long> implements HostDao
.append(":lastpinged=")
.append(host.getLastPinged())
.append("]");
- str.append("; Old=[status=").append(oldStatus.toString()).append(":msid=").append(host.getManagementServerId()).append(":lastpinged=").append(oldPingTime).append("]");
+ str.append("; Old=[status=")
+ .append(oldStatus.toString())
+ .append(":msid=")
+ .append(host.getManagementServerId())
+ .append(":lastpinged=")
+ .append(oldPingTime)
+ .append("]");
str.append("; DB=[status=")
.append(vo.getStatus().toString())
.append(":msid=")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/host/dao/HostTagsDao.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/host/dao/HostTagsDao.java b/engine/schema/src/com/cloud/host/dao/HostTagsDao.java
index 4f38782..50c0b7e 100644
--- a/engine/schema/src/com/cloud/host/dao/HostTagsDao.java
+++ b/engine/schema/src/com/cloud/host/dao/HostTagsDao.java
@@ -17,6 +17,7 @@
package com.cloud.host.dao;
import java.util.List;
+
import com.cloud.host.HostTagVO;
import com.cloud.utils.db.GenericDao;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/hypervisor/HypervisorCapabilitiesVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/hypervisor/HypervisorCapabilitiesVO.java b/engine/schema/src/com/cloud/hypervisor/HypervisorCapabilitiesVO.java
index fd6e654..2deeb2e 100644
--- a/engine/schema/src/com/cloud/hypervisor/HypervisorCapabilitiesVO.java
+++ b/engine/schema/src/com/cloud/hypervisor/HypervisorCapabilitiesVO.java
@@ -27,10 +27,8 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
-import org.apache.cloudstack.api.Identity;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.utils.NumbersUtil;
-import org.apache.cloudstack.api.InternalIdentity;
@Entity
@Table(name = "hypervisor_capabilities")
@@ -72,7 +70,8 @@ public class HypervisorCapabilitiesVO implements HypervisorCapabilities {
this.uuid = UUID.randomUUID().toString();
}
- public HypervisorCapabilitiesVO(HypervisorType hypervisorType, String hypervisorVersion, Long maxGuestsLimit, boolean securityGroupEnabled, boolean storageMotionSupported) {
+ public HypervisorCapabilitiesVO(HypervisorType hypervisorType, String hypervisorVersion, Long maxGuestsLimit, boolean securityGroupEnabled,
+ boolean storageMotionSupported) {
this.hypervisorType = hypervisorType;
this.hypervisorVersion = hypervisorVersion;
this.maxGuestsLimit = maxGuestsLimit;
@@ -153,6 +152,7 @@ public class HypervisorCapabilitiesVO implements HypervisorCapabilities {
return storageMotionSupported;
}
+ @Override
public long getId() {
return id;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/hypervisor/dao/HypervisorCapabilitiesDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/hypervisor/dao/HypervisorCapabilitiesDaoImpl.java b/engine/schema/src/com/cloud/hypervisor/dao/HypervisorCapabilitiesDaoImpl.java
index b5057f7..2b94e69 100644
--- a/engine/schema/src/com/cloud/hypervisor/dao/HypervisorCapabilitiesDaoImpl.java
+++ b/engine/schema/src/com/cloud/hypervisor/dao/HypervisorCapabilitiesDaoImpl.java
@@ -16,16 +16,18 @@
// under the License.
package com.cloud.hypervisor.dao;
+import java.util.List;
+
+import javax.ejb.Local;
+
+import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
+
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.hypervisor.HypervisorCapabilitiesVO;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
-import org.apache.log4j.Logger;
-import org.springframework.stereotype.Component;
-
-import javax.ejb.Local;
-import java.util.List;
@Component
@Local(value = HypervisorCapabilitiesDao.class)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/keystore/KeystoreDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/keystore/KeystoreDaoImpl.java b/engine/schema/src/com/cloud/keystore/KeystoreDaoImpl.java
index 0d365fe..6c51a26 100644
--- a/engine/schema/src/com/cloud/keystore/KeystoreDaoImpl.java
+++ b/engine/schema/src/com/cloud/keystore/KeystoreDaoImpl.java
@@ -80,7 +80,8 @@ public class KeystoreDaoImpl extends GenericDaoBase<KeystoreVO, Long> implements
try {
txn.start();
- String sql = "INSERT INTO keystore (`name`, `certificate`, `key`, `domain_suffix`) VALUES (?, ?, ?, ?) ON DUPLICATE KEY UPDATE `certificate`=?, `key`=?, `domain_suffix`=?";
+ String sql =
+ "INSERT INTO keystore (`name`, `certificate`, `key`, `domain_suffix`) VALUES (?, ?, ?, ?) ON DUPLICATE KEY UPDATE `certificate`=?, `key`=?, `domain_suffix`=?";
PreparedStatement pstmt = txn.prepareAutoCloseStatement(sql);
pstmt.setString(1, name);
pstmt.setString(2, certificate);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/keystore/KeystoreVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/keystore/KeystoreVO.java b/engine/schema/src/com/cloud/keystore/KeystoreVO.java
index fd5c185..66dfac1 100644
--- a/engine/schema/src/com/cloud/keystore/KeystoreVO.java
+++ b/engine/schema/src/com/cloud/keystore/KeystoreVO.java
@@ -16,8 +16,6 @@
// under the License.
package com.cloud.keystore;
-import org.apache.cloudstack.api.InternalIdentity;
-
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
@@ -25,6 +23,8 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
+import org.apache.cloudstack.api.InternalIdentity;
+
@Entity
@Table(name = "keystore")
public class KeystoreVO implements InternalIdentity {
@@ -51,6 +51,7 @@ public class KeystoreVO implements InternalIdentity {
public KeystoreVO() {
}
+ @Override
public long getId() {
return id;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/LBHealthCheckPolicyVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/LBHealthCheckPolicyVO.java b/engine/schema/src/com/cloud/network/LBHealthCheckPolicyVO.java
index a3f00b7..f1e8fe8 100644
--- a/engine/schema/src/com/cloud/network/LBHealthCheckPolicyVO.java
+++ b/engine/schema/src/com/cloud/network/LBHealthCheckPolicyVO.java
@@ -16,11 +16,6 @@
// under the License.
package com.cloud.network;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
import java.util.UUID;
import javax.persistence.Column;
@@ -32,7 +27,6 @@ import javax.persistence.PrimaryKeyJoinColumn;
import javax.persistence.Table;
import com.cloud.network.rules.HealthCheckPolicy;
-import org.apache.cloudstack.api.InternalIdentity;
@Entity
@Table(name = ("load_balancer_healthcheck_policies"))
@@ -106,38 +100,47 @@ public class LBHealthCheckPolicyVO implements HealthCheckPolicy {
}
+ @Override
public int getResponseTime() {
return responseTime;
}
+ @Override
public int getHealthcheckInterval() {
return healthcheckInterval;
}
+ @Override
public int getHealthcheckThresshold() {
return healthcheckThresshold;
}
+ @Override
public int getUnhealthThresshold() {
return unhealthThresshold;
}
+ @Override
public long getId() {
return id;
}
+ @Override
public long getLoadBalancerId() {
return loadBalancerId;
}
+ @Override
public String getpingpath() {
return pingPath;
}
+ @Override
public String getDescription() {
return description;
}
+ @Override
public boolean isRevoke() {
return revoke;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/UserIpv6AddressVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/UserIpv6AddressVO.java b/engine/schema/src/com/cloud/network/UserIpv6AddressVO.java
index 264e415..3098a68 100644
--- a/engine/schema/src/com/cloud/network/UserIpv6AddressVO.java
+++ b/engine/schema/src/com/cloud/network/UserIpv6AddressVO.java
@@ -27,7 +27,6 @@ import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
-import javax.persistence.Transient;
import com.cloud.utils.db.GenericDao;
@@ -149,6 +148,7 @@ public class UserIpv6AddressVO implements UserIpv6Address {
this.state = state;
}
+ @Override
public String getMacAddress() {
return macAddress;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/VpnUserVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/VpnUserVO.java b/engine/schema/src/com/cloud/network/VpnUserVO.java
index 09c14ad..07b6326 100644
--- a/engine/schema/src/com/cloud/network/VpnUserVO.java
+++ b/engine/schema/src/com/cloud/network/VpnUserVO.java
@@ -27,9 +27,7 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
-import org.apache.cloudstack.api.Identity;
import com.cloud.utils.db.Encrypt;
-import org.apache.cloudstack.api.InternalIdentity;
@Entity
@Table(name = ("vpn_users"))
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/as/AutoScalePolicyConditionMapVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/as/AutoScalePolicyConditionMapVO.java b/engine/schema/src/com/cloud/network/as/AutoScalePolicyConditionMapVO.java
index 93905a5..834422f 100644
--- a/engine/schema/src/com/cloud/network/as/AutoScalePolicyConditionMapVO.java
+++ b/engine/schema/src/com/cloud/network/as/AutoScalePolicyConditionMapVO.java
@@ -16,8 +16,6 @@
// under the License.
package com.cloud.network.as;
-import org.apache.cloudstack.api.InternalIdentity;
-
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
@@ -25,6 +23,8 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
+import org.apache.cloudstack.api.InternalIdentity;
+
@Entity
@Table(name = ("autoscale_policy_condition_map"))
public class AutoScalePolicyConditionMapVO implements InternalIdentity {
@@ -48,6 +48,7 @@ public class AutoScalePolicyConditionMapVO implements InternalIdentity {
this.conditionId = conditionId;
}
+ @Override
public long getId() {
return id;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/as/AutoScalePolicyVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/as/AutoScalePolicyVO.java b/engine/schema/src/com/cloud/network/as/AutoScalePolicyVO.java
index f8fbcb4..fbaf8e9 100644
--- a/engine/schema/src/com/cloud/network/as/AutoScalePolicyVO.java
+++ b/engine/schema/src/com/cloud/network/as/AutoScalePolicyVO.java
@@ -28,9 +28,10 @@ import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import javax.persistence.Table;
-import com.cloud.utils.db.GenericDao;
import org.apache.cloudstack.api.InternalIdentity;
+import com.cloud.utils.db.GenericDao;
+
@Entity
@Table(name = "autoscale_policies")
@Inheritance(strategy = InheritanceType.JOINED)
@@ -87,6 +88,7 @@ public class AutoScalePolicyVO implements AutoScalePolicy, InternalIdentity {
return id;
}
+ @Override
public String getUuid() {
return uuid;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/as/AutoScaleVmGroupPolicyMapVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/as/AutoScaleVmGroupPolicyMapVO.java b/engine/schema/src/com/cloud/network/as/AutoScaleVmGroupPolicyMapVO.java
index 6bec99e..b275364 100644
--- a/engine/schema/src/com/cloud/network/as/AutoScaleVmGroupPolicyMapVO.java
+++ b/engine/schema/src/com/cloud/network/as/AutoScaleVmGroupPolicyMapVO.java
@@ -16,8 +16,6 @@
// under the License.
package com.cloud.network.as;
-import org.apache.cloudstack.api.InternalIdentity;
-
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
@@ -25,6 +23,8 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
+import org.apache.cloudstack.api.InternalIdentity;
+
@Entity
@Table(name = ("autoscale_vmgroup_policy_map"))
public class AutoScaleVmGroupPolicyMapVO implements InternalIdentity {
@@ -51,6 +51,7 @@ public class AutoScaleVmGroupPolicyMapVO implements InternalIdentity {
this(vmgroupId, policyId);
}
+ @Override
public long getId() {
return id;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/as/AutoScaleVmGroupVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/as/AutoScaleVmGroupVO.java b/engine/schema/src/com/cloud/network/as/AutoScaleVmGroupVO.java
index d1d85f9..4eed086 100644
--- a/engine/schema/src/com/cloud/network/as/AutoScaleVmGroupVO.java
+++ b/engine/schema/src/com/cloud/network/as/AutoScaleVmGroupVO.java
@@ -28,9 +28,10 @@ import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import javax.persistence.Table;
-import com.cloud.utils.db.GenericDao;
import org.apache.cloudstack.api.InternalIdentity;
+import com.cloud.utils.db.GenericDao;
+
@Entity
@Table(name = "autoscale_vmgroups")
@Inheritance(strategy = InheritanceType.JOINED)
@@ -83,7 +84,8 @@ public class AutoScaleVmGroupVO implements AutoScaleVmGroup, InternalIdentity {
public AutoScaleVmGroupVO() {
}
- public AutoScaleVmGroupVO(long lbRuleId, long zoneId, long domainId, long accountId, int minMembers, int maxMembers, int memberPort, int interval, long profileId, String state) {
+ public AutoScaleVmGroupVO(long lbRuleId, long zoneId, long domainId, long accountId, int minMembers, int maxMembers, int memberPort, int interval, long profileId,
+ String state) {
this.uuid = UUID.randomUUID().toString();
this.loadBalancerId = lbRuleId;
this.minMembers = minMembers;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/as/AutoScaleVmProfileVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/as/AutoScaleVmProfileVO.java b/engine/schema/src/com/cloud/network/as/AutoScaleVmProfileVO.java
index a7ad532..ec643b0 100644
--- a/engine/schema/src/com/cloud/network/as/AutoScaleVmProfileVO.java
+++ b/engine/schema/src/com/cloud/network/as/AutoScaleVmProfileVO.java
@@ -34,10 +34,11 @@ import javax.persistence.InheritanceType;
import javax.persistence.Table;
import org.apache.cloudstack.api.Identity;
+import org.apache.cloudstack.api.InternalIdentity;
+
import com.cloud.utils.Pair;
import com.cloud.utils.db.GenericDao;
import com.cloud.utils.net.NetUtils;
-import org.apache.cloudstack.api.InternalIdentity;
@Entity
@Table(name = "autoscale_vmprofiles")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/as/ConditionVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/as/ConditionVO.java b/engine/schema/src/com/cloud/network/as/ConditionVO.java
index bbae72f..8d7e776 100644
--- a/engine/schema/src/com/cloud/network/as/ConditionVO.java
+++ b/engine/schema/src/com/cloud/network/as/ConditionVO.java
@@ -30,9 +30,10 @@ import javax.persistence.Id;
import javax.persistence.Table;
import org.apache.cloudstack.api.Identity;
-import com.cloud.utils.db.GenericDao;
import org.apache.cloudstack.api.InternalIdentity;
+import com.cloud.utils.db.GenericDao;
+
@Entity
@Table(name = "conditions")
public class ConditionVO implements Condition, Identity, InternalIdentity {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/as/CounterVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/as/CounterVO.java b/engine/schema/src/com/cloud/network/as/CounterVO.java
index b7b03f7..2ba71f0 100644
--- a/engine/schema/src/com/cloud/network/as/CounterVO.java
+++ b/engine/schema/src/com/cloud/network/as/CounterVO.java
@@ -30,9 +30,10 @@ import javax.persistence.Id;
import javax.persistence.Table;
import org.apache.cloudstack.api.Identity;
-import com.cloud.utils.db.GenericDao;
import org.apache.cloudstack.api.InternalIdentity;
+import com.cloud.utils.db.GenericDao;
+
@Entity
@Table(name = "counter")
public class CounterVO implements Counter, Identity, InternalIdentity {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/as/dao/AutoScalePolicyConditionMapDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/as/dao/AutoScalePolicyConditionMapDaoImpl.java b/engine/schema/src/com/cloud/network/as/dao/AutoScalePolicyConditionMapDaoImpl.java
index 9a614f4..5933f36 100644
--- a/engine/schema/src/com/cloud/network/as/dao/AutoScalePolicyConditionMapDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/as/dao/AutoScalePolicyConditionMapDaoImpl.java
@@ -47,6 +47,7 @@ public class AutoScalePolicyConditionMapDaoImpl extends GenericDaoBase<AutoScale
return listBy(getSearchCriteria(policyId, conditionId));
}
+ @Override
public boolean isConditionInUse(Long conditionId) {
return findOneBy(getSearchCriteria(null, conditionId)) != null;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/as/dao/AutoScalePolicyDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/as/dao/AutoScalePolicyDaoImpl.java b/engine/schema/src/com/cloud/network/as/dao/AutoScalePolicyDaoImpl.java
index 692ce1a..684aaad 100644
--- a/engine/schema/src/com/cloud/network/as/dao/AutoScalePolicyDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/as/dao/AutoScalePolicyDaoImpl.java
@@ -28,6 +28,7 @@ import com.cloud.utils.db.SearchCriteria;
@Local(value = {AutoScalePolicyDao.class})
public class AutoScalePolicyDaoImpl extends GenericDaoBase<AutoScalePolicyVO, Long> implements AutoScalePolicyDao {
+ @Override
public int removeByAccountId(long accountId) {
SearchCriteria<AutoScalePolicyVO> sc = createSearchCriteria();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/as/dao/ConditionDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/as/dao/ConditionDaoImpl.java b/engine/schema/src/com/cloud/network/as/dao/ConditionDaoImpl.java
index 8235823..2bb8fd3 100644
--- a/engine/schema/src/com/cloud/network/as/dao/ConditionDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/as/dao/ConditionDaoImpl.java
@@ -46,6 +46,7 @@ public class ConditionDaoImpl extends GenericDaoBase<ConditionVO, Long> implemen
return findOneBy(sc);
}
+ @Override
public int removeByAccountId(long accountId) {
SearchCriteria<ConditionVO> sc = createSearchCriteria();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapDao.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapDao.java b/engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapDao.java
index dc1ec89..e3b223e 100644
--- a/engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapDao.java
+++ b/engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapDao.java
@@ -16,11 +16,10 @@
// under the License.
package com.cloud.network.dao;
-import com.cloud.network.dao.AccountGuestVlanMapVO;
-import com.cloud.utils.db.GenericDao;
-
import java.util.List;
+import com.cloud.utils.db.GenericDao;
+
public interface AccountGuestVlanMapDao extends GenericDao<AccountGuestVlanMapVO, Long> {
public List<AccountGuestVlanMapVO> listAccountGuestVlanMapsByAccount(long accountId);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapDaoImpl.java b/engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapDaoImpl.java
index 20fa5d0..a31798f 100644
--- a/engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapDaoImpl.java
@@ -16,11 +16,10 @@
// under the License.
package com.cloud.network.dao;
-import com.cloud.network.dao.AccountGuestVlanMapVO;
-import com.cloud.network.dao.AccountGuestVlanMapDao;
-
import java.util.List;
+
import javax.ejb.Local;
+
import org.springframework.stereotype.Component;
import com.cloud.utils.db.DB;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapVO.java b/engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapVO.java
index 67227a7..4234c73 100644
--- a/engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapVO.java
+++ b/engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapVO.java
@@ -16,11 +16,17 @@
// under the License.
package com.cloud.network.dao;
-import com.cloud.network.GuestVlan;
-
-import javax.persistence.*;
import java.util.UUID;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import com.cloud.network.GuestVlan;
+
@Entity
@Table(name = "account_vnet_map")
public class AccountGuestVlanMapVO implements GuestVlan {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/ExternalFirewallDeviceDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/ExternalFirewallDeviceDaoImpl.java b/engine/schema/src/com/cloud/network/dao/ExternalFirewallDeviceDaoImpl.java
index c9334ef..11fa5ed 100644
--- a/engine/schema/src/com/cloud/network/dao/ExternalFirewallDeviceDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/dao/ExternalFirewallDeviceDaoImpl.java
@@ -17,6 +17,7 @@
package com.cloud.network.dao;
import java.util.List;
+
import javax.ejb.Local;
import org.springframework.stereotype.Component;
@@ -77,7 +78,8 @@ public class ExternalFirewallDeviceDaoImpl extends GenericDaoBase<ExternalFirewa
}
@Override
- public List<ExternalFirewallDeviceVO> listByProviderAndDeviceAllocationState(long physicalNetworkId, String providerName, FirewallDeviceAllocationState allocationState) {
+ public List<ExternalFirewallDeviceVO> listByProviderAndDeviceAllocationState(long physicalNetworkId, String providerName,
+ FirewallDeviceAllocationState allocationState) {
SearchCriteria<ExternalFirewallDeviceVO> sc = allocationStateSearch.create();
sc.setParameters("physicalNetworkId", physicalNetworkId);
sc.setParameters("providerName", providerName);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/ExternalFirewallDeviceVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/ExternalFirewallDeviceVO.java b/engine/schema/src/com/cloud/network/dao/ExternalFirewallDeviceVO.java
index 76460a3..2e49ba8 100644
--- a/engine/schema/src/com/cloud/network/dao/ExternalFirewallDeviceVO.java
+++ b/engine/schema/src/com/cloud/network/dao/ExternalFirewallDeviceVO.java
@@ -16,9 +16,6 @@
// under the License.
package com.cloud.network.dao;
-import org.apache.cloudstack.api.Identity;
-import org.apache.cloudstack.api.InternalIdentity;
-
import java.util.UUID;
import javax.persistence.Column;
@@ -30,6 +27,9 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
+import org.apache.cloudstack.api.Identity;
+import org.apache.cloudstack.api.InternalIdentity;
+
/**
* ExternalFirewallDeviceVO contains information of a external firewall device (Juniper SRX) added into a deployment
*/
@@ -97,6 +97,7 @@ public class ExternalFirewallDeviceVO implements InternalIdentity, Identity {
this.uuid = UUID.randomUUID().toString();
}
+ @Override
public long getId() {
return id;
}
@@ -149,6 +150,7 @@ public class ExternalFirewallDeviceVO implements InternalIdentity, Identity {
isDedicatedDevice = isDedicated;
}
+ @Override
public String getUuid() {
return uuid;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDao.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDao.java b/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDao.java
index b7baa7e..b755598 100644
--- a/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDao.java
+++ b/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDao.java
@@ -16,12 +16,12 @@
// under the License.
package com.cloud.network.dao;
+import java.util.List;
+
import com.cloud.network.dao.ExternalLoadBalancerDeviceVO.LBDeviceAllocationState;
import com.cloud.network.dao.ExternalLoadBalancerDeviceVO.LBDeviceState;
import com.cloud.utils.db.GenericDao;
-import java.util.List;
-
public interface ExternalLoadBalancerDeviceDao extends GenericDao<ExternalLoadBalancerDeviceVO, Long> {
/**
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDaoImpl.java b/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDaoImpl.java
index 88c0d37..f12d063 100644
--- a/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDaoImpl.java
@@ -16,6 +16,12 @@
// under the License.
package com.cloud.network.dao;
+import java.util.List;
+
+import javax.ejb.Local;
+
+import org.springframework.stereotype.Component;
+
import com.cloud.network.dao.ExternalLoadBalancerDeviceVO.LBDeviceAllocationState;
import com.cloud.network.dao.ExternalLoadBalancerDeviceVO.LBDeviceState;
import com.cloud.utils.db.DB;
@@ -23,10 +29,6 @@ import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Op;
-import org.springframework.stereotype.Component;
-
-import javax.ejb.Local;
-import java.util.List;
@Component
@Local(value = ExternalLoadBalancerDeviceDao.class)
@@ -76,6 +78,7 @@ public class ExternalLoadBalancerDeviceDaoImpl extends GenericDaoBase<ExternalLo
}
+ @Override
public List<ExternalLoadBalancerDeviceVO> listByPhysicalNetwork(long physicalNetworkId) {
SearchCriteria<ExternalLoadBalancerDeviceVO> sc = physicalNetworkIdSearch.create();
sc.setParameters("physicalNetworkId", physicalNetworkId);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceVO.java b/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceVO.java
index e7222a8..8cc13fd 100644
--- a/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceVO.java
+++ b/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceVO.java
@@ -16,13 +16,21 @@
// under the License.
package com.cloud.network.dao;
+import java.util.UUID;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
import org.apache.cloudstack.api.Identity;
import org.apache.cloudstack.api.InternalIdentity;
import org.apache.cloudstack.network.ExternalNetworkDeviceManager;
-import javax.persistence.*;
-import java.util.UUID;
-
/**
* ExternalLoadBalancerDeviceVO contains information on external load balancer devices (F5/Netscaler VPX,MPX,SDX) added into a deployment
*/
@@ -92,7 +100,8 @@ public class ExternalLoadBalancerDeviceVO implements InternalIdentity, Identity
Provider // This state is set only for device that can dynamically provision LB appliances
}
- public ExternalLoadBalancerDeviceVO(long hostId, long physicalNetworkId, String provider_name, String device_name, long capacity, boolean dedicated, boolean gslbProvider) {
+ public ExternalLoadBalancerDeviceVO(long hostId, long physicalNetworkId, String provider_name, String device_name, long capacity, boolean dedicated,
+ boolean gslbProvider) {
this.physicalNetworkId = physicalNetworkId;
this.providerName = provider_name;
this.deviceName = device_name;
@@ -123,6 +132,7 @@ public class ExternalLoadBalancerDeviceVO implements InternalIdentity, Identity
this.uuid = UUID.randomUUID().toString();
}
+ @Override
public long getId() {
return id;
}
@@ -215,6 +225,7 @@ public class ExternalLoadBalancerDeviceVO implements InternalIdentity, Identity
return gslbSitePrivateIP;
}
+ @Override
public String getUuid() {
return uuid;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/FirewallRulesCidrsVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/FirewallRulesCidrsVO.java b/engine/schema/src/com/cloud/network/dao/FirewallRulesCidrsVO.java
index d0aacff..e6871bb 100644
--- a/engine/schema/src/com/cloud/network/dao/FirewallRulesCidrsVO.java
+++ b/engine/schema/src/com/cloud/network/dao/FirewallRulesCidrsVO.java
@@ -16,8 +16,6 @@
// under the License.
package com.cloud.network.dao;
-import org.apache.cloudstack.api.InternalIdentity;
-
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
@@ -25,6 +23,8 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
+import org.apache.cloudstack.api.InternalIdentity;
+
@Entity
@Table(name = ("firewall_rules_cidrs"))
public class FirewallRulesCidrsVO implements InternalIdentity {
@@ -47,6 +47,7 @@ public class FirewallRulesCidrsVO implements InternalIdentity {
this.sourceCidrList = sourceCidrList;
}
+ @Override
public long getId() {
return id;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/FirewallRulesDaoImpl.java b/engine/schema/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
index 44989dc..6a43486 100644
--- a/engine/schema/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
@@ -241,7 +241,8 @@ public class FirewallRulesDaoImpl extends GenericDaoBase<FirewallRuleVO, Long> i
}
@Override
- public List<FirewallRuleVO> listByIpPurposeAndProtocolAndNotRevoked(long ipAddressId, Integer startPort, Integer endPort, String protocol, FirewallRule.Purpose purpose) {
+ public List<FirewallRuleVO> listByIpPurposeAndProtocolAndNotRevoked(long ipAddressId, Integer startPort, Integer endPort, String protocol,
+ FirewallRule.Purpose purpose) {
SearchCriteria<FirewallRuleVO> sc = NotRevokedSearch.create();
sc.setParameters("ipId", ipAddressId);
sc.setParameters("state", State.Revoke);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/IPAddressDao.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/IPAddressDao.java b/engine/schema/src/com/cloud/network/dao/IPAddressDao.java
index 5cc91e6..fb92cf9 100755
--- a/engine/schema/src/com/cloud/network/dao/IPAddressDao.java
+++ b/engine/schema/src/com/cloud/network/dao/IPAddressDao.java
@@ -16,14 +16,12 @@
// under the License.
package com.cloud.network.dao;
+import java.util.List;
+
import com.cloud.dc.Vlan.VlanType;
-import com.cloud.utils.db.DB;
import com.cloud.utils.db.GenericDao;
import com.cloud.utils.net.Ip;
-import java.sql.SQLException;
-import java.util.List;
-
public interface IPAddressDao extends GenericDao<IPAddressVO, Long> {
IPAddressVO markAsUnavailable(long ipAddressId);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/IPAddressDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/IPAddressDaoImpl.java b/engine/schema/src/com/cloud/network/dao/IPAddressDaoImpl.java
index 8ad3f70..97c4de1 100755
--- a/engine/schema/src/com/cloud/network/dao/IPAddressDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/dao/IPAddressDaoImpl.java
@@ -16,7 +16,18 @@
// under the License.
package com.cloud.network.dao;
-import com.cloud.dc.DataCenterVnetVO;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.Date;
+import java.util.List;
+
+import javax.annotation.PostConstruct;
+import javax.ejb.Local;
+import javax.inject.Inject;
+
+import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
+
import com.cloud.dc.Vlan.VlanType;
import com.cloud.dc.VlanVO;
import com.cloud.dc.dao.VlanDao;
@@ -33,17 +44,6 @@ import com.cloud.utils.db.SearchCriteria.Func;
import com.cloud.utils.db.SearchCriteria.Op;
import com.cloud.utils.db.TransactionLegacy;
import com.cloud.utils.net.Ip;
-import org.apache.log4j.Logger;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.PostConstruct;
-import javax.ejb.Local;
-import javax.inject.Inject;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.Date;
-import java.util.List;
@Component
@Local(value = {IPAddressDao.class})
@@ -112,7 +112,8 @@ public class IPAddressDaoImpl extends GenericDaoBase<IPAddressVO, Long> implemen
SearchBuilder<VlanVO> virtaulNetworkVlan = _vlanDao.createSearchBuilder();
virtaulNetworkVlan.and("vlanType", virtaulNetworkVlan.entity().getVlanType(), SearchCriteria.Op.EQ);
- AllIpCountForDashboard.join("vlan", virtaulNetworkVlan, virtaulNetworkVlan.entity().getId(), AllIpCountForDashboard.entity().getVlanId(), JoinBuilder.JoinType.INNER);
+ AllIpCountForDashboard.join("vlan", virtaulNetworkVlan, virtaulNetworkVlan.entity().getId(), AllIpCountForDashboard.entity().getVlanId(),
+ JoinBuilder.JoinType.INNER);
virtaulNetworkVlan.done();
AllIpCountForDashboard.done();
@@ -289,7 +290,8 @@ public class IPAddressDaoImpl extends GenericDaoBase<IPAddressVO, Long> implemen
TransactionLegacy txn = TransactionLegacy.currentTxn();
int ipCount = 0;
try {
- String sql = "SELECT count(*) FROM user_ip_address u INNER JOIN vlan v on (u.vlan_db_id = v.id AND v.data_center_id = ? AND v.vlan_id = ? AND v.vlan_gateway = ? AND v.vlan_netmask = ? AND u.account_id = ?)";
+ String sql =
+ "SELECT count(*) FROM user_ip_address u INNER JOIN vlan v on (u.vlan_db_id = v.id AND v.data_center_id = ? AND v.vlan_id = ? AND v.vlan_gateway = ? AND v.vlan_netmask = ? AND u.account_id = ?)";
PreparedStatement pstmt = txn.prepareAutoCloseStatement(sql);
pstmt.setLong(1, dcId);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/IPAddressVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/IPAddressVO.java b/engine/schema/src/com/cloud/network/dao/IPAddressVO.java
index 3d4592d..d71a90f 100644
--- a/engine/schema/src/com/cloud/network/dao/IPAddressVO.java
+++ b/engine/schema/src/com/cloud/network/dao/IPAddressVO.java
@@ -253,6 +253,7 @@ public class IPAddressVO implements IpAddress {
return state;
}
+ @Override
public void setState(State state) {
this.state = state;
}
@@ -284,6 +285,7 @@ public class IPAddressVO implements IpAddress {
this.uuid = uuid;
}
+ @Override
public Long getPhysicalNetworkId() {
return physicalNetworkId;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/InlineLoadBalancerNicMapVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/InlineLoadBalancerNicMapVO.java b/engine/schema/src/com/cloud/network/dao/InlineLoadBalancerNicMapVO.java
index 2257149..3bfb076 100644
--- a/engine/schema/src/com/cloud/network/dao/InlineLoadBalancerNicMapVO.java
+++ b/engine/schema/src/com/cloud/network/dao/InlineLoadBalancerNicMapVO.java
@@ -16,8 +16,6 @@
// under the License.
package com.cloud.network.dao;
-import org.apache.cloudstack.api.InternalIdentity;
-
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
@@ -25,6 +23,8 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
+import org.apache.cloudstack.api.InternalIdentity;
+
@Entity
@Table(name = ("inline_load_balancer_nic_map"))
public class InlineLoadBalancerNicMapVO implements InternalIdentity {
@@ -47,6 +47,7 @@ public class InlineLoadBalancerNicMapVO implements InternalIdentity {
this.nicId = nicId;
}
+ @Override
public long getId() {
return id;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/LBStickinessPolicyVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/LBStickinessPolicyVO.java b/engine/schema/src/com/cloud/network/dao/LBStickinessPolicyVO.java
index d7c2bc2..6e8dfbb 100644
--- a/engine/schema/src/com/cloud/network/dao/LBStickinessPolicyVO.java
+++ b/engine/schema/src/com/cloud/network/dao/LBStickinessPolicyVO.java
@@ -30,9 +30,9 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.PrimaryKeyJoinColumn;
import javax.persistence.Table;
+
import com.cloud.network.rules.StickinessPolicy;
import com.cloud.utils.Pair;
-import org.apache.cloudstack.api.InternalIdentity;
@Entity
@Table(name = ("load_balancer_stickiness_policies"))
@@ -97,6 +97,7 @@ public class LBStickinessPolicyVO implements StickinessPolicy {
this.uuid = UUID.randomUUID().toString();
}
+ @Override
public List<Pair<String, String>> getParams() {
List<Pair<String, String>> paramsList = new ArrayList<Pair<String, String>>();
String[] params = paramsInDB.split("[=&]");
@@ -107,26 +108,32 @@ public class LBStickinessPolicyVO implements StickinessPolicy {
return paramsList;
}
+ @Override
public long getId() {
return id;
}
+ @Override
public long getLoadBalancerId() {
return loadBalancerId;
}
+ @Override
public String getName() {
return name;
}
+ @Override
public String getDescription() {
return description;
}
+ @Override
public String getMethodName() {
return methodName;
}
+ @Override
public boolean isRevoke() {
return revoke;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapDao.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapDao.java b/engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapDao.java
index 1bd320c..1e038a1 100644
--- a/engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapDao.java
+++ b/engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapDao.java
@@ -16,11 +16,10 @@
// under the License.
package com.cloud.network.dao;
-import com.cloud.network.LBHealthCheckPolicyVO;
-import com.cloud.utils.db.GenericDao;
-
import java.util.List;
+import com.cloud.utils.db.GenericDao;
+
public interface LoadBalancerCertMapDao extends GenericDao<LoadBalancerCertMapVO, Long> {
List<LoadBalancerCertMapVO> listByCertId(Long certId);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapDaoImpl.java b/engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapDaoImpl.java
index b196961..c84b97d 100644
--- a/engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapDaoImpl.java
@@ -16,15 +16,16 @@
// under the License.
package com.cloud.network.dao;
+import java.util.List;
+
+import javax.ejb.Local;
+import javax.inject.Inject;
+
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.JoinBuilder;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
-import javax.ejb.Local;
-import javax.inject.Inject;
-import java.util.List;
-
@Local(value = {LoadBalancerCertMapDao.class})
public class LoadBalancerCertMapDaoImpl extends GenericDaoBase<LoadBalancerCertMapVO, Long> implements LoadBalancerCertMapDao {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapVO.java b/engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapVO.java
index ea89246..f95c617 100644
--- a/engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapVO.java
+++ b/engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapVO.java
@@ -16,13 +16,14 @@
// under the License.
package com.cloud.network.dao;
-import org.apache.cloudstack.api.InternalIdentity;
+import java.util.UUID;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
-import java.util.UUID;
+
+import org.apache.cloudstack.api.InternalIdentity;
@Entity
@Table(name = "load_balancer_cert_map")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/LoadBalancerVMMapVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/LoadBalancerVMMapVO.java b/engine/schema/src/com/cloud/network/dao/LoadBalancerVMMapVO.java
index 27c8f79..0a67106 100644
--- a/engine/schema/src/com/cloud/network/dao/LoadBalancerVMMapVO.java
+++ b/engine/schema/src/com/cloud/network/dao/LoadBalancerVMMapVO.java
@@ -16,8 +16,6 @@
// under the License.
package com.cloud.network.dao;
-import org.apache.cloudstack.api.InternalIdentity;
-
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
@@ -25,6 +23,8 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
+import org.apache.cloudstack.api.InternalIdentity;
+
@Entity
@Table(name = ("load_balancer_vm_map"))
public class LoadBalancerVMMapVO implements InternalIdentity {
@@ -59,6 +59,7 @@ public class LoadBalancerVMMapVO implements InternalIdentity {
this.revoke = revoke;
}
+ @Override
public long getId() {
return id;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/LoadBalancerVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/LoadBalancerVO.java b/engine/schema/src/com/cloud/network/dao/LoadBalancerVO.java
index 88d83d4..865e7d2 100644
--- a/engine/schema/src/com/cloud/network/dao/LoadBalancerVO.java
+++ b/engine/schema/src/com/cloud/network/dao/LoadBalancerVO.java
@@ -65,8 +65,8 @@ public class LoadBalancerVO extends FirewallRuleVO implements LoadBalancer {
public LoadBalancerVO() {
}
- public LoadBalancerVO(String xId, String name, String description, long srcIpId, int srcPort, int dstPort, String algorithm, long networkId, long accountId, long domainId,
- String lbProtocol) {
+ public LoadBalancerVO(String xId, String name, String description, long srcIpId, int srcPort, int dstPort, String algorithm, long networkId, long accountId,
+ long domainId, String lbProtocol) {
super(xId, srcIpId, srcPort, NetUtils.TCP_PROTO, networkId, accountId, domainId, Purpose.LoadBalancing, null, null, null, null);
this.name = name;
this.description = description;
@@ -106,6 +106,7 @@ public class LoadBalancerVO extends FirewallRuleVO implements LoadBalancer {
this.name = name;
}
+ @Override
public String getLbProtocol() {
return lbProtocol;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/MonitoringServiceDao.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/MonitoringServiceDao.java b/engine/schema/src/com/cloud/network/dao/MonitoringServiceDao.java
index 6856a91..66e2531 100644
--- a/engine/schema/src/com/cloud/network/dao/MonitoringServiceDao.java
+++ b/engine/schema/src/com/cloud/network/dao/MonitoringServiceDao.java
@@ -17,10 +17,10 @@
package com.cloud.network.dao;
-import com.cloud.utils.db.GenericDao;
-
import java.util.List;
+import com.cloud.utils.db.GenericDao;
+
public interface MonitoringServiceDao extends GenericDao<MonitoringServiceVO, Long> {
List<MonitoringServiceVO> listAllServices();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/MonitoringServiceDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/MonitoringServiceDaoImpl.java b/engine/schema/src/com/cloud/network/dao/MonitoringServiceDaoImpl.java
index 8a80627..c2292a2 100644
--- a/engine/schema/src/com/cloud/network/dao/MonitoringServiceDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/dao/MonitoringServiceDaoImpl.java
@@ -17,13 +17,15 @@
package com.cloud.network.dao;
+import java.util.List;
+
+import javax.ejb.Local;
+
+import org.springframework.stereotype.Component;
+
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
-import org.springframework.stereotype.Component;
-
-import javax.ejb.Local;
-import java.util.List;
@Component
@Local(value = MonitoringServiceDao.class)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/MonitoringServiceVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/MonitoringServiceVO.java b/engine/schema/src/com/cloud/network/dao/MonitoringServiceVO.java
index 62a6196..1d7ef14 100644
--- a/engine/schema/src/com/cloud/network/dao/MonitoringServiceVO.java
+++ b/engine/schema/src/com/cloud/network/dao/MonitoringServiceVO.java
@@ -16,11 +16,17 @@
// under the License.
package com.cloud.network.dao;
-import com.cloud.network.MonitoringService;
-
-import javax.persistence.*;
import java.util.UUID;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import com.cloud.network.MonitoringService;
+
@Entity
@Table(name = "monitoring_services")
public class MonitoringServiceVO implements MonitoringService {
@@ -64,6 +70,7 @@ public class MonitoringServiceVO implements MonitoringService {
@Column(name = "uuid")
String uuid = UUID.randomUUID().toString();
+ @Override
public long getId() {
return id;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/NetworkAccountVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/NetworkAccountVO.java b/engine/schema/src/com/cloud/network/dao/NetworkAccountVO.java
index 7c71dee..208d130 100644
--- a/engine/schema/src/com/cloud/network/dao/NetworkAccountVO.java
+++ b/engine/schema/src/com/cloud/network/dao/NetworkAccountVO.java
@@ -23,9 +23,10 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
-import com.cloud.user.OwnedBy;
import org.apache.cloudstack.api.InternalIdentity;
+import com.cloud.user.OwnedBy;
+
@Entity
@Table(name = "account_network_ref")
public class NetworkAccountVO implements OwnedBy, InternalIdentity {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/NetworkDao.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/NetworkDao.java b/engine/schema/src/com/cloud/network/dao/NetworkDao.java
index e9405e9..6d49b0a 100644
--- a/engine/schema/src/com/cloud/network/dao/NetworkDao.java
+++ b/engine/schema/src/com/cloud/network/dao/NetworkDao.java
@@ -21,8 +21,8 @@ import java.util.Map;
import com.cloud.network.Network;
import com.cloud.network.Network.GuestType;
-import com.cloud.network.Networks.TrafficType;
import com.cloud.network.Network.State;
+import com.cloud.network.Networks.TrafficType;
import com.cloud.utils.db.GenericDao;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.fsm.StateDao;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/NetworkDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/NetworkDaoImpl.java b/engine/schema/src/com/cloud/network/dao/NetworkDaoImpl.java
index 5ead316..13fb64e 100644
--- a/engine/schema/src/com/cloud/network/dao/NetworkDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/dao/NetworkDaoImpl.java
@@ -25,15 +25,16 @@ import javax.ejb.Local;
import javax.inject.Inject;
import javax.persistence.TableGenerator;
-import org.apache.cloudstack.acl.ControlledEntity.ACLType;
import org.springframework.stereotype.Component;
+import org.apache.cloudstack.acl.ControlledEntity.ACLType;
+
import com.cloud.network.Network;
+import com.cloud.network.Network.Event;
import com.cloud.network.Network.GuestType;
import com.cloud.network.Network.Provider;
import com.cloud.network.Network.Service;
import com.cloud.network.Network.State;
-import com.cloud.network.Network.Event;
import com.cloud.network.Networks.BroadcastDomainType;
import com.cloud.network.Networks.Mode;
import com.cloud.network.Networks.TrafficType;
@@ -42,10 +43,17 @@ import com.cloud.offerings.NetworkOfferingVO;
import com.cloud.offerings.dao.NetworkOfferingDao;
import com.cloud.server.ResourceTag.ResourceObjectType;
import com.cloud.tags.dao.ResourceTagDao;
-import com.cloud.utils.db.*;
+import com.cloud.utils.db.DB;
+import com.cloud.utils.db.GenericDaoBase;
+import com.cloud.utils.db.GenericSearchBuilder;
+import com.cloud.utils.db.JoinBuilder;
import com.cloud.utils.db.JoinBuilder.JoinType;
+import com.cloud.utils.db.SearchBuilder;
+import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Func;
import com.cloud.utils.db.SearchCriteria.Op;
+import com.cloud.utils.db.SequenceFetcher;
+import com.cloud.utils.db.TransactionLegacy;
import com.cloud.utils.net.NetUtils;
@Component
@@ -191,7 +199,8 @@ public class NetworkDaoImpl extends GenericDaoBase<NetworkVO, Long> implements N
SearchBuilder<NetworkAccountVO> join4 = _accountsDao.createSearchBuilder();
join4.and("account", join4.entity().getAccountId(), Op.EQ);
join4.and("isOwner", join4.entity().isOwner(), Op.EQ);
- NetworksRegularUserCanCreateSearch.join("accounts", join4, NetworksRegularUserCanCreateSearch.entity().getId(), join4.entity().getNetworkId(), JoinBuilder.JoinType.INNER);
+ NetworksRegularUserCanCreateSearch.join("accounts", join4, NetworksRegularUserCanCreateSearch.entity().getId(), join4.entity().getNetworkId(),
+ JoinBuilder.JoinType.INNER);
SearchBuilder<NetworkOfferingVO> join5 = _ntwkOffDao.createSearchBuilder();
join5.and("specifyVlan", join5.entity().getSpecifyVlan(), Op.EQ);
NetworksRegularUserCanCreateSearch.join("ntwkOff", join5, NetworksRegularUserCanCreateSearch.entity().getNetworkOfferingId(), join5.entity().getId(),
@@ -221,8 +230,8 @@ public class NetworkDaoImpl extends GenericDaoBase<NetworkVO, Long> implements N
OfferingAccountNetworkSearch.select(null, Func.DISTINCT, OfferingAccountNetworkSearch.entity().getId());
SearchBuilder<NetworkOfferingVO> ntwkOfferingJoin = _ntwkOffDao.createSearchBuilder();
ntwkOfferingJoin.and("isSystem", ntwkOfferingJoin.entity().isSystemOnly(), Op.EQ);
- OfferingAccountNetworkSearch.join("ntwkOfferingSearch", ntwkOfferingJoin, OfferingAccountNetworkSearch.entity().getNetworkOfferingId(), ntwkOfferingJoin.entity().getId(),
- JoinBuilder.JoinType.LEFT);
+ OfferingAccountNetworkSearch.join("ntwkOfferingSearch", ntwkOfferingJoin, OfferingAccountNetworkSearch.entity().getNetworkOfferingId(), ntwkOfferingJoin.entity()
+ .getId(), JoinBuilder.JoinType.LEFT);
SearchBuilder<NetworkAccountVO> ntwkAccountJoin = _accountsDao.createSearchBuilder();
ntwkAccountJoin.and("accountId", ntwkAccountJoin.entity().getAccountId(), Op.EQ);
OfferingAccountNetworkSearch.join("ntwkAccountSearch", ntwkAccountJoin, OfferingAccountNetworkSearch.entity().getId(), ntwkAccountJoin.entity().getNetworkId(),
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/NetworkDetailsDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/NetworkDetailsDaoImpl.java b/engine/schema/src/com/cloud/network/dao/NetworkDetailsDaoImpl.java
index 3ef6847..c4fb481 100644
--- a/engine/schema/src/com/cloud/network/dao/NetworkDetailsDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/dao/NetworkDetailsDaoImpl.java
@@ -18,9 +18,10 @@ package com.cloud.network.dao;
import javax.ejb.Local;
-import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase;
import org.springframework.stereotype.Component;
+import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase;
+
@Component
@Local(value = NetworkDetailsDao.class)
public class NetworkDetailsDaoImpl extends ResourceDetailsDaoBase<NetworkDetailVO> implements NetworkDetailsDao {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/NetworkDomainDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/NetworkDomainDaoImpl.java b/engine/schema/src/com/cloud/network/dao/NetworkDomainDaoImpl.java
index 8d7eff3..e5ee255 100644
--- a/engine/schema/src/com/cloud/network/dao/NetworkDomainDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/dao/NetworkDomainDaoImpl.java
@@ -52,7 +52,7 @@ public class NetworkDomainDaoImpl extends GenericDaoBase<NetworkDomainVO, Long>
@Override
public List<NetworkDomainVO> listDomainNetworkMapByDomain(Object... domainId) {
SearchCriteria<NetworkDomainVO> sc = DomainsSearch.create();
- sc.setParameters("domainId", (Object[])domainId);
+ sc.setParameters("domainId", domainId);
return listBy(sc);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/NetworkDomainVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/NetworkDomainVO.java b/engine/schema/src/com/cloud/network/dao/NetworkDomainVO.java
index a3be08b..99cbb50 100644
--- a/engine/schema/src/com/cloud/network/dao/NetworkDomainVO.java
+++ b/engine/schema/src/com/cloud/network/dao/NetworkDomainVO.java
@@ -23,9 +23,10 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
-import com.cloud.domain.PartOf;
import org.apache.cloudstack.api.InternalIdentity;
+import com.cloud.domain.PartOf;
+
@Entity
@Table(name = "domain_network_ref")
public class NetworkDomainVO implements PartOf, InternalIdentity {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/NetworkExternalFirewallVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/NetworkExternalFirewallVO.java b/engine/schema/src/com/cloud/network/dao/NetworkExternalFirewallVO.java
index 096a09f..9cf9a61 100644
--- a/engine/schema/src/com/cloud/network/dao/NetworkExternalFirewallVO.java
+++ b/engine/schema/src/com/cloud/network/dao/NetworkExternalFirewallVO.java
@@ -26,9 +26,10 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
-import com.cloud.utils.db.GenericDao;
import org.apache.cloudstack.api.InternalIdentity;
+import com.cloud.utils.db.GenericDao;
+
/**
* NetworkExternalFirewallVO contains information on the networks that are using external firewall
*/
@@ -66,6 +67,7 @@ public class NetworkExternalFirewallVO implements InternalIdentity {
this.uuid = UUID.randomUUID().toString();
}
+ @Override
public long getId() {
return id;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/NetworkExternalLoadBalancerVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/NetworkExternalLoadBalancerVO.java b/engine/schema/src/com/cloud/network/dao/NetworkExternalLoadBalancerVO.java
index 095a1ce..6ba5c8f 100644
--- a/engine/schema/src/com/cloud/network/dao/NetworkExternalLoadBalancerVO.java
+++ b/engine/schema/src/com/cloud/network/dao/NetworkExternalLoadBalancerVO.java
@@ -26,9 +26,10 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
-import com.cloud.utils.db.GenericDao;
import org.apache.cloudstack.api.InternalIdentity;
+import com.cloud.utils.db.GenericDao;
+
/**
* NetworkExternalLoadBalancerVO contains mapping of a network and the external load balancer device id assigned to the network
*/
@@ -67,6 +68,7 @@ public class NetworkExternalLoadBalancerVO implements InternalIdentity {
this.uuid = UUID.randomUUID().toString();
}
+ @Override
public long getId() {
return id;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/NetworkOpDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/NetworkOpDaoImpl.java b/engine/schema/src/com/cloud/network/dao/NetworkOpDaoImpl.java
index 03a60e9..307b964 100644
--- a/engine/schema/src/com/cloud/network/dao/NetworkOpDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/dao/NetworkOpDaoImpl.java
@@ -16,12 +16,9 @@
// under the License.
package com.cloud.network.dao;
-import java.util.List;
-
import org.springframework.stereotype.Component;
import com.cloud.utils.db.Attribute;
-import com.cloud.utils.db.GenericDao;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.GenericSearchBuilder;
import com.cloud.utils.db.SearchBuilder;
@@ -51,6 +48,7 @@ public class NetworkOpDaoImpl extends GenericDaoBase<NetworkOpVO, Long> implemen
assert _activeNicsAttribute != null : "Cannot find activeNicsCount";
}
+ @Override
public int getActiveNics(long networkId) {
SearchCriteria<Integer> sc = ActiveNicsSearch.create();
sc.setParameters("network", networkId);
@@ -58,6 +56,7 @@ public class NetworkOpDaoImpl extends GenericDaoBase<NetworkOpVO, Long> implemen
return customSearch(sc, null).get(0);
}
+ @Override
public void changeActiveNicsBy(long networkId, int count) {
SearchCriteria<NetworkOpVO> sc = AllFieldsSearch.create();
@@ -70,12 +69,14 @@ public class NetworkOpDaoImpl extends GenericDaoBase<NetworkOpVO, Long> implemen
update(builder, sc, null);
}
+ @Override
public void setCheckForGc(long networkId) {
NetworkOpVO vo = createForUpdate();
vo.setCheckForGc(true);
update(networkId, vo);
}
+ @Override
public void clearCheckForGc(long networkId) {
NetworkOpVO vo = createForUpdate();
vo.setCheckForGc(false);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/NetworkOpVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/NetworkOpVO.java b/engine/schema/src/com/cloud/network/dao/NetworkOpVO.java
index f237279..ea38116 100644
--- a/engine/schema/src/com/cloud/network/dao/NetworkOpVO.java
+++ b/engine/schema/src/com/cloud/network/dao/NetworkOpVO.java
@@ -16,13 +16,13 @@
// under the License.
package com.cloud.network.dao;
-import org.apache.cloudstack.api.InternalIdentity;
-
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
+import org.apache.cloudstack.api.InternalIdentity;
+
@Entity
@Table(name = "op_networks")
public class NetworkOpVO implements InternalIdentity {
@@ -50,6 +50,7 @@ public class NetworkOpVO implements InternalIdentity {
this.activeNicsCount = 0;
}
+ @Override
public long getId() {
return id;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/NetworkRuleConfigDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/NetworkRuleConfigDaoImpl.java b/engine/schema/src/com/cloud/network/dao/NetworkRuleConfigDaoImpl.java
index 17281dc..ebb1eb2 100644
--- a/engine/schema/src/com/cloud/network/dao/NetworkRuleConfigDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/dao/NetworkRuleConfigDaoImpl.java
@@ -37,12 +37,14 @@ public class NetworkRuleConfigDaoImpl extends GenericDaoBase<NetworkRuleConfigVO
SecurityGroupIdSearch.done();
}
+ @Override
public List<NetworkRuleConfigVO> listBySecurityGroupId(long securityGroupId) {
SearchCriteria<NetworkRuleConfigVO> sc = SecurityGroupIdSearch.create();
sc.setParameters("securityGroupId", securityGroupId);
return listBy(sc);
}
+ @Override
public void deleteBySecurityGroup(long securityGroupId) {
SearchCriteria<NetworkRuleConfigVO> sc = SecurityGroupIdSearch.create();
sc.setParameters("securityGroupId", securityGroupId);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/NetworkServiceMapVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/NetworkServiceMapVO.java b/engine/schema/src/com/cloud/network/dao/NetworkServiceMapVO.java
index 596c3ab..4e1e9af 100644
--- a/engine/schema/src/com/cloud/network/dao/NetworkServiceMapVO.java
+++ b/engine/schema/src/com/cloud/network/dao/NetworkServiceMapVO.java
@@ -25,11 +25,11 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
-import com.cloud.network.Network;
+import org.apache.cloudstack.api.InternalIdentity;
+
import com.cloud.network.Network.Provider;
import com.cloud.network.Network.Service;
import com.cloud.utils.db.GenericDao;
-import org.apache.cloudstack.api.InternalIdentity;
@Entity
@Table(name = "ntwk_service_map")
@@ -51,6 +51,7 @@ public class NetworkServiceMapVO implements InternalIdentity {
@Column(name = GenericDao.CREATED_COLUMN)
Date created;
+ @Override
public long getId() {
return id;
}
@@ -80,6 +81,7 @@ public class NetworkServiceMapVO implements InternalIdentity {
this.provider = provider.getName();
}
+ @Override
public String toString() {
StringBuilder buf = new StringBuilder("[Network Service[");
return buf.append(networkId).append("-").append(service).append("-").append(provider).append("]").toString();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/NetworkVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/NetworkVO.java b/engine/schema/src/com/cloud/network/dao/NetworkVO.java
index 03960b8..f3776df 100644
--- a/engine/schema/src/com/cloud/network/dao/NetworkVO.java
+++ b/engine/schema/src/com/cloud/network/dao/NetworkVO.java
@@ -180,7 +180,8 @@ public class NetworkVO implements Network {
* @param dataCenterId
* @param physicalNetworkId TODO
*/
- public NetworkVO(TrafficType trafficType, Mode mode, BroadcastDomainType broadcastDomainType, long networkOfferingId, State state, long dataCenterId, Long physicalNetworkId) {
+ public NetworkVO(TrafficType trafficType, Mode mode, BroadcastDomainType broadcastDomainType, long networkOfferingId, State state, long dataCenterId,
+ Long physicalNetworkId) {
this.trafficType = trafficType;
this.mode = mode;
this.broadcastDomainType = broadcastDomainType;
@@ -196,8 +197,8 @@ public class NetworkVO implements Network {
this.uuid = UUID.randomUUID().toString();
}
- public NetworkVO(long id, Network that, long offeringId, String guruName, long domainId, long accountId, long related, String name, String displayText, String networkDomain,
- GuestType guestType, long dcId, Long physicalNetworkId, ACLType aclType, boolean specifyIpRanges, Long vpcId) {
+ public NetworkVO(long id, Network that, long offeringId, String guruName, long domainId, long accountId, long related, String name, String displayText,
+ String networkDomain, GuestType guestType, long dcId, Long physicalNetworkId, ACLType aclType, boolean specifyIpRanges, Long vpcId) {
this(id,
that.getTrafficType(),
that.getMode(),
@@ -247,8 +248,9 @@ public class NetworkVO implements Network {
* @param vpcId TODO
* @param dataCenterId
*/
- public NetworkVO(long id, TrafficType trafficType, Mode mode, BroadcastDomainType broadcastDomainType, long networkOfferingId, long domainId, long accountId, long related,
- String name, String displayText, String networkDomain, GuestType guestType, long dcId, Long physicalNetworkId, ACLType aclType, boolean specifyIpRanges, Long vpcId) {
+ public NetworkVO(long id, TrafficType trafficType, Mode mode, BroadcastDomainType broadcastDomainType, long networkOfferingId, long domainId, long accountId,
+ long related, String name, String displayText, String networkDomain, GuestType guestType, long dcId, Long physicalNetworkId, ACLType aclType,
+ boolean specifyIpRanges, Long vpcId) {
this(trafficType, mode, broadcastDomainType, networkOfferingId, State.Allocated, dcId, physicalNetworkId);
this.domainId = domainId;
this.accountId = accountId;
@@ -334,6 +336,7 @@ public class NetworkVO implements Network {
this.guruData = guruData;
}
+ @Override
public String getGuruName() {
return guruName;
}
@@ -360,6 +363,7 @@ public class NetworkVO implements Network {
return trafficType;
}
+ @Override
public void setTrafficType(TrafficType trafficType) {
this.trafficType = trafficType;
}
@@ -510,6 +514,7 @@ public class NetworkVO implements Network {
return buf.toString();
}
+ @Override
public String getUuid() {
return this.uuid;
}
@@ -518,6 +523,7 @@ public class NetworkVO implements Network {
this.uuid = uuid;
}
+ @Override
public ControlledEntity.ACLType getAclType() {
return aclType;
}
@@ -541,6 +547,7 @@ public class NetworkVO implements Network {
return vpcId;
}
+ @Override
public String getIp6Cidr() {
return ip6Cidr;
}
@@ -549,6 +556,7 @@ public class NetworkVO implements Network {
this.ip6Cidr = ip6Cidr;
}
+ @Override
public String getIp6Gateway() {
return ip6Gateway;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkIsolationMethodDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkIsolationMethodDaoImpl.java b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkIsolationMethodDaoImpl.java
index 1da9cc1..11b4399 100644
--- a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkIsolationMethodDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkIsolationMethodDaoImpl.java
@@ -28,7 +28,8 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Op;
@Component
-public class PhysicalNetworkIsolationMethodDaoImpl extends GenericDaoBase<PhysicalNetworkIsolationMethodVO, Long> implements GenericDao<PhysicalNetworkIsolationMethodVO, Long> {
+public class PhysicalNetworkIsolationMethodDaoImpl extends GenericDaoBase<PhysicalNetworkIsolationMethodVO, Long> implements
+ GenericDao<PhysicalNetworkIsolationMethodVO, Long> {
private final GenericSearchBuilder<PhysicalNetworkIsolationMethodVO, String> IsolationMethodSearch;
private final SearchBuilder<PhysicalNetworkIsolationMethodVO> AllFieldsSearch;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkIsolationMethodVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkIsolationMethodVO.java b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkIsolationMethodVO.java
index 1e8cc60..65d776e 100644
--- a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkIsolationMethodVO.java
+++ b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkIsolationMethodVO.java
@@ -16,8 +16,6 @@
// under the License.
package com.cloud.network.dao;
-import org.apache.cloudstack.api.InternalIdentity;
-
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
@@ -25,6 +23,8 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
+import org.apache.cloudstack.api.InternalIdentity;
+
/**
*
*/
@@ -54,6 +54,7 @@ public class PhysicalNetworkIsolationMethodVO implements InternalIdentity {
this.isolationMethod = isolationMethod;
}
+ @Override
public long getId() {
return id;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkServiceProviderVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkServiceProviderVO.java b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkServiceProviderVO.java
index 90b0cc4..415b513 100644
--- a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkServiceProviderVO.java
+++ b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkServiceProviderVO.java
@@ -30,10 +30,11 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
+import org.apache.cloudstack.api.InternalIdentity;
+
import com.cloud.network.Network.Service;
import com.cloud.network.PhysicalNetworkServiceProvider;
import com.cloud.utils.db.GenericDao;
-import org.apache.cloudstack.api.InternalIdentity;
@Entity
@Table(name = "physical_network_service_providers")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTagVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTagVO.java b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTagVO.java
index f39c690..df9030a 100644
--- a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTagVO.java
+++ b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTagVO.java
@@ -16,8 +16,6 @@
// under the License.
package com.cloud.network.dao;
-import org.apache.cloudstack.api.InternalIdentity;
-
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
@@ -25,6 +23,8 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
+import org.apache.cloudstack.api.InternalIdentity;
+
/**
*
*/
@@ -54,6 +54,7 @@ public class PhysicalNetworkTagVO implements InternalIdentity {
this.tag = tag;
}
+ @Override
public long getId() {
return id;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeVO.java b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeVO.java
index 9541d0f..395a4e3 100644
--- a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeVO.java
+++ b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeVO.java
@@ -29,7 +29,6 @@ import javax.persistence.Table;
import com.cloud.network.Networks.TrafficType;
import com.cloud.network.PhysicalNetworkTrafficType;
-import org.apache.cloudstack.api.InternalIdentity;
@Entity
@Table(name = "physical_network_traffic_types")
@@ -70,8 +69,8 @@ public class PhysicalNetworkTrafficTypeVO implements PhysicalNetworkTrafficType
public PhysicalNetworkTrafficTypeVO() {
}
- public PhysicalNetworkTrafficTypeVO(long physicalNetworkId, TrafficType trafficType, String xenLabel, String kvmLabel, String vmwareLabel, String simulatorLabel, String vlan,
- String hypervLabel) {
+ public PhysicalNetworkTrafficTypeVO(long physicalNetworkId, TrafficType trafficType, String xenLabel, String kvmLabel, String vmwareLabel, String simulatorLabel,
+ String vlan, String hypervLabel) {
this.physicalNetworkId = physicalNetworkId;
this.trafficType = trafficType;
this.xenNetworkLabel = xenLabel;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/PortProfileDao.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/PortProfileDao.java b/engine/schema/src/com/cloud/network/dao/PortProfileDao.java
index 43a9bd4..837c9b4 100644
--- a/engine/schema/src/com/cloud/network/dao/PortProfileDao.java
+++ b/engine/schema/src/com/cloud/network/dao/PortProfileDao.java
@@ -17,6 +17,7 @@
package com.cloud.network.dao;
import java.util.List;
+
import com.cloud.utils.db.GenericDao;
public interface PortProfileDao extends GenericDao<PortProfileVO, Long> {