diff options
| author |   Sunder Tattavarada <statta@research.att.com> | 2018-05-04 21:36:44 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-05-04 21:36:44 +0000 |
| commit | 3bf54a070dabf39a9fff87b1b5d56feb4978b340 (patch) | |
| tree | 59aaab35d97bb24afecb2a71861cd6e239603829 | |
| parent | 6874c0043e721655868e9486c693a0c7bf9dc274 (diff) | |
| parent | 95af4009b19a16a949d9e5b2ba782119f8ff41b5 (diff) | |
Merge "Music version upgrade"
3 files changed, 7 insertions, 3 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 fdf6e499..9645a777 100644 --- a/ecomp-sdk/epsdk-app-os/src/main/resources/music.properties +++ b/ecomp-sdk/epsdk-app-os/src/main/resources/music.properties @@ -4,7 +4,7 @@ music.session.meta.tables = spring_session #music.cache = false music.serialize.compress = true music.session.max.inactive.interval.seconds = 1800 -music.exclude.api = /portalApi/healthCheck,/portalApi/healthCheckSuspend,/portalApi/healthCheckResume +music.exclude.api = /portalApi/healthCheck,/portalApi/healthCheckSuspend,/portalApi/healthCheckResume,/auxapi/.* #By default it's eventual music.atomic.get = false music.atomic.put = false diff --git a/ecomp-sdk/epsdk-music/pom.xml b/ecomp-sdk/epsdk-music/pom.xml index 44970e13..5ef0d469 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.3</version> + <version>2.5.4</version> </dependency> <!-- Mapper --> 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 ff1edb74..d7de16bd 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 @@ -144,7 +144,11 @@ public class MusicUtil { public static boolean isExcludedApi(String api){ Set<String> excludedApiSet = getMusicExcludedAPI(); - return excludedApiSet.contains(api); + for(String str: excludedApiSet){ + if(api.matches(str)) + return true; + } + return false; } public static boolean isMusicSerializeCompress(){ |