Code Review
/
music.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Remove zookeeper reference
[music.git]
/
src
/
main
/
java
/
org
/
onap
/
music
/
main
/
MusicUtil.java
diff --git
a/src/main/java/org/onap/music/main/MusicUtil.java
b/src/main/java/org/onap/music/main/MusicUtil.java
index
dd08968
..
aa82ea9
100755
(executable)
--- a/
src/main/java/org/onap/music/main/MusicUtil.java
+++ b/
src/main/java/org/onap/music/main/MusicUtil.java
@@
-48,7
+48,6
@@
import java.util.concurrent.ConcurrentMap;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.ResponseBuilder;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.ResponseBuilder;
-
import org.onap.music.datastore.MusicDataStoreHandle;
import org.onap.music.datastore.PreparedQueryObject;
import org.onap.music.eelf.logging.EELFLoggerDelegate;
import org.onap.music.datastore.MusicDataStoreHandle;
import org.onap.music.datastore.PreparedQueryObject;
import org.onap.music.eelf.logging.EELFLoggerDelegate;
@@
-59,7
+58,6
@@
import org.onap.music.exceptions.MusicQueryException;
import org.onap.music.exceptions.MusicServiceException;
import org.onap.music.service.MusicCoreService;
import org.onap.music.service.impl.MusicCassaCore;
import org.onap.music.exceptions.MusicServiceException;
import org.onap.music.service.MusicCoreService;
import org.onap.music.service.impl.MusicCassaCore;
-import org.onap.music.service.impl.MusicZKCore;
import com.datastax.driver.core.ConsistencyLevel;
import com.datastax.driver.core.DataType;
import com.datastax.driver.core.ConsistencyLevel;
import com.datastax.driver.core.DataType;
@@
-95,7
+93,6
@@
public class MusicUtil {
public static final String USERID = "userId";
public static final String PASSWORD = "password";
public static final String CASSANDRA = "cassandra";
public static final String USERID = "userId";
public static final String PASSWORD = "password";
public static final String CASSANDRA = "cassandra";
- public static final String ZOOKEEPER = "zookeeper";
public static final String AUTHORIZATION = "Authorization";
public static final String AUTHORIZATION = "Authorization";
@@
-789,8
+786,6
@@
public class MusicUtil {
public static MusicCoreService getMusicCoreService() {
if(getLockUsing().equals(MusicUtil.CASSANDRA))
return MusicCassaCore.getInstance();
public static MusicCoreService getMusicCoreService() {
if(getLockUsing().equals(MusicUtil.CASSANDRA))
return MusicCassaCore.getInstance();
- else if (getLockUsing().equals(MusicUtil.ZOOKEEPER))
- return MusicZKCore.getInstance();
else
return MusicCassaCore.getInstance();
}
else
return MusicCassaCore.getInstance();
}
@@
-815,7
+810,6
@@
public class MusicUtil {
public static void setIsCadi(boolean isCadi) {
public static void setIsCadi(boolean isCadi) {
- // TODO Auto-generated method stub
MusicUtil.isCadi = isCadi;
}
MusicUtil.isCadi = isCadi;
}
@@
-859,5
+853,15
@@
public class MusicUtil {
return MusicUtil.isCadi;
}
return MusicUtil.isCadi;
}
+
+ /**
+ * @return a random uuid
+ */
+ public static String generateUUID() {
+ String uuid = UUID.randomUUID().toString();
+ logger.info(EELFLoggerDelegate.applicationLogger,"New AID generated: "+uuid);
+ return uuid;
+ }
+
}
}