From 3e9fe84af892cd75c564da90481800a4131fc009 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Wed, 17 Mar 2021 15:10:17 -0400 Subject: Change RestServerParameters to BusTopicParams HTTP client parameters should be based on BusTopicParams instead of RestServerParameters, modified the policyApiParameters. Issue-ID: POLICY-3147 Change-Id: I73aa34bec3ab7e27e7a3474260f411ed55b6f933 Signed-off-by: Jim Hahn --- .../application/optimization/OptimizationPdpApplication.java | 6 +++--- .../optimization/OptimizationPdpApplicationTest.java | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'applications/optimization/src') diff --git a/applications/optimization/src/main/java/org/onap/policy/xacml/pdp/application/optimization/OptimizationPdpApplication.java b/applications/optimization/src/main/java/org/onap/policy/xacml/pdp/application/optimization/OptimizationPdpApplication.java index 8b0442bb..50bc0bd8 100644 --- a/applications/optimization/src/main/java/org/onap/policy/xacml/pdp/application/optimization/OptimizationPdpApplication.java +++ b/applications/optimization/src/main/java/org/onap/policy/xacml/pdp/application/optimization/OptimizationPdpApplication.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * ONAP * ================================================================================ - * Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2019-2021 AT&T Intellectual Property. All rights reserved. * Modifications Copyright (C) 2021 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -34,7 +34,7 @@ import java.util.Collection; import java.util.List; import java.util.Map; import org.apache.commons.lang3.tuple.Pair; -import org.onap.policy.common.endpoints.parameters.RestServerParameters; +import org.onap.policy.common.endpoints.event.comm.bus.internal.BusTopicParams; import org.onap.policy.models.decisions.concepts.DecisionRequest; import org.onap.policy.models.decisions.concepts.DecisionResponse; import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier; @@ -87,7 +87,7 @@ public class OptimizationPdpApplication extends StdXacmlApplicationServiceProvid } @Override - public void initialize(Path pathForData, RestServerParameters policyApiParameters) + public void initialize(Path pathForData, BusTopicParams policyApiParameters) throws XacmlApplicationException { // // Store our API parameters and path for translator so it diff --git a/applications/optimization/src/test/java/org/onap/policy/xacml/pdp/application/optimization/OptimizationPdpApplicationTest.java b/applications/optimization/src/test/java/org/onap/policy/xacml/pdp/application/optimization/OptimizationPdpApplicationTest.java index 44de7f02..a3b218c6 100644 --- a/applications/optimization/src/test/java/org/onap/policy/xacml/pdp/application/optimization/OptimizationPdpApplicationTest.java +++ b/applications/optimization/src/test/java/org/onap/policy/xacml/pdp/application/optimization/OptimizationPdpApplicationTest.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * ONAP * ================================================================================ - * Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2019-2021 AT&T Intellectual Property. All rights reserved. * Modifications Copyright (C) 2019-2021 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -48,7 +48,7 @@ import org.junit.FixMethodOrder; import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.junit.runners.MethodSorters; -import org.onap.policy.common.endpoints.parameters.RestServerParameters; +import org.onap.policy.common.endpoints.event.comm.bus.internal.BusTopicParams; import org.onap.policy.common.utils.coder.CoderException; import org.onap.policy.common.utils.coder.StandardCoder; import org.onap.policy.common.utils.coder.StandardYamlCoder; @@ -76,7 +76,7 @@ public class OptimizationPdpApplicationTest { private static XacmlApplicationServiceProvider service; private static StandardCoder gson = new StandardCoder(); private static DecisionRequest baseRequest; - private static RestServerParameters clientParams; + private static BusTopicParams clientParams; private static String[] listPolicyTypeFiles = { "onap.policies.Optimization", "onap.policies.optimization.Resource", @@ -101,8 +101,8 @@ public class OptimizationPdpApplicationTest { */ @BeforeClass public static void setUp() throws Exception { - clientParams = mock(RestServerParameters.class); - when(clientParams.getHost()).thenReturn("localhost"); + clientParams = mock(BusTopicParams.class); + when(clientParams.getHostname()).thenReturn("localhost"); when(clientParams.getPort()).thenReturn(6969); // // Load Single Decision Request -- cgit 1.2.3-korg