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, 14 insertions, 10 deletions

diff --git a/controlloop/common/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncManager.java b/controlloop/common/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncManager.java
index 61665f684..2e39cd9e1 100644
--- a/controlloop/common/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncManager.java
+++ b/controlloop/common/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncManager.java
@@ -1,7 +1,9 @@
-/*-
+/*
  * ============LICENSE_START=======================================================
  * Copyright (C) 2018 Huawei. All rights reserved.
  * ================================================================================
+ * 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.
  * You may obtain a copy of the License at
@@ -26,8 +28,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.sdnc.util.Serialization;
 
 import org.slf4j.Logger;
@@ -46,7 +48,7 @@ public final class SdncManager implements Runnable {
             LoggerFactory.getLogger(org.onap.policy.common.endpoints.event.comm.Topic.NETWORK_LOGGER);
 
     // The REST manager used for processing REST calls for this Sdnc manager
-    private RESTManager restManager;
+    private RestManager restManager;
     
     /**
      * Constructor.
@@ -63,7 +65,7 @@ public final class SdncManager implements Runnable {
         workingMem = wm;
         sdncRequest = request;
 
-        restManager = new RESTManager();
+        restManager = new RestManager();
 
         setSdncParams(getPeManagerEnvProperty("sdnc.url"), getPeManagerEnvProperty("sdnc.username"), 
             getPeManagerEnvProperty("sdnc.password"));
@@ -140,7 +142,7 @@ public final class SdncManager implements Runnable {
      * Protected setter for rest manager to allow mocked rest manager to be used for testing.
      * @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/sdnc/src/test/java/org/onap/policy/sdnc/SdncManagerTest.java b/controlloop/common/model-impl/sdnc/src/test/java/org/onap/policy/sdnc/SdncManagerTest.java
index b5ddec1be..2431fc715 100644
--- a/controlloop/common/model-impl/sdnc/src/test/java/org/onap/policy/sdnc/SdncManagerTest.java
+++ b/controlloop/common/model-impl/sdnc/src/test/java/org/onap/policy/sdnc/SdncManagerTest.java
@@ -4,6 +4,8 @@
  * ================================================================================
  * Copyright (C) 2018 Huawei. All rights reserved.
  * ================================================================================
+ * 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.
  * You may obtain a copy of the License at
@@ -43,14 +45,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.sdnc.util.Serialization;
 
 public class SdncManagerTest {
     private static WorkingMemory mockedWorkingMemory;
 
-    private RESTManager   mockedRestManager;
+    private RestManager   mockedRestManager;
 
     private Pair<Integer, String> httpResponsePutOk;
     private Pair<Integer, String> httpResponseGetOk;
@@ -70,7 +72,7 @@ public class SdncManagerTest {
      */
     @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));