MODHAADM-93 tweak SqlQuery parameter values

Author: nielserik

src/main/java/org/folio/harvesteradmin/moduledata/StoredEntity.java

@@ -46,7 +46,6 @@ public abstract class StoredEntity {
    * Gets a SQL query string.
    */
   public SqlQuery makeSqlFromCqlQuery(RoutingContext routingContext, String schemaDotTable) {
-
     PgCqlDefinition definition = getQueryableFields();
 
     RequestParameters params = routingContext.get(ValidationHandler.REQUEST_CONTEXT_KEY);
@@ -56,22 +55,18 @@ public SqlQuery makeSqlFromCqlQuery(RoutingContext routingContext, String schema
 
     String select = "SELECT * ";
     String from = "FROM " + schemaDotTable;
-    String where = "";
-    String orderBy = "";
+    String whereClause = "";
+    String orderByClause = "";
     if (query != null && !query.isEmpty()) {
       PgCqlQuery pgCqlQuery = definition.parse(query.getString());
-      String whereClause = pgCqlQuery.getWhereClause();
-      if (whereClause != null) {
-        whereClause = jsonPropertiesToColumnNames(whereClause);
-        where = " WHERE " + whereClause;
+      if (pgCqlQuery.getWhereClause() != null) {
+        whereClause = jsonPropertiesToColumnNames(pgCqlQuery.getWhereClause());
       }
-      String orderByClause = pgCqlQuery.getOrderByClause();
-      orderByClause = jsonPropertiesToColumnNames(orderByClause);
-      if (orderByClause != null) {
-        orderBy = " ORDER BY " + orderByClause;
+      if (pgCqlQuery.getOrderByClause() != null) {
+        orderByClause = jsonPropertiesToColumnNames(pgCqlQuery.getOrderByClause());
       }
     }
-    return new SqlQuery(select, from, where, orderBy, offset, limit);
+    return new SqlQuery(select, from, whereClause, orderByClause, offset, limit);
   }
 
   /**