summaryrefslogtreecommitdiffstats
path: root/aai-resources/src
diff options
context:
space:
mode:
authorMariano Diaz <mariano.diaz@yoppworks.com>2020-11-03 15:51:52 -0500
committerMariano Diaz <mariano.diaz@yoppworks.com>2020-11-03 15:51:52 -0500
commit43f538f8951a1f61f4adcbe2e1dcc0b2b44ae1ac (patch)
tree582e52067b39410ad87fac4950a0e903a303d4e0 /aai-resources/src
parent2dc6040239526af220562dcf63960e4d06fcdf14 (diff)
fix sonar issues
Issue-ID: AAI-2882 Signed-off-by: Mariano Diaz <mariano.diaz@yoppworks.com> Change-Id: I9d48b036ca7e0f50ecc775ea6ecb6503d4688165
Diffstat (limited to 'aai-resources/src')
-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)) {