API Versioning for ECOMP Components in SDK

Issue-ID: PORTAL-263

Included the fix for the defect regarding profile self pages returning
404 error.

Change-Id: Id6b1ed6ffde319ba41e9da445de8aa5f38249a8b
Signed-off-by: sa282w <sa282w@att.com>

1 files changed, 27 insertions, 17 deletions

diff --git a/ecomp-sdk/epsdk-music/src/main/java/org/onap/portalapp/music/conf/MusicSessionRepositoryHandler.java b/ecomp-sdk/epsdk-music/src/main/java/org/onap/portalapp/music/conf/MusicSessionRepositoryHandler.java
index 7d2e51ff..0e8551b9 100644
--- a/ecomp-sdk/epsdk-music/src/main/java/org/onap/portalapp/music/conf/MusicSessionRepositoryHandler.java
+++ b/ecomp-sdk/epsdk-music/src/main/java/org/onap/portalapp/music/conf/MusicSessionRepositoryHandler.java
@@ -55,40 +55,50 @@ public class MusicSessionRepositoryHandler {
 	
 	
 	public Session get(String id) {
-		if(!musicCache){
+		if(musicCache){
+		 // todo need to add the clean up for "sessions" map if musicCache is enabled 	     
+			return this.sessions.get(id);
+		}else{
 			try {
 				Session session = MusicService.getMetaAttribute(id);
 				return session;
 			} catch (Exception e) {
 				logger.error(EELFLoggerDelegate.errorLogger, "get failed with id " + id, e);
+				return null;
 			}
-		}
-		return this.sessions.get(id);
+		}		
 	}
 
 
 
 	public void remove(String id) {
-		 sessions.remove(id);
-		 try {
-			MusicService.removeSession(id);
-		} catch (MusicLockingException e) {
-			logger.error(EELFLoggerDelegate.errorLogger, "removeSession locking failed with id " + id, e);
-		} catch (MusicServiceException e) {
-			logger.error(EELFLoggerDelegate.errorLogger, "removeSession failed with id " + id, e);
+		if(musicCache){
+			 // todo need to add the clean up for "sessions" map if musicCache is enabled 	     
+			sessions.remove(id);	
+		}else{
+			try {
+				MusicService.removeSession(id);
+			} catch (MusicLockingException e) {
+				logger.error(EELFLoggerDelegate.errorLogger, "removeSession locking failed with id " + id, e);
+			} catch (MusicServiceException e) {
+				logger.error(EELFLoggerDelegate.errorLogger, "removeSession failed with id " + id, e);
+			}
 		}
 	}
 
 
 
 	public void put(String id, MusicSession musicSession) {
-		sessions.put(id, musicSession);
-		try {
-			MusicService.setMetaAttribute(musicSession);
-			MusicService.cleanUpMusic();
-		} catch (Exception e) {
-			logger.error(EELFLoggerDelegate.errorLogger, "setMetaAttribute failed with id " + id, e);
+		if(musicCache){
+			 // todo need to add the clean up for "sessions" map if musicCache is enabled 	     
+			sessions.put(id, musicSession);		
+		}else{
+			try {
+				MusicService.setMetaAttribute(musicSession);
+				MusicService.cleanUpMusic();
+			} catch (Exception e) {
+				logger.error(EELFLoggerDelegate.errorLogger, "setMetaAttribute failed with id " + id, e);
+			}
 		}
 	}
-
 }