Remove model-imp/rest checkstyle suppressions

Renamed "RESTManager" class to "RestManager".  This did not require
any changes to rules.
Updated license data in pom.

Change-Id: Ide59b99b8c5d939804b7540c71a686404195173c
Issue-ID: POLICY-1141
Signed-off-by: Jim Hahn <jrh3@att.com>

2 files changed, 9 insertions, 9 deletions

diff --git a/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcManager.java b/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcManager.java
index 2a004bd04..7cca6c51b 100644
--- a/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcManager.java
+++ b/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcManager.java
@@ -26,8 +26,8 @@ import java.util.Map;
 
 import org.drools.core.WorkingMemory;
 import org.onap.policy.drools.system.PolicyEngine;
-import org.onap.policy.rest.RESTManager;
-import org.onap.policy.rest.RESTManager.Pair;
+import org.onap.policy.rest.RestManager;
+import org.onap.policy.rest.RestManager.Pair;
 import org.onap.policy.vfc.util.Serialization;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -45,7 +45,7 @@ public final class VfcManager implements Runnable {
             LoggerFactory.getLogger(org.onap.policy.common.endpoints.event.comm.Topic.NETWORK_LOGGER);
 
     // The REST manager used for processing REST calls for this VFC manager
-    private RESTManager restManager;
+    private RestManager restManager;
 
     /**
      * Constructor.
@@ -61,7 +61,7 @@ public final class VfcManager implements Runnable {
         workingMem = wm;
         vfcRequest = request;
 
-        restManager = new RESTManager();
+        restManager = new RestManager();
 
         // use getPEManagerEnvProperty() for required properties; others are optional
         setVfcParams(getPeManagerEnvProperty("vfc.url"), PolicyEngine.manager.getEnvironmentProperty("vfc.username"),
@@ -166,7 +166,7 @@ public final class VfcManager implements Runnable {
      * 
      * @param restManager the test REST manager
      */
-    protected void setRestManager(final RESTManager restManager) {
+    protected void setRestManager(final RestManager restManager) {
         this.restManager = restManager;
     }
 
diff --git a/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/VfcManagerTest.java b/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/VfcManagerTest.java
index f5d06de36..f9e6e8260 100644
--- a/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/VfcManagerTest.java
+++ b/controlloop/common/model-impl/vfc/src/test/java/org/onap/policy/vfc/VfcManagerTest.java
@@ -42,14 +42,14 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.onap.policy.drools.system.PolicyEngine;
-import org.onap.policy.rest.RESTManager;
-import org.onap.policy.rest.RESTManager.Pair;
+import org.onap.policy.rest.RestManager;
+import org.onap.policy.rest.RestManager.Pair;
 import org.onap.policy.vfc.util.Serialization;
 
 public class VfcManagerTest {
     private static WorkingMemory mockedWorkingMemory;
 
-    private RESTManager   mockedRestManager;
+    private RestManager   mockedRestManager;
 
     private Pair<Integer, String> httpResponsePutOk;
     private Pair<Integer, String> httpResponseGetOk;
@@ -69,7 +69,7 @@ public class VfcManagerTest {
      */
     @Before
     public void setupMockedRest() {
-        mockedRestManager   = mock(RESTManager.class);
+        mockedRestManager   = mock(RestManager.class);
 
         httpResponsePutOk       = mockedRestManager.new Pair<>(202, Serialization.gsonPretty.toJson(response));
         httpResponseGetOk       = mockedRestManager.new Pair<>(200, Serialization.gsonPretty.toJson(response));