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

Renamed ResourceDetailDaoImpl to ResourceDetailDaoBase

This commit is contained in:
Alena Prokharchyk 2013-10-25 14:20:58 -07:00
parent ad51b8edfb
commit 300f626d42
9 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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<DataCenterDetailVO> implements DataCenterDetailsDao, ScopedConfigStorage {
public class DataCenterDetailsDaoImpl extends ResourceDetailDaoBase<DataCenterDetailVO> implements DataCenterDetailsDao, ScopedConfigStorage {
public DataCenterDetailsDaoImpl() {
}

7
engine/schema/src/com/cloud/dc/dao/ResourceDetailDaoImpl.java → engine/schema/src/com/cloud/dc/dao/ResourceDetailDaoBase.java
View File

@ -28,10 +28,10 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.TransactionLegacy;
public abstract class ResourceDetailDaoImpl<R extends ResourceDetail> extends GenericDaoBase<R, Long>{
public abstract class ResourceDetailDaoBase<R extends ResourceDetail> extends GenericDaoBase<R, Long>{
private SearchBuilder<R> 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<R extends ResourceDetail> extends Ge
public void addDetails(List<R> details) {
if (details.isEmpty()) {
return;
}
TransactionLegacy txn = TransactionLegacy.currentTxn();
txn.start();
SearchCriteria<R> sc = AllFieldsSearch.create();

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

@ -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<NetworkDetailVO> implements NetworkDetailsDao {
public class NetworkDetailsDaoImpl extends ResourceDetailDaoBase<NetworkDetailVO> implements NetworkDetailsDao {
}

4
engine/schema/src/com/cloud/service/dao/ServiceOfferingDetailsDaoImpl.java
View File

@ -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<ServiceOfferingDetailsVO>
public class ServiceOfferingDetailsDaoImpl extends ResourceDetailDaoBase<ServiceOfferingDetailsVO>
implements ServiceOfferingDetailsDao {
}

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

@ -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<VMTemplateDetailVO> implements VMTemplateDetailsDao {
public class VMTemplateDetailsDaoImpl extends ResourceDetailDaoBase<VMTemplateDetailVO> implements VMTemplateDetailsDao {
}

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

@ -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<VolumeDetailVO> implements VolumeDetailsDao {
public class VolumeDetailsDaoImpl extends ResourceDetailDaoBase<VolumeDetailVO> implements VolumeDetailsDao {
}

4
engine/schema/src/com/cloud/vm/dao/NicDetailDaoImpl.java
View File

@ -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<NicDetailVO> implements NicDetailDao {
public class NicDetailDaoImpl extends ResourceDetailDaoBase<NicDetailVO> implements NicDetailDao {
}

4
engine/schema/src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java
View File

@ -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<UserVmDetailVO> implements UserVmDetailsDao {
public class UserVmDetailsDaoImpl extends ResourceDetailDaoBase<UserVmDetailVO> implements UserVmDetailsDao {
}

2
server/src/com/cloud/api/ApiDBUtils.java
View File

@ -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;