various Updates

Q-api,
triggers,
conductor conditional updates.
Bug fixes

Change-Id: Iec392309787cd90f0a2827a2955399723640e800
Issue-ID: MUSIC-93
Signed-off-by: Thomas Nelson Jr (arthurdent3) tn1381@att.com <tn1381@att.com>

3 files changed, 27 insertions, 31 deletions

diff --git a/src/main/java/org/onap/music/conductor/conditionals/JsonConditional.java b/src/main/java/org/onap/music/conductor/conditionals/JsonConditional.java
index 0e971eb6..33a14bef 100644
--- a/src/main/java/org/onap/music/conductor/conditionals/JsonConditional.java
+++ b/src/main/java/org/onap/music/conductor/conditionals/JsonConditional.java
@@ -86,4 +86,4 @@ public class JsonConditional implements Serializable {
 	
 	
 	
-}
+}
\ No newline at end of file
diff --git a/src/main/java/org/onap/music/conductor/conditionals/MusicContional.java b/src/main/java/org/onap/music/conductor/conditionals/MusicConditional.java
index 492f7c62..0fc9ffe3 100644
--- a/src/main/java/org/onap/music/conductor/conditionals/MusicContional.java
+++ b/src/main/java/org/onap/music/conductor/conditionals/MusicConditional.java
@@ -26,8 +26,6 @@ import java.io.StringWriter;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.ws.rs.core.Response.Status;
-
 import org.codehaus.jettison.json.JSONObject;
 import org.onap.music.datastore.PreparedQueryObject;
 import org.onap.music.eelf.logging.EELFLoggerDelegate;
@@ -39,7 +37,6 @@ import org.onap.music.main.MusicCore;
 import org.onap.music.main.MusicUtil;
 import org.onap.music.main.ResultType;
 import org.onap.music.main.ReturnType;
-import org.onap.music.response.jsonobjects.JsonResponse;
 import org.onap.music.rest.RestMusicDataAPI;
 
 import com.datastax.driver.core.ColumnDefinitions;
@@ -48,7 +45,7 @@ import com.datastax.driver.core.ResultSet;
 import com.datastax.driver.core.Row;
 import com.datastax.driver.core.TableMetadata;
 
-public class MusicContional {
+public class MusicConditional {
 	private static EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(RestMusicDataAPI.class);
 
 	public static ReturnType conditionalInsert(String keyspace, String tablename, String casscadeColumnName,
@@ -79,7 +76,8 @@ public class MusicContional {
 		update.addValue(MusicUtil.convertToActualDataType(primaryIdType, primaryKey));
 		queryBank.put(MusicUtil.UPDATE, update);
 
-		Map<String, String> insertColumnvalues = new HashMap<>();
+
+		Map<String, String> insertColumnvalues = new HashMap<>();//casscade column values
 		insertColumnvalues = getValues(false, casscadeColumnData, status);
 		formatedValues = MusicUtil.convertToActualDataType(casscadeColumnType, insertColumnvalues);
 		PreparedQueryObject insert = extractQuery(valuesMap, tableInfo, tablename, keyspace, primaryId, primaryKey,casscadeColumnName,formatedValues);
@@ -95,7 +93,7 @@ public class MusicContional {
 			if (lockAcqResult.getResult().equals(ResultType.SUCCESS)) {
 				ReturnType criticalPutResult = conditionalInsertAtomic(lockId, keyspace, tablename, primaryKey,
 						queryBank);
-				MusicCore.releaseLock(lockId, true);
+				MusicCore.destroyLockRef(lockId);
 				if (criticalPutResult.getMessage().contains("insert"))
 					criticalPutResult
 							.setMessage("Insert values: ");
@@ -105,11 +103,11 @@ public class MusicContional {
 				return criticalPutResult;
 
 			} else {
-				MusicCore.releaseLock(lockId, true);
+				MusicCore.destroyLockRef(lockId);
 				return lockAcqResult;
 			}
 		} catch (Exception e) {
-			MusicCore.releaseLock(lockId, true);
+			MusicCore.destroyLockRef(lockId);
 			return new ReturnType(ResultType.FAILURE, e.getMessage());
 		}
 
@@ -163,17 +161,15 @@ public class MusicContional {
 		try {
 
 			if (lockAcqResult.getResult().equals(ResultType.SUCCESS)) {
-				ReturnType updateResult= updateAtomic(lockId, keyspace, tableName, primaryKey,primaryKeyValue, queryBank,planId,cascadeColumnValues,cascadeColumnName);
-				MusicCore.releaseLock(lockId, true);
-				return updateResult;
+				return updateAtomic(lockId, keyspace, tableName, primaryKey,primaryKeyValue, queryBank,planId,cascadeColumnValues,cascadeColumnName);
 
 			} else {
-				MusicCore.releaseLock(lockId, true);
+				MusicCore.destroyLockRef(lockId);
 				return lockAcqResult;
 			}
 
 		} catch (Exception e) {
-			MusicCore.releaseLock(lockId, true);
+			MusicCore.destroyLockRef(lockId);
 			return new ReturnType(ResultType.FAILURE, e.getMessage());
 
 		}
@@ -206,7 +202,6 @@ public class MusicContional {
 				}else {
 					return new ReturnType(ResultType.FAILURE,"Cannot find data related to key: "+primaryKey);
 				}
-				
 				MusicCore.getDSHandle().executePut(queryBank.get(MusicUtil.UPSERT), "critical");
 				return new ReturnType(ResultType.SUCCESS, "update success");
 
@@ -248,7 +243,6 @@ public class MusicContional {
 
 	}
 	
-	
 	public static PreparedQueryObject extractQuery(Map<String, Object> valuesMap, TableMetadata tableInfo, String tableName,
 			String keySpaceName,String primaryKeyName,String primaryKey,String casscadeColumn,Object casscadeColumnValues) throws Exception {
 
@@ -356,4 +350,4 @@ public class MusicContional {
 
 	}
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/org/onap/music/conductor/conditionals/RestMusicConditonalAPI.java b/src/main/java/org/onap/music/conductor/conditionals/RestMusicConditionalAPI.java
index c13dd621..eb466754 100644
--- a/src/main/java/org/onap/music/conductor/conditionals/RestMusicConditonalAPI.java
+++ b/src/main/java/org/onap/music/conductor/conditionals/RestMusicConditionalAPI.java
@@ -49,6 +49,8 @@ import org.onap.music.main.ResultType;
 import org.onap.music.main.ReturnType;
 import org.onap.music.response.jsonobjects.JsonResponse;
 import org.onap.music.rest.RestMusicAdminAPI;
+import org.onap.music.conductor.*;
+
 
 import com.datastax.driver.core.DataType;
 import com.datastax.driver.core.TableMetadata;
@@ -58,13 +60,11 @@ import io.swagger.annotations.ApiParam;
 
 @Path("/v2/conditional")
 @Api(value = "Conditional Api", hidden = true)
-public class RestMusicConditonalAPI {
+public class RestMusicConditionalAPI {
 	private static EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(RestMusicAdminAPI.class);
 	private static final String XMINORVERSION = "X-minorVersion";
 	private static final String XPATCHVERSION = "X-patchVersion";
 	private static final String NS = "ns";
-	private static final String USERID = "userId";
-	private static final String PASSWORD = "password";
 	private static final String VERSION = "v2";
 
 	@POST
@@ -77,8 +77,7 @@ public class RestMusicConditonalAPI {
 			@ApiParam(value = "Patch Version", required = false) @HeaderParam(XPATCHVERSION) String patchVersion,
 			@ApiParam(value = "AID", required = true) @HeaderParam("aid") String aid,
 			@ApiParam(value = "Application namespace", required = true) @HeaderParam(NS) String ns,
-			@ApiParam(value = "userId", required = true) @HeaderParam(USERID) String userId,
-			@ApiParam(value = "Password", required = true) @HeaderParam(PASSWORD) String password,
+			@ApiParam(value = "Authorization", required = true) @HeaderParam("Authorization") String authorization,
 			@ApiParam(value = "Major Version", required = true) @PathParam("keyspace") String keyspace,
 			@ApiParam(value = "Major Version", required = true) @PathParam("tablename") String tablename,
 			JsonConditional jsonObj) throws Exception {
@@ -98,6 +97,9 @@ public class RestMusicConditonalAPI {
 					.setError(String.valueOf("One or more input values missing")).toMap()).build();
 
 		}
+		Map<String,String> userCredentials = MusicUtil.extractBasicAuthentication(authorization);
+		String userId = userCredentials.get(MusicUtil.USERID);
+		String password = userCredentials.get(MusicUtil.PASSWORD);
 
 		Map<String, Object> authMap = null;
 		try {
@@ -128,7 +130,7 @@ public class RestMusicConditonalAPI {
 		status.put("nonexists", conditions.get("nonexists").get("status").toString());
 		ReturnType out = null;
 
-		out = MusicContional.conditionalInsert(keyspace, tablename, casscadeColumnName, casscadeColumnData,
+		out = MusicConditional.conditionalInsert(keyspace, tablename, casscadeColumnName, casscadeColumnData,
 				primaryKeyValue, valuesMap, status);
 		return response.status(Status.OK).entity(new JsonResponse(out.getResult()).setMessage(out.getMessage()).toMap())
 				.build();
@@ -146,8 +148,7 @@ public class RestMusicConditonalAPI {
 			@ApiParam(value = "Patch Version", required = false) @HeaderParam(XPATCHVERSION) String patchVersion,
 			@ApiParam(value = "AID", required = true) @HeaderParam("aid") String aid,
 			@ApiParam(value = "Application namespace", required = true) @HeaderParam(NS) String ns,
-			@ApiParam(value = "userId", required = true) @HeaderParam(USERID) String userId,
-			@ApiParam(value = "Password", required = true) @HeaderParam(PASSWORD) String password,
+			@ApiParam(value = "Authorization", required = true) @HeaderParam("Authorization") String authorization,
 			@ApiParam(value = "Major Version", required = true) @PathParam("keyspace") String keyspace,
 			@ApiParam(value = "Major Version", required = true) @PathParam("tablename") String tablename,
 			JsonConditional upObj) throws Exception {
@@ -167,6 +168,9 @@ public class RestMusicConditonalAPI {
 					.setError(String.valueOf("One or more input values missing")).toMap()).build();
 
 		}
+		Map<String,String> userCredentials = MusicUtil.extractBasicAuthentication(authorization);
+		String userId = userCredentials.get(MusicUtil.USERID);
+		String password = userCredentials.get(MusicUtil.PASSWORD);
 
 		Map<String, Object> authMap = null;
 		try {
@@ -194,17 +198,15 @@ public class RestMusicConditonalAPI {
 		DataType primaryIdType = tableInfo.getPrimaryKey().get(0).getType();
 		String primaryId = tableInfo.getPrimaryKey().get(0).getName();
 		
-		PreparedQueryObject upsert = MusicContional.extractQuery(tableValues, tableInfo, tablename, keyspace, primaryKey, primaryKeyValue, null, null);
-		
 		PreparedQueryObject select = new PreparedQueryObject();
 		select.appendQueryString("SELECT * FROM " + keyspace + "." + tablename + " where " + primaryId + " = ?");
 		select.addValue(MusicUtil.convertToActualDataType(primaryIdType, primaryKeyValue));
 		
+		PreparedQueryObject upsert = MusicConditional.extractQuery(tableValues, tableInfo, tablename, keyspace, primaryKey, primaryKeyValue, null, null);
 		Map<String,PreparedQueryObject> queryBank = new HashMap<>();
-		//queryBank.put(MusicUtil.UPDATE, update);
-		queryBank.put(MusicUtil.UPSERT, upsert);
 		queryBank.put(MusicUtil.SELECT, select);
-		ReturnType result = MusicContional.update(queryBank, keyspace, tablename, primaryKey,primaryKeyValue,planId,casscadeColumnName,casscadeColumnValueMap);
+		queryBank.put(MusicUtil.UPSERT, upsert);
+		ReturnType result = MusicConditional.update(queryBank, keyspace, tablename, primaryKey,primaryKeyValue,planId,casscadeColumnName,casscadeColumnValueMap);
 		if (result.getResult() == ResultType.SUCCESS) {
 			return response.status(Status.OK)
 					.entity(new JsonResponse(result.getResult()).setMessage(result.getMessage()).toMap()).build();
@@ -215,4 +217,4 @@ public class RestMusicConditonalAPI {
 
 	}
 
-}
+}
\ No newline at end of file