Merge "Replace String Literal with Constant"

diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/async/client/VnfAdapterNotify_Service.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/async/client/VnfAdapterNotify_Service.java
index e1a4270..073ea35 100644 (file)
--- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/async/client/VnfAdapterNotify_Service.java
+++ b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/async/client/VnfAdapterNotify_Service.java
@@ -37,9 +37,9 @@ import javax.xml.ws.WebServiceFeature;
         wsdlLocation = "/VnfAdapterNotify.wsdl")
 public class VnfAdapterNotify_Service extends Service {
 
-    private final static URL VNFADAPTERNOTIFY_WSDL_LOCATION;
-    private final static WebServiceException VNFADAPTERNOTIFY_EXCEPTION;
-    private final static QName VNFADAPTERNOTIFY_QNAME = new QName("http://org.onap.so/vnfNotify", "vnfAdapterNotify");
+    private static final URL VNFADAPTERNOTIFY_WSDL_LOCATION;
+    private static final WebServiceException VNFADAPTERNOTIFY_EXCEPTION;
+    private static final QName VNFADAPTERNOTIFY_QNAME = new QName("http://org.onap.so/vnfNotify", "vnfAdapterNotify");
 
     static {
         VNFADAPTERNOTIFY_WSDL_LOCATION = org.onap.so.adapters.vnf.async.client.VnfAdapterNotify_Service.class
@@ -53,11 +53,11 @@ public class VnfAdapterNotify_Service extends Service {
     }
 
     public VnfAdapterNotify_Service() {
-        super(__getWsdlLocation(), VNFADAPTERNOTIFY_QNAME);
+        super(getWsdlLocation(), VNFADAPTERNOTIFY_QNAME);
     }
 
     public VnfAdapterNotify_Service(WebServiceFeature... features) {
-        super(__getWsdlLocation(), VNFADAPTERNOTIFY_QNAME, features);
+        super(getWsdlLocation(), VNFADAPTERNOTIFY_QNAME, features);
     }
 
     public VnfAdapterNotify_Service(URL wsdlLocation) {
@@ -98,7 +98,7 @@ public class VnfAdapterNotify_Service extends Service {
                 VnfAdapterNotify.class, features);
     }
 
-    private static URL __getWsdlLocation() {
+    private static URL getWsdlLocation() {
         if (VNFADAPTERNOTIFY_EXCEPTION != null) {
             throw VNFADAPTERNOTIFY_EXCEPTION;
         }

diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/heatbridge/constants/HeatBridgeConstants.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/heatbridge/constants/HeatBridgeConstants.java
index dd64d53..933b42e 100644 (file)
--- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/heatbridge/constants/HeatBridgeConstants.java
+++ b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/heatbridge/constants/HeatBridgeConstants.java
@@ -14,10 +14,6 @@ package org.onap.so.heatbridge.constants;
 
 public class HeatBridgeConstants {
 
-    private HeatBridgeConstants() {
-        throw new IllegalStateException("Trying to instantiate a constants class.");
-    }
-
     /**
      * Openstack related constants
      */
@@ -70,4 +66,9 @@ public class HeatBridgeConstants {
     public static final String KEY_MSO_REQUEST_ID = "msoRequestId";
     public static final String KEY_SO_WORKFLOW_EXCEPTION = "WorkflowException";
     public static final String KEY_PROCESS_STATUS_MSG = "processStatusMsg";
+
+    private HeatBridgeConstants() {
+        throw new IllegalStateException("Trying to instantiate a constants class.");
+    }
+
 }