Merge "Sonar Fix: RestconfApiUtils.java"

diff --git a/properties-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/prop/XmlParser.java b/properties-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/prop/XmlParser.java
index 0b308c2..68b2f74 100644 (file)
--- a/properties-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/prop/XmlParser.java
+++ b/properties-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/prop/XmlParser.java
@@ -2,8 +2,7 @@
  * ============LICENSE_START=======================================================
  * openECOMP : SDN-C
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- *
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. *
  * Modifications Copyright © 2018 IBM.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -73,10 +72,6 @@ public final class XmlParser {
 
         private Map<String, String> properties = new HashMap<>();
 
-        public Map<String, String> getProperties() {
-            return properties;
-        }
-
         StringBuilder currentName = new StringBuilder();
         StringBuilder currentValue = new StringBuilder();
 
@@ -87,6 +82,10 @@ public final class XmlParser {
                 this.listNameList = new HashSet<>();
         }
 
+        public Map<String, String> getProperties() {
+            return properties;
+        }
+
         @Override
         public void startElement(String uri, String localName, String qName, Attributes attributes)
                 throws SAXException {

diff --git a/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/RetryPolicyStore.java b/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/RetryPolicyStore.java
index 775137f..e4ba5fd 100644 (file)
--- a/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/RetryPolicyStore.java
+++ b/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/RetryPolicyStore.java
@@ -4,6 +4,7 @@
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
  *                     reserved.
+ * Modifications Copyright © 2018 IBM.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,11 +28,13 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class RetryPolicyStore {
-    private static final Logger log = LoggerFactory.getLogger(RetryPolicyStore.class);
-
     HashMap<String, RetryPolicy> retryPolicies;
     public String proxyServers;
 
+    public RetryPolicyStore() {
+        retryPolicies = new HashMap<>();
+    }
+
     public String getProxyServers() {
         return proxyServers;
     }
@@ -42,10 +45,6 @@ public class RetryPolicyStore {
         RetryPolicy adminPortalRetry = new RetryPolicy(adminServersArray, adminServersArray.length);
         retryPolicies.put("dme2proxy", adminPortalRetry);
     }
-
-    public RetryPolicyStore() {
-        retryPolicies = new HashMap<>();
-    }
     
     public RetryPolicy getRetryPolicy(String policyName) {
         return (this.retryPolicies.get(policyName));

diff --git a/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/XmlParser.java b/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/XmlParser.java
index 9aede5b..cf6af66 100644 (file)
--- a/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/XmlParser.java
+++ b/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/XmlParser.java
@@ -4,6 +4,7 @@
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
  *                     reserved.
+ *     Modifications Copyright © 2018 IBM
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -73,9 +74,8 @@ public final class XmlParser {
 
         private Map<String, String> properties = new HashMap<>();
 
-        public Map<String, String> getProperties() {
-            return properties;
-        }
+        StringBuilder currentName = new StringBuilder();
+        StringBuilder currentValue = new StringBuilder();
 
         public Handler(Set<String> listNameList) {
             super();
@@ -84,8 +84,9 @@ public final class XmlParser {
                 this.listNameList = new HashSet<>();
         }
 
-        StringBuilder currentName = new StringBuilder();
-        StringBuilder currentValue = new StringBuilder();
+        public Map<String, String> getProperties() {
+            return properties;
+        }
 
         @Override
         public void startElement(String uri, String localName, String qName, Attributes attributes)