summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLo, WEI-TING(wl849v) <wl849v@att.com>2018-05-29 17:00:44 -0400
committerLo, WEI-TING(wl849v) <wl849v@att.com>2018-05-29 17:00:44 -0400
commitd26c4ce7bc799e5e263bbb66d68062a063708e1c (patch)
treec1f7233226446ff407aa430d1862b4c9cf80d6b1
parent4f1afd26403c688b29c8329be66dcaded951bd54 (diff)
Music ver upgrade
Issue-ID: PORTAL-293 Music toggle enable Change-Id: I72986134afaf533a086307f82d9f925db793423c Signed-off-by: Lo, WEI-TING(wl849v) <wl849v@att.com>
-rw-r--r--ecomp-sdk/epsdk-app-os/src/main/resources/music.properties1
-rw-r--r--ecomp-sdk/epsdk-music/pom.xml2
-rw-r--r--ecomp-sdk/epsdk-music/src/main/java/org/onap/portalapp/music/conf/MusicSessionRepositoryHandler.java44
-rw-r--r--ecomp-sdk/epsdk-music/src/main/java/org/onap/portalapp/music/filter/MusicSessionRepositoryFilter.java2
-rw-r--r--ecomp-sdk/epsdk-music/src/main/java/org/onap/portalapp/music/util/MusicProperties.java2
-rw-r--r--ecomp-sdk/epsdk-music/src/main/java/org/onap/portalapp/music/util/MusicUtil.java11
6 files changed, 43 insertions, 19 deletions
diff --git a/ecomp-sdk/epsdk-app-os/src/main/resources/music.properties b/ecomp-sdk/epsdk-app-os/src/main/resources/music.properties
index 9645a777..d7951560 100644
--- a/ecomp-sdk/epsdk-app-os/src/main/resources/music.properties
+++ b/ecomp-sdk/epsdk-app-os/src/main/resources/music.properties
@@ -12,6 +12,7 @@ music.atomic.put = false
music.cleanup.frequency = 6
#how old of session need to be cleaned up (hour)
music.cleanup.threshold = 10
+music.enable = false
cassandra.host=135.197.226.103
zookeeper.host=135.197.226.103, 135.197.226.108, 135.197.226.119
cassandra.user=cassandra
diff --git a/ecomp-sdk/epsdk-music/pom.xml b/ecomp-sdk/epsdk-music/pom.xml
index 5ef0d469..45ebddc3 100644
--- a/ecomp-sdk/epsdk-music/pom.xml
+++ b/ecomp-sdk/epsdk-music/pom.xml
@@ -125,7 +125,7 @@
<dependency>
<groupId>org.onap.music</groupId>
<artifactId>MUSIC</artifactId>
- <version>2.5.4</version>
+ <version>2.5.5</version>
</dependency>
<!-- Mapper -->
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);
+ }
}
}
-
}
diff --git a/ecomp-sdk/epsdk-music/src/main/java/org/onap/portalapp/music/filter/MusicSessionRepositoryFilter.java b/ecomp-sdk/epsdk-music/src/main/java/org/onap/portalapp/music/filter/MusicSessionRepositoryFilter.java
index aa9e2e3e..694e80cd 100644
--- a/ecomp-sdk/epsdk-music/src/main/java/org/onap/portalapp/music/filter/MusicSessionRepositoryFilter.java
+++ b/ecomp-sdk/epsdk-music/src/main/java/org/onap/portalapp/music/filter/MusicSessionRepositoryFilter.java
@@ -59,7 +59,7 @@ public class MusicSessionRepositoryFilter extends DelegatingFilterProxy{
try{
if (request instanceof HttpServletRequest) {
String path = ((HttpServletRequest)request).getRequestURI().substring(((HttpServletRequest) request).getContextPath().length());
- if(MusicUtil.isExcludedApi(path))
+ if(MusicUtil.isExcludedApi(path) || !MusicUtil.isMusicEnable())
request.setAttribute("org.springframework.session.web.http.SessionRepositoryFilter.FILTERED", Boolean.TRUE);
}
}catch(Exception e){
diff --git a/ecomp-sdk/epsdk-music/src/main/java/org/onap/portalapp/music/util/MusicProperties.java b/ecomp-sdk/epsdk-music/src/main/java/org/onap/portalapp/music/util/MusicProperties.java
index 802634b6..5aae01d0 100644
--- a/ecomp-sdk/epsdk-music/src/main/java/org/onap/portalapp/music/util/MusicProperties.java
+++ b/ecomp-sdk/epsdk-music/src/main/java/org/onap/portalapp/music/util/MusicProperties.java
@@ -99,6 +99,8 @@ public class MusicProperties {
public static final String MUSIC_CLEAN_UP_THRESHOLD = "music.cleanup.threshold";
+ public static final String MUSIC_ENABLE = "music.enable";
+
public static final String SESSION_MAX_INACTIVE_INTERVAL_SECONDS = "music.session.max.inactive.interval.seconds";
public static final String ATTRIBUTE_NAME = "ATTRIBUTE_NAME";
diff --git a/ecomp-sdk/epsdk-music/src/main/java/org/onap/portalapp/music/util/MusicUtil.java b/ecomp-sdk/epsdk-music/src/main/java/org/onap/portalapp/music/util/MusicUtil.java
index d7de16bd..a62c929c 100644
--- a/ecomp-sdk/epsdk-music/src/main/java/org/onap/portalapp/music/util/MusicUtil.java
+++ b/ecomp-sdk/epsdk-music/src/main/java/org/onap/portalapp/music/util/MusicUtil.java
@@ -67,6 +67,8 @@ public class MusicUtil {
private static String cached = MusicProperties.getProperty(MusicProperties.MUSIC_CACHE);
private static String cleanUpFreq = MusicProperties.getProperty(MusicProperties.MUSIC_CLEAN_UP_FREQUENCY);
private static String musicSerializeCompress = MusicProperties.getProperty(MusicProperties.MUSIC_SERIALIZE_COMPRESS);
+ private static String musicEnable = MusicProperties.getProperty(MusicProperties.MUSIC_ENABLE);
+
public static boolean isSessionMetaAttr(String key){
return sessionAttrNameSet.contains(key);
}
@@ -203,4 +205,13 @@ public class MusicUtil {
return false;
}
}
+
+ public static boolean isMusicEnable(){
+ if(musicEnable==null)
+ return false;
+ if(musicEnable.equals("true"))
+ return true;
+ else
+ return false;
+ }
}