cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ahu...@apache.org
Subject [22/48] All Checkstyle problems corrected
Date Thu, 12 Dec 2013 21:01:22 GMT
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/engine/schema/src/com/cloud/network/as/AutoScaleVmGroupVmMapVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/as/AutoScaleVmGroupVmMapVO.java b/engine/schema/src/com/cloud/network/as/AutoScaleVmGroupVmMapVO.java
index d70f9bf..038f0d7 100644
--- a/engine/schema/src/com/cloud/network/as/AutoScaleVmGroupVmMapVO.java
+++ b/engine/schema/src/com/cloud/network/as/AutoScaleVmGroupVmMapVO.java
@@ -28,35 +28,35 @@ import org.apache.cloudstack.api.InternalIdentity;
 @Entity
 @Table(name = ("autoscale_vmgroup_vm_map"))
 public class AutoScaleVmGroupVmMapVO implements InternalIdentity {
-	@Id
-	@GeneratedValue(strategy = GenerationType.IDENTITY)
-	@Column(name = "id")
-	private long id;
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private long id;
 
-	@Column(name = "vmgroup_id")
-	private long vmGroupId;
+    @Column(name = "vmgroup_id")
+    private long vmGroupId;
 
-	@Column(name = "instance_id")
-	private long instanceId;
+    @Column(name = "instance_id")
+    private long instanceId;
 
-	public AutoScaleVmGroupVmMapVO() {
-	}
+    public AutoScaleVmGroupVmMapVO() {
+    }
 
-	public AutoScaleVmGroupVmMapVO(long vmGroupId, long instanceId) {
-		this.vmGroupId = vmGroupId;
-		this.instanceId = instanceId;
-	}
+    public AutoScaleVmGroupVmMapVO(long vmGroupId, long instanceId) {
+        this.vmGroupId = vmGroupId;
+        this.instanceId = instanceId;
+    }
 
-	public long getId() {
-		return id;
-	}
+    public long getId() {
+        return id;
+    }
 
-	public long getVmGroupId() {
-		return vmGroupId;
-	}
+    public long getVmGroupId() {
+        return vmGroupId;
+    }
 
-	public long getInstanceId() {
-		return instanceId;
-	}
+    public long getInstanceId() {
+        return instanceId;
+    }
 
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/engine/schema/src/com/cloud/network/as/dao/AutoScalePolicyConditionMapDao.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/as/dao/AutoScalePolicyConditionMapDao.java b/engine/schema/src/com/cloud/network/as/dao/AutoScalePolicyConditionMapDao.java
index a9cfd18..cc6dc10 100644
--- a/engine/schema/src/com/cloud/network/as/dao/AutoScalePolicyConditionMapDao.java
+++ b/engine/schema/src/com/cloud/network/as/dao/AutoScalePolicyConditionMapDao.java
@@ -26,7 +26,7 @@ public interface AutoScalePolicyConditionMapDao extends GenericDao<AutoScalePoli
 
     public boolean isConditionInUse(Long conditionId);
 
-	boolean removeByAutoScalePolicyId(long id);
+    boolean removeByAutoScalePolicyId(long id);
 
-	List<AutoScalePolicyConditionMapVO> findByPolicyId(long id);
+    List<AutoScalePolicyConditionMapVO> findByPolicyId(long id);
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/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 557a673..fd4bfd5 100644
--- a/engine/schema/src/com/cloud/network/as/dao/AutoScalePolicyConditionMapDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/as/dao/AutoScalePolicyConditionMapDaoImpl.java
@@ -56,14 +56,14 @@ public class AutoScalePolicyConditionMapDaoImpl extends GenericDaoBase<AutoScale
     public boolean removeByAutoScalePolicyId(long policyId) {
         SearchCriteria<AutoScalePolicyConditionMapVO> sc = createSearchCriteria();
         sc.addAnd("policyId", SearchCriteria.Op.EQ, policyId);
-		return expunge(sc) > 0;
-	}
+        return expunge(sc) > 0;
+    }
 
-	@Override
-	public List<AutoScalePolicyConditionMapVO> findByPolicyId(long policyId) {
-		SearchCriteria<AutoScalePolicyConditionMapVO> sc = createSearchCriteria();
-		sc.addAnd("policyId", SearchCriteria.Op.EQ, policyId);
+    @Override
+    public List<AutoScalePolicyConditionMapVO> findByPolicyId(long policyId) {
+        SearchCriteria<AutoScalePolicyConditionMapVO> sc = createSearchCriteria();
+        sc.addAnd("policyId", SearchCriteria.Op.EQ, policyId);
 
-		return listBy(sc);
-	}
+        return listBy(sc);
+    }
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/engine/schema/src/com/cloud/network/as/dao/AutoScaleVmGroupVmMapDao.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/as/dao/AutoScaleVmGroupVmMapDao.java b/engine/schema/src/com/cloud/network/as/dao/AutoScaleVmGroupVmMapDao.java
index b7234e7..1a8acf3 100644
--- a/engine/schema/src/com/cloud/network/as/dao/AutoScaleVmGroupVmMapDao.java
+++ b/engine/schema/src/com/cloud/network/as/dao/AutoScaleVmGroupVmMapDao.java
@@ -22,10 +22,10 @@ import com.cloud.network.as.AutoScaleVmGroupVmMapVO;
 import com.cloud.utils.db.GenericDao;
 
 public interface AutoScaleVmGroupVmMapDao extends GenericDao<AutoScaleVmGroupVmMapVO, Long> {
-	public Integer countByGroup(long vmGroupId);
+    public Integer countByGroup(long vmGroupId);
 
-	public List<AutoScaleVmGroupVmMapVO> listByGroup(long vmGroupId);
+    public List<AutoScaleVmGroupVmMapVO> listByGroup(long vmGroupId);
 
-	public int remove(long vmGroupId, long vmId);
+    public int remove(long vmGroupId, long vmId);
 
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/engine/schema/src/com/cloud/network/as/dao/AutoScaleVmGroupVmMapDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/as/dao/AutoScaleVmGroupVmMapDaoImpl.java b/engine/schema/src/com/cloud/network/as/dao/AutoScaleVmGroupVmMapDaoImpl.java
index 494092d..463477c 100644
--- a/engine/schema/src/com/cloud/network/as/dao/AutoScaleVmGroupVmMapDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/as/dao/AutoScaleVmGroupVmMapDaoImpl.java
@@ -27,30 +27,30 @@ import com.cloud.utils.db.GenericDaoBase;
 import com.cloud.utils.db.SearchCriteria;
 
 @Component
-@Local(value={AutoScaleVmGroupVmMapDao.class})
+@Local(value = {AutoScaleVmGroupVmMapDao.class})
 public class AutoScaleVmGroupVmMapDaoImpl extends GenericDaoBase<AutoScaleVmGroupVmMapVO, Long> implements AutoScaleVmGroupVmMapDao {
 
-	@Override
-	public Integer countByGroup(long vmGroupId) {
-
-		SearchCriteria<AutoScaleVmGroupVmMapVO> sc = createSearchCriteria();
-		sc.addAnd("vmGroupId", SearchCriteria.Op.EQ, vmGroupId);
-		return getCount(sc);
-	}
-
-	@Override
-	public List<AutoScaleVmGroupVmMapVO> listByGroup(long vmGroupId) {
-		SearchCriteria<AutoScaleVmGroupVmMapVO> sc = createSearchCriteria();
-		sc.addAnd("vmGroupId", SearchCriteria.Op.EQ, vmGroupId);
-		return listBy(sc);
-	}
-
-	@Override
-	public int remove(long vmGroupId, long vmId) {
-		SearchCriteria<AutoScaleVmGroupVmMapVO> sc = createSearchCriteria();
-		sc.addAnd("vmGroupId", SearchCriteria.Op.EQ, vmGroupId);
-		sc.addAnd("instanceId", SearchCriteria.Op.EQ, vmId);
-		return remove(sc);
-	}
+    @Override
+    public Integer countByGroup(long vmGroupId) {
+
+        SearchCriteria<AutoScaleVmGroupVmMapVO> sc = createSearchCriteria();
+        sc.addAnd("vmGroupId", SearchCriteria.Op.EQ, vmGroupId);
+        return getCount(sc);
+    }
+
+    @Override
+    public List<AutoScaleVmGroupVmMapVO> listByGroup(long vmGroupId) {
+        SearchCriteria<AutoScaleVmGroupVmMapVO> sc = createSearchCriteria();
+        sc.addAnd("vmGroupId", SearchCriteria.Op.EQ, vmGroupId);
+        return listBy(sc);
+    }
+
+    @Override
+    public int remove(long vmGroupId, long vmId) {
+        SearchCriteria<AutoScaleVmGroupVmMapVO> sc = createSearchCriteria();
+        sc.addAnd("vmGroupId", SearchCriteria.Op.EQ, vmGroupId);
+        sc.addAnd("instanceId", SearchCriteria.Op.EQ, vmId);
+        return remove(sc);
+    }
 
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/engine/schema/src/com/cloud/network/dao/ExternalFirewallDeviceDao.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/ExternalFirewallDeviceDao.java b/engine/schema/src/com/cloud/network/dao/ExternalFirewallDeviceDao.java
index bb3ebef..b67130b 100644
--- a/engine/schema/src/com/cloud/network/dao/ExternalFirewallDeviceDao.java
+++ b/engine/schema/src/com/cloud/network/dao/ExternalFirewallDeviceDao.java
@@ -34,25 +34,25 @@ public interface ExternalFirewallDeviceDao extends GenericDao<ExternalFirewallDe
     /**
      * list the firewall devices added in to this physical network of certain provider type?
      * @param physicalNetworkId physical Network Id
-     * @param provider_name netwrok service provider name
+     * @param providerName netwrok service provider name
      */
-    List<ExternalFirewallDeviceVO> listByPhysicalNetworkAndProvider(long physicalNetworkId, String provider_name);
+    List<ExternalFirewallDeviceVO> listByPhysicalNetworkAndProvider(long physicalNetworkId, String providerName);
 
     /**
      * list the firewall devices added in to this physical network by their allocation state
      * @param physicalNetworkId physical Network Id
-     * @param provider_name netwrok service provider name
+     * @param providerName netwrok service provider name
      * @param allocationState firewall device allocation state
      * @return list of ExternalFirewallDeviceVO for the devices in the physical network with a device allocation state
      */
-    List<ExternalFirewallDeviceVO> listByProviderAndDeviceAllocationState(long physicalNetworkId, String provider_name, FirewallDeviceAllocationState allocationState);
+    List<ExternalFirewallDeviceVO> listByProviderAndDeviceAllocationState(long physicalNetworkId, String providerName, FirewallDeviceAllocationState allocationState);
 
     /**
      * list the load balancer devices added in to this physical network by the device status (enabled/disabled)
      * @param physicalNetworkId physical Network Id
-     * @param provider_name netwrok service provider name
+     * @param providerName netwrok service provider name
      * @param state firewall device status
      * @return list of ExternalFirewallDeviceVO for the devices in the physical network with a device state
      */
-    List<ExternalFirewallDeviceVO> listByProviderAndDeviceStaus(long physicalNetworkId, String provider_name, FirewallDeviceState state);
+    List<ExternalFirewallDeviceVO> listByProviderAndDeviceStaus(long physicalNetworkId, String providerName, FirewallDeviceState state);
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/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 2e49ba8..141eb53 100644
--- a/engine/schema/src/com/cloud/network/dao/ExternalFirewallDeviceVO.java
+++ b/engine/schema/src/com/cloud/network/dao/ExternalFirewallDeviceVO.java
@@ -80,10 +80,10 @@ public class ExternalFirewallDeviceVO implements InternalIdentity, Identity {
         Free, Allocated
     }
 
-    public ExternalFirewallDeviceVO(long hostId, long physicalNetworkId, String provider_name, String device_name, long capacity, boolean dedicated) {
+    public ExternalFirewallDeviceVO(long hostId, long physicalNetworkId, String providerName, String deviceName, long capacity, boolean dedicated) {
         this.physicalNetworkId = physicalNetworkId;
-        this.providerName = provider_name;
-        this.deviceName = device_name;
+        this.providerName = providerName;
+        this.deviceName = deviceName;
         this.hostId = hostId;
         this.deviceState = FirewallDeviceState.Disabled;
         this.allocationState = FirewallDeviceAllocationState.Free;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/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 b755598..9125447 100644
--- a/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDao.java
+++ b/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDao.java
@@ -34,36 +34,36 @@ public interface ExternalLoadBalancerDeviceDao extends GenericDao<ExternalLoadBa
     /**
      * list the load balancer devices added in to this physical network of certain provider type?
      * @param physicalNetworkId physical Network Id
-     * @param provider_name netwrok service provider name
+     * @param providerName netwrok service provider name
      */
-    List<ExternalLoadBalancerDeviceVO> listByPhysicalNetworkAndProvider(long physicalNetworkId, String provider_name);
+    List<ExternalLoadBalancerDeviceVO> listByPhysicalNetworkAndProvider(long physicalNetworkId, String providerName);
 
     /**
      * list the load balancer devices added in to this physical network by their allocation state
      * @param physicalNetworkId physical Network Id
-     * @param provider_name netwrok service provider name
+     * @param providerName netwrok service provider name
      * @param allocationState load balancer device allocation state
      * @return list of ExternalLoadBalancerDeviceVO for the devices in the physical network with a device allocation state
      */
-    List<ExternalLoadBalancerDeviceVO> listByProviderAndDeviceAllocationState(long physicalNetworkId, String provider_name, LBDeviceAllocationState allocationState);
+    List<ExternalLoadBalancerDeviceVO> listByProviderAndDeviceAllocationState(long physicalNetworkId, String providerName, LBDeviceAllocationState allocationState);
 
     /**
      * list the load balancer devices added in to this physical network by the device status (enabled/disabled)
      * @param physicalNetworkId physical Network Id
-     * @param provider_name netwrok service provider name
+     * @param providerName netwrok service provider name
      * @param state load balancer device status
      * @return list of ExternalLoadBalancerDeviceVO for the devices in the physical network with a device state
      */
-    List<ExternalLoadBalancerDeviceVO> listByProviderAndDeviceStaus(long physicalNetworkId, String provider_name, LBDeviceState state);
+    List<ExternalLoadBalancerDeviceVO> listByProviderAndDeviceStaus(long physicalNetworkId, String providerName, LBDeviceState state);
 
     /**
      * list the load balancer devices added in to this physical network by the managed type (external/cloudstack managed)
      * @param physicalNetworkId physical Network Id
-     * @param provider_name netwrok service provider name
+     * @param providerName netwrok service provider name
      * @param managed managed type
      * @return list of ExternalLoadBalancerDeviceVO for the devices in to this physical network of a managed type
      */
-    List<ExternalLoadBalancerDeviceVO> listByProviderAndManagedType(long physicalNetworkId, String provider_name, boolean managed);
+    List<ExternalLoadBalancerDeviceVO> listByProviderAndManagedType(long physicalNetworkId, String providerName, boolean managed);
 
     /**
      * Find the external load balancer device that is provisioned as GSLB service provider in the pyshical network

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/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 432b4a2..da23bcf 100644
--- a/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDaoImpl.java
@@ -87,18 +87,18 @@ public class ExternalLoadBalancerDeviceDaoImpl extends GenericDaoBase<ExternalLo
     }
 
     @Override
-    public List<ExternalLoadBalancerDeviceVO> listByPhysicalNetworkAndProvider(long physicalNetworkId, String provider_name) {
+    public List<ExternalLoadBalancerDeviceVO> listByPhysicalNetworkAndProvider(long physicalNetworkId, String providerName) {
         SearchCriteria<ExternalLoadBalancerDeviceVO> sc = physicalNetworkServiceProviderSearch.create();
         sc.setParameters("physicalNetworkId", physicalNetworkId);
-        sc.setParameters("providerName", provider_name);
+        sc.setParameters("providerName", providerName);
         return search(sc, null);
     }
 
     @Override
-    public List<ExternalLoadBalancerDeviceVO> listByProviderAndDeviceAllocationState(long physicalNetworkId, String provider_name, LBDeviceAllocationState state) {
+    public List<ExternalLoadBalancerDeviceVO> listByProviderAndDeviceAllocationState(long physicalNetworkId, String providerName, LBDeviceAllocationState state) {
         SearchCriteria<ExternalLoadBalancerDeviceVO> sc = allocationStateSearch.create();
         sc.setParameters("physicalNetworkId", physicalNetworkId);
-        sc.setParameters("providerName", provider_name);
+        sc.setParameters("providerName", providerName);
         sc.setParameters("allocationState", state);
         sc.setParameters("exclusiveGslbProvider", false);
         return search(sc, null);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/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 d82d537..80bec1b 100644
--- a/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceVO.java
+++ b/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceVO.java
@@ -103,11 +103,11 @@ 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,
+    public ExternalLoadBalancerDeviceVO(long hostId, long physicalNetworkId, String providerName, String deviceName, long capacity, boolean dedicated,
             boolean gslbProvider) {
         this.physicalNetworkId = physicalNetworkId;
-        this.providerName = provider_name;
-        this.deviceName = device_name;
+        this.providerName = providerName;
+        this.deviceName = deviceName;
         this.hostId = hostId;
         this.state = LBDeviceState.Disabled;
         this.allocationState = LBDeviceAllocationState.Free;
@@ -119,14 +119,14 @@ public class ExternalLoadBalancerDeviceVO implements InternalIdentity, Identity
         this.gslbProvider = gslbProvider;
         this.gslbSitePublicIP = null;
         this.gslbSitePrivateIP = null;
-        if (device_name.equalsIgnoreCase(ExternalNetworkDeviceManager.NetworkDevice.NetscalerSDXLoadBalancer.getName())) {
+        if (deviceName.equalsIgnoreCase(ExternalNetworkDeviceManager.NetworkDevice.NetscalerSDXLoadBalancer.getName())) {
             this.allocationState = LBDeviceAllocationState.Provider;
         }
     }
 
-    public ExternalLoadBalancerDeviceVO(long hostId, long physicalNetworkId, String provider_name, String device_name, long capacity, boolean dedicated, boolean managed,
+    public ExternalLoadBalancerDeviceVO(long hostId, long physicalNetworkId, String providerName, String deviceName, long capacity, boolean dedicated, boolean managed,
             long parentHostId) {
-        this(hostId, physicalNetworkId, provider_name, device_name, capacity, dedicated, false);
+        this(hostId, physicalNetworkId, providerName, deviceName, capacity, dedicated, false);
         this.isManagedDevice = managed;
         this.parentHostId = parentHostId;
     }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/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 c84b97d..9986337 100644
--- a/engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapDaoImpl.java
@@ -55,9 +55,9 @@ public class LoadBalancerCertMapDaoImpl extends GenericDaoBase<LoadBalancerCertM
     }
 
     @Override
-    public LoadBalancerCertMapVO findByLbRuleId(Long LbId) {
+    public LoadBalancerCertMapVO findByLbRuleId(Long lbId) {
         SearchCriteria<LoadBalancerCertMapVO> sc = findByLbRuleId.create();
-        sc.setParameters("loadBalancerId", LbId);
+        sc.setParameters("loadBalancerId", lbId);
         return findOneBy(sc);
     }
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/engine/schema/src/com/cloud/network/dao/OvsProviderDao.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/OvsProviderDao.java b/engine/schema/src/com/cloud/network/dao/OvsProviderDao.java
index 2cd21c6..692ec86 100644
--- a/engine/schema/src/com/cloud/network/dao/OvsProviderDao.java
+++ b/engine/schema/src/com/cloud/network/dao/OvsProviderDao.java
@@ -22,9 +22,9 @@ import com.cloud.network.element.OvsProviderVO;
 import com.cloud.utils.db.GenericDao;
 
 public interface OvsProviderDao extends GenericDao<OvsProviderVO, Long> {
-	public OvsProviderVO findByNspId(long nspId);
+    public OvsProviderVO findByNspId(long nspId);
 
-	public List<OvsProviderVO> listByEnabled(boolean enabled);
+    public List<OvsProviderVO> listByEnabled(boolean enabled);
 
-	public OvsProviderVO findByIdAndEnabled(long id, boolean enabled);
+    public OvsProviderVO findByIdAndEnabled(long id, boolean enabled);
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/engine/schema/src/com/cloud/network/dao/OvsProviderDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/OvsProviderDaoImpl.java b/engine/schema/src/com/cloud/network/dao/OvsProviderDaoImpl.java
index ec20d4c..ee13197 100644
--- a/engine/schema/src/com/cloud/network/dao/OvsProviderDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/dao/OvsProviderDaoImpl.java
@@ -32,42 +32,42 @@ import com.cloud.utils.db.SearchCriteria;
 @Local(value = OvsProviderDao.class)
 @DB()
 public class OvsProviderDaoImpl extends GenericDaoBase<OvsProviderVO, Long>
-		implements OvsProviderDao {
-	final SearchBuilder<OvsProviderVO> AllFieldsSearch;
+        implements OvsProviderDao {
+    final SearchBuilder<OvsProviderVO> AllFieldsSearch;
 
-	public OvsProviderDaoImpl() {
-		super();
-		AllFieldsSearch = createSearchBuilder();
-		AllFieldsSearch.and("id", AllFieldsSearch.entity().getId(),
-				SearchCriteria.Op.EQ);
-		AllFieldsSearch.and("nsp_id", AllFieldsSearch.entity().getNspId(),
-				SearchCriteria.Op.EQ);
-		AllFieldsSearch.and("uuid", AllFieldsSearch.entity().getUuid(),
-				SearchCriteria.Op.EQ);
-		AllFieldsSearch.and("enabled", AllFieldsSearch.entity().isEnabled(),
-				SearchCriteria.Op.EQ);
-		AllFieldsSearch.done();
-	}
+    public OvsProviderDaoImpl() {
+        super();
+        AllFieldsSearch = createSearchBuilder();
+        AllFieldsSearch.and("id", AllFieldsSearch.entity().getId(),
+            SearchCriteria.Op.EQ);
+        AllFieldsSearch.and("nsp_id", AllFieldsSearch.entity().getNspId(),
+            SearchCriteria.Op.EQ);
+        AllFieldsSearch.and("uuid", AllFieldsSearch.entity().getUuid(),
+            SearchCriteria.Op.EQ);
+        AllFieldsSearch.and("enabled", AllFieldsSearch.entity().isEnabled(),
+            SearchCriteria.Op.EQ);
+        AllFieldsSearch.done();
+    }
 
-	@Override
-	public OvsProviderVO findByNspId(long nspId) {
-		SearchCriteria<OvsProviderVO> sc = AllFieldsSearch.create();
-		sc.setParameters("nsp_id", nspId);
-		return findOneBy(sc);
-	}
+    @Override
+    public OvsProviderVO findByNspId(long nspId) {
+        SearchCriteria<OvsProviderVO> sc = AllFieldsSearch.create();
+        sc.setParameters("nsp_id", nspId);
+        return findOneBy(sc);
+    }
 
-	@Override
-	public List<OvsProviderVO> listByEnabled(boolean enabled) {
-		SearchCriteria<OvsProviderVO> sc = AllFieldsSearch.create();
-		sc.setParameters("enabled", enabled);
-		return listBy(sc);
-	}
+    @Override
+    public List<OvsProviderVO> listByEnabled(boolean enabled) {
+        SearchCriteria<OvsProviderVO> sc = AllFieldsSearch.create();
+        sc.setParameters("enabled", enabled);
+        return listBy(sc);
+    }
 
-	@Override
-	public OvsProviderVO findByIdAndEnabled(long id, boolean enabled) {
-		SearchCriteria<OvsProviderVO> sc = AllFieldsSearch.create();
-		sc.setParameters("id", id);
-		sc.setParameters("enabled", enabled);
-		return findOneBy(sc);
-	}
+    @Override
+    public OvsProviderVO findByIdAndEnabled(long id, boolean enabled) {
+        SearchCriteria<OvsProviderVO> sc = AllFieldsSearch.create();
+        sc.setParameters("id", id);
+        sc.setParameters("enabled", enabled);
+        return findOneBy(sc);
+    }
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/engine/schema/src/com/cloud/network/dao/SslCertDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/SslCertDaoImpl.java b/engine/schema/src/com/cloud/network/dao/SslCertDaoImpl.java
index cab001b..99354c5 100644
--- a/engine/schema/src/com/cloud/network/dao/SslCertDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/dao/SslCertDaoImpl.java
@@ -33,7 +33,7 @@ public class SslCertDaoImpl extends GenericDaoBase<SslCertVO, Long> implements S
         listByAccountId = createSearchBuilder();
         listByAccountId.and("accountId", listByAccountId.entity().getAccountId(), SearchCriteria.Op.EQ);
         listByAccountId.done();
-   }
+    }
 
     @Override
     public List<SslCertVO> listByAccountId(Long accountId) {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/engine/schema/src/com/cloud/network/element/OvsProviderVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/element/OvsProviderVO.java b/engine/schema/src/com/cloud/network/element/OvsProviderVO.java
index ddcc9c3..09ea59d 100644
--- a/engine/schema/src/com/cloud/network/element/OvsProviderVO.java
+++ b/engine/schema/src/com/cloud/network/element/OvsProviderVO.java
@@ -32,68 +32,68 @@ import com.cloud.utils.db.GenericDao;
 @Entity
 @Table(name = ("ovs_providers"))
 public class OvsProviderVO implements OvsProvider {
-	@Id
-	@GeneratedValue(strategy = GenerationType.IDENTITY)
-	@Column(name = "id")
-	long id;
-
-	@Column(name = "nsp_id")
-	private long nspId;
-
-	@Column(name = "uuid")
-	private String uuid;
-
-	@Column(name = "enabled")
-	private boolean enabled;
-
-	@Column(name = GenericDao.REMOVED_COLUMN)
-	Date removed;
-
-	public OvsProviderVO() {
-		this.uuid = UUID.randomUUID().toString();
-	}
-
-	public OvsProviderVO(long nspId) {
-		this.nspId = nspId;
-		this.uuid = UUID.randomUUID().toString();
-	}
-
-	@Override
-	public long getNspId() {
-		return nspId;
-	}
-
-	public String getUuid() {
-		return uuid;
-	}
-
-	@Override
-	public long getId() {
-		return id;
-	}
-
-	public Date getRemoved() {
-		return removed;
-	}
-
-	public void setEnabled(boolean enabled) {
-		this.enabled = enabled;
-	}
-
-	@Override
-	public boolean isEnabled() {
-		return this.enabled;
-	}
-
-	public void setId(long id) {
-		this.id = id;
-	}
-
-	public void setNspId(long nspId) {
-		this.nspId = nspId;
-	}
-
-	public void setUuid(String uuid) {
-		this.uuid = uuid;
-	}
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    long id;
+
+    @Column(name = "nsp_id")
+    private long nspId;
+
+    @Column(name = "uuid")
+    private String uuid;
+
+    @Column(name = "enabled")
+    private boolean enabled;
+
+    @Column(name = GenericDao.REMOVED_COLUMN)
+    Date removed;
+
+    public OvsProviderVO() {
+        this.uuid = UUID.randomUUID().toString();
+    }
+
+    public OvsProviderVO(long nspId) {
+        this.nspId = nspId;
+        this.uuid = UUID.randomUUID().toString();
+    }
+
+    @Override
+    public long getNspId() {
+        return nspId;
+    }
+
+    public String getUuid() {
+        return uuid;
+    }
+
+    @Override
+    public long getId() {
+        return id;
+    }
+
+    public Date getRemoved() {
+        return removed;
+    }
+
+    public void setEnabled(boolean enabled) {
+        this.enabled = enabled;
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return this.enabled;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public void setNspId(long nspId) {
+        this.nspId = nspId;
+    }
+
+    public void setUuid(String uuid) {
+        this.uuid = uuid;
+    }
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/engine/schema/src/com/cloud/network/security/dao/VmRulesetLogDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/security/dao/VmRulesetLogDaoImpl.java b/engine/schema/src/com/cloud/network/security/dao/VmRulesetLogDaoImpl.java
index cfc3da5..c941055 100644
--- a/engine/schema/src/com/cloud/network/security/dao/VmRulesetLogDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/security/dao/VmRulesetLogDaoImpl.java
@@ -41,7 +41,7 @@ import com.cloud.utils.db.TransactionLegacy;
 public class VmRulesetLogDaoImpl extends GenericDaoBase<VmRulesetLogVO, Long> implements VmRulesetLogDao {
     protected static Logger s_logger = Logger.getLogger(VmRulesetLogDaoImpl.class);
     private SearchBuilder<VmRulesetLogVO> VmIdSearch;
-    private String INSERT_OR_UPDATE = "INSERT INTO op_vm_ruleset_log (instance_id, created, logsequence) "
+    private String InsertOrUpdateSQl = "INSERT INTO op_vm_ruleset_log (instance_id, created, logsequence) "
         + " VALUES(?, now(), 1) ON DUPLICATE KEY UPDATE logsequence=logsequence+1";
     private static HashMap<Integer, String> cachedPrepStmtStrings = new HashMap<Integer, String>();
     final static private int cacheStringSizes[] = {512, 256, 128, 64, 32, 16, 8, 4, 2, 1};
@@ -160,7 +160,7 @@ public class VmRulesetLogDaoImpl extends GenericDaoBase<VmRulesetLogVO, Long> im
         int count = 0;
         boolean success = true;
         try {
-            stmtInsert = txn.prepareAutoCloseStatement(INSERT_OR_UPDATE);
+            stmtInsert = txn.prepareAutoCloseStatement(InsertOrUpdateSQl);
 
             txn.start();
             for (Long vmId : workItems) {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/engine/schema/src/com/cloud/offerings/NetworkOfferingVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/offerings/NetworkOfferingVO.java b/engine/schema/src/com/cloud/offerings/NetworkOfferingVO.java
index a023462..bf07807 100755
--- a/engine/schema/src/com/cloud/offerings/NetworkOfferingVO.java
+++ b/engine/schema/src/com/cloud/offerings/NetworkOfferingVO.java
@@ -479,8 +479,8 @@ public class NetworkOfferingVO implements NetworkOffering {
         return this.concurrentConnections;
     }
 
-    public void setConcurrentConnections(Integer concurrent_connections) {
-        this.concurrentConnections = concurrent_connections;
+    public void setConcurrentConnections(Integer concurrentConnections) {
+        this.concurrentConnections = concurrentConnections;
     }
 
     public void setPublicLb(boolean publicLb) {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/engine/schema/src/com/cloud/service/ServiceOfferingVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/service/ServiceOfferingVO.java b/engine/schema/src/com/cloud/service/ServiceOfferingVO.java
index f1cc39b..b554a23 100755
--- a/engine/schema/src/com/cloud/service/ServiceOfferingVO.java
+++ b/engine/schema/src/com/cloud/service/ServiceOfferingVO.java
@@ -62,10 +62,10 @@ public class ServiceOfferingVO extends DiskOfferingVO implements ServiceOffering
     private String hostTag;
 
     @Column(name = "default_use")
-    private boolean default_use;
+    private boolean defaultUse;
 
     @Column(name = "vm_type")
-    private String vm_type;
+    private String vmType;
 
     @Column(name = "sort_key")
     int sortKey;
@@ -89,7 +89,7 @@ public class ServiceOfferingVO extends DiskOfferingVO implements ServiceOffering
     }
 
     public ServiceOfferingVO(String name, Integer cpu, Integer ramSize, Integer speed, Integer rateMbps, Integer multicastRateMbps, boolean offerHA, String displayText,
-            boolean useLocalStorage, boolean recreatable, String tags, boolean systemUse, VirtualMachine.Type vm_type, boolean defaultUse) {
+            boolean useLocalStorage, boolean recreatable, String tags, boolean systemUse, VirtualMachine.Type vmType, boolean defaultUse) {
         super(name, displayText, false, tags, recreatable, useLocalStorage, systemUse, true);
         this.cpu = cpu;
         this.ramSize = ramSize;
@@ -99,12 +99,12 @@ public class ServiceOfferingVO extends DiskOfferingVO implements ServiceOffering
         this.offerHA = offerHA;
         this.limitCpuUse = false;
         this.volatileVm = false;
-        this.default_use = defaultUse;
-        this.vm_type = vm_type == null ? null : vm_type.toString().toLowerCase();
+        this.defaultUse = defaultUse;
+        this.vmType = vmType == null ? null : vmType.toString().toLowerCase();
     }
 
     public ServiceOfferingVO(String name, Integer cpu, Integer ramSize, Integer speed, Integer rateMbps, Integer multicastRateMbps, boolean offerHA, boolean limitCpuUse,
-            boolean volatileVm, String displayText, boolean useLocalStorage, boolean recreatable, String tags, boolean systemUse, VirtualMachine.Type vm_type,
+            boolean volatileVm, String displayText, boolean useLocalStorage, boolean recreatable, String tags, boolean systemUse, VirtualMachine.Type vmType,
             Long domainId) {
         super(name, displayText, false, tags, recreatable, useLocalStorage, systemUse, true, domainId);
         this.cpu = cpu;
@@ -115,12 +115,12 @@ public class ServiceOfferingVO extends DiskOfferingVO implements ServiceOffering
         this.offerHA = offerHA;
         this.limitCpuUse = limitCpuUse;
         this.volatileVm = volatileVm;
-        this.vm_type = vm_type == null ? null : vm_type.toString().toLowerCase();
+        this.vmType = vmType == null ? null : vmType.toString().toLowerCase();
     }
 
     public ServiceOfferingVO(String name, Integer cpu, Integer ramSize, Integer speed, Integer rateMbps, Integer multicastRateMbps, boolean offerHA,
             boolean limitResourceUse, boolean volatileVm, String displayText, boolean useLocalStorage, boolean recreatable, String tags, boolean systemUse,
-            VirtualMachine.Type vm_type, Long domainId, String hostTag) {
+            VirtualMachine.Type vmType, Long domainId, String hostTag) {
         this(name,
             cpu,
             ramSize,
@@ -135,14 +135,14 @@ public class ServiceOfferingVO extends DiskOfferingVO implements ServiceOffering
             recreatable,
             tags,
             systemUse,
-            vm_type,
+            vmType,
             domainId);
         this.hostTag = hostTag;
     }
 
     public ServiceOfferingVO(String name, Integer cpu, Integer ramSize, Integer speed, Integer rateMbps, Integer multicastRateMbps, boolean offerHA,
             boolean limitResourceUse, boolean volatileVm, String displayText, boolean useLocalStorage, boolean recreatable, String tags, boolean systemUse,
-            VirtualMachine.Type vm_type, Long domainId, String hostTag, String deploymentPlanner) {
+            VirtualMachine.Type vmType, Long domainId, String hostTag, String deploymentPlanner) {
         this(name,
             cpu,
             ramSize,
@@ -157,14 +157,23 @@ public class ServiceOfferingVO extends DiskOfferingVO implements ServiceOffering
             recreatable,
             tags,
             systemUse,
-            vm_type,
+            vmType,
             domainId,
             hostTag);
         this.deploymentPlanner = deploymentPlanner;
     }
 
     public ServiceOfferingVO(ServiceOfferingVO offering) {
-        super(offering.getId(), offering.getName(), offering.getDisplayText(), false, offering.getTags(), offering.isRecreatable(), offering.getUseLocalStorage(), offering.getSystemUse(), true, offering.getDomainId());
+        super(offering.getId(),
+            offering.getName(),
+            offering.getDisplayText(),
+            false,
+            offering.getTags(),
+            offering.isRecreatable(),
+            offering.getUseLocalStorage(),
+            offering.getSystemUse(),
+            true,
+            offering.getDomainId());
         this.cpu = offering.getCpu();
         this.ramSize = offering.getRamSize();
         this.speed = offering.getSpeed();
@@ -174,7 +183,7 @@ public class ServiceOfferingVO extends DiskOfferingVO implements ServiceOffering
         this.limitCpuUse = offering.getLimitCpuUse();
         this.volatileVm = offering.getVolatileVm();
         this.hostTag = offering.getHostTag();
-        this.vm_type = offering.getSystemVmType();
+        this.vmType = offering.getSystemVmType();
     }
 
     @Override
@@ -197,7 +206,7 @@ public class ServiceOfferingVO extends DiskOfferingVO implements ServiceOffering
 
     @Override
     public boolean getDefaultUse() {
-        return default_use;
+        return defaultUse;
     }
 
     @Override
@@ -267,7 +276,7 @@ public class ServiceOfferingVO extends DiskOfferingVO implements ServiceOffering
 
     @Override
     public String getSystemVmType() {
-        return vm_type;
+        return vmType;
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/engine/schema/src/com/cloud/service/dao/ServiceOfferingDao.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/service/dao/ServiceOfferingDao.java b/engine/schema/src/com/cloud/service/dao/ServiceOfferingDao.java
index ecab8d2..ab81853 100644
--- a/engine/schema/src/com/cloud/service/dao/ServiceOfferingDao.java
+++ b/engine/schema/src/com/cloud/service/dao/ServiceOfferingDao.java
@@ -34,7 +34,7 @@ public interface ServiceOfferingDao extends GenericDao<ServiceOfferingVO, Long>
 
     List<ServiceOfferingVO> findServiceOfferingByDomainId(Long domainId);
 
-    List<ServiceOfferingVO> findSystemOffering(Long domainId, Boolean isSystem, String vm_type);
+    List<ServiceOfferingVO> findSystemOffering(Long domainId, Boolean isSystem, String vmType);
 
     ServiceOfferingVO persistDeafultServiceOffering(ServiceOfferingVO offering);
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/engine/schema/src/com/cloud/service/dao/ServiceOfferingDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/service/dao/ServiceOfferingDaoImpl.java b/engine/schema/src/com/cloud/service/dao/ServiceOfferingDaoImpl.java
index 5d423e0..1905d9e 100644
--- a/engine/schema/src/com/cloud/service/dao/ServiceOfferingDaoImpl.java
+++ b/engine/schema/src/com/cloud/service/dao/ServiceOfferingDaoImpl.java
@@ -25,10 +25,10 @@ import javax.ejb.Local;
 import javax.inject.Inject;
 import javax.persistence.EntityExistsException;
 
-import com.cloud.event.UsageEventVO;
 import org.apache.log4j.Logger;
 import org.springframework.stereotype.Component;
 
+import com.cloud.event.UsageEventVO;
 import com.cloud.service.ServiceOfferingDetailsVO;
 import com.cloud.service.ServiceOfferingVO;
 import com.cloud.utils.db.DB;
@@ -128,11 +128,11 @@ public class ServiceOfferingDaoImpl extends GenericDaoBase<ServiceOfferingVO, Lo
     }
 
     @Override
-    public List<ServiceOfferingVO> findSystemOffering(Long domainId, Boolean isSystem, String vm_type) {
+    public List<ServiceOfferingVO> findSystemOffering(Long domainId, Boolean isSystem, String vmType) {
         SearchCriteria<ServiceOfferingVO> sc = SystemServiceOffering.create();
         sc.setParameters("domainId", domainId);
         sc.setParameters("system", isSystem);
-        sc.setParameters("vm_type", vm_type);
+        sc.setParameters("vm_type", vmType);
         return listBy(sc);
     }
 
@@ -211,7 +211,7 @@ public class ServiceOfferingDaoImpl extends GenericDaoBase<ServiceOfferingVO, Lo
                 throw new CloudRuntimeException("missing argument vmId");
             }
             Map<String, String> dynamicOffering = userVmDetailsDao.listDetailsKeyPairs(vmId);
-            return  getcomputeOffering(offering, dynamicOffering);
+            return getcomputeOffering(offering, dynamicOffering);
         }
         return offering;
     }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/engine/schema/src/com/cloud/storage/DiskOfferingVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/storage/DiskOfferingVO.java b/engine/schema/src/com/cloud/storage/DiskOfferingVO.java
index 1ff62ab..d1a48d2 100755
--- a/engine/schema/src/com/cloud/storage/DiskOfferingVO.java
+++ b/engine/schema/src/com/cloud/storage/DiskOfferingVO.java
@@ -207,7 +207,7 @@ public class DiskOfferingVO implements DiskOffering {
     }
 
     public DiskOfferingVO(long id, String name, String displayText, boolean mirrored, String tags, boolean recreatable,
-                          boolean useLocalStorage, boolean systemUse, boolean customized, Long domainId) {
+            boolean useLocalStorage, boolean systemUse, boolean customized, Long domainId) {
         this.id = id;
         type = Type.Service;
         this.name = name;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/engine/schema/src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java
index 6cd614d..3d067a2 100755
--- a/engine/schema/src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java
+++ b/engine/schema/src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java
@@ -64,8 +64,8 @@ public class VMTemplateHostDaoImpl extends GenericDaoBase<VMTemplateHostVO, Long
     protected final SearchBuilder<VMTemplateHostVO> TemplateStatusSearch;
     protected final SearchBuilder<VMTemplateHostVO> TemplateStatesSearch;
     protected final SearchBuilder<VMTemplateHostVO> updateStateSearch;
-    protected SearchBuilder<VMTemplateHostVO> ZONE_TEMPLATE_SEARCH;
-    protected SearchBuilder<VMTemplateHostVO> LOCAL_SECONDARY_STORAGE_SEARCH;
+    protected SearchBuilder<VMTemplateHostVO> ZoneTemplateSearch;
+    protected SearchBuilder<VMTemplateHostVO> LocalSecondaryStorageSearch;
 
     protected static final String UPDATE_TEMPLATE_HOST_REF = "UPDATE template_host_ref SET download_state = ?, download_pct= ?, last_updated = ? "
         + ", error_str = ?, local_path = ?, job_id = ? " + "WHERE host_id = ? and type_id = ?";
@@ -131,25 +131,25 @@ public class VMTemplateHostDaoImpl extends GenericDaoBase<VMTemplateHostVO, Long
     @Override
     public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
         boolean result = super.configure(name, params);
-        ZONE_TEMPLATE_SEARCH = createSearchBuilder();
-        ZONE_TEMPLATE_SEARCH.and("template_id", ZONE_TEMPLATE_SEARCH.entity().getTemplateId(), SearchCriteria.Op.EQ);
-        ZONE_TEMPLATE_SEARCH.and("state", ZONE_TEMPLATE_SEARCH.entity().getDownloadState(), SearchCriteria.Op.EQ);
+        ZoneTemplateSearch = createSearchBuilder();
+        ZoneTemplateSearch.and("template_id", ZoneTemplateSearch.entity().getTemplateId(), SearchCriteria.Op.EQ);
+        ZoneTemplateSearch.and("state", ZoneTemplateSearch.entity().getDownloadState(), SearchCriteria.Op.EQ);
         SearchBuilder<HostVO> hostSearch = _hostDao.createSearchBuilder();
         hostSearch.and("zone_id", hostSearch.entity().getDataCenterId(), SearchCriteria.Op.EQ);
-        ZONE_TEMPLATE_SEARCH.join("tmplHost", hostSearch, hostSearch.entity().getId(), ZONE_TEMPLATE_SEARCH.entity().getHostId(), JoinBuilder.JoinType.INNER);
-        ZONE_TEMPLATE_SEARCH.done();
+        ZoneTemplateSearch.join("tmplHost", hostSearch, hostSearch.entity().getId(), ZoneTemplateSearch.entity().getHostId(), JoinBuilder.JoinType.INNER);
+        ZoneTemplateSearch.done();
 
-        LOCAL_SECONDARY_STORAGE_SEARCH = createSearchBuilder();
-        LOCAL_SECONDARY_STORAGE_SEARCH.and("template_id", LOCAL_SECONDARY_STORAGE_SEARCH.entity().getTemplateId(), SearchCriteria.Op.EQ);
-        LOCAL_SECONDARY_STORAGE_SEARCH.and("state", LOCAL_SECONDARY_STORAGE_SEARCH.entity().getDownloadState(), SearchCriteria.Op.EQ);
+        LocalSecondaryStorageSearch = createSearchBuilder();
+        LocalSecondaryStorageSearch.and("template_id", LocalSecondaryStorageSearch.entity().getTemplateId(), SearchCriteria.Op.EQ);
+        LocalSecondaryStorageSearch.and("state", LocalSecondaryStorageSearch.entity().getDownloadState(), SearchCriteria.Op.EQ);
         SearchBuilder<HostVO> localSecondaryHost = _hostDao.createSearchBuilder();
         localSecondaryHost.and("private_ip_address", localSecondaryHost.entity().getPrivateIpAddress(), SearchCriteria.Op.EQ);
         localSecondaryHost.and("state", localSecondaryHost.entity().getStatus(), SearchCriteria.Op.EQ);
         localSecondaryHost.and("data_center_id", localSecondaryHost.entity().getDataCenterId(), SearchCriteria.Op.EQ);
         localSecondaryHost.and("type", localSecondaryHost.entity().getType(), SearchCriteria.Op.EQ);
-        LOCAL_SECONDARY_STORAGE_SEARCH.join("host", localSecondaryHost, localSecondaryHost.entity().getId(), LOCAL_SECONDARY_STORAGE_SEARCH.entity().getHostId(),
+        LocalSecondaryStorageSearch.join("host", localSecondaryHost, localSecondaryHost.entity().getId(), LocalSecondaryStorageSearch.entity().getHostId(),
             JoinBuilder.JoinType.INNER);
-        LOCAL_SECONDARY_STORAGE_SEARCH.done();
+        LocalSecondaryStorageSearch.done();
 
         return result;
     }
@@ -330,7 +330,7 @@ public class VMTemplateHostDaoImpl extends GenericDaoBase<VMTemplateHostVO, Long
 
     @Override
     public List<VMTemplateHostVO> listByZoneTemplate(long dcId, long templateId, boolean readyOnly) {
-        SearchCriteria<VMTemplateHostVO> sc = ZONE_TEMPLATE_SEARCH.create();
+        SearchCriteria<VMTemplateHostVO> sc = ZoneTemplateSearch.create();
         sc.setParameters("template_id", templateId);
         sc.setJoinParameters("tmplHost", "zone_id", dcId);
         if (readyOnly) {
@@ -365,7 +365,7 @@ public class VMTemplateHostDaoImpl extends GenericDaoBase<VMTemplateHostVO, Long
     @Override
     public VMTemplateHostVO findLocalSecondaryStorageByHostTemplate(long hostId, long templateId) {
         HostVO computingHost = _hostDao.findById(hostId);
-        SearchCriteria<VMTemplateHostVO> sc = LOCAL_SECONDARY_STORAGE_SEARCH.create();
+        SearchCriteria<VMTemplateHostVO> sc = LocalSecondaryStorageSearch.create();
         sc.setJoinParameters("host", "private_ip_address", computingHost.getPrivateIpAddress());
         sc.setJoinParameters("host", "state", com.cloud.host.Status.Up);
         sc.setJoinParameters("host", "data_center_id", computingHost.getDataCenterId());

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/engine/schema/src/com/cloud/upgrade/DatabaseIntegrityChecker.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/upgrade/DatabaseIntegrityChecker.java b/engine/schema/src/com/cloud/upgrade/DatabaseIntegrityChecker.java
index c1120bd..c20a418 100755
--- a/engine/schema/src/com/cloud/upgrade/DatabaseIntegrityChecker.java
+++ b/engine/schema/src/com/cloud/upgrade/DatabaseIntegrityChecker.java
@@ -39,7 +39,7 @@ import com.cloud.utils.exception.CloudRuntimeException;
 @Component
 @Local(value = {SystemIntegrityChecker.class})
 public class DatabaseIntegrityChecker extends AdapterBase implements SystemIntegrityChecker {
-    private final Logger s_logger = Logger.getLogger(DatabaseIntegrityChecker.class);
+    private static final Logger s_logger = Logger.getLogger(DatabaseIntegrityChecker.class);
 
     @Inject
     VersionDao _dao;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java b/engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
index c5eea10..0761c9f 100755
--- a/engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
+++ b/engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
@@ -80,7 +80,7 @@ import com.cloud.utils.exception.CloudRuntimeException;
 
 @Local(value = {SystemIntegrityChecker.class})
 public class DatabaseUpgradeChecker implements SystemIntegrityChecker {
-    private final Logger s_logger = Logger.getLogger(DatabaseUpgradeChecker.class);
+    private static final Logger s_logger = Logger.getLogger(DatabaseUpgradeChecker.class);
 
     protected HashMap<String, DbUpgrade[]> _upgradeMap = new HashMap<String, DbUpgrade[]>();
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/engine/schema/src/com/cloud/upgrade/dao/Upgrade218to22.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade218to22.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade218to22.java
index 5aa4b5f..4f06715 100644
--- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade218to22.java
+++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade218to22.java
@@ -72,10 +72,10 @@ public class Upgrade218to22 implements DbUpgrade {
     }
 
     protected long insertNetworkOffering(Connection conn, String name, String displayText, String trafficType, boolean systemOnly, boolean defaultNetworkOffering,
-        String availability, boolean dns_service, boolean gateway_service, boolean firewall_service, boolean lb_service, boolean userdata_service, boolean vpn_service,
-        boolean dhcp_service) {
+        String availability, boolean dnsService, boolean gatewayService, boolean firewallService, boolean lbService, boolean userdataService, boolean vpnService,
+        boolean dhcpService) {
         String insertSql =
-            "INSERT INTO network_offerings (name, display_text, nw_rate, mc_rate, concurrent_connections, traffic_type, tags, system_only, specify_vlan, service_offering_id, created, removed, `default`, availability, dns_service, gateway_service, firewall_service, lb_service, userdata_service, vpn_service, dhcp_service) "
+            "INSERT INTO network_offerings (name, display_text, nw_rate, mc_rate, concurrent_connections, traffic_type, tags, system_only, specify_vlan, service_offering_id, created, removed, `default`, availability, dnsService, gatewayService, firewallService, lbService, userdataService, vpnService, dhcpService) "
                 + "VALUES (?,    ?,            NULL,    NULL,    NULL,                   ?,            NULL, ?,           0,            NULL,                now(),   NULL,    ?,       ?,            ?,           ?,               ?,                ?,          ?,                ?,           ?)";
         try {
             PreparedStatement pstmt = conn.prepareStatement(insertSql, Statement.RETURN_GENERATED_KEYS);
@@ -86,13 +86,13 @@ public class Upgrade218to22 implements DbUpgrade {
             pstmt.setBoolean(i++, systemOnly);
             pstmt.setBoolean(i++, defaultNetworkOffering);
             pstmt.setString(i++, availability);
-            pstmt.setBoolean(i++, dns_service);
-            pstmt.setBoolean(i++, gateway_service);
-            pstmt.setBoolean(i++, firewall_service);
-            pstmt.setBoolean(i++, lb_service);
-            pstmt.setBoolean(i++, userdata_service);
-            pstmt.setBoolean(i++, vpn_service);
-            pstmt.setBoolean(i++, dhcp_service);
+            pstmt.setBoolean(i++, dnsService);
+            pstmt.setBoolean(i++, gatewayService);
+            pstmt.setBoolean(i++, firewallService);
+            pstmt.setBoolean(i++, lbService);
+            pstmt.setBoolean(i++, userdataService);
+            pstmt.setBoolean(i++, vpnService);
+            pstmt.setBoolean(i++, dhcpService);
             pstmt.executeUpdate();
             ResultSet rs = pstmt.getGeneratedKeys();
             rs.next();

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/engine/schema/src/com/cloud/upgrade/dao/Upgrade2213to2214.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade2213to2214.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade2213to2214.java
index 3edefcb..f3293ba 100644
--- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade2213to2214.java
+++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade2213to2214.java
@@ -301,10 +301,10 @@ public class Upgrade2213to2214 implements DbUpgrade {
         DbUpgradeUtils.dropKeysIfExist(conn, "cloud.user_ip_address", keys, false);
         try {
             PreparedStatement pstmt = conn.prepareStatement(
-                    "ALTER TABLE `cloud`.`user_ip_address` ADD CONSTRAINT `fk_user_ip_address__account_id` FOREIGN KEY (`account_id`) REFERENCES `account`(`id`)");
+                "ALTER TABLE `cloud`.`user_ip_address` ADD CONSTRAINT `fk_user_ip_address__account_id` FOREIGN KEY (`account_id`) REFERENCES `account`(`id`)");
             pstmt.executeUpdate();
             pstmt = conn.prepareStatement(
-                    "ALTER TABLE `cloud`.`user_ip_address` ADD CONSTRAINT `fk_user_ip_address__vlan_db_id` FOREIGN KEY (`vlan_db_id`) REFERENCES `vlan`(`id`) ON DELETE CASCADE");
+                "ALTER TABLE `cloud`.`user_ip_address` ADD CONSTRAINT `fk_user_ip_address__vlan_db_id` FOREIGN KEY (`vlan_db_id`) REFERENCES `vlan`(`id`) ON DELETE CASCADE");
             pstmt.executeUpdate();
             pstmt = conn.prepareStatement(
                 "ALTER TABLE `cloud`.`user_ip_address` ADD CONSTRAINT `fk_user_ip_address__data_center_id`" +

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
index 80497d4..a331b13 100755
--- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
+++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
@@ -3161,28 +3161,28 @@ public class Upgrade410to420 implements DbUpgrade {
         }
     }
 
-    private static void upgradeResourceCountforAccount(Connection conn, Long account_id, Long domain_id, String type, Long resource_count) throws SQLException {
+    private static void upgradeResourceCountforAccount(Connection conn, Long accountId, Long domainId, String type, Long resourceCount) throws SQLException {
         //update or insert into resource_count table.
         PreparedStatement pstmt = null;
         pstmt =
             conn.prepareStatement("INSERT INTO `cloud`.`resource_count` (account_id, type, count) VALUES (?,?,?) ON DUPLICATE KEY UPDATE id=LAST_INSERT_ID(id), count=?");
-        pstmt.setLong(1, account_id);
+        pstmt.setLong(1, accountId);
         pstmt.setString(2, type);
-        pstmt.setLong(3, resource_count);
-        pstmt.setLong(4, resource_count);
+        pstmt.setLong(3, resourceCount);
+        pstmt.setLong(4, resourceCount);
         pstmt.executeUpdate();
         pstmt.close();
     }
 
-    private static void upgradeResourceCountforDomain(Connection conn, Long domain_id, String type, Long resource_count) throws SQLException {
+    private static void upgradeResourceCountforDomain(Connection conn, Long domainId, String type, Long resourceCount) throws SQLException {
         //update or insert into resource_count table.
         PreparedStatement pstmt = null;
         pstmt =
             conn.prepareStatement("INSERT INTO `cloud`.`resource_count` (domain_id, type, count) VALUES (?,?,?) ON DUPLICATE KEY UPDATE id=LAST_INSERT_ID(id), count=?");
-        pstmt.setLong(1, domain_id);
+        pstmt.setLong(1, domainId);
         pstmt.setString(2, type);
-        pstmt.setLong(3, resource_count);
-        pstmt.setLong(4, resource_count);
+        pstmt.setLong(3, resourceCount);
+        pstmt.setLong(4, resourceCount);
         pstmt.executeUpdate();
         pstmt.close();
     }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/engine/schema/src/com/cloud/upgrade/dao/Upgrade420to421.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade420to421.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade420to421.java
index 51fb0de..c3a6b06 100644
--- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade420to421.java
+++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade420to421.java
@@ -248,28 +248,28 @@ public class Upgrade420to421 implements DbUpgrade {
         }
     }
 
-    private static void upgradeResourceCountforAccount(Connection conn, Long account_id, Long domain_id, String type, Long resource_count) throws SQLException {
+    private static void upgradeResourceCountforAccount(Connection conn, Long accountId, Long domainId, String type, Long resourceCount) throws SQLException {
         //update or insert into resource_count table.
         PreparedStatement pstmt = null;
         pstmt =
             conn.prepareStatement("INSERT INTO `cloud`.`resource_count` (account_id, type, count) VALUES (?,?,?) ON DUPLICATE KEY UPDATE id=LAST_INSERT_ID(id), count=?");
-        pstmt.setLong(1, account_id);
+        pstmt.setLong(1, accountId);
         pstmt.setString(2, type);
-        pstmt.setLong(3, resource_count);
-        pstmt.setLong(4, resource_count);
+        pstmt.setLong(3, resourceCount);
+        pstmt.setLong(4, resourceCount);
         pstmt.executeUpdate();
         pstmt.close();
     }
 
-    private static void upgradeResourceCountforDomain(Connection conn, Long domain_id, String type, Long resource_count) throws SQLException {
+    private static void upgradeResourceCountforDomain(Connection conn, Long domainId, String type, Long resourceCount) throws SQLException {
         //update or insert into resource_count table.
         PreparedStatement pstmt = null;
         pstmt =
             conn.prepareStatement("INSERT INTO `cloud`.`resource_count` (domain_id, type, count) VALUES (?,?,?) ON DUPLICATE KEY UPDATE id=LAST_INSERT_ID(id), count=?");
-        pstmt.setLong(1, domain_id);
+        pstmt.setLong(1, domainId);
         pstmt.setString(2, type);
-        pstmt.setLong(3, resource_count);
-        pstmt.setLong(4, resource_count);
+        pstmt.setLong(3, resourceCount);
+        pstmt.setLong(4, resourceCount);
         pstmt.executeUpdate();
         pstmt.close();
     }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/engine/schema/src/com/cloud/upgrade/dao/Upgrade430to440.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade430to440.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade430to440.java
index 4fcb892..8ee1db7 100644
--- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade430to440.java
+++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade430to440.java
@@ -50,7 +50,7 @@ public class Upgrade430to440 implements DbUpgrade {
             throw new CloudRuntimeException("Unable to find db/schema-4310to440.sql");
         }
 
-        return new File[] { new File(script) };
+        return new File[] {new File(script)};
     }
 
     @Override
@@ -64,6 +64,6 @@ public class Upgrade430to440 implements DbUpgrade {
             throw new CloudRuntimeException("Unable to find db/schema-430to440-cleanup.sql");
         }
 
-        return new File[] { new File(script) };
+        return new File[] {new File(script)};
     }
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/engine/schema/src/com/cloud/usage/UsageVMInstanceVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/usage/UsageVMInstanceVO.java b/engine/schema/src/com/cloud/usage/UsageVMInstanceVO.java
index 8d9491f..06d4876 100644
--- a/engine/schema/src/com/cloud/usage/UsageVMInstanceVO.java
+++ b/engine/schema/src/com/cloud/usage/UsageVMInstanceVO.java
@@ -46,14 +46,14 @@ public class UsageVMInstanceVO {
     @Column(name = "service_offering_id")
     private long serviceOfferingId;
 
-    @Column(name="cpu_cores")
-    private  Long cpuCores;
+    @Column(name = "cpu_cores")
+    private Long cpuCores;
 
-    @Column(name="memory")
-    private  Long memory;
+    @Column(name = "memory")
+    private Long memory;
 
-    @Column(name="cpu_speed")
-    private  Long cpuSpeed;
+    @Column(name = "cpu_speed")
+    private Long cpuSpeed;
 
     @Column(name = "template_id")
     private long templateId;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/engine/schema/src/com/cloud/usage/dao/UsageStorageDao.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/usage/dao/UsageStorageDao.java b/engine/schema/src/com/cloud/usage/dao/UsageStorageDao.java
index 6d1cde3..f5408d7 100644
--- a/engine/schema/src/com/cloud/usage/dao/UsageStorageDao.java
+++ b/engine/schema/src/com/cloud/usage/dao/UsageStorageDao.java
@@ -23,7 +23,7 @@ import com.cloud.usage.UsageStorageVO;
 import com.cloud.utils.db.GenericDao;
 
 public interface UsageStorageDao extends GenericDao<UsageStorageVO, Long> {
-    public void removeBy(long userId, long id, int storage_type);
+    public void removeBy(long userId, long id, int storageType);
 
     public void update(UsageStorageVO usage);
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/engine/schema/src/com/cloud/usage/dao/UsageStorageDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/usage/dao/UsageStorageDaoImpl.java b/engine/schema/src/com/cloud/usage/dao/UsageStorageDaoImpl.java
index 175bb88..77fc56f 100644
--- a/engine/schema/src/com/cloud/usage/dao/UsageStorageDaoImpl.java
+++ b/engine/schema/src/com/cloud/usage/dao/UsageStorageDaoImpl.java
@@ -89,7 +89,7 @@ public class UsageStorageDaoImpl extends GenericDaoBase<UsageStorageVO, Long> im
     }
 
     @Override
-    public void removeBy(long accountId, long volId, int storage_type) {
+    public void removeBy(long accountId, long volId, int storageType) {
         TransactionLegacy txn = TransactionLegacy.open(TransactionLegacy.USAGE_DB);
         PreparedStatement pstmt = null;
         try {
@@ -98,7 +98,7 @@ public class UsageStorageDaoImpl extends GenericDaoBase<UsageStorageVO, Long> im
             pstmt = txn.prepareAutoCloseStatement(sql);
             pstmt.setLong(1, accountId);
             pstmt.setLong(2, volId);
-            pstmt.setInt(3, storage_type);
+            pstmt.setInt(3, storageType);
             pstmt.executeUpdate();
             txn.commit();
         } catch (Exception e) {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/engine/schema/src/com/cloud/user/dao/AccountDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/user/dao/AccountDaoImpl.java b/engine/schema/src/com/cloud/user/dao/AccountDaoImpl.java
index 792b326..4bc23ed 100755
--- a/engine/schema/src/com/cloud/user/dao/AccountDaoImpl.java
+++ b/engine/schema/src/com/cloud/user/dao/AccountDaoImpl.java
@@ -45,7 +45,7 @@ import com.cloud.utils.db.TransactionLegacy;
 @Local(value = {AccountDao.class})
 public class AccountDaoImpl extends GenericDaoBase<AccountVO, Long> implements AccountDao {
     private static final Logger s_logger = Logger.getLogger(AccountDaoImpl.class);
-    private final String FIND_USER_ACCOUNT_BY_API_KEY = "SELECT u.id, u.username, u.account_id, u.secret_key, u.state, "
+    private static final String FIND_USER_ACCOUNT_BY_API_KEY = "SELECT u.id, u.username, u.account_id, u.secret_key, u.state, "
         + "a.id, a.account_name, a.type, a.domain_id, a.state " + "FROM `cloud`.`user` u, `cloud`.`account` a "
         + "WHERE u.account_id = a.id AND u.api_key = ? and u.removed IS NULL";
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/engine/schema/src/com/cloud/vm/dao/NicIpAliasDao.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/vm/dao/NicIpAliasDao.java b/engine/schema/src/com/cloud/vm/dao/NicIpAliasDao.java
index ff3a24b..b1cd02b 100644
--- a/engine/schema/src/com/cloud/vm/dao/NicIpAliasDao.java
+++ b/engine/schema/src/com/cloud/vm/dao/NicIpAliasDao.java
@@ -50,7 +50,7 @@ public interface NicIpAliasDao extends GenericDao<NicIpAliasVO, Long> {
 
     List<String> getAliasIpAddressesForNic(long nicId);
 
-    Integer countAliasIps(long NicId);
+    Integer countAliasIps(long nicId);
 
     public NicIpAliasVO findByIp4AddressAndVmId(String ip4Address, long vmId);
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/engine/schema/src/com/cloud/vm/dao/UserVmDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/vm/dao/UserVmDaoImpl.java b/engine/schema/src/com/cloud/vm/dao/UserVmDaoImpl.java
index b675fb6..5ea4798 100755
--- a/engine/schema/src/com/cloud/vm/dao/UserVmDaoImpl.java
+++ b/engine/schema/src/com/cloud/vm/dao/UserVmDaoImpl.java
@@ -82,7 +82,7 @@ public class UserVmDaoImpl extends GenericDaoBase<UserVmVO, Long> implements Use
         "SELECT pod_id FROM cloud.vm_instance WHERE data_center_id = ? AND account_id = ? AND pod_id IS NOT NULL AND (state = 'Running' OR state = 'Stopped') "
             + "GROUP BY pod_id HAVING count(id) > 0 ORDER BY count(id) DESC";
 
-    private static String VM_DETAILS = "select vm_instance.id, "
+    private static final String VM_DETAILS = "select vm_instance.id, "
         + "account.id, account.account_name, account.type, domain.name, instance_group.id, instance_group.name,"
         + "data_center.id, data_center.name, data_center.is_security_group_enabled, host.id, host.name, "
         + "vm_template.id, vm_template.name, vm_template.display_text, iso.id, iso.name, "
@@ -223,7 +223,7 @@ public class UserVmDaoImpl extends GenericDaoBase<UserVmVO, Long> implements Use
         vo.setUserData(userData);
         vo.setDisplayVm(displayVm);
         vo.setDynamicallyScalable(isDynamicallyScalable);
-        if (customId != null){
+        if (customId != null) {
             vo.setUuid(customId);
         }
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/engine/schema/src/com/cloud/vm/dao/VMInstanceDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/vm/dao/VMInstanceDaoImpl.java b/engine/schema/src/com/cloud/vm/dao/VMInstanceDaoImpl.java
index f45042c..605ece3 100644
--- a/engine/schema/src/com/cloud/vm/dao/VMInstanceDaoImpl.java
+++ b/engine/schema/src/com/cloud/vm/dao/VMInstanceDaoImpl.java
@@ -102,7 +102,7 @@ public class VMInstanceDaoImpl extends GenericDaoBase<VMInstanceVO, Long> implem
 
     private static final String ORDER_PODS_NUMBER_OF_VMS_FOR_ACCOUNT = "SELECT pod.id, SUM(IF(vm.state='Running' AND vm.account_id = ?, 1, 0)) FROM `cloud`.`" +
         "host_pod_ref` pod LEFT JOIN `cloud`.`vm_instance` vm ON pod.id = vm.pod_id WHERE pod.data_center_id = ? AND pod.removed is null "
-            + " GROUP BY pod.id ORDER BY 2 ASC ";
+        + " GROUP BY pod.id ORDER BY 2 ASC ";
 
     private static final String ORDER_HOSTS_NUMBER_OF_VMS_FOR_ACCOUNT =
         "SELECT host.id, SUM(IF(vm.state='Running' AND vm.account_id = ?, 1, 0)) FROM `cloud`.`host` host LEFT JOIN `cloud`.`vm_instance` vm ON host.id = vm.host_id " +

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/engine/schema/src/com/cloud/vm/snapshot/dao/VMSnapshotDao.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/vm/snapshot/dao/VMSnapshotDao.java b/engine/schema/src/com/cloud/vm/snapshot/dao/VMSnapshotDao.java
index 792914b..e714a6e 100644
--- a/engine/schema/src/com/cloud/vm/snapshot/dao/VMSnapshotDao.java
+++ b/engine/schema/src/com/cloud/vm/snapshot/dao/VMSnapshotDao.java
@@ -35,5 +35,5 @@ public interface VMSnapshotDao extends GenericDao<VMSnapshotVO, Long>, StateDao<
 
     List<VMSnapshotVO> listByParent(Long vmSnapshotId);
 
-    VMSnapshotVO findByName(Long vm_id, String name);
+    VMSnapshotVO findByName(Long vmId, String name);
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/engine/schema/src/com/cloud/vm/snapshot/dao/VMSnapshotDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/vm/snapshot/dao/VMSnapshotDaoImpl.java b/engine/schema/src/com/cloud/vm/snapshot/dao/VMSnapshotDaoImpl.java
index 4ea6abc..dccd19f 100644
--- a/engine/schema/src/com/cloud/vm/snapshot/dao/VMSnapshotDaoImpl.java
+++ b/engine/schema/src/com/cloud/vm/snapshot/dao/VMSnapshotDaoImpl.java
@@ -114,9 +114,9 @@ public class VMSnapshotDaoImpl extends GenericDaoBase<VMSnapshotVO, Long> implem
     }
 
     @Override
-    public VMSnapshotVO findByName(Long vm_id, String name) {
+    public VMSnapshotVO findByName(Long vmId, String name) {
         SearchCriteria<VMSnapshotVO> sc = AllFieldsSearch.create();
-        sc.setParameters("vm_id", vm_id);
+        sc.setParameters("vm_id", vmId);
         sc.setParameters("display_name", name);
         return null;
     }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/engine/schema/src/org/apache/cloudstack/resourcedetail/NetworkACLItemDetailVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/NetworkACLItemDetailVO.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/NetworkACLItemDetailVO.java
index fb27d37..5abf59c 100644
--- a/engine/schema/src/org/apache/cloudstack/resourcedetail/NetworkACLItemDetailVO.java
+++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/NetworkACLItemDetailVO.java
@@ -79,4 +79,3 @@ public class NetworkACLItemDetailVO implements ResourceDetail {
         return display;
     }
 }
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/engine/schema/src/org/apache/cloudstack/resourcedetail/NetworkACLListDetailVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/NetworkACLListDetailVO.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/NetworkACLListDetailVO.java
index 71cf563..f60ba8c 100644
--- a/engine/schema/src/org/apache/cloudstack/resourcedetail/NetworkACLListDetailVO.java
+++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/NetworkACLListDetailVO.java
@@ -79,4 +79,3 @@ public class NetworkACLListDetailVO implements ResourceDetail {
         return display;
     }
 }
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/NetworkACLItemDetailsDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/NetworkACLItemDetailsDaoImpl.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/NetworkACLItemDetailsDaoImpl.java
index 930c77a..03d1282 100644
--- a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/NetworkACLItemDetailsDaoImpl.java
+++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/NetworkACLItemDetailsDaoImpl.java
@@ -5,7 +5,7 @@
 // to you under the Apache License, Version 2.0 (the
 // "License"); you may not use this file except in compliance
 // with the License.  You may obtain a copy of the License at
-// 
+//
 //   http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing,
@@ -18,12 +18,13 @@ package org.apache.cloudstack.resourcedetail.dao;
 
 import javax.ejb.Local;
 
+import org.springframework.stereotype.Component;
+
 import org.apache.cloudstack.resourcedetail.NetworkACLItemDetailVO;
 import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase;
-import org.springframework.stereotype.Component;
 
 @Component
-@Local(value = { NetworkACLItemDetailsDao.class })
+@Local(value = {NetworkACLItemDetailsDao.class})
 public class NetworkACLItemDetailsDaoImpl extends ResourceDetailsDaoBase<NetworkACLItemDetailVO> implements NetworkACLItemDetailsDao {
 
     @Override

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/NetworkACLListDetailsDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/NetworkACLListDetailsDaoImpl.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/NetworkACLListDetailsDaoImpl.java
index 0b7037f..e07110f 100644
--- a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/NetworkACLListDetailsDaoImpl.java
+++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/NetworkACLListDetailsDaoImpl.java
@@ -5,7 +5,7 @@
 // to you under the Apache License, Version 2.0 (the
 // "License"); you may not use this file except in compliance
 // with the License.  You may obtain a copy of the License at
-// 
+//
 //   http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing,
@@ -18,12 +18,13 @@ package org.apache.cloudstack.resourcedetail.dao;
 
 import javax.ejb.Local;
 
-import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase;
-import org.apache.cloudstack.resourcedetail.NetworkACLListDetailVO;
 import org.springframework.stereotype.Component;
 
+import org.apache.cloudstack.resourcedetail.NetworkACLListDetailVO;
+import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase;
+
 @Component
-@Local(value = { NetworkACLListDetailsDao.class })
+@Local(value = {NetworkACLListDetailsDao.class})
 public class NetworkACLListDetailsDaoImpl extends ResourceDetailsDaoBase<NetworkACLListDetailVO> implements NetworkACLListDetailsDao {
 
     @Override

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/VpcDetailsDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/VpcDetailsDaoImpl.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/VpcDetailsDaoImpl.java
index 6459723..fb22c7c 100644
--- a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/VpcDetailsDaoImpl.java
+++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/VpcDetailsDaoImpl.java
@@ -5,7 +5,7 @@
 // to you under the Apache License, Version 2.0 (the
 // "License"); you may not use this file except in compliance
 // with the License.  You may obtain a copy of the License at
-// 
+//
 //   http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing,
@@ -18,12 +18,13 @@ package org.apache.cloudstack.resourcedetail.dao;
 
 import javax.ejb.Local;
 
+import org.springframework.stereotype.Component;
+
 import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase;
 import org.apache.cloudstack.resourcedetail.VpcDetailVO;
-import org.springframework.stereotype.Component;
 
 @Component
-@Local(value = { VpcDetailsDao.class })
+@Local(value = {VpcDetailsDao.class})
 public class VpcDetailsDaoImpl extends ResourceDetailsDaoBase<VpcDetailVO> implements VpcDetailsDao {
 
     @Override

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/VpcGatewayDetailsDao.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/VpcGatewayDetailsDao.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/VpcGatewayDetailsDao.java
index 4f16919..a42d0cf 100644
--- a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/VpcGatewayDetailsDao.java
+++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/VpcGatewayDetailsDao.java
@@ -24,4 +24,3 @@ import com.cloud.utils.db.GenericDao;
 public interface VpcGatewayDetailsDao extends GenericDao<VpcGatewayDetailVO, Long>, ResourceDetailsDao<VpcGatewayDetailVO> {
 
 }
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/VpcGatewayDetailsDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/VpcGatewayDetailsDaoImpl.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/VpcGatewayDetailsDaoImpl.java
index 2b4c563..871c363 100644
--- a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/VpcGatewayDetailsDaoImpl.java
+++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/VpcGatewayDetailsDaoImpl.java
@@ -5,7 +5,7 @@
 // to you under the Apache License, Version 2.0 (the
 // "License"); you may not use this file except in compliance
 // with the License.  You may obtain a copy of the License at
-// 
+//
 //   http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing,
@@ -18,12 +18,13 @@ package org.apache.cloudstack.resourcedetail.dao;
 
 import javax.ejb.Local;
 
+import org.springframework.stereotype.Component;
+
 import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase;
 import org.apache.cloudstack.resourcedetail.VpcGatewayDetailVO;
-import org.springframework.stereotype.Component;
 
 @Component
-@Local(value = { VpcGatewayDetailsDao.class })
+@Local(value = {VpcGatewayDetailsDao.class})
 public class VpcGatewayDetailsDaoImpl extends ResourceDetailsDaoBase<VpcGatewayDetailVO> implements VpcGatewayDetailsDao {
 
     @Override

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/AllTests.java
----------------------------------------------------------------------
diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/AllTests.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/AllTests.java
index c475632..12943ff 100644
--- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/AllTests.java
+++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/AllTests.java
@@ -23,7 +23,7 @@ import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
 
 @RunWith(Suite.class)
-@SuiteClasses({volumeServiceTest.class})
+@SuiteClasses({VolumeServiceTest.class})
 public class AllTests {
 
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/ChildTestConfiguration.java
----------------------------------------------------------------------
diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/ChildTestConfiguration.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/ChildTestConfiguration.java
index 9a676f9..69d60c2 100644
--- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/ChildTestConfiguration.java
+++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/ChildTestConfiguration.java
@@ -98,14 +98,14 @@ import com.cloud.vm.snapshot.dao.VMSnapshotDaoImpl;
 
 @Configuration
 @ComponentScan(basePackageClasses = {NicDaoImpl.class, VMInstanceDaoImpl.class, VMTemplateHostDaoImpl.class, VolumeHostDaoImpl.class, VolumeDaoImpl.class,
-                   VMTemplatePoolDaoImpl.class, ResourceTagsDaoImpl.class, VMTemplateDaoImpl.class, MockStorageMotionStrategy.class, ConfigurationDaoImpl.class,
-                   ClusterDaoImpl.class, HostPodDaoImpl.class, VMTemplateZoneDaoImpl.class, VMTemplateDetailsDaoImpl.class, HostDetailsDaoImpl.class,
-                   HostTagsDaoImpl.class, HostTransferMapDaoImpl.class, DataCenterIpAddressDaoImpl.class, DataCenterLinkLocalIpAddressDaoImpl.class,
-                   DataCenterVnetDaoImpl.class, PodVlanDaoImpl.class, DataCenterDetailsDaoImpl.class, DiskOfferingDaoImpl.class, StoragePoolHostDaoImpl.class,
-                   UserVmDaoImpl.class, UserVmDetailsDaoImpl.class, ServiceOfferingDaoImpl.class, CapacityDaoImpl.class, SnapshotDaoImpl.class, VMSnapshotDaoImpl.class,
-                   OCFS2ManagerImpl.class, ClusterDetailsDaoImpl.class, SecondaryStorageVmDaoImpl.class, ConsoleProxyDaoImpl.class, StoragePoolWorkDaoImpl.class,
-                   StorageCacheManagerImpl.class, UserDaoImpl.class, DataCenterDaoImpl.class, StoragePoolDetailsDaoImpl.class, DomainDaoImpl.class,
-                   DownloadMonitorImpl.class, AccountDaoImpl.class, ActionEventUtils.class, EventDaoImpl.class},
+    VMTemplatePoolDaoImpl.class, ResourceTagsDaoImpl.class, VMTemplateDaoImpl.class, MockStorageMotionStrategy.class, ConfigurationDaoImpl.class,
+    ClusterDaoImpl.class, HostPodDaoImpl.class, VMTemplateZoneDaoImpl.class, VMTemplateDetailsDaoImpl.class, HostDetailsDaoImpl.class,
+    HostTagsDaoImpl.class, HostTransferMapDaoImpl.class, DataCenterIpAddressDaoImpl.class, DataCenterLinkLocalIpAddressDaoImpl.class,
+    DataCenterVnetDaoImpl.class, PodVlanDaoImpl.class, DataCenterDetailsDaoImpl.class, DiskOfferingDaoImpl.class, StoragePoolHostDaoImpl.class,
+    UserVmDaoImpl.class, UserVmDetailsDaoImpl.class, ServiceOfferingDaoImpl.class, CapacityDaoImpl.class, SnapshotDaoImpl.class, VMSnapshotDaoImpl.class,
+    OCFS2ManagerImpl.class, ClusterDetailsDaoImpl.class, SecondaryStorageVmDaoImpl.class, ConsoleProxyDaoImpl.class, StoragePoolWorkDaoImpl.class,
+    StorageCacheManagerImpl.class, UserDaoImpl.class, DataCenterDaoImpl.class, StoragePoolDetailsDaoImpl.class, DomainDaoImpl.class,
+    DownloadMonitorImpl.class, AccountDaoImpl.class, ActionEventUtils.class, EventDaoImpl.class},
                includeFilters = {@Filter(value = Library.class, type = FilterType.CUSTOM)},
                useDefaultFilters = false)
 public class ChildTestConfiguration extends TestConfiguration {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/CloudStackTestNGBase.java
----------------------------------------------------------------------
diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/CloudStackTestNGBase.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/CloudStackTestNGBase.java
index 51e4943..7442f1d 100644
--- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/CloudStackTestNGBase.java
+++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/CloudStackTestNGBase.java
@@ -74,7 +74,7 @@ public class CloudStackTestNGBase extends AbstractTestNGSpringContextTests {
         "primary-storage-want-to-add", "devcloud-secondary-storage", "s3-accesskey", "s3-secretkey", "s3-endpoint", "s3-template-bucket", "s3-usehttps",
         "image-install-path", "primary-storage-uuid-want-to-add", "script-path", "hypervisor"})
     protected void setup(String hostuuid, String gateway, String cidr, String hostIp, String templateUrl, String localStorageUuid, String primaryStorage,
-        String secondaryStorage, String s3_accessKey, String s3_secretKey, String s3_endpoint, String s3_template_bucket, String s3_usehttps, String imageInstallPath,
+        String secondaryStorage, String s3AccessKey, String s3SecretKey, String s3Endpoint, String s3TemplateBucket, String s3Usehttps, String imageInstallPath,
         String primaryStorageUuid, String scriptPath, String hypervisor) {
         this.hostGuid = hostuuid;
         this.hostGateway = gateway;
@@ -88,11 +88,11 @@ public class CloudStackTestNGBase extends AbstractTestNGSpringContextTests {
         this.hypervisor = HypervisorType.getType(hypervisor);
         this.setSecondaryStorage(secondaryStorage);
         // set S3 parameters
-        this.s3AccessKey = s3_accessKey;
-        this.s3SecretKey = s3_secretKey;
-        this.s3EndPoint = s3_endpoint;
-        this.s3TemplateBucket = s3_template_bucket;
-        this.s3UseHttps = Boolean.parseBoolean(s3_usehttps);
+        this.s3AccessKey = s3AccessKey;
+        this.s3SecretKey = s3SecretKey;
+        this.s3EndPoint = s3Endpoint;
+        this.s3TemplateBucket = s3TemplateBucket;
+        this.s3UseHttps = Boolean.parseBoolean(s3Usehttps);
         this.scriptPath = scriptPath;
         if (this.scriptPath != null) {
             System.setProperty("paths.script", this.getScriptPath());

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/EndpointSelectorTest.java
----------------------------------------------------------------------
diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/EndpointSelectorTest.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/EndpointSelectorTest.java
index 9227c88..b841bf2 100644
--- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/EndpointSelectorTest.java
+++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/EndpointSelectorTest.java
@@ -34,7 +34,6 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Matchers;
-import org.mockito.Mockito;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 


Mime
View raw message