From 63f2140962365fe095c04d779691600f5a0fb4ab Mon Sep 17 00:00:00 2001 From: mmis Date: Thu, 26 Jul 2018 17:45:55 +0100 Subject: Copy policy-endpoints from drools-pdp to common Replaced references to classes deleted from drools-pdp with references to the corresponding classes in polcy-common Issue-ID: POLICY-967 Change-Id: I7bb580af3b3b2eb0ddcab9421c595237fa37282b Signed-off-by: mmis --- ONAP-PDP/pom.xml | 4 ++-- .../java/org/onap/policy/xacml/action/FindActionTest.java | 11 ++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ONAP-PDP/pom.xml b/ONAP-PDP/pom.xml index d664cf4db..a616edd96 100644 --- a/ONAP-PDP/pom.xml +++ b/ONAP-PDP/pom.xml @@ -81,9 +81,9 @@ - org.onap.policy.drools-pdp + org.onap.policy.common policy-endpoints - ${project.version} + ${project.version} test diff --git a/ONAP-PDP/src/test/java/org/onap/policy/xacml/action/FindActionTest.java b/ONAP-PDP/src/test/java/org/onap/policy/xacml/action/FindActionTest.java index f8a5e4b4a..93cb28546 100644 --- a/ONAP-PDP/src/test/java/org/onap/policy/xacml/action/FindActionTest.java +++ b/ONAP-PDP/src/test/java/org/onap/policy/xacml/action/FindActionTest.java @@ -45,8 +45,9 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.onap.policy.drools.http.server.HttpServletServer; -import org.onap.policy.drools.utils.NetworkUtil; +import org.onap.policy.common.endpoints.http.server.HttpServletServer; +import org.onap.policy.common.endpoints.http.server.impl.IndexedHttpServletServerFactory; +import org.onap.policy.common.utils.network.NetworkUtil; import org.onap.policy.xacml.custom.OnapFunctionDefinitionFactory; public class FindActionTest { @@ -68,8 +69,8 @@ public class FindActionTest { @BeforeClass public static void setUpServer() { try { - final HttpServletServer testServer = - HttpServletServer.factory.build("dmaapSim", "localhost", MOCK_SERVER_PORT, "/", false, true); + final HttpServletServer testServer = IndexedHttpServletServerFactory.getInstance().build("dmaapSim", + "localhost", MOCK_SERVER_PORT, "/", false, true); testServer.addServletClass("/*", DummyRest.class.getName()); testServer.waitedStart(2000); if (!NetworkUtil.isTcpPortOpen("localhost", testServer.getPort(), 5, 10000L)) { @@ -83,7 +84,7 @@ public class FindActionTest { @AfterClass public static void tearDownSimulator() { - HttpServletServer.factory.destroy(); + IndexedHttpServletServerFactory.getInstance().destroy(); } /** -- cgit 1.2.3-korg