diff options
| author |   Jim Hahn <jrh3@att.com> | 2019-07-05 10:52:20 -0400 |
|---|---|---|
| committer | Jim Hahn <jrh3@att.com> | 2019-07-05 12:25:00 -0400 |
| commit | e173fc5ab13b095d8f70fd8a8d4d063adeba6e6b (patch) | |
| tree | 8e63717c99cfe9f52f905974c8c67fb8a1dece29 /policy-endpoints/src/test/java/org/onap/policy/common/endpoints/parameters/CommonTestData.java | |
| parent | 53f9550501ca1854318c1f552b0aba2e255b6748 (diff) | |
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 <jrh3@att.com>
Diffstat (limited to 'policy-endpoints/src/test/java/org/onap/policy/common/endpoints/parameters/CommonTestData.java')
| -rw-r--r-- | policy-endpoints/src/test/java/org/onap/policy/common/endpoints/parameters/CommonTestData.java | 15 |
1 files changed, 9 insertions, 6 deletions
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<TopicParameters> TOPIC_PARAMS = + + protected static final List<TopicParameters> 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); } } |