From 300f626d42fbb0c944517b2e548c135f7e0873c9 Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Fri, 25 Oct 2013 14:20:58 -0700 Subject: [PATCH] Renamed ResourceDetailDaoImpl to ResourceDetailDaoBase --- .../src/com/cloud/dc/dao/DataCenterDetailsDaoImpl.java | 2 +- ...sourceDetailDaoImpl.java => ResourceDetailDaoBase.java} | 7 +++++-- .../src/com/cloud/network/dao/NetworkDetailsDaoImpl.java | 4 ++-- .../cloud/service/dao/ServiceOfferingDetailsDaoImpl.java | 4 ++-- .../com/cloud/storage/dao/VMTemplateDetailsDaoImpl.java | 4 ++-- .../src/com/cloud/storage/dao/VolumeDetailsDaoImpl.java | 4 ++-- engine/schema/src/com/cloud/vm/dao/NicDetailDaoImpl.java | 4 ++-- .../schema/src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java | 4 ++-- server/src/com/cloud/api/ApiDBUtils.java | 2 +- 9 files changed, 19 insertions(+), 16 deletions(-) rename engine/schema/src/com/cloud/dc/dao/{ResourceDetailDaoImpl.java => ResourceDetailDaoBase.java} (95%) diff --git a/engine/schema/src/com/cloud/dc/dao/DataCenterDetailsDaoImpl.java b/engine/schema/src/com/cloud/dc/dao/DataCenterDetailsDaoImpl.java index b6949f55332..eb9176d1047 100644 --- a/engine/schema/src/com/cloud/dc/dao/DataCenterDetailsDaoImpl.java +++ b/engine/schema/src/com/cloud/dc/dao/DataCenterDetailsDaoImpl.java @@ -26,7 +26,7 @@ import org.apache.cloudstack.framework.config.ScopedConfigStorage; import com.cloud.dc.DataCenterDetailVO; @Local(value=DataCenterDetailsDao.class) -public class DataCenterDetailsDaoImpl extends ResourceDetailDaoImpl implements DataCenterDetailsDao, ScopedConfigStorage { +public class DataCenterDetailsDaoImpl extends ResourceDetailDaoBase implements DataCenterDetailsDao, ScopedConfigStorage { public DataCenterDetailsDaoImpl() { } diff --git a/engine/schema/src/com/cloud/dc/dao/ResourceDetailDaoImpl.java b/engine/schema/src/com/cloud/dc/dao/ResourceDetailDaoBase.java similarity index 95% rename from engine/schema/src/com/cloud/dc/dao/ResourceDetailDaoImpl.java rename to engine/schema/src/com/cloud/dc/dao/ResourceDetailDaoBase.java index 8819e4bf0cc..ea8f85a2e6b 100644 --- a/engine/schema/src/com/cloud/dc/dao/ResourceDetailDaoImpl.java +++ b/engine/schema/src/com/cloud/dc/dao/ResourceDetailDaoBase.java @@ -28,10 +28,10 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.TransactionLegacy; -public abstract class ResourceDetailDaoImpl extends GenericDaoBase{ +public abstract class ResourceDetailDaoBase extends GenericDaoBase{ private SearchBuilder AllFieldsSearch; - public ResourceDetailDaoImpl() { + public ResourceDetailDaoBase() { AllFieldsSearch = createSearchBuilder(); AllFieldsSearch.and("resourceId", AllFieldsSearch.entity().getResourceId(), SearchCriteria.Op.EQ); AllFieldsSearch.and("name", AllFieldsSearch.entity().getName(), SearchCriteria.Op.EQ); @@ -85,6 +85,9 @@ public abstract class ResourceDetailDaoImpl extends Ge public void addDetails(List details) { + if (details.isEmpty()) { + return; + } TransactionLegacy txn = TransactionLegacy.currentTxn(); txn.start(); SearchCriteria sc = AllFieldsSearch.create(); diff --git a/engine/schema/src/com/cloud/network/dao/NetworkDetailsDaoImpl.java b/engine/schema/src/com/cloud/network/dao/NetworkDetailsDaoImpl.java index 76dc24a9a0a..915e1847b45 100644 --- a/engine/schema/src/com/cloud/network/dao/NetworkDetailsDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/NetworkDetailsDaoImpl.java @@ -20,10 +20,10 @@ import javax.ejb.Local; import org.springframework.stereotype.Component; -import com.cloud.dc.dao.ResourceDetailDaoImpl; +import com.cloud.dc.dao.ResourceDetailDaoBase; @Component @Local(value=NetworkDetailsDao.class) -public class NetworkDetailsDaoImpl extends ResourceDetailDaoImpl implements NetworkDetailsDao { +public class NetworkDetailsDaoImpl extends ResourceDetailDaoBase implements NetworkDetailsDao { } diff --git a/engine/schema/src/com/cloud/service/dao/ServiceOfferingDetailsDaoImpl.java b/engine/schema/src/com/cloud/service/dao/ServiceOfferingDetailsDaoImpl.java index bf3cdcc2f83..eed8a132b12 100644 --- a/engine/schema/src/com/cloud/service/dao/ServiceOfferingDetailsDaoImpl.java +++ b/engine/schema/src/com/cloud/service/dao/ServiceOfferingDetailsDaoImpl.java @@ -20,12 +20,12 @@ import javax.ejb.Local; import org.springframework.stereotype.Component; -import com.cloud.dc.dao.ResourceDetailDaoImpl; +import com.cloud.dc.dao.ResourceDetailDaoBase; import com.cloud.service.ServiceOfferingDetailsVO; @Component @Local(value=ServiceOfferingDetailsDao.class) -public class ServiceOfferingDetailsDaoImpl extends ResourceDetailDaoImpl +public class ServiceOfferingDetailsDaoImpl extends ResourceDetailDaoBase implements ServiceOfferingDetailsDao { } diff --git a/engine/schema/src/com/cloud/storage/dao/VMTemplateDetailsDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/VMTemplateDetailsDaoImpl.java index 007f9cab2bd..4b9bfb5f0ed 100644 --- a/engine/schema/src/com/cloud/storage/dao/VMTemplateDetailsDaoImpl.java +++ b/engine/schema/src/com/cloud/storage/dao/VMTemplateDetailsDaoImpl.java @@ -20,10 +20,10 @@ import javax.ejb.Local; import org.springframework.stereotype.Component; -import com.cloud.dc.dao.ResourceDetailDaoImpl; +import com.cloud.dc.dao.ResourceDetailDaoBase; import com.cloud.storage.VMTemplateDetailVO; @Component @Local(value = VMTemplateDetailsDao.class) -public class VMTemplateDetailsDaoImpl extends ResourceDetailDaoImpl implements VMTemplateDetailsDao { +public class VMTemplateDetailsDaoImpl extends ResourceDetailDaoBase implements VMTemplateDetailsDao { } diff --git a/engine/schema/src/com/cloud/storage/dao/VolumeDetailsDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/VolumeDetailsDaoImpl.java index d264394990f..9df6ee1307d 100644 --- a/engine/schema/src/com/cloud/storage/dao/VolumeDetailsDaoImpl.java +++ b/engine/schema/src/com/cloud/storage/dao/VolumeDetailsDaoImpl.java @@ -20,11 +20,11 @@ import javax.ejb.Local; import org.springframework.stereotype.Component; -import com.cloud.dc.dao.ResourceDetailDaoImpl; +import com.cloud.dc.dao.ResourceDetailDaoBase; import com.cloud.storage.VolumeDetailVO; @Component @Local(value=VolumeDetailsDao.class) -public class VolumeDetailsDaoImpl extends ResourceDetailDaoImpl implements VolumeDetailsDao { +public class VolumeDetailsDaoImpl extends ResourceDetailDaoBase implements VolumeDetailsDao { } diff --git a/engine/schema/src/com/cloud/vm/dao/NicDetailDaoImpl.java b/engine/schema/src/com/cloud/vm/dao/NicDetailDaoImpl.java index 65a327fc939..6263cae0b90 100644 --- a/engine/schema/src/com/cloud/vm/dao/NicDetailDaoImpl.java +++ b/engine/schema/src/com/cloud/vm/dao/NicDetailDaoImpl.java @@ -20,11 +20,11 @@ import javax.ejb.Local; import org.springframework.stereotype.Component; -import com.cloud.dc.dao.ResourceDetailDaoImpl; +import com.cloud.dc.dao.ResourceDetailDaoBase; import com.cloud.vm.NicDetailVO; @Component @Local (value={NicDetailDao.class}) -public class NicDetailDaoImpl extends ResourceDetailDaoImpl implements NicDetailDao { +public class NicDetailDaoImpl extends ResourceDetailDaoBase implements NicDetailDao { } diff --git a/engine/schema/src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java b/engine/schema/src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java index 38b691da4cc..b435381c451 100644 --- a/engine/schema/src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java +++ b/engine/schema/src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java @@ -20,11 +20,11 @@ import javax.ejb.Local; import org.springframework.stereotype.Component; -import com.cloud.dc.dao.ResourceDetailDaoImpl; +import com.cloud.dc.dao.ResourceDetailDaoBase; import com.cloud.vm.UserVmDetailVO; @Component @Local(value=UserVmDetailsDao.class) -public class UserVmDetailsDaoImpl extends ResourceDetailDaoImpl implements UserVmDetailsDao { +public class UserVmDetailsDaoImpl extends ResourceDetailDaoBase implements UserVmDetailsDao { } diff --git a/server/src/com/cloud/api/ApiDBUtils.java b/server/src/com/cloud/api/ApiDBUtils.java index 36fddf49331..37b9e9c526b 100755 --- a/server/src/com/cloud/api/ApiDBUtils.java +++ b/server/src/com/cloud/api/ApiDBUtils.java @@ -126,7 +126,7 @@ import com.cloud.dc.dao.ClusterDao; import com.cloud.dc.dao.DataCenterDao; import com.cloud.dc.dao.DataCenterDetailsDao; import com.cloud.dc.dao.HostPodDao; -import com.cloud.dc.dao.ResourceDetailDaoImpl; +import com.cloud.dc.dao.ResourceDetailDaoBase; import com.cloud.dc.dao.VlanDao; import com.cloud.domain.DomainVO; import com.cloud.domain.dao.DomainDao;