From e173fc5ab13b095d8f70fd8a8d4d063adeba6e6b Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Fri, 5 Jul 2019 10:52:20 -0400 Subject: Fix sonar issues in policy/endpoints Sonar fixes, other than code coverage. These changes are disruptive and will likely cause breakage in a number of policy repos. Renamed constants. Moved constants/factories from interfaces to classes. Change-Id: I182d50320aa6b53e383081af806c60dd2f806cbe Issue-ID: POLICY-1791 Signed-off-by: Jim Hahn --- .../common/endpoints/parameters/CommonTestData.java | 15 +++++++++------ .../endpoints/parameters/RestServerParametersTest.java | 8 +++++--- .../endpoints/parameters/TopicParameterGroupTest.java | 6 ++++-- 3 files changed, 18 insertions(+), 11 deletions(-) (limited to 'policy-endpoints/src/test/java/org/onap/policy/common/endpoints/parameters') diff --git a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/parameters/CommonTestData.java b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/parameters/CommonTestData.java index 80d1e865..346ac5d6 100644 --- a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/parameters/CommonTestData.java +++ b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/parameters/CommonTestData.java @@ -1,6 +1,8 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2019 Nordix Foundation. + * 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. @@ -40,7 +42,7 @@ import org.onap.policy.common.utils.coder.StandardCoder; */ public class CommonTestData { - public static final String REST_SERVER_PASSWORD = "zb!XztG34"; + public static final String REST_SERVER_PASS = "zb!XztG34"; public static final String REST_SERVER_USER = "healthcheck"; public static final int REST_SERVER_PORT = 6969; public static final String REST_SERVER_HOST = "0.0.0.0"; @@ -50,9 +52,11 @@ public class CommonTestData { public static final String TOPIC_NAME = "POLICY-PDP-PAP"; public static final String TOPIC_INFRA = "dmaap"; public static final String TOPIC_SERVER = "message-router"; - public static final List TOPIC_PARAMS = + + protected static final List TOPIC_PARAMS = Arrays.asList(getTopicParameters(TOPIC_NAME, TOPIC_INFRA, TOPIC_SERVER)); - public static final Coder coder = new StandardCoder(); + + protected static final Coder coder = new StandardCoder(); /** * Create topic parameters for test cases. @@ -102,7 +106,7 @@ public class CommonTestData { map.put("host", REST_SERVER_HOST); map.put("port", REST_SERVER_PORT); map.put("userName", REST_SERVER_USER); - map.put("password", REST_SERVER_PASSWORD); + map.put("password", REST_SERVER_PASS); } return map; @@ -133,7 +137,6 @@ public class CommonTestData { */ public String getParameterGroupAsString(String filePath) throws IOException { File file = new File(filePath); - String json = new String(Files.readAllBytes(file.toPath()), StandardCharsets.UTF_8); - return json; + return new String(Files.readAllBytes(file.toPath()), StandardCharsets.UTF_8); } } diff --git a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/parameters/RestServerParametersTest.java b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/parameters/RestServerParametersTest.java index ca2b3c4c..58bf98b3 100644 --- a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/parameters/RestServerParametersTest.java +++ b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/parameters/RestServerParametersTest.java @@ -1,6 +1,8 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2019 Nordix Foundation. + * 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. @@ -41,7 +43,7 @@ public class RestServerParametersTest { private static final Coder coder = new StandardCoder(); @Test - public void test() throws Exception { + public void test() { final RestServerParameters restServerParameters = testData.toObject(testData.getRestServerParametersMap(false), RestServerParameters.class); final GroupValidationResult validationResult = restServerParameters.validate(); @@ -49,13 +51,13 @@ public class RestServerParametersTest { assertEquals(CommonTestData.REST_SERVER_HOST, restServerParameters.getHost()); assertEquals(CommonTestData.REST_SERVER_PORT, restServerParameters.getPort()); assertEquals(CommonTestData.REST_SERVER_USER, restServerParameters.getUserName()); - assertEquals(CommonTestData.REST_SERVER_PASSWORD, restServerParameters.getPassword()); + assertEquals(CommonTestData.REST_SERVER_PASS, restServerParameters.getPassword()); assertEquals(CommonTestData.REST_SERVER_HTTPS, restServerParameters.isHttps()); assertEquals(CommonTestData.REST_SERVER_AAF, restServerParameters.isAaf()); } @Test - public void testValidate() throws Exception { + public void testValidate() { final RestServerParameters restServerParameters = testData.toObject(testData.getRestServerParametersMap(false), RestServerParameters.class); final GroupValidationResult result = restServerParameters.validate(); diff --git a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/parameters/TopicParameterGroupTest.java b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/parameters/TopicParameterGroupTest.java index eaf0b2a9..db26a1a4 100644 --- a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/parameters/TopicParameterGroupTest.java +++ b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/parameters/TopicParameterGroupTest.java @@ -1,6 +1,8 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2019 Nordix Foundation. + * 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. @@ -40,7 +42,7 @@ public class TopicParameterGroupTest { private static final Coder coder = new StandardCoder(); @Test - public void test() throws Exception { + public void test() { final TopicParameterGroup topicParameterGroup = testData.toObject(testData.getTopicParameterGroupMap(false), TopicParameterGroup.class); final GroupValidationResult validationResult = topicParameterGroup.validate(); @@ -50,7 +52,7 @@ public class TopicParameterGroupTest { } @Test - public void testValidate() throws Exception { + public void testValidate() { final TopicParameterGroup topicParameterGroup = testData.toObject(testData.getTopicParameterGroupMap(false), TopicParameterGroup.class); final GroupValidationResult result = topicParameterGroup.validate(); -- cgit 1.2.3-korg