various Updates

Q-api,
triggers,
conductor conditional updates.
Bug fixes

Change-Id: Iec392309787cd90f0a2827a2955399723640e800
Issue-ID: MUSIC-93
Signed-off-by: Thomas Nelson Jr (arthurdent3) tn1381@att.com <tn1381@att.com>

1 files changed, 451 insertions, 201 deletions

diff --git a/src/main/java/org/onap/music/rest/RestMusicQAPI.java b/src/main/java/org/onap/music/rest/RestMusicQAPI.java
index e08adaf7..8af334c7 100755
--- a/src/main/java/org/onap/music/rest/RestMusicQAPI.java
+++ b/src/main/java/org/onap/music/rest/RestMusicQAPI.java
@@ -1,31 +1,24 @@
 /*
- * ============LICENSE_START==========================================
- * org.onap.music
- * ===================================================================
- *  Copyright (c) 2017 AT&T Intellectual Property
- * ===================================================================
- *  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
+ * ============LICENSE_START========================================== org.onap.music
+ * =================================================================== Copyright (c) 2017 AT&T
+ * Intellectual Property ===================================================================
+ * 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
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  * 
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
  * 
  * ============LICENSE_END=============================================
  * ====================================================================
  */
 package org.onap.music.rest;
 
-
-
 import java.util.HashMap;
 import java.util.Map;
-
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
 import javax.ws.rs.GET;
@@ -37,215 +30,472 @@ import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
 import javax.ws.rs.core.UriInfo;
-
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.ResponseBuilder;
+import javax.ws.rs.core.Response.Status;
+// cjcimport javax.servlet.http.HttpServletResponse;
 import org.onap.music.datastore.jsonobjects.JsonDelete;
 import org.onap.music.datastore.jsonobjects.JsonInsert;
 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.main.MusicCore;
 
+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.apache.commons.lang3.StringUtils;
 import org.onap.music.datastore.PreparedQueryObject;
 import com.datastax.driver.core.ResultSet;
-
+import org.onap.music.exceptions.MusicServiceException;
+import org.onap.music.main.MusicCore;
+import org.onap.music.main.MusicUtil;
+import org.onap.music.main.ResultType;
+// cjc import org.onap.music.main.ReturnType;
+import org.onap.music.response.jsonobjects.JsonResponse;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 
-//@Path("/v{version: [0-9]+}/priorityq/")
-@Path("/priorityq/")
-@Api(value="Q Api")
+// import io.swagger.models.Response;
+// @Path("/v{version: [0-9]+}/priorityq/")
+@Path("{version}/priorityq/")
+@Api(value = "Q Api")
 public class RestMusicQAPI {
-    
-    private EELFLoggerDelegate logger =EELFLoggerDelegate.getLogger(RestMusicDataAPI.class);
 
+  private EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(RestMusicQAPI.class);
+  // private static String xLatestVersion = "X-latestVersion";
+  /*
+   * private EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(RestMusicDataAPI.class);
+   * private static final String XMINORVERSION = "X-minorVersion"; private static final String
+   * XPATCHVERSION = "X-patchVersion"; private static final String NS = "ns"; private static final
+   * String USERID = "userId"; private static final String PASSWORD = "password";
+   *    */
+  // private static final String VERSION = "v2";
 
-    /**
-     * 
-     * @param tableObj 
-     * @param keyspace
-     * @param tablename
-     * @throws Exception
-     */
 
-    @POST
-    @Path("/keyspaces/{keyspace}/{qname}")
-    @ApiOperation(value = "", response = Void.class)
-    @Consumes(MediaType.APPLICATION_JSON)
-    public Response createQ( 
-        @ApiParam(value="Major Version",required=true) @PathParam("version") String version,
-        @ApiParam(value="Minor Version",required=false) @HeaderParam("X-minorVersion") String minorVersion,
-        @ApiParam(value="Patch Version",required=false) @HeaderParam("X-patchVersion") String patchVersion,
-        @ApiParam(value="AID",required=true) @HeaderParam("aid") String aid,
-        @ApiParam(value="Application namespace",required=true) @HeaderParam("ns") String ns, 
-        @ApiParam(value="userId",required=true) @HeaderParam("userId") String userId, 
-        @ApiParam(value="Password",required=true) @HeaderParam("password") String password, JsonTable tableObj, 
-        @ApiParam(value="Key Space",required=true) @PathParam("keyspace") String keyspace, 
-        @ApiParam(value="Table Name",required=true) @PathParam("tablename") String tablename) throws Exception{ 
-        return new RestMusicDataAPI().createTable(version,minorVersion,patchVersion,aid, ns, userId, password, tableObj, keyspace, tablename);
+  /**
+   * 
+   * @param tableObj
+   * @param keyspace
+   * @param tablename
+   * @throws Exception
+   */
+ 
+  @POST
+  @Path("/keyspaces/{keyspace}/{qname}") // is it same as tablename?down
+  @ApiOperation(value = "Create Q", response = String.class)
+  @Consumes(MediaType.APPLICATION_JSON)
+  @Produces(MediaType.APPLICATION_JSON)
+  
+  /* old
+  @POST
+  @Path("/keyspaces/{keyspace}/{qname}")
+  @ApiOperation(value = "", response = Void.class)
+  @Consumes(MediaType.APPLICATION_JSON)
+  */
+  public Response createQ(
+  // public Map<String,Object> createQ(
+          @ApiParam(value = "Major Version", required = true) @PathParam("version") String version,
+          @ApiParam(value = "Minor Version",
+                  required = false) @HeaderParam("X-minorVersion") String minorVersion,
+          @ApiParam(value = "Patch Version",
+                  required = false) @HeaderParam("X-patchVersion") String patchVersion,
+          @ApiParam(value = "AID", required = true) @HeaderParam("aid") String aid,
+          @ApiParam(value = "Application namespace", required = true) @HeaderParam("ns") String ns,
+          @ApiParam(value = "Authorization", required = true) @HeaderParam(MusicUtil.AUTHORIZATION) String authorization,
+          JsonTable tableObj, 
+          @ApiParam(value = "Key Space", required = true) @PathParam("keyspace") String keyspace,
+          @ApiParam(value = "Table Name", required = true) @PathParam("qname") String tablename)
+          throws Exception {
+    //logger.info(logger, "cjc before start in q 1** major version=" + version);
+
+    ResponseBuilder response = MusicUtil.buildVersionResponse(version, minorVersion, patchVersion);
+
+    Map<String, String> fields = tableObj.getFields();
+    if (fields == null) { // || (!fields.containsKey("order")) ){
+      logger.error(EELFLoggerDelegate.errorLogger, "", AppMessages.MISSINGDATA,
+              ErrorSeverity.CRITICAL, ErrorTypes.DATAERROR);
+      return response.status(Status.BAD_REQUEST)
+              .entity(new JsonResponse(ResultType.FAILURE)
+                      .setError("CreateQ/Required table fields are empty or not set").toMap())
+              .build();
     }
 
-    /**
-     * 
-     * @param insObj
-     * @param keyspace
-     * @param tablename
-     * @throws Exception
-     */
-    @POST
-    @Path("/keyspaces/{keyspace}/{qname}/rows")
-    @ApiOperation(value = "", response = Void.class)
-    @Consumes(MediaType.APPLICATION_JSON)
-    @Produces(MediaType.APPLICATION_JSON)
-    public Response insertIntoQ(
-        @ApiParam(value="Major Version",required=true) @PathParam("version") String version,
-        @ApiParam(value="Minor Version",required=false) @HeaderParam("X-minorVersion") String minorVersion,
-        @ApiParam(value="Patch Version",required=false) @HeaderParam("X-patchVersion") String patchVersion,
-        @ApiParam(value="AID",required=true) @HeaderParam("aid") String aid, 
-        @ApiParam(value="Application namespace",required=true) @HeaderParam("ns") String ns, @ApiParam(value="userId",required=true) @HeaderParam("userId") String userId, 
-        @ApiParam(value="Password",required=true) @HeaderParam("password") String password, JsonInsert insObj, 
-        @ApiParam(value="Key Space",required=true) @PathParam("keyspace") String keyspace, 
-        @ApiParam(value="Table Name",required=true) @PathParam("tablename") String tablename) throws Exception{
-        return new RestMusicDataAPI().insertIntoTable(version,minorVersion,patchVersion,aid, ns, userId, password, insObj, keyspace, tablename);
+    String primaryKey = tableObj.getPrimaryKey();
+    String partitionKey = tableObj.getPartitionKey();
+    String clusteringKey = tableObj.getClusteringKey();
+    String filteringKey = tableObj.getFilteringKey();
+    String clusteringOrder = tableObj.getClusteringOrder();
+
+    if(primaryKey == null) {
+        primaryKey = tableObj.getFields().get("PRIMARY KEY");
     }
 
-    /**
-     * 
-     * @param updateObj
-     * @param keyspace
-     * @param tablename
-     * @param info
-     * @return
-     * @throws Exception
-     */
-    @PUT
-    @Path("/keyspaces/{keyspace}/{qname}/rows")
-    @ApiOperation(value = "", response = String.class)
-    @Consumes(MediaType.APPLICATION_JSON)
-    @Produces(MediaType.APPLICATION_JSON)
-    public Response updateQ(
-        @ApiParam(value="Major Version",required=true) @PathParam("version") String version,
-        @ApiParam(value="Minor Version",required=false) @HeaderParam("X-minorVersion") String minorVersion,
-        @ApiParam(value="Patch Version",required=false) @HeaderParam("X-patchVersion") String patchVersion,
-        @ApiParam(value="AID",required=true) @HeaderParam("aid") String aid, 
-        @ApiParam(value="Application namespace",required=true) @HeaderParam("ns") String ns, @ApiParam(value="userId",required=true) @HeaderParam("userId") String userId, 
-        @ApiParam(value="Password",required=true) @HeaderParam("password") String password, JsonUpdate updateObj, 
-        @ApiParam(value="Key Space",required=true) @PathParam("keyspace") String keyspace, 
-        @ApiParam(value="Table Name",required=true) @PathParam("tablename") String tablename, 
-        @Context UriInfo info) throws Exception{
-        return new RestMusicDataAPI().updateTable(version,minorVersion,patchVersion,aid, ns, userId, password, updateObj, keyspace, tablename, info);
+    if ((primaryKey == null) && (partitionKey == null)) {
+        logger.error(EELFLoggerDelegate.errorLogger, "", AppMessages.MISSINGDATA,
+                ErrorSeverity.CRITICAL, ErrorTypes.DATAERROR);
+        return response.status(Status.BAD_REQUEST)
+                .entity(new JsonResponse(ResultType.FAILURE)
+                        .setError("CreateQ: Partition key cannot be empty").toMap())
+                .build();
+      }
+
+    if ((primaryKey == null) && (clusteringKey == null)) {
+        logger.error(EELFLoggerDelegate.errorLogger, "", AppMessages.MISSINGDATA,
+                ErrorSeverity.CRITICAL, ErrorTypes.DATAERROR);
+        return response.status(Status.BAD_REQUEST)
+                .entity(new JsonResponse(ResultType.FAILURE)
+                        .setError("CreateQ: Clustering key cannot be empty").toMap())
+                .build();
+      }
+
+    if (clusteringOrder == null) {
+        logger.error(EELFLoggerDelegate.errorLogger, "", AppMessages.MISSINGDATA,
+                ErrorSeverity.CRITICAL, ErrorTypes.DATAERROR);
+        return response.status(Status.BAD_REQUEST)
+                .entity(new JsonResponse(ResultType.FAILURE)
+                        .setError("CreateQ: Clustering Order cannot be empty").toMap())
+                .build();
+      }
+
+    if ((primaryKey!=null) && (partitionKey == null)) {
+        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("CreateQ 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("[\\(]+","");
+                clusteringKey=primaryKey.substring(primaryKey.indexOf(',')+1);  // make sure index
+                clusteringKey=clusteringKey.replaceAll("[)]+", "");
+            } else {
+              partitionKey=primaryKey;
+              partitionKey=partitionKey.replaceAll("[\\)]+","");
+              partitionKey=partitionKey.replaceAll("[\\(]+","");
+              clusteringKey="";
+           }
+      } else {
+            partitionKey= primaryKey.substring(0,primaryKey.indexOf(')'));
+            partitionKey=partitionKey.replaceAll("[\\(]+","");
+            partitionKey.trim();
+            clusteringKey= primaryKey.substring(primaryKey.indexOf(')'));
+            clusteringKey=clusteringKey.replaceAll("[\\(]+","");
+            clusteringKey=clusteringKey.replaceAll("[\\)]+","");
+            clusteringKey.trim();
+            if (clusteringKey.indexOf(",") == 0) clusteringKey=clusteringKey.substring(1);
+            clusteringKey.trim();
+            if (clusteringKey.equals(",") ) clusteringKey=""; // print error if needed    ( ... ),)
+         }
     }
 
-    /**
-     * 
-     * @param delObj
-     * @param keyspace
-     * @param tablename
-     * @param info
-     * @return
-     * @throws Exception
-     */
-    @DELETE
-    @Path("/keyspaces/{keyspace}/{qname}/rows")
-    @ApiOperation(value = "", response = String.class)
-    @Consumes(MediaType.APPLICATION_JSON)
-    @Produces(MediaType.APPLICATION_JSON)
-    public Response deleteFromQ(
-        @ApiParam(value="Major Version",required=true) @PathParam("version") String version,
-        @ApiParam(value="Minor Version",required=false) @HeaderParam("X-minorVersion") String minorVersion,
-        @ApiParam(value="Patch Version",required=false) @HeaderParam("X-patchVersion") String patchVersion,
-        @ApiParam(value="AID",required=true) @HeaderParam("aid") String aid, 
-        @ApiParam(value="Application namespace",required=true) @HeaderParam("ns") String ns, 
-        @ApiParam(value="userId",required=true) @HeaderParam("userId") String userId, 
-        @ApiParam(value="Password",required=true) @HeaderParam("password") String password, JsonDelete delObj, 
-        @ApiParam(value="Key Space",required=true) @PathParam("keyspace") String keyspace, 
-        @ApiParam(value="Table Name",required=true) @PathParam("tablename") String tablename, 
-        @Context UriInfo info) throws Exception{ 
-        return new RestMusicDataAPI().deleteFromTable(version,minorVersion,patchVersion,aid, ns, userId, password, delObj, keyspace, tablename, info);
+    if (partitionKey.trim().isEmpty()) {
+        logger.error(EELFLoggerDelegate.errorLogger, "", AppMessages.MISSINGDATA,
+                ErrorSeverity.CRITICAL, ErrorTypes.DATAERROR);
+        return response.status(Status.BAD_REQUEST)
+                .entity(new JsonResponse(ResultType.FAILURE)
+                        .setError("CreateQ: Partition key cannot be empty").toMap())
+                .build();
+    }
+
+    if (clusteringKey.trim().isEmpty()) {
+        logger.error(EELFLoggerDelegate.errorLogger, "", AppMessages.MISSINGDATA,
+                ErrorSeverity.CRITICAL, ErrorTypes.DATAERROR);
+        return response.status(Status.BAD_REQUEST)
+                .entity(new JsonResponse(ResultType.FAILURE)
+                        .setError("CreateQ: Clustering key cannot be empty").toMap())
+                .build();
+    }
+
+    if((filteringKey != null) && (filteringKey.equalsIgnoreCase(partitionKey))) {
+        logger.error(EELFLoggerDelegate.errorLogger, "", AppMessages.MISSINGDATA,
+                ErrorSeverity.CRITICAL, ErrorTypes.DATAERROR);
+        return response.status(Status.BAD_REQUEST)
+                .entity(new JsonResponse(ResultType.FAILURE)
+                        .setError("CreateQ: Filtering key cannot be same as Partition Key").toMap())
+                .build();
+    }
+
+    return new RestMusicDataAPI().createTable(version, minorVersion, patchVersion, aid, ns, authorization, tableObj, keyspace, tablename);
+  }
+
+  /**
+   * 
+   * @param insObj
+   * @param keyspace
+   * @param tablename
+   * @throws Exception
+   */
+  @POST
+  @Path("/keyspaces/{keyspace}/{qname}/rows")
+  @ApiOperation(value = "", response = Void.class)
+  @Consumes(MediaType.APPLICATION_JSON)
+  @Produces(MediaType.APPLICATION_JSON)
+  // public Map<String, Object> insertIntoQ(
+  public Response insertIntoQ(
+          @ApiParam(value = "Major Version", required = true) @PathParam("version") String version,
+          @ApiParam(value = "Minor Version",
+                  required = false) @HeaderParam("X-minorVersion") String minorVersion,
+          @ApiParam(value = "Patch Version",
+                  required = false) @HeaderParam("X-patchVersion") String patchVersion,
+          @ApiParam(value = "AID", required = true) @HeaderParam("aid") String aid,
+          @ApiParam(value = "Application namespace", required = true) @HeaderParam("ns") String ns,
+          @ApiParam(value = "Authorization", required = true) @HeaderParam(MusicUtil.AUTHORIZATION) String authorization,
+          JsonInsert insObj,
+          @ApiParam(value = "Key Space", required = true) @PathParam("keyspace") String keyspace,
+          @ApiParam(value = "Table Name", required = true) @PathParam("qname") String tablename)
+          throws Exception {
+    // ,@Context HttpServletResponse response) throws Exception {
+
+    // Map<String, Object> valuesMap = insObj.getValues();
+    // check valuesMap.isEmpty and proceed
+    // if(valuesMap.isEmpty() ) {
+    // response.addHeader(xLatestVersion, MusicUtil.getVersion());
+    ResponseBuilder response = MusicUtil.buildVersionResponse(version, minorVersion, patchVersion);
+    if (insObj.getValues().isEmpty()) {
+      // response.status(404);
+      logger.error(EELFLoggerDelegate.errorLogger, "", AppMessages.MISSINGDATA,
+              ErrorSeverity.CRITICAL, ErrorTypes.DATAERROR);
+      return response.status(Status.BAD_REQUEST).entity(new JsonResponse(ResultType.FAILURE)
+              .setError("Required HTTP Request body is missing.").toMap()).build();
+    }
+    return new RestMusicDataAPI().insertIntoTable(version, minorVersion, patchVersion, aid, ns,
+            authorization, insObj, keyspace, tablename);
+  }
+
+  /**
+   * 
+   * @param updateObj
+   * @param keyspace
+   * @param tablename
+   * @param info
+   * @return
+   * @throws Exception
+   */
+  @PUT
+  @Path("/keyspaces/{keyspace}/{qname}/rows")
+  @ApiOperation(value = "updateQ", response = String.class)
+  @Consumes(MediaType.APPLICATION_JSON)
+  @Produces(MediaType.APPLICATION_JSON)
+  public Response updateQ(
+          @ApiParam(value = "Major Version", required = true) @PathParam("version") String version,
+          @ApiParam(value = "Minor Version",
+                  required = false) @HeaderParam("X-minorVersion") String minorVersion,
+          @ApiParam(value = "Patch Version",
+                  required = false) @HeaderParam("X-patchVersion") String patchVersion,
+          @ApiParam(value = "AID", required = true) @HeaderParam("aid") String aid,
+          @ApiParam(value = "Application namespace", required = true) @HeaderParam("ns") String ns,
+          @ApiParam(value = "Authorization", required = true) @HeaderParam(MusicUtil.AUTHORIZATION) String authorization,
+          JsonUpdate updateObj,
+          @ApiParam(value = "Key Space", required = true) @PathParam("keyspace") String keyspace,
+          @ApiParam(value = "Table Name", required = true) @PathParam("qname") String tablename,
+          @Context UriInfo info) throws Exception {
+
+    //logger.info(EELFLoggerDelegate.errorLogger, "", AppMessages.MISSINGDATA, ErrorSeverity.CRITICAL,
+      //      ErrorTypes.DATAERROR);
+    ResponseBuilder response = MusicUtil.buildVersionResponse(version, minorVersion, patchVersion);
+    if (updateObj.getValues().isEmpty()) {
+      // response.status(404);
+      logger.error(EELFLoggerDelegate.errorLogger, "", AppMessages.MISSINGDATA,
+              ErrorSeverity.CRITICAL, ErrorTypes.DATAERROR);
+      return response.status(Status.BAD_REQUEST)
+              .entity(new JsonResponse(ResultType.FAILURE).setError(
+                      "Required HTTP Request body is missing. JsonUpdate updateObj.getValues() is empty. ")
+                      .toMap())
+              .build();
+
+ 
+    }
+    return new RestMusicDataAPI().updateTable(version, minorVersion, patchVersion, aid, ns, 
+            authorization,updateObj, keyspace, tablename, info);
+  }
+
+  /**
+   * 
+   * @param delObj
+   * @param keyspace
+   * @param tablename
+   * @param info
+   * 
+   * @return
+   * @throws Exception
+   */
+
+  @DELETE
+  @Path("/keyspaces/{keyspace}/{qname}/rows")
+  @ApiOperation(value = "deleteQ", response = String.class)
+  @Consumes(MediaType.APPLICATION_JSON)
+  @Produces(MediaType.APPLICATION_JSON)
+  public Response deleteFromQ(
+          @ApiParam(value = "Major Version", required = true) @PathParam("version") String version,
+          @ApiParam(value = "Minor Version",
+                  required = false) @HeaderParam("X-minorVersion") String minorVersion,
+          @ApiParam(value = "Patch Version",
+                  required = false) @HeaderParam("X-patchVersion") String patchVersion,
+          @ApiParam(value = "AID", required = true) @HeaderParam("aid") String aid,
+          @ApiParam(value = "Application namespace", required = true) @HeaderParam("ns") String ns,
+          @ApiParam(value = "Authorization", required = true) @HeaderParam(MusicUtil.AUTHORIZATION) String authorization,
+         // @ApiParam(value = "userId", required = true) @HeaderParam("userId") String userId,
+         // @ApiParam(value = "Password", required = true) @HeaderParam("password") String password,
+          JsonDelete delObj,
+          @ApiParam(value = "Key Space", required = true) @PathParam("keyspace") String keyspace,
+          @ApiParam(value = "Table Name", required = true) @PathParam("qname") String tablename,
+          @Context UriInfo info) throws Exception {
+    // added checking as per RestMusicDataAPI
+    ResponseBuilder response = MusicUtil.buildVersionResponse(version, minorVersion, patchVersion);
+    if (delObj == null) {
+      // response.status(404);
+      logger.error(EELFLoggerDelegate.errorLogger, "", AppMessages.MISSINGDATA,
+              ErrorSeverity.CRITICAL, ErrorTypes.DATAERROR);
+      return response.status(Status.BAD_REQUEST).entity(new JsonResponse(ResultType.FAILURE)
+              .setError("deleteFromQ JsonDelete delObjis empty").toMap()).build();
     }
 
-    /**
-     * 
-     * @param keyspace
-     * @param tablename
-     * @param info
-     * @return
-     * @throws Exception
+    return new RestMusicDataAPI().deleteFromTable(version, minorVersion, patchVersion, aid, ns,
+            authorization, delObj, keyspace, tablename, info);
+  }
+
+  /**
+   * 
+   * @param keyspace
+   * @param tablename
+   * @param info
+   * @return
+   * @throws Exception
+   */
+  @GET
+  @Path("/keyspaces/{keyspace}/{qname}/peek")
+  @ApiOperation(value = "", response = Map.class)
+  @Produces(MediaType.APPLICATION_JSON)
+  //public Map<String, HashMap<String, Object>> peek(
+  public Response peek(
+          @ApiParam(value = "Major Version", required = true) @PathParam("version") String version,
+          @ApiParam(value = "Minor Version",
+                  required = false) @HeaderParam("X-minorVersion") String minorVersion,
+          @ApiParam(value = "Patch Version",
+                  required = false) @HeaderParam("X-patchVersion") String patchVersion,
+          @ApiParam(value = "AID", required = true) @HeaderParam("aid") String aid,
+          @ApiParam(value = "Application namespace", required = true) @HeaderParam("ns") String ns,
+          @ApiParam(value = "Authorization", required = true) @HeaderParam(MusicUtil.AUTHORIZATION) String authorization,
+          @ApiParam(value = "Key Space", required = true) @PathParam("keyspace") String keyspace,
+          @ApiParam(value = "Table Name", required = true) @PathParam("qname") String tablename,
+          @Context UriInfo info) throws Exception {
+    int limit =1; //peek must return just the top row
+    Map<String ,String> auth = new HashMap<>();
+    String userId =auth.get(MusicUtil.USERID);
+    String password =auth.get(MusicUtil.PASSWORD);  
+    ResponseBuilder response = MusicUtil.buildVersionResponse(version, minorVersion, patchVersion);
+   
+    PreparedQueryObject queryObject = new PreparedQueryObject();
+    if (info.getQueryParameters() == null ) //|| info.getQueryParameters().isEmpty())
+      queryObject.appendQueryString(
+              "SELECT *  FROM " + keyspace + "." + tablename + " LIMIT " + limit + ";");
+    else {
+
+      try {
+        queryObject = new RestMusicDataAPI().selectSpecificQuery(version, minorVersion,
+                patchVersion, aid, ns, userId, password, keyspace, tablename, info, limit);
+      } catch (MusicServiceException ex) {
+        logger.error(EELFLoggerDelegate.errorLogger, "", AppMessages.UNKNOWNERROR,
+                ErrorSeverity.WARN, ErrorTypes.GENERALSERVICEERROR);
+        return response.status(Status.BAD_REQUEST)
+                .entity(new JsonResponse(ResultType.FAILURE).setError(ex.getMessage()).toMap())
+                .build();
+      }
+    }
+
+    try {
+      ResultSet results = MusicCore.get(queryObject);
+      return response.status(Status.OK).entity(new JsonResponse(ResultType.SUCCESS)
+              .setDataResult(MusicCore.marshallResults(results)).toMap()).build();
+    } catch (MusicServiceException ex) {
+      logger.error(EELFLoggerDelegate.errorLogger, "", AppMessages.UNKNOWNERROR,
+              ErrorSeverity.ERROR, ErrorTypes.MUSICSERVICEERROR);
+      return response.status(Status.BAD_REQUEST)
+              .entity(new JsonResponse(ResultType.FAILURE).setError(ex.getMessage()).toMap())
+              .build();
+    }
+  }
+
+  /**
+   * 
+   *
+   * @param keyspace
+   * @param tablename
+   * @param info
+   * @return
+   * @throws Exception
+   */
+  @GET
+  @Path("/keyspaces/{keyspace}/{qname}/filter")
+  @ApiOperation(value = "filter", response = Map.class)
+  @Produces(MediaType.APPLICATION_JSON)
+  // public Map<String, HashMap<String, Object>> filter(
+  public Response filter(
+          @ApiParam(value = "Major Version", required = true) @PathParam("version") String version,
+          @ApiParam(value = "Minor Version",
+                  required = false) @HeaderParam("X-minorVersion") String minorVersion,
+          @ApiParam(value = "Patch Version",
+                  required = false) @HeaderParam("X-patchVersion") String patchVersion,
+          @ApiParam(value = "AID", required = true) @HeaderParam("aid") String aid,
+          @ApiParam(value = "Application namespace", required = true) @HeaderParam("ns") String ns,
+          @ApiParam(value = "Authorization", required = true) @HeaderParam(MusicUtil.AUTHORIZATION) String authorization,
+         // @ApiParam(value = "userId", required = true) @HeaderParam("userId") String userId,
+          //@ApiParam(value = "Password", required = true) @HeaderParam("password") String password,
+          @ApiParam(value = "Key Space", required = true) @PathParam("keyspace") String keyspace,
+          @ApiParam(value = "Table Name", required = true) @PathParam("qname") String tablename,
+          @Context UriInfo info) throws Exception {
+    //int limit = -1;
+    /*
+     * PreparedQueryObject query = new RestMusicDataAPI().selectSpecificQuery(version, minorVersion,
+     * patchVersion, aid, ns, userId, password, keyspace, tablename, info, limit); ResultSet results
+     * = MusicCore.get(query); return MusicCore.marshallResults(results);
      */
-    @GET
-    @Path("/keyspaces/{keyspace}/{qname}/peek")
-    @ApiOperation(value = "", response = Map.class)
-    @Produces(MediaType.APPLICATION_JSON)    
-    public Map<String, HashMap<String, Object>> peek(
-        @ApiParam(value="Major Version",required=true) @PathParam("version") String version,
-        @ApiParam(value="Minor Version",required=false) @HeaderParam("X-minorVersion") String minorVersion,
-        @ApiParam(value="Patch Version",required=false) @HeaderParam("X-patchVersion") String patchVersion,
-        @ApiParam(value="AID",required=true) @HeaderParam("aid") String aid, 
-        @ApiParam(value="Application namespace",required=true) @HeaderParam("ns") String ns, 
-        @ApiParam(value="userId",required=true) @HeaderParam("userId") String userId, 
-        @ApiParam(value="Password",required=true) @HeaderParam("password") String password,
-        @ApiParam(value="Key Space",required=true) @PathParam("keyspace") String keyspace, 
-        @ApiParam(value="Table Name",required=true) @PathParam("tablename") String tablename, 
-        @Context UriInfo info) throws Exception{
-        int limit =1; //peek must return just the top row
-        PreparedQueryObject query = new RestMusicDataAPI().selectSpecificQuery(version,minorVersion,patchVersion,aid, ns, userId, password,keyspace,tablename,info,limit);
-        ResultSet results = MusicCore.get(query);
-        return MusicCore.marshallResults(results);
-
-    } 
+   /* Map<String ,String> auth = new HashMap<>();
+    String userId =auth.get(MusicUtil.USERID);
+    String password =auth.get(MusicUtil.PASSWORD);
+   */ 
+    return new RestMusicDataAPI().select(version, minorVersion, patchVersion, aid, ns, authorization, keyspace, tablename, info);// , limit)
     
-    /**
-     * 
-     *
-     * @param keyspace
-     * @param tablename
-     * @param info
-     * @return
-     * @throws Exception
-     */
-    @GET
-    @Path("/keyspaces/{keyspace}/{qname}/filter")
-    @ApiOperation(value = "", response = Map.class)
-    @Produces(MediaType.APPLICATION_JSON)    
-    public Map<String, HashMap<String, Object>> filter(
-        @ApiParam(value="Major Version",required=true) @PathParam("version") String version,
-        @ApiParam(value="Minor Version",required=false) @HeaderParam("X-minorVersion") String minorVersion,
-        @ApiParam(value="Patch Version",required=false) @HeaderParam("X-patchVersion") String patchVersion,
-        @ApiParam(value="AID",required=true) @HeaderParam("aid") String aid, 
-        @ApiParam(value="Application namespace",required=true) @HeaderParam("ns") String ns, 
-        @ApiParam(value="userId",required=true) @HeaderParam("userId") String userId, 
-        @ApiParam(value="Password",required=true) @HeaderParam("password") String password,
-        @ApiParam(value="Key Space",required=true) @PathParam("keyspace") String keyspace, 
-        @ApiParam(value="Table Name",required=true) @PathParam("tablename") String tablename, 
-        @Context UriInfo info) throws Exception{
-        int limit =-1; 
-        PreparedQueryObject query = new RestMusicDataAPI().selectSpecificQuery(version,minorVersion,patchVersion,aid, ns, userId, password,keyspace,tablename,info,limit);
-        ResultSet results = MusicCore.get(query);
-        return MusicCore.marshallResults(results);
-    } 
-
-    /**
-     * 
-     * @param tabObj
-     * @param keyspace
-     * @param tablename
-     * @throws Exception
-     */
-    @DELETE
-    @ApiOperation(value = "", response = Void.class)
-    @Path("/keyspaces/{keyspace}/{qname}")
-    public Response dropQ(
-        @ApiParam(value="Major Version",required=true) @PathParam("version") String version,
-        @ApiParam(value="Minor Version",required=false) @HeaderParam("X-minorVersion") String minorVersion,
-        @ApiParam(value="Patch Version",required=false) @HeaderParam("X-patchVersion") String patchVersion,
-        @ApiParam(value="AID",required=true) @HeaderParam("aid") String aid, 
-        @ApiParam(value="Application namespace",required=true) @HeaderParam("ns") String ns, 
-        @ApiParam(value="userId",required=true) @HeaderParam("userId") String userId, 
-        @ApiParam(value="Password",required=true) @HeaderParam("password") String password, JsonTable tabObj,
-        @ApiParam(value="Key Space",required=true) @PathParam("keyspace") String keyspace, 
-        @ApiParam(value="Table Name",required=true) @PathParam("tablename") String tablename) throws Exception{ 
-        return new RestMusicDataAPI().dropTable(version,minorVersion,patchVersion,aid, ns, userId, password, keyspace, tablename);
-    }
+  }
+
+  /**
+   * 
+   * @param tabObj
+   * @param keyspace
+   * @param tablename
+   * @throws Exception
+   */
+  @DELETE
+  @ApiOperation(value = "DropQ", response = String.class)
+  @Path("/keyspaces/{keyspace}/{qname}")
+  @Produces(MediaType.APPLICATION_JSON)
+  public Response dropQ(
+          @ApiParam(value = "Major Version", required = true) @PathParam("version") String version,
+          @ApiParam(value = "Minor Version",
+                  required = false) @HeaderParam("X-minorVersion") String minorVersion,
+          @ApiParam(value = "Patch Version",
+                  required = false) @HeaderParam("X-patchVersion") String patchVersion,
+          @ApiParam(value = "AID", required = true) @HeaderParam("aid") String aid,
+          @ApiParam(value = "Application namespace", required = true) @HeaderParam("ns") String ns,
+          @ApiParam(value = "Authorization", required = true) @HeaderParam(MusicUtil.AUTHORIZATION) String authorization,
+         // @ApiParam(value = "userId", required = true) @HeaderParam("userId") String userId,
+          //@ApiParam(value = "Password", required = true) @HeaderParam("password") String password,
+          // cjc JsonTable tabObj,
+          @ApiParam(value = "Key Space", required = true) @PathParam("keyspace") String keyspace,
+          @ApiParam(value = "Table Name", required = true) @PathParam("qname") String tablename)
+          throws Exception {
+    // @Context HttpServletResponse response) throws Exception {
+    // tabObj never in use & thus no need to verify
+
+
+    return new RestMusicDataAPI().dropTable(version, minorVersion, patchVersion, aid, ns, authorization, keyspace, tablename);
+  }
 }