summaryrefslogtreecommitdiffstats
path: root/aai-resources
diff options
context:
space:
mode:
authorWilliam Reehil <william.reehil@att.com>2020-11-25 14:16:33 +0000
committerGerrit Code Review <gerrit@onap.org>2020-11-25 14:16:33 +0000
commitc5a545c8363065f7cb8092e6bfa6fa3a5c6e5758 (patch)
tree88561b8b41e01e14c64cb45cc8cc999cce81ed01 /aai-resources
parente5912cd329ae4fc8977173a8b6809aa2f814d69b (diff)
parent43f538f8951a1f61f4adcbe2e1dcc0b2b44ae1ac (diff)
Merge "fix sonar issues"
Diffstat (limited to 'aai-resources')
-rw-r--r--aai-resources/src/main/java/org/onap/aai/TenantIsolation/DataImportTasks.java2
-rw-r--r--aai-resources/src/main/java/org/onap/aai/rest/BulkConsumer.java3
2 files changed, 3 insertions, 2 deletions
diff --git a/aai-resources/src/main/java/org/onap/aai/TenantIsolation/DataImportTasks.java b/aai-resources/src/main/java/org/onap/aai/TenantIsolation/DataImportTasks.java
index 917146f..c22251d 100644
--- a/aai-resources/src/main/java/org/onap/aai/TenantIsolation/DataImportTasks.java
+++ b/aai-resources/src/main/java/org/onap/aai/TenantIsolation/DataImportTasks.java
@@ -66,7 +66,7 @@ import org.apache.commons.io.filefilter.RegexFileFilter;
public class DataImportTasks {
private static final Logger LOGGER;
- private static final SimpleDateFormat dateFormat = new SimpleDateFormat("HH:mm:ss");
+ private SimpleDateFormat dateFormat = new SimpleDateFormat("HH:mm:ss");
private static final List<String> EXTS = Arrays.asList("tar.gz", "tgz");
diff --git a/aai-resources/src/main/java/org/onap/aai/rest/BulkConsumer.java b/aai-resources/src/main/java/org/onap/aai/rest/BulkConsumer.java
index 4bd1a0d..a2f83b0 100644
--- a/aai-resources/src/main/java/org/onap/aai/rest/BulkConsumer.java
+++ b/aai-resources/src/main/java/org/onap/aai/rest/BulkConsumer.java
@@ -321,7 +321,8 @@ public abstract class BulkConsumer extends RESTAPI {
}
UriComponents uriComponents = UriComponentsBuilder.fromUriString(itemURIfield.getAsString()).build();
- if (uriComponents.getPath().endsWith("/relationship-list/relationship")) {
+ if (uriComponents.getPath() != null &&
+ uriComponents.getPath().endsWith("/relationship-list/relationship")) {
if (method.equals(HttpMethod.PUT)) {
bulkOperation.setHttpMethod(HttpMethod.PUT_EDGE);
} else if (method.equals(HttpMethod.DELETE)) {