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>

diff --git a/controlloop/common/actors/actor.appclcm/src/main/java/org/onap/policy/controlloop/actor/appclcm/AppcLcmActorServiceProvider.java b/controlloop/common/actors/actor.appclcm/src/main/java/org/onap/policy/controlloop/actor/appclcm/AppcLcmActorServiceProvider.java
index b4151a9..049a77a 100644 (file)
--- a/controlloop/common/actors/actor.appclcm/src/main/java/org/onap/policy/controlloop/actor/appclcm/AppcLcmActorServiceProvider.java
+++ b/controlloop/common/actors/actor.appclcm/src/main/java/org/onap/policy/controlloop/actor/appclcm/AppcLcmActorServiceProvider.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * AppcLcmActorServiceProvider
  * ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
  * Modifications copyright (c) 2018 Nokia
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -52,7 +52,7 @@ import org.onap.policy.controlloop.actorserviceprovider.spi.Actor;
 import org.onap.policy.controlloop.policy.Policy;
 import org.onap.policy.controlloop.policy.PolicyResult;
 import org.onap.policy.drools.system.PolicyEngine;
-import org.onap.policy.rest.RESTManager;
+import org.onap.policy.rest.RestManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -162,7 +162,7 @@ public class AppcLcmActorServiceProvider implements Actor {
         aaiRequest.setInstanceFilters(new AaiNqInstanceFilters());
         aaiRequest.getInstanceFilters().getInstanceFilter().add(filter);
 
-        AaiNqResponse aaiResponse = new AaiManager(new RESTManager()).postQuery(getPeManagerEnvProperty("aai.url"),
+        AaiNqResponse aaiResponse = new AaiManager(new RestManager()).postQuery(getPeManagerEnvProperty("aai.url"),
                 getPeManagerEnvProperty("aai.username"), getPeManagerEnvProperty("aai.password"), aaiRequest,
                 requestId);
 

diff --git a/controlloop/common/actors/actor.vfc/src/main/java/org/onap/policy/controlloop/actor/vfc/VfcActorServiceProvider.java b/controlloop/common/actors/actor.vfc/src/main/java/org/onap/policy/controlloop/actor/vfc/VfcActorServiceProvider.java
index 323b54d..098f1b7 100644 (file)
--- a/controlloop/common/actors/actor.vfc/src/main/java/org/onap/policy/controlloop/actor/vfc/VfcActorServiceProvider.java
+++ b/controlloop/common/actors/actor.vfc/src/main/java/org/onap/policy/controlloop/actor/vfc/VfcActorServiceProvider.java
@@ -33,7 +33,7 @@ import org.onap.policy.controlloop.VirtualControlLoopEvent;
 import org.onap.policy.controlloop.actorserviceprovider.spi.Actor;
 import org.onap.policy.controlloop.policy.Policy;
 import org.onap.policy.drools.system.PolicyEngine;
-import org.onap.policy.rest.RESTManager;
+import org.onap.policy.rest.RestManager;
 import org.onap.policy.vfc.VfcHealActionVmInfo;
 import org.onap.policy.vfc.VfcHealAdditionalParams;
 import org.onap.policy.vfc.VfcHealRequest;
@@ -134,11 +134,11 @@ public class VfcActorServiceProvider implements Actor {
         try {
             if (vnfName != null) {
                 String url = aaiUrl + "/aai/v11/network/generic-vnfs/generic-vnf?vnf-name=";
-                response = new AaiManager(new RESTManager()).getQueryByVnfName(url, aaiUsername, aaiPassword, requestId,
+                response = new AaiManager(new RestManager()).getQueryByVnfName(url, aaiUsername, aaiPassword, requestId,
                         vnfName);
             } else if (vnfId != null) {
                 String url = aaiUrl + "/aai/v11/network/generic-vnfs/generic-vnf/";
-                response = new AaiManager(new RESTManager()).getQueryByVnfId(url, aaiUsername, aaiPassword, requestId,
+                response = new AaiManager(new RestManager()).getQueryByVnfId(url, aaiUsername, aaiPassword, requestId,
                         vnfId);
             } else {
                 logger.error("getAAIServiceInstance failed");

diff --git a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManager.java b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManager.java
index e9fc277..f063789 100644 (file)
--- a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManager.java
+++ b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManager.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * controlloop event manager
  * ================================================================================
- * 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.
@@ -58,7 +58,7 @@ import org.onap.policy.guard.LockCallback;
 import org.onap.policy.guard.PolicyGuard;
 import org.onap.policy.guard.PolicyGuard.LockResult;
 import org.onap.policy.guard.TargetLock;
-import org.onap.policy.rest.RESTManager;
+import org.onap.policy.rest.RestManager;
 import org.onap.policy.so.util.Serialization;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -885,7 +885,7 @@ public class ControlLoopEventManager implements LockCallback, Serializable {
                 String aaiGetQueryByVserver = "/aai/v11/nodes/vservers?vserver-name=";
                 String url = aaiHostUrl + aaiGetQueryByVserver;
                 logger.info("AAI Host URL by VServer: {}", url);
-                response = new AaiManager(new RESTManager()).getQueryByVserverName(url, aaiUser, aaiPassword, requestId,
+                response = new AaiManager(new RestManager()).getQueryByVserverName(url, aaiUser, aaiPassword, requestId,
                         vserverName);
             }
         } catch (Exception e) {
@@ -918,14 +918,14 @@ public class ControlLoopEventManager implements LockCallback, Serializable {
                 String aaiGetQueryByVnfName = "/aai/v11/network/generic-vnfs/generic-vnf?vnf-name=";
                 String url = aaiHostUrl + aaiGetQueryByVnfName;
                 logger.info("AAI Host URL by VNF name: {}", url);
-                response = new AaiManager(new RESTManager()).getQueryByVnfName(url, aaiUser, aaiPassword, requestId,
+                response = new AaiManager(new RestManager()).getQueryByVnfName(url, aaiUser, aaiPassword, requestId,
                         vnfName);
             } else if (vnfId != null) {
                 String aaiGetQueryByVnfId = "/aai/v11/network/generic-vnfs/generic-vnf/";
                 String url = aaiHostUrl + aaiGetQueryByVnfId;
                 logger.info("AAI Host URL by VNF ID: {}", url);
                 response =
-                        new AaiManager(new RESTManager()).getQueryByVnfId(url, aaiUser, aaiPassword, requestId, vnfId);
+                        new AaiManager(new RestManager()).getQueryByVnfId(url, aaiUser, aaiPassword, requestId, vnfId);
             }
         } catch (Exception e) {
             logger.error("getAAIVnfInfo exception: ", e);
@@ -975,7 +975,7 @@ public class ControlLoopEventManager implements LockCallback, Serializable {
             logger.debug("AAI Request sent: {}", Serialization.gsonPretty.toJson(aaiNqRequest));
         }
 
-        AaiNqResponse aaiNqResponse = new AaiManager(new RESTManager()).postQuery(getPeManagerEnvProperty(AAI_URL),
+        AaiNqResponse aaiNqResponse = new AaiManager(new RestManager()).postQuery(getPeManagerEnvProperty(AAI_URL),
                 getPeManagerEnvProperty(AAI_USERNAME_PROPERTY), getPeManagerEnvProperty(AAI_PASS_PROPERTY), 
                 aaiNqRequest, onset.getRequestId());
 

diff --git a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AaiManager.java b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AaiManager.java
index b54981d..96d606a 100644 (file)
--- a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AaiManager.java
+++ b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AaiManager.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * aai
  * ================================================================================
- * 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.
@@ -27,8 +27,8 @@ import java.util.Map;
 import java.util.UUID;
 
 import org.onap.policy.aai.util.Serialization;
-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.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -49,14 +49,14 @@ public final class AaiManager {
 
     /** The rest manager. */
     // The REST manager used for processing REST calls for this AAI manager
-    private final RESTManager restManager;
+    private final RestManager restManager;
 
     /**
      * Constructor, create the AAI manager with the specified REST manager.
      *
      * @param restManager the rest manager to use for REST calls
      */
-    public AaiManager(final RESTManager restManager) {
+    public AaiManager(final RestManager restManager) {
         this.restManager = restManager;
     }
 
@@ -76,12 +76,12 @@ public final class AaiManager {
 
         url = url + "/aai/search/named-query";
 
-        logger.debug("RESTManager.post before");
+        logger.debug("RestManager.post before");
         String requestJson = Serialization.gsonPretty.toJson(request);
         netLogger.info("[OUT|{}|{}|]{}{}", "AAI", url, LINE_SEPARATOR, requestJson);
         Pair<Integer, String> httpDetails =
                 restManager.post(url, username, password, headers, "application/json", requestJson);
-        logger.debug("RESTManager.post after");
+        logger.debug("RestManager.post after");
 
         if (httpDetails == null) {
             logger.info("AAI POST Null Response to {}", url);

diff --git a/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/AaiManagerTest.java b/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/AaiManagerTest.java
index 32a0295..3717740 100644 (file)
--- a/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/AaiManagerTest.java
+++ b/controlloop/common/model-impl/aai/src/test/java/org/onap/policy/aai/AaiManagerTest.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * aai
  * ================================================================================
- * 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.
@@ -37,11 +37,11 @@ import java.util.UUID;
 import org.junit.Before;
 import org.junit.Test;
 import org.onap.policy.aai.util.Serialization;
-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;
 
 public class AaiManagerTest {
-    RESTManager restManagerMock;
+    RestManager restManagerMock;
     UUID aaiNqRequestUuid = UUID.randomUUID();
     Pair<Integer, String> httpResponseOk;
     Pair<Integer, String> httpResponseErr0;
@@ -53,7 +53,7 @@ public class AaiManagerTest {
      */
     @Before
     public void beforeTestAaiManager() {
-        restManagerMock = mock(RESTManager.class);
+        restManagerMock = mock(RestManager.class);
 
         Map<String, String> expectedHeaders = new HashMap<>();
         expectedHeaders.put("X-FromAppId", "POLICY");

diff --git a/controlloop/common/model-impl/rest/checkstyle-suppressions.xml b/controlloop/common/model-impl/rest/checkstyle-suppressions.xml
deleted file mode 100644 (file)
index 19202a9..0000000
--- 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 d2a1dc0..43f84fe 100644 (file)
--- 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
similarity index 98%
rename from controlloop/common/model-impl/rest/src/main/java/org/onap/policy/rest/RESTManager.java
rename to controlloop/common/model-impl/rest/src/main/java/org/onap/policy/rest/RestManager.java
index a7e373b..84a220b 100644 (file)
--- 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 11366c6..37e38ec 100755 (executable)
--- 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 e245eab..6269e9d 100755 (executable)
--- 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 aedd0b2..834c298 100755 (executable)
--- 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);
     }

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 61665f6..2e39cd9 100644 (file)
--- 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 b5ddec1..2431fc7 100644 (file)
--- 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));

diff --git a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SoManager.java b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SoManager.java
index 632c489..20136f7 100644 (file)
--- a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SoManager.java
+++ b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SoManager.java
@@ -30,8 +30,8 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 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.so.util.Serialization;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -58,7 +58,7 @@ public final class SoManager {
     private static final long GET_REQUEST_WAIT_INTERVAL = 20000;
 
     // The REST manager used for processing REST calls for this VFC manager
-    private RESTManager restManager;
+    private RestManager restManager;
 
     private long restGetTimeout = GET_REQUEST_WAIT_INTERVAL;
 
@@ -66,7 +66,7 @@ public final class SoManager {
      * Default constructor.
      */
     public SoManager() {
-        restManager = new RESTManager();
+        restManager = new RestManager();
     }
 
     /**

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 2a004bd..7cca6c5 100644 (file)
--- 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 f5d06de..f9e6e82 100644 (file)
--- 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));

diff --git a/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/AaiSimulatorTest.java b/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/AaiSimulatorTest.java
index 79a484b..b18e3da 100644 (file)
--- a/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/AaiSimulatorTest.java
+++ b/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/AaiSimulatorTest.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * simulators
  * ================================================================================
- * 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.
@@ -43,7 +43,7 @@ import org.onap.policy.aai.AaiNqRequest;
 import org.onap.policy.aai.AaiNqResponse;
 import org.onap.policy.common.endpoints.http.server.HttpServletServer;
 import org.onap.policy.drools.utils.logging.LoggerUtil;
-import org.onap.policy.rest.RESTManager;
+import org.onap.policy.rest.RestManager;
 
 public class AaiSimulatorTest {
 
@@ -68,7 +68,7 @@ public class AaiSimulatorTest {
 
     @Test
     public void testGet() {
-        final AaiGetVnfResponse response = new AaiManager(new RESTManager()).getQueryByVnfId(
+        final AaiGetVnfResponse response = new AaiManager(new RestManager()).getQueryByVnfId(
                 "http://localhost:6666/aai/v11/network/generic-vnfs/generic-vnf/", "testUser", "testPass",
                 UUID.randomUUID(), "5e49ca06-2972-4532-9ed4-6d071588d792");
         assertNotNull(response);
@@ -94,7 +94,7 @@ public class AaiSimulatorTest {
         tempInstanceFilters.setInstanceFilter(tempInstanceFilter);
         request.setInstanceFilters(tempInstanceFilters);
 
-        AaiNqResponse response = new AaiManager(new RESTManager()).postQuery("http://localhost:6666", "testUser",
+        AaiNqResponse response = new AaiManager(new RestManager()).postQuery("http://localhost:6666", "testUser",
                 "testPass", request, UUID.randomUUID());
         assertNotNull(response);
         assertNotNull(response.getInventoryResponseItems());
@@ -102,7 +102,7 @@ public class AaiSimulatorTest {
         // check error response for vserver query
         tempInnerMap.put("vserver-name", "error");
 
-        response = new AaiManager(new RESTManager()).postQuery("http://localhost:6666", "testUser", "testPass", request,
+        response = new AaiManager(new RestManager()).postQuery("http://localhost:6666", "testUser", "testPass", request,
                 UUID.randomUUID());
         assertNotNull(response);
         assertNotNull(response.getRequestError());
@@ -122,7 +122,7 @@ public class AaiSimulatorTest {
         tempInstanceFilters.setInstanceFilter(tempInstanceFilter);
         request.setInstanceFilters(tempInstanceFilters);
 
-        response = new AaiManager(new RESTManager()).postQuery("http://localhost:6666", "testUser", "testPass", request,
+        response = new AaiManager(new RestManager()).postQuery("http://localhost:6666", "testUser", "testPass", request,
                 UUID.randomUUID());
         assertNotNull(response);
         assertNotNull(response.getInventoryResponseItems());
@@ -131,7 +131,7 @@ public class AaiSimulatorTest {
         // check error response for generic-vnf query
         tempInnerMap.put("vnf-id", "error");
 
-        response = new AaiManager(new RESTManager()).postQuery("http://localhost:6666", "testUser", "testPass", request,
+        response = new AaiManager(new RestManager()).postQuery("http://localhost:6666", "testUser", "testPass", request,
                 UUID.randomUUID());
         assertNotNull(response);
         assertNotNull(response.getRequestError());

diff --git a/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/GuardSimulatorTest.java b/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/GuardSimulatorTest.java
index 3768b1b..c02f143 100644 (file)
--- a/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/GuardSimulatorTest.java
+++ b/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/GuardSimulatorTest.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * simulators
  * ================================================================================
- * 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.
@@ -29,8 +29,8 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.onap.policy.common.endpoints.http.server.HttpServletServer;
 import org.onap.policy.drools.utils.logging.LoggerUtil;
-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;
 
 public class GuardSimulatorTest {
 
@@ -58,14 +58,14 @@ public class GuardSimulatorTest {
         String request = makeRequest("test_actor_id", "test_op_id", "test_target", "test_clName");
         String url = "http://localhost:" + Util.GUARDSIM_SERVER_PORT + "/pdp/api/getDecision";
         Pair<Integer, String> response =
-                new RESTManager().post(url, "testUname", "testPass", null, "application/json", request);
+                new RestManager().post(url, "testUname", "testPass", null, "application/json", request);
         assertNotNull(response);
         assertNotNull(response.first);
         assertNotNull(response.second);
         assertEquals("{\"decision\": \"PERMIT\", \"details\": \"Decision Permit. OK!\"}", response.second);
 
         request = makeRequest("test_actor_id", "test_op_id", "test_target", "denyGuard");
-        response = new RESTManager().post(url, "testUname", "testPass", null, "application/json", request);
+        response = new RestManager().post(url, "testUname", "testPass", null, "application/json", request);
         assertNotNull(response);
         assertNotNull(response.first);
         assertNotNull(response.second);

diff --git a/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/SoSimulatorTest.java b/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/SoSimulatorTest.java
index c704f76..c7545b0 100644 (file)
--- a/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/SoSimulatorTest.java
+++ b/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/SoSimulatorTest.java
@@ -30,8 +30,8 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.onap.policy.common.endpoints.http.server.HttpServletServer;
 import org.onap.policy.drools.utils.logging.LoggerUtil;
-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.so.SoCloudConfiguration;
 import org.onap.policy.so.SoModelInfo;
 import org.onap.policy.so.SoRelatedInstance;
@@ -138,7 +138,7 @@ public class SoSimulatorTest {
     @Test
     public void testResponse() {
         final String request = Serialization.gsonPretty.toJson(this.createTestRequest());
-        final Pair<Integer, String> httpDetails = new RESTManager().post(
+        final Pair<Integer, String> httpDetails = new RestManager().post(
                         "http://localhost:6667/serviceInstantiation/v7/serviceInstances/12345/vnfs/12345/vfModules/scaleOut",
                         "username",
                         "password", new HashMap<>(), "application/json", request);

diff --git a/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/VfcSimulatorTest.java b/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/VfcSimulatorTest.java
index 6e778d8..cb161d5 100644 (file)
--- a/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/VfcSimulatorTest.java
+++ b/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/VfcSimulatorTest.java
@@ -31,8 +31,8 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.onap.policy.common.endpoints.http.server.HttpServletServer;
 import org.onap.policy.drools.utils.logging.LoggerUtil;
-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.VfcResponse;
 import org.onap.policy.vfc.util.Serialization;
 
@@ -60,7 +60,7 @@ public class VfcSimulatorTest {
     @Test
     public void testPost() {
         final Pair<Integer, String> httpDetails =
-                new RESTManager().post("http://localhost:6668/api/nslcm/v1/ns/1234567890/heal", "username", "password",
+                new RestManager().post("http://localhost:6668/api/nslcm/v1/ns/1234567890/heal", "username", "password",
                         new HashMap<String, String>(), "application/json", "Some Request Here");
         assertNotNull(httpDetails);
         assertTrue(httpDetails.first == 202);
@@ -70,7 +70,7 @@ public class VfcSimulatorTest {
 
     @Test
     public void testGet() {
-        final Pair<Integer, String> httpDetails = new RESTManager().get("http://localhost:6668/api/nslcm/v1/jobs/1234",
+        final Pair<Integer, String> httpDetails = new RestManager().get("http://localhost:6668/api/nslcm/v1/jobs/1234",
                 "username", "password", new HashMap<String, String>());
         assertNotNull(httpDetails);
         final VfcResponse response = Serialization.gsonPretty.fromJson(httpDetails.second, VfcResponse.class);