From: Bharath Balasubramanian Date: Fri, 1 Feb 2019 19:53:34 +0000 (+0000) Subject: Merge "Update Jar." X-Git-Tag: 2.5.8~40 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=2357dbf628ddf889b7a1640ccb11a424f6a7dacd;hp=c752be120a8f8708471246497e0619a7d468debe;p=music.git Merge "Update Jar." --- diff --git a/src/main/java/org/onap/music/authentication/MusicAuthentication.java b/src/main/java/org/onap/music/authentication/MusicAuthentication.java index 0471e309..1d845b3c 100644 --- a/src/main/java/org/onap/music/authentication/MusicAuthentication.java +++ b/src/main/java/org/onap/music/authentication/MusicAuthentication.java @@ -37,7 +37,6 @@ import org.onap.music.exceptions.MusicServiceException; import org.onap.music.main.CachingUtil; import org.onap.music.main.MusicCore; import org.onap.music.main.MusicUtil; -import org.onap.music.service.impl.MusicZKCore; import com.datastax.driver.core.DataType; import com.datastax.driver.core.Row; @@ -76,6 +75,7 @@ public class MusicAuthentication { try { isAAFApp= CachingUtil.isAAFApplication(nameSpace); } catch(MusicServiceException e) { + logger.error(e.getErrorMessage(), e); resultMap.put("Exception", e.getMessage()); return resultMap; } @@ -84,7 +84,7 @@ public class MusicAuthentication { + " is correct and Application is onboarded."); return resultMap; } - boolean isAAF = Boolean.valueOf(isAAFApp); + boolean isAAF = Boolean.parseBoolean(isAAFApp); if (userId == null || password == null) { logger.error(EELFLoggerDelegate.errorLogger,"", AppMessages.MISSINGINFO ,ErrorSeverity.WARN, ErrorTypes.AUTHENTICATIONERROR); logger.error(EELFLoggerDelegate.errorLogger,"One or more required headers is missing. userId: " + userId @@ -141,7 +141,7 @@ public class MusicAuthentication { uuid = rs.getUUID("uuid").toString(); resultMap.put("uuid", "existing"); } catch (Exception e) { - logger.info(EELFLoggerDelegate.applicationLogger,"No UUID found in DB. So creating new UUID."); + logger.error(EELFLoggerDelegate.applicationLogger,"No UUID found in DB. So creating new UUID."); uuid = CachingUtil.generateUUID(); resultMap.put("uuid", "new"); } @@ -154,8 +154,6 @@ public class MusicAuthentication { public static boolean authenticateAdmin(String id,String password) { - String a = MusicUtil.getAdminId(); - String b = MusicUtil.getAdminPass(); return (id.equals(MusicUtil.getAdminId()) && password.equals(MusicUtil.getAdminPass())); } diff --git a/src/main/java/org/onap/music/conductor/conditionals/MusicConditional.java b/src/main/java/org/onap/music/conductor/conditionals/MusicConditional.java index 58409b71..ff77bfde 100644 --- a/src/main/java/org/onap/music/conductor/conditionals/MusicConditional.java +++ b/src/main/java/org/onap/music/conductor/conditionals/MusicConditional.java @@ -3,6 +3,7 @@ * org.onap.music * =================================================================== * Copyright (c) 2017 AT&T Intellectual Property + * Modifications Copyright (C) 2019 IBM. * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,13 +38,11 @@ import org.onap.music.eelf.logging.format.ErrorTypes; import org.onap.music.exceptions.MusicLockingException; import org.onap.music.exceptions.MusicQueryException; import org.onap.music.exceptions.MusicServiceException; -import org.onap.music.lockingservice.cassandra.MusicLockState; 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.rest.RestMusicDataAPI; -import org.onap.music.service.impl.MusicZKCore; import com.datastax.driver.core.ColumnDefinitions; import com.datastax.driver.core.DataType; @@ -72,8 +71,8 @@ public class MusicConditional { queryBank.put(MusicUtil.SELECT, select); PreparedQueryObject update = new PreparedQueryObject(); - Map updateColumnvalues = new HashMap<>(); //casscade column values - updateColumnvalues = getValues(true, casscadeColumnData, status); + //casscade column values + Map updateColumnvalues = getValues(true, casscadeColumnData, status); Object formatedValues = MusicUtil.convertToActualDataType(casscadeColumnType, updateColumnvalues); update.appendQueryString("UPDATE " + keyspace + "." + tablename + " SET " + casscadeColumnName + " =" + casscadeColumnName + " + ? , vector_ts = ?" + " WHERE " + primaryId + " = ? "); @@ -83,8 +82,8 @@ public class MusicConditional { queryBank.put(MusicUtil.UPDATE, update); - Map insertColumnvalues = new HashMap<>();//casscade column values - insertColumnvalues = getValues(false, casscadeColumnData, status); + //casscade column values + Map insertColumnvalues = getValues(false, casscadeColumnData, status); formatedValues = MusicUtil.convertToActualDataType(casscadeColumnType, insertColumnvalues); PreparedQueryObject insert = extractQuery(valuesMap, tableInfo, tablename, keyspace, primaryId, primaryKey,casscadeColumnName,formatedValues); queryBank.put(MusicUtil.INSERT, insert); @@ -127,8 +126,6 @@ public class MusicConditional { try { String fullyQualifiedKey = keyspace + "." + tableName + "." + primaryKey; ReturnType lockAcqResult = MusicCore.acquireLock(fullyQualifiedKey, lockId); - //MusicLockState mls = MusicZKCore.getLockingServiceHandle() - //.getLockState(keyspace + "." + tableName + "." + primaryKey); if (lockAcqResult.getResult().equals(ResultType.SUCCESS)) { try { results = MusicDataStoreHandle.getDSHandle().executeQuorumConsistencyGet(queryBank.get(MusicUtil.SELECT)); @@ -188,8 +185,7 @@ public class MusicConditional { try { String fullyQualifiedKey = keyspace + "." + tableName + "." + primaryKeyValue; ReturnType lockAcqResult = MusicCore.acquireLock(fullyQualifiedKey, lockId); - //MusicLockState mls = MusicZKCore.getLockingServiceHandle() - //.getLockState(keyspace + "." + tableName + "." + primaryKeyValue); + if (lockAcqResult.getResult().equals(ResultType.SUCCESS)) { Row row = MusicDataStoreHandle.getDSHandle().executeQuorumConsistencyGet(queryBank.get(MusicUtil.SELECT)).one(); @@ -234,11 +230,10 @@ public class MusicConditional { public static Map getValues(boolean isExists, Map casscadeColumnData, Map status) { - Map value = new HashMap<>(); Map returnMap = new HashMap<>(); Object key = casscadeColumnData.get("key"); String setStatus = ""; - value = (Map) casscadeColumnData.get("value"); + Map value = (Map) casscadeColumnData.get("value"); if (isExists) setStatus = status.get("exists"); @@ -261,7 +256,7 @@ public class MusicConditional { String vector = String.valueOf(Thread.currentThread().getId() + System.currentTimeMillis()); queryObject.addValue(vector); if(casscadeColumn!=null && casscadeColumnValues!=null) { - fieldsString.append("" +casscadeColumn+" ," ); + fieldsString.append(casscadeColumn).append(" ,"); valueString.append("?,"); queryObject.addValue(casscadeColumnValues); } @@ -269,7 +264,7 @@ public class MusicConditional { int counter = 0; for (Map.Entry entry : valuesMap.entrySet()) { - fieldsString.append("" + entry.getKey()); + fieldsString.append(entry.getKey()); Object valueObj = entry.getValue(); if (primaryKeyName.equals(entry.getKey())) { primaryKey = entry.getValue() + ""; @@ -339,11 +334,10 @@ public class MusicConditional { ColumnDefinitions colInfo = row.getColumnDefinitions(); DataType colType = colInfo.getType(cascadeColumnName); - Map values = new HashMap<>(); Object columnValue = getColValue(row, cascadeColumnName, colType); Map finalValues = new HashMap<>(); - values = (Map) columnValue; + Map values = (Map) columnValue; if (values != null && values.keySet().contains(planId)) { String valueString = values.get(planId); String tempValueString = valueString.replaceAll("\\{", "").replaceAll("\"", "").replaceAll("\\}", "");