Merge "Fix potential null pointer places"

diff --git a/sparkybe-onap-application/config/spring-beans/sparky-attribute-update-service.xml b/sparkybe-onap-application/config/spring-beans/sparky-attribute-update-service.xml
new file mode 100644 (file)
index 0000000..6ae1edb
--- /dev/null
+++ b/sparkybe-onap-application/config/spring-beans/sparky-attribute-update-service.xml
@@ -0,0 +1,19 @@
+<beans profile="resources" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xmlns="http://www.springframework.org/schema/beans" xmlns:context="http://www.springframework.org/schema/context"
+        xmlns:task="http://www.springframework.org/schema/task"
+        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+                http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd
+                http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd">
+
+        <bean id="attributeUpdater" class="org.onap.aai.sparky.editattributes.AttributeUpdater">
+                <constructor-arg ref="oxmModelLoader" />
+                <constructor-arg ref="oxmEntityLookup" />
+                <constructor-arg ref="activeInventoryAdapter" />
+        </bean>
+
+        <bean id="attributeEditProcessor"
+                class="org.onap.aai.sparky.editattributes.AttributeEditProcessor">
+                <constructor-arg ref="attributeUpdater" />
+        </bean>
+
+</beans>
\ No newline at end of file

diff --git a/sparkybe-onap-application/config/spring-beans/sparky-gizmo.xml b/sparkybe-onap-application/config/spring-beans/sparky-gizmo.xml
index cc6031a..adf3507 100644 (file)
--- a/sparkybe-onap-application/config/spring-beans/sparky-gizmo.xml
+++ b/sparkybe-onap-application/config/spring-beans/sparky-gizmo.xml
@@ -23,8 +23,8 @@
                <constructor-arg ref="oxmModelLoader" />
                <constructor-arg ref="gizmoRestEndpointConfig" />
                <property name="relationshipsBasePath"
-                       value="/services/inventory/relationships/${gizmo.apiVersion:v12}/" />
-               <property name="inventoryBasePath" value="/services/inventory/${gizmo.apiVersion:v12}/" />
+                       value="/services/inventory/relationships/${gizmo.apiVersion:v12}" />
+               <property name="inventoryBasePath" value="/services/inventory/${gizmo.apiVersion:v12}" />
        </bean>
 
 </beans>
\ No newline at end of file

diff --git a/sparkybe-onap-application/config/spring-beans/sparky-oxm.xml b/sparkybe-onap-application/config/spring-beans/sparky-oxm.xml
index ed084dc..ecba6cd 100644 (file)
--- a/sparkybe-onap-application/config/spring-beans/sparky-oxm.xml
+++ b/sparkybe-onap-application/config/spring-beans/sparky-oxm.xml
@@ -70,17 +70,6 @@
                        value="entitycounthistoryindex" />
        </bean>
 
-       <bean id="attributeUpdater" class="org.onap.aai.sparky.editattributes.AttributeUpdater">
-               <constructor-arg ref="oxmModelLoader" />
-               <constructor-arg ref="oxmEntityLookup" />
-               <constructor-arg ref="activeInventoryAdapter" />
-       </bean>
-
-       <bean id="attributeEditProcessor"
-               class="org.onap.aai.sparky.editattributes.AttributeEditProcessor">
-               <constructor-arg ref="attributeUpdater" />
-       </bean>
-
        <bean id="geoVisualizationProcessor" class="org.onap.aai.sparky.inventory.GeoVisualizationProcessor">
                <constructor-arg ref="elasticSearchAdapter" />
                <constructor-arg name="topographicalSearchIndexName"

diff --git a/sparkybe-onap-application/config/spring-beans/sparky-view-inspect-with-gizmo.xml b/sparkybe-onap-application/config/spring-beans/sparky-view-inspect-with-gizmo.xml
index f709446..d7b9ff1 100644 (file)
--- a/sparkybe-onap-application/config/spring-beans/sparky-view-inspect-with-gizmo.xml
+++ b/sparkybe-onap-application/config/spring-beans/sparky-view-inspect-with-gizmo.xml
@@ -45,7 +45,7 @@
                class="org.onap.aai.sparky.viewandinspect.services.BaseVisualizationService">
                <constructor-arg ref="oxmModelLoader" />
                <constructor-arg ref="visualizationConfigurations" />
-               <constructor-arg ref="activeInventoryAdapter" />
+               <constructor-arg name="aaiAdapter"><null/></constructor-arg>
                <constructor-arg ref="gizmoAdapter" />
                <constructor-arg ref="elasticSearchAdapter" />
                <constructor-arg ref="elasticSearchEndpointConfig" />

diff --git a/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/aggregation/sync/HistoricalEntitySummarizer.java b/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/aggregation/sync/HistoricalEntitySummarizer.java
index a41df4f..c6cd3b1 100644 (file)
--- a/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/aggregation/sync/HistoricalEntitySummarizer.java
+++ b/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/aggregation/sync/HistoricalEntitySummarizer.java
@@ -76,7 +76,6 @@ public class HistoricalEntitySummarizer extends AbstractEntitySynchronizer
   /**
    * Instantiates a new historical entity summarizer.
    *
-   * @param indexName the index name
    * @throws Exception the exception
    */
   public HistoricalEntitySummarizer(ElasticSearchSchemaConfig schemaConfig, int internalSyncWorkers,
@@ -304,6 +303,7 @@ public class HistoricalEntitySummarizer extends AbstractEntitySynchronizer
         Thread.sleep(500);
       } catch (InterruptedException exc) {
         LOG.error(AaiUiMsgs.INTERRUPTED, "historical Entities", exc.getMessage());
+        Thread.currentThread().interrupt();
       }
     }
 

diff --git a/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/dal/ActiveInventoryAdapter.java b/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/dal/ActiveInventoryAdapter.java
index 214538f..33d2ff4 100644 (file)
--- a/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/dal/ActiveInventoryAdapter.java
+++ b/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/dal/ActiveInventoryAdapter.java
@@ -360,6 +360,7 @@ public class ActiveInventoryAdapter {
         Thread.sleep(50);
       } catch (InterruptedException exc) {
         LOG.error(AaiUiMsgs.QUERY_AAI_WAIT_INTERRUPTION, exc.getLocalizedMessage());
+        Thread.currentThread().interrupt();
         break;
       }
       LOG.error(AaiUiMsgs.QUERY_AAI_RETRY_FAILURE_WITH_SEQ, url, String.valueOf(retryCount + 1));

diff --git a/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/dal/GizmoAdapter.java b/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/dal/GizmoAdapter.java
index 86573d2..a888c8b 100644 (file)
--- a/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/dal/GizmoAdapter.java
+++ b/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/dal/GizmoAdapter.java
@@ -238,6 +238,7 @@ public class GizmoAdapter {
                                Thread.sleep(50);
                        } catch (InterruptedException exc) {
                                LOG.error(AaiUiMsgs.QUERY_AAI_WAIT_INTERRUPTION, exc.getLocalizedMessage());
+                               Thread.currentThread().interrupt();
                                break;
                        }
                        LOG.error(AaiUiMsgs.QUERY_AAI_RETRY_FAILURE_WITH_SEQ, url, String.valueOf(retryCount + 1));

diff --git a/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/sync/SyncControllerImpl.java b/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/sync/SyncControllerImpl.java
index 397e2fe..8b008de 100644 (file)
--- a/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/sync/SyncControllerImpl.java
+++ b/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/sync/SyncControllerImpl.java
@@ -626,6 +626,7 @@ public class SyncControllerImpl implements SyncController {
       } catch (InterruptedException exc) {
         LOG.error(AaiUiMsgs.ERROR_GENERIC,
             "An error occurred while waiting for sync to complete. Error = " + exc.getMessage());
+        Thread.currentThread().interrupt();
       }
 
     }

diff --git a/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/sync/task/SyncControllerTask.java b/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/sync/task/SyncControllerTask.java
index 18567d5..be05e30 100644 (file)
--- a/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/sync/task/SyncControllerTask.java
+++ b/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/sync/task/SyncControllerTask.java
@@ -41,6 +41,7 @@ public class SyncControllerTask implements Runnable {
       try {
         Thread.sleep(1000);
       } catch (InterruptedException e) {
+        Thread.currentThread().interrupt();
         // exit out of the sync-wait-loop
         break;
       }

diff --git a/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/viewandinspect/services/BaseGizmoVisualizationContext.java b/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/viewandinspect/services/BaseGizmoVisualizationContext.java
index 066873d..4177b44 100644 (file)
--- a/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/viewandinspect/services/BaseGizmoVisualizationContext.java
+++ b/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/viewandinspect/services/BaseGizmoVisualizationContext.java
@@ -798,6 +798,7 @@ public class BaseGizmoVisualizationContext implements VisualizationContext {
         Thread.sleep(10);
       } catch (InterruptedException exc) {
         LOG.error(AaiUiMsgs.PROCESSING_LOOP_INTERUPTED, exc.getMessage());
+        Thread.currentThread().interrupt();
         return;
       }
 

diff --git a/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/viewandinspect/services/BaseVisualizationContext.java b/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/viewandinspect/services/BaseVisualizationContext.java
index 5dd5aca..0cbd52e 100644 (file)
--- a/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/viewandinspect/services/BaseVisualizationContext.java
+++ b/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/viewandinspect/services/BaseVisualizationContext.java
@@ -1434,6 +1434,7 @@ public class BaseVisualizationContext implements VisualizationContext {
         Thread.sleep(10);
       } catch (InterruptedException exc) {
         LOG.error(AaiUiMsgs.PROCESSING_LOOP_INTERUPTED, exc.getMessage());
+        Thread.currentThread().interrupt();
         return;
       }