Docker Updates for CSIT

Udates fro Docker and also a few bug fixes.

Change-Id: I48d8ee81412c7ce664e6b3e33c06e952afad734e
Issue-ID: MUSIC-32, MUSIC-51
Signed-off-by: Thomas Nelson Jr (arthurdent3) tn1381@att.com <tn1381@att.com>

6 files changed, 36 insertions, 18 deletions

diff --git a/src/main/java/org/onap/music/main/CachingUtil.java b/src/main/java/org/onap/music/main/CachingUtil.java
index 40dffa2d..aee3abbf 100755
--- a/src/main/java/org/onap/music/main/CachingUtil.java
+++ b/src/main/java/org/onap/music/main/CachingUtil.java
@@ -392,11 +392,9 @@ public class CachingUtil implements Runnable {
         }
         PreparedQueryObject queryObject = new PreparedQueryObject();
         queryObject.appendQueryString(
-                        "select * from admin.keyspace_master where application_name = ? and username = ? and password = ? allow filtering");
+                        "select * from admin.keyspace_master where application_name = ? allow filtering");
         try {
         	queryObject.addValue(MusicUtil.convertToActualDataType(DataType.text(), ns));
-        	queryObject.addValue(MusicUtil.convertToActualDataType(DataType.text(), userId));
-        	queryObject.addValue(MusicUtil.convertToActualDataType(DataType.text(), password));
         } catch(Exception e) {
         	resultMap.put("Exception",
                     "Unable to process input data. Invalid input data type. Please check ns, userId and password values. "+e.getMessage());
@@ -412,16 +410,20 @@ public class CachingUtil implements Runnable {
 			return resultMap;
 		}
         if (rs == null) {
-        	logger.error(EELFLoggerDelegate.errorLogger,"", AppMessages.AUTHENTICATIONERROR, ErrorSeverity.WARN, ErrorTypes.AUTHENTICATIONERROR);
-            logger.error(EELFLoggerDelegate.errorLogger,"Namespace, UserId and password doesn't match. namespace: "+ns+" and userId: "+userId);
-
-            resultMap.put("Exception", "Namespace, UserId and password doesn't match. namespace: "+ns+" and userId: "+userId);
+            logger.error(EELFLoggerDelegate.errorLogger,"Application is not onboarded. Please contact admin.");
+            resultMap.put("Exception", "Application is not onboarded. Please contact admin.");
         } else {
+            if(!(rs.getString("username").equals(userId)) && !(rs.getString("password").equals("password"))) {
+                logger.error(EELFLoggerDelegate.errorLogger,"", AppMessages.AUTHENTICATIONERROR, ErrorSeverity.WARN, ErrorTypes.AUTHENTICATIONERROR);
+                logger.error(EELFLoggerDelegate.errorLogger,"Namespace, UserId and password doesn't match. namespace: "+ns+" and userId: "+userId);
+                resultMap.put("Exception", "Namespace, UserId and password doesn't match. namespace: "+ns+" and userId: "+userId);
+                return resultMap;
+            }
             boolean is_aaf = rs.getBool("is_aaf");
             String keyspace = rs.getString("keyspace_name");
             if (!is_aaf) {
                 if (!keyspace.equals(MusicUtil.DEFAULTKEYSPACENAME)) {
-                	logger.error(EELFLoggerDelegate.errorLogger,"", AppMessages.MISSINGINFO ,ErrorSeverity.WARN, ErrorTypes.DATAERROR);
+                    logger.error(EELFLoggerDelegate.errorLogger,"", AppMessages.MISSINGINFO ,ErrorSeverity.WARN, ErrorTypes.DATAERROR);
                     logger.error(EELFLoggerDelegate.errorLogger,"Non AAF applications are allowed to have only one keyspace per application.");
                     resultMap.put("Exception",
                                     "Non AAF applications are allowed to have only one keyspace per application.");
diff --git a/src/main/java/org/onap/music/main/MusicCore.java b/src/main/java/org/onap/music/main/MusicCore.java
index fdf43a45..73a6ee55 100644
--- a/src/main/java/org/onap/music/main/MusicCore.java
+++ b/src/main/java/org/onap/music/main/MusicCore.java
@@ -119,7 +119,12 @@ public class MusicCore {
         logger.info(EELFLoggerDelegate.applicationLogger,"Acquiring data store handle");
         long start = System.currentTimeMillis();
         if (mDstoreHandle == null) {
-            mDstoreHandle = new MusicDataStore();
+            // Quick Fix - Best to put this into every call to getDSHandle?
+            if (! MusicUtil.getMyCassaHost().equals("localhost") ) {
+                mDstoreHandle = new MusicDataStore(MusicUtil.getMyCassaHost());
+            } else {
+                mDstoreHandle = new MusicDataStore();
+            }
         }
         if(mDstoreHandle.getSession() == null) {
         	String message = "Connection to Cassandra has not been enstablished."
diff --git a/src/main/java/org/onap/music/main/MusicUtil.java b/src/main/java/org/onap/music/main/MusicUtil.java
index 5bc9f94f..0f77614e 100755
--- a/src/main/java/org/onap/music/main/MusicUtil.java
+++ b/src/main/java/org/onap/music/main/MusicUtil.java
@@ -394,7 +394,7 @@ public class MusicUtil {
         MusicUtil.cassPwd = cassPwd;
     }
 
-    public static String convertToCQLDataType(DataType type, Object valueObj) {
+    public static String convertToCQLDataType(DataType type, Object valueObj) throws Exception {
 
         String value = "";
         switch (type.getName()) {
@@ -459,7 +459,7 @@ public class MusicUtil {
      * @return
      */
 
-    public static String jsonMaptoSqlString(Map<String, Object> jMap, String lineDelimiter) {
+    public static String jsonMaptoSqlString(Map<String, Object> jMap, String lineDelimiter) throws Exception{
         StringBuilder sqlString = new StringBuilder();
         int counter = 0;
         for (Map.Entry<String, Object> entry : jMap.entrySet()) {
diff --git a/src/main/java/org/onap/music/rest/RestMusicAdminAPI.java b/src/main/java/org/onap/music/rest/RestMusicAdminAPI.java
index 849c3a98..cbe9ec9c 100755
--- a/src/main/java/org/onap/music/rest/RestMusicAdminAPI.java
+++ b/src/main/java/org/onap/music/rest/RestMusicAdminAPI.java
@@ -167,8 +167,14 @@ public class RestMusicAdminAPI {
             Row row = (Row) it.next();
             resultMap.put( row.getUUID("uuid").toString(),row.getString("keyspace_name"));
         }
-        if (resultMap.isEmpty())
-            resultMap.put("ERROR", "Application is not onboarded. Please contact admin.");
+        if (resultMap.isEmpty()) {
+            if(uuid != null)
+                resultMap.put("Exception", "Please make sure Aid is correct and application is onboarded.");
+            else {
+                resultMap.put("Exception",
+                               "Application is not onboarded. Please make sure all the information is correct.");
+            }
+        }
         return resultMap;
     }
 
@@ -212,7 +218,7 @@ public class RestMusicAdminAPI {
     	            resultMap.put("Success", "Your application has been deleted successfully");
     	        } else {
     	            resultMap.put("Exception",
-    	                            "Oops. Spomething went wrong. Please make sure Aid is correct or Application is onboarded");
+    	                            "Oops. Something went wrong. Please make sure Aid is correct or Application is onboarded");
     	        }
                 return resultMap;    
         }
@@ -329,7 +335,7 @@ public class RestMusicAdminAPI {
 	            resultMap.put("Success", "Your application has been updated successfully");
 	        } else {
 	            resultMap.put("Exception",
-	                            "Oops. Spomething went wrong. Please make sure Aid is correct and application is onboarded");
+	                            "Oops. Something went wrong. Please make sure Aid is correct and application is onboarded");
 	        }
 	        
         return resultMap;
diff --git a/src/main/java/org/onap/music/rest/RestMusicDataAPI.java b/src/main/java/org/onap/music/rest/RestMusicDataAPI.java
index ed586d06..e7af8f9f 100755
--- a/src/main/java/org/onap/music/rest/RestMusicDataAPI.java
+++ b/src/main/java/org/onap/music/rest/RestMusicDataAPI.java
@@ -181,7 +181,12 @@ public class RestMusicDataAPI {
         boolean result = false;
         long start = System.currentTimeMillis();
         Map<String, Object> replicationInfo = kspObject.getReplicationInfo();
-        String repString = "{" + MusicUtil.jsonMaptoSqlString(replicationInfo, ",") + "}";
+        String repString = null;
+        try {
+            repString = "{" + MusicUtil.jsonMaptoSqlString(replicationInfo, ",") + "}";
+        } catch (Exception e) {
+            logger.error(EELFLoggerDelegate.errorLogger, e.getMessage());
+        }
         queryObject.appendQueryString(
                         "CREATE KEYSPACE " + keyspaceName + " WITH replication = " + repString);
         if (kspObject.getDurabilityOfWrites() != null) {
diff --git a/src/test/java/org/onap/music/unittests/MusicUtilTest.java b/src/test/java/org/onap/music/unittests/MusicUtilTest.java
index f8cab32a..47edc1e3 100644
--- a/src/test/java/org/onap/music/unittests/MusicUtilTest.java
+++ b/src/test/java/org/onap/music/unittests/MusicUtilTest.java
@@ -169,7 +169,7 @@ public class MusicUtilTest {
     }
 
     @Test
-    public void testConvertToCQLDataType() {
+    public void testConvertToCQLDataType() throws Exception {
         Map<String,Object> myMap = new HashMap<String,Object>();
         myMap.put("name","tom");
         assertEquals(MusicUtil.convertToCQLDataType(DataType.varchar(),"Happy People"),"'Happy People'");
@@ -195,7 +195,7 @@ public class MusicUtilTest {
     }
 
     @Test
-    public void testJsonMaptoSqlString() {
+    public void testJsonMaptoSqlString() throws Exception {
         Map<String,Object> myMap = new HashMap<>();
         myMap.put("name","tom");
         myMap.put("value",5);