diff options
| author |   Bharath Balasubramanian <bharathb@research.att.com> | 2020-04-08 16:54:26 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-04-08 16:54:26 +0000 |
| commit | efdd05004d6ecf018e6e39e1613b5691aff69ef5 (patch) | |
| tree | b40cc6f44e17c54b5c3410409344c52277041fbc /music-core/src/main/java/org/onap/music/datastore/jsonobjects/JsonTable.java | |
| parent | 90d1e3551488a73e74fb54d320be6e29678ca270 (diff) | |
| parent | 1aafd3ff1cbf1827ded174efd2659539b7f80dac (diff) | |
Merge "some code smells removed"
Diffstat (limited to 'music-core/src/main/java/org/onap/music/datastore/jsonobjects/JsonTable.java')
| -rw-r--r-- | music-core/src/main/java/org/onap/music/datastore/jsonobjects/JsonTable.java | 33 |
1 files changed, 22 insertions, 11 deletions
diff --git a/music-core/src/main/java/org/onap/music/datastore/jsonobjects/JsonTable.java b/music-core/src/main/java/org/onap/music/datastore/jsonobjects/JsonTable.java index 0a277e08..0ba1a7ef 100644 --- a/music-core/src/main/java/org/onap/music/datastore/jsonobjects/JsonTable.java +++ b/music-core/src/main/java/org/onap/music/datastore/jsonobjects/JsonTable.java @@ -166,8 +166,10 @@ public class JsonTable { if (entry.getKey().equals("PRIMARY KEY")) { primaryKey = entry.getValue(); // replaces primaryKey primaryKey = primaryKey.trim(); - } else { - if (counter == 0 ) fieldsString.append("" + entry.getKey() + " " + entry.getValue() + ""); + } + else { + if (counter == 0 ) + fieldsString.append("" + entry.getKey() + " " + entry.getValue() + ""); else fieldsString.append("," + entry.getKey() + " " + entry.getValue() + ""); } @@ -209,7 +211,8 @@ public class JsonTable { clusterKey=clusterKey.substring(1); } clusterKey = clusterKey.trim(); - if (clusterKey.equals(",") ) clusterKey=""; // print error if needed ( ... ),) + if (clusterKey.equals(",") ) + clusterKey=""; // print error if needed ( ... ),) } if (!(partitionKey.isEmpty() || clusterKey.isEmpty()) @@ -226,12 +229,16 @@ public class JsonTable { } - if (partitionKey.isEmpty() ) primaryKey=""; - else if (clusterKey.isEmpty() ) primaryKey=" (" + partitionKey + ")"; - else primaryKey=" (" + partitionKey + ")," + clusterKey; + if (partitionKey.isEmpty() ) + primaryKey=""; + else if (clusterKey.isEmpty() ) + primaryKey=" (" + partitionKey + ")"; + else + primaryKey=" (" + partitionKey + ")," + clusterKey; - if (primaryKey != null) fieldsString.append(", PRIMARY KEY (" + primaryKey + " )"); + if (primaryKey != null) + fieldsString.append(", PRIMARY KEY (" + primaryKey + " )"); } else { // end of length > 0 @@ -248,11 +255,15 @@ public class JsonTable { Status.BAD_REQUEST.getStatusCode()); } - if (partitionKey.isEmpty() ) primaryKey=""; - else if (clusterKey.isEmpty() ) primaryKey=" (" + partitionKey + ")"; - else primaryKey=" (" + partitionKey + ")," + clusterKey; + if (partitionKey.isEmpty() ) + primaryKey=""; + else if (clusterKey.isEmpty() ) + primaryKey=" (" + partitionKey + ")"; + else + primaryKey=" (" + partitionKey + ")," + clusterKey; - if (primaryKey != null) fieldsString.append(", PRIMARY KEY (" + primaryKey + " )"); + if (primaryKey != null) + fieldsString.append(", PRIMARY KEY (" + primaryKey + " )"); } fieldsString.append(")"); |