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>

4 files changed, 70 insertions, 41 deletions

diff --git a/PolicyEngineUtils/src/main/java/org/onap/policy/utils/AAFPolicyClient.java b/PolicyEngineUtils/src/main/java/org/onap/policy/utils/AAFPolicyClient.java
index ab87bc093..236f01eff 100644
--- a/PolicyEngineUtils/src/main/java/org/onap/policy/utils/AAFPolicyClient.java
+++ b/PolicyEngineUtils/src/main/java/org/onap/policy/utils/AAFPolicyClient.java
@@ -33,6 +33,13 @@ public interface AAFPolicyClient {
 
     public boolean checkPerm(String userName, String pass, String type, String instance, String action);
 
+    /**
+     * getInstance.
+     *
+     * @param properties Properties
+     * @return AAFPolicyClient
+     * @throws AAFPolicyException AAFPolicyException
+     */
     public static AAFPolicyClient getInstance(Properties properties) throws AAFPolicyException {
         try {
             Class<?> aafPolicyClient = Class
diff --git a/PolicyEngineUtils/src/main/java/org/onap/policy/utils/PolicyUtils.java b/PolicyEngineUtils/src/main/java/org/onap/policy/utils/PolicyUtils.java
index 9c1294540..7d70da2f7 100644
--- a/PolicyEngineUtils/src/main/java/org/onap/policy/utils/PolicyUtils.java
+++ b/PolicyEngineUtils/src/main/java/org/onap/policy/utils/PolicyUtils.java
@@ -53,11 +53,14 @@ import org.xml.sax.XMLReader;
 
 public class PolicyUtils {
     private static final Logger LOGGER = FlexLogger.getLogger(PolicyUtils.class);
+    private static final String PACKAGE_ERROR = "mismatched input '{' expecting one of the following tokens: '[package";
+
     public static final String CATCH_EXCEPTION = "PE500: An exception was caught.";
     public static final String EMAIL_PATTERN =
             "^[_A-Za-z0-9-\\+]+(\\.[_A-Za-z0-9-]+)*@" + "[A-Za-z0-9-]+(\\.[A-Za-z0-9]+)*(\\.[A-Za-z]{2,})$";
-    private static final String PACKAGE_ERROR = "mismatched input '{' expecting one of the following tokens: '[package";
     public static final String SUCCESS = "success";
+    public static final String CHARACTER_ENCODING = "UTF-8";
+    public static final String APPLICATION_JSON = "application/json";
 
     private PolicyUtils() {
         // Private Constructor
diff --git a/PolicyEngineUtils/src/main/resources/META-INF/persistencePU.xml b/PolicyEngineUtils/src/main/resources/META-INF/persistencePU.xml
index 6cd88bf28..93a2acf05 100644
--- a/PolicyEngineUtils/src/main/resources/META-INF/persistencePU.xml
+++ b/PolicyEngineUtils/src/main/resources/META-INF/persistencePU.xml
@@ -3,14 +3,14 @@
   ============LICENSE_START=======================================================
   PolicyEngineUtils
   ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+  Copyright (C) 2017, 2019 AT&T Intellectual Property. All rights reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,10 +20,12 @@
   -->
 
 <persistence version="2.1"
-	xmlns="http://xmlns.jcp.org/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
-	<persistence-unit name="PolicyEngineUtils" transaction-type="RESOURCE_LOCAL">
-		<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
-		<class>org.onap.policy.jpa.BackUpMonitorEntity</class>
-	</persistence-unit>
+    xmlns="http://xmlns.jcp.org/xml/ns/persistence"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
+    <persistence-unit name="PolicyEngineUtils"
+        transaction-type="RESOURCE_LOCAL">
+        <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
+        <class>org.onap.policy.jpa.BackUpMonitorEntity</class>
+    </persistence-unit>
 </persistence>
diff --git a/PolicyEngineUtils/src/test/resources/META-INF/persistencePUtest.xml b/PolicyEngineUtils/src/test/resources/META-INF/persistencePUtest.xml
index a73e6b3c5..17cdce68d 100644
--- a/PolicyEngineUtils/src/test/resources/META-INF/persistencePUtest.xml
+++ b/PolicyEngineUtils/src/test/resources/META-INF/persistencePUtest.xml
@@ -1,35 +1,52 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- ============LICENSE_START======================================================= 
-	PolicyEngineUtils ================================================================================ 
-	Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. ================================================================================ 
-	Licensed under the Apache License, Version 2.0 (the "License"); you may not 
-	use this file except in compliance with the License. You may obtain a copy 
-	of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 
-	by applicable law or agreed to in writing, software distributed under the 
-	License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
-	OF ANY KIND, either express or implied. See the License for the specific 
-	language governing permissions and limitations under the License. ============LICENSE_END========================================================= -->
+<!--
+  ============LICENSE_START=======================================================
+  PolicyEngineUtils
+  ================================================================================
+  Copyright (C) 2017, 2019 AT&T Intellectual Property. All rights reserved.
+  ================================================================================
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+  
+       http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  ============LICENSE_END=========================================================
+  -->
 
 <persistence version="2.1"
-	xmlns="http://xmlns.jcp.org/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
-	<persistence-unit name="PolicyEngineUtils"
-		transaction-type="RESOURCE_LOCAL">
-		<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
-		<class>org.onap.policy.jpa.BackUpMonitorEntity</class>
-		<property name="javax.persistence.schema-generation.scripts.action"
-			value="drop-and-create" />
-		<property name="javax.persistence.schema-generation.scripts.create-target"
-			value="./src/test/resources/META-INF/generatedCreate.ddl" />
-		<property name="javax.persistence.schema-generation.scripts.drop-target"
-			value="./src/test/resources/META-INF/generatedDrop.ddl" />
-		<property name="javax.persistence.schema-generation.database.action"
-			value="drop-and-create" />
-		<property name="javax.persistence.schema-generation.create-source"
-			value="metadata-then-script" />
-		<property name="javax.persistence.schema-generation.drop-source"
-			value="script" />
-		<property name="javax.persistence.schema-generation.drop-script-source"
-			value="META-INF/drop.ddl" />
-	</persistence-unit>
+    xmlns="http://xmlns.jcp.org/xml/ns/persistence"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
+    <persistence-unit name="PolicyEngineUtils"
+        transaction-type="RESOURCE_LOCAL">
+        <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
+        <class>org.onap.policy.jpa.BackUpMonitorEntity</class>
+        <property
+            name="javax.persistence.schema-generation.scripts.action"
+            value="drop-and-create" />
+        <property
+            name="javax.persistence.schema-generation.scripts.create-target"
+            value="./src/test/resources/META-INF/generatedCreate.ddl" />
+        <property
+            name="javax.persistence.schema-generation.scripts.drop-target"
+            value="./src/test/resources/META-INF/generatedDrop.ddl" />
+        <property
+            name="javax.persistence.schema-generation.database.action"
+            value="drop-and-create" />
+        <property
+            name="javax.persistence.schema-generation.create-source"
+            value="metadata-then-script" />
+        <property
+            name="javax.persistence.schema-generation.drop-source"
+            value="script" />
+        <property
+            name="javax.persistence.schema-generation.drop-script-source"
+            value="META-INF/drop.ddl" />
+    </persistence-unit>
 </persistence>