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: Ie8d6ee1e8bcdad282bcef3cad409c5c109e907f1
Signed-off-by: liamfallon <liam.fallon@est.tech>

2 files changed, 19 insertions, 17 deletions

diff --git a/models-interactions/model-actors/actor.test/src/main/java/org/onap/policy/controlloop/actor/test/BasicBidirectionalTopicOperation.java b/models-interactions/model-actors/actor.test/src/main/java/org/onap/policy/controlloop/actor/test/BasicBidirectionalTopicOperation.java
index 215286ef9..263fd2401 100644
--- a/models-interactions/model-actors/actor.test/src/main/java/org/onap/policy/controlloop/actor/test/BasicBidirectionalTopicOperation.java
+++ b/models-interactions/model-actors/actor.test/src/main/java/org/onap/policy/controlloop/actor/test/BasicBidirectionalTopicOperation.java
@@ -3,6 +3,7 @@
  * ONAP
  * ================================================================================
  * Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 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.
@@ -21,7 +22,7 @@
 package org.onap.policy.controlloop.actor.test;
 
 import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.lenient;
 
 import java.util.List;
 import java.util.function.BiConsumer;
@@ -170,9 +171,9 @@ public abstract class BasicBidirectionalTopicOperation<Q> extends BasicOperation
      * Initializes a configuration.
      */
     protected void initConfig() {
-        when(config.getTopicHandler()).thenReturn(topicHandler);
-        when(config.getForwarder()).thenReturn(forwarder);
-        when(config.getTimeoutMs()).thenReturn(TIMEOUT_MS);
+        lenient().when(config.getTopicHandler()).thenReturn(topicHandler);
+        lenient().when(config.getForwarder()).thenReturn(forwarder);
+        lenient().when(config.getTimeoutMs()).thenReturn(TIMEOUT_MS);
     }
 
     /**
diff --git a/models-interactions/model-actors/actor.test/src/main/java/org/onap/policy/controlloop/actor/test/BasicHttpOperation.java b/models-interactions/model-actors/actor.test/src/main/java/org/onap/policy/controlloop/actor/test/BasicHttpOperation.java
index 02225759c..4bb75dc74 100644
--- a/models-interactions/model-actors/actor.test/src/main/java/org/onap/policy/controlloop/actor/test/BasicHttpOperation.java
+++ b/models-interactions/model-actors/actor.test/src/main/java/org/onap/policy/controlloop/actor/test/BasicHttpOperation.java
@@ -3,6 +3,7 @@
  * ONAP
  * ================================================================================
  * Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 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.
@@ -21,7 +22,7 @@
 package org.onap.policy.controlloop.actor.test;
 
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.lenient;
 
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
@@ -95,21 +96,21 @@ public class BasicHttpOperation extends BasicOperation {
     public void setUpBasic() {
         super.setUpBasic();
 
-        when(factory.get(MY_CLIENT)).thenReturn(client);
+        lenient().when(factory.get(MY_CLIENT)).thenReturn(client);
 
-        when(rawResponse.getStatus()).thenReturn(200);
+        lenient().when(rawResponse.getStatus()).thenReturn(200);
 
-        when(webBuilder.async()).thenReturn(webAsync);
-        when(webBuilder.accept(any(MediaType.class))).thenReturn(webBuilder);
-        when(webBuilder.accept(any(String.class))).thenReturn(webBuilder);
+        lenient().when(webBuilder.async()).thenReturn(webAsync);
+        lenient().when(webBuilder.accept(any(MediaType.class))).thenReturn(webBuilder);
+        lenient().when(webBuilder.accept(any(String.class))).thenReturn(webBuilder);
 
-        when(webTarget.request()).thenReturn(webBuilder);
-        when(webTarget.path(any())).thenReturn(webTarget);
-        when(webTarget.queryParam(any(), any())).thenReturn(webTarget);
+        lenient().when(webTarget.request()).thenReturn(webBuilder);
+        lenient().when(webTarget.path(any())).thenReturn(webTarget);
+        lenient().when(webTarget.queryParam(any(), any())).thenReturn(webTarget);
 
-        when(client.getWebTarget()).thenReturn(webTarget);
+        lenient().when(client.getWebTarget()).thenReturn(webTarget);
 
-        when(client.getBaseUrl()).thenReturn(BASE_URI);
+        lenient().when(client.getBaseUrl()).thenReturn(BASE_URI);
 
         initConfig();
     }
@@ -118,8 +119,8 @@ public class BasicHttpOperation extends BasicOperation {
      * Initializes a configuration.
      */
     protected void initConfig() {
-        when(config.getClient()).thenReturn(client);
-        when(config.getPath()).thenReturn(PATH);
+        lenient().when(config.getClient()).thenReturn(client);
+        lenient().when(config.getPath()).thenReturn(PATH);
     }
 
     /**