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, 13 insertions, 13 deletions

diff --git a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/elk/ElkConnectorImplTest.java b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/elk/ElkConnectorImplTest.java
index 2f3d580f7..87f56e284 100644
--- a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/elk/ElkConnectorImplTest.java
+++ b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/elk/ElkConnectorImplTest.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.
@@ -25,6 +25,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+
 import io.searchbox.client.JestResult;
 
 import java.io.IOException;
@@ -56,41 +57,41 @@ public class ElkConnectorImplTest {
     }
 
     @Test
-    public void searchTest(){
-        JestResult r1=null, r2=null, r3=null, r4=null;
+    public void searchTest() {
+        JestResult r1 = null, r2 = null, r3 = null, r4 = null;
 
         // Should always work if the above test passes and ELK server is up
-        try{
+        try {
             r1 = new ElkConnectorImpl().search(PolicyIndexType.decision, "abc123");
         } catch (Exception e) {
             // ELK server is down. Don't continue the test
-            if(e instanceof IllegalStateException){
+            if (e instanceof IllegalStateException) {
                 return;
             }
             fail();
         }
 
         // Should always work
-        try{
+        try {
             r2 = new ElkConnectorImpl().search(PolicyIndexType.decision, "The_quick_brown_fox_jumps_over_the_lazy_dog");
         } catch (Exception e) {
             fail();
         }
 
         // Should throw exception
-        try{
+        try {
             r3 = new ElkConnectorImpl().search(PolicyIndexType.decision, "abc123{}");
         } catch (Exception e) {
-            if(! (e instanceof IllegalArgumentException)){
+            if (!(e instanceof IllegalArgumentException)) {
                 fail();
             }
         }
 
         // Should throw exception
-        try{
+        try {
             r4 = new ElkConnectorImpl().search(PolicyIndexType.decision, "The quick brown fox jumps over the lazy dog");
         } catch (Exception e) {
-            if(! (e instanceof IllegalArgumentException)){
+            if (!(e instanceof IllegalArgumentException)) {
                 fail();
             }
         }
@@ -114,7 +115,6 @@ public class ElkConnectorImplTest {
         fail("Expected exception to be thrown");
     }
 
-
     @Test
     public void testPut() throws IOException {
         thrown.expect(NullPointerException.class);