From e740b7c33217f8564849c523a3607c53bab6e3a8 Mon Sep 17 00:00:00 2001 From: liamfallon Date: Tue, 14 Mar 2023 17:20:20 +0000 Subject: Update for SNI Chcecking SNI checking is now supported in Jersey Issue-ID: POLICY-4474 Change-Id: I6afc2d577493485f151887180ef152303c456f3a Signed-off-by: liamfallon --- .../uservice/adapt/restclient/TestExecutionPropertyRest.java | 4 ++-- .../integration/uservice/adapt/restclient/TestFile2Rest.java | 4 ++-- .../integration/uservice/adapt/restclient/TestRest2File.java | 4 ++-- .../uservice/taskparameters/TestTaskParameters.java | 12 +++++++----- 4 files changed, 13 insertions(+), 11 deletions(-) (limited to 'testsuites/integration/integration-uservice-test/src/test/java') diff --git a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/restclient/TestExecutionPropertyRest.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/restclient/TestExecutionPropertyRest.java index 8596ceec9..d1488df86 100644 --- a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/restclient/TestExecutionPropertyRest.java +++ b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/restclient/TestExecutionPropertyRest.java @@ -1,6 +1,6 @@ /*- * ============LICENSE_START======================================================= - * Copyright (C) 2019-2020 Nordix Foundation. + * Copyright (C) 2019-2020,2023 Nordix Foundation. * Modifications Copyright (C) 2020-2021 Bell Canada. All rights reserved. * Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved. * ================================================================================ @@ -77,7 +77,7 @@ public class TestExecutionPropertyRest { } server = HttpServletServerFactoryInstance.getServerFactory().build("TestExecutionPropertyRest", false, null, - PORT, "/TestExecutionRest", false, false); + PORT, false, "/TestExecutionRest", false, false); server.addServletClass(null, TestRestClientEndpoint.class.getName()); server.setSerializationProvider(GsonMessageBodyHandler.class.getName()); diff --git a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/restclient/TestFile2Rest.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/restclient/TestFile2Rest.java index 04a1e6faf..5683b48b2 100644 --- a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/restclient/TestFile2Rest.java +++ b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/restclient/TestFile2Rest.java @@ -1,7 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. - * Modifications Copyright (C) 2019-2020 Nordix Foundation. + * Modifications Copyright (C) 2019-2020,2023 Nordix Foundation. * Modifications Copyright (C) 2021 Bell Canada. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -75,7 +75,7 @@ public class TestFile2Rest { */ @BeforeClass public static void setUp() throws Exception { - server = HttpServletServerFactoryInstance.getServerFactory().build("TestFile2Rest", false, null, PORT, + server = HttpServletServerFactoryInstance.getServerFactory().build("TestFile2Rest", false, null, PORT, false, "/TestFile2Rest", false, false); server.addServletClass(null, TestRestClientEndpoint.class.getName()); diff --git a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/restclient/TestRest2File.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/restclient/TestRest2File.java index 0aeb196f0..34aaab802 100644 --- a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/restclient/TestRest2File.java +++ b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/restclient/TestRest2File.java @@ -1,7 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. - * Modifications Copyright (C) 2019-2020 Nordix Foundation. + * Modifications Copyright (C) 2019-2020,2023 Nordix Foundation. * Modifications Copyright (C) 2020-2021 Bell Canada. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -78,7 +78,7 @@ public class TestRest2File { */ @Before public void setUp() throws Exception { - server = HttpServletServerFactoryInstance.getServerFactory().build("TestRest2File", false, null, PORT, + server = HttpServletServerFactoryInstance.getServerFactory().build("TestRest2File", false, null, PORT, false, "/TestRest2File", false, false); server.addServletClass(null, TestRestClientEndpoint.class.getName()); diff --git a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/taskparameters/TestTaskParameters.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/taskparameters/TestTaskParameters.java index 9713bcb74..655538349 100644 --- a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/taskparameters/TestTaskParameters.java +++ b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/taskparameters/TestTaskParameters.java @@ -1,6 +1,6 @@ /*- * ============LICENSE_START======================================================= - * Copyright (C) 2020 Nordix Foundation. + * Copyright (C) 2020,2023 Nordix Foundation. * Modifications Copyright (C) 2020 Bell Canada. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -56,7 +56,6 @@ public class TestTaskParameters { private static final int PORT = 32801; private static final String HOST = "localhost"; - /** * Sets up a server for testing. * @@ -68,8 +67,9 @@ public class TestTaskParameters { throw new IllegalStateException("port " + PORT + " is still in use"); } - server = HttpServletServerFactoryInstance.getServerFactory().build("TestTaskParameters", false, null, PORT, - "/TestTaskParametersRest", false, false); + server = + HttpServletServerFactoryInstance.getServerFactory().build("TestTaskParameters", false, null, PORT, false, + "/TestTaskParametersRest", false, false); server.addServletClass(null, RestClientEndpointForTaskParameters.class.getName()); server.setSerializationProvider(GsonMessageBodyHandler.class.getName()); @@ -153,7 +153,9 @@ public class TestTaskParameters { // @formatter:on new ApexCliToscaEditorMain(cliArgs); - final String[] args = {"target/classes/APEXPolicy.json"}; + final String[] args = { + "target/classes/APEXPolicy.json" + }; // clear the details set in server client.target("http://" + HOST + ":" + PORT + "/TestTaskParametersRest/apex/event/clearDetails") .request("application/json").get(); -- cgit 1.2.3-korg