CADI and a few small updates.

- Include CADI and remove Admin API and admin
  code.
- A few Sonar Fixes.
- Properties File Clean up.
- Read/Write Locking API.
- Various whitespace fixes.

Issue-ID: MUSIC-394
Change-Id: I58e1b64b71796bb6bda1c97ea688f434a836d3c7
Signed-off-by: Nelson, Thomas (arthurdent3) <nelson24@att.com>

1 files changed, 0 insertions, 635 deletions

diff --git a/src/main/java/org/onap/music/rest/RestMusicAdminAPI.java b/src/main/java/org/onap/music/rest/RestMusicAdminAPI.java
deleted file mode 100755
index 664747f6..00000000
--- a/src/main/java/org/onap/music/rest/RestMusicAdminAPI.java
+++ /dev/null
@@ -1,635 +0,0 @@
-/*
- * ============LICENSE_START==========================================
- * org.onap.music
- * ===================================================================
- *  Copyright (c) 2017 AT&T Intellectual Property
- * ===================================================================
- * Modifications Copyright (C) 2018 IBM.
- * Modifications Copyright (c) 2019 Samsung
- * ================================================================================
- *  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
- *
- *  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.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.ResponseBuilder;
-import javax.ws.rs.core.Response.Status;
-
-import org.mindrot.jbcrypt.BCrypt;
-import org.onap.music.authentication.CachingUtil;
-import org.onap.music.authentication.MusicAAFAuthentication;
-import org.onap.music.authentication.MusicAuthenticator;
-import org.onap.music.datastore.MusicDataStoreHandle;
-import org.onap.music.datastore.PreparedQueryObject;
-import org.onap.music.datastore.jsonobjects.JsonOnboard;
-import org.onap.music.datastore.jsonobjects.MusicResponse;
-import org.onap.music.eelf.logging.EELFLoggerDelegate;
-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.MusicServiceException;
-import org.onap.music.main.MusicCore;
-import org.onap.music.main.MusicUtil;
-import org.onap.music.main.ResultType;
-import org.onap.music.response.jsonobjects.JsonResponse;
-import org.springframework.beans.factory.config.YamlProcessor.ResolutionMethod;
-
-import com.datastax.driver.core.DataType;
-import com.datastax.driver.core.KeyspaceMetadata;
-import com.datastax.driver.core.ResultSet;
-import com.datastax.driver.core.Row;
-import com.datastax.driver.core.TableMetadata;
-import com.sun.xml.bind.v2.TODO;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-//import java.util.Base64.Encoder;
-//import java.util.Base64.Decoder;
-
-@Path("/v2/admin")
-@Api(value = "Admin Api", hidden = true)
-public class RestMusicAdminAPI {
-    private static EELFLoggerDelegate logger =
-                    EELFLoggerDelegate.getLogger(RestMusicAdminAPI.class);
-    // Set to true in env like ONAP. Where access to creating and dropping keyspaces exist.    
-    private static final boolean KEYSPACE_ACTIVE = false;
-    
-    private MusicAuthenticator authenticator = new MusicAAFAuthentication();
-
-    /*
-     * API to onboard an application with MUSIC. This is the mandatory first step.
-     *
-     */
-    @POST
-    @Path("/onboardAppWithMusic")
-    @ApiOperation(value = "Onboard application", response = String.class)
-    @Consumes(MediaType.APPLICATION_JSON)
-    @Produces(MediaType.APPLICATION_JSON)
-    public Response onboardAppWithMusic(JsonOnboard jsonObj,
-            @ApiParam(value = "Authorization", required = true) @HeaderParam(MusicUtil.AUTHORIZATION) String authorization) throws Exception {
-        logger.info(EELFLoggerDelegate.errorLogger, "oboarding app");
-        ResponseBuilder response =
-                        Response.noContent().header("X-latestVersion", MusicUtil.getVersion());
-        if (!authenticator.authenticateAdmin(authorization)) {
-            logger.error(EELFLoggerDelegate.errorLogger, "Unauthorized: Please check admin username,password and try again", AppMessages.AUTHENTICATIONERROR, ErrorSeverity.CRITICAL,
-                    ErrorTypes.AUTHENTICATIONERROR);
-            return response.status(Status.UNAUTHORIZED)
-                    .entity(new JsonResponse(ResultType.FAILURE)
-                            .setError("Unauthorized: Please check admin username,password and try again").toMap())
-                    .build();
-        }
-
-        Map<String, Object> resultMap = new HashMap<>();
-        String appName = jsonObj.getAppname();
-        String userId = jsonObj.getUserId();
-        String password = jsonObj.getPassword();
-        String keyspace_name = jsonObj.getKeyspace();
-        
-        if (appName == null || userId == null ||  password == null || keyspace_name == null) {
-            logger.error(EELFLoggerDelegate.errorLogger, "Unauthorized: Please check the request parameters. Some of the required values appName(ns), userId, password, isAAF are missing.", AppMessages.MISSINGINFO,
-                            ErrorSeverity.CRITICAL, ErrorTypes.AUTHENTICATIONERROR);
-            resultMap.put("Exception",
-                            "Unauthorized: Please check the request parameters. Some of the required values appName(ns), userId, password, isAAF are missing.");
-            return response.status(Status.BAD_REQUEST).entity(resultMap).build();
-        }
-
-        PreparedQueryObject pQuery = new PreparedQueryObject();
-    
-        pQuery.appendQueryString(
-            "select uuid from admin.keyspace_master where application_name = ? and keyspace_name = ? allow filtering");
-        pQuery.addValue(MusicUtil.convertToActualDataType(DataType.text(), appName));
-        pQuery.addValue(MusicUtil.convertToActualDataType(DataType.text(), keyspace_name));
-        ResultSet rs = MusicCore.get(pQuery);
-        if (!rs.all().isEmpty()) {
-            logger.error(EELFLoggerDelegate.errorLogger, "", AppMessages.INCORRECTDATA, ErrorSeverity.CRITICAL,
-                ErrorTypes.GENERALSERVICEERROR);
-            response.status(Status.BAD_REQUEST);
-            return response.entity(new JsonResponse(ResultType.FAILURE)
-                .setError("Application " + appName + " has already been onboarded. Please contact admin.").toMap())
-                .build();
-        }
-    
-        pQuery = new PreparedQueryObject();
-        String uuid = MusicUtil.generateUUID();
-        pQuery.appendQueryString(
-                        "INSERT INTO admin.keyspace_master (uuid, keyspace_name, application_name, is_api, "
-                                        + "password, username, is_aaf) VALUES (?,?,?,?,?,?,?)");
-        pQuery.addValue(MusicUtil.convertToActualDataType(DataType.uuid(), uuid));
-        pQuery.addValue(MusicUtil.convertToActualDataType(DataType.text(),keyspace_name));
-        pQuery.addValue(MusicUtil.convertToActualDataType(DataType.text(), appName));
-        pQuery.addValue(MusicUtil.convertToActualDataType(DataType.cboolean(), "False"));
-        pQuery.addValue(MusicUtil.convertToActualDataType(DataType.text(), BCrypt.hashpw(password, BCrypt.gensalt())));
-        pQuery.addValue(MusicUtil.convertToActualDataType(DataType.text(), userId));
-        pQuery.addValue(MusicUtil.convertToActualDataType(DataType.cboolean(), "true"));
-
-        String returnStr = MusicCore.eventualPut(pQuery).toString();
-        if (returnStr.contains("Failure")) {
-            logger.error(EELFLoggerDelegate.errorLogger,"", AppMessages.INCORRECTDATA  ,ErrorSeverity.CRITICAL, ErrorTypes.GENERALSERVICEERROR);
-            response.status(Status.BAD_REQUEST);
-            return response.entity(new JsonResponse(ResultType.FAILURE).setError("Oops. Something wrong with onboarding process. "
-                    + "Please retry later or contact admin.").toMap()).build();
-        }
-        //CachingUtil.updateisAAFCache(appName, isAAF);
-        resultMap.put("Success", "Your application " + appName + " has been onboarded with MUSIC.");
-        resultMap.put("Generated AID", uuid);
-        return response.status(Status.OK).entity(resultMap).build();
-    }
-
-
-    @POST
-    @Path("/search")
-    @ApiOperation(value = "Search Onboard application", response = String.class)
-    @Consumes(MediaType.APPLICATION_JSON)
-    @Produces(MediaType.APPLICATION_JSON)
-    public Response getOnboardedInfoSearch(JsonOnboard jsonObj,
-            @ApiParam(value = "Authorization", required = true) @HeaderParam(MusicUtil.AUTHORIZATION) String authorization) throws Exception {
-        ResponseBuilder response = Response.noContent().header("X-latestVersion", MusicUtil.getVersion());
-        
-        if (!authenticator.authenticateAdmin(authorization)) {
-            logger.error(EELFLoggerDelegate.errorLogger, "Unauthorized: Please check admin username,password and try again", AppMessages.AUTHENTICATIONERROR, ErrorSeverity.CRITICAL,
-                    ErrorTypes.AUTHENTICATIONERROR);
-            return response.status(Status.UNAUTHORIZED)
-                    .entity(new JsonResponse(ResultType.FAILURE)
-                            .setError("Unauthorized: Please check admin username,password and try again").toMap())
-                    .build();
-        }
-        
-        Map<String, Object> resultMap = new HashMap<>();
-        String appName = jsonObj.getAppname();
-        String uuid = jsonObj.getAid();
-        String isAAF = jsonObj.getIsAAF();
-        if (appName == null && uuid == null && isAAF == null) {
-            logger.error(EELFLoggerDelegate.errorLogger, "Unauthorized: Please check the request parameters. Enter atleast one of the following parameters: appName(ns), aid, isAAF.", AppMessages.MISSINGINFO,
-                            ErrorSeverity.CRITICAL, ErrorTypes.AUTHENTICATIONERROR);
-            resultMap.put("Exception",
-                            "Unauthorized: Please check the request parameters. Enter atleast one of the following parameters: appName(ns), aid, isAAF.");
-            return response.status(Status.BAD_REQUEST).entity(resultMap).build();
-        }
-
-        PreparedQueryObject pQuery = new PreparedQueryObject();
-        String cql = "select uuid, keyspace_name from admin.keyspace_master where ";
-        if (appName != null)
-            cql = cql + "application_name = ? AND ";
-        if (uuid != null)
-            cql = cql + "uuid = ? AND ";
-        if (isAAF != null)
-            cql = cql + "is_aaf = ?";
-
-        if (cql.endsWith("AND "))
-            cql = cql.trim().substring(0, cql.length() - 4);
-        logger.info("Query in callback is: " + cql);
-        cql = cql + " allow filtering";
-        pQuery.appendQueryString(cql);
-        if (appName != null)
-            pQuery.addValue(MusicUtil.convertToActualDataType(DataType.text(), appName));
-        if (uuid != null)
-            pQuery.addValue(MusicUtil.convertToActualDataType(DataType.uuid(), uuid));
-        if (isAAF != null)
-            pQuery.addValue(MusicUtil.convertToActualDataType(DataType.cboolean(),
-                            Boolean.parseBoolean(isAAF)));
-        ResultSet rs = MusicCore.get(pQuery);
-        Iterator<Row> it = rs.iterator();
-        while (it.hasNext()) {
-            Row row = it.next();
-            resultMap.put(row.getUUID("uuid").toString(), row.getString("keyspace_name"));
-        }
-        if (resultMap.isEmpty()) {
-            if (uuid != null) {
-                logger.error(EELFLoggerDelegate.errorLogger,"", AppMessages.INCORRECTDATA  ,ErrorSeverity.CRITICAL, ErrorTypes.GENERALSERVICEERROR);
-                response.status(Status.BAD_REQUEST);
-                return response.entity(new JsonResponse(ResultType.FAILURE).setError("Please make sure Aid is correct and application is onboarded.").toMap()).build();
-
-            } else {
-                logger.error(EELFLoggerDelegate.errorLogger,"", AppMessages.INCORRECTDATA  ,ErrorSeverity.CRITICAL, ErrorTypes.GENERALSERVICEERROR);
-                response.status(Status.BAD_REQUEST);
-                return response.entity(new JsonResponse(ResultType.FAILURE).setError("Application is not onboarded. Please make sure all the information is correct.").toMap()).build();
-            }
-        }
-        return response.status(Status.OK).entity(resultMap).build();
-    }
-
-
-    @DELETE
-    @Path("/onboardAppWithMusic")
-    @ApiOperation(value = "Delete Onboard application", response = String.class)
-    @Consumes(MediaType.APPLICATION_JSON)
-    @Produces(MediaType.APPLICATION_JSON)
-    public Response deleteOnboardApp(JsonOnboard jsonObj,
-            @ApiParam(value = "Authorization", required = true) @HeaderParam(MusicUtil.AUTHORIZATION) String authorization) throws Exception {
-        ResponseBuilder response = Response.noContent().header("X-latestVersion", MusicUtil.getVersion());
-        
-        if (!authenticator.authenticateAdmin(authorization)) {
-            logger.error(EELFLoggerDelegate.errorLogger, "Unauthorized: Please check admin username,password and try again", AppMessages.AUTHENTICATIONERROR, ErrorSeverity.CRITICAL,
-                    ErrorTypes.AUTHENTICATIONERROR);
-            return response.status(Status.UNAUTHORIZED)
-                    .entity(new JsonResponse(ResultType.FAILURE)
-                            .setError("Unauthorized: Please check admin username,password and try again").toMap())
-                    .build();
-        }
-        
-        Map<String, Object> resultMap = new HashMap<>();
-        String appName = jsonObj.getAppname();
-        String aid = jsonObj.getAid();
-        PreparedQueryObject pQuery = new PreparedQueryObject();
-        String consistency = MusicUtil.EVENTUAL;
-        if (appName == null && aid == null) {
-            logger.error(EELFLoggerDelegate.errorLogger, 
-                "Please make sure either appName(ns) or Aid is present", AppMessages.MISSINGINFO,
-                ErrorSeverity.CRITICAL, ErrorTypes.DATAERROR);
-            resultMap.put("Exception", "Please make sure either appName(ns) or Aid is present");
-            return response.status(Status.BAD_REQUEST).entity(resultMap).build();
-        }
-        if (aid != null) {
-            if (MusicUtil.isKeyspaceActive()) {
-                pQuery.appendQueryString(
-                            "SELECT keyspace_name FROM admin.keyspace_master WHERE uuid = ?");
-                pQuery.addValue(MusicUtil.convertToActualDataType(DataType.uuid(),
-                            UUID.fromString(aid)));
-                Row row = MusicCore.get(pQuery).one();
-                if (row != null) {
-                    String ks = row.getString("keyspace_name");
-                    if (!ks.equals(MusicUtil.DEFAULTKEYSPACENAME)) {
-                        PreparedQueryObject queryObject = new PreparedQueryObject();
-                        queryObject.appendQueryString("DROP KEYSPACE IF EXISTS " + ks + ";");
-                        MusicCore.nonKeyRelatedPut(queryObject, consistency);
-                    }
-                }
-            }
-            pQuery = new PreparedQueryObject();
-            pQuery.appendQueryString("delete from admin.keyspace_master where uuid = ? IF EXISTS");
-            pQuery.addValue(MusicUtil.convertToActualDataType(DataType.uuid(),
-                            UUID.fromString(aid)));
-            ResultType result = MusicCore.nonKeyRelatedPut(pQuery, consistency);
-            if (result == ResultType.SUCCESS) {
-                resultMap.put("Success", "Your application has been deleted successfully");
-            } else {
-                resultMap.put("Exception",
-                    "Oops. Something went wrong. Please make sure Aid is correct or Application is onboarded");
-                logger.error(EELFLoggerDelegate.errorLogger, 
-                    "Oops. Something went wrong. Please make sure Aid is correct or Application is onboarded", 
-                    AppMessages.INCORRECTDATA,
-                    ErrorSeverity.CRITICAL, ErrorTypes.DATAERROR);
-                return response.status(Status.BAD_REQUEST).entity(resultMap).build();
-
-            }
-            return response.status(Status.OK).entity(resultMap).build();
-        }
-
-        pQuery.appendQueryString(
-                        "select uuid from admin.keyspace_master where application_name = ? allow filtering");
-        pQuery.addValue(MusicUtil.convertToActualDataType(DataType.text(), appName));
-        ResultSet rs = MusicCore.get(pQuery);
-        List<Row> rows = rs.all();
-        String uuid = null;
-        if (rows.isEmpty()) {
-            resultMap.put("Exception",
-                            "Application not found. Please make sure Application exists.");
-            logger.error(EELFLoggerDelegate.errorLogger, "Application not found. Please make sure Application exists.", AppMessages.INCORRECTDATA,
-                            ErrorSeverity.CRITICAL, ErrorTypes.DATAERROR);
-            return response.status(Status.BAD_REQUEST).entity(resultMap).build();
-        } else if (rows.size() == 1) {
-            uuid = rows.get(0).getUUID("uuid").toString();
-            pQuery = new PreparedQueryObject();
-            pQuery.appendQueryString(
-                            "SELECT keyspace_name FROM admin.keyspace_master WHERE uuid = ?");
-            pQuery.addValue(MusicUtil.convertToActualDataType(DataType.uuid(),
-                            UUID.fromString(uuid)));
-            Row row = MusicCore.get(pQuery).one();
-            String ks = row.getString("keyspace_name");
-            if (!ks.equals(MusicUtil.DEFAULTKEYSPACENAME)) {
-                PreparedQueryObject queryObject = new PreparedQueryObject();
-                queryObject.appendQueryString("DROP KEYSPACE " + ks + ";");
-                MusicCore.nonKeyRelatedPut(queryObject, consistency);
-            }
-
-            pQuery = new PreparedQueryObject();
-            pQuery.appendQueryString("delete from admin.keyspace_master where uuid = ?");
-            pQuery.addValue(MusicUtil.convertToActualDataType(DataType.uuid(),
-                            UUID.fromString(uuid)));
-            MusicCore.eventualPut(pQuery);
-            resultMap.put("Success", "Your application " + appName + " has been deleted.");
-            return response.status(Status.OK).entity(resultMap).build();
-        } else {
-            resultMap.put("Failure",
-                            "More than one Aid exists for this application, so please provide Aid.");
-            logger.error(EELFLoggerDelegate.errorLogger, "More than one Aid exists for this application, so please provide Aid.", AppMessages.MULTIPLERECORDS,
-                            ErrorSeverity.CRITICAL, ErrorTypes.DATAERROR);
-            return response.status(Status.BAD_REQUEST).entity(resultMap).build();
-        }
-    }
-
-
-    @PUT
-    @Path("/onboardAppWithMusic")
-    @ApiOperation(value = "Update Onboard application", response = String.class)
-    @Consumes(MediaType.APPLICATION_JSON)
-    @Produces(MediaType.APPLICATION_JSON)
-    public Response updateOnboardApp(JsonOnboard jsonObj,
-            @ApiParam(value = "Authorization", required = true) @HeaderParam(MusicUtil.AUTHORIZATION) String authorization) throws Exception {
-        ResponseBuilder response = Response.noContent().header("X-latestVersion", MusicUtil.getVersion());
-        if (!authenticator.authenticateAdmin(authorization)) {
-            logger.error(EELFLoggerDelegate.errorLogger, "Unauthorized: Please check admin username,password and try again", AppMessages.AUTHENTICATIONERROR, ErrorSeverity.CRITICAL,
-                    ErrorTypes.AUTHENTICATIONERROR);
-            return response.status(Status.UNAUTHORIZED)
-                    .entity(new JsonResponse(ResultType.FAILURE)
-                            .setError("Unauthorized: Please check admin username,password and try again").toMap())
-                    .build();
-        }
-        
-        Map<String, Object> resultMap = new HashMap<>();
-        String aid = jsonObj.getAid();
-        String appName = jsonObj.getAppname();
-        String userId = jsonObj.getUserId();
-        String cassandraKeyspace=jsonObj.getKeyspace();
-        String consistency = "eventual";
-        PreparedQueryObject pQuery;
-        
-        if (aid == null) {
-            resultMap.put("Exception", "Please make sure Aid is present");
-            logger.error(EELFLoggerDelegate.errorLogger, "Please make sure Aid is present", AppMessages.MISSINGDATA,
-                            ErrorSeverity.CRITICAL, ErrorTypes.DATAERROR);
-            return response.status(Status.BAD_REQUEST).entity(resultMap).build();
-        }
-
-        if (appName == null || userId == null || cassandraKeyspace == null) {
-            resultMap.put("Exception",
-                            "No parameters found to update. Please update atleast one parameter.");
-            logger.error(EELFLoggerDelegate.errorLogger, "No parameters found to update. Please update atleast one parameter.", AppMessages.MISSINGDATA,
-                            ErrorSeverity.CRITICAL, ErrorTypes.DATAERROR);
-            return response.status(Status.BAD_REQUEST).entity(resultMap).build();
-        }
-
-        if (appName != null) {
-            pQuery = new PreparedQueryObject();
-            pQuery.appendQueryString(
-                            "select uuid from admin.keyspace_master where application_name = ? allow filtering");
-            pQuery.addValue(MusicUtil.convertToActualDataType(DataType.text(), appName));
-            ResultSet rs = MusicCore.get(pQuery);
-            if (rs.all().isEmpty()) {
-                resultMap.put("Exception", "Application " + appName
-                                + " not found. Please contact admin.");
-                logger.error(EELFLoggerDelegate.errorLogger, "Application " + appName+"not found. Please contact admin.", AppMessages.ALREADYEXIST,
-                                ErrorSeverity.CRITICAL, ErrorTypes.DATAERROR);
-                return response.status(Status.BAD_REQUEST).entity(resultMap).build();
-            }
-        }
-
-        pQuery = new PreparedQueryObject();
-        StringBuilder preCql = new StringBuilder("UPDATE admin.keyspace_master SET ");
-        if (appName != null)
-            preCql.append(" application_name = ?,");
-        if (userId != null)
-            preCql.append(" username = ?,");
-        if (cassandraKeyspace != null)
-            preCql.append(" keyspace_name = ?,");
-        preCql.deleteCharAt(preCql.length() - 1);
-        preCql.append(" WHERE uuid = ? IF EXISTS");
-        pQuery.appendQueryString(preCql.toString());
-        if (appName != null)
-            pQuery.addValue(MusicUtil.convertToActualDataType(DataType.text(), appName));
-        if (userId != null)
-            pQuery.addValue(MusicUtil.convertToActualDataType(DataType.text(), userId));
-        if (cassandraKeyspace != null)
-            pQuery.addValue(MusicUtil.convertToActualDataType(DataType.text(), cassandraKeyspace));
-
-        pQuery.addValue(MusicUtil.convertToActualDataType(DataType.uuid(), UUID.fromString(aid)));
-        ResultType result = MusicCore.nonKeyRelatedPut(pQuery, consistency);
-
-        if (result == ResultType.SUCCESS) {
-            resultMap.put("Success", "Your application has been updated successfully");
-        } else {
-            resultMap.put("Exception",
-                            "Oops. Something went wrong. Please make sure Aid is correct and application is onboarded");
-            logger.error(EELFLoggerDelegate.errorLogger, "Oops. Something went wrong. Please make sure Aid is correct and application is onboarded", AppMessages.INCORRECTDATA,
-                            ErrorSeverity.CRITICAL, ErrorTypes.DATAERROR);
-            return response.status(Status.BAD_REQUEST).entity(resultMap).build();
-        }
-
-        return response.status(Status.OK).entity(resultMap).build();
-    }
-
-    
-    
-  //Dashboard related calls
-  //TODO Make return object Response.
-    
-    @GET
-    @Path("/getall")
-    @Produces(MediaType.APPLICATION_JSON)
-    @Consumes(MediaType.APPLICATION_JSON)
-    public MusicResponse getall(@ApiParam(value = "Authorization", required = true) @HeaderParam(MusicUtil.AUTHORIZATION) String authorization) throws MusicServiceException{
-        MusicResponse response  = new MusicResponse();
-        if (!authenticator.authenticateAdmin(authorization)) {
-            logger.info(EELFLoggerDelegate.errorLogger, "Unauthorized: Please check admin username,password and try again", AppMessages.AUTHENTICATIONERROR, ErrorSeverity.CRITICAL,
-                    ErrorTypes.AUTHENTICATIONERROR);
-            response.setResposne("fail", "Auth failed for admin");
-            return response;
-        }
-        
-        PreparedQueryObject queryObject = new PreparedQueryObject();
-        queryObject.appendQueryString("SELECT *  FROM " + "admin" + "." + "keyspace_master" + ";");
-        try {
-        ResultSet results = MusicCore.get(queryObject);
-        for(Row row : results) {
-            Application app = new Application();
-            app.setApplication_name(row.getString("application_name"));
-            app.setIs_aaf(row.getBool("is_aaf"));
-            app.setIs_api(row.getBool("is_api"));
-            app.setUsername(row.getString("username"));
-            app.setKeyspace_name(row.getString("keyspace_name"));
-            app.setUuid(row.getUUID("uuid").toString());
-            response.addAppToList(app);
-        }
-        }catch(Exception ex) {
-        	response.setResposne("fail", ex.getMessage());
-        }
-        return response;
-        
-    }
-    
-    
-    @DELETE
-    @Path("/delete")
-    @Produces(MediaType.APPLICATION_JSON)
-    @Consumes(MediaType.APPLICATION_JSON)
-    public MusicResponse delete(@ApiParam(value = "Authorization", required = true) @HeaderParam(MusicUtil.AUTHORIZATION) String authorization,
-            @ApiParam(value = "uuid", required = true) @HeaderParam("uuid") String uuid) throws Exception {
-    	MusicResponse response = new MusicResponse();
-        if (!authenticator.authenticateAdmin(authorization)) {
-            logger.info(EELFLoggerDelegate.errorLogger, "Unauthorized: Please check admin username,password and try again", AppMessages.AUTHENTICATIONERROR, ErrorSeverity.CRITICAL,
-                    ErrorTypes.AUTHENTICATIONERROR);
-            response.setResposne("fail", "Auth failed for admin");
-            return response;
-        }
-        PreparedQueryObject queryObject = new PreparedQueryObject();
-        queryObject.appendQueryString("delete from admin.keyspace_master where uuid=?");
-        queryObject.addValue(MusicUtil.convertToActualDataType(DataType.uuid(),uuid));
-        ResultType result;
-        try {
-            result = MusicCore.nonKeyRelatedPut(queryObject, "eventual");
-            response.setResposne("success", "Application deleted successfully. Please contact ops team to delete keyspace");
-        }catch(Exception ex) {
-            logger.error(EELFLoggerDelegate.errorLogger, ex);
-            response.setResposne("fail", ex.getMessage());
-            return response;
-        }
-        return response;
-    }
-    
-    @POST
-    @Path("/onboard")
-    @ApiOperation(value = "Onboard application", response = String.class)
-    @Consumes(MediaType.APPLICATION_JSON)
-    @Produces(MediaType.APPLICATION_JSON)
-    public MusicResponse onboard(JsonOnboard jsonObj,
-            @ApiParam(value = "Authorization", required = true) @HeaderParam(MusicUtil.AUTHORIZATION) String authorization) throws Exception {
-        logger.info(EELFLoggerDelegate.errorLogger, "oboarding app");
-        MusicResponse response = new MusicResponse();
-        if (!authenticator.authenticateAdmin(authorization)) {
-            logger.info(EELFLoggerDelegate.errorLogger, "Unauthorized: Please check admin username,password and try again", AppMessages.AUTHENTICATIONERROR, ErrorSeverity.CRITICAL,
-                    ErrorTypes.AUTHENTICATIONERROR);
-            response.setResposne("fail", "auth error");
-        }
-        PreparedQueryObject pQurey = new PreparedQueryObject();
-        pQurey.appendQueryString("Describe keyspace + ?");
-        pQurey.addValue(MusicUtil.convertToActualDataType(DataType.text(),jsonObj.getKeyspace()));
-        KeyspaceMetadata keyspaceInfo = null;
-        //authenticator.checkOnbaordUserAccess(jsonObj.getUserId(), jsonObj.getAppname());
-        try {
-            keyspaceInfo = MusicDataStoreHandle.returnkeyspaceMetadata(jsonObj.getKeyspace());
-        }catch (Exception e) {
-			logger.info(EELFLoggerDelegate.applicationLogger,"Application onbaord failed for "+ jsonObj.getKeyspace());
-			
-		}
-        if(keyspaceInfo == null) {
-            logger.info(EELFLoggerDelegate.applicationLogger,"Keyspace does not exist, contact music support to create a keyspace and onbaord again");
-            response.setResposne("fail", "Keyspace does not exist, contact music support to create a keyspace and onboard again");
-            return response;
-        }
-        Response result = null;
-        try {
-            result = onboardAppWithMusic(jsonObj, authorization);
-            if(result.getStatus()!= 200) {
-                response.setResposne("fail", result.getEntity().toString());
-            }else {
-                response.setResposne("success", "Onboard Success");
-            }
-        }catch(Exception ex) {
-            response.setResposne("fail", ex.getMessage());
-            return response;
-    
-        }
-        return response;
-    }
-    
-    @POST
-    @Path("/disable")
-    @ApiOperation(value = "Onboard application", response = String.class)
-    @Consumes(MediaType.APPLICATION_JSON)
-    @Produces(MediaType.APPLICATION_JSON)
-    public MusicResponse disableApplicationAccess(@ApiParam(value = "Authorization", required = true) @HeaderParam(MusicUtil.AUTHORIZATION) String authorization,
-            @ApiParam(value = "uuid", required = true) @HeaderParam("uuid") String uuid) throws Exception {
-        logger.info(EELFLoggerDelegate.errorLogger, "oboarding app");
-        MusicResponse response = new MusicResponse();
-        if (!authenticator.authenticateAdmin(authorization)) {
-            logger.info(EELFLoggerDelegate.errorLogger, "Unauthorized: Please check admin username,password and try again", AppMessages.AUTHENTICATIONERROR, ErrorSeverity.CRITICAL,
-                    ErrorTypes.AUTHENTICATIONERROR);
-          response.setResposne("fail", "Authorization failed for music admin");
-        }
-        PreparedQueryObject queryObject = new PreparedQueryObject();
-        queryObject.appendQueryString("SELECT * from admin.keyspace_master where uuid = ?");
-        queryObject.addValue(MusicUtil.convertToActualDataType(DataType.uuid(), uuid));
-        Row row = MusicDataStoreHandle.getDSHandle().executeGet(queryObject, "eventual").one();
-        boolean toggleAccess = row.getBool("is_api");
-        queryObject = null;
-        queryObject = new PreparedQueryObject();
-        queryObject.appendQueryString("UPDATE admin.keyspace_master SET is_api = ? WHERE uuid = ?");
-        queryObject.addValue(MusicUtil.convertToActualDataType(DataType.cboolean(), !toggleAccess));
-        queryObject.addValue(MusicUtil.convertToActualDataType(DataType.uuid(), uuid));
-        try {
-        	MusicDataStoreHandle.getDSHandle().executePut(queryObject, "eventual");
-        	response.setResposne("success","Access toggle success");
-        }catch(Exception ex) {
-        	response.setResposne("fail", ex.getMessage());
-        }
-        		
-        return response;
-    }
-    
-    @POST
-    @Path("/editApplication")
-    @ApiOperation(value = "Onboard application", response = String.class)
-    @Consumes(MediaType.APPLICATION_JSON)
-    @Produces(MediaType.APPLICATION_JSON)
-    public MusicResponse editApplication(JsonOnboard jsonObj,
-            @ApiParam(value = "Authorization", required = true) @HeaderParam(MusicUtil.AUTHORIZATION) String authorization) throws Exception {
-        logger.info(EELFLoggerDelegate.errorLogger, "oboarding app");
-       MusicResponse response = new MusicResponse();
-        if (!authenticator.authenticateAdmin(authorization)) {
-            logger.info(EELFLoggerDelegate.errorLogger, "Unauthorized: Please check admin username,password and try again", AppMessages.AUTHENTICATIONERROR, ErrorSeverity.CRITICAL,
-                    ErrorTypes.AUTHENTICATIONERROR);
-          response.setResposne("fail", "auth error");
-        }
-        KeyspaceMetadata keyspaceInfo = null;
-        try {
-        	keyspaceInfo = MusicDataStoreHandle.returnkeyspaceMetadata(jsonObj.getKeyspace());
-        }catch (Exception e) {
-			logger.info(EELFLoggerDelegate.applicationLogger,"Application Update failed for "+ jsonObj.getKeyspace());
-			
-		}
-        if(keyspaceInfo == null) {
-            logger.info(EELFLoggerDelegate.applicationLogger,"Keyspace does not exist, contact music support to create a keyspace and onbaord again");
-            response.setResposne("fail", "Keyspace does not exist, contact music support to create a keyspace and update again");
-            return response;
-         }
-        
-        try {
-        Response res = updateOnboardApp(jsonObj, authorization);
-        if(res.getStatus() != 200) {
-        	response.setResposne("fail", res.getEntity().toString());
-        }else
-        	response.setResposne("success", "Update success");
-        }catch(Exception ex){
-        	logger.info(EELFLoggerDelegate.errorLogger,"Exception while updating application");
-        	logger.info(EELFLoggerDelegate.errorLogger,ex.getMessage());
-        	response.setResposne("fail", ex.getMessage());
-        	
-        }
-     return response;
-    }
-    
-    
-}