summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIttay Stern <ittay.stern@att.com>2019-08-21 06:34:15 +0000
committerGerrit Code Review <gerrit@onap.org>2019-08-21 06:34:15 +0000
commit8af834cdee882fb2c7ff55626978f3df2e0e6004 (patch)
tree45b6f61e61d6529fa42df314c39ca10c1f1ac740
parentb63481896467e5c2a0e5a8df0f2e11e892774ef4 (diff)
parent6d53372256c01c3f0bf88cb95301322954e2471e (diff)
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.
-rwxr-xr-xepsdk-app-onap/src/main/webapp/app/fusion/external/ebz/angular_js/app.js4
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/job/impl/JobSchedulerInitializer.java16
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/services/AsyncInstantiationBusinessLogicImpl.java1
3 files changed, 10 insertions, 11 deletions
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 416dc3272..cb74a6689 100755
--- 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) {
var flags = [];
for (var key in results.data) {
- flags.push({"key":key, "active":results.data[key]})
+ flags.push({"key":key, "active":results.data[key]});
}
featureFlags.set(flags);
- })
+ });
});
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 b3ab75b23..b5c2dd74b 100644
--- 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 7818837f1..d7b3ac602 100644
--- 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;