diff options
| author |   Thomas Nelson Jr (arthurdent3) tn1381@att.com <tn1381@att.com> | 2018-03-18 01:48:08 -0400 |
|---|---|---|
| committer | Thomas Nelson Jr (arthurdent3) tn1381@att.com <tn1381@att.com> | 2018-03-18 01:48:08 -0400 |
| commit | 67da04ebd086a4e79c9f9acf4d1084729306b2d6 (patch) | |
| tree | dc2ef489142d6568352bb125d3236de4c70e5ec4 /src/main/java/org/onap/music/main/MusicCore.java | |
| parent | 3c86680e532b959bd637b6c093b3916ae5bcee11 (diff) | |
CLM Changes
Change-Id: Id34c036653bf0816e5c67004e4dcf7da90e470e7
Issue-ID: MUSIC-47, MUSIC-48, MUSIC-49
Signed-off-by: Thomas Nelson Jr (arthurdent3) tn1381@att.com <tn1381@att.com>
Diffstat (limited to 'src/main/java/org/onap/music/main/MusicCore.java')
| -rw-r--r-- | src/main/java/org/onap/music/main/MusicCore.java | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/src/main/java/org/onap/music/main/MusicCore.java b/src/main/java/org/onap/music/main/MusicCore.java index 6ce6b0d3..4929edd8 100644 --- a/src/main/java/org/onap/music/main/MusicCore.java +++ b/src/main/java/org/onap/music/main/MusicCore.java @@ -890,7 +890,13 @@ public class MusicCore { operation); if (!resultMap.isEmpty()) return resultMap; - boolean isAAF = CachingUtil.isAAFApplication(nameSpace); + String isAAFApp = CachingUtil.isAAFApplication(nameSpace); + if(isAAFApp == null) { + resultMap.put("Exception", "Namespace: "+nameSpace+" doesn't exist. Please make sure ns(appName)" + + " is correct and Application is onboarded."); + return resultMap; + } + boolean isAAF = Boolean.valueOf(isAAFApp); if (!isAAF && !(operation.equals("createKeySpace"))) { if(aid == null) { resultMap.put("Exception", "Aid is mandatory for nonAAF applications "); @@ -947,20 +953,6 @@ public class MusicCore { uuid = CachingUtil.generateUUID(); resultMap.put("uuid", "new"); } - - pQuery = new PreparedQueryObject(); - pQuery.appendQueryString( - "INSERT into admin.keyspace_master (uuid, keyspace_name, application_name, is_api, " - + "password, username, is_aaf) values (?,?,?,?,?,?,?)"); - pQuery.addValue(MusicUtil.convertToActualDataType(DataType.uuid(), uuid)); - pQuery.addValue(MusicUtil.convertToActualDataType(DataType.text(), keyspace)); - pQuery.addValue(MusicUtil.convertToActualDataType(DataType.text(), nameSpace)); - pQuery.addValue(MusicUtil.convertToActualDataType(DataType.cboolean(), "True")); - pQuery.addValue(MusicUtil.convertToActualDataType(DataType.text(), password)); - pQuery.addValue(MusicUtil.convertToActualDataType(DataType.text(), userId)); - pQuery.addValue(MusicUtil.convertToActualDataType(DataType.cboolean(), isAAF)); - //CachingUtil.updateMusicCache(uuid, keyspace); - MusicCore.eventualPut(pQuery); resultMap.put("aid", uuid); } |