Skip to content

Commit 17c436e

Browse files
harikrishna-patnalaharikrishna-patnala
committed
use ResourceDetail interface
1 parent 7093406 commit 17c436e

17 files changed

+83
-110
lines changed

‎engine/schema/src/main/java/com/cloud/dc/ClusterDetailsDao.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@
1919
import java.util.Map;
2020

2121
import com.cloud.utils.db.GenericDao;
22+
import org.apache.cloudstack.resourcedetail.ResourceDetailsDao;
2223

23-
public interface ClusterDetailsDao extends GenericDao<ClusterDetailsVO, Long> {
24+
public interface ClusterDetailsDao extends GenericDao<ClusterDetailsVO, Long>, ResourceDetailsDao<ClusterDetailsVO> {
2425
Map<String, String> findDetails(long clusterId);
2526

2627
void persist(long clusterId, Map<String, String> details);
@@ -32,6 +33,4 @@ public interface ClusterDetailsDao extends GenericDao<ClusterDetailsVO, Long> {
3233
void deleteDetails(long clusterId);
3334

3435
String getVmwareDcName(Long clusterId);
35-
36-
String getActualValue(ClusterDetailsVO clusterDetailsVO);
3736
}

‎engine/schema/src/main/java/com/cloud/dc/ClusterDetailsDaoImpl.java‎

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,13 @@
2626
import org.apache.cloudstack.framework.config.ScopedConfigStorage;
2727

2828
import com.cloud.utils.crypt.DBEncryptionUtil;
29-
import com.cloud.utils.db.GenericDaoBase;
3029
import com.cloud.utils.db.SearchBuilder;
3130
import com.cloud.utils.db.SearchCriteria;
3231
import com.cloud.utils.db.TransactionLegacy;
33-
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
34-
import org.apache.cloudstack.framework.config.impl.ConfigurationVO;
32+
import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase;
3533

36-
import javax.inject.Inject;
34+
public class ClusterDetailsDaoImpl extends ResourceDetailsDaoBase<ClusterDetailsVO> implements ClusterDetailsDao, ScopedConfigStorage {
3735

38-
public class ClusterDetailsDaoImpl extends GenericDaoBase<ClusterDetailsVO, Long> implements ClusterDetailsDao, ScopedConfigStorage {
39-
40-
@Inject
41-
private ConfigurationDao _configDao;
4236
protected final SearchBuilder<ClusterDetailsVO> ClusterSearch;
4337
protected final SearchBuilder<ClusterDetailsVO> DetailSearch;
4438

@@ -73,6 +67,11 @@ public ClusterDetailsVO findDetail(long clusterId, String name) {
7367
return detail;
7468
}
7569

70+
@Override
71+
public void addDetail(long resourceId, String key, String value, boolean display) {
72+
super.addDetail(new ClusterDetailsVO(resourceId, key, value));
73+
}
74+
7675
@Override
7776
public Map<String, String> findDetails(long clusterId) {
7877
SearchCriteria<ClusterDetailsVO> sc = ClusterSearch.create();
@@ -168,13 +167,4 @@ private String getCpuMemoryOvercommitRatio(String name) {
168167

169168
return name;
170169
}
171-
172-
@Override
173-
public String getActualValue(ClusterDetailsVO clusterDetailsVO) {
174-
ConfigurationVO configurationVO = _configDao.findByName(clusterDetailsVO.getName());
175-
if (configurationVO != null && configurationVO.isEncrypted()) {
176-
return DBEncryptionUtil.decrypt(clusterDetailsVO.getValue());
177-
}
178-
return clusterDetailsVO.getValue();
179-
}
180170
}

‎engine/schema/src/main/java/com/cloud/dc/ClusterDetailsVO.java‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
import javax.persistence.Id;
2424
import javax.persistence.Table;
2525

26-
import org.apache.cloudstack.api.InternalIdentity;
26+
import org.apache.cloudstack.api.ResourceDetail;
2727

2828
@Entity
2929
@Table(name = "cluster_details")
30-
public class ClusterDetailsVO implements InternalIdentity {
30+
public class ClusterDetailsVO implements ResourceDetail {
3131

3232
@Id
3333
@GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -56,6 +56,11 @@ public long getClusterId() {
5656
return clusterId;
5757
}
5858

59+
@Override
60+
public long getResourceId() {
61+
return clusterId;
62+
}
63+
5964
public String getName() {
6065
return name;
6166
}
@@ -64,6 +69,11 @@ public String getValue() {
6469
return value;
6570
}
6671

72+
@Override
73+
public boolean isDisplay() {
74+
return true;
75+
}
76+
6777
public void setValue(String value) {
6878
this.value = value;
6979
}

‎engine/schema/src/main/java/com/cloud/dc/dao/DataCenterDetailsDao.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,4 @@
2222

2323
public interface DataCenterDetailsDao extends GenericDao<DataCenterDetailVO, Long>, ResourceDetailsDao<DataCenterDetailVO> {
2424
void persist(long zoneId, String name, String value);
25-
26-
String getActualValue(DataCenterDetailVO dataCenterDetailVO);
2725
}

‎engine/schema/src/main/java/com/cloud/dc/dao/DataCenterDetailsDaoImpl.java‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,26 +16,18 @@
1616
// under the License.
1717
package com.cloud.dc.dao;
1818

19-
import com.cloud.utils.crypt.DBEncryptionUtil;
2019
import org.apache.cloudstack.framework.config.ConfigKey;
2120
import org.apache.cloudstack.framework.config.ConfigKey.Scope;
2221
import org.apache.cloudstack.framework.config.ScopedConfigStorage;
23-
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
24-
import org.apache.cloudstack.framework.config.impl.ConfigurationVO;
2522
import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase;
2623

2724
import com.cloud.dc.DataCenterDetailVO;
2825
import com.cloud.utils.db.SearchBuilder;
2926
import com.cloud.utils.db.SearchCriteria;
3027
import com.cloud.utils.db.TransactionLegacy;
3128

32-
import javax.inject.Inject;
33-
3429
public class DataCenterDetailsDaoImpl extends ResourceDetailsDaoBase<DataCenterDetailVO> implements DataCenterDetailsDao, ScopedConfigStorage {
3530

36-
@Inject
37-
private ConfigurationDao _configDao;
38-
3931
private final SearchBuilder<DataCenterDetailVO> DetailSearch;
4032

4133
DataCenterDetailsDaoImpl() {
@@ -74,13 +66,4 @@ public void persist(long zoneId, String name, String value) {
7466
persist(vo);
7567
txn.commit();
7668
}
77-
78-
@Override
79-
public String getActualValue(DataCenterDetailVO dataCenterDetailVO) {
80-
ConfigurationVO configurationVO = _configDao.findByName(dataCenterDetailVO.getName());
81-
if (configurationVO != null && configurationVO.isEncrypted()) {
82-
return DBEncryptionUtil.decrypt(dataCenterDetailVO.getValue());
83-
}
84-
return dataCenterDetailVO.getValue();
85-
}
8669
}

‎engine/schema/src/main/java/com/cloud/domain/DomainDetailVO.java‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
import javax.persistence.Id;
2424
import javax.persistence.Table;
2525

26-
import org.apache.cloudstack.api.InternalIdentity;
26+
import org.apache.cloudstack.api.ResourceDetail;
2727

2828
@Entity
2929
@Table(name = "domain_details")
30-
public class DomainDetailVO implements InternalIdentity {
30+
public class DomainDetailVO implements ResourceDetail {
3131
@Id
3232
@GeneratedValue(strategy = GenerationType.IDENTITY)
3333
@Column(name = "id")
@@ -55,6 +55,11 @@ public long getDomainId() {
5555
return domainId;
5656
}
5757

58+
@Override
59+
public long getResourceId() {
60+
return domainId;
61+
}
62+
5863
public String getName() {
5964
return name;
6065
}
@@ -63,6 +68,11 @@ public String getValue() {
6368
return value;
6469
}
6570

71+
@Override
72+
public boolean isDisplay() {
73+
return true;
74+
}
75+
6676
public void setValue(String value) {
6777
this.value = value;
6878
}

‎engine/schema/src/main/java/com/cloud/domain/dao/DomainDetailsDao.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@
2020

2121
import com.cloud.domain.DomainDetailVO;
2222
import com.cloud.utils.db.GenericDao;
23+
import org.apache.cloudstack.resourcedetail.ResourceDetailsDao;
2324

24-
public interface DomainDetailsDao extends GenericDao<DomainDetailVO, Long> {
25+
public interface DomainDetailsDao extends GenericDao<DomainDetailVO, Long>, ResourceDetailsDao<DomainDetailVO> {
2526
Map<String, String> findDetails(long domainId);
2627

2728
void persist(long domainId, Map<String, String> details);
@@ -31,6 +32,4 @@ public interface DomainDetailsDao extends GenericDao<DomainDetailVO, Long> {
3132
void deleteDetails(long domainId);
3233

3334
void update(long domainId, Map<String, String> details);
34-
35-
String getActualValue(DomainDetailVO domainDetailVO);
3635
}

‎engine/schema/src/main/java/com/cloud/domain/dao/DomainDetailsDaoImpl.java‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424

2525
import com.cloud.domain.DomainDetailVO;
2626
import com.cloud.domain.DomainVO;
27-
import com.cloud.utils.crypt.DBEncryptionUtil;
28-
import com.cloud.utils.db.GenericDaoBase;
2927
import com.cloud.utils.db.QueryBuilder;
3028
import com.cloud.utils.db.SearchBuilder;
3129
import com.cloud.utils.db.SearchCriteria;
@@ -35,9 +33,9 @@
3533
import org.apache.cloudstack.framework.config.ConfigKey.Scope;
3634
import org.apache.cloudstack.framework.config.ScopedConfigStorage;
3735
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
38-
import org.apache.cloudstack.framework.config.impl.ConfigurationVO;
36+
import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase;
3937

40-
public class DomainDetailsDaoImpl extends GenericDaoBase<DomainDetailVO, Long> implements DomainDetailsDao, ScopedConfigStorage {
38+
public class DomainDetailsDaoImpl extends ResourceDetailsDaoBase<DomainDetailVO> implements DomainDetailsDao, ScopedConfigStorage {
4139
protected final SearchBuilder<DomainDetailVO> domainSearch;
4240

4341
@Inject
@@ -85,6 +83,11 @@ public DomainDetailVO findDetail(long domainId, String name) {
8583
return sc.find();
8684
}
8785

86+
@Override
87+
public void addDetail(long resourceId, String key, String value, boolean display) {
88+
super.addDetail(new DomainDetailVO(resourceId, key, value));
89+
}
90+
8891
@Override
8992
public void deleteDetails(long domainId) {
9093
SearchCriteria<DomainDetailVO> sc = domainSearch.create();
@@ -129,13 +132,4 @@ public String getConfigValue(long id, ConfigKey<?> key) {
129132
}
130133
return vo == null ? null : getActualValue(vo);
131134
}
132-
133-
@Override
134-
public String getActualValue(DomainDetailVO domainDetailVO) {
135-
ConfigurationVO configurationVO = _configDao.findByName(domainDetailVO.getName());
136-
if (configurationVO != null && configurationVO.isEncrypted()) {
137-
return DBEncryptionUtil.decrypt(domainDetailVO.getValue());
138-
}
139-
return domainDetailVO.getValue();
140-
}
141135
}

‎engine/schema/src/main/java/com/cloud/storage/dao/StoragePoolDetailsDaoImpl.java‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,9 @@
1717
package com.cloud.storage.dao;
1818

1919

20-
import com.cloud.utils.crypt.DBEncryptionUtil;
2120
import org.apache.cloudstack.framework.config.ConfigKey;
2221
import org.apache.cloudstack.framework.config.ConfigKey.Scope;
2322
import org.apache.cloudstack.framework.config.ScopedConfigStorage;
24-
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
25-
import org.apache.cloudstack.framework.config.impl.ConfigurationVO;
2623
import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase;
2724
import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
2825
import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailVO;
@@ -36,8 +33,6 @@ public class StoragePoolDetailsDaoImpl extends ResourceDetailsDaoBase<StoragePoo
3633

3734
@Inject
3835
PrimaryDataStoreDao _storagePoolDao;
39-
@Inject
40-
private ConfigurationDao _configDao;
4136

4237
public StoragePoolDetailsDaoImpl() {
4338
}
@@ -61,13 +56,4 @@ public void addDetail(long resourceId, String key, String value, boolean display
6156
}
6257
super.addDetail(new StoragePoolDetailVO(resourceId, key, value, display));
6358
}
64-
65-
@Override
66-
public String getActualValue(StoragePoolDetailVO storagePoolDetailVO) {
67-
ConfigurationVO configurationVO = _configDao.findByName(storagePoolDetailVO.getName());
68-
if (configurationVO != null && configurationVO.isEncrypted()) {
69-
return DBEncryptionUtil.decrypt(storagePoolDetailVO.getValue());
70-
}
71-
return storagePoolDetailVO.getValue();
72-
}
7359
}

‎engine/schema/src/main/java/com/cloud/user/AccountDetailVO.java‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
import javax.persistence.Id;
2424
import javax.persistence.Table;
2525

26-
import org.apache.cloudstack.api.InternalIdentity;
26+
import org.apache.cloudstack.api.ResourceDetail;
2727

2828
@Entity
2929
@Table(name = "account_details")
30-
public class AccountDetailVO implements InternalIdentity {
30+
public class AccountDetailVO implements ResourceDetail {
3131
@Id
3232
@GeneratedValue(strategy = GenerationType.IDENTITY)
3333
@Column(name = "id")
@@ -55,6 +55,11 @@ public long getAccountId() {
5555
return accountId;
5656
}
5757

58+
@Override
59+
public long getResourceId() {
60+
return accountId;
61+
}
62+
5863
public String getName() {
5964
return name;
6065
}
@@ -63,6 +68,11 @@ public String getValue() {
6368
return value;
6469
}
6570

71+
@Override
72+
public boolean isDisplay() {
73+
return true;
74+
}
75+
6676
public void setValue(String value) {
6777
this.value = value;
6878
}

0 commit comments

Comments
 (0)