Merge "merge 2 TestNg transformers"

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/model/AaiGetNetworkCollectionDetails/AaiGetNetworkCollectionDetails.java b/vid-app-common/src/main/java/org/onap/vid/aai/model/AaiGetNetworkCollectionDetails/AaiGetNetworkCollectionDetails.java
index ec7ea8a..8ad6cd6 100644 (file)
--- a/vid-app-common/src/main/java/org/onap/vid/aai/model/AaiGetNetworkCollectionDetails/AaiGetNetworkCollectionDetails.java
+++ b/vid-app-common/src/main/java/org/onap/vid/aai/model/AaiGetNetworkCollectionDetails/AaiGetNetworkCollectionDetails.java
@@ -3,6 +3,7 @@
  * VID
  * ================================================================================
  * Copyright (C) 2017 - 2019 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2018 IBM.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,12 +26,13 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class AaiGetNetworkCollectionDetails {
 
+        @JsonProperty("results")
+        private Result results = null;
+       
     public AaiGetNetworkCollectionDetails(){
         results = new Result();
     }
-    @JsonProperty("results")
-    private Result results = null;
-
+    
     @JsonProperty("results")
     public Result getResults() {
         return results;

diff --git a/vid-app-common/src/main/java/org/onap/vid/aai/model/InstanceGroupInfo.java b/vid-app-common/src/main/java/org/onap/vid/aai/model/InstanceGroupInfo.java
index b14cfa8..37ec179 100644 (file)
--- a/vid-app-common/src/main/java/org/onap/vid/aai/model/InstanceGroupInfo.java
+++ b/vid-app-common/src/main/java/org/onap/vid/aai/model/InstanceGroupInfo.java
@@ -3,6 +3,7 @@
  * VID
  * ================================================================================
  * Copyright (C) 2017 - 2019 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2018 IBM.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,15 +22,8 @@
 package org.onap.vid.aai.model;
 
 public class InstanceGroupInfo {
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    private String type;
+       
+       private String type;
     private String name;
 
     public InstanceGroupInfo(String name){
@@ -37,6 +31,13 @@ public class InstanceGroupInfo {
         this.type = "instance-group";
     }
 
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
 
     public String getName() {
         return name;

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/GetVnfWorkflowRelationRequest.java b/vid-app-common/src/main/java/org/onap/vid/changeManagement/GetVnfWorkflowRelationRequest.java
index 7a9787c..0c3a57d 100644 (file)
--- a/vid-app-common/src/main/java/org/onap/vid/changeManagement/GetVnfWorkflowRelationRequest.java
+++ b/vid-app-common/src/main/java/org/onap/vid/changeManagement/GetVnfWorkflowRelationRequest.java
@@ -3,6 +3,7 @@
  * VID
  * ================================================================================
  * Copyright (C) 2017 - 2019 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 IBM.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +26,9 @@ import java.util.List;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class GetVnfWorkflowRelationRequest {
+       
+       @JsonProperty("vnfsDetails")
+       private List<VnfDetails>  vnfsDetails;
 
        public GetVnfWorkflowRelationRequest() {
        }
@@ -32,9 +36,6 @@ public class GetVnfWorkflowRelationRequest {
        public GetVnfWorkflowRelationRequest(List<VnfDetails> vnfsDetails) {
                this.vnfsDetails = vnfsDetails;
        }
-
-       @JsonProperty("vnfsDetails")
-       private List<VnfDetails>  vnfsDetails;
        
        @JsonProperty("vnfsDetails")
        public List<VnfDetails> getVnfDetails() {

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/AaiServiceImpl.java b/vid-app-common/src/main/java/org/onap/vid/services/AaiServiceImpl.java
index 9b89047..b50dcc3 100644 (file)
--- a/vid-app-common/src/main/java/org/onap/vid/services/AaiServiceImpl.java
+++ b/vid-app-common/src/main/java/org/onap/vid/services/AaiServiceImpl.java
@@ -42,7 +42,6 @@ import org.apache.http.HttpStatus;
 import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
 import org.onap.vid.aai.AaiClientInterface;
 import org.onap.vid.aai.AaiGetVnfResponse;
-import org.onap.vid.aai.AaiOverTLSClientInterface;
 import org.onap.vid.aai.AaiResponse;
 import org.onap.vid.aai.AaiResponseTranslator;
 import org.onap.vid.aai.ExceptionWithRequestInfo;

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;

diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/controller/InstantiationController.js b/vid-app-common/src/main/webapp/app/vid/scripts/controller/InstantiationController.js
index 6eed080..7fa312e 100755 (executable)
--- a/vid-app-common/src/main/webapp/app/vid/scripts/controller/InstantiationController.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/controller/InstantiationController.js
@@ -142,13 +142,13 @@
 \r
             }\r
             return null;\r
-        }\r
+        };\r
         $scope.hasVfModules = function (vnfInstance) {\r
             if ($scope.returnVfModules(vnfInstance) != null) {\r
                 return true;\r
             }\r
             return false;\r
-        }\r
+        };\r
         $scope.returnVolumeGroups = function (vnfInstance) {\r
 \r
             var svcModel = $scope.service.convertedModel;\r
@@ -183,13 +183,13 @@
 \r
             }\r
             return null;\r
-        }\r
+        };\r
         $scope.hasVolumeGroups = function (vnfInstance) {\r
             if ($scope.returnVolumeGroups(vnfInstance) != null) {\r
                 return true;\r
             }\r
             return false;\r
-        }\r
+        };\r
         $scope.deleteNetwork = function (serviceObject, network) {\r
 \r
             console.log("Removing Network " + network.name);\r
@@ -871,7 +871,7 @@
 \r
             //Display popup with additional VF-Module information\r
             DataService.setVfModuleInstanceId(vfModule[FIELD.ID.VF_MODULE_ID]);\r
-            DataService.setInventoryItem(vfModule)\r
+            DataService.setInventoryItem(vfModule);\r
 \r
             DataService.setSubscriberName(serviceObject[COMPONENT.SUBSCRIBER_NAME]);\r
             DataService.setServiceType(serviceObject[COMPONENT.SERVICE_TYPE]);\r
@@ -1323,7 +1323,7 @@
 \r
         var deleteCallbackFunction = function () {\r
             console.log('hi')\r
-        }\r
+        };\r
 \r
         $scope.resetProgress = function () {\r
             $scope.percentProgress = 0;\r
@@ -1364,13 +1364,13 @@
             else {\r
                 return true;\r
             }\r
-        }\r
+        };\r
         $scope.isMacro = function () {\r
             return $scope.service && AsdcService.isMacro($scope.service.model);\r
-        }\r
+        };\r
         $scope.reloadRoute = function () {\r
             $route.reload();\r
-        }\r
+        };\r
 \r
 \r
         /*\r
@@ -1539,7 +1539,7 @@ Private metthods
                     + FIELD.STATUS.IS_SUCCESSFUL + response.isSuccessful;\r
                 if (response.isSuccessful) {\r
                     color = FIELD.ID.COLOR_8F8;\r
-                    $location.path(COMPONENT.SERVICEMODELS_MODELS_SERVICES_PATH)\r
+                    $location.path(COMPONENT.SERVICEMODELS_MODELS_SERVICES_PATH);\r
                 } else {\r
                     color = FIELD.ID.COLOR_F88;\r
                 }\r