Merge "Continue addressing technical debt for ONAP-XACML"

[policy/engine.git] / POLICY-SDK-APP / src / main / java / org / onap / policy / admin / RESTfulPAPEngine.java

diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/RESTfulPAPEngine.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/RESTfulPAPEngine.java
index 234d28f..0e7c056 100644 (file)
--- a/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/RESTfulPAPEngine.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/RESTfulPAPEngine.java
@@ -81,7 +81,7 @@ public class RESTfulPAPEngine extends StdPDPItemSetChangeNotifier implements PAP
         * Set up link with PAP Servlet and get our initial set of Groups
         * @throws Exception 
         */
-       public RESTfulPAPEngine (String myURLString) throws PAPException, IOException  {
+       public RESTfulPAPEngine (String myURLString) throws PAPException  {
                //
                // Get our URL to the PAP servlet
                //
@@ -139,7 +139,7 @@ public class RESTfulPAPEngine extends StdPDPItemSetChangeNotifier implements PAP
 
        @Override
        public void newGroup(String name, String description)
-                       throws PAPException, NullPointerException {
+                       throws PAPException {
                String escapedName = null;
                String escapedDescription = null;
                try {
@@ -190,7 +190,7 @@ public class RESTfulPAPEngine extends StdPDPItemSetChangeNotifier implements PAP
        
        @Override
        public void removeGroup(OnapPDPGroup group, OnapPDPGroup newGroup)
-                       throws PAPException, NullPointerException {
+                       throws PAPException {
                String moveToGroupString = null;
                if (newGroup != null) {
                        moveToGroupString = "movePDPsToGroupId=" + newGroup.getId();
@@ -214,8 +214,7 @@ public class RESTfulPAPEngine extends StdPDPItemSetChangeNotifier implements PAP
        }
        
        @Override
-       public void newPDP(String id, OnapPDPGroup group, String name, String description, int jmxport) throws PAPException,
-                       NullPointerException {
+       public void newPDP(String id, OnapPDPGroup group, String name, String description, int jmxport) throws PAPException {
                StdPDP newPDP = new StdPDP(id, name, description, jmxport);
                sendToPAP("PUT", newPDP, null, null, groupID + group.getId(), "pdpId=" + id);
                return;
@@ -359,9 +358,9 @@ public class RESTfulPAPEngine extends StdPDPItemSetChangeNotifier implements PAP
                try {
                        String fullURL = papServletURLString;
                        if (parameters != null && parameters.length > 0) {
-                               String queryString = "";
+                               StringBuilder queryString = new StringBuilder();
                                for (String p : parameters) {
-                                       queryString += "&" + p;
+                                       queryString.append("&" + p);
                                }
                                fullURL += "?" + queryString.substring(1);
                        }
@@ -467,10 +466,10 @@ public class RESTfulPAPEngine extends StdPDPItemSetChangeNotifier implements PAP
                                final CollectionType javaType = 
                                      mapper.getTypeFactory().constructCollectionType(collectionTypeClass, responseContentClass);
        
-                               return (Object)mapper.readValue(json, javaType);
+                               return mapper.readValue(json, javaType);
                            } else {
                                // single value object expected
-                                   return (Object)mapper.readValue(json, responseContentClass);
+                                   return mapper.readValue(json, responseContentClass);
                            }
                }
 
@@ -481,7 +480,7 @@ public class RESTfulPAPEngine extends StdPDPItemSetChangeNotifier implements PAP
                        LOGGER.error("No Location header to redirect to when response code="+connection.getResponseCode());
                        throw new IOException("No redirect Location header when response code="+connection.getResponseCode());
                }
-               int qIndex = newURL.indexOf("?");
+               int qIndex = newURL.indexOf('?');
                if (qIndex > 0) {
                        newURL = newURL.substring(0, qIndex);
                }