Skip to content

Commit dd4e94a

Browse files
committed
Address comments
1 parent a3c3de5 commit dd4e94a

1 file changed

Lines changed: 2 additions & 6 deletions

File tree

engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/ResourceDetailsDaoBase.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ public abstract class ResourceDetailsDaoBase<R extends ResourceDetail> extends G
4949
public ResourceDetailsDaoBase() {
5050
AllFieldsSearch = createSearchBuilder();
5151
AllFieldsSearch.and("resourceId", AllFieldsSearch.entity().getResourceId(), SearchCriteria.Op.EQ);
52+
AllFieldsSearch.and("resourceIdIn", AllFieldsSearch.entity().getResourceId(), SearchCriteria.Op.IN);
5253
AllFieldsSearch.and("name", AllFieldsSearch.entity().getName(), SearchCriteria.Op.EQ);
5354
AllFieldsSearch.and("value", AllFieldsSearch.entity().getValue(), SearchCriteria.Op.EQ);
5455
// FIXME SnapshotDetailsVO doesn't have a display field
@@ -254,12 +255,7 @@ public List<R> listDetailsForResourceIdsAndKey(List<Long> resourceIds, String ke
254255
if (CollectionUtils.isEmpty(resourceIds) || StringUtils.isBlank(key)) {
255256
return Collections.emptyList();
256257
}
257-
SearchBuilder<R> sb = createSearchBuilder();
258-
sb.and("name", sb.entity().getName(), Op.EQ);
259-
sb.and("resourceIdIn", sb.entity().getResourceId(), Op.IN);
260-
sb.done();
261-
262-
SearchCriteria<R> sc = sb.create();
258+
SearchCriteria<R> sc = AllFieldsSearch.create();
263259
sc.setParameters("name", key);
264260
sc.setParameters("resourceIdIn", resourceIds.toArray());
265261
return search(sc, null);

0 commit comments

Comments
 (0)