Changes Listed below:

- Added build version API
- Updated Keyspace active to use Properties setting
- Update Libraries Netty,jbcrypt,Jackson Databind and log4j
- Removed some irrelivant files
- Updated some usint tests to ignore some tests(This will be updated soon)
- Bugfixes
  - Missing Values, inform user.
  - Respond with proper error
  - Fix Locking Contention issue.
  - Add locking retry for atomic calls.

Change-Id: Ie218dd92edb0c20e4a0efe33eeaaec84e5293c44
Issue-ID: MUSIC-393
Signed-off-by: Nelson, Thomas (arthurdent3) <nelson24@att.com>

3 files changed, 141 insertions, 47 deletions

diff --git a/src/main/java/org/onap/music/main/MusicCore.java b/src/main/java/org/onap/music/main/MusicCore.java
index 221e680b..df718379 100644
--- a/src/main/java/org/onap/music/main/MusicCore.java
+++ b/src/main/java/org/onap/music/main/MusicCore.java
@@ -66,7 +66,7 @@ public class MusicCore {
         return musicCore.acquireLockWithLease(key, lockId, leasePeriod);
     }
     
-    public static String createLockReference(String fullyQualifiedKey) {
+    public static String createLockReference(String fullyQualifiedKey) throws MusicLockingException {
         return musicCore.createLockReference(fullyQualifiedKey);
     }
     
@@ -83,7 +83,7 @@ public class MusicCore {
         return musicCore.whoseTurnIsIt(fullyQualifiedKey);
     }
     
-    public static void destroyLockRef(String lockId) {
+    public static void destroyLockRef(String lockId) throws MusicLockingException {
         musicCore.destroyLockRef(lockId);
     }
     
@@ -154,9 +154,9 @@ public class MusicCore {
         return musicCore.validateLock(lockName);
     }
 
-    public static MusicLockState releaseLock(String lockId, boolean voluntaryRelease) {
+    public static MusicLockState releaseLock(String lockId, boolean voluntaryRelease) throws MusicLockingException {
         return musicCore.releaseLock(lockId, voluntaryRelease);
     }
     
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/onap/music/main/MusicUtil.java b/src/main/java/org/onap/music/main/MusicUtil.java
index 07612aa0..da5da239 100755
--- a/src/main/java/org/onap/music/main/MusicUtil.java
+++ b/src/main/java/org/onap/music/main/MusicUtil.java
@@ -112,19 +112,25 @@ public class MusicUtil {
     private static int cacheObjectMaxLife = -1;
     private static String lockUsing = MusicUtil.CASSANDRA;
     private static boolean isCadi = false;
+    private static boolean isKeyspaceActive = false;
     
     private static boolean debug = true;
-    private static String version = "2.3.0";
+    private static String version = "0.0.0";
+    private static String build = "";
     private static String musicRestIp = LOCALHOST;
     private static String musicPropertiesFilePath = PROPERTIES_FILE;
     private static long defaultLockLeasePeriod = 6000;
+    private static int retryCount = 3;
     private static final String[] propKeys = new String[] { "cassandra.host", "music.ip", "debug",
-            "version", "music.rest.ip", "music.properties", "lock.lease.period", "id", "all.ids", "public.ip",
-            "all.pubic.ips", "cassandra.user", "cassandra.password", "aaf.endpoint.url","admin.username","admin.password","aaf.admin.url",
-            "music.namespace","admin.aaf.role","cassandra.port","lock.using"};
+        "version", "music.rest.ip", "music.properties", "lock.lease.period", "id", "all.ids", 
+        "public.ip","all.pubic.ips", "cassandra.user", "cassandra.password", "aaf.endpoint.url",
+        "admin.username","admin.password","aaf.admin.url","music.namespace","admin.aaf.role",
+        "cassandra.port","lock.using","retry.count"};
     private static final String[] cosistencyLevel = new String[] {
-            "ALL","EACH_QUORUM","QUORUM","LOCAL_QUORUM","ONE","TWO","THREE","LOCAL_ONE","ANY","SERIAL","LOCAL_SERIAL"};
+        "ALL","EACH_QUORUM","QUORUM","LOCAL_QUORUM","ONE","TWO",
+        "THREE","LOCAL_ONE","ANY","SERIAL","LOCAL_SERIAL"};
     private static final Map<String,ConsistencyLevel> consistencyName = new HashMap<>();
+
     static {
         consistencyName.put("ONE",ConsistencyLevel.ONE);
         consistencyName.put("TWO",ConsistencyLevel.TWO);
@@ -145,8 +151,8 @@ public class MusicUtil {
     private static String adminId = "username";
     private static String adminPass= "password";
     private static String aafAdminUrl= null;
-    private static String musicNamespace= "com.att.music.api";
-    private static String adminAafRole= "com.att.music.api.admin_api";
+    private static String musicNamespace= "org.onap.music.api";
+    private static String adminAafRole= "org.onap.music.api.admin_api";
     
     public static final long MusicEternityEpochMillis = 1533081600000L; // Wednesday, August 1, 2018 12:00:00 AM
 
@@ -213,7 +219,6 @@ public class MusicUtil {
         MusicUtil.adminPass = adminPass;
     }
 
-
     private MusicUtil() {
         throw new IllegalStateException("Utility Class");
     }
@@ -419,7 +424,7 @@ public class MusicUtil {
     }
 
     /**
-     * Return the version property file value - version
+     * Return the version property file value - version.
      *
      * @return
      */
@@ -428,6 +433,23 @@ public class MusicUtil {
     }
 
     /**
+     * Set the build of project which is a combination of the 
+     * version and the date.
+     * 
+     * @param build - version-date.
+     */
+    public static void setBuild(String build) {
+        MusicUtil.build = build;
+    }
+
+    /**
+     * Return the build version-date.
+     */
+    public static String getBuild() {
+        return build;
+    }
+
+    /**
      * Get MyCassHost - Cassandra Hostname - Default = localhost property file
      * value - cassandra.host
      *
@@ -440,7 +462,7 @@ public class MusicUtil {
     /**
      * Set MyCassHost - Cassandra Hostname
      *
-     * @param myCassaHost
+     * @param myCassaHost .
      */
     public static void setMyCassaHost(String myCassaHost) {
         MusicUtil.myCassaHost = myCassaHost;
@@ -458,24 +480,56 @@ public class MusicUtil {
     /**
      * Set DefaultMusicIp
      *
-     * @param defaultMusicIp
+     * @param defaultMusicIp .
      */
     public static void setDefaultMusicIp(String defaultMusicIp) {
         MusicUtil.defaultMusicIp = defaultMusicIp;
     }
-
+    
     /**
-     *
+     * Gey default retry count
      * @return
      */
+    public static int getRetryCount() {
+        return retryCount;
+    }
+
+    /**
+     * Set retry count
+     * @param retryCount .
+     */
+    public static void setRetryCount(int retryCount) {
+        MusicUtil.retryCount = retryCount;
+    }
+
+
+    /**
+     * This is used to turn keyspace creation api on/off.
+     * 
+     */
+    public static void setKeyspaceActive(Boolean keyspaceActive) {
+        MusicUtil.isKeyspaceActive = keyspaceActive;
+    }
+
+    /**
+     * This is used to turn keyspace creation api on/off.
+     * @return boolean isKeyspaceActive
+     */
+    public static boolean isKeyspaceActive() {
+        return isKeyspaceActive;
+    }
+
+    /**
+     * .
+     * @return String
+     */
     public static String getTestType() {
         String testType = "";
         try {
             Scanner fileScanner = new Scanner(new File(""));
             testType = fileScanner.next();// ignore the my id line
             @SuppressWarnings("unused")
-            String batchSize = fileScanner.next();// ignore the my public ip
-                                                    // line
+            String batchSize = fileScanner.next();// ignore the my public ip line
             fileScanner.close();
         } catch (FileNotFoundException e) {
             logger.error(EELFLoggerDelegate.errorLogger, e.getMessage(), e);
@@ -592,8 +646,8 @@ public class MusicUtil {
     }
 
     public static ByteBuffer convertToActualDataType(DataType colType, byte[] valueObj) {
-         ByteBuffer buffer = ByteBuffer.wrap(valueObj);
-         return buffer;
+        ByteBuffer buffer = ByteBuffer.wrap(valueObj);
+        return buffer;
     }
 
     /**
diff --git a/src/main/java/org/onap/music/main/PropertiesLoader.java b/src/main/java/org/onap/music/main/PropertiesLoader.java
index db04ff4b..af4e14e3 100644
--- a/src/main/java/org/onap/music/main/PropertiesLoader.java
+++ b/src/main/java/org/onap/music/main/PropertiesLoader.java
@@ -48,6 +48,9 @@ public class PropertiesLoader implements InitializingBean {
     
     @Value("${version}")
     public String version;
+
+    @Value("${build}")
+    public String build;
     
     @Value("${music.rest.ip}")
     public String musicRestIp;
@@ -106,6 +109,12 @@ public class PropertiesLoader implements InitializingBean {
     @Value("${cadi}")
     public String isCadi;
     
+    @Value("${keyspace.active}")
+    public String isKeyspaceActive;
+
+    @Value("${retry.count}")
+    public String rertryCount;
+    
     private static EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(PropertiesLoader.class);
     
     @Bean
@@ -117,23 +126,30 @@ public class PropertiesLoader implements InitializingBean {
         return pspc;
     }
     
-    public void loadProperties () {
-        if(aafAdminUrl != null && !aafAdminUrl.equals("${aaf.admin.url}"))
+    /**
+     * .
+     */
+    public void loadProperties() {
+        if (aafAdminUrl != null && !aafAdminUrl.equals("${aaf.admin.url}")) {
             MusicUtil.setAafAdminUrl(aafAdminUrl);
-        if(aafEndpointUrl != null && !aafEndpointUrl.equals("${aaf.endpoint.url}"))
+        }
+        if (aafEndpointUrl != null && !aafEndpointUrl.equals("${aaf.endpoint.url}")) {
             MusicUtil.setAafEndpointUrl(aafEndpointUrl);
-        if(adminAafRole != null && !adminAafRole.equals("${admin.aaf.role}"))
+        }
+        if (adminAafRole != null && !adminAafRole.equals("${admin.aaf.role}")) {
             MusicUtil.setAdminAafRole(adminAafRole);
-        //MusicUtil.setAdminId(adminId);
-        if(adminPassword != null && !adminPassword.equals("${admin.password}"))
+        }
+        if (adminPassword != null && !adminPassword.equals("${admin.password}")) {
             MusicUtil.setAdminPass(adminPassword);
-        if(adminUsername != null && !adminUsername.equals("${admin.username}"))
+        }
+        if (adminUsername != null && !adminUsername.equals("${admin.username}")) {
             MusicUtil.setAdminId(adminUsername);
-        if(allIds != null && !allIds.equals("${all.ids}")) {
+        }
+        if (allIds != null && !allIds.equals("${all.ids}")) {
             String[] ids = allIds.split(":");
             MusicUtil.setAllIds(new ArrayList<String>(Arrays.asList(ids)));
         }
-        if(allPublicIps != null && !allPublicIps.equals("${all.public.ips}")) {
+        if (allPublicIps != null && !allPublicIps.equals("${all.public.ips}")) {
             String[] ips = allPublicIps.split(":");
             if (ips.length == 1) {
                 // Future use
@@ -142,39 +158,63 @@ public class PropertiesLoader implements InitializingBean {
                                 new ArrayList<String>(Arrays.asList(ips)));
             }
         }
-        if(cassandraPort != null && !cassandraPort.equals("${cassandra.port}"))
+        if (cassandraPort != null && !cassandraPort.equals("${cassandra.port}")) {
             MusicUtil.setCassandraPort(Integer.parseInt(cassandraPort));
-        if(cassandraUser != null && !cassandraUser.equals("${cassandra.user}"))
+        }
+        if (cassandraUser != null && !cassandraUser.equals("${cassandra.user}")) {
             MusicUtil.setCassName(cassandraUser);
-        if(cassandraPassword != null && !cassandraPassword.equals("${cassandra.password}"))
+        }
+        if (cassandraPassword != null && !cassandraPassword.equals("${cassandra.password}")) {
             MusicUtil.setCassPwd(cassandraPassword);
-        if(debug != null && !debug.equals("${debug}"))
+        }
+        if (debug != null && !debug.equals("${debug}")) {
             MusicUtil.setDebug(Boolean.parseBoolean(debug));
-        if(lockLeasePeriod != null && !lockLeasePeriod.equals("${lock.lease.period}"))
+        }
+        if (lockLeasePeriod != null && !lockLeasePeriod.equals("${lock.lease.period}")) {
             MusicUtil.setDefaultLockLeasePeriod(Long.parseLong(lockLeasePeriod));
-        if(musicIp != null && !musicIp.equals("${music.ip}"))
+        }
+        if (musicIp != null && !musicIp.equals("${music.ip}")) {
             MusicUtil.setDefaultMusicIp(musicIp);
-        if(musicNamespace != null && !musicNamespace.equals("${music.namespace}"))
+        }
+        if (musicNamespace != null && !musicNamespace.equals("${music.namespace}")) {
             MusicUtil.setMusicNamespace(musicNamespace);
-        if(musicProperties != null && !musicProperties.equals("${music.properties}"))
+        }
+        if (musicProperties != null && !musicProperties.equals("${music.properties}")) {
             MusicUtil.setMusicPropertiesFilePath(musicProperties);
-        if(musicRestIp != null && !musicRestIp.equals("${music.rest.ip}"))
+        }
+        if (musicRestIp != null && !musicRestIp.equals("${music.rest.ip}")) {
             MusicUtil.setMusicRestIp(musicRestIp);
-        if(cassandraHost != null && !cassandraHost.equals("${cassandra.host}")) 
+        }
+        if (cassandraHost != null && !cassandraHost.equals("${cassandra.host}")) {
             MusicUtil.setMyCassaHost(cassandraHost);
-        logger.info("#### Cassandra Host: " + MusicUtil.getMyCassaHost());
-        if(myId != null && !myId.equals("${my.id}")) 
+        }
+        if (myId != null && !myId.equals("${my.id}")) {
             MusicUtil.setMyId(Integer.parseInt(myId));
-        if(notifyInterval != null && !notifyInterval.equals("${notify.interval}")) 
+        }
+        if (notifyInterval != null && !notifyInterval.equals("${notify.interval}")) {
             MusicUtil.setNotifyInterval(Integer.parseInt(notifyInterval));
-        if(notifyTimeout != null && !notifyTimeout.equals("${notify.timeout}"))
+        }
+        if (notifyTimeout != null && !notifyTimeout.equals("${notify.timeout}")) {
             MusicUtil.setNotifyTimeOut(Integer.parseInt(notifyTimeout));
-        if(allPublicIps != null && !allPublicIps.equals("${public.ip}"))
+        }
+        if (allPublicIps != null && !allPublicIps.equals("${public.ip}")) {
             MusicUtil.setPublicIp(allPublicIps);
-        if(version != null && !version.equals("${version}"))
+        }
+        if (version != null && !version.equals("${version}")) {
             MusicUtil.setVersion(version);
-        if(isCadi != null && !isCadi.equals("${cadi}"))
+        }
+        if (build != null && !version.equals("${build}")) {
+            MusicUtil.setBuild(build);
+        }
+        if (isCadi != null && !isCadi.equals("${cadi}")) {
             MusicUtil.setIsCadi(Boolean.parseBoolean(isCadi));
+        }
+        if (rertryCount != null && !rertryCount.equals("${retry.count}")) {
+            MusicUtil.setRetryCount(Integer.parseInt(rertryCount));
+        }
+        if (isKeyspaceActive != null && !isKeyspaceActive.equals("${keyspace.active}")) {
+            MusicUtil.setKeyspaceActive(Boolean.parseBoolean(isKeyspaceActive));
+        }
     }