X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fmusic%2Frest%2FRestMusicLocksAPI.java;h=49b2d8162211966acb3d5976bf6fc62328906e89;hb=d6e7b63cc580e7b3822be61fe92a493ad5e222a3;hp=943f4ca81e3fad32eef316602245ee9a95df130e;hpb=87eade94c1bf1fab3e33c9a5497f2a14bc296b79;p=music.git

diff --git a/src/main/java/org/onap/music/rest/RestMusicLocksAPI.java b/src/main/java/org/onap/music/rest/RestMusicLocksAPI.java
index 943f4ca8..49b2d816 100644
--- a/src/main/java/org/onap/music/rest/RestMusicLocksAPI.java
+++ b/src/main/java/org/onap/music/rest/RestMusicLocksAPI.java
@@ -4,6 +4,8 @@
  * ===================================================================
  *  Copyright (c) 2017 AT&T Intellectual Property
  * ===================================================================
+ *  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
@@ -45,6 +47,7 @@ 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.MusicLockingException;
 import org.onap.music.lockingservice.cassandra.MusicLockState;
 import org.onap.music.main.MusicCore;
 import org.onap.music.main.MusicUtil;
@@ -65,7 +68,7 @@ public class RestMusicLocksAPI {
     private static final String XMINORVERSION = "X-minorVersion";
     private static final String XPATCHVERSION = "X-patchVersion";
     private static final String VERSION = "v2";
-    
+
     private MusicAuthenticator authenticator = new MusicAAFAuthentication();
 
     /**
@@ -111,7 +114,12 @@ public class RestMusicLocksAPI {
         }
         
         ResultType status = ResultType.SUCCESS;
-        String lockId = MusicCore.createLockReference(lockName);
+        String lockId;
+        try {
+        	lockId= MusicCore.createLockReference(lockName);
+        } catch (MusicLockingException e) {
+        	return response.status(Status.BAD_REQUEST).entity(new JsonResponse(ResultType.FAILURE).setError(e.getMessage()).toMap()).build();
+        }
         
         if (lockId == null) { 
             status = ResultType.FAILURE; 
@@ -175,7 +183,8 @@ public class RestMusicLocksAPI {
             }
             return response.entity(new JsonResponse(lockStatus.getResult()).setLock(lockId).setMessage(lockStatus.getMessage()).toMap()).build();
         } catch (Exception e) {
-            logger.error(EELFLoggerDelegate.errorLogger,AppMessages.INVALIDLOCK + lockId, ErrorSeverity.CRITICAL, ErrorTypes.LOCKINGERROR);
+            logger.error(EELFLoggerDelegate.errorLogger,AppMessages.INVALIDLOCK + lockId, ErrorSeverity.CRITICAL,
+                ErrorTypes.LOCKINGERROR, e);
             return response.status(Status.BAD_REQUEST).entity(new JsonResponse(ResultType.FAILURE).setError("Unable to aquire lock").toMap()).build();
         }
         } finally {
@@ -325,28 +334,13 @@ public class RestMusicLocksAPI {
         return response.status(Status.OK).entity(new JsonResponse(status).setError(error).setLock(lockName).setLockHolder(who).toMap()).build();
         } finally {
             EELFLoggerDelegate.mdcRemove("keyspace");
-        } 
-        
-        //MusicLockState mls = MusicZKCore.getMusicLockState(lockName);
-//        Map<String,Object> returnMap = null;
-//        JsonResponse jsonResponse = new JsonResponse(ResultType.FAILURE).setLock(lockName);
-//        if(mls == null) {
-//            jsonResponse.setError("");
-//            jsonResponse.setMessage("No lock object created yet..");
-//            logger.error(EELFLoggerDelegate.errorLogger,"", AppMessages.INCORRECTDATA  ,ErrorSeverity.CRITICAL, ErrorTypes.GENERALSERVICEERROR);
-//            return response.status(Status.BAD_REQUEST).entity(jsonResponse.toMap()).build();
-//        } else { 
-//            jsonResponse.setStatus(ResultType.SUCCESS);
-//            jsonResponse.setLockStatus(mls.getLockStatus());
-//            jsonResponse.setLockHolder(mls.getLockHolder());
-//            return response.status(Status.OK).entity(jsonResponse.toMap()).build();
-//        }
+        }
 
     }
 
     /**
      * 
-     * deletes the process from the zk queue
+     * deletes the process from the lock queue
      * 
      * @param lockId
      * @throws Exception 
@@ -354,7 +348,7 @@ public class RestMusicLocksAPI {
     @DELETE
     @Path("/release/{lockreference}")
     @ApiOperation(value = "Release Lock",
-        notes = "deletes the process from the zk queue",
+        notes = "deletes the process from the lock queue",
         response = Map.class)
     @Produces(MediaType.APPLICATION_JSON)    
     public Response unLock(@PathParam("lockreference") String lockId,
@@ -409,14 +403,15 @@ public class RestMusicLocksAPI {
     }
 
     /**
-     * 
+     * @deprecated
      * @param lockName
      * @throws Exception 
      */
     @DELETE
     @Path("/delete/{lockname}")
-    @ApiOperation(value = "Delete Lock", response = Map.class)
-    @Produces(MediaType.APPLICATION_JSON)    
+    @ApiOperation(value = "Delete Lock", response = Map.class, hidden = true, notes = "Deprecated")
+    @Produces(MediaType.APPLICATION_JSON)
+    @Deprecated
     public Response deleteLock(@PathParam("lockname") String lockName,
             @ApiParam(value = "Minor Version",required = false) @HeaderParam(XMINORVERSION) String minorVersion,
             @ApiParam(value = "Patch Version",required = false) @HeaderParam(XPATCHVERSION) String patchVersion,
@@ -446,6 +441,7 @@ public class RestMusicLocksAPI {
         try{
             MusicCore.deleteLock(lockName);
         }catch (Exception e) {
+            logger.error(EELFLoggerDelegate.errorLogger, e);
             return response.status(Status.BAD_REQUEST).entity(new JsonResponse(ResultType.FAILURE).setError(e.getMessage()).toMap()).build();
         }
         return response.status(Status.OK).entity(new JsonResponse(ResultType.SUCCESS).toMap()).build();