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, 45 insertions, 32 deletions

diff --git a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/DictionaryControllerTest.java b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/DictionaryControllerTest.java
index 89be75f52..52b79b88f 100644
--- a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/DictionaryControllerTest.java
+++ b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/DictionaryControllerTest.java
@@ -2,14 +2,14 @@
  * ============LICENSE_START=======================================================
  * ONAP-PAP-REST
  * ================================================================================
- * Copyright (C) 2017-2018 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.
@@ -18,7 +18,6 @@
  * ============LICENSE_END=========================================================
  */
 
-
 package org.onap.policy.pap.xacml.rest.controller;
 
 import static org.junit.Assert.assertTrue;
@@ -70,12 +69,12 @@ public class DictionaryControllerTest {
         commonClassDao = Mockito.mock(CommonClassDao.class);
 
         MicroServiceModels testData = new MicroServiceModels();
-        testData.setVersion("1707.4.1.2-Junit");        
+        testData.setVersion("1707.4.1.2-Junit");
 
-        //--- mock the getDataByColumn() call
-        List<String>  microList = new ArrayList<String>();
+        // --- mock the getDataByColumn() call
+        List<String> microList = new ArrayList<String>();
         microList.add("123");
-        List<Object>  listId = new ArrayList<Object>();
+        List<Object> listId = new ArrayList<Object>();
         when(commonClassDao.getDataByColumn(Attribute.class, "xacmlId")).thenReturn(microList);
         List<Object> object = new ArrayList<>();
         object.add(new Category());
@@ -83,9 +82,9 @@ public class DictionaryControllerTest {
         PolicyEditorScopes editorScope = new PolicyEditorScopes();
         doNothing().when(commonClassDao).save(editorScope);
         doNothing().when(commonClassDao).update(editorScope);
-        
+
         when(commonClassDao.getData(Attribute.class)).thenReturn(listId);
-        
+
         request = mock(HttpServletRequest.class);
         controller = new DictionaryController(commonClassDao);
         new DictionaryUtils(commonClassDao);
@@ -98,12 +97,13 @@ public class DictionaryControllerTest {
     public void testGetAttributeDictionaryEntityDatabyAttributeName() {
         logger.info("testGetAttributeDictionaryEntityDatabyAttributeName: Entering");
 
-        MockHttpServletResponse response =  new MockHttpServletResponse();
+        MockHttpServletResponse response = new MockHttpServletResponse();
 
         controller.getAttributeDictionaryEntityDatabyAttributeName(response);
 
         try {
-            assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("attributeDictionaryDatas"));
+            assertTrue(response.getContentAsString() != null
+                    && response.getContentAsString().contains("attributeDictionaryDatas"));
             logger.info("response.getContentAsString(): " + response.getContentAsString());
         } catch (UnsupportedEncodingException e) {
             fail("Exception: " + e);
@@ -116,12 +116,13 @@ public class DictionaryControllerTest {
     public void testGetAttributeDictionaryEntityData() {
         logger.info("testGetAttributeDictionaryEntityData: Entering");
 
-        MockHttpServletResponse response =  new MockHttpServletResponse();
+        MockHttpServletResponse response = new MockHttpServletResponse();
 
         controller.getAttributeDictionaryEntityData(response);
 
         try {
-            assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("attributeDictionaryDatas"));
+            assertTrue(response.getContentAsString() != null
+                    && response.getContentAsString().contains("attributeDictionaryDatas"));
             logger.info("response.getContentAsString(): " + response.getContentAsString());
         } catch (UnsupportedEncodingException e) {
             fail("Exception: " + e);
@@ -134,16 +135,22 @@ public class DictionaryControllerTest {
     public void testSaveAttributeDictionary() {
         logger.info("testSaveAttributeDictionary: Entering");
 
-        MockHttpServletResponse response =  new MockHttpServletResponse();
+        MockHttpServletResponse response = new MockHttpServletResponse();
         request = mock(HttpServletRequest.class);
-        
+
         try {
-            jsonString = "{\"attributeDictionaryData\":{\"datatypeBean\":{\"shortName\":\"string\"},\"description\":\"Qwerty\",\"priority\":\"High\",\"userDataTypeValues\":[{\"$$hashKey\":\"object:641\",\"attributeValues\":\"test\",\"id\":\"choice1\"},{\"$$hashKey\":\"object:646\",\"attributeValues\":\"test\",\"id\":\"choice2\"}],\"xacmlId\":\"Qwerty\"},\"userid\":\"demo\"}";
+            jsonString =
+                    "{\"attributeDictionaryData\":{\"datatypeBean\":{\"shortName\":\"string\"},\"description\":"
+                            + "\"Qwerty\",\"priority\":\"High\",\"userDataTypeValues\":[{\"$$hashKey\":"
+                            + "\"object:641\",\"attributeValues\":\"test\",\"id\":\"choice1\"},{\"$$hashKey\":"
+                            + "\"object:646\",\"attributeValues\":\"test\",\"id\":\"choice2\"}],\"xacmlId\":"
+                            + "\"Qwerty\"},\"userid\":\"demo\"}";
             BufferedReader br = new BufferedReader(new StringReader(jsonString));
             when(request.getReader()).thenReturn(br);
             controller.saveAttributeDictionary(request, response);
             logger.info("response.getContentAsString(): " + response.getContentAsString());
-            assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("attributeDictionaryDatas"));
+            assertTrue(response.getContentAsString() != null
+                    && response.getContentAsString().contains("attributeDictionaryDatas"));
 
         } catch (Exception e) {
             fail("Exception: " + e);
@@ -156,16 +163,17 @@ public class DictionaryControllerTest {
     public void testRemoveAttributeDictionary() {
         logger.info("testRemoveAttributeDictionary: Entering");
 
-        MockHttpServletResponse response =  new MockHttpServletResponse();
+        MockHttpServletResponse response = new MockHttpServletResponse();
         request = mock(HttpServletRequest.class);
 
         try {
             jsonString = "{\"userid\":\"demo\",\"data\":{\"id\":1,\"description\":\"test\",\"xacmlId\":\"Test\"}}";
-                BufferedReader br = new BufferedReader(new StringReader(jsonString));
+            BufferedReader br = new BufferedReader(new StringReader(jsonString));
             when(request.getReader()).thenReturn(br);
             controller.removeAttributeDictionary(request, response);
             logger.info("response.getContentAsString(): " + response.getContentAsString());
-            assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("attributeDictionaryDatas"));
+            assertTrue(response.getContentAsString() != null
+                    && response.getContentAsString().contains("attributeDictionaryDatas"));
 
         } catch (Exception e) {
             fail("Exception: " + e);
@@ -178,12 +186,13 @@ public class DictionaryControllerTest {
     public void testGetOnapNameDictionaryByNameEntityData() {
         logger.info("testGetOnapNameDictionaryByNameEntityData: Entering");
 
-        MockHttpServletResponse response =  new MockHttpServletResponse();
+        MockHttpServletResponse response = new MockHttpServletResponse();
 
         controller.getOnapNameDictionaryByNameEntityData(response);
 
         try {
-            assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("onapNameDictionaryDatas"));
+            assertTrue(response.getContentAsString() != null
+                    && response.getContentAsString().contains("onapNameDictionaryDatas"));
             logger.info("response.getContentAsString(): " + response.getContentAsString());
         } catch (UnsupportedEncodingException e) {
             fail("Exception: " + e);
@@ -196,12 +205,13 @@ public class DictionaryControllerTest {
     public void testGetOnapNameDictionaryEntityData() {
         logger.info("testGetOnapNameDictionaryEntityData: Entering");
 
-        MockHttpServletResponse response =  new MockHttpServletResponse();
+        MockHttpServletResponse response = new MockHttpServletResponse();
 
         controller.getOnapNameDictionaryEntityData(response);
 
         try {
-            assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("onapNameDictionaryDatas"));
+            assertTrue(response.getContentAsString() != null
+                    && response.getContentAsString().contains("onapNameDictionaryDatas"));
             logger.info("response.getContentAsString(): " + response.getContentAsString());
         } catch (UnsupportedEncodingException e) {
             fail("Exception: " + e);
@@ -215,16 +225,18 @@ public class DictionaryControllerTest {
 
         logger.info("testSaveOnapDictionary: Entering");
 
-        MockHttpServletResponse response =  new MockHttpServletResponse();
+        MockHttpServletResponse response = new MockHttpServletResponse();
         request = mock(HttpServletRequest.class);
-        
+
         try {
-            jsonString = "{\"userid\":\"demo\",\"onapNameDictionaryData\":{\"description\":\"test\",\"onapName\":\"Test\"}}";
+            jsonString =
+                    "{\"userid\":\"demo\",\"onapNameDictionaryData\":{\"description\":\"test\",\"onapName\":\"Test\"}}";
             BufferedReader br = new BufferedReader(new StringReader(jsonString));
             when(request.getReader()).thenReturn(br);
             controller.saveOnapDictionary(request, response);
             logger.info("response.getContentAsString(): " + response.getContentAsString());
-            assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("onapNameDictionaryDatas"));
+            assertTrue(response.getContentAsString() != null
+                    && response.getContentAsString().contains("onapNameDictionaryDatas"));
 
         } catch (Exception e) {
             fail("Exception: " + e);
@@ -237,16 +249,17 @@ public class DictionaryControllerTest {
     public void testRemoveOnapDictionary() {
         logger.info("testRemoveOnapDictionary: Entering");
 
-        MockHttpServletResponse response =  new MockHttpServletResponse();
+        MockHttpServletResponse response = new MockHttpServletResponse();
         request = mock(HttpServletRequest.class);
 
         try {
             jsonString = "{\"userid\":\"demo\",\"data\":{\"id\":1,\"description\":\"test\",\"onapName\":\"Test\"}}";
-                BufferedReader br = new BufferedReader(new StringReader(jsonString));
+            BufferedReader br = new BufferedReader(new StringReader(jsonString));
             when(request.getReader()).thenReturn(br);
             controller.removeOnapDictionary(request, response);
             logger.info("response.getContentAsString(): " + response.getContentAsString());
-            assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("onapNameDictionaryDatas"));
+            assertTrue(response.getContentAsString() != null
+                    && response.getContentAsString().contains("onapNameDictionaryDatas"));
 
         } catch (Exception e) {
             fail("Exception: " + e);