Skip to content

Commit bd85367

Browse files
K0zkaibuildthecloud
K0zka
authored and
ibuildthecloud
committed
remove txn attribute from DB
txn attribute was never actually used Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
1 parent 2b47611 commit bd85367

60 files changed

Lines changed: 121 additions & 170 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDaoImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060

6161
@Component(value="EngineHostDao")
6262
@Local(value = { EngineHostDao.class })
63-
@DB(txn = false)
63+
@DB
6464
@TableGenerator(name = "host_req_sq", table = "op_host", pkColumnName = "id", valueColumnName = "sequence", allocationSize = 1)
6565
public class EngineHostDaoImpl extends GenericDaoBase<EngineHostVO, Long> implements EngineHostDao {
6666
private static final Logger s_logger = Logger.getLogger(EngineHostDaoImpl.class);

‎engine/schema/src/com/cloud/certificate/dao/CertificateDaoImpl.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
package com.cloud.certificate.dao;
1818

1919
import java.io.BufferedInputStream;
20-
import java.io.File;
21-
import java.io.FileInputStream;
22-
import java.io.FileNotFoundException;
2320
import java.io.IOException;
2421

2522
import javax.ejb.Local;
@@ -32,7 +29,7 @@
3229
import com.cloud.utils.db.GenericDaoBase;
3330

3431
@Component
35-
@Local(value={CertificateDao.class}) @DB(txn=false)
32+
@Local(value={CertificateDao.class}) @DB
3633
public class CertificateDaoImpl extends GenericDaoBase<CertificateVO, Long> implements CertificateDao {
3734

3835
private static final Logger s_logger = Logger.getLogger(CertificateDaoImpl.class);

‎engine/schema/src/com/cloud/cluster/agentlb/dao/HostTransferMapDaoImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
@Component
3636
@Local(value = { HostTransferMapDao.class })
37-
@DB(txn = false)
37+
@DB
3838
public class HostTransferMapDaoImpl extends GenericDaoBase<HostTransferMapVO, Long> implements HostTransferMapDao {
3939
private static final Logger s_logger = Logger.getLogger(HostTransferMapDaoImpl.class);
4040

‎engine/schema/src/com/cloud/dc/dao/ClusterVSMMapDaoImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
@Component
3232
@Local(value=ClusterVSMMapDao.class)
33-
@DB(txn = false)
33+
@DB
3434
public class ClusterVSMMapDaoImpl extends GenericDaoBase<ClusterVSMMapVO, Long> implements ClusterVSMMapDao {
3535

3636
final SearchBuilder<ClusterVSMMapVO> ClusterSearch;

‎engine/schema/src/com/cloud/dc/dao/DataCenterIpAddressDaoImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
import com.cloud.utils.net.NetUtils;
3939

4040
@Component
41-
@Local(value={DataCenterIpAddressDao.class}) @DB(txn=false)
41+
@Local(value={DataCenterIpAddressDao.class}) @DB
4242
public class DataCenterIpAddressDaoImpl extends GenericDaoBase<DataCenterIpAddressVO, Long> implements DataCenterIpAddressDao {
4343
private static final Logger s_logger = Logger.getLogger(DataCenterIpAddressDaoImpl.class);
4444

‎engine/schema/src/com/cloud/dc/dao/DataCenterLinkLocalIpAddressDaoImpl.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030

3131
import com.cloud.dc.DataCenterLinkLocalIpAddressVO;
3232
import com.cloud.utils.db.DB;
33-
import com.cloud.utils.db.GenericDao;
3433
import com.cloud.utils.db.GenericDaoBase;
3534
import com.cloud.utils.db.GenericSearchBuilder;
3635
import com.cloud.utils.db.SearchBuilder;
@@ -41,7 +40,7 @@
4140
import com.cloud.utils.net.NetUtils;
4241

4342
@Component
44-
@Local(value={DataCenterLinkLocalIpAddressDaoImpl.class}) @DB(txn=false)
43+
@Local(value={DataCenterLinkLocalIpAddressDaoImpl.class}) @DB
4544
public class DataCenterLinkLocalIpAddressDaoImpl extends GenericDaoBase<DataCenterLinkLocalIpAddressVO, Long> implements DataCenterLinkLocalIpAddressDao {
4645
private static final Logger s_logger = Logger.getLogger(DataCenterLinkLocalIpAddressDaoImpl.class);
4746

‎engine/schema/src/com/cloud/dc/dao/DataCenterVnetDaoImpl.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,12 @@
2525
import javax.inject.Inject;
2626
import javax.naming.ConfigurationException;
2727

28-
import com.cloud.exception.InvalidParameterValueException;
2928
import org.springframework.stereotype.Component;
3029

3130
import com.cloud.dc.DataCenterVnetVO;
3231
import com.cloud.network.dao.AccountGuestVlanMapDao;
3332
import com.cloud.network.dao.AccountGuestVlanMapVO;
3433
import com.cloud.utils.db.DB;
35-
import com.cloud.utils.db.GenericDao;
3634
import com.cloud.utils.db.GenericDaoBase;
3735
import com.cloud.utils.db.GenericSearchBuilder;
3836
import com.cloud.utils.db.JoinBuilder;
@@ -48,7 +46,7 @@
4846
* data center/physical_network and the vnet that appears within the physical network.
4947
*/
5048
@Component
51-
@DB(txn=false)
49+
@DB
5250
public class DataCenterVnetDaoImpl extends GenericDaoBase<DataCenterVnetVO, Long> implements DataCenterVnetDao {
5351

5452
private final SearchBuilder<DataCenterVnetVO> FreeVnetSearch;

‎engine/schema/src/com/cloud/dc/dao/StorageNetworkIpAddressDaoImpl.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,13 @@
1818

1919
import java.util.Date;
2020
import java.util.List;
21-
import java.util.Map;
2221

2322
import javax.ejb.Local;
24-
import javax.naming.ConfigurationException;
2523

2624
import org.springframework.stereotype.Component;
2725

28-
import com.cloud.dc.DataCenterIpAddressVO;
2926
import com.cloud.dc.StorageNetworkIpAddressVO;
3027
import com.cloud.utils.db.DB;
31-
import com.cloud.utils.db.Filter;
3228
import com.cloud.utils.db.GenericDaoBase;
3329
import com.cloud.utils.db.GenericSearchBuilder;
3430
import com.cloud.utils.db.SearchBuilder;
@@ -37,10 +33,11 @@
3733
import com.cloud.utils.db.Transaction;
3834
import com.cloud.utils.db.SearchCriteria.Func;
3935
import com.cloud.utils.db.SearchCriteria.Op;
36+
import com.cloud.utils.db.Transaction;
4037

4138
@Component
4239
@Local(value={StorageNetworkIpAddressDao.class})
43-
@DB(txn=false)
40+
@DB
4441
public class StorageNetworkIpAddressDaoImpl extends GenericDaoBase<StorageNetworkIpAddressVO, Long> implements StorageNetworkIpAddressDao {
4542
protected final GenericSearchBuilder<StorageNetworkIpAddressVO, Long> countInUserIp;
4643
protected final GenericSearchBuilder<StorageNetworkIpAddressVO, String> listInUseIp;

‎engine/schema/src/com/cloud/dc/dao/StorageNetworkIpRangeDaoImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
@Component
3535
@Local(value={StorageNetworkIpRangeDao.class})
36-
@DB(txn=false)
36+
@DB
3737
public class StorageNetworkIpRangeDaoImpl extends GenericDaoBase<StorageNetworkIpRangeVO, Long> implements StorageNetworkIpRangeDao {
3838
protected final GenericSearchBuilder<StorageNetworkIpRangeVO, Long> countRanges;
3939

‎engine/schema/src/com/cloud/host/dao/HostDaoImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565

6666
@Component
6767
@Local(value = {HostDao.class})
68-
@DB(txn = false)
68+
@DB
6969
@TableGenerator(name = "host_req_sq", table = "op_host", pkColumnName = "id", valueColumnName = "sequence", allocationSize = 1)
7070
public class HostDaoImpl extends GenericDaoBase<HostVO, Long> implements HostDao { //FIXME: , ExternalIdDao {
7171
private static final Logger s_logger = Logger.getLogger(HostDaoImpl.class);

0 commit comments

Comments
 (0)