Consolidate PolicyRestAdapter setup

Put common code into PolicyEngineUtils that the controllers use to
populate the PolicyRestController.

Also some more sonar cleanup and formatting of XML files.

Shortened 120 line characters. Removed some trailing spaces
from comments.

Fixed up one JUnit.

Licenses.

Issue-ID: POLICY-2133
Change-Id: Id7d8ac3ab60331535f048ec0f26aeb17a099414e
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>

1 files changed, 5 insertions, 7 deletions

diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/elk/client/ElkConnector.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/elk/client/ElkConnector.java
index d64b71763..d3f7f4dea 100644
--- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/elk/client/ElkConnector.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/elk/client/ElkConnector.java
@@ -20,9 +20,10 @@
 
 package org.onap.policy.pap.xacml.rest.elk.client;
 
-
 import io.searchbox.client.JestResult;
+
 import java.util.Map;
+
 import org.onap.policy.rest.adapter.PolicyRestAdapter;
 
 public interface ElkConnector {
@@ -44,8 +45,7 @@ public interface ElkConnector {
 
     public boolean delete(PolicyRestAdapter policyData) throws IllegalStateException;
 
-    public JestResult search(PolicyIndexType type, String text)
-            throws IllegalStateException, IllegalArgumentException;
+    public JestResult search(PolicyIndexType type, String text) throws IllegalStateException, IllegalArgumentException;
 
     public JestResult search(PolicyIndexType type, String text, Map<String, String> searchKeyValue)
             throws IllegalStateException, IllegalArgumentException;
@@ -54,8 +54,7 @@ public interface ElkConnector {
 
     public ElkConnector singleton = new ElkConnectorImpl();
 
-    public static PolicyIndexType toPolicyIndexType(String policyName)
-            throws IllegalArgumentException {
+    public static PolicyIndexType toPolicyIndexType(String policyName) throws IllegalArgumentException {
         if (policyName == null)
             throw new IllegalArgumentException("Unsupported NULL policy name conversion");
 
@@ -76,8 +75,7 @@ public interface ElkConnector {
         } else if (policyName.startsWith("Config")) {
             return PolicyIndexType.config;
         } else {
-            throw new IllegalArgumentException(
-                    "Unsupported policy name conversion to index: " + policyName);
+            throw new IllegalArgumentException("Unsupported policy name conversion to index: " + policyName);
         }
     }