Merge "Move this variables to comply with Java Code Conventions"

diff --git a/docs/installation.rst b/docs/installation.rst
index 55d9f22..9d1fc70 100644 (file)
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -19,7 +19,7 @@ Please follow the instructions given below, for installing VID using a Docker im
   docker login -u docker -p docker nexus3.onap.org:10001
   docker pull nexus3.onap.org:10001/onap/vid:5.0.1
 
-2. Install by running following command (Use the path for the lf_config folder under the VID git repository as CONFIG_PATH)
+2. Install by running following command (Use the path for the lf_config folder under the VID git repository as CONFIG_PATH and path for .jks files for CERTS_PATH, usually epsdk-app-onap/src/main/webapp/WEB-INF/cert )
 
 .. code-block:: bash
 
@@ -27,10 +27,10 @@ Please follow the instructions given below, for installing VID using a Docker im
    docker run --name vid-mariadb -e MYSQL_DATABASE=vid_openecomp_epsdk -e MYSQL_USER=vidadmin -e MYSQL_PASSWORD=YOUR_PASSWORD -e MYSQL_ROOT_PASSWORD=ROOT_PASSWORD -v CONFIG_PATH/vid-my.cnf:/etc/mysql/my.cnf -v /var/lib/mysql -d mariadb:10
    
    #start VID server
-   docker run -e VID_MYSQL_DBNAME=vid_openecomp_epsdk -e VID_MYSQL_PASS=YOUR_PASSWORD --name vid-server -p 8080:8080 --link vid-mariadb:vid-mariadb-docker-instance -d nexus3.onap.org:10001/onap/vid:5.0.1
+   docker run -e VID_MYSQL_DBNAME=vid_openecomp_epsdk -e VID_MYSQL_PASS=YOUR_PASSWORD -v CERTS_PATH:/opt/app/vid/etc --name vid-server -p 8080:8080 --link vid-mariadb:vid-mariadb-docker-instance -d nexus3.onap.org:10001/onap/vid:5.0.1
 
 Or use docker-compose:
 
 .. code-block:: bash
 
-   docker-compose up
\ No newline at end of file
+   docker-compose up

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/aai/util/HttpsAuthClient.java b/vid-app-common/src/main/java/org/onap/vid/aai/util/HttpsAuthClient.java
index af181eb..391c295 100644 (file)
--- a/vid-app-common/src/main/java/org/onap/vid/aai/util/HttpsAuthClient.java
+++ b/vid-app-common/src/main/java/org/onap/vid/aai/util/HttpsAuthClient.java
@@ -51,6 +51,12 @@ public class HttpsAuthClient {
 
     private final SystemPropertyHelper systemPropertyHelper;
     private final SSLContextProvider sslContextProvider;
+       private final String certFilePath;
+       FeatureManager featureManager;
+
+    /** The logger. */
+    static EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(org.onap.vid.aai.util.HttpsAuthClient.class);
+       
 
     public HttpsAuthClient(String certFilePath, SystemPropertyHelper systemPropertyHelper, SSLContextProvider sslContextProvider, FeatureManager featureManager) {
         this.certFilePath = certFilePath;
@@ -59,13 +65,6 @@ public class HttpsAuthClient {
         this.featureManager = featureManager;
     }
 
-    private final String certFilePath;
-
-    FeatureManager featureManager;
-
-    /** The logger. */
-    static EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(org.onap.vid.aai.util.HttpsAuthClient.class);
-
 
     /**
      * Gets the client.

diff --git a/vid-app-common/src/main/java/org/onap/vid/changeManagement/LeanCloudConfiguration.java b/vid-app-common/src/main/java/org/onap/vid/changeManagement/LeanCloudConfiguration.java
index 36570da..4f666b7 100644 (file)
--- a/vid-app-common/src/main/java/org/onap/vid/changeManagement/LeanCloudConfiguration.java
+++ b/vid-app-common/src/main/java/org/onap/vid/changeManagement/LeanCloudConfiguration.java
@@ -28,6 +28,12 @@ import org.onap.vid.mso.model.CloudConfiguration;
  */
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
 public class LeanCloudConfiguration {
+       
+       public String lcpCloudRegionId;
+
+    public String tenantId;
+
+    public String cloudOwner;
 
     public LeanCloudConfiguration() {
     }
@@ -38,10 +44,5 @@ public class LeanCloudConfiguration {
         this.cloudOwner = cloudConfiguration.getCloudOwner();
 
     }
-    public String lcpCloudRegionId;
-
-    public String tenantId;
-
-    public String cloudOwner;
 
 }

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;