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, 9 insertions, 5 deletions

diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/util/JsonMessage.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/util/JsonMessage.java
index 6ea0c79ee..cafeb0c92 100644
--- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/util/JsonMessage.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/util/JsonMessage.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP-PAP-REST
  * ================================================================================
- * 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.
@@ -25,17 +25,19 @@ public class JsonMessage {
     private String data;
     private String data2;
     private String data3;
+
     public JsonMessage(String data) {
         super();
         this.data = data;
     }
-    public JsonMessage(String data,String data2) {
+
+    public JsonMessage(String data, String data2) {
         super();
         this.data = data;
         this.data2 = data2;
     }
 
-    public JsonMessage(String data,String data2,String data3) {
+    public JsonMessage(String data, String data2, String data3) {
         super();
         this.data = data;
         this.data2 = data2;
@@ -49,19 +51,21 @@ public class JsonMessage {
     public void setData(String data) {
         this.data = data;
     }
+
     public String getData2() {
         return data2;
     }
+
     public void setData2(String data2) {
         this.data2 = data2;
     }
+
     public String getData3() {
         return data3;
     }
+
     public void setData3(String data3) {
         this.data3 = data3;
     }
 
-
 }
-