etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove txn attribute from DB 

txn attribute was never actually used

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
This commit is contained in:
Laszlo Hornyak 2013-08-30 13:21:37 +02:00 committed by Darren Shepherd
parent 2b47611c5d
commit bd8536739c
60 changed files with 121 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDaoImpl.java
View File

@ -60,7 +60,7 @@ import com.cloud.utils.exception.CloudRuntimeException;
@Component(value="EngineHostDao")
@Local(value = { EngineHostDao.class })
@DB(txn = false)
@DB
@TableGenerator(name = "host_req_sq", table = "op_host", pkColumnName = "id", valueColumnName = "sequence", allocationSize = 1)
public class EngineHostDaoImpl extends GenericDaoBase<EngineHostVO, Long> implements EngineHostDao {
private static final Logger s_logger = Logger.getLogger(EngineHostDaoImpl.class);

5
engine/schema/src/com/cloud/certificate/dao/CertificateDaoImpl.java
View File

@ -17,9 +17,6 @@
package com.cloud.certificate.dao;
import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import javax.ejb.Local;
@ -32,7 +29,7 @@ import com.cloud.utils.db.DB;
import com.cloud.utils.db.GenericDaoBase;
@Component
@Local(value={CertificateDao.class}) @DB(txn=false)
@Local(value={CertificateDao.class}) @DB
public class CertificateDaoImpl extends GenericDaoBase<CertificateVO, Long> implements CertificateDao {
private static final Logger s_logger = Logger.getLogger(CertificateDaoImpl.class);

2
engine/schema/src/com/cloud/cluster/agentlb/dao/HostTransferMapDaoImpl.java
View File

@ -34,7 +34,7 @@ import com.cloud.utils.db.SearchCriteria;
@Component
@Local(value = { HostTransferMapDao.class })
@DB(txn = false)
@DB
public class HostTransferMapDaoImpl extends GenericDaoBase<HostTransferMapVO, Long> implements HostTransferMapDao {
private static final Logger s_logger = Logger.getLogger(HostTransferMapDaoImpl.class);

2
engine/schema/src/com/cloud/dc/dao/ClusterVSMMapDaoImpl.java
View File

@ -30,7 +30,7 @@ import com.cloud.utils.db.Transaction;
@Component
@Local(value=ClusterVSMMapDao.class)
@DB(txn = false)
@DB
public class ClusterVSMMapDaoImpl extends GenericDaoBase<ClusterVSMMapVO, Long> implements ClusterVSMMapDao {
final SearchBuilder<ClusterVSMMapVO> ClusterSearch;

2
engine/schema/src/com/cloud/dc/dao/DataCenterIpAddressDaoImpl.java
View File

@ -38,7 +38,7 @@ import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.net.NetUtils;
@Component
@Local(value={DataCenterIpAddressDao.class}) @DB(txn=false)
@Local(value={DataCenterIpAddressDao.class}) @DB
public class DataCenterIpAddressDaoImpl extends GenericDaoBase<DataCenterIpAddressVO, Long> implements DataCenterIpAddressDao {
private static final Logger s_logger = Logger.getLogger(DataCenterIpAddressDaoImpl.class);

3
engine/schema/src/com/cloud/dc/dao/DataCenterLinkLocalIpAddressDaoImpl.java
View File

@ -30,7 +30,6 @@ import org.springframework.stereotype.Component;
import com.cloud.dc.DataCenterLinkLocalIpAddressVO;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.GenericDao;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.GenericSearchBuilder;
import com.cloud.utils.db.SearchBuilder;
@ -41,7 +40,7 @@ import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.net.NetUtils;
@Component
@Local(value={DataCenterLinkLocalIpAddressDaoImpl.class}) @DB(txn=false)
@Local(value={DataCenterLinkLocalIpAddressDaoImpl.class}) @DB
public class DataCenterLinkLocalIpAddressDaoImpl extends GenericDaoBase<DataCenterLinkLocalIpAddressVO, Long> implements DataCenterLinkLocalIpAddressDao {
private static final Logger s_logger = Logger.getLogger(DataCenterLinkLocalIpAddressDaoImpl.class);

4
engine/schema/src/com/cloud/dc/dao/DataCenterVnetDaoImpl.java
View File

@ -25,14 +25,12 @@ import java.util.Map;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
import com.cloud.exception.InvalidParameterValueException;
import org.springframework.stereotype.Component;
import com.cloud.dc.DataCenterVnetVO;
import com.cloud.network.dao.AccountGuestVlanMapDao;
import com.cloud.network.dao.AccountGuestVlanMapVO;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.GenericDao;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.GenericSearchBuilder;
import com.cloud.utils.db.JoinBuilder;
@ -48,7 +46,7 @@ import com.cloud.utils.exception.CloudRuntimeException;
* data center/physical_network and the vnet that appears within the physical network.
*/
@Component
@DB(txn=false)
@DB
public class DataCenterVnetDaoImpl extends GenericDaoBase<DataCenterVnetVO, Long> implements DataCenterVnetDao {
private final SearchBuilder<DataCenterVnetVO> FreeVnetSearch;

7
engine/schema/src/com/cloud/dc/dao/StorageNetworkIpAddressDaoImpl.java
View File

@ -18,17 +18,13 @@ package com.cloud.dc.dao;
import java.util.Date;
import java.util.List;
import java.util.Map;
import javax.ejb.Local;
import javax.naming.ConfigurationException;
import org.springframework.stereotype.Component;
import com.cloud.dc.DataCenterIpAddressVO;
import com.cloud.dc.StorageNetworkIpAddressVO;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.Filter;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.GenericSearchBuilder;
import com.cloud.utils.db.SearchBuilder;
@ -37,10 +33,11 @@ import com.cloud.utils.db.GenericQueryBuilder;
import com.cloud.utils.db.Transaction;
import com.cloud.utils.db.SearchCriteria.Func;
import com.cloud.utils.db.SearchCriteria.Op;
import com.cloud.utils.db.Transaction;
@Component
@Local(value={StorageNetworkIpAddressDao.class})
@DB(txn=false)
@DB
public class StorageNetworkIpAddressDaoImpl extends GenericDaoBase<StorageNetworkIpAddressVO, Long> implements StorageNetworkIpAddressDao {
protected final GenericSearchBuilder<StorageNetworkIpAddressVO, Long> countInUserIp;
protected final GenericSearchBuilder<StorageNetworkIpAddressVO, String> listInUseIp;

2
engine/schema/src/com/cloud/dc/dao/StorageNetworkIpRangeDaoImpl.java
View File

@ -33,7 +33,7 @@ import com.cloud.utils.db.SearchCriteria.Op;
@Component
@Local(value={StorageNetworkIpRangeDao.class})
@DB(txn=false)
@DB
public class StorageNetworkIpRangeDaoImpl extends GenericDaoBase<StorageNetworkIpRangeVO, Long> implements StorageNetworkIpRangeDao {
protected final GenericSearchBuilder<StorageNetworkIpRangeVO, Long> countRanges;

2
engine/schema/src/com/cloud/host/dao/HostDaoImpl.java
View File

@ -65,7 +65,7 @@ import com.cloud.utils.exception.CloudRuntimeException;
@Component
@Local(value = {HostDao.class})
@DB(txn = false)
@DB
@TableGenerator(name = "host_req_sq", table = "op_host", pkColumnName = "id", valueColumnName = "sequence", allocationSize = 1)
public class HostDaoImpl extends GenericDaoBase<HostVO, Long> implements HostDao { //FIXME: , ExternalIdDao {
private static final Logger s_logger = Logger.getLogger(HostDaoImpl.class);

2
engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapDaoImpl.java
View File

@ -30,7 +30,7 @@ import com.cloud.utils.db.SearchCriteria;
@Component
@Local(value={AccountGuestVlanMapDao.class})
@DB(txn=false)
@DB
public class AccountGuestVlanMapDaoImpl extends GenericDaoBase<AccountGuestVlanMapVO, Long> implements AccountGuestVlanMapDao {
protected SearchBuilder<AccountGuestVlanMapVO> AccountSearch;

2
engine/schema/src/com/cloud/network/dao/ExternalFirewallDeviceDaoImpl.java
View File

@ -30,7 +30,7 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Op;
@Component
@Local(value=ExternalFirewallDeviceDao.class) @DB(txn=false)
@Local(value=ExternalFirewallDeviceDao.class) @DB
public class ExternalFirewallDeviceDaoImpl extends GenericDaoBase<ExternalFirewallDeviceVO, Long> implements ExternalFirewallDeviceDao {
final SearchBuilder<ExternalFirewallDeviceVO> physicalNetworkServiceProviderSearch;
final SearchBuilder<ExternalFirewallDeviceVO> physicalNetworkIdSearch;

2
engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDaoImpl.java
View File

@ -29,7 +29,7 @@ import javax.ejb.Local;
import java.util.List;
@Component
@Local(value=ExternalLoadBalancerDeviceDao.class) @DB(txn=false)
@Local(value=ExternalLoadBalancerDeviceDao.class) @DB
public class ExternalLoadBalancerDeviceDaoImpl extends GenericDaoBase<ExternalLoadBalancerDeviceVO, Long> implements ExternalLoadBalancerDeviceDao {
final SearchBuilder<ExternalLoadBalancerDeviceVO> physicalNetworkIdSearch;
final SearchBuilder<ExternalLoadBalancerDeviceVO> physicalNetworkServiceProviderSearch;

3
engine/schema/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
View File

@ -31,7 +31,6 @@ import com.cloud.network.rules.FirewallRule.TrafficType;
import com.cloud.network.rules.FirewallRuleVO;
import com.cloud.server.ResourceTag.TaggedResourceType;
import com.cloud.tags.dao.ResourceTagDao;
import com.cloud.tags.dao.ResourceTagsDaoImpl;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.GenericSearchBuilder;
@ -44,7 +43,7 @@ import com.cloud.utils.db.Transaction;
@Component
@Local(value = FirewallRulesDao.class)
@DB(txn = false)
@DB
public class FirewallRulesDaoImpl extends GenericDaoBase<FirewallRuleVO, Long> implements FirewallRulesDao {
protected final SearchBuilder<FirewallRuleVO> AllFieldsSearch;

4
engine/schema/src/com/cloud/network/dao/NetworkDaoImpl.java
View File

@ -40,10 +40,8 @@ import com.cloud.network.Networks.TrafficType;
import com.cloud.offering.NetworkOffering;
import com.cloud.offerings.NetworkOfferingVO;
import com.cloud.offerings.dao.NetworkOfferingDao;
import com.cloud.offerings.dao.NetworkOfferingDaoImpl;
import com.cloud.server.ResourceTag.TaggedResourceType;
import com.cloud.tags.dao.ResourceTagDao;
import com.cloud.tags.dao.ResourceTagsDaoImpl;
import com.cloud.utils.db.*;
import com.cloud.utils.db.JoinBuilder.JoinType;
import com.cloud.utils.db.SearchCriteria.Func;
@ -52,7 +50,7 @@ import com.cloud.utils.net.NetUtils;
@Component
@Local(value = NetworkDao.class)
@DB(txn = false)
@DB()
public class NetworkDaoImpl extends GenericDaoBase<NetworkVO, Long> implements NetworkDao {
SearchBuilder<NetworkVO> AllFieldsSearch;
SearchBuilder<NetworkVO> AccountSearch;

2
engine/schema/src/com/cloud/network/dao/NetworkDomainDaoImpl.java
View File

@ -30,7 +30,7 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Op;
@Component
@Local(value=NetworkDomainDao.class) @DB(txn=false)
@Local(value=NetworkDomainDao.class) @DB()
public class NetworkDomainDaoImpl extends GenericDaoBase<NetworkDomainVO, Long> implements NetworkDomainDao {
final SearchBuilder<NetworkDomainVO> AllFieldsSearch;
final SearchBuilder<NetworkDomainVO> DomainsSearch;

2
engine/schema/src/com/cloud/network/dao/NetworkExternalFirewallDaoImpl.java
View File

@ -30,7 +30,7 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Op;
@Component
@Local(value=NetworkExternalFirewallDao.class) @DB(txn=false)
@Local(value=NetworkExternalFirewallDao.class) @DB()
public class NetworkExternalFirewallDaoImpl extends GenericDaoBase<NetworkExternalFirewallVO, Long> implements NetworkExternalFirewallDao {
final SearchBuilder<NetworkExternalFirewallVO> networkIdSearch;

2
engine/schema/src/com/cloud/network/dao/NetworkExternalLoadBalancerDaoImpl.java
View File

@ -29,7 +29,7 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Op;
@Component
@Local(value=NetworkExternalLoadBalancerDao.class) @DB(txn=false)
@Local(value=NetworkExternalLoadBalancerDao.class) @DB()
public class NetworkExternalLoadBalancerDaoImpl extends GenericDaoBase<NetworkExternalLoadBalancerVO, Long> implements NetworkExternalLoadBalancerDao {
final SearchBuilder<NetworkExternalLoadBalancerVO> networkIdSearch;

2
engine/schema/src/com/cloud/network/dao/NetworkServiceMapDaoImpl.java
View File

@ -33,7 +33,7 @@ import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
@Component
@Local(value=NetworkServiceMapDao.class) @DB(txn=false)
@Local(value=NetworkServiceMapDao.class) @DB()
public class NetworkServiceMapDaoImpl extends GenericDaoBase<NetworkServiceMapVO, Long> implements NetworkServiceMapDao {
final SearchBuilder<NetworkServiceMapVO> AllFieldsSearch;
final SearchBuilder<NetworkServiceMapVO> MultipleServicesSearch;

2
engine/schema/src/com/cloud/network/dao/PhysicalNetworkDaoImpl.java
View File

@ -32,7 +32,7 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Op;
@Component
@Local(value=PhysicalNetworkDao.class) @DB(txn=false)
@Local(value=PhysicalNetworkDao.class) @DB()
public class PhysicalNetworkDaoImpl extends GenericDaoBase<PhysicalNetworkVO, Long> implements PhysicalNetworkDao {
final SearchBuilder<PhysicalNetworkVO> ZoneSearch;

2
engine/schema/src/com/cloud/network/dao/PhysicalNetworkServiceProviderDaoImpl.java
View File

@ -31,7 +31,7 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Op;
@Component
@Local(value=PhysicalNetworkServiceProviderDao.class) @DB(txn=false)
@Local(value=PhysicalNetworkServiceProviderDao.class) @DB()
public class PhysicalNetworkServiceProviderDaoImpl extends GenericDaoBase<PhysicalNetworkServiceProviderVO, Long> implements PhysicalNetworkServiceProviderDao {
final SearchBuilder<PhysicalNetworkServiceProviderVO> physicalNetworkSearch;
final SearchBuilder<PhysicalNetworkServiceProviderVO> physicalNetworkServiceProviderSearch;

2
engine/schema/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeDaoImpl.java
View File

@ -33,7 +33,7 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Op;
@Component
@Local(value=PhysicalNetworkTrafficTypeDao.class) @DB(txn=false)
@Local(value=PhysicalNetworkTrafficTypeDao.class) @DB()
public class PhysicalNetworkTrafficTypeDaoImpl extends GenericDaoBase<PhysicalNetworkTrafficTypeVO, Long> implements PhysicalNetworkTrafficTypeDao {
final SearchBuilder<PhysicalNetworkTrafficTypeVO> physicalNetworkSearch;
final GenericSearchBuilder<PhysicalNetworkTrafficTypeVO, String> kvmAllFieldsSearch;

2
engine/schema/src/com/cloud/network/dao/PortProfileDaoImpl.java
View File

@ -34,7 +34,7 @@ import com.cloud.utils.db.SearchCriteria.Op;
import com.cloud.utils.exception.CloudRuntimeException;
@Component
@Local(value=PortProfileDao.class) @DB(txn=false)
@Local(value=PortProfileDao.class) @DB()
public class PortProfileDaoImpl extends GenericDaoBase<PortProfileVO, Long> implements PortProfileDao {
protected static final Logger s_logger = Logger.getLogger(PortProfileDaoImpl.class);

2
engine/schema/src/com/cloud/network/dao/VirtualRouterProviderDaoImpl.java
View File

@ -30,7 +30,7 @@ import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
@Component
@Local(value=VirtualRouterProviderDao.class) @DB(txn=false)
@Local(value=VirtualRouterProviderDao.class) @DB()
public class VirtualRouterProviderDaoImpl extends GenericDaoBase<VirtualRouterProviderVO, Long> implements VirtualRouterProviderDao {
final SearchBuilder<VirtualRouterProviderVO> AllFieldsSearch;

3
engine/schema/src/com/cloud/network/vpc/dao/NetworkACLDaoImpl.java
View File

@ -19,14 +19,13 @@ package com.cloud.network.vpc.dao;
import com.cloud.network.vpc.NetworkACLVO;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
import org.springframework.stereotype.Component;
import javax.ejb.Local;
@Component
@Local(value = NetworkACLDao.class)
@DB(txn = false)
@DB()
public class NetworkACLDaoImpl extends GenericDaoBase<NetworkACLVO, Long> implements NetworkACLDao{
protected NetworkACLDaoImpl() {

2
engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemDaoImpl.java
View File

@ -28,7 +28,7 @@ import java.util.List;
@Component
@Local(value = NetworkACLItemDao.class)
@DB(txn = false)
@DB()
public class NetworkACLItemDaoImpl extends GenericDaoBase<NetworkACLItemVO, Long> implements NetworkACLItemDao {
protected final SearchBuilder<NetworkACLItemVO> AllFieldsSearch;

2
engine/schema/src/com/cloud/network/vpc/dao/PrivateIpDaoImpl.java
View File

@ -36,7 +36,7 @@ import com.cloud.utils.db.Transaction;
@Component
@Local(value = PrivateIpDao.class)
@DB(txn = false)
@DB()
public class PrivateIpDaoImpl extends GenericDaoBase<PrivateIpVO, Long> implements PrivateIpDao {
private static final Logger s_logger = Logger.getLogger(PrivateIpDaoImpl.class);

2
engine/schema/src/com/cloud/network/vpc/dao/StaticRouteDaoImpl.java
View File

@ -40,7 +40,7 @@ import com.cloud.utils.db.Transaction;
@Component
@Local(value = StaticRouteDao.class)
@DB(txn = false)
@DB()
public class StaticRouteDaoImpl extends GenericDaoBase<StaticRouteVO, Long> implements StaticRouteDao{
protected final SearchBuilder<StaticRouteVO> AllFieldsSearch;
protected final SearchBuilder<StaticRouteVO> NotRevokedSearch;

2
engine/schema/src/com/cloud/network/vpc/dao/VpcDaoImpl.java
View File

@ -42,7 +42,7 @@ import com.cloud.utils.db.Transaction;
@Component
@Local(value = VpcDao.class)
@DB(txn = false)
@DB()
public class VpcDaoImpl extends GenericDaoBase<VpcVO, Long> implements VpcDao{
final GenericSearchBuilder<VpcVO, Integer> CountByOfferingId;
final SearchBuilder<VpcVO> AllFieldsSearch;

2
engine/schema/src/com/cloud/network/vpc/dao/VpcGatewayDaoImpl.java
View File

@ -31,7 +31,7 @@ import java.util.List;
@Component
@Local(value = VpcGatewayDao.class)
@DB(txn = false)
@DB()
public class VpcGatewayDaoImpl extends GenericDaoBase<VpcGatewayVO, Long> implements VpcGatewayDao{
protected final SearchBuilder<VpcGatewayVO> AllFieldsSearch;

2
engine/schema/src/com/cloud/network/vpc/dao/VpcOfferingDaoImpl.java
View File

@ -30,7 +30,7 @@ import com.cloud.utils.db.Transaction;
@Component
@Local(value = VpcOfferingDao.class)
@DB(txn = false)
@DB()
public class VpcOfferingDaoImpl extends GenericDaoBase<VpcOfferingVO, Long> implements VpcOfferingDao{
final SearchBuilder<VpcOfferingVO> AllFieldsSearch;

2
engine/schema/src/com/cloud/network/vpc/dao/VpcOfferingServiceMapDaoImpl.java
View File

@ -33,7 +33,7 @@ import com.cloud.utils.db.SearchCriteria.Func;
@Component
@Local(value = VpcOfferingServiceMapDao.class)
@DB(txn = false)
@DB()
public class VpcOfferingServiceMapDaoImpl extends GenericDaoBase<VpcOfferingServiceMapVO, Long> implements VpcOfferingServiceMapDao{
final SearchBuilder<VpcOfferingServiceMapVO> AllFieldsSearch;
final SearchBuilder<VpcOfferingServiceMapVO> MultipleServicesSearch;

2
engine/schema/src/com/cloud/network/vpc/dao/VpcServiceMapDaoImpl.java
View File

@ -33,7 +33,7 @@ import com.cloud.utils.db.SearchCriteria;
import org.springframework.stereotype.Component;
@Component
@Local(value=VpcServiceMapDao.class) @DB(txn=false)
@Local(value=VpcServiceMapDao.class) @DB()
public class VpcServiceMapDaoImpl extends GenericDaoBase<VpcServiceMapVO, Long> implements VpcServiceMapDao {
final SearchBuilder<VpcServiceMapVO> AllFieldsSearch;
final SearchBuilder<VpcServiceMapVO> MultipleServicesSearch;

2
engine/schema/src/com/cloud/offerings/dao/NetworkOfferingDaoImpl.java
View File

@ -42,7 +42,7 @@ import com.cloud.utils.db.Transaction;
@Component
@Local(value = NetworkOfferingDao.class)
@DB(txn = false)
@DB()
public class NetworkOfferingDaoImpl extends GenericDaoBase<NetworkOfferingVO, Long> implements NetworkOfferingDao {
final SearchBuilder<NetworkOfferingVO> NameSearch;
final SearchBuilder<NetworkOfferingVO> SystemOfferingSearch;

2
engine/schema/src/com/cloud/offerings/dao/NetworkOfferingServiceMapDaoImpl.java
View File

@ -34,7 +34,7 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Func;
@Component
@Local(value=NetworkOfferingServiceMapDao.class) @DB(txn=false)
@Local(value=NetworkOfferingServiceMapDao.class) @DB()
public class NetworkOfferingServiceMapDaoImpl extends GenericDaoBase<NetworkOfferingServiceMapVO, Long> implements NetworkOfferingServiceMapDao {
final SearchBuilder<NetworkOfferingServiceMapVO> AllFieldsSearch;

2
engine/schema/src/com/cloud/service/dao/ServiceOfferingDaoImpl.java
View File

@ -34,7 +34,7 @@ import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
@Component
@Local(value={ServiceOfferingDao.class}) @DB(txn=false)
@Local(value={ServiceOfferingDao.class}) @DB()
public class ServiceOfferingDaoImpl extends GenericDaoBase<ServiceOfferingVO, Long> implements ServiceOfferingDao {
protected static final Logger s_logger = Logger.getLogger(ServiceOfferingDaoImpl.class);

2
engine/schema/src/com/cloud/storage/dao/StoragePoolWorkDaoImpl.java
View File

@ -36,7 +36,7 @@ import com.cloud.utils.exception.CloudRuntimeException;
@Component
@Local(value = { StoragePoolWorkDao.class })
@DB(txn = false)
@DB()
public class StoragePoolWorkDaoImpl extends GenericDaoBase<StoragePoolWorkVO, Long> implements StoragePoolWorkDao {
protected final SearchBuilder<StoragePoolWorkVO> PendingWorkForPrepareForMaintenanceSearch;

4
engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java
View File

@ -354,7 +354,7 @@ public class VolumeDaoImpl extends GenericDaoBase<VolumeVO, Long> implements Vol
}
@Override
@DB(txn = false)
@DB()
public Pair<Long, Long> getCountAndTotalByPool(long poolId) {
SearchCriteria<SumCount> sc = TotalSizeByPoolSearch.create();
sc.setParameters("poolId", poolId);
@ -506,7 +506,7 @@ public class VolumeDaoImpl extends GenericDaoBase<VolumeVO, Long> implements Vol
}
@Override
@DB(txn = false)
@DB()
public Pair<Long, Long> getNonDestroyedCountAndTotalByPool(long poolId) {
SearchCriteria<SumCount> sc = TotalSizeByPoolSearch.create();
sc.setParameters("poolId", poolId);

2
engine/schema/src/com/cloud/upgrade/dao/VersionDaoImpl.java
View File

@ -40,7 +40,7 @@ import com.cloud.utils.exception.CloudRuntimeException;
@Component
@Local(value = VersionDao.class)
@DB(txn = false)
@DB()
public class VersionDaoImpl extends GenericDaoBase<VersionVO, Long> implements VersionDao {
private static final Logger s_logger = Logger.getLogger(VersionDaoImpl.class);

2
engine/schema/src/com/cloud/vm/dao/UserVmCloneSettingDaoImpl.java
View File

@ -35,7 +35,7 @@ import com.cloud.utils.db.DB;
@Component
@Local(value= { UserVmCloneSettingDao.class })
@DB(txn = false)
@DB()
public class UserVmCloneSettingDaoImpl extends GenericDaoBase<UserVmCloneSettingVO, Long> implements UserVmCloneSettingDao {
public static final Logger s_logger = Logger.getLogger(UserVmCloneSettingDaoImpl.class);

2
engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerLbRuleMapDaoImpl.java
View File

@ -28,7 +28,7 @@ import java.util.List;
@Component
@Local(value={GlobalLoadBalancerLbRuleMapDao.class})
@DB(txn = false)
@DB()
public class GlobalLoadBalancerLbRuleMapDaoImpl extends GenericDaoBase<GlobalLoadBalancerLbRuleMapVO, Long> implements GlobalLoadBalancerLbRuleMapDao {
private final SearchBuilder<GlobalLoadBalancerLbRuleMapVO> listByGslbRuleId;

2
engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java
View File

@ -44,7 +44,7 @@ import com.cloud.utils.db.Transaction;
import com.cloud.utils.exception.CloudRuntimeException;
@Local(value = { PrimaryDataStoreDao.class })
@DB(txn = false)
@DB()
public class PrimaryDataStoreDaoImpl extends GenericDaoBase<StoragePoolVO, Long> implements PrimaryDataStoreDao {
protected final SearchBuilder<StoragePoolVO> AllFieldSearch;
protected final SearchBuilder<StoragePoolVO> DcPodSearch;

16
framework/db/src/com/cloud/utils/db/DB.java
View File

@ -36,24 +36,8 @@ import java.lang.annotation.Target;
* _dao.acquireInLockTable(id);
* ...
* _dao.releaseFromLockTable(id);
*
* 3. Annotate methods that are inside a DAO but doesn't use
* the Transaction class. Generally, these are methods
* that are utility methods for setting up searches. In
* this case use @DB(txn=false) to annotate the method.
* While this is not required, it helps when you're debugging
* the code and it saves on method calls during runtime.
*
*/
@Target({TYPE, METHOD})
@Retention(RUNTIME)
public @interface DB {
/**
* (Optional) Specifies that the method
* does not use transaction. This is useful for
* utility methods within DAO classes which are
* automatically marked with @DB. By marking txn=false,
* the method is not surrounded with transaction code.
*/
boolean txn() default true;
}

122
framework/db/src/com/cloud/utils/db/GenericDaoBase.java
View File

@ -168,7 +168,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
}
@Override
@SuppressWarnings("unchecked") @DB(txn=false)
@SuppressWarnings("unchecked") @DB()
public <J> GenericSearchBuilder<T, J> createSearchBuilder(Class<J> resultType) {
return new GenericSearchBuilder<T, J>(_entityBeanType, resultType);
}
@ -282,7 +282,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
setRunLevel(ComponentLifecycle.RUN_LEVEL_SYSTEM);
}
@Override @DB(txn=false)
@Override @DB()
@SuppressWarnings("unchecked")
public T createForUpdate(final ID id) {
final T entity = (T)_factory.newInstance(new Callback[] {NoOp.INSTANCE, new UpdateBuilder(this)});
@ -296,12 +296,12 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
return entity;
}
@Override @DB(txn=false)
@Override @DB()
public T createForUpdate() {
return createForUpdate(null);
}
@Override @DB(txn=false)
@Override @DB()
public <K> K getNextInSequence(final Class<K> clazz, final String name) {
final TableGenerator tg = _tgs.get(name);
assert (tg != null) : "Couldn't find Table generator using " + name;
@ -309,7 +309,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
return s_seqFetcher.getNextSequence(clazz, tg);
}
@Override @DB(txn=false)
@Override @DB()
public <K> K getRandomlyIncreasingNextInSequence(final Class<K> clazz, final String name) {
final TableGenerator tg = _tgs.get(name);
assert (tg != null) : "Couldn't find Table generator using " + name;
@ -317,19 +317,19 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
return s_seqFetcher.getRandomNextSequence(clazz, tg);
}
@Override @DB(txn=false)
@Override @DB()
public List<T> lockRows(final SearchCriteria<T> sc, final Filter filter, final boolean exclusive) {
return search(sc, filter, exclusive, false);
}
@Override @DB(txn=false)
@Override @DB()
public T lockOneRandomRow(final SearchCriteria<T> sc, final boolean exclusive) {
final Filter filter = new Filter(1);
final List<T> beans = search(sc, filter, exclusive, true);
return beans.isEmpty() ? null : beans.get(0);
}
@DB(txn=false)
@DB()
protected List<T> search(SearchCriteria<T> sc, final Filter filter, final Boolean lock, final boolean cache) {
if (_removed != null) {
if (sc == null) {
@ -340,7 +340,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
return searchIncludingRemoved(sc, filter, lock, cache);
}
@DB(txn=false)
@DB()
protected List<T> search(SearchCriteria<T> sc, final Filter filter, final Boolean lock, final boolean cache, final boolean enable_query_cache) {
if (_removed != null) {
if (sc == null) {
@ -499,7 +499,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
}
}
@Override @DB(txn=false)
@Override @DB()
public <M> List<M> customSearch(SearchCriteria<M> sc, final Filter filter) {
if (_removed != null) {
sc.addAnd(_removed.second().field.getName(), SearchCriteria.Op.NULL);
@ -508,7 +508,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
return customSearchIncludingRemoved(sc, filter);
}
@DB(txn=false)
@DB()
protected void setField(Object entity, Field field, ResultSet rs, int index) throws SQLException {
try {
final Class<?> type = field.getType();
@ -652,7 +652,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
}
}
@DB(txn=false) @SuppressWarnings("unchecked")
@DB() @SuppressWarnings("unchecked")
protected <M> M getObject(Class<M> type, ResultSet rs, int index) throws SQLException {
if (type == String.class) {
byte[] bytes = rs.getBytes(index);
@ -744,7 +744,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
}
}
@DB(txn=false)
@DB()
protected int addJoinAttributes(int count, PreparedStatement pstmt, Collection<JoinBuilder<SearchCriteria<?>>> joins) throws SQLException {
for (JoinBuilder<SearchCriteria<?>> join : joins) {
for (final Pair<Attribute, Object> value : join.getT().getValues()) {
@ -832,12 +832,12 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
}
}
@DB(txn=false)
@DB()
protected Attribute findAttributeByFieldName(String name) {
return _allAttributes.get(name);
}
@DB(txn=false)
@DB()
protected String buildSelectByIdSql(final StringBuilder sql) {
if (_idField == null) {
return null;
@ -857,13 +857,13 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
return sql.toString();
}
@DB(txn=false)
@DB()
@Override
public Class<T> getEntityBeanType() {
return _entityBeanType;
}
@DB(txn=false)
@DB()
protected T findOneIncludingRemovedBy(final SearchCriteria<T> sc) {
Filter filter = new Filter(1);
List<T> results = searchIncludingRemoved(sc, filter, null, false);
@ -872,7 +872,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
}
@Override
@DB(txn=false)
@DB()
public T findOneBy(final SearchCriteria<T> sc) {
if (_removed != null) {
sc.addAnd(_removed.second().field.getName(), SearchCriteria.Op.NULL);
@ -880,7 +880,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
return findOneIncludingRemovedBy(sc);
}
@DB(txn=false)
@DB()
protected List<T> listBy(final SearchCriteria<T> sc, final Filter filter) {
if (_removed != null) {
sc.addAnd(_removed.second().field.getName(), SearchCriteria.Op.NULL);
@ -888,7 +888,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
return listIncludingRemovedBy(sc, filter);
}
@DB(txn=false)
@DB()
protected List<T> listBy(final SearchCriteria<T> sc, final Filter filter, final boolean enable_query_cache) {
if (_removed != null) {
sc.addAnd(_removed.second().field.getName(), SearchCriteria.Op.NULL);
@ -896,27 +896,27 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
return listIncludingRemovedBy(sc, filter, enable_query_cache);
}
@DB(txn=false)
@DB()
protected List<T> listBy(final SearchCriteria<T> sc) {
return listBy(sc, null);
}
@DB(txn=false)
@DB()
protected List<T> listIncludingRemovedBy(final SearchCriteria<T> sc, final Filter filter, final boolean enable_query_cache) {
return searchIncludingRemoved(sc, filter, null, false, enable_query_cache);
}
@DB(txn=false)
@DB()
protected List<T> listIncludingRemovedBy(final SearchCriteria<T> sc, final Filter filter) {
return searchIncludingRemoved(sc, filter, null, false);
}
@DB(txn=false)
@DB()
protected List<T> listIncludingRemovedBy(final SearchCriteria<T> sc) {
return listIncludingRemovedBy(sc, null);
}
@Override @DB(txn=false)
@Override @DB()
@SuppressWarnings("unchecked")
public T findById(final ID id) {
if (_cache != null) {
@ -927,26 +927,26 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
}
}
@Override @DB(txn=false)
@Override @DB()
public T findByUuid(final String uuid) {
SearchCriteria<T> sc = createSearchCriteria();
sc.addAnd("uuid", SearchCriteria.Op.EQ, uuid);
return findOneBy(sc);
}
@Override @DB(txn=false)
@Override @DB()
public T findByUuidIncludingRemoved(final String uuid) {
SearchCriteria<T> sc = createSearchCriteria();
sc.addAnd("uuid", SearchCriteria.Op.EQ, uuid);
return findOneIncludingRemovedBy(sc);
}
@Override @DB(txn=false)
@Override @DB()
public T findByIdIncludingRemoved(ID id) {
return findById(id, true, null);
}
@Override @DB(txn=false)
@Override @DB()
public T findById(final ID id, boolean fresh) {
if(!fresh) {
return findById(id);
@ -958,7 +958,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
return lockRow(id, null);
}
@Override @DB(txn=false)
@Override @DB()
public T lockRow(ID id, Boolean lock) {
return findById(id, false, lock);
}
@ -987,7 +987,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
}
}
@Override @DB(txn=false)
@Override @DB()
public T acquireInLockTable(ID id) {
return acquireInLockTable(id, _timeoutSeconds);
}
@ -1018,7 +1018,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
return txn.release(_table + id);
}
@Override @DB(txn=false)
@Override @DB()
public boolean lockInLockTable(final String id) {
return lockInLockTable(id, _timeoutSeconds);
}
@ -1035,12 +1035,12 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
return txn.release(_table + id);
}
@Override @DB(txn=false)
@Override @DB()
public List<T> listAllIncludingRemoved() {
return listAllIncludingRemoved(null);
}
@DB(txn=false)
@DB()
protected List<Object> addGroupBy(final StringBuilder sql, SearchCriteria<?> sc) {
Pair<GroupBy<?, ?, ?>, List<Object>> groupBys = sc.getGroupBy();
if (groupBys != null) {
@ -1051,7 +1051,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
}
}
@DB(txn=false)
@DB()
protected void addFilter(final StringBuilder sql, final Filter filter) {
if (filter != null) {
if (filter.getOrderBy() != null) {
@ -1067,7 +1067,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
}
}
@Override @DB(txn=false)
@Override @DB()
public List<T> listAllIncludingRemoved(final Filter filter) {
final StringBuilder sql = createPartialSelectSql(null, false);
addFilter(sql, filter);
@ -1098,12 +1098,12 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
}
}
@Override @DB(txn=false)
@Override @DB()
public List<T> listAll() {
return listAll(null);
}
@Override @DB(txn=false)
@Override @DB()
public List<T> listAll(final Filter filter) {
if (_removed == null) {
return listAllIncludingRemoved(filter);
@ -1174,7 +1174,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
}
}
@DB(txn=false)
@DB()
protected StringBuilder createPartialSelectSql(SearchCriteria<?> sc, final boolean whereClause, final boolean enable_query_cache) {
StringBuilder sql = new StringBuilder(enable_query_cache ? _partialQueryCacheSelectSql.first() : _partialSelectSql.first());
if (sc != null && !sc.isSelectAll()) {
@ -1189,7 +1189,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
return sql;
}
@DB(txn=false)
@DB()
protected StringBuilder createPartialSelectSql(SearchCriteria<?> sc, final boolean whereClause) {
StringBuilder sql = new StringBuilder(_partialSelectSql.first());
if (sc != null && !sc.isSelectAll()) {
@ -1205,7 +1205,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
}
@DB(txn = false)
@DB()
protected void addJoins(StringBuilder str, Collection<JoinBuilder<SearchCriteria<?>>> joins) {
int fromIndex = str.lastIndexOf("WHERE");
if (fromIndex == -1) {
@ -1238,24 +1238,24 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
}
}
@Override @DB(txn=false)
@Override @DB()
public List<T> search(final SearchCriteria<T> sc, final Filter filter) {
return search(sc, filter, null, false);
}
@Override @DB(txn=false)
@Override @DB()
public Pair<List<T>, Integer> searchAndCount(final SearchCriteria<T> sc, final Filter filter) {
List<T> objects = search(sc, filter, null, false);
Integer count = getCount(sc);
return new Pair<List<T>, Integer>(objects, count);
}
@Override @DB(txn=false)
@Override @DB()
public List<T> search(final SearchCriteria<T> sc, final Filter filter, final boolean enable_query_cache) {
return search(sc, filter, null, false, enable_query_cache);
}
@Override @DB(txn=false)
@Override @DB()
public boolean update(ID id, T entity) {
assert Enhancer.isEnhanced(entity.getClass()) : "Entity is not generated by this dao";
@ -1264,14 +1264,14 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
return result;
}
@DB(txn=false)
@DB()
public int update(final T entity, final SearchCriteria<T> sc, Integer rows) {
final UpdateBuilder ub = getUpdateBuilder(entity);
return update(ub, sc, rows);
}
@Override
@DB(txn=false)
@DB()
public int update(final T entity, final SearchCriteria<T> sc) {
final UpdateBuilder ub = getUpdateBuilder(entity);
return update(ub, sc, null);
@ -1390,7 +1390,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
txn.commit();
}
@DB(txn=false)
@DB()
protected Object generateValue(final Attribute attr) {
if (attr.is(Attribute.Flag.Created) || attr.is(Attribute.Flag.Removed)) {
return new Date();
@ -1414,7 +1414,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
}
}
@DB(txn=false)
@DB()
protected void prepareAttribute(final int j, final PreparedStatement pstmt, final Attribute attr, Object value) throws SQLException {
if (attr.is(Attribute.Flag.DaoGenerated) && value == null) {
value = generateValue(attr);
@ -1519,7 +1519,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
}
}
@DB(txn=false)
@DB()
protected int prepareAttributes(final PreparedStatement pstmt, final Object entity, final Attribute[] attrs, final int index) throws SQLException {
int j = 0;
for (int i = 0; i < attrs.length; i++) {
@ -1536,7 +1536,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
return j;
}
@SuppressWarnings("unchecked") @DB(txn=false)
@SuppressWarnings("unchecked") @DB()
protected T toEntityBean(final ResultSet result, final boolean cache) throws SQLException {
final T entity = (T)_factory.newInstance(new Callback[] {NoOp.INSTANCE, new UpdateBuilder(this)});
@ -1553,7 +1553,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
return entity;
}
@DB(txn=false)
@DB()
protected T toVO(ResultSet result, boolean cache) throws SQLException {
T entity;
try {
@ -1575,7 +1575,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
return entity;
}
@DB(txn=false)
@DB()
protected void toEntityBean(final ResultSet result, final T entity) throws SQLException {
ResultSetMetaData meta = result.getMetaData();
for (int index = 1, max = meta.getColumnCount(); index <= max; index++) {
@ -1586,7 +1586,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
}
}
@DB(txn = true)
@DB()
@SuppressWarnings("unchecked")
protected void loadCollection(T entity, Attribute attr) {
EcInfo ec = (EcInfo)attr.attache;
@ -1688,7 +1688,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
}
}
@DB(txn=false)
@DB()
protected void setField(final Object entity, final ResultSet rs, ResultSetMetaData meta, final int index) throws SQLException {
Attribute attr = _allColumns.get(new Pair<String, String>(meta.getTableName(index), meta.getColumnName(index)));
if ( attr == null ){
@ -1745,7 +1745,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
}
protected Cache _cache;
@DB(txn=false)
@DB()
protected void createCache(final Map<String, ? extends Object> params) {
final String value = (String)params.get("cache.size");
@ -1762,7 +1762,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
}
}
@Override @DB(txn=false)
@Override @DB()
public boolean configure(final String name, final Map<String, Object> params) throws ConfigurationException {
_name = name;
@ -1778,19 +1778,19 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
return true;
}
@DB(txn=false)
@DB()
public static <T> UpdateBuilder getUpdateBuilder(final T entityObject) {
final Factory factory = (Factory)entityObject;
assert(factory != null);
return (UpdateBuilder)factory.getCallback(1);
}
@Override @DB(txn=false)
@Override @DB()
public SearchBuilder<T> createSearchBuilder() {
return new SearchBuilder<T>(_entityBeanType);
}
@Override @DB(txn=false)
@Override @DB()
public SearchCriteria<T> createSearchCriteria() {
SearchBuilder<T> builder = createSearchBuilder();
return builder.create();
@ -1859,7 +1859,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
}
}
@DB(txn=false)
@DB()
protected StringBuilder createCountSelect(SearchCriteria<?> sc, final boolean whereClause) {
StringBuilder sql = new StringBuilder(_count);

7
plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalDhcpDaoImpl.java
View File

@ -18,16 +18,11 @@
// Automatically generated by addcopyright.py at 01/29/2013
package com.cloud.baremetal.database;
import java.util.List;
import java.util.Map;
import javax.ejb.Local;
import javax.naming.ConfigurationException;
import org.springframework.stereotype.Component;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.Filter;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.GenericSearchBuilder;
import com.cloud.utils.db.SearchBuilder;
@ -36,7 +31,7 @@ import com.cloud.utils.db.GenericQueryBuilder;
@Component
@Local(value=BaremetalDhcpDao.class)
@DB(txn=false)
@DB()
public class BaremetalDhcpDaoImpl extends GenericDaoBase<BaremetalDhcpVO, Long> implements BaremetalDhcpDao {
public BaremetalDhcpDaoImpl() {

7
plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalPxeDaoImpl.java
View File

@ -18,16 +18,11 @@
// Automatically generated by addcopyright.py at 01/29/2013
package com.cloud.baremetal.database;
import java.util.List;
import java.util.Map;
import javax.ejb.Local;
import javax.naming.ConfigurationException;
import org.springframework.stereotype.Component;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.Filter;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.GenericSearchBuilder;
import com.cloud.utils.db.SearchBuilder;
@ -36,6 +31,6 @@ import com.cloud.utils.db.GenericQueryBuilder;
@Component
@Local(value = {BaremetalPxeDao.class})
@DB(txn = false)
@DB()
public class BaremetalPxeDaoImpl extends GenericDaoBase<BaremetalPxeVO, Long> implements BaremetalPxeDao {
}

4
plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsBladeDaoImpl.java
View File

@ -19,12 +19,10 @@ package com.cloud.ucs.database;
import javax.ejb.Local;
import org.springframework.stereotype.Component;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.GenericDaoBase;
@Local(value = { UcsBladeDao.class })
@DB(txn = false)
@DB()
public class UcsBladeDaoImpl extends GenericDaoBase<UcsBladeVO, Long> implements UcsBladeDao {
}

4
plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsManagerDaoImpl.java
View File

@ -19,12 +19,10 @@ package com.cloud.ucs.database;
import javax.ejb.Local;
import org.springframework.stereotype.Component;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.GenericDaoBase;
@Local(value = { UcsManagerDao.class })
@DB(txn = false)
@DB()
public class UcsManagerDaoImpl extends GenericDaoBase<UcsManagerVO, Long> implements UcsManagerDao {
}

2
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/LegacyZoneDaoImpl.java
View File

@ -32,7 +32,7 @@
import com.cloud.utils.db.SearchCriteria.Op;
@Component
@Local(value=LegacyZoneDao.class) @DB(txn=false)
@Local(value=LegacyZoneDao.class) @DB
public class LegacyZoneDaoImpl extends GenericDaoBase<LegacyZoneVO, Long> implements LegacyZoneDao {
protected static final Logger s_logger = Logger.getLogger(LegacyZoneDaoImpl.class);

2
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/VmwareDatacenterDaoImpl.java
View File

@ -32,7 +32,7 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Op;
@Component
@Local(value=VmwareDatacenterDao.class) @DB(txn=false)
@Local(value=VmwareDatacenterDao.class) @DB
public class VmwareDatacenterDaoImpl extends GenericDaoBase<VmwareDatacenterVO, Long> implements VmwareDatacenterDao {
protected static final Logger s_logger = Logger.getLogger(VmwareDatacenterDaoImpl.class);

2
plugins/hypervisors/vmware/src/com/cloud/network/dao/CiscoNexusVSMDeviceDaoImpl.java
View File

@ -30,7 +30,7 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Op;
@Component
@Local(value=CiscoNexusVSMDeviceDao.class) @DB(txn=false)
@Local(value=CiscoNexusVSMDeviceDao.class) @DB
public class CiscoNexusVSMDeviceDaoImpl extends GenericDaoBase<CiscoNexusVSMDeviceVO, Long> implements CiscoNexusVSMDeviceDao {
protected static final Logger s_logger = Logger.getLogger(CiscoNexusVSMDeviceDaoImpl.class);
final SearchBuilder<CiscoNexusVSMDeviceVO> mgmtVlanIdSearch;

2
plugins/network-elements/netscaler/src/com/cloud/network/dao/NetScalerPodDaoImpl.java
View File

@ -30,7 +30,7 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Op;
@Component
@Local(value=NetScalerPodDao.class) @DB(txn=false)
@Local(value=NetScalerPodDao.class) @DB
public class NetScalerPodDaoImpl extends GenericDaoBase<NetScalerPodVO, Long> implements NetScalerPodDao {
final SearchBuilder<NetScalerPodVO> podIdSearch;

3
server/src/com/cloud/dc/dao/DedicatedResourceDaoImpl.java
View File

@ -23,7 +23,6 @@ import javax.ejb.Local;
import org.springframework.stereotype.Component;
import com.cloud.dc.DedicatedResourceVO;
import com.cloud.dc.HostPodVO;
import com.cloud.utils.Pair;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.GenericDaoBase;
@ -35,7 +34,7 @@ import com.cloud.utils.db.SearchCriteria.Op;
import com.cloud.utils.db.Transaction;
@Component
@Local(value={DedicatedResourceDao.class}) @DB(txn = false)
@Local(value={DedicatedResourceDao.class}) @DB
public class DedicatedResourceDaoImpl extends GenericDaoBase<DedicatedResourceVO, Long> implements DedicatedResourceDao {
protected final SearchBuilder<DedicatedResourceVO> ZoneSearch;
protected final SearchBuilder<DedicatedResourceVO> PodSearch;

2
server/test/com/cloud/vpc/dao/MockNetworkDaoImpl.java
View File

@ -32,7 +32,7 @@ import java.util.List;
import java.util.Map;
@Local(value = NetworkDao.class)
@DB(txn = false)
@DB()
public class MockNetworkDaoImpl extends GenericDaoBase<NetworkVO, Long> implements NetworkDao{
/* (non-Javadoc)

3
server/test/com/cloud/vpc/dao/MockNetworkOfferingDaoImpl.java
View File

@ -33,10 +33,9 @@ import com.cloud.offerings.NetworkOfferingVO;
import com.cloud.offerings.dao.NetworkOfferingDao;
import com.cloud.offerings.dao.NetworkOfferingDaoImpl;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.GenericDaoBase;
@Local(value = NetworkOfferingDao.class)
@DB(txn = false)
@DB()
public class MockNetworkOfferingDaoImpl extends NetworkOfferingDaoImpl implements NetworkOfferingDao{
private static final Logger s_logger = Logger.getLogger(MockNetworkOfferingDaoImpl.class);

6
server/test/com/cloud/vpc/dao/MockNetworkOfferingServiceMapDaoImpl.java
View File

@ -16,19 +16,15 @@
// under the License.
package com.cloud.vpc.dao;
import java.util.ArrayList;
import java.util.List;
import javax.ejb.Local;
import com.cloud.network.Network.Service;
import com.cloud.offerings.dao.NetworkOfferingServiceMapDao;
import com.cloud.offerings.dao.NetworkOfferingServiceMapDaoImpl;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.SearchCriteria;
@Local(value = NetworkOfferingServiceMapDao.class)
@DB(txn = false)
@DB()
public class MockNetworkOfferingServiceMapDaoImpl extends NetworkOfferingServiceMapDaoImpl{
@Override

2
server/test/com/cloud/vpc/dao/MockNetworkServiceMapDaoImpl.java
View File

@ -28,7 +28,7 @@ import com.cloud.utils.db.DB;
import com.cloud.utils.db.GenericDaoBase;
@Local(value = NetworkServiceMapDao.class)
@DB(txn = false)
@DB()
public class MockNetworkServiceMapDaoImpl extends GenericDaoBase<NetworkServiceMapVO, Long> implements NetworkServiceMapDao{
/* (non-Javadoc)

2
server/test/com/cloud/vpc/dao/MockVpcDaoImpl.java
View File

@ -32,7 +32,7 @@ import com.cloud.utils.db.DB;
import com.cloud.utils.db.GenericDaoBase;
@Local(value = VpcDao.class)
@DB(txn = false)
@DB()
public class MockVpcDaoImpl extends GenericDaoBase<VpcVO, Long> implements VpcDao{
private static final Logger s_logger = Logger.getLogger(MockNetworkOfferingDaoImpl.class);

2
server/test/com/cloud/vpc/dao/MockVpcOfferingDaoImpl.java
View File

@ -24,7 +24,7 @@ import com.cloud.utils.db.DB;
import com.cloud.utils.db.GenericDaoBase;
@Local(value = VpcOfferingDao.class)
@DB(txn = false)
@DB()
public class MockVpcOfferingDaoImpl extends GenericDaoBase<VpcOfferingVO, Long> implements VpcOfferingDao{
/* (non-Javadoc)

2
server/test/com/cloud/vpc/dao/MockVpcOfferingServiceMapDaoImpl.java
View File

@ -27,7 +27,7 @@ import com.cloud.utils.db.DB;
import com.cloud.utils.db.GenericDaoBase;
@Local(value = VpcOfferingServiceMapDao.class)
@DB(txn = false)
@DB()
public class MockVpcOfferingServiceMapDaoImpl extends GenericDaoBase<VpcOfferingServiceMapVO, Long> implements VpcOfferingServiceMapDao{
/* (non-Javadoc)