1 files changed, 10 insertions, 11 deletions

diff --git a/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiPolicyForwarder.java b/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiPolicyForwarder.java
index 2983c5ef..b6f41fbf 100644
--- a/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiPolicyForwarder.java
+++ b/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiPolicyForwarder.java
@@ -31,6 +31,7 @@ import javax.ws.rs.client.Entity;
 import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
+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.HttpClientFactoryInstance;
@@ -56,23 +57,14 @@ public class LifecycleApiPolicyForwarder implements PolicyForwarder {
     private static final String DEPLOY_POLICY_URI = "/policy/pap/v1/pdps/policies";
     private static final String CREATE_POLICY_TYPE_URI = "/policy/api/v1/policytypes/";
     private static final Logger LOGGER = LoggerFactory.getLogger(LifecycleApiPolicyForwarder.class);
-
     private LifecycleApiForwarderParameters forwarderParameters;
-    private HttpClient apiClient;
-    private HttpClient papClient;
 
     /**
      * {@inheritDoc}.
      */
     @Override
-    public void configure(final String parameterGroupName) throws HttpClientConfigException {
+    public void configure(final String parameterGroupName) {
         forwarderParameters = ParameterService.get(parameterGroupName);
-
-        forwarderParameters.getApiParameters().setClientName("policy-api");
-        forwarderParameters.getPapParameters().setClientName("policy-pap");
-
-        apiClient = HttpClientFactoryInstance.getClientFactory().build(forwarderParameters.getApiParameters());
-        papClient = HttpClientFactoryInstance.getClientFactory().build(forwarderParameters.getPapParameters());
     }
 
     /**
@@ -164,7 +156,14 @@ public class LifecycleApiPolicyForwarder implements PolicyForwarder {
     }
 
     private HttpClient getHttpClient(final boolean wantApi) throws HttpClientConfigException {
-        return (wantApi ? apiClient : papClient);
+        final boolean https = forwarderParameters.isHttps();
+        final LifecycleApiParameters parameters =
+                (wantApi ? forwarderParameters.getApiParameters() : forwarderParameters.getPapParameters());
+        final BusTopicParams params = BusTopicParams.builder().clientName("Policy Distribution").useHttps(https)
+                .hostname(parameters.getHostName()).port(parameters.getPort()).userName(parameters.getUserName())
+                .password(parameters.getPassword()).allowSelfSignedCerts(forwarderParameters.isAllowSelfSignedCerts())
+                .build();
+        return HttpClientFactoryInstance.getClientFactory().build(params);
     }
 }