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, 6 insertions, 6 deletions

diff --git a/src/main/java/org/onap/music/rest/RestMusicQAPI.java b/src/main/java/org/onap/music/rest/RestMusicQAPI.java
index 3940c84a..768f1a44 100755
--- a/src/main/java/org/onap/music/rest/RestMusicQAPI.java
+++ b/src/main/java/org/onap/music/rest/RestMusicQAPI.java
@@ -312,7 +312,7 @@ public class RestMusicQAPI {
     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 MusicServiceException, MusicQueryException {
+    @Context UriInfo info) throws MusicServiceException, MusicQueryException {
     // added checking as per RestMusicDataAPI
     ResponseBuilder response = MusicUtil.buildVersionResponse(version, minorVersion, patchVersion);
     if (delObj == null) {
@@ -348,11 +348,11 @@ public class RestMusicQAPI {
         @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)  {
+        @Context UriInfo info)  {
         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);  
+        // 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();
@@ -377,7 +377,7 @@ public class RestMusicQAPI {
                 .setDataResult(MusicDataStoreHandle.marshallResults(results)).toMap()).build();
         } catch (MusicServiceException ex) {
             logger.error(EELFLoggerDelegate.errorLogger, "", AppMessages.UNKNOWNERROR,
-              ErrorSeverity.ERROR, ErrorTypes.MUSICSERVICEERROR, ex);
+                ErrorSeverity.ERROR, ErrorTypes.MUSICSERVICEERROR, ex);
             return response.status(Status.BAD_REQUEST)
                 .entity(new JsonResponse(ResultType.FAILURE).setError(ex.getMessage()).toMap())
                 .build();