summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorVikram Potturi(apotturi) <apotturi@gmail.com>2018-04-09 16:47:50 -0400
committerVikram Potturi(apotturi) <apotturi@gmail.com>2018-04-09 16:56:47 -0400
commit587e3d75c651f97b6e11cc61d7159e607c3f0f90 (patch)
treeb98f1ef1ea6c389c58ec6e0801a7aa398c29ee6e /src
parent0d0e1f6dcf7bb27f5604615772d55b8cc903e9c7 (diff)
Adding HEAT map information.
Change-Id: I676137f72ab3cf451532c8f8fcfd032f83c31d5b Issue-ID: MUSIC-63 Signed-off-by: Vikram Potturi(apotturi) <apotturi@gmail.com>
Diffstat (limited to 'src')
-rw-r--r--src/main/java/org/onap/music/lockingservice/MusicLockingService.java8
-rw-r--r--src/main/java/org/onap/music/main/MusicCore.java4
-rw-r--r--src/main/java/org/onap/music/rest/RestMusicLocksAPI.java6
-rw-r--r--src/test/java/org/onap/music/unittests/TestMusicCore.java2
4 files changed, 15 insertions, 5 deletions
diff --git a/src/main/java/org/onap/music/lockingservice/MusicLockingService.java b/src/main/java/org/onap/music/lockingservice/MusicLockingService.java
index 44a00bcf..ae026903 100644
--- a/src/main/java/org/onap/music/lockingservice/MusicLockingService.java
+++ b/src/main/java/org/onap/music/lockingservice/MusicLockingService.java
@@ -133,8 +133,12 @@ public class MusicLockingService implements Watcher {
zkLockHandle.unlock(lockId);
}
- public void deleteLock(String lockName) {
- zkLockHandle.deleteLock(lockName);
+ public void deleteLock(String lockName) throws MusicLockingException {
+ if(lockIdExists(lockName))
+ zkLockHandle.deleteLock(lockName);
+ else{
+ throw new MusicLockingException("Lock does not exist.Please check the lock: " + lockName + " and try again");
+ }
}
public String whoseTurnIsIt(String lockName) {
diff --git a/src/main/java/org/onap/music/main/MusicCore.java b/src/main/java/org/onap/music/main/MusicCore.java
index d38a4d6a..dfc93ccc 100644
--- a/src/main/java/org/onap/music/main/MusicCore.java
+++ b/src/main/java/org/onap/music/main/MusicCore.java
@@ -518,14 +518,16 @@ public class MusicCore {
/**
*
* @param lockName
+ * @throws MusicLockingException
*/
- public static void deleteLock(String lockName) {
+ public static void deleteLock(String lockName) throws MusicLockingException {
long start = System.currentTimeMillis();
logger.info(EELFLoggerDelegate.applicationLogger,"Deleting lock for " + lockName);
try {
getLockingServiceHandle().deleteLock("/" + lockName);
} catch (MusicLockingException e) {
logger.error(EELFLoggerDelegate.errorLogger,e.getMessage(), AppMessages.DELTELOCK+lockName ,ErrorSeverity.CRITICAL, ErrorTypes.LOCKINGERROR);
+ throw new MusicLockingException(e.getMessage());
}
long end = System.currentTimeMillis();
logger.info(EELFLoggerDelegate.applicationLogger,"Time taken to delete lock:" + (end - start) + " ms");
diff --git a/src/main/java/org/onap/music/rest/RestMusicLocksAPI.java b/src/main/java/org/onap/music/rest/RestMusicLocksAPI.java
index 9189fbb3..22112ddf 100644
--- a/src/main/java/org/onap/music/rest/RestMusicLocksAPI.java
+++ b/src/main/java/org/onap/music/rest/RestMusicLocksAPI.java
@@ -412,7 +412,11 @@ public class RestMusicLocksAPI {
logger.error(EELFLoggerDelegate.errorLogger,"", AppMessages.UNKNOWNERROR ,ErrorSeverity.CRITICAL, ErrorTypes.GENERALSERVICEERROR);
return response.status(Status.BAD_REQUEST).entity(resultMap).build();
}
- MusicCore.deleteLock(lockName);
+ try{
+ MusicCore.deleteLock(lockName);
+ }catch (Exception 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();
}
diff --git a/src/test/java/org/onap/music/unittests/TestMusicCore.java b/src/test/java/org/onap/music/unittests/TestMusicCore.java
index 876c78b1..e798aaf1 100644
--- a/src/test/java/org/onap/music/unittests/TestMusicCore.java
+++ b/src/test/java/org/onap/music/unittests/TestMusicCore.java
@@ -257,7 +257,7 @@ public class TestMusicCore {
}
@Test
- public void testDeleteLock() {
+ public void testDeleteLock() throws MusicLockingException {
Mockito.doNothing().when(mLockHandle).deleteLock("/" + "id1");
MusicCore.deleteLock("id1");
Mockito.verify(mLockHandle).deleteLock("/" + "id1");