From 21fabae24d4f78799d6d15a9d067645eb84a70f9 Mon Sep 17 00:00:00 2001 From: liamfallon Date: Tue, 31 Jan 2023 10:42:45 +0000 Subject: Upgrade and clean up dependencies - Upgrade Hibernate - Upgrade Mockito - Upgrade Mockserver - Remove Powermock (no longer supported) and replace with spring-test ReflectionTestUtils - Upgrade Spring Framework - Add spring-security to allow authentication on unit tests using MockMVC Minor clean-up - Replace deprecated authorization configuraiton on spring boot applications with SecurityFilterChain bean - Change @LocalPort include on tests to use test include rather than runtime include - Remove unused imports - Remove unused constants and variables - Add deprecation annotations where required Issue-ID: POLICY-4482 Change-Id: Ie004dcc5303e92f6e2c2154967c3537b91868dd5 Signed-off-by: liamfallon --- .../apex/service/engine/event/JsonEventConverterTest.java | 5 +++-- .../service/engine/event/JsonEventHandlerForPojoTest.java | 3 ++- .../apex/service/engine/event/JsonEventHandlerTest.java | 5 +++-- services/services-onappf/pom.xml | 11 ++++++++--- .../policy/apex/services/onappf/TestApexStarterConstants.java | 10 +++++++--- .../services/onappf/rest/CommonApexStarterRestServer.java | 8 ++++---- 6 files changed, 27 insertions(+), 15 deletions(-) (limited to 'services') diff --git a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/JsonEventConverterTest.java b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/JsonEventConverterTest.java index ed1e09b2a..6e346a2a0 100644 --- a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/JsonEventConverterTest.java +++ b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/JsonEventConverterTest.java @@ -1,7 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2018 Ericsson. All rights reserved. - * Modifications Copyright (C) 2020 Nordix Foundation + * Modifications Copyright (C) 2020,2023 Nordix Foundation * Modifications Copyright (C) 2022 Bell Canada. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -34,6 +34,7 @@ import org.onap.policy.apex.service.parameters.eventprotocol.EventProtocolParame * */ public class JsonEventConverterTest { + @SuppressWarnings("deprecation") @Test public void testJsonEventConverter() { Apex2JsonEventConverter converter = new Apex2JsonEventConverter(); @@ -63,4 +64,4 @@ public class JsonEventConverterTest { "here", "there", ""))) .hasMessage("Model for org.onap.policy.apex.model.eventmodel.concepts.AxEvents not found in model service"); } -} \ No newline at end of file +} diff --git a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/JsonEventHandlerForPojoTest.java b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/JsonEventHandlerForPojoTest.java index e2149efa5..3bee638d8 100644 --- a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/JsonEventHandlerForPojoTest.java +++ b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/JsonEventHandlerForPojoTest.java @@ -1,7 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. - * Modifications Copyright (C) 2020,2022 Nordix Foundation. + * Modifications Copyright (C) 2020,2022-2023 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -202,6 +202,7 @@ public class JsonEventHandlerForPojoTest { * @throws ApexException the apex exception * @throws IOException on IO exceptions */ + @SuppressWarnings("deprecation") @Test public void testJsonBadPojoApexEvent() throws ApexException, IOException { final Apex2JsonEventConverter jsonEventConverter = new Apex2JsonEventConverter(); diff --git a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/JsonEventHandlerTest.java b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/JsonEventHandlerTest.java index dd7acddaa..a724b6da2 100644 --- a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/JsonEventHandlerTest.java +++ b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/JsonEventHandlerTest.java @@ -1,7 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. - * Modifications Copyright (C) 2020 Nordix Foundation. + * Modifications Copyright (C) 2020,2023 Nordix Foundation. * Modifications Copyright (C) 2022 Bell Canada. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -136,6 +136,7 @@ public class JsonEventHandlerTest { * * @throws ApexException the apex exception */ + @SuppressWarnings("deprecation") @Test public void testJsontoApexBadEvent() throws ApexException { final Apex2JsonEventConverter jsonEventConverter = new Apex2JsonEventConverter(); @@ -268,4 +269,4 @@ public class JsonEventHandlerTest { assertTrue(apexEvent0000JsonString.contains("\"intPar\": 12345")); assertTrue(apexEvent0000JsonString.contains("\"toscaPolicyState\": \"ENTRY\"")); } -} \ No newline at end of file +} diff --git a/services/services-onappf/pom.xml b/services/services-onappf/pom.xml index 2d7b348d7..7dc9760c0 100644 --- a/services/services-onappf/pom.xml +++ b/services/services-onappf/pom.xml @@ -1,6 +1,6 @@