MUSIC-ORM-Implemetation

MUSIC-ORM-Implemetation

Issue-ID: MUSIC-348
Change-Id: Ifb6d4a1f331e080bdbeab236942e73ab13a69dad
Signed-off-by: Sudarshan Kumar <sudars19@in.ibm.com>

1 files changed, 95 insertions, 629 deletions

diff --git a/src/main/java/org/onap/music/rest/RestMusicDataAPI.java b/src/main/java/org/onap/music/rest/RestMusicDataAPI.java
index 39778338..756856d0 100755
--- a/src/main/java/org/onap/music/rest/RestMusicDataAPI.java
+++ b/src/main/java/org/onap/music/rest/RestMusicDataAPI.java
@@ -6,6 +6,8 @@
  * ===================================================================
  *  Modifications Copyright (c) 2019 Samsung
  * ===================================================================
+ *  Modifications Copyright (C) 2019 IBM 
+ * ===================================================================
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
  *  You may obtain a copy of the License at
@@ -24,7 +26,6 @@
 
 package org.onap.music.rest;
 
-import java.nio.ByteBuffer;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
@@ -46,23 +47,23 @@ import javax.ws.rs.core.Response.ResponseBuilder;
 import javax.ws.rs.core.Response.Status;
 import javax.ws.rs.core.UriInfo;
 
-import org.apache.commons.lang3.StringUtils;
+import org.onap.music.datastore.MusicDataStoreHandle;
 import org.onap.music.datastore.PreparedQueryObject;
 import org.onap.music.datastore.jsonobjects.JsonDelete;
+import org.onap.music.datastore.jsonobjects.JsonIndex;
 import org.onap.music.datastore.jsonobjects.JsonInsert;
 import org.onap.music.datastore.jsonobjects.JsonKeySpace;
+import org.onap.music.datastore.jsonobjects.JsonSelect;
 import org.onap.music.datastore.jsonobjects.JsonTable;
 import org.onap.music.datastore.jsonobjects.JsonUpdate;
 import org.onap.music.eelf.logging.EELFLoggerDelegate;
-import org.onap.music.exceptions.MusicLockingException;
-import org.onap.music.exceptions.MusicQueryException;
 import org.onap.music.eelf.logging.format.AppMessages;
 import org.onap.music.eelf.logging.format.ErrorSeverity;
 import org.onap.music.eelf.logging.format.ErrorTypes;
+import org.onap.music.exceptions.MusicLockingException;
+import org.onap.music.exceptions.MusicQueryException;
 import org.onap.music.exceptions.MusicServiceException;
 import org.onap.music.main.MusicCore;
-import org.onap.music.datastore.Condition;
-import org.onap.music.datastore.MusicDataStoreHandle;
 import org.onap.music.main.MusicUtil;
 import org.onap.music.main.ResultType;
 import org.onap.music.main.ReturnType;
@@ -73,12 +74,10 @@ import com.datastax.driver.core.ResultSet;
 import com.datastax.driver.core.TableMetadata;
 
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponses;
 import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
 import io.swagger.annotations.Example;
 import io.swagger.annotations.ExampleProperty;
 
@@ -180,41 +179,11 @@ public class RestMusicDataAPI {
                     response.status(Status.BAD_REQUEST);
                     return response.entity(new JsonResponse(ResultType.FAILURE).setError(ResultType.BODYMISSING.getResult()).toMap()).build();
                 }
-        
-                String consistency = MusicUtil.EVENTUAL;// for now this needs only eventual consistency
-        
-                PreparedQueryObject queryObject = new PreparedQueryObject();
-                if(consistency.equalsIgnoreCase(MusicUtil.EVENTUAL) && kspObject.getConsistencyInfo().get("consistency") != null) {
-                    if(MusicUtil.isValidConsistency(kspObject.getConsistencyInfo().get("consistency")))
-                        queryObject.setConsistency(kspObject.getConsistencyInfo().get("consistency"));
-                    else
-                        return response.status(Status.BAD_REQUEST).entity(new JsonResponse(ResultType.SYNTAXERROR).setError("Invalid Consistency type").toMap()).build();
-                }
-                long start = System.currentTimeMillis();
-                Map<String, Object> replicationInfo = kspObject.getReplicationInfo();
-                String repString = null;
-                try {
-                    repString = "{" + MusicUtil.jsonMaptoSqlString(replicationInfo, ",") + "}";
-                } catch (Exception e) {
-                    logger.error(EELFLoggerDelegate.errorLogger,e.getMessage(), AppMessages.MISSINGDATA  ,ErrorSeverity
-                        .CRITICAL, ErrorTypes.DATAERROR, e);
-        
-                }
-                queryObject.appendQueryString(
-                                "CREATE KEYSPACE " + keyspaceName + " WITH replication = " + repString);
-                if (kspObject.getDurabilityOfWrites() != null) {
-                    queryObject.appendQueryString(
-                                    " AND durable_writes = " + kspObject.getDurabilityOfWrites());
-                }
-        
-                queryObject.appendQueryString(";");
-                long end = System.currentTimeMillis();
-                logger.info(EELFLoggerDelegate.applicationLogger,
-                                "Time taken for setting up query in create keyspace:" + (end - start));
-        
                 ResultType result = ResultType.FAILURE;
                 try {
-                    result = MusicCore.nonKeyRelatedPut(queryObject, consistency);
+                    kspObject.setKeyspaceName(keyspaceName);
+                    result = MusicCore.createKeyspace(kspObject, MusicUtil.EVENTUAL);
+                    logger.info(EELFLoggerDelegate.applicationLogger, "result = " + result);
                 } catch ( MusicQueryException ex) {
                     logger.error(EELFLoggerDelegate.errorLogger,ex.getMessage(), AppMessages.QUERYERROR 
                     ,ErrorSeverity.WARN, ErrorTypes.QUERYERROR);
@@ -276,11 +245,11 @@ public class RestMusicDataAPI {
             logger.info(EELFLoggerDelegate.applicationLogger,"In Drop Keyspace " + keyspaceName);
             if (MusicUtil.isKeyspaceActive()) {
                 String consistency = MusicUtil.EVENTUAL;// for now this needs only
-                PreparedQueryObject queryObject = new PreparedQueryObject();
-                queryObject.appendQueryString("DROP KEYSPACE " + keyspaceName + ";");
                 String droperror = "Error Deleteing Keyspace " + keyspaceName;
+                JsonKeySpace kspObject = new JsonKeySpace();
+                kspObject.setKeyspaceName(keyspaceName);
                 try{
-                    ResultType result = MusicCore.nonKeyRelatedPut(queryObject, consistency);
+                    ResultType result = MusicCore.dropKeyspace(kspObject, consistency);
                     if ( result.equals(ResultType.FAILURE) ) {
                         return response.status(Status.BAD_REQUEST).entity(new JsonResponse(result).setError(droperror).toMap()).build();
                     }
@@ -358,180 +327,15 @@ public class RestMusicDataAPI {
             EELFLoggerDelegate.mdcPut("keyspace", "( "+keyspace+" ) ");
             String consistency = MusicUtil.EVENTUAL;
             // for now this needs only eventual consistency
-            String primaryKey = null;
-            String partitionKey = tableObj.getPartitionKey();
-            String clusterKey = tableObj.getClusteringKey();
-            String filteringKey = tableObj.getFilteringKey();
-            if(filteringKey != null) {
-                clusterKey = clusterKey + "," + filteringKey;
-            }
-            primaryKey = tableObj.getPrimaryKey(); // get primaryKey if available
-
-            PreparedQueryObject queryObject = new PreparedQueryObject();
-            // first read the information about the table fields
-            Map<String, String> fields = tableObj.getFields();
-            if (fields == null) {
-                return response.status(Status.BAD_REQUEST).entity(new JsonResponse(ResultType.FAILURE)
-                    .setError("Create Table Error: No fields in request").toMap()).build();
-            }
-
-            StringBuilder fieldsString = new StringBuilder("(vector_ts text,");
-            int counter = 0;
-            for (Map.Entry<String, String> entry : fields.entrySet()) {
-                if (entry.getKey().equals("PRIMARY KEY")) {
-                    primaryKey = entry.getValue(); // replaces primaryKey
-                    primaryKey = primaryKey.trim();
-                } else {
-                    if (counter == 0 )  fieldsString.append("" + entry.getKey() + " " + entry.getValue() + "");
-                    else fieldsString.append("," + entry.getKey() + " " + entry.getValue() + "");
-                }
-
-                if (counter != (fields.size() - 1) ) {
-                    counter = counter + 1; 
-                } else {
-            
-                    if((primaryKey != null) && (partitionKey == null)) {
-                        primaryKey = primaryKey.trim();
-                        int count1 = StringUtils.countMatches(primaryKey, ')');
-                        int count2 = StringUtils.countMatches(primaryKey, '(');
-                        if (count1 != count2) {
-                            return response.status(Status.BAD_REQUEST).entity(new JsonResponse(ResultType.FAILURE)
-                                .setError("Create Table Error: primary key '(' and ')' do not match, primary key=" + primaryKey)
-                                .toMap()).build();
-                        }
-
-                        if ( primaryKey.indexOf('(') == -1  || ( count2 == 1 && (primaryKey.lastIndexOf(')') +1) ==  primaryKey.length() ) ) {
-                            if (primaryKey.contains(",") ) {
-                                partitionKey= primaryKey.substring(0,primaryKey.indexOf(','));
-                                partitionKey=partitionKey.replaceAll("[\\(]+","");
-                                clusterKey=primaryKey.substring(primaryKey.indexOf(',')+1);  // make sure index
-                                clusterKey=clusterKey.replaceAll("[)]+", "");
-                            } else {
-                                partitionKey=primaryKey;
-                                partitionKey=partitionKey.replaceAll("[\\)]+","");
-                                partitionKey=partitionKey.replaceAll("[\\(]+","");
-                                clusterKey="";
-                            }
-                        } else {   // not null and has ) before the last char
-                            partitionKey= primaryKey.substring(0,primaryKey.indexOf(')'));
-                            partitionKey=partitionKey.replaceAll("[\\(]+","");
-                            partitionKey = partitionKey.trim();
-                            clusterKey= primaryKey.substring(primaryKey.indexOf(')'));
-                            clusterKey=clusterKey.replaceAll("[\\(]+","");
-                            clusterKey=clusterKey.replaceAll("[\\)]+","");
-                            clusterKey = clusterKey.trim();
-                            if (clusterKey.indexOf(',') == 0) {
-                                clusterKey=clusterKey.substring(1);
-                            }
-                            clusterKey = clusterKey.trim();
-                            if (clusterKey.equals(",") ) clusterKey=""; // print error if needed    ( ... ),)
-                        }
-
-                        if (!(partitionKey.isEmpty() || clusterKey.isEmpty())
-                            && (partitionKey.equalsIgnoreCase(clusterKey) ||
-                            clusterKey.contains(partitionKey) || partitionKey.contains(clusterKey)) ) {
-                            logger.error("DataAPI createTable partition/cluster key ERROR: partitionKey="+partitionKey+", clusterKey=" + clusterKey + " and primary key=" + primaryKey );
-                            return response.status(Status.BAD_REQUEST).entity(new JsonResponse(ResultType.FAILURE).setError(
-                                "Create Table primary key error: clusterKey(" + clusterKey + ") equals/contains/overlaps partitionKey(" +partitionKey+ ")  of"
-                                + " primary key=" + primaryKey)
-                                .toMap()).build();
-
-                        }
-
-                        if (partitionKey.isEmpty() )  primaryKey="";
-                        else  if (clusterKey.isEmpty() ) primaryKey=" (" + partitionKey  + ")";
-                        else  primaryKey=" (" + partitionKey + ")," + clusterKey;
-
-                
-                        if (primaryKey != null) fieldsString.append(", PRIMARY KEY (" + primaryKey + " )");
-
-                    } else { // end of length > 0
-                    
-                        if (!(partitionKey.isEmpty() || clusterKey.isEmpty())
-                            && (partitionKey.equalsIgnoreCase(clusterKey) ||
-                            clusterKey.contains(partitionKey) || partitionKey.contains(clusterKey)) ) {
-                            logger.error("DataAPI createTable partition/cluster key ERROR: partitionKey="+partitionKey+", clusterKey=" + clusterKey);
-                            return response.status(Status.BAD_REQUEST).entity(new JsonResponse(ResultType.FAILURE).setError(
-                                "Create Table primary key error: clusterKey(" + clusterKey + ") equals/contains/overlaps partitionKey(" +partitionKey+ ")")
-                                .toMap()).build();
-                        }
-
-                        if (partitionKey.isEmpty() )  primaryKey="";
-                        else  if (clusterKey.isEmpty() ) primaryKey=" (" + partitionKey  + ")";
-                        else  primaryKey=" (" + partitionKey + ")," + clusterKey;
-
-                        if (primaryKey != null) fieldsString.append(", PRIMARY KEY (" + primaryKey + " )");
-                    }
-                    fieldsString.append(")");
-
-                } // end of last field check
-
-            } // end of for each
-            // information about the name-value style properties
-            Map<String, Object> propertiesMap = tableObj.getProperties();
-            StringBuilder propertiesString = new StringBuilder();
-            if (propertiesMap != null) {
-                counter = 0;
-                for (Map.Entry<String, Object> entry : propertiesMap.entrySet()) {
-                    Object ot = entry.getValue();
-                    String value = ot + "";
-                    if (ot instanceof String) {
-                        value = "'" + value + "'";
-                    } else if (ot instanceof Map) {
-                        @SuppressWarnings("unchecked")
-                        Map<String, Object> otMap = (Map<String, Object>) ot;
-                        value = "{" + MusicUtil.jsonMaptoSqlString(otMap, ",") + "}";
-                    }
-
-                    propertiesString.append(entry.getKey() + "=" + value + "");
-                    if (counter != propertiesMap.size() - 1)
-                        propertiesString.append(" AND ");
-
-                    counter = counter + 1;
-                }
-            }
-
-            String clusteringOrder = tableObj.getClusteringOrder();
-
-            if (clusteringOrder != null && !(clusteringOrder.isEmpty())) {
-                String[] arrayClusterOrder = clusteringOrder.split("[,]+");
-
-                for (int i = 0; i < arrayClusterOrder.length; i++) {
-                    String[] clusterS = arrayClusterOrder[i].trim().split("[ ]+");
-                    if ( (clusterS.length ==2)  && (clusterS[1].equalsIgnoreCase("ASC") || clusterS[1].equalsIgnoreCase("DESC"))) {
-                        continue;
-                    } else {
-                        return response.status(Status.BAD_REQUEST)
-                        .entity(new JsonResponse(ResultType.FAILURE)
-                        .setError("createTable/Clustering Order vlaue ERROR: valid clustering order is ASC or DESC or expecting colname  order; please correct clusteringOrder:"+ clusteringOrder+".")
-                        .toMap()).build();
-                    }
-                    // add validation for column names in cluster key
-                }
-
-                if (!(clusterKey.isEmpty())) {
-                    clusteringOrder = "CLUSTERING ORDER BY (" +clusteringOrder +")";
-                    //cjc check if propertiesString.length() >0 instead propertiesMap
-                    if (propertiesMap != null) {
-                        propertiesString.append(" AND  "+ clusteringOrder);
-                    } else {
-                        propertiesString.append(clusteringOrder);
-                    }
-                } else {
-                    logger.warn("Skipping clustering order=("+clusteringOrder+ ") since clustering key is empty ");
-                }
-            } //if non empty
-
-            queryObject.appendQueryString(
-                "CREATE TABLE " + keyspace + "." + tablename + " " + fieldsString);
-
-
-            if (propertiesString != null &&  propertiesString.length()>0 )
-                queryObject.appendQueryString(" WITH " + propertiesString);
-            queryObject.appendQueryString(";");
             ResultType result = ResultType.FAILURE;
             try {
-                result = MusicCore.createTable(keyspace, tablename, queryObject, consistency);
+                tableObj.setKeyspaceName(keyspace);
+                tableObj.setTableName(tablename);
+                result = MusicCore.createTable(tableObj, consistency);
+            } catch (MusicQueryException ex) {
+                logger.error(EELFLoggerDelegate.errorLogger,ex.getMessage(), ex.getMessage()  ,ErrorSeverity
+                        .WARN, ErrorTypes.MUSICSERVICEERROR, ex);
+                return response.status(Status.BAD_REQUEST).entity(new JsonResponse(ResultType.FAILURE).setError(ex.getMessage()).toMap()).build();
             } catch (MusicServiceException ex) {
                 logger.error(EELFLoggerDelegate.errorLogger,ex.getMessage(), AppMessages.UNKNOWNERROR  ,ErrorSeverity.CRITICAL, ErrorTypes.MUSICSERVICEERROR);
                 response.status(Status.BAD_REQUEST);
@@ -601,13 +405,12 @@ public class RestMusicDataAPI {
             String indexName = "";
             if (rowParams.getFirst("index_name") != null)
                 indexName = rowParams.getFirst("index_name");
-            PreparedQueryObject query = new PreparedQueryObject();
-            query.appendQueryString("Create index if not exists " + indexName + "  on " + keyspace + "."
-                            + tablename + " (" + fieldName + ");");
-
+            
+            JsonIndex jsonIndexObject = new JsonIndex(indexName, keyspace, tablename, fieldName);
+            
             ResultType result = ResultType.FAILURE;
             try {
-                result = MusicCore.nonKeyRelatedPut(query, "eventual");
+                result = MusicCore.createIndex(jsonIndexObject, MusicUtil.EVENTUAL);
             } catch (MusicServiceException ex) {
                 logger.error(EELFLoggerDelegate.errorLogger,ex.getMessage(), AppMessages.UNKNOWNERROR  ,ErrorSeverity
                 .CRITICAL, ErrorTypes.GENERALSERVICEERROR, ex);
@@ -674,143 +477,12 @@ public class RestMusicDataAPI {
                 .toMap()).build();
             }
             EELFLoggerDelegate.mdcPut("keyspace","(" + keyspace + ")");
-            PreparedQueryObject queryObject = new PreparedQueryObject();
-            TableMetadata tableInfo = null;
-            try {
-                tableInfo = MusicDataStoreHandle.returnColumnMetadata(keyspace, tablename);
-                if(tableInfo == null) {
-                    return response.status(Status.BAD_REQUEST).entity(new JsonResponse(ResultType.FAILURE).setError("Table name doesn't exists. Please check the table name.").toMap()).build();
-                }
-            } catch (MusicServiceException e) {
-                logger.error(EELFLoggerDelegate.errorLogger, e, AppMessages.UNKNOWNERROR  ,ErrorSeverity.CRITICAL, ErrorTypes.GENERALSERVICEERROR);
-                return response.status(Status.BAD_REQUEST).entity(new JsonResponse(ResultType.FAILURE).setError(e.getMessage()).toMap()).build();
-            }
-            String primaryKeyName = tableInfo.getPrimaryKey().get(0).getName();
-            StringBuilder fieldsString = new StringBuilder("(vector_ts,");
-            String vectorTs =
-                            String.valueOf(Thread.currentThread().getId() + System.currentTimeMillis());
-            StringBuilder valueString = new StringBuilder("(" + "?" + ",");
-            queryObject.addValue(vectorTs);
-            
-            Map<String, Object> valuesMap = insObj.getValues();
-            if (valuesMap==null) {
-                return response.status(Status.BAD_REQUEST).entity(new JsonResponse(ResultType.FAILURE)
-                        .setError("Nothing to insert. No values provided in request.").toMap()).build();
-            }
-            int counter = 0;
-            String primaryKey = "";
-            for (Map.Entry<String, Object> entry : valuesMap.entrySet()) {
-                fieldsString.append("" + entry.getKey());
-                Object valueObj = entry.getValue();
-                if (primaryKeyName.equals(entry.getKey())) {
-                    primaryKey = entry.getValue() + "";
-                    primaryKey = primaryKey.replace("'", "''");
-                }
-                DataType colType = null;
-                try {
-                    colType = tableInfo.getColumn(entry.getKey()).getType();
-                } catch(NullPointerException ex) {
-                    logger.error(EELFLoggerDelegate.errorLogger,ex.getMessage() +" Invalid column name : "+entry.getKey
-                        (), AppMessages.INCORRECTDATA  ,ErrorSeverity.CRITICAL, ErrorTypes.DATAERROR, ex);
-                    return response.status(Status.BAD_REQUEST).entity(new JsonResponse(ResultType.FAILURE).setError("Invalid column name : "+entry.getKey()).toMap()).build();
-                }
-
-                Object formattedValue = null;
-                try {
-                    formattedValue = MusicUtil.convertToActualDataType(colType, valueObj);
-                } catch (Exception e) {
-                    logger.error(EELFLoggerDelegate.errorLogger,e);
-                }
-                valueString.append("?");
-
-                queryObject.addValue(formattedValue);
-
-                if (counter == valuesMap.size() - 1) {
-                    fieldsString.append(")");
-                    valueString.append(")");
-                } else {
-                    fieldsString.append(",");
-                    valueString.append(",");
-                }
-                counter = counter + 1;
-            }
-
-            //blobs..
-            Map<String, byte[]> objectMap = insObj.getObjectMap();
-            if(objectMap != null) {
-                for (Map.Entry<String, byte[]> entry : objectMap.entrySet()) {
-                    if(counter > 0) {
-                        fieldsString.replace(fieldsString.length()-1, fieldsString.length(), ",");
-                        valueString.replace(valueString.length()-1, valueString.length(), ",");
-                    }
-                    fieldsString.append("" + entry.getKey());
-                    byte[] valueObj = entry.getValue();
-                    if (primaryKeyName.equals(entry.getKey())) {
-                        primaryKey = entry.getValue() + "";
-                        primaryKey = primaryKey.replace("'", "''");
-                    }
-                    DataType colType = tableInfo.getColumn(entry.getKey()).getType();
-                    ByteBuffer formattedValue = null;
-                    if(colType.toString().toLowerCase().contains("blob")) {
-                        formattedValue = MusicUtil.convertToActualDataType(colType, valueObj);
-                    }
-                    valueString.append("?");
-                    queryObject.addValue(formattedValue);
-                    counter = counter + 1;
-                    fieldsString.append(",");
-                    valueString.append(",");
-                } 
-            }
-
-            if(primaryKey == null || primaryKey.length() <= 0) {
-                logger.error(EELFLoggerDelegate.errorLogger, "Some required partition key parts are missing: "+primaryKeyName );
-                return response.status(Status.BAD_REQUEST).entity(new JsonResponse(ResultType.SYNTAXERROR).setError("Some required partition key parts are missing: "+primaryKeyName).toMap()).build();
-            }
-
-            fieldsString.replace(fieldsString.length()-1, fieldsString.length(), ")");
-            valueString.replace(valueString.length()-1, valueString.length(), ")");
-
-            queryObject.appendQueryString("INSERT INTO " + keyspace + "." + tablename + " "
-                            + fieldsString + " VALUES " + valueString);
-
-            String ttl = insObj.getTtl();
-            String timestamp = insObj.getTimestamp();
-
-            if ((ttl != null) && (timestamp != null)) {
-                logger.info(EELFLoggerDelegate.applicationLogger, "both there");
-                queryObject.appendQueryString(" USING TTL ? AND TIMESTAMP ?");
-                queryObject.addValue(Integer.parseInt(ttl));
-                queryObject.addValue(Long.parseLong(timestamp));
-            }
-
-            if ((ttl != null) && (timestamp == null)) {
-                logger.info(EELFLoggerDelegate.applicationLogger, "ONLY TTL there");
-                queryObject.appendQueryString(" USING TTL ?");
-                queryObject.addValue(Integer.parseInt(ttl));
-            }
-
-            if ((ttl == null) && (timestamp != null)) {
-                logger.info(EELFLoggerDelegate.applicationLogger, "ONLY timestamp there");
-                queryObject.appendQueryString(" USING TIMESTAMP ?");
-                queryObject.addValue(Long.parseLong(timestamp));
-            }
-
-            queryObject.appendQueryString(";");
-
             ReturnType result = null;
             String consistency = insObj.getConsistencyInfo().get("type");
-            if(consistency.equalsIgnoreCase(MusicUtil.EVENTUAL) && insObj.getConsistencyInfo().get("consistency") != null) {
-                if(MusicUtil.isValidConsistency(insObj.getConsistencyInfo().get("consistency"))) {
-                    queryObject.setConsistency(insObj.getConsistencyInfo().get("consistency"));
-                } else {
-                    return response.status(Status.BAD_REQUEST).entity(new JsonResponse(ResultType.SYNTAXERROR).setError("Invalid Consistency type").toMap()).build();
-                }
-            }
-            queryObject.setOperation("insert");
             try {
-                if (consistency.equalsIgnoreCase(MusicUtil.EVENTUAL)) {
-                    result = MusicCore.eventualPut(queryObject);
-                } else if (consistency.equalsIgnoreCase(MusicUtil.CRITICAL)) {
+                insObj.setKeyspaceName(keyspace);
+                insObj.setTableName(tablename);
+                if (consistency.equalsIgnoreCase(MusicUtil.CRITICAL)) {
                     String lockId = insObj.getConsistencyInfo().get("lockId");
                     if(lockId == null) {
                         logger.error(EELFLoggerDelegate.errorLogger,"LockId cannot be null. Create lock reference or"
@@ -818,11 +490,13 @@ public class RestMusicDataAPI {
                         return response.status(Status.BAD_REQUEST).entity(new JsonResponse(ResultType.FAILURE).setError("LockId cannot be null. Create lock "
                                 + "and acquire lock or use ATOMIC instead of CRITICAL").toMap()).build();
                     }
-                    result = MusicCore.criticalPut(keyspace, tablename, primaryKey, queryObject, lockId,null);
-                } else if (consistency.equalsIgnoreCase(MusicUtil.ATOMIC)) {
-                    result = MusicCore.atomicPut(keyspace, tablename, primaryKey, queryObject, null);
                 }
-            } catch (Exception ex) {
+                result = MusicCore.insertIntoTable(insObj);
+            }catch (MusicQueryException ex) {
+                logger.error(EELFLoggerDelegate.errorLogger,ex.getMessage(), ex.getMessage()  ,ErrorSeverity
+                        .WARN, ErrorTypes.MUSICSERVICEERROR, ex);
+                return response.status(Status.BAD_REQUEST).entity(new JsonResponse(ResultType.FAILURE).setError(ex.getMessage()).toMap()).build();
+            }catch (Exception ex) {
                 logger.error(EELFLoggerDelegate.errorLogger,ex.getMessage(), AppMessages.UNKNOWNERROR  ,ErrorSeverity
                     .WARN, ErrorTypes.MUSICSERVICEERROR, ex);
                 return response.status(Status.BAD_REQUEST).entity(new JsonResponse(ResultType.FAILURE).setError(ex.getMessage()).toMap()).build();
@@ -889,159 +563,41 @@ public class RestMusicDataAPI {
             String operationId = UUID.randomUUID().toString();  // just for infoging
                                                                 // purposes.
             String consistency = updateObj.getConsistencyInfo().get("type");
-
+            ReturnType operationResult = null;
             logger.info(EELFLoggerDelegate.applicationLogger, "--------------Music " + consistency
                 + " update-" + operationId + "-------------------------");
-            // obtain the field value pairs of the update
-
-            PreparedQueryObject queryObject = new PreparedQueryObject();
-            Map<String, Object> valuesMap = updateObj.getValues();
-
-            TableMetadata tableInfo;
-            try {
-                tableInfo = MusicDataStoreHandle.returnColumnMetadata(keyspace, tablename);
-            } catch (MusicServiceException e) {
-                logger.error(EELFLoggerDelegate.errorLogger,e, AppMessages.UNKNOWNERROR  ,ErrorSeverity.WARN, ErrorTypes
-                    .GENERALSERVICEERROR, e);
-                return response.status(Status.BAD_REQUEST).entity(new JsonResponse(ResultType.FAILURE).setError(e.getMessage()).toMap()).build();
-            }
-            if (tableInfo == null) {
-                logger.error(EELFLoggerDelegate.errorLogger,"Table information not found. Please check input for table name= "+tablename, AppMessages.MISSINGINFO  ,ErrorSeverity.WARN, ErrorTypes.AUTHENTICATIONERROR);
-                return response.status(Status.BAD_REQUEST).entity(new JsonResponse(ResultType.FAILURE)
-                    .setError("Table information not found. Please check input for table name= "
-                    + keyspace + "." + tablename).toMap()).build();
-            }
-            String vectorTs = String.valueOf(Thread.currentThread().getId() + System.currentTimeMillis());
-            StringBuilder fieldValueString = new StringBuilder("vector_ts=?,");
-            queryObject.addValue(vectorTs);
-            int counter = 0;
-            for (Map.Entry<String, Object> entry : valuesMap.entrySet()) {
-                Object valueObj = entry.getValue();
-                DataType colType = null;
-                try {
-                    colType = tableInfo.getColumn(entry.getKey()).getType();
-                } catch(NullPointerException ex) {
-                    logger.error(EELFLoggerDelegate.errorLogger, ex, "Invalid column name : "+entry.getKey(), ex);
-                    return response.status(Status.BAD_REQUEST).entity(new JsonResponse(ResultType.FAILURE).setError("Invalid column name : "+entry.getKey()).toMap()).build();
-                }
-                Object valueString = null;
-                try {
-                    valueString = MusicUtil.convertToActualDataType(colType, valueObj);
-                } catch (Exception e) {
-                    logger.error(EELFLoggerDelegate.errorLogger,e);
-                }
-                fieldValueString.append(entry.getKey() + "= ?");
-                queryObject.addValue(valueString);
-                if (counter != valuesMap.size() - 1) {
-                    fieldValueString.append(",");
-                }    
-                counter = counter + 1;
-            }
-            String ttl = updateObj.getTtl();
-            String timestamp = updateObj.getTimestamp();
-
-            queryObject.appendQueryString("UPDATE " + keyspace + "." + tablename + " ");
-            if ((ttl != null) && (timestamp != null)) {
-                logger.info("both there");
-                queryObject.appendQueryString(" USING TTL ? AND TIMESTAMP ?");
-                queryObject.addValue(Integer.parseInt(ttl));
-                queryObject.addValue(Long.parseLong(timestamp));
-            }
-
-            if ((ttl != null) && (timestamp == null)) {
-                logger.info("ONLY TTL there");
-                queryObject.appendQueryString(" USING TTL ?");
-                queryObject.addValue(Integer.parseInt(ttl));
-            }
-
-            if ((ttl == null) && (timestamp != null)) {
-                logger.info("ONLY timestamp there");
-                queryObject.appendQueryString(" USING TIMESTAMP ?");
-                queryObject.addValue(Long.parseLong(timestamp));
-            }
-            // get the row specifier
-            RowIdentifier rowId = null;
+            
+            updateObj.setKeyspaceName(keyspace);
+            updateObj.setTableName(tablename);
+            
             try {
-                rowId = getRowIdentifier(keyspace, tablename, info.getQueryParameters(), queryObject);
-                if(rowId == null || rowId.primarKeyValue.isEmpty()) {
-                    return response.status(Status.BAD_REQUEST).entity(new JsonResponse(ResultType.FAILURE)
-                            .setError("Mandatory WHERE clause is missing. Please check the input request.").toMap()).build();
+                if (consistency.equalsIgnoreCase(MusicUtil.CRITICAL)) {
+                    String lockId = updateObj.getConsistencyInfo().get("lockId");
+                    if(lockId == null) {
+                        logger.error(EELFLoggerDelegate.errorLogger,"LockId cannot be null. Create lock reference or"
+                                + " use ATOMIC instead of CRITICAL", ErrorSeverity.FATAL, ErrorTypes.MUSICSERVICEERROR);
+                        return response.status(Status.BAD_REQUEST).entity(new JsonResponse(ResultType.FAILURE).setError("LockId cannot be null. Create lock "
+                                + "and acquire lock or use ATOMIC instead of CRITICAL").toMap()).build();
+                    }
                 }
-            } catch (MusicServiceException ex) {
-                logger.error(EELFLoggerDelegate.errorLogger,ex, AppMessages.UNKNOWNERROR  ,ErrorSeverity.WARN, ErrorTypes
-                    .GENERALSERVICEERROR, ex);
+                operationResult = MusicCore.updateTable(updateObj,info.getQueryParameters());
+            }catch (MusicLockingException e) {
+                 logger.error(EELFLoggerDelegate.errorLogger,e, AppMessages.UNKNOWNERROR  ,ErrorSeverity.WARN,
+                            ErrorTypes.GENERALSERVICEERROR, e);
+                        return response.status(Status.BAD_REQUEST).entity(new JsonResponse(ResultType.FAILURE).setError(e.getMessage()).toMap()).build();
+            }catch (MusicQueryException ex) {
+                logger.error(EELFLoggerDelegate.errorLogger,ex.getMessage(), ex.getMessage()  ,ErrorSeverity
+                        .WARN, ErrorTypes.MUSICSERVICEERROR, ex);
+                return response.status(Status.BAD_REQUEST).entity(new JsonResponse(ResultType.FAILURE).setError(ex.getMessage()).toMap()).build();
+            }catch (Exception ex) {
+                logger.error(EELFLoggerDelegate.errorLogger,ex.getMessage(), AppMessages.UNKNOWNERROR  ,ErrorSeverity
+                        .WARN, ErrorTypes.MUSICSERVICEERROR, ex);
                 return response.status(Status.BAD_REQUEST).entity(new JsonResponse(ResultType.FAILURE).setError(ex.getMessage()).toMap()).build();
-            }
-
-            queryObject.appendQueryString(
-                " SET " + fieldValueString + " WHERE " + rowId.rowIdString + ";");
-
-            // get the conditional, if any
-            Condition conditionInfo;
-            if (updateObj.getConditions() == null) {
-                conditionInfo = null;
-            } else {
-                // to avoid parsing repeatedly, just send the select query to obtain row
-                PreparedQueryObject selectQuery = new PreparedQueryObject();
-                selectQuery.appendQueryString("SELECT *  FROM " + keyspace + "." + tablename + " WHERE "
-                    + rowId.rowIdString + ";");
-                selectQuery.addValue(rowId.primarKeyValue);
-                conditionInfo = new Condition(updateObj.getConditions(), selectQuery);
-            }
-
-            ReturnType operationResult = null;
-            long jsonParseCompletionTime = System.currentTimeMillis();
-
-            if(consistency.equalsIgnoreCase(MusicUtil.EVENTUAL) && updateObj.getConsistencyInfo().get("consistency") != null) {
-                if(MusicUtil.isValidConsistency(updateObj.getConsistencyInfo().get("consistency"))) {
-                    queryObject.setConsistency(updateObj.getConsistencyInfo().get("consistency"));
-                } else {
-                    return response.status(Status.BAD_REQUEST).entity(new JsonResponse(ResultType.SYNTAXERROR).setError("Invalid Consistency type").toMap()).build();
-                }
-            }
-            queryObject.setOperation("update");
-            if (consistency.equalsIgnoreCase(MusicUtil.EVENTUAL)) {
-                operationResult = MusicCore.eventualPut(queryObject);
-            } else if (consistency.equalsIgnoreCase(MusicUtil.CRITICAL)) {
-                String lockId = updateObj.getConsistencyInfo().get("lockId");
-                if(lockId == null) {
-                    logger.error(EELFLoggerDelegate.errorLogger,"LockId cannot be null. Create lock reference or"
-                            + " use ATOMIC instead of CRITICAL", ErrorSeverity.FATAL, ErrorTypes.MUSICSERVICEERROR);
-                    return response.status(Status.BAD_REQUEST).entity(new JsonResponse(ResultType.FAILURE).setError("LockId cannot be null. Create lock "
-                            + "and acquire lock or use ATOMIC instead of CRITICAL").toMap()).build();
-                }
-                try {
-                    operationResult = MusicCore.criticalPut(keyspace, tablename, rowId.primarKeyValue,
-                        queryObject, lockId, conditionInfo);
-                } catch ( Exception e) {
-                    logger.error(EELFLoggerDelegate.errorLogger,e, AppMessages.UNKNOWNERROR  ,ErrorSeverity.WARN,
-                        ErrorTypes.GENERALSERVICEERROR, e);
-                    return response.status(Status.BAD_REQUEST).entity(new JsonResponse(ResultType.FAILURE).setError("Error doing critical put: " + e.getMessage()).toMap()).build();
-                }
-            } else if (consistency.equalsIgnoreCase("atomic_delete_lock")) {
-                // this function is mainly for the benchmarks
-                try {
-                    operationResult = MusicCore.atomicPutWithDeleteLock(keyspace, tablename,
-                        rowId.primarKeyValue, queryObject, conditionInfo);
-                } catch (MusicLockingException e) {
-                    logger.error(EELFLoggerDelegate.errorLogger,e, AppMessages.UNKNOWNERROR  ,ErrorSeverity.WARN,
-                        ErrorTypes.GENERALSERVICEERROR, e);
-                    return response.status(Status.BAD_REQUEST).entity(new JsonResponse(ResultType.FAILURE).setError(e.getMessage()).toMap()).build();
-                }
-            } else if (consistency.equalsIgnoreCase(MusicUtil.ATOMIC)) {
-                try {
-                    operationResult = MusicCore.atomicPut(keyspace, tablename, rowId.primarKeyValue,
-                        queryObject, conditionInfo);
-                } catch (MusicLockingException e) {
-                    logger.error(EELFLoggerDelegate.errorLogger,e, AppMessages.UNKNOWNERROR  ,ErrorSeverity.WARN, ErrorTypes.GENERALSERVICEERROR, e);
-                    return response.status(Status.BAD_REQUEST).entity(new JsonResponse(ResultType.FAILURE).setError(e.getMessage()).toMap()).build();
-                }
-            } else if (consistency.equalsIgnoreCase(MusicUtil.EVENTUAL_NB)) {
-                operationResult = MusicCore.eventualPut_nb(queryObject, keyspace, tablename, rowId.primarKeyValue);
             }
             long actualUpdateCompletionTime = System.currentTimeMillis();
 
             long endTime = System.currentTimeMillis();
+            long jsonParseCompletionTime = System.currentTimeMillis();
             String timingString = "Time taken in ms for Music " + consistency + " update-" + operationId
                 + ":" + "|total operation time:" + (endTime - startTime)
                 + "|json parsing time:" + (jsonParseCompletionTime - startTime)
@@ -1115,76 +671,12 @@ public class RestMusicDataAPI {
                 logger.error(EELFLoggerDelegate.errorLogger,ResultType.BODYMISSING.getResult(), AppMessages.MISSINGDATA  ,ErrorSeverity.WARN, ErrorTypes.DATAERROR);
                 return response.status(Status.BAD_REQUEST).entity(new JsonResponse(ResultType.FAILURE).setError(ResultType.BODYMISSING.getResult()).toMap()).build();
             }
-            PreparedQueryObject queryObject = new PreparedQueryObject();
-            StringBuilder columnString = new StringBuilder();
-
-            int counter = 0;
-            List<String> columnList = delObj.getColumns();
-            if (columnList != null) {
-                for (String column : columnList) {
-                    columnString.append(column);
-                    if (counter != columnList.size() - 1)
-                        columnString.append(",");
-                    counter = counter + 1;
-                }
-            }
-
-            // get the row specifier
-            RowIdentifier rowId = null;
-            try {
-                rowId = getRowIdentifier(keyspace, tablename, info.getQueryParameters(), queryObject);
-            } catch (MusicServiceException ex) {
-                logger.error(EELFLoggerDelegate.errorLogger,ex, AppMessages.UNKNOWNERROR  ,ErrorSeverity.WARN, ErrorTypes
-                    .GENERALSERVICEERROR, ex);
-                return response.status(Status.BAD_REQUEST).entity(new JsonResponse(ResultType.FAILURE).setError(ex.getMessage()).toMap()).build();
-            }
-            String rowSpec = rowId.rowIdString.toString();
-
-            if ((columnList != null) && (!rowSpec.isEmpty())) {
-                queryObject.appendQueryString("DELETE " + columnString + " FROM " + keyspace + "."
-                                + tablename + " WHERE " + rowSpec + ";");
-            }
-
-            if ((columnList == null) && (!rowSpec.isEmpty())) {
-                queryObject.appendQueryString("DELETE FROM " + keyspace + "." + tablename + " WHERE "
-                                + rowSpec + ";");
-            }
-
-            if ((columnList != null) && (rowSpec.isEmpty())) {
-                queryObject.appendQueryString(
-                                "DELETE " + columnString + " FROM " + keyspace + "." + rowSpec + ";");
-            }
-            // get the conditional, if any
-            Condition conditionInfo;
-            if (delObj.getConditions() == null) {
-                conditionInfo = null;
-            } else {
-                // to avoid parsing repeatedly, just send the select query to
-                // obtain row
-                PreparedQueryObject selectQuery = new PreparedQueryObject();
-                selectQuery.appendQueryString("SELECT *  FROM " + keyspace + "." + tablename + " WHERE "
-                    + rowId.rowIdString + ";");
-                selectQuery.addValue(rowId.primarKeyValue);
-                conditionInfo = new Condition(delObj.getConditions(), selectQuery);
-            }
-
-            String consistency = delObj.getConsistencyInfo().get("type");
-
-
-            if(consistency.equalsIgnoreCase(MusicUtil.EVENTUAL) && delObj.getConsistencyInfo().get("consistency")!=null) {
-                if(MusicUtil.isValidConsistency(delObj.getConsistencyInfo().get("consistency"))) {
-                    queryObject.setConsistency(delObj.getConsistencyInfo().get("consistency"));
-                } else {
-                    return response.status(Status.BAD_REQUEST).entity(new JsonResponse(ResultType.SYNTAXERROR)
-                        .setError("Invalid Consistency type").toMap()).build();
-                }
-            }
             ReturnType operationResult = null;
-            queryObject.setOperation("delete");
+            String consistency = delObj.getConsistencyInfo().get("type");
+            delObj.setKeyspaceName(keyspace);
+            delObj.setTableName(tablename);
             try {
-                if (consistency.equalsIgnoreCase(MusicUtil.EVENTUAL))
-                    operationResult = MusicCore.eventualPut(queryObject);
-                else if (consistency.equalsIgnoreCase(MusicUtil.CRITICAL)) {
+                if (consistency.equalsIgnoreCase(MusicUtil.CRITICAL)) {
                     String lockId = delObj.getConsistencyInfo().get("lockId");
                     if(lockId == null) {
                         logger.error(EELFLoggerDelegate.errorLogger,"LockId cannot be null. Create lock reference or"
@@ -1192,14 +684,14 @@ public class RestMusicDataAPI {
                         return response.status(Status.BAD_REQUEST).entity(new JsonResponse(ResultType.FAILURE).setError("LockId cannot be null. Create lock "
                             + "and acquire lock or use ATOMIC instead of CRITICAL").toMap()).build();
                     }
-                    operationResult = MusicCore.criticalPut(keyspace, tablename, rowId.primarKeyValue,
-                        queryObject, lockId, conditionInfo);
-                } else if (consistency.equalsIgnoreCase(MusicUtil.ATOMIC)) {
-                    operationResult = MusicCore.atomicPut(keyspace, tablename, rowId.primarKeyValue,
-                        queryObject, conditionInfo);
-                } else if(consistency.equalsIgnoreCase(MusicUtil.EVENTUAL_NB)) {                    
-                    operationResult = MusicCore.eventualPut_nb(queryObject, keyspace, tablename, rowId.primarKeyValue);
                 }
+                
+                operationResult = MusicCore.deleteFromTable(delObj,info.getQueryParameters());
+            } catch (MusicQueryException ex) {
+                logger.error(EELFLoggerDelegate.errorLogger,ex.getMessage(), ex.getMessage()  ,ErrorSeverity
+                        .WARN, ErrorTypes.MUSICSERVICEERROR, ex);
+                return response.status(Status.BAD_REQUEST).entity(new JsonResponse(ResultType.FAILURE).setError(ex.getMessage()).toMap()).build();
+                
             } catch (MusicLockingException e) {
                 logger.error(EELFLoggerDelegate.errorLogger,e, AppMessages.UNKNOWNERROR  ,ErrorSeverity.WARN, ErrorTypes.GENERALSERVICEERROR, e);
                 return response.status(Status.BAD_REQUEST).entity(new JsonResponse(ResultType.FAILURE)
@@ -1265,11 +757,11 @@ public class RestMusicDataAPI {
                     .toMap()).build();
             }
             EELFLoggerDelegate.mdcPut("keyspace", "( "+keyspace+" ) ");
-            String consistency = "eventual";// for now this needs only eventual consistency
-            PreparedQueryObject query = new PreparedQueryObject();
-            query.appendQueryString("DROP TABLE  " + keyspace + "." + tablename + ";");
+            JsonTable jsonTable = new JsonTable();
+            jsonTable.setKeyspaceName(keyspace);
+            jsonTable.setTableName(tablename);
             try {
-                return response.status(Status.OK).entity(new JsonResponse(MusicCore.nonKeyRelatedPut(query, consistency)).toMap()).build();
+                return response.status(Status.OK).entity(new JsonResponse(MusicCore.dropTable(jsonTable, MusicUtil.EVENTUAL)).toMap()).build();
             } catch (MusicQueryException ex) {
                 logger.error(EELFLoggerDelegate.errorLogger, ex.getMessage(), AppMessages.QUERYERROR,ErrorSeverity.WARN
                     , ErrorTypes.QUERYERROR);
@@ -1351,28 +843,11 @@ public class RestMusicDataAPI {
                 logger.error(EELFLoggerDelegate.errorLogger,ResultType.BODYMISSING.getResult() + error, AppMessages.MISSINGDATA  ,ErrorSeverity.WARN, ErrorTypes.DATAERROR);
                 return response.status(Status.BAD_REQUEST).entity(new JsonResponse(ResultType.FAILURE).setError(ResultType.BODYMISSING.getResult() + error).toMap()).build();
             }
-
-            String lockId = selObj.getConsistencyInfo().get("lockId");
-            PreparedQueryObject queryObject = new PreparedQueryObject();
-            RowIdentifier rowId = null;
-            try {
-                rowId = getRowIdentifier(keyspace, tablename, info.getQueryParameters(), queryObject);
-                if ( "".equals(rowId)) {
-                    logger.error(EELFLoggerDelegate.errorLogger,RestMusicDataAPI.PARAMETER_ERROR, AppMessages.UNKNOWNERROR  ,ErrorSeverity.WARN, ErrorTypes
-                    .GENERALSERVICEERROR);
-                    return response.status(Status.BAD_REQUEST).entity(new JsonResponse(ResultType.FAILURE).setError(RestMusicDataAPI.PARAMETER_ERROR).toMap()).build();
-                }
-            } catch (MusicServiceException ex) {
-                logger.error(EELFLoggerDelegate.errorLogger,ex, AppMessages.UNKNOWNERROR  ,ErrorSeverity.WARN, ErrorTypes
-                    .GENERALSERVICEERROR, ex);
-                return response.status(Status.BAD_REQUEST).entity(new JsonResponse(ResultType.FAILURE).setError(ex.getMessage()).toMap()).build();
-            }
-            queryObject.appendQueryString(
-                "SELECT *  FROM " + keyspace + "." + tablename + " WHERE " + rowId.rowIdString + ";");
-
             ResultSet results = null;
-
             String consistency = selObj.getConsistencyInfo().get("type");
+            String lockId = selObj.getConsistencyInfo().get("lockId");
+            selObj.setKeyspaceName(keyspace);
+            selObj.setTableName(tablename);
             try {
                 if (consistency.equalsIgnoreCase(MusicUtil.CRITICAL)) {
                     if(lockId == null) {
@@ -1381,20 +856,17 @@ public class RestMusicDataAPI {
                         return response.status(Status.BAD_REQUEST).entity(new JsonResponse(ResultType.FAILURE).setError("LockId cannot be null. Create lock "
                             + "and acquire lock or use ATOMIC instead of CRITICAL").toMap()).build();
                     }
-                    results = MusicCore.criticalGet(keyspace, tablename, rowId.primarKeyValue, queryObject,lockId);
-                } else if (consistency.equalsIgnoreCase(MusicUtil.ATOMIC)) {
-                    results = MusicCore.atomicGet(keyspace, tablename, rowId.primarKeyValue, queryObject);
-                } else {
-                    return response.status(Status.BAD_REQUEST).entity(new JsonResponse(ResultType.FAILURE)
-                        .setError("Consistency must be: " + MusicUtil.ATOMIC + " or " + MusicUtil.CRITICAL)
-                        .toMap()).build();
                 }
-            } catch ( MusicLockingException | MusicServiceException me ) {
-                return response.status(Status.BAD_REQUEST).entity(new JsonResponse(ResultType.FAILURE).setError("Music Exception" + me.getMessage()).toMap()).build();
-            } catch ( Exception ex) {
+                results = MusicCore.selectCritical(selObj, info.getQueryParameters());
+            }catch (MusicQueryException ex) {
+                logger.error(EELFLoggerDelegate.errorLogger,ex.getMessage(), ex.getMessage()  ,ErrorSeverity
+                        .WARN, ErrorTypes.MUSICSERVICEERROR, ex);
+                return response.status(Status.BAD_REQUEST).entity(new JsonResponse(ResultType.FAILURE).setError(ex.getMessage()).toMap()).build();
+                
+            }catch(Exception ex) {
                 return response.status(Status.BAD_REQUEST).entity(new JsonResponse(ResultType.FAILURE).setError(ex.getMessage()).toMap()).build();
             }
-            
+
             if(results!=null && results.getAvailableWithoutFetching() >0) {
                 return response.status(Status.OK).entity(new JsonResponse(ResultType.SUCCESS).setDataResult(MusicDataStoreHandle.marshallResults(results)).toMap()).build();
             }
@@ -1481,26 +953,20 @@ public class RestMusicDataAPI {
                     .toMap()).build();
             }
             EELFLoggerDelegate.mdcPut("keyspace", "( " + keyspace + " ) ");
-            PreparedQueryObject queryObject = new PreparedQueryObject();
-
-            if (info.getQueryParameters().isEmpty()) { // select all
-                queryObject.appendQueryString("SELECT *  FROM " + keyspace + "." + tablename + ";");
-            } else {
-                int limit = -1; // do not limit the number of results
-                try {
-                    queryObject = selectSpecificQuery(keyspace, tablename, info, limit);
-                } catch (MusicServiceException ex) {
-                    logger.error(EELFLoggerDelegate.errorLogger, ex, AppMessages.UNKNOWNERROR  ,ErrorSeverity.WARN,
-                        ErrorTypes.GENERALSERVICEERROR, ex);
-                    return response.status(Status.BAD_REQUEST).entity(new JsonResponse(ResultType.FAILURE).setError(ex.getMessage()).toMap()).build();
-                }
-            }
             try {
-                ResultSet results = MusicCore.get(queryObject);
+                JsonSelect jsonSelect = new JsonSelect();
+                jsonSelect.setKeyspaceName(keyspace);
+                jsonSelect.setTableName(tablename);
+                ResultSet results = MusicCore.select(jsonSelect, info.getQueryParameters());
                 if(results.getAvailableWithoutFetching() >0) {
                     return response.status(Status.OK).entity(new JsonResponse(ResultType.SUCCESS).setDataResult(MusicDataStoreHandle.marshallResults(results)).toMap()).build();
                 }
                 return response.status(Status.OK).entity(new JsonResponse(ResultType.SUCCESS).setDataResult(MusicDataStoreHandle.marshallResults(results)).setError("No data found").toMap()).build();
+            } catch (MusicQueryException ex) {
+                logger.error(EELFLoggerDelegate.errorLogger,ex.getMessage(), ex.getMessage()  ,ErrorSeverity
+                        .WARN, ErrorTypes.MUSICSERVICEERROR, ex);
+                return response.status(Status.BAD_REQUEST).entity(new JsonResponse(ResultType.FAILURE).setError(ex.getMessage()).toMap()).build();
+                
             } catch (MusicServiceException ex) {
                 logger.error(EELFLoggerDelegate.errorLogger, ex, AppMessages.UNKNOWNERROR  ,ErrorSeverity.ERROR,
                     ErrorTypes.MUSICSERVICEERROR, ex);