Merge changes from topics "VID-580", "VID-579", "VID-578"

* changes:
  unused import
  Move the variable to comply with JCC.
  semicolon at the end of this statement.

diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/angular_js/app.js b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/angular_js/app.js
index 416dc32..cb74a66 100755 (executable)
--- a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/angular_js/app.js
+++ b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/angular_js/app.js
@@ -7,8 +7,8 @@ app.run(function(featureFlags, $http) {
     $http.get('flags').then(function (results) {\r
          var flags = [];\r
         for (var key in results.data) {\r
-            flags.push({"key":key, "active":results.data[key]})\r
+            flags.push({"key":key, "active":results.data[key]});\r
         }\r
         featureFlags.set(flags);\r
-    })\r
+    });\r
 });\r

diff --git a/vid-app-common/src/main/java/org/onap/vid/job/impl/JobSchedulerInitializer.java b/vid-app-common/src/main/java/org/onap/vid/job/impl/JobSchedulerInitializer.java
index b3ab75b..b5c2dd7 100644 (file)
--- a/vid-app-common/src/main/java/org/onap/vid/job/impl/JobSchedulerInitializer.java
+++ b/vid-app-common/src/main/java/org/onap/vid/job/impl/JobSchedulerInitializer.java
@@ -46,6 +46,14 @@ public class JobSchedulerInitializer {
     private FeatureManager featureManager;
     private JobCommandFactory jobCommandFactory;
     private EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(JobSchedulerInitializer.class);
+    public static final List<Job.JobStatus> WORKERS_TOPICS = ImmutableList.of(
+            Job.JobStatus.PENDING,
+            Job.JobStatus.CREATING,
+            Job.JobStatus.IN_PROGRESS,
+            Job.JobStatus.RESOURCE_IN_PROGRESS,
+            Job.JobStatus.PENDING_RESOURCE
+    );
+
 
     @Autowired
     public JobSchedulerInitializer(
@@ -61,14 +69,6 @@ public class JobSchedulerInitializer {
 
     }
 
-    public static final List<Job.JobStatus> WORKERS_TOPICS = ImmutableList.of(
-            Job.JobStatus.PENDING,
-            Job.JobStatus.CREATING,
-            Job.JobStatus.IN_PROGRESS,
-            Job.JobStatus.RESOURCE_IN_PROGRESS,
-            Job.JobStatus.PENDING_RESOURCE
-    );
-
     @PostConstruct
     public void init() {
         WORKERS_TOPICS.forEach(topic->scheduleJobWorker(topic, 1));

diff --git a/vid-app-common/src/main/java/org/onap/vid/services/AsyncInstantiationBusinessLogicImpl.java b/vid-app-common/src/main/java/org/onap/vid/services/AsyncInstantiationBusinessLogicImpl.java
index 7818837..d7b3ac6 100644 (file)
--- a/vid-app-common/src/main/java/org/onap/vid/services/AsyncInstantiationBusinessLogicImpl.java
+++ b/vid-app-common/src/main/java/org/onap/vid/services/AsyncInstantiationBusinessLogicImpl.java
@@ -39,7 +39,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.hibernate.SessionFactory;
 import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
 import org.onap.vid.aai.AaiClientInterface;
-import org.onap.vid.aai.ExceptionWithRequestInfo;
 import org.onap.vid.aai.model.ResourceType;
 import org.onap.vid.dal.AsyncInstantiationRepository;
 import org.onap.vid.exceptions.DbFailureUncheckedException;