summaryrefslogtreecommitdiffstats
path: root/main/src
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2021-07-19 11:21:33 -0400
committerJim Hahn <jrh3@att.com>2021-07-19 11:22:37 -0400
commitc22e9700c78415dd4d267b0c7a1db7a574912330 (patch)
treecab4f4a0394e1b75c418d50c57025b4f7a16c619 /main/src
parent708e3bf02095bc7185b44cc30e91e293eebb4fd2 (diff)
Use new RestClientParameters class in PAP
Replaced generic BusTopicParams with more specific RestClientParameters. Issue-ID: POLICY-3456 Change-Id: Ic1a3acca5b651730fc74332c2c5d5bc36bccb790 Signed-off-by: Jim Hahn <jrh3@att.com>
Diffstat (limited to 'main/src')
-rw-r--r--main/src/main/java/org/onap/policy/pap/main/parameters/PapParameterGroup.java6
-rw-r--r--main/src/main/java/org/onap/policy/pap/main/rest/PolicyComponentsHealthCheckProvider.java4
-rw-r--r--main/src/test/java/org/onap/policy/pap/main/rest/TestPolicyComponentsHealthCheckControllerV1.java14
-rw-r--r--main/src/test/java/org/onap/policy/pap/main/rest/TestPolicyComponentsHealthCheckProvider.java4
4 files changed, 14 insertions, 14 deletions
diff --git a/main/src/main/java/org/onap/policy/pap/main/parameters/PapParameterGroup.java b/main/src/main/java/org/onap/policy/pap/main/parameters/PapParameterGroup.java
index 2078bbfe..f89e156c 100644
--- a/main/src/main/java/org/onap/policy/pap/main/parameters/PapParameterGroup.java
+++ b/main/src/main/java/org/onap/policy/pap/main/parameters/PapParameterGroup.java
@@ -24,7 +24,7 @@ package org.onap.policy.pap.main.parameters;
import java.util.List;
import lombok.Getter;
-import org.onap.policy.common.endpoints.event.comm.bus.internal.BusTopicParams;
+import org.onap.policy.common.endpoints.parameters.RestClientParameters;
import org.onap.policy.common.endpoints.parameters.RestServerParameters;
import org.onap.policy.common.endpoints.parameters.TopicParameterGroup;
import org.onap.policy.common.parameters.ParameterGroupImpl;
@@ -51,8 +51,8 @@ public class PapParameterGroup extends ParameterGroupImpl {
private boolean savePdpStatisticsInDb;
@Valid
private TopicParameterGroup topicParameterGroup;
- // API, Distribution Health Check restClient parameters.
- private List<@NotNull @Valid BusTopicParams> healthCheckRestClientParameters;
+ // API, Distribution Health Check REST client parameters.
+ private List<@NotNull @Valid RestClientParameters> healthCheckRestClientParameters;
/**
* Create the pap parameter group.
diff --git a/main/src/main/java/org/onap/policy/pap/main/rest/PolicyComponentsHealthCheckProvider.java b/main/src/main/java/org/onap/policy/pap/main/rest/PolicyComponentsHealthCheckProvider.java
index 2b28b1c5..b1e1f5cf 100644
--- a/main/src/main/java/org/onap/policy/pap/main/rest/PolicyComponentsHealthCheckProvider.java
+++ b/main/src/main/java/org/onap/policy/pap/main/rest/PolicyComponentsHealthCheckProvider.java
@@ -39,10 +39,10 @@ import java.util.stream.Collectors;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
import org.apache.commons.lang3.tuple.Pair;
-import org.onap.policy.common.endpoints.event.comm.bus.internal.BusTopicParams;
import org.onap.policy.common.endpoints.http.client.HttpClient;
import org.onap.policy.common.endpoints.http.client.HttpClientConfigException;
import org.onap.policy.common.endpoints.http.client.HttpClientFactory;
+import org.onap.policy.common.endpoints.parameters.RestClientParameters;
import org.onap.policy.common.endpoints.report.HealthCheckReport;
import org.onap.policy.common.parameters.ParameterService;
import org.onap.policy.common.utils.services.Registry;
@@ -85,7 +85,7 @@ public class PolicyComponentsHealthCheckProvider {
*/
public static void initializeClientHealthCheckExecutorService(PapParameterGroup papParameterGroup,
HttpClientFactory clientFactory) throws HttpClientConfigException {
- for (BusTopicParams params : papParameterGroup.getHealthCheckRestClientParameters()) {
+ for (RestClientParameters params : papParameterGroup.getHealthCheckRestClientParameters()) {
params.setManaged(false);
clients.add(clientFactory.build(params));
}
diff --git a/main/src/test/java/org/onap/policy/pap/main/rest/TestPolicyComponentsHealthCheckControllerV1.java b/main/src/test/java/org/onap/policy/pap/main/rest/TestPolicyComponentsHealthCheckControllerV1.java
index d898b5e5..b49d7704 100644
--- a/main/src/test/java/org/onap/policy/pap/main/rest/TestPolicyComponentsHealthCheckControllerV1.java
+++ b/main/src/test/java/org/onap/policy/pap/main/rest/TestPolicyComponentsHealthCheckControllerV1.java
@@ -1,7 +1,7 @@
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2019-2020 Nordix Foundation.
- * Modifications Copyright (C) 2020 AT&T Inc.
+ * Modifications Copyright (C) 2020-2021 AT&T Inc.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -34,7 +34,7 @@ import javax.ws.rs.core.Response;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.onap.policy.common.endpoints.event.comm.bus.internal.BusTopicParams;
+import org.onap.policy.common.endpoints.parameters.RestClientParameters;
import org.onap.policy.common.parameters.ParameterService;
import org.onap.policy.pap.main.parameters.PapParameterGroup;
import org.powermock.reflect.Whitebox;
@@ -47,7 +47,7 @@ import org.powermock.reflect.Whitebox;
public class TestPolicyComponentsHealthCheckControllerV1 extends CommonPapRestServer {
private static final String ENDPOINT = "components/healthcheck";
- private static List<BusTopicParams> savedBusTopicParams;
+ private static List<RestClientParameters> savedRestClientParameters;
/**
* Set up for the test class.
@@ -56,8 +56,8 @@ public class TestPolicyComponentsHealthCheckControllerV1 extends CommonPapRestSe
public static void setUpClass() {
// To skip calling to the remote components
PapParameterGroup papParameterGroup = ParameterService.get("PapGroup");
- List<BusTopicParams> lo = Whitebox.getInternalState(papParameterGroup, "healthCheckRestClientParameters");
- savedBusTopicParams = new ArrayList<>(lo);
+ List<RestClientParameters> lo = Whitebox.getInternalState(papParameterGroup, "healthCheckRestClientParameters");
+ savedRestClientParameters = new ArrayList<>(lo);
lo.clear();
}
@@ -67,8 +67,8 @@ public class TestPolicyComponentsHealthCheckControllerV1 extends CommonPapRestSe
@AfterClass
public static void tearDownClass() {
PapParameterGroup papParameterGroup = ParameterService.get("PapGroup");
- List<BusTopicParams> lo = Whitebox.getInternalState(papParameterGroup, "healthCheckRestClientParameters");
- lo.addAll(savedBusTopicParams);
+ List<RestClientParameters> lo = Whitebox.getInternalState(papParameterGroup, "healthCheckRestClientParameters");
+ lo.addAll(savedRestClientParameters);
}
@Test
diff --git a/main/src/test/java/org/onap/policy/pap/main/rest/TestPolicyComponentsHealthCheckProvider.java b/main/src/test/java/org/onap/policy/pap/main/rest/TestPolicyComponentsHealthCheckProvider.java
index 6c707307..3f4ecd32 100644
--- a/main/src/test/java/org/onap/policy/pap/main/rest/TestPolicyComponentsHealthCheckProvider.java
+++ b/main/src/test/java/org/onap/policy/pap/main/rest/TestPolicyComponentsHealthCheckProvider.java
@@ -41,9 +41,9 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
-import org.onap.policy.common.endpoints.event.comm.bus.internal.BusTopicParams;
import org.onap.policy.common.endpoints.http.client.HttpClient;
import org.onap.policy.common.endpoints.http.client.HttpClientFactory;
+import org.onap.policy.common.endpoints.parameters.RestClientParameters;
import org.onap.policy.common.endpoints.report.HealthCheckReport;
import org.onap.policy.common.parameters.ParameterService;
import org.onap.policy.common.utils.coder.Coder;
@@ -134,7 +134,7 @@ public class TestPolicyComponentsHealthCheckProvider {
when(client2.get()).thenReturn(response2);
PapParameterGroup papParameterGroup = ParameterService.get(PAP_GROUP_PARAMS_NAME);
- List<BusTopicParams> params = papParameterGroup.getHealthCheckRestClientParameters();
+ List<RestClientParameters> params = papParameterGroup.getHealthCheckRestClientParameters();
when(clientFactory.build(params.get(0))).thenReturn(client1);
when(clientFactory.build(params.get(1))).thenReturn(client2);