From c9ccfe0c7cdbb043509bd9a161e74a34285a8b2e Mon Sep 17 00:00:00 2001
From: Sweidan Omar <TFS\sweidan.omar>
Date: Thu, 30 Dec 2021 16:15:12 +0000
Subject: [PATCH] git-tfs-id:
 [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C32644

---
 .../src/user/jobengine/db/ItemDAOEx.java        | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemDAOEx.java b/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemDAOEx.java
index 7d7046e0..81650684 100644
--- a/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemDAOEx.java
+++ b/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemDAOEx.java
@@ -27,7 +27,7 @@ public class ItemDAOEx {
 		return queryBuilder.getQuery();
 	}
 
-	private String buildResultQuery(QueryObject queryObject, String innerQuery, ComplexSearchResult csr) {
+	private String buildResultQuery(QueryObject queryObject, String innerQuery, ComplexSearchResult<Item> csr) {
 		StringBuilder resultQuery = new StringBuilder();
 		Formatter qf = new Formatter(resultQuery, Locale.getDefault());
 		RenderParameter rp = queryObject.getParameters();
@@ -61,9 +61,9 @@ public class ItemDAOEx {
 		return resultQuery.toString();
 	}
 
-	private List<ComplexSearchResult> getResultHeaders(Connection connection, QueryObject queryObject,
+	private List<ComplexSearchResult<Item>> getResultHeaders(Connection connection, QueryObject queryObject,
 			String innerQuery) {
-		List<ComplexSearchResult> results = new ArrayList<ComplexSearchResult>();
+		List<ComplexSearchResult<Item>> results = new ArrayList<ComplexSearchResult<Item>>();
 		String typeQuery;
 		if (queryObject.getParameters() == null)
 			typeQuery = String.format("SELECT CAST(COUNT(DISTINCT(ii.ID)) AS BIGINT) %s", innerQuery);
@@ -79,7 +79,7 @@ public class ItemDAOEx {
 			st = connection.prepareStatement(typeQuery);
 			rs = st.executeQuery();
 			while (rs.next()) {
-				ComplexSearchResult sr = new ComplexSearchResult();
+				ComplexSearchResult<Item> sr = new ComplexSearchResult<Item>();
 				if (queryObject.getParameters() == null) {
 					sr.setItemCount(rs.getLong(1));
 				} else {
@@ -107,6 +107,7 @@ public class ItemDAOEx {
 				e1.printStackTrace();
 			}
 		}
+
 		return results;
 	}
 
@@ -181,12 +182,12 @@ public class ItemDAOEx {
 	}
 
 	@SuppressWarnings("unchecked")
-	public List<ComplexSearchResult> search(QueryObject queryObject) {
+	public List<ComplexSearchResult<Item>> search(QueryObject queryObject) {
 		manager.traceIn();
 		if (queryObject == null || queryObject.getFilters() == null || queryObject.getFilters().size() == 0)
 			throw new IllegalArgumentException("QueryObject not specified.");
 
-		List<ComplexSearchResult> results = new ArrayList<ComplexSearchResult>();
+		List<ComplexSearchResult<Item>> results = new ArrayList<ComplexSearchResult<Item>>();
 
 		ResultSet rs = null;
 		PreparedStatement st = null;
@@ -203,7 +204,7 @@ public class ItemDAOEx {
 				// ItemType-onként többe
 				results = getResultHeaders(connection, queryObject, innerQuery);
 			} else {
-				ComplexSearchResult sr = new ComplexSearchResult();
+				ComplexSearchResult<Item> sr = new ComplexSearchResult<Item>();
 				ItemType itemType = (ItemType) manager.get(ItemType.class, queryObject.getActiveItemTypeId());
 				sr.setItemType(itemType);
 				// TODO
@@ -213,7 +214,7 @@ public class ItemDAOEx {
 			}
 
 			if (results.size() != 0) {
-				ComplexSearchResult csr = results.get(0);
+				ComplexSearchResult<Item> csr = results.get(0);
 				String resultQuery = buildResultQuery(queryObject, innerQuery, csr);
 				st = connection.prepareStatement(resultQuery);
 
-- 
2.54.0