summaryrefslogtreecommitdiffstats
path: root/ecomp-sdk/epsdk-music/src
diff options
context:
space:
mode:
authorsa282w <sa282w@att.com>2018-06-22 12:09:50 -0400
committersa282w <sa282w@att.com>2018-06-27 12:44:16 -0400
commit3772c40e89085db751c2a4823084b0b1810b1b31 (patch)
tree1eb8b299896021a4eb740b8f5526e5af9fd5fd1a /ecomp-sdk/epsdk-music/src
parentcc409b55d11d971a4cc85df63be2fe32317c9082 (diff)
API Versioning for ECOMP Components in SDK
Issue-ID: PORTAL-263 Included the missing changes for V3 API's for UserService and LoginService and release/2.4.0 changes needed to be merged in master branch. Change-Id: Ic516255464d3edf637df3e8c64eafbf0dde8cee3 Signed-off-by: sa282w <sa282w@att.com>
Diffstat (limited to 'ecomp-sdk/epsdk-music/src')
-rw-r--r--ecomp-sdk/epsdk-music/src/main/java/org/onap/portalapp/music/conf/MusicSession.java4
-rw-r--r--ecomp-sdk/epsdk-music/src/main/java/org/onap/portalapp/music/conf/MusicSessionRepository.java2
-rw-r--r--ecomp-sdk/epsdk-music/src/main/java/org/onap/portalapp/music/service/MusicService.java20
3 files changed, 13 insertions, 13 deletions
diff --git a/ecomp-sdk/epsdk-music/src/main/java/org/onap/portalapp/music/conf/MusicSession.java b/ecomp-sdk/epsdk-music/src/main/java/org/onap/portalapp/music/conf/MusicSession.java
index f1defe3c..1f68bda0 100644
--- a/ecomp-sdk/epsdk-music/src/main/java/org/onap/portalapp/music/conf/MusicSession.java
+++ b/ecomp-sdk/epsdk-music/src/main/java/org/onap/portalapp/music/conf/MusicSession.java
@@ -158,7 +158,7 @@ public final class MusicSession implements Session, Serializable {
public void setLastAccessedTime(Instant lastAccessedTime) {
logger.debug(EELFLoggerDelegate.debugLogger, "setLastAccessedTime: start");
try{
- MusicService.setAttribute(MusicProperties.LAST_ACCESS_TIME, this.lastAccessedTime, this.id);
+ MusicService.setAttribute(MusicProperties.LAST_ACCESS_TIME, lastAccessedTime, this.id);
}catch(Exception e){
logger.error(EELFLoggerDelegate.errorLogger, "setLastAccessedTime failed with id " + this.id, e);
}
@@ -375,7 +375,7 @@ public final class MusicSession implements Session, Serializable {
}
private static String generateId() {
- return UUID.randomUUID().toString();
+ return UUID.randomUUID().toString().replaceAll("-", "~");
}
private static final long serialVersionUID = 7160779239673823561L;
diff --git a/ecomp-sdk/epsdk-music/src/main/java/org/onap/portalapp/music/conf/MusicSessionRepository.java b/ecomp-sdk/epsdk-music/src/main/java/org/onap/portalapp/music/conf/MusicSessionRepository.java
index 4bebfc2b..f2f8fee5 100644
--- a/ecomp-sdk/epsdk-music/src/main/java/org/onap/portalapp/music/conf/MusicSessionRepository.java
+++ b/ecomp-sdk/epsdk-music/src/main/java/org/onap/portalapp/music/conf/MusicSessionRepository.java
@@ -38,8 +38,8 @@
package org.onap.portalapp.music.conf;
import java.time.Duration;
-import java.util.Map;
+import org.springframework.session.MapSession;
import org.springframework.session.Session;
import org.springframework.session.SessionRepository;
import org.springframework.session.events.SessionDeletedEvent;
diff --git a/ecomp-sdk/epsdk-music/src/main/java/org/onap/portalapp/music/service/MusicService.java b/ecomp-sdk/epsdk-music/src/main/java/org/onap/portalapp/music/service/MusicService.java
index 801e9c03..3861b2dd 100644
--- a/ecomp-sdk/epsdk-music/src/main/java/org/onap/portalapp/music/service/MusicService.java
+++ b/ecomp-sdk/epsdk-music/src/main/java/org/onap/portalapp/music/service/MusicService.java
@@ -112,7 +112,7 @@ public class MusicService {
}
if (isAtomicPut)
- result = MusicCore.atomicPut(musicKeySpace, tableName, sessionId, queryObject, null);
+ result = MusicCore.atomicPutWithDeleteLock(musicKeySpace, tableName, sessionId, queryObject, null);
else
result = MusicCore.eventualPut(queryObject);
logger.debug(EELFLoggerDelegate.debugLogger, "setAttribute: attributeName: " + attributeName
@@ -144,7 +144,7 @@ public class MusicService {
queryObject.addValue(String.valueOf(session.getMaxInactiveInterval()));
queryObject.addValue(session.getId());
if (isAtomicPut)
- result = MusicCore.atomicPut(musicKeySpace, musicMetaTable, session.getId(), queryObject, null);
+ result = MusicCore.atomicPutWithDeleteLock(musicKeySpace, musicMetaTable, session.getId(), queryObject, null);
else
result = MusicCore.eventualPut(queryObject);
logger.debug(EELFLoggerDelegate.debugLogger,
@@ -170,7 +170,7 @@ public class MusicService {
queryObject.appendQueryString(querySB.toString());
queryObject.addValue(sessionId);
if (isAtomicGet)
- result = MusicCore.atomicGet(musicKeySpace, musicMetaTable, sessionId, queryObject);
+ result = MusicCore.atomicGetWithDeleteLock(musicKeySpace, musicMetaTable, sessionId, queryObject);
else
result = MusicCore.get(queryObject);
logger.debug(EELFLoggerDelegate.debugLogger, "getMetaAttribute: with session id: " + sessionId);
@@ -226,7 +226,7 @@ public class MusicService {
queryObject.appendQueryString(querySB.toString());
if (isAtomicGet)
- result = MusicCore.atomicGet(musicKeySpace, tableName, sessionId, queryObject);
+ result = MusicCore.atomicGetWithDeleteLock(musicKeySpace, tableName, sessionId, queryObject);
else
result = MusicCore.get(queryObject);
return MusicUtil.musicRestResponseDataParsing(result, attributeName);
@@ -262,7 +262,7 @@ public class MusicService {
tableName = musicMetaTable;
queryObject.appendQueryString(querySB.toString());
if (isAtomicPut)
- result = MusicCore.atomicPut(musicKeySpace, tableName, sessionId, queryObject, null);
+ result = MusicCore.atomicPutWithDeleteLock(musicKeySpace, tableName, sessionId, queryObject, null);
else
result = MusicCore.eventualPut(queryObject);
logger.debug(EELFLoggerDelegate.debugLogger,
@@ -290,7 +290,7 @@ public class MusicService {
queryObject.appendQueryString(querySB.toString());
queryObject.addValue(sessionId);
if (isAtomic)
- result = MusicCore.atomicPut(musicKeySpace, musicMetaTable, sessionId, queryObject, null);
+ result = MusicCore.atomicPutWithDeleteLock(musicKeySpace, musicMetaTable, sessionId, queryObject, null);
else
result = MusicCore.eventualPut(queryObject);
logger.debug(EELFLoggerDelegate.debugLogger, "removeSession: " + musicMetaTable + " with session id: "
@@ -303,7 +303,7 @@ public class MusicService {
queryObject.appendQueryString(querySB.toString());
queryObject.addValue(sessionId);
if (isAtomic)
- result = MusicCore.atomicPut(musicKeySpace, musicAttrTable, sessionId, queryObject, null);
+ result = MusicCore.atomicPutWithDeleteLock(musicKeySpace, musicAttrTable, sessionId, queryObject, null);
else
result = MusicCore.eventualPut(queryObject);
@@ -570,7 +570,7 @@ public class MusicService {
try{
if (isAtomicGet)
- result = MusicCore.atomicGet(musicKeySpace, musicMetaTable, null, queryObject);
+ result = MusicCore.atomicGetWithDeleteLock(musicKeySpace, musicMetaTable, null, queryObject);
else
result = MusicCore.get(queryObject);
Row row = result.one();
@@ -616,7 +616,7 @@ public class MusicService {
queryObject.appendQueryString(querySB.toString());
try{
if (isAtomicPut)
- result = MusicCore.atomicPut(musicKeySpace, null, null, queryObject, null);
+ result = MusicCore.atomicPutWithDeleteLock(musicKeySpace, null, null, queryObject, null);
else
result = MusicCore.eventualPut(queryObject);
}catch(Exception e){
@@ -634,7 +634,7 @@ public class MusicService {
queryObject.appendQueryString(querySB.toString());
try{
if (isAtomicPut)
- result = MusicCore.atomicPut(musicKeySpace, null, null, queryObject, null);
+ result = MusicCore.atomicPutWithDeleteLock(musicKeySpace, null, null, queryObject, null);
else
result = MusicCore.eventualPut(queryObject);
}catch(Exception e){