diff options
author | Jim Hahn <jrh3@att.com> | 2019-01-14 09:38:23 -0500 |
---|---|---|
committer | Jim Hahn <jrh3@att.com> | 2019-01-14 10:07:07 -0500 |
commit | 45018c1970772037139134fcc2d69da360a03c66 (patch) | |
tree | 93342100485a51c29a0b5de91d2564198e0f9000 /controlloop/common/model-impl/rest/src | |
parent | 4b3d5ae4a7ae81dc337c81abc282d1e2fa7213c5 (diff) |
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>
Diffstat (limited to 'controlloop/common/model-impl/rest/src')
-rw-r--r-- | controlloop/common/model-impl/rest/src/main/java/org/onap/policy/rest/RestManager.java (renamed from controlloop/common/model-impl/rest/src/main/java/org/onap/policy/rest/RESTManager.java) | 6 | ||||
-rwxr-xr-x | controlloop/common/model-impl/rest/src/test/java/org/onap/policy/rest/GetTest.java | 14 | ||||
-rwxr-xr-x | controlloop/common/model-impl/rest/src/test/java/org/onap/policy/rest/PairTest.java | 8 | ||||
-rwxr-xr-x | controlloop/common/model-impl/rest/src/test/java/org/onap/policy/rest/PostTest.java | 10 |
4 files changed, 19 insertions, 19 deletions
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); } |