Merge "return this expression instead of assigning it to the temporary variable"

diff --git a/vid-app-common/src/main/java/org/onap/vid/aai/PombaRestInterface.java b/vid-app-common/src/main/java/org/onap/vid/aai/PombaRestInterface.java
index b118901..2f69e39 100644 (file)
--- a/vid-app-common/src/main/java/org/onap/vid/aai/PombaRestInterface.java
+++ b/vid-app-common/src/main/java/org/onap/vid/aai/PombaRestInterface.java
@@ -4,6 +4,7 @@
  * ================================================================================
  * Copyright (C) 2017 - 2019 AT&T Intellectual Property. All rights reserved.
  * Modifications Copyright (C) 2018 - 2019 Nokia. 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.
@@ -35,13 +36,13 @@ import java.util.UUID;
 import static org.onap.vid.utils.Logging.REQUEST_ID_HEADER_KEY;
 
 public class PombaRestInterface extends AAIRestInterface {
+       
+    private Client client = null;
 
     public PombaRestInterface (HttpsAuthClient httpsAuthClientFactory, ServletRequestHelper servletRequestHelper, SystemPropertyHelper systemPropertyHelper) {
         super(httpsAuthClientFactory, servletRequestHelper, systemPropertyHelper);
     }
 
-    private Client client = null;
-
     @Override
     protected void initRestClient()
     {

diff --git a/vid-app-common/src/main/java/org/onap/vid/aai/SubscriberListWithFilterData.java b/vid-app-common/src/main/java/org/onap/vid/aai/SubscriberListWithFilterData.java
index d03362b..af665f8 100644 (file)
--- a/vid-app-common/src/main/java/org/onap/vid/aai/SubscriberListWithFilterData.java
+++ b/vid-app-common/src/main/java/org/onap/vid/aai/SubscriberListWithFilterData.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.
@@ -31,6 +32,8 @@ import java.util.List;
  * Created by Oren on 7/5/17.
  */
 public class SubscriberListWithFilterData {
+       
+    public List<SubscriberWithFilter> customer;
 
     public SubscriberListWithFilterData(SubscriberList subscriberList, RoleValidator roleValidator){
         List<Subscriber> subscribers = subscriberList != null ? subscriberList.customer : new ArrayList<>();
@@ -46,5 +49,4 @@ public class SubscriberListWithFilterData {
         }
     }
 
-    public List<SubscriberWithFilter> customer;
 }

diff --git a/vid-app-common/src/main/java/org/onap/vid/aai/util/SSLContextProvider.java b/vid-app-common/src/main/java/org/onap/vid/aai/util/SSLContextProvider.java
index 8a67460..400e788 100644 (file)
--- a/vid-app-common/src/main/java/org/onap/vid/aai/util/SSLContextProvider.java
+++ b/vid-app-common/src/main/java/org/onap/vid/aai/util/SSLContextProvider.java
@@ -34,7 +34,7 @@ public class SSLContextProvider {
 
     private static EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(SSLContextProvider.class);
 
-    public SSLContext getSslContext(String keystorePath, String keystorePassword, HttpClientMode httpClientMode) throws HttpClientBuilderException {
+    public SSLContext getSslContext(String keystorePath, String keystorePassword, HttpClientMode httpClientMode){
         try {
             final SSLContext ctx = SSLContext.getInstance("TLSv1.2");
             KeyManager[] keyManagers = getKeyManagerFactory(keystorePath, keystorePassword, httpClientMode);

diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/services/change-management.service.js b/vid-app-common/src/main/webapp/app/vid/scripts/services/change-management.service.js
index e545aad..6b45a74 100644 (file)
--- a/vid-app-common/src/main/webapp/app/vid/scripts/services/change-management.service.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/services/change-management.service.js
@@ -119,8 +119,7 @@
                 });
 
             return deferred.promise;
-        };
-               
+        };             
                this.postChangeManagementNow = function (requestData, vnfName) {
                        var url = COMPONENT.CHANGE_MANAGEMENT_OPERATION_NO_SCHEDULER.replace('@vnfName', vnfName);
             return $http.post(url, requestData)