6 files changed, 20 insertions, 51 deletions
diff --git a/controlloop/common/model-impl/rest/checkstyle-suppressions.xml b/controlloop/common/model-impl/rest/checkstyle-suppressions.xml
deleted file mode 100644
index 19202a9f0..000000000
--- a/controlloop/common/model-impl/rest/checkstyle-suppressions.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  ============LICENSE_START=======================================================
-   Copyright (C) 2018 AT&T Technologies. 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.
-  
-  SPDX-License-Identifier: Apache-2.0
-  ============LICENSE_END=========================================================
--->
- 
-<!DOCTYPE suppressions PUBLIC
-     "-//Puppy Crawl//DTD Suppressions 1.0//EN"
-     "http://www.puppycrawl.com/dtds/suppressions_1_0.dtd">
- 
-<suppressions>
-  <suppress checks="AbbreviationAsWordInName"
-    files="RESTManager.java"
-    lines="1-9999"/>
-</suppressions>
diff --git a/controlloop/common/model-impl/rest/pom.xml b/controlloop/common/model-impl/rest/pom.xml
index d2a1dc041..43f84fe76 100644
--- a/controlloop/common/model-impl/rest/pom.xml
+++ b/controlloop/common/model-impl/rest/pom.xml
@@ -2,7 +2,7 @@
   ============LICENSE_START=======================================================
   Drools PDP Application Models
   ================================================================================
-  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.
@@ -70,7 +70,6 @@
                             <includeTestResources>true</includeTestResources>
                             <excludes>
                             </excludes>
-                            <suppressionsLocation>${project.basedir}/checkstyle-suppressions.xml</suppressionsLocation>
                             <consoleOutput>true</consoleOutput>
                             <failsOnViolation>true</failsOnViolation>
                             <violationSeverity>warning</violationSeverity>
diff --git a/controlloop/common/model-impl/rest/src/main/java/org/onap/policy/rest/RESTManager.java b/controlloop/common/model-impl/rest/src/main/java/org/onap/policy/rest/RestManager.java
index a7e373b5f..84a220b9a 100644
--- a/controlloop/common/model-impl/rest/src/main/java/org/onap/policy/rest/RESTManager.java
+++ b/controlloop/common/model-impl/rest/src/main/java/org/onap/policy/rest/RestManager.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * 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.
@@ -38,9 +38,9 @@ import org.apache.http.util.EntityUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class RESTManager {
+public class RestManager {
 
-    private static final Logger logger = LoggerFactory.getLogger(RESTManager.class);
+    private static final Logger logger = LoggerFactory.getLogger(RestManager.class);
 
     public class Pair<A, B> {
         public final A first;
diff --git a/controlloop/common/model-impl/rest/src/test/java/org/onap/policy/rest/GetTest.java b/controlloop/common/model-impl/rest/src/test/java/org/onap/policy/rest/GetTest.java
index 11366c6a0..37e38ec70 100755
--- a/controlloop/common/model-impl/rest/src/test/java/org/onap/policy/rest/GetTest.java
+++ b/controlloop/common/model-impl/rest/src/test/java/org/onap/policy/rest/GetTest.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * 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.
@@ -24,19 +24,19 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
-import org.onap.policy.rest.RESTManager.Pair;
+import org.onap.policy.rest.RestManager.Pair;
 
 public class GetTest {
 
     @Test(expected = NullPointerException.class)
     public void testUrlNull() {
-        RESTManager mgr = new RESTManager();
+        RestManager mgr = new RestManager();
         mgr.get(null, "user", null, null);
     }
 
     @Test
     public void testUsernameNull() {
-        RESTManager mgr = new RESTManager();
+        RestManager mgr = new RestManager();
 
         Pair<Integer, String> result = mgr.get("http://www.example.org", null, null, null);
         assertEquals((Integer)200, result.first);
@@ -46,7 +46,7 @@ public class GetTest {
 
     @Test
     public void testUsernameEmpty() {
-        RESTManager mgr = new RESTManager();
+        RestManager mgr = new RestManager();
 
         Pair<Integer, String> result = mgr.get("http://www.example.org", "", null, null);
         assertEquals((Integer)200, result.first);
@@ -56,11 +56,11 @@ public class GetTest {
 
     @Test
     public void testUrlExampleOrg() {
-        RESTManager mgr = new RESTManager();
+        RestManager mgr = new RestManager();
 
         Pair<Integer, String> result = mgr.get("http://www.example.org", "user", null, null);
         assertEquals((Integer)200, result.first);
         assertTrue(result.second != null);
         assertTrue(result.second.length() > 0);
     }
-}
-\ No newline at end of file
+}
diff --git a/controlloop/common/model-impl/rest/src/test/java/org/onap/policy/rest/PairTest.java b/controlloop/common/model-impl/rest/src/test/java/org/onap/policy/rest/PairTest.java
index e245eabdb..6269e9de4 100755
--- a/controlloop/common/model-impl/rest/src/test/java/org/onap/policy/rest/PairTest.java
+++ b/controlloop/common/model-impl/rest/src/test/java/org/onap/policy/rest/PairTest.java
@@ -1,8 +1,8 @@
-/*-
+/*
  * ============LICENSE_START=======================================================
  * rest
  * ================================================================================
- * 
+ * Modifications Copyright (C) 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.
@@ -23,13 +23,13 @@ package org.onap.policy.rest;
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
-import org.onap.policy.rest.RESTManager.Pair;
+import org.onap.policy.rest.RestManager.Pair;
 
 public class PairTest {
 
     @Test
     public void testPair() {
-        RESTManager mgr = new RESTManager();
+        RestManager mgr = new RestManager();
 
         Pair<Integer, Integer> pii = mgr.new Pair<>(1, 2);
         assertEquals((Integer) 1, (Integer) pii.first);
diff --git a/controlloop/common/model-impl/rest/src/test/java/org/onap/policy/rest/PostTest.java b/controlloop/common/model-impl/rest/src/test/java/org/onap/policy/rest/PostTest.java
index aedd0b288..834c29873 100755
--- a/controlloop/common/model-impl/rest/src/test/java/org/onap/policy/rest/PostTest.java
+++ b/controlloop/common/model-impl/rest/src/test/java/org/onap/policy/rest/PostTest.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * 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.
@@ -23,27 +23,27 @@ package org.onap.policy.rest;
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
-import org.onap.policy.rest.RESTManager.Pair;
+import org.onap.policy.rest.RestManager.Pair;
 
 public class PostTest {
 
     @Test
     public void testUsernameNull() {
-        RESTManager mgr = new RESTManager();
+        RestManager mgr = new RestManager();
         Pair<Integer, String> result = mgr.post("http://www.example.org", null, null, null, null, null);
         assertEquals(null, result);
     }
 
     @Test
     public void testUsernameEmpty() {
-        RESTManager mgr = new RESTManager();
+        RestManager mgr = new RestManager();
         Pair<Integer, String> result = mgr.post("http://www.example.org", "", null, null, null, null);
         assertEquals(null, result);
     }
 
     @Test
     public void testBodyNull() {
-        RESTManager mgr = new RESTManager();
+        RestManager mgr = new RestManager();
         Pair<Integer, String> result = mgr.post("http://www.example.org", "user", null, null, null, null);
         assertEquals(null, result);
     }