1 files changed, 12 insertions, 12 deletions

diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/dao/hibernate/ModelOperationsCommon.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/dao/hibernate/ModelOperationsCommon.java
index 139128b4..596646f9 100644
--- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/dao/hibernate/ModelOperationsCommon.java
+++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/dao/hibernate/ModelOperationsCommon.java
@@ -59,6 +59,7 @@ import org.onap.portalsdk.core.dao.support.FusionDao;
 import org.onap.portalsdk.core.domain.Lookup;
 import org.onap.portalsdk.core.domain.support.DomainVo;
 import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.onap.portalsdk.core.util.NamedQueryBuilder;
 import org.onap.portalsdk.core.util.SystemProperties;
 
 public abstract class ModelOperationsCommon extends FusionDao {
@@ -343,22 +344,21 @@ public abstract class ModelOperationsCommon extends FusionDao {
 	}
 
 	@SuppressWarnings("rawtypes")
-	protected final List _executeNamedQueryWithOrderBy(Class entity, String queryName, String whereClause, Map params,
-			String _orderBy, boolean asc, Integer fromIndex, Integer toIndex) {
+	protected final List _executeNamedQueryWithOrderBy(NamedQueryBuilder namedQuery) {
 		Session session = getSessionFactory().getCurrentSession();
-		Query query = session.getNamedQuery(queryName);
-		bindQueryParameters(query, params);
+		Query query = session.getNamedQuery(namedQuery.getQueryName());
+		bindQueryParameters(query, namedQuery.getParams());
 		String queryStr = query.getQueryString();
-		queryStr = String.format(queryStr, _orderBy, asc ? "ASC" : "DESC");
+		queryStr = String.format(queryStr, namedQuery.get_orderBy(), namedQuery.isAsc() ? "ASC" : "DESC");
 		StringBuilder modifiedSql = new StringBuilder(" select * from (" + queryStr + " ) al ");
-		if (whereClause != null && whereClause.length() > 0)
-			modifiedSql.append("where " + whereClause);
+		if (namedQuery.getWhereClause() != null && namedQuery.getWhereClause().length() > 0)
+			modifiedSql.append("where " + namedQuery.getWhereClause());
 		SQLQuery sqlQuery = session.createSQLQuery(modifiedSql.toString());
-		bindQueryParameters(sqlQuery, params);
-		sqlQuery.addEntity("reportSearch", entity);
-		if (fromIndex != null && toIndex != null) {
-			sqlQuery.setFirstResult(fromIndex.intValue());
-			int pageSize = (toIndex.intValue() - fromIndex.intValue()) + 1;
+		bindQueryParameters(sqlQuery, namedQuery.getParams());
+		sqlQuery.addEntity("reportSearch", namedQuery.getEntity());
+		if (namedQuery.getFromIndex() != null && namedQuery.getToIndex() != null) {
+			sqlQuery.setFirstResult(namedQuery.getFromIndex().intValue());
+			int pageSize = (namedQuery.getToIndex().intValue() - namedQuery.getFromIndex().intValue()) + 1;
 			sqlQuery.setMaxResults(pageSize);
 		}
 		return sqlQuery.list();