Skip to content

Commit 2d1d294

Browse files
committed
merge release branch 4.17 into main
2 parents 6790371 + eb5c8a5 commit 2d1d294

File tree

4 files changed

+364
-217
lines changed

4 files changed

+364
-217
lines changed

engine/schema/src/main/java/com/cloud/host/dao/HostDetailsDao.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
// under the License.
1717
package com.cloud.host.dao;
1818

19+
import java.util.List;
1920
import java.util.Map;
2021

2122
import com.cloud.host.DetailVO;
@@ -29,4 +30,6 @@ public interface HostDetailsDao extends GenericDao<DetailVO, Long> {
2930
DetailVO findDetail(long hostId, String name);
3031

3132
void deleteDetails(long hostId);
33+
34+
List<DetailVO> findByName(String name);
3235
}

engine/schema/src/main/java/com/cloud/host/dao/HostDetailsDaoImpl.java

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import java.util.List;
2323
import java.util.Map;
2424

25-
2625
import org.springframework.stereotype.Component;
2726

2827
import com.cloud.host.DetailVO;
@@ -37,6 +36,7 @@
3736
public class HostDetailsDaoImpl extends GenericDaoBase<DetailVO, Long> implements HostDetailsDao {
3837
protected final SearchBuilder<DetailVO> HostSearch;
3938
protected final SearchBuilder<DetailVO> DetailSearch;
39+
protected final SearchBuilder<DetailVO> DetailNameSearch;
4040

4141
public HostDetailsDaoImpl() {
4242
HostSearch = createSearchBuilder();
@@ -47,6 +47,10 @@ public HostDetailsDaoImpl() {
4747
DetailSearch.and("hostId", DetailSearch.entity().getHostId(), SearchCriteria.Op.EQ);
4848
DetailSearch.and("name", DetailSearch.entity().getName(), SearchCriteria.Op.EQ);
4949
DetailSearch.done();
50+
51+
DetailNameSearch = createSearchBuilder();
52+
DetailNameSearch.and("name", DetailNameSearch.entity().getName(), SearchCriteria.Op.EQ);
53+
DetailNameSearch.done();
5054
}
5155

5256
@Override
@@ -119,4 +123,11 @@ public void persist(long hostId, Map<String, String> details) {
119123
}
120124
txn.commit();
121125
}
126+
127+
@Override
128+
public List<DetailVO> findByName(String name) {
129+
SearchCriteria<DetailVO> sc = DetailNameSearch.create();
130+
sc.setParameters("name", name);
131+
return listBy(sc);
132+
}
122133
}

0 commit comments

Comments
 (0)