Changes Listed below:
[music.git] / src / main / java / org / onap / music / rest / RestMusicLocksAPI.java
index 8612b1f..49b2d81 100644 (file)
@@ -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
  * ============LICENSE_END=============================================
  * ====================================================================
  */
+
 package org.onap.music.rest;
 
 import java.util.Map;
 
-import javax.servlet.http.HttpServletResponse;
 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.Path;
 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.Response.ResponseBuilder;
+import javax.ws.rs.core.Response.Status;
 
+import org.onap.music.authentication.MusicAAFAuthentication;
+import org.onap.music.authentication.MusicAuthenticator;
+import org.onap.music.authentication.MusicAuthenticator.Operation;
 import org.onap.music.datastore.jsonobjects.JsonLeasedLock;
-import org.onap.music.lockingservice.MusicLockState;
+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;
-import org.onap.music.response.jsonobjects.JsonLockResponse;
-
-import com.att.eelf.configuration.EELFLogger;
-import com.att.eelf.configuration.EELFManager;
+import org.onap.music.main.ResultType;
+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]+}/locks/")
+@Path("/v2/locks/")
 @Api(value="Lock Api")
 public class RestMusicLocksAPI {
 
-       private static EELFLogger logger = EELFManager.getInstance().getLogger(RestMusicLocksAPI.class);
-       private static String xLatestVersion = "X-latestVersion";
-       /**
-        * Puts the requesting process in the q for this lock. The corresponding
-        * node will be created in zookeeper if it did not already exist
-        * 
-        * @param lockName
-        * @return
-        */
-
-       @POST
-       @Path("/create/{lockname}")
-       @ApiOperation(value = "Create Lock",
-               notes = "Puts the requesting process in the q for this lock." +
-               " The corresponding node will be created in zookeeper if it did not already exist." +
-               " Lock Name is the \"key\" of the form keyspaceName.tableName.rowId",
-               response = Map.class)
-       @Produces(MediaType.APPLICATION_JSON)   
-       public Map<String,Object> createLockReference(
-                       @ApiParam(value="Lock Name",required=true) @PathParam("lockname") String lockName,
-                       @Context HttpServletResponse response){
-               response.addHeader(xLatestVersion,MusicUtil.getVersion());              
-               Boolean status = true;
-               String lockId = MusicCore.createLockReference(lockName);
-               if ( lockId == null ) { status = false; }
-               return new JsonLockResponse(status.toString(),"",lockId).toMap();
-       }
-
-       /**
-        * 
-        * Checks if the node is in the top of the queue and hence acquires the lock
-        * 
-        * @param lockId
-        * @return
-        */
-       @GET
-       @Path("/acquire/{lockreference}")
-       @ApiOperation(value = "Aquire Lock", 
-               notes = "Checks if the node is in the top of the queue and hence acquires the lock",
-               response = Map.class)
-       @Produces(MediaType.APPLICATION_JSON)   
-       public Map<String,Object> accquireLock(
-                       @ApiParam(value="Lock Reference",required=true) @PathParam("lockreference") String lockId,
-                       @Context HttpServletResponse response){
-               response.addHeader(xLatestVersion,MusicUtil.getVersion());
-               String lockName = lockId.substring(lockId.indexOf('$')+1, lockId.lastIndexOf('$'));
-               Boolean lockStatus = MusicCore.acquireLock(lockName,lockId);
-               return new JsonLockResponse(lockStatus.toString(),"",lockId,lockStatus.toString(),"").toMap();
-       }
-       
-
-
-       
-       @POST
-       @Path("/acquire-with-lease/{lockreference}")
-       @ApiOperation(value = "Aquire Lock with Lease", response = Map.class)
-       @Consumes(MediaType.APPLICATION_JSON)
-       @Produces(MediaType.APPLICATION_JSON)   
-       public Map<String,Object> accquireLockWithLease(JsonLeasedLock lockObj, 
-                       @ApiParam(value="Lock Reference",required=true) @PathParam("lockreference") String lockId,
-                       @Context HttpServletResponse response){
-               response.addHeader(xLatestVersion,MusicUtil.getVersion());
-               String lockName = lockId.substring(lockId.indexOf('$')+1, lockId.lastIndexOf('$'));
-               String lockLeaseStatus = MusicCore.acquireLockWithLease(lockName, lockId, lockObj.getLeasePeriod()).toString();
-               return new JsonLockResponse(lockLeaseStatus,"",lockName,lockLeaseStatus,"",String.valueOf(lockObj.getLeasePeriod())).toMap(); 
-       } 
-       
-
-       @GET
-       @Path("/enquire/{lockname}")
-       @ApiOperation(value = "Get Lock Holder", 
-               notes = "Gets the current Lock Holder",
-               response = Map.class)
-       @Produces(MediaType.APPLICATION_JSON)   
-       public Map<String,Object> currentLockHolder(
-                       @ApiParam(value="Lock Name",required=true) @PathParam("lockname") String lockName,
-                       @Context HttpServletResponse response){
-               response.addHeader(xLatestVersion,MusicUtil.getVersion());
-               String who = MusicCore.whoseTurnIsIt(lockName);
-               String status = "true";
-               String error = "";
-               if ( who == null ) { 
-                       status = "false"; 
-                       error = "There was a problem getting the lock holder";
-               }
-               return new JsonLockResponse(status,error,lockName,"",who).toMap();
-       }
-
-       @GET
-       @Path("/{lockname}")
-       @ApiOperation(value = "Lock State",
-               notes = "Returns current Lock State and Holder.",
-               response = Map.class)
-       @Produces(MediaType.APPLICATION_JSON)   
-       public Map<String,Object> currentLockState(
-                       @ApiParam(value="Lock Name",required=true) @PathParam("lockname") String lockName,
-                       @Context HttpServletResponse response){
-               response.addHeader(xLatestVersion,MusicUtil.getVersion());
-               MusicLockState mls = MusicCore.getMusicLockState(lockName);
-               Map<String,Object> returnMap = null;
-               JsonLockResponse jsonResponse = new JsonLockResponse("false","",lockName);
-               if(mls == null) {
-                       jsonResponse.setError("");
-                       jsonResponse.setMessage("No lock object created yet..");
-               } else { 
-                       jsonResponse.setStatus("true");
-                       jsonResponse.setLockStatus(mls.getLockStatus().toString());
-                       jsonResponse.setLockHolder(mls.getLockHolder());
-               } 
-               return returnMap;
-       }
-
-       /**
-        * 
-        * deletes the process from the zk queue
-        * 
-        * @param lockId
-        */
-       @DELETE
-       @Path("/release/{lockreference}")
-       @ApiOperation(value = "Release Lock",
-               notes = "deletes the process from the zk queue",
-               response = Map.class)
-       @Produces(MediaType.APPLICATION_JSON)   
-       public Map<String,Object> unLock(@PathParam("lockreference") String lockId,
-                       @Context HttpServletResponse response){
-               response.addHeader(xLatestVersion,MusicUtil.getVersion());
-               boolean voluntaryRelease = true; 
-               MusicLockState mls = MusicCore.releaseLock(lockId,voluntaryRelease);
-               Map<String,Object> returnMap = null;
-               if ( mls.getLockStatus() == MusicLockState.LockStatus.UNLOCKED ) {
-                       returnMap = new JsonLockResponse("Unlocked","","").toMap();
-               }
-               if ( mls.getLockStatus() == MusicLockState.LockStatus.LOCKED) {
-                       returnMap = new JsonLockResponse("Locked","","").toMap();
-               }
-               return returnMap;
-       }
-
-       /**
-        * 
-        * @param lockName
-        */
-       @DELETE
-       @Path("/delete/{lockname}")
-       @ApiOperation(value = "Delete Lock", response = Map.class)
-       @Produces(MediaType.APPLICATION_JSON)   
-       public Map<String,Object> deleteLock(@PathParam("lockname") String lockName,
-                       @Context HttpServletResponse response){
-               response.addHeader(xLatestVersion,MusicUtil.getVersion());
-               MusicCore.deleteLock(lockName);
-               return new JsonLockResponse("true","","").toMap();
-       }
+    private EELFLoggerDelegate logger =EELFLoggerDelegate.getLogger(RestMusicLocksAPI.class);
+    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();
+
+    /**
+     * Puts the requesting process in the q for this lock. The corresponding
+     * node will be created if it did not already exist
+     * 
+     * @param lockName
+     * @return
+     * @throws Exception 
+     */
+    @POST
+    @Path("/create/{lockname}")
+    @ApiOperation(value = "Create Lock",
+        notes = "Puts the requesting process in the q for this lock." +
+        " The corresponding lock will be created if it did not already exist." +
+        " Lock Name is the \"key\" of the form keyspaceName.tableName.rowId",
+        response = Map.class)
+    @Produces(MediaType.APPLICATION_JSON)    
+    public Response createLockReference(
+            @ApiParam(value="Lock Name",required=true) @PathParam("lockname") String lockName,
+            @ApiParam(value = "Minor Version",required = false) @HeaderParam(XMINORVERSION) String minorVersion,
+            @ApiParam(value = "Patch Version",required = false) @HeaderParam(XPATCHVERSION) String patchVersion,
+            @ApiParam(value = "Authorization", required = true) @HeaderParam(MusicUtil.AUTHORIZATION) String authorization,
+            @ApiParam(value = "AID", required = true) @HeaderParam("aid") String aid,
+            @ApiParam(value = "Application namespace",
+                            required = true) @HeaderParam("ns") String ns) throws Exception{
+        try {
+        ResponseBuilder response = MusicUtil.buildVersionResponse(VERSION, minorVersion, patchVersion);
+        Map<String, Object> resultMap = MusicCore.validateLock(lockName);
+        if (resultMap.containsKey("Error")) {
+            logger.error(EELFLoggerDelegate.errorLogger,"", AppMessages.MISSINGINFO  ,ErrorSeverity.CRITICAL, ErrorTypes.GENERALSERVICEERROR);
+            response.status(Status.BAD_REQUEST);
+            return response.entity(new JsonResponse(ResultType.FAILURE).setError(String.valueOf(resultMap.get("Error"))).toMap()).build();
+        }
+        String keyspaceName = (String) resultMap.get("keyspace");
+        EELFLoggerDelegate.mdcPut("keyspace", "( "+keyspaceName+" ) ");
+        
+        if (!authenticator.authenticateUser(ns, authorization, keyspaceName, aid, Operation.CREATE_LOCKREF)) {
+            return response.status(Status.UNAUTHORIZED)
+                    .entity(new JsonResponse(ResultType.FAILURE)
+                            .setError("Unauthorized: Please check username, password and make sure your app is onboarded")
+                            .toMap()).build();
+        }
+        
+        ResultType status = ResultType.SUCCESS;
+        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; 
+            logger.error(EELFLoggerDelegate.errorLogger,"", AppMessages.LOCKINGERROR  ,ErrorSeverity.CRITICAL, ErrorTypes.LOCKINGERROR);
+            return response.status(Status.BAD_REQUEST).entity(new JsonResponse(status).setError("Lock Id is null").toMap()).build();
+        }
+        return response.status(Status.OK).entity(new JsonResponse(status).setLock(lockId).toMap()).build();
+        } finally {
+            EELFLoggerDelegate.mdcRemove("keyspace");
+        }
+    }
+
+    /**
+     * 
+     * Checks if the node is in the top of the queue and hence acquires the lock
+     * 
+     * @param lockId
+     * @return
+     * @throws Exception 
+     */
+    @GET
+    @Path("/acquire/{lockreference}")
+    @ApiOperation(value = "Aquire Lock", 
+        notes = "Checks if the node is in the top of the queue and hence acquires the lock",
+        response = Map.class)
+    @Produces(MediaType.APPLICATION_JSON)    
+    public Response accquireLock(
+            @ApiParam(value="Lock Reference",required=true) @PathParam("lockreference") String lockId,
+            @ApiParam(value = "Minor Version",required = false) @HeaderParam(XMINORVERSION) String minorVersion,
+            @ApiParam(value = "Patch Version",required = false) @HeaderParam(XPATCHVERSION) String patchVersion,
+            @ApiParam(value = "Authorization", required = true) @HeaderParam(MusicUtil.AUTHORIZATION) String authorization,
+            @ApiParam(value = "AID", required = true) @HeaderParam("aid") String aid,
+            @ApiParam(value = "Application namespace",
+                            required = true) @HeaderParam("ns") String ns) throws Exception{
+        try { 
+        ResponseBuilder response = MusicUtil.buildVersionResponse(VERSION, minorVersion, patchVersion);
+        Map<String, Object> resultMap = MusicCore.validateLock(lockId);
+        if (resultMap.containsKey("Error")) {
+            logger.error(EELFLoggerDelegate.errorLogger,"", AppMessages.INCORRECTDATA  ,ErrorSeverity.CRITICAL, ErrorTypes.GENERALSERVICEERROR);
+            response.status(Status.BAD_REQUEST);
+            return response.entity(new JsonResponse(ResultType.FAILURE).setError(String.valueOf(resultMap.get("Error"))).toMap()).build();
+        }
+        
+        String keyspaceName = (String) resultMap.get("keyspace");
+        EELFLoggerDelegate.mdcPut("keyspace", "( "+keyspaceName+" ) ");
+        
+        if (!authenticator.authenticateUser(ns, authorization, keyspaceName, aid, Operation.ACQUIRE_LOCK)) {
+            return response.status(Status.UNAUTHORIZED)
+                    .entity(new JsonResponse(ResultType.FAILURE)
+                            .setError("Unauthorized: Please check username, password and make sure your app is onboarded")
+                            .toMap()).build();
+        }
+        
+        try {
+            String lockName = lockId.substring(lockId.indexOf('$')+1, lockId.lastIndexOf('$'));
+            ReturnType lockStatus = MusicCore.acquireLock(lockName,lockId);
+            if ( lockStatus.getResult().equals(ResultType.SUCCESS)) {
+                response.status(Status.OK);
+            } else {
+                response.status(Status.BAD_REQUEST);
+            }
+            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, e);
+            return response.status(Status.BAD_REQUEST).entity(new JsonResponse(ResultType.FAILURE).setError("Unable to aquire lock").toMap()).build();
+        }
+        } finally {
+            EELFLoggerDelegate.mdcRemove("keyspace");
+        }
+    }
+    
+
+
+    
+    @POST
+    @Path("/acquire-with-lease/{lockreference}")
+    @ApiOperation(value = "Aquire Lock with Lease", response = Map.class)
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)    
+    public Response accquireLockWithLease(JsonLeasedLock lockObj, 
+            @ApiParam(value="Lock Reference",required=true) @PathParam("lockreference") String lockId,
+            @ApiParam(value = "Minor Version",required = false) @HeaderParam(XMINORVERSION) String minorVersion,
+            @ApiParam(value = "Patch Version",required = false) @HeaderParam(XPATCHVERSION) String patchVersion,
+            @ApiParam(value = "Authorization", required = true) @HeaderParam(MusicUtil.AUTHORIZATION) String authorization,
+            @ApiParam(value = "AID", required = true) @HeaderParam("aid") String aid,
+            @ApiParam(value = "Application namespace",
+                            required = true) @HeaderParam("ns") String ns) throws Exception{
+        try {
+        ResponseBuilder response = MusicUtil.buildVersionResponse(VERSION, minorVersion, patchVersion);
+        Map<String, Object> resultMap = MusicCore.validateLock(lockId);
+        if (resultMap.containsKey("Error")) {
+            logger.error(EELFLoggerDelegate.errorLogger,"", AppMessages.INCORRECTDATA  ,ErrorSeverity.CRITICAL, ErrorTypes.GENERALSERVICEERROR);
+            response.status(Status.BAD_REQUEST);
+            return response.entity(new JsonResponse(ResultType.FAILURE).setError(String.valueOf(resultMap.get("Error"))).toMap()).build();
+        }
+        String keyspaceName = (String) resultMap.get("keyspace");
+        EELFLoggerDelegate.mdcPut("keyspace", "( "+keyspaceName+" ) ");
+        resultMap.remove("keyspace");
+        if (!authenticator.authenticateUser(ns, authorization, keyspaceName, aid, Operation.ACQUIRE_LOCK)) {
+            return response.status(Status.UNAUTHORIZED)
+                    .entity(new JsonResponse(ResultType.FAILURE)
+                            .setError("Unauthorized: Please check username, password and make sure your app is onboarded")
+                            .toMap()).build();
+        }
+        
+        String lockName = lockId.substring(lockId.indexOf('$')+1, lockId.lastIndexOf('$'));
+        ReturnType lockLeaseStatus = MusicCore.acquireLockWithLease(lockName, lockId, lockObj.getLeasePeriod());
+        if ( lockLeaseStatus.getResult().equals(ResultType.SUCCESS)) {
+            response.status(Status.OK);
+        } else {
+            response.status(Status.BAD_REQUEST);
+        }
+        return response.entity(new JsonResponse(lockLeaseStatus.getResult()).setLock(lockName)
+                                    .setMessage(lockLeaseStatus.getMessage())
+                                    .setLockLease(String.valueOf(lockObj.getLeasePeriod())).toMap()).build();
+        } finally {
+            EELFLoggerDelegate.mdcRemove("keyspace");
+        }
+    } 
+    
+
+    @GET
+    @Path("/enquire/{lockname}")
+    @ApiOperation(value = "Get Lock Holder", 
+        notes = "Gets the current Lock Holder",
+        response = Map.class)
+    @Produces(MediaType.APPLICATION_JSON)    
+    public Response currentLockHolder(
+            @ApiParam(value="Lock Name",required=true) @PathParam("lockname") String lockName,
+            @ApiParam(value = "Minor Version",required = false) @HeaderParam(XMINORVERSION) String minorVersion,
+            @ApiParam(value = "Patch Version",required = false) @HeaderParam(XPATCHVERSION) String patchVersion,
+            @ApiParam(value = "Authorization", required = true) @HeaderParam(MusicUtil.AUTHORIZATION) String authorization,
+            @ApiParam(value = "AID", required = true) @HeaderParam("aid") String aid,
+            @ApiParam(value = "Application namespace",
+                            required = true) @HeaderParam("ns") String ns) throws Exception{
+        try {
+        ResponseBuilder response = MusicUtil.buildVersionResponse(VERSION, minorVersion, patchVersion);
+        Map<String, Object> resultMap = MusicCore.validateLock(lockName);
+        if (resultMap.containsKey("Error")) {
+            logger.error(EELFLoggerDelegate.errorLogger,"", AppMessages.INCORRECTDATA  ,ErrorSeverity.CRITICAL, ErrorTypes.GENERALSERVICEERROR);
+            response.status(Status.BAD_REQUEST);
+            return response.entity(new JsonResponse(ResultType.FAILURE).setError(String.valueOf(resultMap.get("Error"))).toMap()).build();
+        }
+
+        String keyspaceName = (String) resultMap.get("keyspace");
+        EELFLoggerDelegate.mdcPut("keyspace", "( "+keyspaceName+" ) ");
+        resultMap.remove("keyspace");
+        if (!authenticator.authenticateUser(ns, authorization, keyspaceName, aid, Operation.CURRENT_LOCK)) {
+            return response.status(Status.UNAUTHORIZED)
+                    .entity(new JsonResponse(ResultType.FAILURE)
+                            .setError("Unauthorized: Please check username, password and make sure your app is onboarded")
+                            .toMap()).build();
+        }
+        
+        String who = MusicCore.whoseTurnIsIt(lockName);
+        ResultType status = ResultType.SUCCESS;
+        String error = "";
+        if ( who == null ) { 
+            status = ResultType.FAILURE; 
+            error = "There was a problem getting the lock holder";
+            logger.error(EELFLoggerDelegate.errorLogger,"There was a problem getting the lock holder", AppMessages.INCORRECTDATA  ,ErrorSeverity.CRITICAL, ErrorTypes.GENERALSERVICEERROR);
+            return response.status(Status.BAD_REQUEST).entity(new JsonResponse(status).setError(error).setLock(lockName).setLockHolder(who).toMap()).build();
+        }
+        return response.status(Status.OK).entity(new JsonResponse(status).setError(error).setLock(lockName).setLockHolder(who).toMap()).build();
+        } finally {
+            EELFLoggerDelegate.mdcRemove("keyspace");
+        }
+    }
+
+    @GET
+    @Path("/{lockname}")
+    @ApiOperation(value = "Lock State",
+        notes = "Returns current Lock State and Holder.",
+        response = Map.class)
+    @Produces(MediaType.APPLICATION_JSON)    
+    public Response currentLockState(
+            @ApiParam(value="Lock Name",required=true) @PathParam("lockname") String lockName,
+            @ApiParam(value = "Minor Version",required = false) @HeaderParam(XMINORVERSION) String minorVersion,
+            @ApiParam(value = "Patch Version",required = false) @HeaderParam(XPATCHVERSION) String patchVersion,
+            @ApiParam(value = "Authorization", required = true) @HeaderParam(MusicUtil.AUTHORIZATION) String authorization,
+            @ApiParam(value = "AID", required = true) @HeaderParam("aid") String aid,
+            @ApiParam(value = "Application namespace",
+                            required = true) @HeaderParam("ns") String ns) throws Exception{
+        try {
+        ResponseBuilder response = MusicUtil.buildVersionResponse(VERSION, minorVersion, patchVersion);
+        Map<String, Object> resultMap = MusicCore.validateLock(lockName);
+        if (resultMap.containsKey("Error")) {
+            logger.error(EELFLoggerDelegate.errorLogger,"", AppMessages.INCORRECTDATA  ,ErrorSeverity.CRITICAL, ErrorTypes.GENERALSERVICEERROR);
+            response.status(Status.BAD_REQUEST);
+            return response.entity(new JsonResponse(ResultType.FAILURE).setError(String.valueOf(resultMap.get("Error"))).toMap()).build();
+        }
+        String keyspaceName = (String) resultMap.get("keyspace");
+        EELFLoggerDelegate.mdcPut("keyspace", "( "+keyspaceName+" ) ");
+        resultMap.remove("keyspace");
+        if (!authenticator.authenticateUser(ns, authorization, keyspaceName, aid, Operation.CURRENT_LOCK)) {
+            return response.status(Status.UNAUTHORIZED)
+                    .entity(new JsonResponse(ResultType.FAILURE)
+                            .setError("Unauthorized: Please check username, password and make sure your app is onboarded")
+                            .toMap()).build();
+        }
+        
+        String who = MusicCore.whoseTurnIsIt(lockName);
+        ResultType status = ResultType.SUCCESS;
+        String error = "";
+        if ( who == null ) { 
+            status = ResultType.FAILURE; 
+            error = "There was a problem getting the lock holder";
+            logger.error(EELFLoggerDelegate.errorLogger,"There was a problem getting the lock holder", AppMessages.INCORRECTDATA  ,ErrorSeverity.CRITICAL, ErrorTypes.GENERALSERVICEERROR);
+            return response.status(Status.BAD_REQUEST).entity(new JsonResponse(status).setError(error).setLock(lockName).setLockHolder(who).toMap()).build();
+        }
+        return response.status(Status.OK).entity(new JsonResponse(status).setError(error).setLock(lockName).setLockHolder(who).toMap()).build();
+        } finally {
+            EELFLoggerDelegate.mdcRemove("keyspace");
+        }
+
+    }
+
+    /**
+     * 
+     * deletes the process from the lock queue
+     * 
+     * @param lockId
+     * @throws Exception 
+     */
+    @DELETE
+    @Path("/release/{lockreference}")
+    @ApiOperation(value = "Release Lock",
+        notes = "deletes the process from the lock queue",
+        response = Map.class)
+    @Produces(MediaType.APPLICATION_JSON)    
+    public Response unLock(@PathParam("lockreference") String lockId,
+            @ApiParam(value = "Minor Version",required = false) @HeaderParam(XMINORVERSION) String minorVersion,
+            @ApiParam(value = "Patch Version",required = false) @HeaderParam(XPATCHVERSION) String patchVersion,
+            @ApiParam(value = "Authorization", required = true) @HeaderParam(MusicUtil.AUTHORIZATION) String authorization,
+            @ApiParam(value = "AID", required = true) @HeaderParam("aid") String aid,
+            @ApiParam(value = "Application namespace",
+                            required = true) @HeaderParam("ns") String ns) throws Exception{
+        try {
+        ResponseBuilder response = MusicUtil.buildVersionResponse(VERSION, minorVersion, patchVersion);
+        Map<String, Object> resultMap = MusicCore.validateLock(lockId);
+        if (resultMap.containsKey("Error")) {
+            logger.error(EELFLoggerDelegate.errorLogger,"", AppMessages.INCORRECTDATA  ,ErrorSeverity.CRITICAL, ErrorTypes.GENERALSERVICEERROR);
+            response.status(Status.BAD_REQUEST);
+            return response.entity(new JsonResponse(ResultType.FAILURE).setError(String.valueOf(resultMap.get("Error"))).toMap()).build();
+        }
+
+        String keyspaceName = (String) resultMap.get("keyspace");
+        EELFLoggerDelegate.mdcPut("keyspace", "( "+keyspaceName+" ) ");
+        resultMap.remove("keyspace");
+        if (!authenticator.authenticateUser(ns, authorization, keyspaceName, aid, Operation.DELETE_LOCK)) {
+            return response.status(Status.UNAUTHORIZED)
+                    .entity(new JsonResponse(ResultType.FAILURE)
+                            .setError("Unauthorized: Please check username, password and make sure your app is onboarded")
+                            .toMap()).build();
+        }
+        
+        boolean voluntaryRelease = true; 
+        MusicLockState mls = MusicCore.releaseLock(lockId,voluntaryRelease);
+        if(mls.getErrorMessage() != null) {
+            resultMap.put(ResultType.EXCEPTION.getResult(), mls.getErrorMessage());
+            logger.error(EELFLoggerDelegate.errorLogger,"", AppMessages.INCORRECTDATA  ,ErrorSeverity.CRITICAL, ErrorTypes.GENERALSERVICEERROR);
+            return response.status(Status.BAD_REQUEST).entity(resultMap).build();
+        }
+        Map<String,Object> returnMap = null;
+        if (mls.getLockStatus() == MusicLockState.LockStatus.UNLOCKED) {
+            returnMap = new JsonResponse(ResultType.SUCCESS).setLock(lockId)
+                                .setLockStatus(mls.getLockStatus()).toMap();
+            response.status(Status.OK);
+        }
+        if (mls.getLockStatus() == MusicLockState.LockStatus.LOCKED) {
+            logger.error(EELFLoggerDelegate.errorLogger,"", AppMessages.LOCKINGERROR  ,ErrorSeverity.CRITICAL, ErrorTypes.GENERALSERVICEERROR);
+            returnMap = new JsonResponse(ResultType.FAILURE).setLock(lockId)
+                                .setLockStatus(mls.getLockStatus()).toMap();
+            response.status(Status.BAD_REQUEST);
+        }
+        return response.entity(returnMap).build();
+        } finally {
+            EELFLoggerDelegate.mdcRemove("keyspace");
+        }
+    }
+
+    /**
+     * @deprecated
+     * @param lockName
+     * @throws Exception 
+     */
+    @DELETE
+    @Path("/delete/{lockname}")
+    @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,
+            @ApiParam(value = "AID", required = true) @HeaderParam("aid") String aid,
+            @ApiParam(value = "Authorization", required = true) @HeaderParam(MusicUtil.AUTHORIZATION) String authorization,
+            @ApiParam(value = "Application namespace",
+                            required = true) @HeaderParam("ns") String ns) throws Exception{
+        try {
+        ResponseBuilder response = MusicUtil.buildVersionResponse(VERSION, minorVersion, patchVersion);
+        Map<String, Object> resultMap = MusicCore.validateLock(lockName);
+        if (resultMap.containsKey("Error")) {
+            logger.error(EELFLoggerDelegate.errorLogger,"", AppMessages.UNKNOWNERROR  ,ErrorSeverity.CRITICAL, ErrorTypes.GENERALSERVICEERROR);
+            response.status(Status.BAD_REQUEST);
+            return response.entity(new JsonResponse(ResultType.FAILURE).setError(String.valueOf(resultMap.get("Error"))).toMap()).build();
+        }
+
+        String keyspaceName = (String) resultMap.get("keyspace");
+        EELFLoggerDelegate.mdcPut("keyspace", "( "+keyspaceName+" ) ");
+        resultMap.remove("keyspace");
+        if (!authenticator.authenticateUser(ns, authorization, keyspaceName, aid, Operation.DELETE_LOCK)) {
+            return response.status(Status.UNAUTHORIZED)
+                    .entity(new JsonResponse(ResultType.FAILURE)
+                            .setError("Unauthorized: Please check username, password and make sure your app is onboarded")
+                            .toMap()).build();
+        }
+        
+        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();
+        } finally {
+            EELFLoggerDelegate.mdcRemove("keyspace");
+        }
+    }
 
 }