Upgrade Java 17

Issue-ID: POLICY-4803
Change-Id: Iad0d08ee6f8ab18eb177b458d8edbba4002bcc73
Signed-off-by: adheli.tavares <adheli.tavares@est.tech>

24 files changed, 360 insertions, 406 deletions

diff --git a/plugins/forwarding-plugins/pom.xml b/plugins/forwarding-plugins/pom.xml
index 3b44f55b..a1741b88 100644
--- a/plugins/forwarding-plugins/pom.xml
+++ b/plugins/forwarding-plugins/pom.xml
@@ -19,12 +19,13 @@
   SPDX-License-Identifier: Apache-2.0
   ============LICENSE_END=========================================================
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.onap.policy.distribution</groupId>
         <artifactId>distribution-plugins</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>3.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>forwarding-plugins</artifactId>
@@ -42,15 +43,5 @@
             <artifactId>distribution-main</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 </project>
diff --git a/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiAutomationCompositionForwarder.java b/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiAutomationCompositionForwarder.java
index c9ca5003..5aabde78 100644
--- a/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiAutomationCompositionForwarder.java
+++ b/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiAutomationCompositionForwarder.java
@@ -20,14 +20,14 @@
 
 package org.onap.policy.distribution.forwarding.lifecycle.api;
 
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.MediaType;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
 import org.onap.policy.common.endpoints.http.client.HttpClient;
 import org.onap.policy.common.endpoints.http.client.HttpClientConfigException;
 import org.onap.policy.common.endpoints.http.client.HttpClientFactoryInstance;
diff --git a/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiPolicyForwarder.java b/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiPolicyForwarder.java
index 9be6a0b2..df2e36ef 100644
--- a/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiPolicyForwarder.java
+++ b/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiPolicyForwarder.java
@@ -22,15 +22,15 @@
 
 package org.onap.policy.distribution.forwarding.lifecycle.api;
 
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
 import org.onap.policy.common.endpoints.http.client.HttpClient;
 import org.onap.policy.common.endpoints.http.client.HttpClientConfigException;
 import org.onap.policy.common.endpoints.http.client.HttpClientFactoryInstance;
diff --git a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/file/FilePolicyForwarderParameterGroupTest.java b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/file/FilePolicyForwarderParameterGroupTest.java
index d8ebb4ec..f160d1ba 100644
--- a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/file/FilePolicyForwarderParameterGroupTest.java
+++ b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/file/FilePolicyForwarderParameterGroupTest.java
@@ -22,20 +22,20 @@
 
 package org.onap.policy.distribution.forwarding.file;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.onap.policy.common.parameters.ValidationStatus;
 
 /**
  * Class to perform unit test of {@link FilePolicyForwarderParameterGroup}.
  */
-public class FilePolicyForwarderParameterGroupTest {
+class FilePolicyForwarderParameterGroupTest {
 
     @Test
-    public void testBuilderAndGetters() {
-        final FilePolicyForwarderParameterGroup configurationParameters = new FilePolicyForwarderParameterGroup();
+    void testBuilderAndGetters() {
+        final var configurationParameters = new FilePolicyForwarderParameterGroup();
         configurationParameters.setPath("/tmp");
         configurationParameters.setVerbose(true);
         configurationParameters.setName("myConfiguration");
@@ -47,8 +47,8 @@ public class FilePolicyForwarderParameterGroupTest {
     }
 
     @Test
-    public void testInvalidPath() {
-        final FilePolicyForwarderParameterGroup configurationParameters = new FilePolicyForwarderParameterGroup();
+    void testInvalidPath() {
+        final var configurationParameters = new FilePolicyForwarderParameterGroup();
         configurationParameters.setPath("");
         configurationParameters.setVerbose(false);
         configurationParameters.setName("myConfiguration");
diff --git a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/file/FilePolicyForwarderTest.java b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/file/FilePolicyForwarderTest.java
index fb00dae1..dbc5804b 100644
--- a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/file/FilePolicyForwarderTest.java
+++ b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/file/FilePolicyForwarderTest.java
@@ -23,7 +23,7 @@
 package org.onap.policy.distribution.forwarding.file;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -31,14 +31,11 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Collection;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
 import org.onap.policy.common.parameters.ParameterService;
 import org.onap.policy.distribution.forwarding.PolicyForwardingException;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaEntity;
@@ -49,10 +46,9 @@ import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy;
  * Class to perform unit test of {@link FilePolicyForwarder}.
  *
  */
-@RunWith(MockitoJUnitRunner.class)
-public class FilePolicyForwarderTest {
-    @ClassRule
-    public static TemporaryFolder tempFolder = new TemporaryFolder();
+class FilePolicyForwarderTest {
+
+    private static Path tempFolder;
 
     private static final boolean VERBOSE = true;
     private static final String GROUP_NAME = "fileConfiguration";
@@ -60,10 +56,11 @@ public class FilePolicyForwarderTest {
     /**
      * Set up.
      */
-    @BeforeClass
-    public static void setUp() {
+    @BeforeAll
+    static void setUp(@TempDir Path tempDir) {
+        tempFolder = tempDir;
         final FilePolicyForwarderParameterGroup configurationParameters = new FilePolicyForwarderParameterGroup();
-        configurationParameters.setPath(tempFolder.getRoot().getAbsolutePath().toString());
+        configurationParameters.setPath(tempFolder.toFile().getAbsolutePath());
         configurationParameters.setVerbose(VERBOSE);
         configurationParameters.setName(GROUP_NAME);
         ParameterService.register(configurationParameters);
@@ -72,36 +69,36 @@ public class FilePolicyForwarderTest {
     /**
      * Tear down.
      */
-    @AfterClass
-    public static void tearDown() {
+    @AfterAll
+    static void tearDown() {
         ParameterService.deregister(GROUP_NAME);
     }
 
     @Test
-    public void testForwardPolicy() throws PolicyForwardingException {
+    void testForwardPolicy() throws PolicyForwardingException {
         final Collection<ToscaEntity> policies = new ArrayList<>();
-        final ToscaPolicy policy = createPolicy(policies, "test", "test");
+        final var policy = createPolicy(policies);
 
-        final FilePolicyForwarder forwarder = new FilePolicyForwarder();
+        final var forwarder = new FilePolicyForwarder();
         forwarder.configure(GROUP_NAME);
 
         forwarder.forward(policies);
-        final Path path = Paths.get(tempFolder.getRoot().getAbsolutePath().toString(), policy.getName());
+        final var path = Paths.get(tempFolder.toFile().getAbsolutePath(), policy.getName());
         assertTrue(Files.exists(path));
     }
 
     @Test
-    public void testForwardPolicyError() {
+    void testForwardPolicyError() {
         final Collection<ToscaEntity> policies = new ArrayList<>();
-        final ToscaPolicy policy = createPolicy(policies, "test", "test");
+        final var policy = createPolicy(policies);
 
-        final ToscaPolicy spy = Mockito.spy(policy);
+        final var spy = Mockito.spy(policy);
         Mockito.when(spy.toString()).thenAnswer(invocation -> {
             throw new IOException();
         });
         policies.add(spy);
 
-        final FilePolicyForwarder forwarder = new FilePolicyForwarder();
+        final var forwarder = new FilePolicyForwarder();
         forwarder.configure(GROUP_NAME);
 
         assertThatThrownBy(() -> forwarder.forward(policies)).isInstanceOf(PolicyForwardingException.class)
@@ -109,19 +106,19 @@ public class FilePolicyForwarderTest {
     }
 
     @Test
-    public void testForwardUnsupportedPolicy() {
+    void testForwardUnsupportedPolicy() {
         final Collection<ToscaEntity> policies = new ArrayList<>();
-        final FilePolicyForwarder forwarder = new FilePolicyForwarder();
+        final var forwarder = new FilePolicyForwarder();
         forwarder.configure(GROUP_NAME);
 
-        final ToscaEntity policy = new UnsupportedPolicy();
+        final var policy = new UnsupportedPolicy();
         policies.add(policy);
 
         assertThatThrownBy(() -> forwarder.forward(policies)).isInstanceOf(PolicyForwardingException.class)
         .hasMessageContaining("Cannot forward policy");
     }
 
-    class UnsupportedPolicy extends ToscaEntity {
+    static class UnsupportedPolicy extends ToscaEntity {
 
         @Override
         public String getName() {
@@ -129,8 +126,7 @@ public class FilePolicyForwarderTest {
         }
     }
 
-    private ToscaPolicy createPolicy(final Collection<ToscaEntity> policies, final String name,
-            final String description) {
+    private ToscaPolicy createPolicy(final Collection<ToscaEntity> policies) {
         final ToscaPolicy policy = new ToscaPolicy();
         policy.setName("test");
         policy.setDescription("test");
diff --git a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiAutomationCompositionForwarderParametersTest.java b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiAutomationCompositionForwarderParametersTest.java
index 1904edc7..091b245c 100644
--- a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiAutomationCompositionForwarderParametersTest.java
+++ b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiAutomationCompositionForwarderParametersTest.java
@@ -22,10 +22,10 @@
 package org.onap.policy.distribution.forwarding.lifecycle.api;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.onap.policy.common.parameters.ValidationStatus;
 import org.onap.policy.distribution.forwarding.testclasses.CommonTestData;
 
@@ -34,7 +34,7 @@ import org.onap.policy.distribution.forwarding.testclasses.CommonTestData;
  *
  * @author Sirisha Manchikanti (sirisha.manchikanti@est.tech)
  */
-public class LifecycleApiAutomationCompositionForwarderParametersTest {
+class LifecycleApiAutomationCompositionForwarderParametersTest {
 
     private static final String AUTOMATION_COMPOSITION_RUNTIME_HOST_NAME = "localhost";
     private static final int AUTOMATION_COMPOSITION_RUNTIME_PORT = 6969;
@@ -43,8 +43,8 @@ public class LifecycleApiAutomationCompositionForwarderParametersTest {
 
 
     @Test
-    public void testValidParameters() {
-        final LifecycleApiAutomationCompositionForwarderParameters configurationParameters =
+    void testValidParameters() {
+        final var configurationParameters =
                 CommonTestData.getPolicyForwarderParameters(
                         "src/test/resources/parameters/LifecycleApiAutomationCompositionForwarderParameters.json",
                         LifecycleApiAutomationCompositionForwarderParameters.class);
@@ -67,8 +67,8 @@ public class LifecycleApiAutomationCompositionForwarderParametersTest {
     }
 
     @Test
-    public void testInvalidParameters() {
-        final LifecycleApiForwarderParameters configurationParameters =
+    void testInvalidParameters() {
+        final var configurationParameters =
                 CommonTestData.getPolicyForwarderParameters(
                         "src/test/resources/parameters/LifecycleApiPolicyForwarderParametersInvalid.json",
                         LifecycleApiForwarderParameters.class);
@@ -77,8 +77,8 @@ public class LifecycleApiAutomationCompositionForwarderParametersTest {
     }
 
     @Test
-    public void testEmptyParameters() {
-        final LifecycleApiForwarderParameters configurationParameters =
+    void testEmptyParameters() {
+        final var configurationParameters =
                 CommonTestData.getPolicyForwarderParameters("src/test/resources/parameters/EmptyParameters.json",
                         LifecycleApiForwarderParameters.class);
 
diff --git a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiAutomationCompositionForwarderTest.java b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiAutomationCompositionForwarderTest.java
index 0c9a8f6e..f28b52e5 100644
--- a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiAutomationCompositionForwarderTest.java
+++ b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiAutomationCompositionForwarderTest.java
@@ -25,10 +25,9 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import java.util.ArrayList;
 import java.util.Collection;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.onap.policy.common.parameters.ParameterGroup;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import org.onap.policy.common.parameters.ParameterService;
 import org.onap.policy.common.utils.coder.CoderException;
 import org.onap.policy.common.utils.coder.StandardCoder;
@@ -45,7 +44,7 @@ import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate;
  *
  * @author Sirisha Manchikanti (sirisha.manchikanti@est.tech)
  */
-public class LifecycleApiAutomationCompositionForwarderTest {
+class LifecycleApiAutomationCompositionForwarderTest {
 
     private static final String AUTOMATION_COMPOSITION =
             "src/test/resources/parameters/sample_automation_composition.json";
@@ -60,9 +59,9 @@ public class LifecycleApiAutomationCompositionForwarderTest {
      * @throws PolicyForwardingException if any error occurs
      * @throws InterruptedException if any error occurs
      */
-    @BeforeClass
-    public static void setUp() throws PolicyForwardingException, CoderException, InterruptedException {
-        final ParameterGroup parameterGroup = CommonTestData.getPolicyForwarderParameters(
+    @BeforeAll
+    static void setUp() throws PolicyForwardingException, CoderException, InterruptedException {
+        final var parameterGroup = CommonTestData.getPolicyForwarderParameters(
                 "src/test/resources/parameters/LifecycleApiAutomationCompositionForwarderParameters.json",
                 LifecycleApiAutomationCompositionForwarderParameters.class);
         ParameterService.register(parameterGroup);
@@ -75,19 +74,19 @@ public class LifecycleApiAutomationCompositionForwarderTest {
     /**
      * Tear down.
      */
-    @AfterClass
-    public static void tearDown() {
+    @AfterAll
+    static void tearDown() {
         ParameterService.deregister(LifecycleApiAutomationCompositionForwarderParameters.class.getSimpleName());
         simulator.stopLifecycycleApiSimulator();
     }
 
     @Test
-    public void testForwardAutomationCompositionUsingSimulator() throws Exception {
+    void testForwardAutomationCompositionUsingSimulator() throws Exception {
         assertThatCode(() -> {
-            final ToscaServiceTemplate toscaServiceTemplate = standardCoder.decode(
+            final var toscaServiceTemplate = standardCoder.decode(
                 ResourceUtils.getResourceAsString(AUTOMATION_COMPOSITION), ToscaServiceTemplate.class);
 
-            final LifecycleApiAutomationCompositionForwarder forwarder =
+            final var forwarder =
                     new LifecycleApiAutomationCompositionForwarder();
             forwarder.configure(LifecycleApiAutomationCompositionForwarderParameters.class.getSimpleName());
 
@@ -100,12 +99,12 @@ public class LifecycleApiAutomationCompositionForwarderTest {
     }
 
     @Test
-    public void testForwardAutomationCompositionFailureUsingSimulator() throws Exception {
+    void testForwardAutomationCompositionFailureUsingSimulator() throws Exception {
 
-        final ToscaEntity toscaEntity = new ToscaEntity();
+        final var toscaEntity = new ToscaEntity();
         toscaEntity.setName("FailureCase");
 
-        final LifecycleApiAutomationCompositionForwarder forwarder = new LifecycleApiAutomationCompositionForwarder();
+        final var forwarder = new LifecycleApiAutomationCompositionForwarder();
         forwarder.configure(LifecycleApiAutomationCompositionForwarderParameters.class.getSimpleName());
 
         final Collection<ToscaEntity> automationCompositionList = new ArrayList<>();
diff --git a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiForwarderParametersTest.java b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiForwarderParametersTest.java
index 42602cf7..2cee6e6c 100644
--- a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiForwarderParametersTest.java
+++ b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiForwarderParametersTest.java
@@ -22,11 +22,11 @@
 package org.onap.policy.distribution.forwarding.lifecycle.api;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.onap.policy.common.parameters.ValidationStatus;
 import org.onap.policy.distribution.forwarding.testclasses.CommonTestData;
 
@@ -35,7 +35,7 @@ import org.onap.policy.distribution.forwarding.testclasses.CommonTestData;
  *
  * @author Ram Krishna Verma (ram.krishna.verma@est.tech)
  */
-public class LifecycleApiForwarderParametersTest {
+class LifecycleApiForwarderParametersTest {
 
     private static final String POLICY_API_HOST_NAME = "localhost";
     private static final int POLICY_API_PORT = 6969;
@@ -48,8 +48,8 @@ public class LifecycleApiForwarderParametersTest {
 
 
     @Test
-    public void testValidParameters() {
-        final LifecycleApiForwarderParameters configurationParameters =
+    void testValidParameters() {
+        final var configurationParameters =
                 CommonTestData.getPolicyForwarderParameters(
                         "src/test/resources/parameters/LifecycleApiPolicyForwarderParameters.json",
                         LifecycleApiForwarderParameters.class);
@@ -73,8 +73,8 @@ public class LifecycleApiForwarderParametersTest {
     }
 
     @Test
-    public void testInvalidParameters() {
-        final LifecycleApiForwarderParameters configurationParameters =
+    void testInvalidParameters() {
+        final var configurationParameters =
                 CommonTestData.getPolicyForwarderParameters(
                         "src/test/resources/parameters/LifecycleApiPolicyForwarderParametersInvalid.json",
                         LifecycleApiForwarderParameters.class);
@@ -83,8 +83,8 @@ public class LifecycleApiForwarderParametersTest {
     }
 
     @Test
-    public void testEmptyParameters() {
-        final LifecycleApiForwarderParameters configurationParameters =
+    void testEmptyParameters() {
+        final var configurationParameters =
                 CommonTestData.getPolicyForwarderParameters("src/test/resources/parameters/EmptyParameters.json",
                         LifecycleApiForwarderParameters.class);
 
diff --git a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiPolicyForwarderTest.java b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiPolicyForwarderTest.java
index 604445ed..ba85505d 100644
--- a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiPolicyForwarderTest.java
+++ b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiPolicyForwarderTest.java
@@ -26,10 +26,9 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import java.util.ArrayList;
 import java.util.Collection;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.onap.policy.common.parameters.ParameterGroup;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import org.onap.policy.common.parameters.ParameterService;
 import org.onap.policy.common.utils.coder.CoderException;
 import org.onap.policy.common.utils.coder.StandardCoder;
@@ -46,7 +45,7 @@ import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate;
  *
  * @author Ram Krishna Verma (ram.krishna.verma@est.tech)
  */
-public class LifecycleApiPolicyForwarderTest {
+class LifecycleApiPolicyForwarderTest {
 
     private static final String POLICY = "src/test/resources/parameters/sample_policy.json";
     private static final String POLICY_ERROR = "src/test/resources/parameters/sample_policy_failure.json";
@@ -61,9 +60,9 @@ public class LifecycleApiPolicyForwarderTest {
      * @throws PolicyForwardingException if any error occurs
      * @throws InterruptedException if any error occurs
      */
-    @BeforeClass
-    public static void setUp() throws PolicyForwardingException, CoderException, InterruptedException {
-        final ParameterGroup parameterGroup = CommonTestData.getPolicyForwarderParameters(
+    @BeforeAll
+    static void setUp() throws PolicyForwardingException, CoderException, InterruptedException {
+        final var parameterGroup = CommonTestData.getPolicyForwarderParameters(
                 "src/test/resources/parameters/LifecycleApiPolicyForwarderParameters.json",
                 LifecycleApiForwarderParameters.class);
         ParameterService.register(parameterGroup);
@@ -76,21 +75,21 @@ public class LifecycleApiPolicyForwarderTest {
     /**
      * Tear down.
      */
-    @AfterClass
-    public static void tearDown() {
+    @AfterAll
+    static void tearDown() {
         ParameterService.deregister(LifecycleApiForwarderParameters.class.getSimpleName());
         simulator.stopLifecycycleApiSimulator();
     }
 
     @Test
-    public void testForwardPolicyUsingSimulator() throws Exception {
+    void testForwardPolicyUsingSimulator() throws Exception {
         assertThatCode(() -> {
-            final ToscaServiceTemplate toscaServiceTemplate1 =
+            final var toscaServiceTemplate1 =
                     standardCoder.decode(ResourceUtils.getResourceAsString(POLICY_TYPE), ToscaServiceTemplate.class);
-            final ToscaServiceTemplate toscaServiceTemplate2 =
+            final var toscaServiceTemplate2 =
                     standardCoder.decode(ResourceUtils.getResourceAsString(POLICY), ToscaServiceTemplate.class);
 
-            final LifecycleApiPolicyForwarder forwarder = new LifecycleApiPolicyForwarder();
+            final var forwarder = new LifecycleApiPolicyForwarder();
             forwarder.configure(LifecycleApiForwarderParameters.class.getSimpleName());
 
             final Collection<ToscaEntity> policies = new ArrayList<>();
@@ -103,17 +102,17 @@ public class LifecycleApiPolicyForwarderTest {
     }
 
     @Test
-    public void testForwardPolicyFailureUsingSimulator() throws Exception {
+    void testForwardPolicyFailureUsingSimulator() throws Exception {
 
-        final ToscaServiceTemplate toscaServiceTemplate1 =
+        final var toscaServiceTemplate1 =
                 standardCoder.decode(ResourceUtils.getResourceAsString(POLICY_TYPE), ToscaServiceTemplate.class);
-        final ToscaServiceTemplate toscaServiceTemplate2 =
+        final var toscaServiceTemplate2 =
                 standardCoder.decode(ResourceUtils.getResourceAsString(POLICY), ToscaServiceTemplate.class);
-        final ToscaServiceTemplate toscaServiceTemplate3 =
+        final var toscaServiceTemplate3 =
                 standardCoder.decode(ResourceUtils.getResourceAsString(POLICY_ERROR), ToscaServiceTemplate.class);
-        final ToscaEntity unsupportedPolicy = new UnsupportedPolicy();
+        final var unsupportedPolicy = new UnsupportedPolicy();
 
-        final LifecycleApiPolicyForwarder forwarder = new LifecycleApiPolicyForwarder();
+        final var forwarder = new LifecycleApiPolicyForwarder();
         forwarder.configure(LifecycleApiForwarderParameters.class.getSimpleName());
 
         final Collection<ToscaEntity> policies = new ArrayList<>();
diff --git a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/testclasses/LifecycleApiAutomationCompositionSimulatorEndpoint.java b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/testclasses/LifecycleApiAutomationCompositionSimulatorEndpoint.java
index 00b017ba..c50bf222 100644
--- a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/testclasses/LifecycleApiAutomationCompositionSimulatorEndpoint.java
+++ b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/testclasses/LifecycleApiAutomationCompositionSimulatorEndpoint.java
@@ -21,12 +21,12 @@
 
 package org.onap.policy.distribution.forwarding.testclasses;
 
-import javax.ws.rs.Consumes;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate;
 
 /**
diff --git a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/testclasses/LifecycycleApiSimulatorEndpoint.java b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/testclasses/LifecycycleApiSimulatorEndpoint.java
index 22aeff2f..810ac84d 100644
--- a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/testclasses/LifecycycleApiSimulatorEndpoint.java
+++ b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/testclasses/LifecycycleApiSimulatorEndpoint.java
@@ -22,13 +22,13 @@
 package org.onap.policy.distribution.forwarding.testclasses;
 
 import io.swagger.annotations.ApiParam;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 import org.onap.policy.models.pap.concepts.PdpDeployPolicies;
 import org.onap.policy.models.pap.concepts.PdpGroupDeployResponse;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate;
diff --git a/plugins/pom.xml b/plugins/pom.xml
index e48c5c2b..34f797d4 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -18,18 +18,20 @@
   SPDX-License-Identifier: Apache-2.0
   ============LICENSE_END=========================================================
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.onap.policy.distribution</groupId>
         <artifactId>policy-distribution</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>3.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>distribution-plugins</artifactId>
 
     <name>${project.artifactId}</name>
-    <description>The module of Policy Distribution that holds plugins for custom policy reception and forwarding.</description>
+    <description>The module of Policy Distribution that holds plugins for custom policy reception and forwarding.
+    </description>
     <packaging>pom</packaging>
 
     <properties>
diff --git a/plugins/reception-plugins/pom.xml b/plugins/reception-plugins/pom.xml
index acb5d30c..09a6d259 100644
--- a/plugins/reception-plugins/pom.xml
+++ b/plugins/reception-plugins/pom.xml
@@ -19,12 +19,13 @@
   SPDX-License-Identifier: Apache-2.0
   ============LICENSE_END=========================================================
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.onap.policy.distribution</groupId>
         <artifactId>distribution-plugins</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>3.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>reception-plugins</artifactId>
diff --git a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/policy/file/AutomationCompositionDecoderFileInCsarParameterGroupTest.java b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/policy/file/AutomationCompositionDecoderFileInCsarParameterGroupTest.java
index ea844e4e..201133f2 100644
--- a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/policy/file/AutomationCompositionDecoderFileInCsarParameterGroupTest.java
+++ b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/policy/file/AutomationCompositionDecoderFileInCsarParameterGroupTest.java
@@ -21,9 +21,9 @@
 
 package org.onap.policy.distribution.reception.decoding.policy.file;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.onap.policy.common.parameters.ValidationStatus;
 import org.onap.policy.distribution.reception.handling.sdc.CommonTestData;
 
@@ -32,11 +32,11 @@ import org.onap.policy.distribution.reception.handling.sdc.CommonTestData;
  *
  * @author Sirisha Manchikanti (sirisha.manchikanti@est.tech)
  */
-public class AutomationCompositionDecoderFileInCsarParameterGroupTest {
+class AutomationCompositionDecoderFileInCsarParameterGroupTest {
 
     @Test
-    public void testValidParameters() {
-        final AutomationCompositionDecoderFileInCsarParameterGroup configurationParameters = CommonTestData
+    void testValidParameters() {
+        final var configurationParameters = CommonTestData
                 .getPolicyDecoderParameters(
                     "src/test/resources/parameters/FileInCsarAutomationCompositionDecoderParameters.json",
                     AutomationCompositionDecoderFileInCsarParameterGroup.class);
@@ -48,8 +48,8 @@ public class AutomationCompositionDecoderFileInCsarParameterGroupTest {
     }
 
     @Test
-    public void testInvalidParameters() {
-        final AutomationCompositionDecoderFileInCsarParameterGroup configurationParameters =
+    void testInvalidParameters() {
+        final var configurationParameters =
                 CommonTestData.getPolicyDecoderParameters(
                         "src/test/resources/parameters/FileInCsarAutomationCompositionDecoderParametersInvalid.json",
                         AutomationCompositionDecoderFileInCsarParameterGroup.class);
@@ -58,8 +58,8 @@ public class AutomationCompositionDecoderFileInCsarParameterGroupTest {
     }
 
     @Test
-    public void testEmptyParameters() {
-        final AutomationCompositionDecoderFileInCsarParameterGroup configurationParameters =
+    void testEmptyParameters() {
+        final var configurationParameters =
                 CommonTestData.getPolicyDecoderParameters("src/test/resources/parameters/EmptyParameters.json",
                     AutomationCompositionDecoderFileInCsarParameterGroup.class);
 
diff --git a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/policy/file/AutomationCompositionDecoderFileInCsarTest.java b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/policy/file/AutomationCompositionDecoderFileInCsarTest.java
index ac8a75df..eca893dc 100644
--- a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/policy/file/AutomationCompositionDecoderFileInCsarTest.java
+++ b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/policy/file/AutomationCompositionDecoderFileInCsarTest.java
@@ -22,36 +22,31 @@
 package org.onap.policy.distribution.reception.decoding.policy.file;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.File;
-import java.util.Collection;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import org.onap.policy.common.parameters.ParameterService;
 import org.onap.policy.distribution.model.Csar;
 import org.onap.policy.distribution.reception.decoding.PolicyDecodingException;
 import org.onap.policy.distribution.reception.handling.sdc.CommonTestData;
-import org.onap.policy.models.tosca.authorative.concepts.ToscaEntity;
 
 /**
  * Class to perform unit test of {@link AutomationCompositionDecoderFileInCsar}.
  *
  * @author Sirisha Manchikanti (sirisha.manchikanti@est.tech)
  */
-@RunWith(MockitoJUnitRunner.class)
-public class AutomationCompositionDecoderFileInCsarTest {
+class AutomationCompositionDecoderFileInCsarTest {
 
     /**
      * Set up.
      */
-    @BeforeClass
-    public static void setUp() {
-        final AutomationCompositionDecoderFileInCsarParameterGroup configurationParameters = CommonTestData
+    @BeforeAll
+    static void setUp() {
+        final var configurationParameters = CommonTestData
                 .getPolicyDecoderParameters(
                     "src/test/resources/parameters/FileInCsarAutomationCompositionDecoderParameters.json",
                     AutomationCompositionDecoderFileInCsarParameterGroup.class);
@@ -62,33 +57,33 @@ public class AutomationCompositionDecoderFileInCsarTest {
     /**
      * Tear down.
      */
-    @AfterClass
-    public static void tearDown() {
+    @AfterAll
+    static void tearDown() {
         ParameterService.deregister(AutomationCompositionDecoderFileInCsarParameterGroup.class.getSimpleName());
     }
 
     @Test
-    public void testDecodeAutomationComposition() throws PolicyDecodingException {
+    void testDecodeAutomationComposition() throws PolicyDecodingException {
 
-        final AutomationCompositionDecoderFileInCsar decoder = new AutomationCompositionDecoderFileInCsar();
+        final var decoder = new AutomationCompositionDecoderFileInCsar();
         decoder.configure(AutomationCompositionDecoderFileInCsarParameterGroup.class.getSimpleName());
 
-        final File file = new File("src/test/resources/service-Sampleservice-acm.csar");
-        final Csar csar = new Csar(file.getAbsolutePath());
+        final var file = new File("src/test/resources/service-Sampleservice-acm.csar");
+        final var csar = new Csar(file.getAbsolutePath());
 
         assertTrue(decoder.canHandle(csar));
-        final Collection<ToscaEntity> automationCompositionHolders = decoder.decode(csar);
+        final var automationCompositionHolders = decoder.decode(csar);
         assertEquals(1, automationCompositionHolders.size());
     }
 
     @Test
-    public void testDecodeAutomationCompositionZipError() {
+    void testDecodeAutomationCompositionZipError() {
 
-        final AutomationCompositionDecoderFileInCsar decoder = new AutomationCompositionDecoderFileInCsar();
+        final var decoder = new AutomationCompositionDecoderFileInCsar();
         decoder.configure(AutomationCompositionDecoderFileInCsarParameterGroup.class.getSimpleName());
 
-        final File file = new File("unknown.csar");
-        final Csar csar = new Csar(file.getAbsolutePath());
+        final var file = new File("unknown.csar");
+        final var csar = new Csar(file.getAbsolutePath());
 
         assertTrue(decoder.canHandle(csar));
         assertThatThrownBy(() -> decoder.decode(csar)).isInstanceOf(PolicyDecodingException.class)
diff --git a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/policy/file/PolicyDecoderFileInCsarToPolicyParameterGroupTest.java b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/policy/file/PolicyDecoderFileInCsarToPolicyParameterGroupTest.java
index c3cf3f5b..0164fe57 100644
--- a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/policy/file/PolicyDecoderFileInCsarToPolicyParameterGroupTest.java
+++ b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/policy/file/PolicyDecoderFileInCsarToPolicyParameterGroupTest.java
@@ -21,9 +21,9 @@
 
 package org.onap.policy.distribution.reception.decoding.policy.file;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.onap.policy.common.parameters.ValidationStatus;
 import org.onap.policy.distribution.reception.handling.sdc.CommonTestData;
 
@@ -32,11 +32,11 @@ import org.onap.policy.distribution.reception.handling.sdc.CommonTestData;
  *
  * @author Ram Krishna Verma (ram.krishna.verma@ericsson.com)
  */
-public class PolicyDecoderFileInCsarToPolicyParameterGroupTest {
+class PolicyDecoderFileInCsarToPolicyParameterGroupTest {
 
     @Test
-    public void testValidParameters() {
-        final PolicyDecoderFileInCsarToPolicyParameterGroup configurationParameters = CommonTestData
+    void testValidParameters() {
+        final var configurationParameters = CommonTestData
                 .getPolicyDecoderParameters("src/test/resources/parameters/FileInCsarPolicyDecoderParameters.json",
                         PolicyDecoderFileInCsarToPolicyParameterGroup.class);
 
@@ -48,8 +48,8 @@ public class PolicyDecoderFileInCsarToPolicyParameterGroupTest {
     }
 
     @Test
-    public void testInvalidParameters() {
-        final PolicyDecoderFileInCsarToPolicyParameterGroup configurationParameters =
+    void testInvalidParameters() {
+        final var configurationParameters =
                 CommonTestData.getPolicyDecoderParameters(
                         "src/test/resources/parameters/FileInCsarPolicyDecoderParametersInvalid.json",
                         PolicyDecoderFileInCsarToPolicyParameterGroup.class);
@@ -58,8 +58,8 @@ public class PolicyDecoderFileInCsarToPolicyParameterGroupTest {
     }
 
     @Test
-    public void testEmptyParameters() {
-        final PolicyDecoderFileInCsarToPolicyParameterGroup configurationParameters =
+    void testEmptyParameters() {
+        final var configurationParameters =
                 CommonTestData.getPolicyDecoderParameters("src/test/resources/parameters/EmptyParameters.json",
                         PolicyDecoderFileInCsarToPolicyParameterGroup.class);
 
diff --git a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/policy/file/PolicyDecoderFileInCsarToPolicyTest.java b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/policy/file/PolicyDecoderFileInCsarToPolicyTest.java
index 45dd167c..88b4c863 100644
--- a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/policy/file/PolicyDecoderFileInCsarToPolicyTest.java
+++ b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/policy/file/PolicyDecoderFileInCsarToPolicyTest.java
@@ -22,35 +22,30 @@
 package org.onap.policy.distribution.reception.decoding.policy.file;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.File;
-import java.util.Collection;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import org.onap.policy.common.parameters.ParameterService;
 import org.onap.policy.distribution.model.Csar;
 import org.onap.policy.distribution.reception.decoding.PolicyDecodingException;
 import org.onap.policy.distribution.reception.handling.sdc.CommonTestData;
-import org.onap.policy.models.tosca.authorative.concepts.ToscaEntity;
 
 /**
  * Class to perform unit test of {@link PolicyDecoderFileInCsarToPolicy}.
  *
  * @author Ram Krishna Verma (ram.krishna.verma@ericsson.com)
  */
-@RunWith(MockitoJUnitRunner.class)
-public class PolicyDecoderFileInCsarToPolicyTest {
+class PolicyDecoderFileInCsarToPolicyTest {
 
     /**
      * Set up.
      */
-    @BeforeClass
-    public static void setUp() {
+    @BeforeAll
+    static void setUp() {
         final PolicyDecoderFileInCsarToPolicyParameterGroup configurationParameters = CommonTestData
                 .getPolicyDecoderParameters("src/test/resources/parameters/FileInCsarPolicyDecoderParameters.json",
                         PolicyDecoderFileInCsarToPolicyParameterGroup.class);
@@ -61,47 +56,47 @@ public class PolicyDecoderFileInCsarToPolicyTest {
     /**
      * Tear down.
      */
-    @AfterClass
-    public static void tearDown() {
+    @AfterAll
+    static void tearDown() {
         ParameterService.deregister(PolicyDecoderFileInCsarToPolicyParameterGroup.class.getSimpleName());
     }
 
     @Test
-    public void testDecodePolicy() throws PolicyDecodingException {
+    void testDecodePolicy() throws PolicyDecodingException {
 
-        final PolicyDecoderFileInCsarToPolicy decoder = new PolicyDecoderFileInCsarToPolicy();
+        final var decoder = new PolicyDecoderFileInCsarToPolicy();
         decoder.configure(PolicyDecoderFileInCsarToPolicyParameterGroup.class.getSimpleName());
 
-        final File file = new File("src/test/resources/service-Sampleservice.csar");
-        final Csar csar = new Csar(file.getAbsolutePath());
+        final var file = new File("src/test/resources/service-Sampleservice.csar");
+        final var csar = new Csar(file.getAbsolutePath());
 
         assertTrue(decoder.canHandle(csar));
-        final Collection<ToscaEntity> policyHolders = decoder.decode(csar);
+        final var policyHolders = decoder.decode(csar);
         assertEquals(2, policyHolders.size());
     }
 
     @Test
-    public void testDecodeYamlPolicy() throws PolicyDecodingException {
+    void testDecodeYamlPolicy() throws PolicyDecodingException {
 
-        final PolicyDecoderFileInCsarToPolicy decoder = new PolicyDecoderFileInCsarToPolicy();
+        final var decoder = new PolicyDecoderFileInCsarToPolicy();
         decoder.configure(PolicyDecoderFileInCsarToPolicyParameterGroup.class.getSimpleName());
 
-        final File file = new File("src/test/resources/service-Sampleservice-yaml.csar");
-        final Csar csar = new Csar(file.getAbsolutePath());
+        final var file = new File("src/test/resources/service-Sampleservice-yaml.csar");
+        final var csar = new Csar(file.getAbsolutePath());
 
         assertTrue(decoder.canHandle(csar));
-        final Collection<ToscaEntity> policyHolders = decoder.decode(csar);
+        final var policyHolders = decoder.decode(csar);
         assertEquals(2, policyHolders.size());
     }
 
     @Test
-    public void testDecodePolicyZipError() {
+    void testDecodePolicyZipError() {
 
-        final PolicyDecoderFileInCsarToPolicy decoder = new PolicyDecoderFileInCsarToPolicy();
+        final var decoder = new PolicyDecoderFileInCsarToPolicy();
         decoder.configure(PolicyDecoderFileInCsarToPolicyParameterGroup.class.getSimpleName());
 
-        final File file = new File("unknown.csar");
-        final Csar csar = new Csar(file.getAbsolutePath());
+        final var file = new File("unknown.csar");
+        final var csar = new Csar(file.getAbsolutePath());
 
         assertTrue(decoder.canHandle(csar));
         assertThatThrownBy(() -> decoder.decode(csar)).isInstanceOf(PolicyDecodingException.class)
@@ -110,13 +105,13 @@ public class PolicyDecoderFileInCsarToPolicyTest {
 
 
     @Test
-    public void testDecodePolicyCoderError() {
+    void testDecodePolicyCoderError() {
 
-        final PolicyDecoderFileInCsarToPolicy decoder = new PolicyDecoderFileInCsarToPolicy();
+        final var decoder = new PolicyDecoderFileInCsarToPolicy();
         decoder.configure(PolicyDecoderFileInCsarToPolicyParameterGroup.class.getSimpleName());
 
-        final File file = new File("src/test/resources/service-Sampleservice-test.csar");
-        final Csar csar = new Csar(file.getAbsolutePath());
+        final var file = new File("src/test/resources/service-Sampleservice-test.csar");
+        final var csar = new Csar(file.getAbsolutePath());
 
         assertTrue(decoder.canHandle(csar));
         assertThatThrownBy(() -> decoder.decode(csar)).isInstanceOf(PolicyDecodingException.class)
diff --git a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/file/TestFileSystemReceptionHandler.java b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/file/TestFileSystemReceptionHandler.java
index 7308018d..c36cd363 100644
--- a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/file/TestFileSystemReceptionHandler.java
+++ b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/file/TestFileSystemReceptionHandler.java
@@ -22,8 +22,9 @@
 package org.onap.policy.distribution.reception.handling.file;
 
 import static org.assertj.core.api.Assertions.assertThatCode;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
 
-import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import java.io.File;
 import java.io.FileReader;
@@ -31,14 +32,11 @@ import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.concurrent.atomic.AtomicInteger;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
 import org.mockito.stubbing.Answer;
 import org.onap.policy.common.parameters.ParameterService;
 import org.onap.policy.distribution.reception.statistics.DistributionStatisticsManager;
@@ -48,13 +46,12 @@ import org.slf4j.LoggerFactory;
 /**
  * Class to perform unit test of {@link FileSystemReceptionHandler}.
  */
-@RunWith(MockitoJUnitRunner.class)
-public class TestFileSystemReceptionHandler {
+class TestFileSystemReceptionHandler {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(TestFileSystemReceptionHandler.class);
 
-    @Rule
-    public TemporaryFolder tempFolder = new TemporaryFolder();
+    @TempDir
+    public File tempFolder;
 
     private FileSystemReceptionHandlerConfigurationParameterGroup pssdConfigParameters;
     private FileSystemReceptionHandler fileSystemHandler;
@@ -67,25 +64,25 @@ public class TestFileSystemReceptionHandler {
      * @throws SecurityException if it occurs
      * @throws IllegalArgumentException if it occurs
      */
-    @Before
-    public final void init() throws IOException, SecurityException, IllegalArgumentException {
+    @BeforeEach
+    final void init() throws IOException, SecurityException, IllegalArgumentException {
         DistributionStatisticsManager.resetAllStatistics();
 
-        final Gson gson = new GsonBuilder().create();
+        final var gson = new GsonBuilder().create();
         pssdConfigParameters = gson.fromJson(new FileReader("src/test/resources/handling-filesystem.json"),
                 FileSystemReceptionHandlerConfigurationParameterGroup.class);
         ParameterService.register(pssdConfigParameters);
         fileSystemHandler = new FileSystemReceptionHandler();
     }
 
-    @After
-    public void teardown() {
+    @AfterEach
+    void teardown() {
         ParameterService.deregister(pssdConfigParameters);
     }
 
     @Test
-    public final void testInit() throws IOException {
-        FileSystemReceptionHandler sypHandler = Mockito.spy(fileSystemHandler);
+    final void testInit() throws IOException {
+        var sypHandler = spy(fileSystemHandler);
         Mockito.doNothing().when(sypHandler).initFileWatcher(Mockito.isA(String.class),
                 Mockito.anyInt());
         assertThatCode(() -> sypHandler.initializeReception(pssdConfigParameters.getName()))
@@ -93,8 +90,8 @@ public class TestFileSystemReceptionHandler {
     }
 
     @Test
-    public final void testDestroy() throws IOException {
-        final FileSystemReceptionHandler sypHandler = Mockito.spy(fileSystemHandler);
+    final void testDestroy() throws IOException {
+        final var sypHandler = spy(fileSystemHandler);
         Mockito.doNothing().when(sypHandler).initFileWatcher(Mockito.isA(String.class),
                 Mockito.anyInt());
         assertThatCode(() -> {
@@ -104,17 +101,17 @@ public class TestFileSystemReceptionHandler {
     }
 
     @Test
-    public void testMain() throws IOException {
-        final Object lock = new Object();
-        final String watchPath = tempFolder.getRoot().getAbsolutePath();
+    void testMain() throws IOException {
+        final var lock = new Object();
+        final var watchPath = tempFolder.getAbsolutePath();
 
         class Processed {
             public boolean processed = false;
         }
 
-        final Processed cond = new Processed();
+        final var cond = new Processed();
 
-        final FileSystemReceptionHandler sypHandler = Mockito.spy(fileSystemHandler);
+        final var sypHandler = Mockito.spy(fileSystemHandler);
         Mockito.doAnswer((Answer<Object>) invocation -> {
             synchronized (lock) {
                 cond.processed = true;
@@ -123,7 +120,7 @@ public class TestFileSystemReceptionHandler {
             return null;
         }).when(sypHandler).createPolicyInputAndCallHandler(Mockito.isA(String.class));
 
-        final Thread th = new Thread(() -> {
+        final var th = new Thread(() -> {
             try {
                 sypHandler.initFileWatcher(watchPath, 2);
             } catch (final IOException ex) {
@@ -134,7 +131,7 @@ public class TestFileSystemReceptionHandler {
         th.start();
         try {
             // wait until internal watch service started or counter reached
-            final AtomicInteger counter = new AtomicInteger();
+            final var counter = new AtomicInteger();
             counter.set(0);
             synchronized (lock) {
                 while (!sypHandler.isRunning() && counter.getAndIncrement() < 10) {
@@ -156,8 +153,7 @@ public class TestFileSystemReceptionHandler {
         } catch (final InterruptedException ex) {
             LOGGER.error("testMain failed", ex);
         }
-        Mockito.verify(sypHandler, Mockito.times(1)).createPolicyInputAndCallHandler(Mockito.isA(String.class));
+        verify(sypHandler, Mockito.times(1)).createPolicyInputAndCallHandler(Mockito.isA(String.class));
 
     }
 }
-
diff --git a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/file/TestFileSystemReceptionHandlerConfigurationParameterGroup.java b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/file/TestFileSystemReceptionHandlerConfigurationParameterGroup.java
index c8bcc7bd..46d7f27e 100644
--- a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/file/TestFileSystemReceptionHandlerConfigurationParameterGroup.java
+++ b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/file/TestFileSystemReceptionHandlerConfigurationParameterGroup.java
@@ -24,64 +24,58 @@
 package org.onap.policy.distribution.reception.handling.file;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-import org.onap.policy.common.parameters.ValidationResult;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 
 /**
  * Class to perform unit test of {@link FileSystemReceptionHandlerConfigurationParameterGroup}.
  *
  */
-public class TestFileSystemReceptionHandlerConfigurationParameterGroup {
-    @Rule
-    public TemporaryFolder tempFolder = new TemporaryFolder();
+class TestFileSystemReceptionHandlerConfigurationParameterGroup {
 
-    @Test
-    public void testFileSystemConfiguration() throws IOException {
-        FileSystemReceptionHandlerConfigurationParameterGroup configParameters = null;
-        String validPath = null;
+    @TempDir
+    private File tempFolder;
 
-        validPath = tempFolder.getRoot().getAbsolutePath();
+    @Test
+    void testFileSystemConfiguration() throws IOException {
+        String validPath = tempFolder.getPath();
 
-        configParameters = new FileSystemReceptionHandlerConfigurationParameterGroup();
+        var configParameters = new FileSystemReceptionHandlerConfigurationParameterGroup();
         configParameters.setWatchPath(validPath);
         configParameters.setMaxThread(2);
 
-        final ValidationResult validationResult = configParameters.validate();
+        final var validationResult = configParameters.validate();
         assertTrue(validationResult.isValid());
         assertEquals(validPath, configParameters.getWatchPath());
         assertEquals(2, configParameters.getMaxThread());
     }
 
     @Test
-    public void testInvalidFileSystemConfiguration() throws IOException {
-        FileSystemReceptionHandlerConfigurationParameterGroup configParameters = null;
-        final Gson gson = new GsonBuilder().create();
-        configParameters = gson.fromJson(new FileReader("src/test/resources/handling-sdcInvalid.json"),
+    void testInvalidFileSystemConfiguration() throws IOException {
+        final var gson = new GsonBuilder().create();
+        var configParameters = gson.fromJson(new FileReader("src/test/resources/handling-sdcInvalid.json"),
                 FileSystemReceptionHandlerConfigurationParameterGroup.class);
-        final ValidationResult validationResult = configParameters.validate();
+        final var validationResult = configParameters.validate();
         assertFalse(validationResult.isValid());
 
     }
 
     @Test
-    public void testFileSystemReceptionHandlerConfigurationParameterBuilderWithInvalidPath() throws IOException {
-        final String invalidPath = tempFolder.newFile("foobar").getAbsolutePath();
+    void testFileSystemReceptionHandlerConfigurationParameterBuilderWithInvalidPath() throws IOException {
+        final var invalidPath = new File(tempFolder, "foobar").getAbsolutePath();
 
-        final FileSystemReceptionHandlerConfigurationParameterGroup configParameters =
-                new FileSystemReceptionHandlerConfigurationParameterGroup();
+        final var configParameters = new FileSystemReceptionHandlerConfigurationParameterGroup();
         configParameters.setWatchPath(invalidPath);
 
-        final ValidationResult validateResult = configParameters.validate();
+        final var validateResult = configParameters.validate();
         assertFalse(validateResult.isValid());
         assertThat(validateResult.getResult()).contains("is not a valid directory");
     }
diff --git a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/TestComponentDoneStatusMessage.java b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/TestComponentDoneStatusMessage.java
index c5935822..d3f7ee00 100644
--- a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/TestComponentDoneStatusMessage.java
+++ b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/TestComponentDoneStatusMessage.java
@@ -21,20 +21,20 @@
 
 package org.onap.policy.distribution.reception.handling.sdc;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.onap.sdc.utils.DistributionStatusEnum;
 
-public class TestComponentDoneStatusMessage {
+class TestComponentDoneStatusMessage {
 
     private static final String CONSUMER_ID = "dummyId";
     private static final String DISTRIBUTION_ID = "dummyDistribution";
 
     @Test
-    public void testComponentDoneStatusMessage_Success() {
-        final long timestamp = System.currentTimeMillis();
-        final ComponentDoneStatusMessage message = ComponentDoneStatusMessage.builder().consumerId(CONSUMER_ID)
+    void testComponentDoneStatusMessage_Success() {
+        final var timestamp = System.currentTimeMillis();
+        final var message = ComponentDoneStatusMessage.builder().consumerId(CONSUMER_ID)
                         .distributionId(DISTRIBUTION_ID).distributionStatus(DistributionStatusEnum.COMPONENT_DONE_OK)
                         .timestamp(timestamp).build();
         assertEquals("POLICY", message.getComponentName());
@@ -45,9 +45,9 @@ public class TestComponentDoneStatusMessage {
     }
 
     @Test
-    public void testComponentDoneStatusMessage_Failure() {
-        final long timestamp = System.currentTimeMillis();
-        final ComponentDoneStatusMessage message = ComponentDoneStatusMessage.builder().consumerId(CONSUMER_ID)
+    void testComponentDoneStatusMessage_Failure() {
+        final var timestamp = System.currentTimeMillis();
+        final var message = ComponentDoneStatusMessage.builder().consumerId(CONSUMER_ID)
                         .distributionId(DISTRIBUTION_ID).distributionStatus(DistributionStatusEnum.COMPONENT_DONE_ERROR)
                         .timestamp(timestamp).build();
         assertEquals("POLICY", message.getComponentName());
diff --git a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/TestDistributionStatusMessage.java b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/TestDistributionStatusMessage.java
index 62cf0f3d..86d4bdeb 100644
--- a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/TestDistributionStatusMessage.java
+++ b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/TestDistributionStatusMessage.java
@@ -21,22 +21,22 @@
 
 package org.onap.policy.distribution.reception.handling.sdc;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.onap.sdc.utils.DistributionStatusEnum;
 
-public class TestDistributionStatusMessage {
+class TestDistributionStatusMessage {
 
     private static final String ARTIFACT_URL = "http://dummyurl";
     private static final String CONSUMER_ID = "dummyId";
     private static final String DISTRIBUTION_ID = "dummyDistribution";
 
     @Test
-    public void testDistributionStatusMessage_Download() {
-        final long timestamp = System.currentTimeMillis();
+    void testDistributionStatusMessage_Download() {
+        final var timestamp = System.currentTimeMillis();
 
-        final DistributionStatusMessage message = DistributionStatusMessage.builder().artifactUrl(ARTIFACT_URL)
+        final var message = DistributionStatusMessage.builder().artifactUrl(ARTIFACT_URL)
                         .consumerId(CONSUMER_ID).distributionId(DISTRIBUTION_ID)
                         .distributionStatus(DistributionStatusEnum.DOWNLOAD_OK).timestamp(timestamp).build();
         assertEquals(ARTIFACT_URL, message.getArtifactURL());
@@ -47,10 +47,10 @@ public class TestDistributionStatusMessage {
     }
 
     @Test
-    public void testDistributionStatusMessage_Deploy() {
-        final long timestamp = System.currentTimeMillis();
+    void testDistributionStatusMessage_Deploy() {
+        final var timestamp = System.currentTimeMillis();
 
-        final DistributionStatusMessage message = DistributionStatusMessage.builder().artifactUrl(ARTIFACT_URL)
+        final var message = DistributionStatusMessage.builder().artifactUrl(ARTIFACT_URL)
                         .consumerId(CONSUMER_ID).distributionId(DISTRIBUTION_ID)
                         .distributionStatus(DistributionStatusEnum.DEPLOY_OK).timestamp(timestamp).build();
         assertEquals(ARTIFACT_URL, message.getArtifactURL());
diff --git a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/TestSdcReceptionHandler.java b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/TestSdcReceptionHandler.java
index 3e8f4a63..9a993c6c 100644
--- a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/TestSdcReceptionHandler.java
+++ b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/TestSdcReceptionHandler.java
@@ -23,28 +23,25 @@
 package org.onap.policy.distribution.reception.handling.sdc;
 
 import static org.assertj.core.api.Assertions.assertThatCode;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static  org.mockito.Mockito.any;
+import static  org.mockito.Mockito.mock;
+import static  org.mockito.Mockito.spy;
+import static  org.mockito.Mockito.when;
 
-import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import java.io.FileReader;
 import java.io.IOException;
-import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.onap.policy.common.parameters.ParameterService;
 import org.onap.policy.distribution.forwarding.PolicyForwarder;
 import org.onap.policy.distribution.forwarding.parameters.PolicyForwarderParameters;
@@ -68,23 +65,17 @@ import org.onap.sdc.utils.DistributionActionResultEnum;
  *
  * @author Ram Krishna Verma (ram.krishna.verma@ericsson.com)
  */
-@RunWith(MockitoJUnitRunner.class)
-public class TestSdcReceptionHandler {
+class TestSdcReceptionHandler {
 
     private static final String DUMMY_SERVICE_CSAR = "dummyService.csar";
 
-    @Mock
-    private IDistributionClientResult successfulClientInitResult;
-    @Mock
-    private IDistributionClientResult failureClientInitResult;
-    @Mock
-    private IDistributionClient distributionClient;
-    @Mock
-    private IDistributionClientDownloadResult successfulClientDownloadResult;
-    @Mock
-    private INotificationData notificationData;
-    @Mock
-    private IArtifactInfo artifactInfo;
+    private final IDistributionClientResult successfulClientInitResult = mock(IDistributionClientResult.class);
+    private final IDistributionClientResult failureClientInitResult = mock(IDistributionClientResult.class);
+    private final IDistributionClient distributionClient = mock(IDistributionClient.class);
+    private final IDistributionClientDownloadResult successfulClientDownloadResult
+        = mock(IDistributionClientDownloadResult.class);
+    private final INotificationData notificationData = mock(INotificationData.class);
+    private final IArtifactInfo artifactInfo = mock(IArtifactInfo.class);
 
     private SdcReceptionHandlerConfigurationParameterGroup pssdConfigParameters;
     private SdcReceptionHandler sypHandler;
@@ -97,70 +88,70 @@ public class TestSdcReceptionHandler {
      * @throws SecurityException        if it occurs
      * @throws IllegalArgumentException if it occurs
      */
-    @Before
-    public final void init() throws IOException, SecurityException, IllegalArgumentException {
+    @BeforeEach
+    final void init() throws IOException, SecurityException, IllegalArgumentException {
         DistributionStatisticsManager.resetAllStatistics();
-        final Gson gson = new GsonBuilder().create();
+        final var gson = new GsonBuilder().create();
         pssdConfigParameters = gson.fromJson(new FileReader("src/test/resources/handling-sdc.json"),
             SdcReceptionHandlerConfigurationParameterGroup.class);
         ParameterService.register(pssdConfigParameters);
-        final SdcReceptionHandler sdcHandler = new SdcReceptionHandler();
-        sypHandler = Mockito.spy(sdcHandler);
-
-        Mockito.when(sypHandler.createSdcDistributionClient()).thenReturn(distributionClient);
-        Mockito.when(distributionClient.init(any(), any())).thenReturn(successfulClientInitResult);
-        Mockito.when(distributionClient.start()).thenReturn(successfulClientInitResult);
-        Mockito.when(distributionClient.stop()).thenReturn(successfulClientInitResult);
-        Mockito.when(distributionClient.sendComponentDoneStatus(any())).thenReturn(successfulClientInitResult);
-        Mockito.when(distributionClient.sendComponentDoneStatus(any(), any())).thenReturn(successfulClientInitResult);
-        Mockito.when(distributionClient.sendDownloadStatus(any())).thenReturn(successfulClientInitResult);
-        Mockito.when(distributionClient.sendDownloadStatus(any(), any())).thenReturn(successfulClientInitResult);
-        Mockito.when(distributionClient.sendDeploymentStatus(any())).thenReturn(successfulClientInitResult);
-        Mockito.when(distributionClient.sendDeploymentStatus(any(), any())).thenReturn(successfulClientInitResult);
-        Mockito.when(distributionClient.download(any())).thenReturn(successfulClientDownloadResult);
-        Mockito.when(notificationData.getServiceArtifacts()).thenReturn(List.of(artifactInfo));
-        Mockito.when(artifactInfo.getArtifactName()).thenReturn(DUMMY_SERVICE_CSAR);
-        Mockito.when(successfulClientDownloadResult.getArtifactPayload()).thenReturn(new byte[1]);
-        Mockito.when(successfulClientInitResult.getDistributionActionResult())
+        final var sdcHandler = new SdcReceptionHandler();
+        sypHandler = spy(sdcHandler);
+
+        when(sypHandler.createSdcDistributionClient()).thenReturn(distributionClient);
+        when(distributionClient.init(any(), any())).thenReturn(successfulClientInitResult);
+        when(distributionClient.start()).thenReturn(successfulClientInitResult);
+        when(distributionClient.stop()).thenReturn(successfulClientInitResult);
+        when(distributionClient.sendComponentDoneStatus(any())).thenReturn(successfulClientInitResult);
+        when(distributionClient.sendComponentDoneStatus(any(), any())).thenReturn(successfulClientInitResult);
+        when(distributionClient.sendDownloadStatus(any())).thenReturn(successfulClientInitResult);
+        when(distributionClient.sendDownloadStatus(any(), any())).thenReturn(successfulClientInitResult);
+        when(distributionClient.sendDeploymentStatus(any())).thenReturn(successfulClientInitResult);
+        when(distributionClient.sendDeploymentStatus(any(), any())).thenReturn(successfulClientInitResult);
+        when(distributionClient.download(any())).thenReturn(successfulClientDownloadResult);
+        when(notificationData.getServiceArtifacts()).thenReturn(List.of(artifactInfo));
+        when(artifactInfo.getArtifactName()).thenReturn(DUMMY_SERVICE_CSAR);
+        when(successfulClientDownloadResult.getArtifactPayload()).thenReturn(new byte[1]);
+        when(successfulClientInitResult.getDistributionActionResult())
             .thenReturn(DistributionActionResultEnum.SUCCESS);
-        Mockito.when(successfulClientDownloadResult.getDistributionActionResult())
+        when(successfulClientDownloadResult.getDistributionActionResult())
             .thenReturn(DistributionActionResultEnum.SUCCESS);
-        Mockito.when(failureClientInitResult.getDistributionActionResult())
+        when(failureClientInitResult.getDistributionActionResult())
             .thenReturn(DistributionActionResultEnum.FAIL);
 
     }
 
-    @After
-    public void teardown() {
+    @AfterEach
+    void teardown() {
         ParameterService.deregister(pssdConfigParameters);
     }
 
     @Test
-    public final void testInitializeSdcClient() {
+    final void testInitializeSdcClient() {
         assertThatCode(() -> sypHandler.initializeReception(pssdConfigParameters.getName()))
             .doesNotThrowAnyException();
     }
 
     @Test
-    public final void testInitializeSdcClient_Failure() {
+    final void testInitializeSdcClient_Failure() {
 
-        Mockito.when(successfulClientInitResult.getDistributionActionResult())
+        when(successfulClientInitResult.getDistributionActionResult())
             .thenReturn(DistributionActionResultEnum.FAIL).thenReturn(DistributionActionResultEnum.SUCCESS);
         assertThatCode(() -> sypHandler.initializeReception(pssdConfigParameters.getName()))
             .doesNotThrowAnyException();
     }
 
     @Test
-    public final void testStartSdcClient_Failure() {
+    final void testStartSdcClient_Failure() {
         assertThatCode(() -> {
-            Mockito.when(distributionClient.start()).thenReturn(failureClientInitResult)
+            when(distributionClient.start()).thenReturn(failureClientInitResult)
                 .thenReturn(successfulClientInitResult);
             sypHandler.initializeReception(pssdConfigParameters.getName());
         }).doesNotThrowAnyException();
     }
 
     @Test
-    public final void testStopSdcClient() {
+    final void testStopSdcClient() {
         assertThatCode(() -> {
             sypHandler.initializeReception(pssdConfigParameters.getName());
             sypHandler.destroy();
@@ -168,27 +159,27 @@ public class TestSdcReceptionHandler {
     }
 
     @Test
-    public final void testStopSdcClient_Failure() {
+    final void testStopSdcClient_Failure() {
         sypHandler.initializeReception(pssdConfigParameters.getName());
-        Mockito.when(distributionClient.stop()).thenReturn(failureClientInitResult)
+        when(distributionClient.stop()).thenReturn(failureClientInitResult)
             .thenReturn(successfulClientInitResult);
         assertThatCode(() -> sypHandler.destroy()).doesNotThrowAnyException();
     }
 
     @Test
-    public final void testStopSdcClientWithoutStart() {
+    final void testStopSdcClientWithoutStart() {
         assertThatCode(() -> sypHandler.destroy()).doesNotThrowAnyException();
     }
 
     @Test
-    public void testNotificationCallBack() throws NoSuchFieldException, SecurityException, IllegalArgumentException,
+    void testNotificationCallBack() throws NoSuchFieldException, SecurityException, IllegalArgumentException,
         IllegalAccessException, PluginInitializationException {
 
-        final DummyDecoder policyDecoder = new DummyDecoder();
+        final var policyDecoder = new DummyDecoder();
         final Collection<PolicyDecoder<Csar, DummyPolicy>> policyDecoders = new ArrayList<>();
         policyDecoders.add(policyDecoder);
 
-        final DummyPolicyForwarder policyForwarder = new DummyPolicyForwarder();
+        final var policyForwarder = new DummyPolicyForwarder();
         final Collection<PolicyForwarder> policyForwarders = new ArrayList<>();
         policyForwarders.add(policyForwarder);
 
@@ -208,17 +199,17 @@ public class TestSdcReceptionHandler {
     }
 
     @Test
-    public void testDownloadArtifactFailure() throws NoSuchFieldException, SecurityException, IllegalArgumentException,
+    void testDownloadArtifactFailure() throws NoSuchFieldException, SecurityException, IllegalArgumentException,
         IllegalAccessException, PluginInitializationException {
 
-        Mockito.when(successfulClientDownloadResult.getDistributionActionResult())
+        when(successfulClientDownloadResult.getDistributionActionResult())
             .thenReturn(DistributionActionResultEnum.FAIL);
 
-        final DummyDecoder policyDecoder = new DummyDecoder();
+        final var policyDecoder = new DummyDecoder();
         final Collection<PolicyDecoder<Csar, DummyPolicy>> policyDecoders = new ArrayList<>();
         policyDecoders.add(policyDecoder);
 
-        final DummyPolicyForwarder policyForwarder = new DummyPolicyForwarder();
+        final var policyForwarder = new DummyPolicyForwarder();
         final Collection<PolicyForwarder> policyForwarders = new ArrayList<>();
         policyForwarders.add(policyForwarder);
 
@@ -237,20 +228,20 @@ public class TestSdcReceptionHandler {
     }
 
     @Test
-    public void testSendDistributionStatusFailure() throws NoSuchFieldException, SecurityException,
+    void testSendDistributionStatusFailure() throws NoSuchFieldException, SecurityException,
         IllegalArgumentException, IllegalAccessException, PluginInitializationException {
 
-        Mockito.when(successfulClientDownloadResult.getDistributionActionResult())
+        when(successfulClientDownloadResult.getDistributionActionResult())
             .thenReturn(DistributionActionResultEnum.FAIL);
-        Mockito.when(distributionClient.sendDownloadStatus(any(), any())).thenReturn(failureClientInitResult);
-        Mockito.when(distributionClient.sendDeploymentStatus(any(), any())).thenReturn(failureClientInitResult);
-        Mockito.when(distributionClient.sendComponentDoneStatus(any(), any())).thenReturn(failureClientInitResult);
+        when(distributionClient.sendDownloadStatus(any(), any())).thenReturn(failureClientInitResult);
+        when(distributionClient.sendDeploymentStatus(any(), any())).thenReturn(failureClientInitResult);
+        when(distributionClient.sendComponentDoneStatus(any(), any())).thenReturn(failureClientInitResult);
 
-        final DummyDecoder policyDecoder = new DummyDecoder();
+        final var policyDecoder = new DummyDecoder();
         final Collection<PolicyDecoder<Csar, DummyPolicy>> policyDecoders = new ArrayList<>();
         policyDecoders.add(policyDecoder);
 
-        final DummyPolicyForwarder policyForwarder = new DummyPolicyForwarder();
+        final var policyForwarder = new DummyPolicyForwarder();
         final Collection<PolicyForwarder> policyForwarders = new ArrayList<>();
         policyForwarders.add(policyForwarder);
 
@@ -267,34 +258,34 @@ public class TestSdcReceptionHandler {
                               final Collection<PolicyForwarder> forwarders)
         throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException,
         PluginInitializationException {
-        final PluginHandlerParameters pluginParameters = getPluginHandlerParameters();
+        final var pluginParameters = getPluginHandlerParameters();
         pluginParameters.setName("DummyDistributionGroup");
         ParameterService.register(pluginParameters);
-        final PluginHandler pluginHandler = new PluginHandler(pluginParameters.getName());
+        final var pluginHandler = new PluginHandler(pluginParameters.getName());
 
-        final Field decodersField = pluginHandler.getClass().getDeclaredField("policyDecoders");
+        final var decodersField = pluginHandler.getClass().getDeclaredField("policyDecoders");
         decodersField.setAccessible(true);
         decodersField.set(pluginHandler, decoders);
 
-        final Field forwardersField = pluginHandler.getClass().getDeclaredField("policyForwarders");
+        final var forwardersField = pluginHandler.getClass().getDeclaredField("policyForwarders");
         forwardersField.setAccessible(true);
         forwardersField.set(pluginHandler, forwarders);
 
-        final Field pluginHandlerField = AbstractReceptionHandler.class.getDeclaredField("pluginHandler");
+        final var pluginHandlerField = AbstractReceptionHandler.class.getDeclaredField("pluginHandler");
         pluginHandlerField.setAccessible(true);
         pluginHandlerField.set(receptionHandler, pluginHandler);
         ParameterService.deregister(pluginParameters.getName());
     }
 
     private PluginHandlerParameters getPluginHandlerParameters() {
-        final Map<String, PolicyDecoderParameters> policyDecoders = getPolicyDecoders();
-        final Map<String, PolicyForwarderParameters> policyForwarders = getPolicyForwarders();
+        final var policyDecoders = getPolicyDecoders();
+        final var policyForwarders = getPolicyForwarders();
         return new PluginHandlerParameters(policyDecoders, policyForwarders);
     }
 
     private Map<String, PolicyDecoderParameters> getPolicyDecoders() {
         final Map<String, PolicyDecoderParameters> policyDecoders = new HashMap<>();
-        final PolicyDecoderParameters pDParameters = new PolicyDecoderParameters("DummyDecoder",
+        final var pDParameters = new PolicyDecoderParameters("DummyDecoder",
             "org.onap.policy.distribution.reception.handling.sdc.DummyDecoder", "DummyDecoderConfiguration");
         policyDecoders.put("DummyDecoderKey", pDParameters);
         return policyDecoders;
@@ -302,7 +293,7 @@ public class TestSdcReceptionHandler {
 
     private Map<String, PolicyForwarderParameters> getPolicyForwarders() {
         final Map<String, PolicyForwarderParameters> policyForwarders = new HashMap<>();
-        final PolicyForwarderParameters pFParameters = new PolicyForwarderParameters("DummyForwarder",
+        final var pFParameters = new PolicyForwarderParameters("DummyForwarder",
             "org.onap.policy.distribution.reception.handling.sdc.DummyPolicyForwarder", "DummyConfiguration");
         policyForwarders.put("DummyForwarderKey", pFParameters);
         return policyForwarders;
diff --git a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/TestSdcReceptionHandlerConfigurationParameterGroup.java b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/TestSdcReceptionHandlerConfigurationParameterGroup.java
index 717f635d..0bf85681 100644
--- a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/TestSdcReceptionHandlerConfigurationParameterGroup.java
+++ b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/TestSdcReceptionHandlerConfigurationParameterGroup.java
@@ -22,35 +22,33 @@
 
 package org.onap.policy.distribution.reception.handling.sdc;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import java.io.FileReader;
 import java.io.IOException;
 import java.util.Arrays;
-import org.junit.Test;
-import org.onap.policy.common.parameters.ValidationResult;
+import org.junit.jupiter.api.Test;
 import org.onap.policy.common.parameters.ValidationStatus;
 
 /**
  * Class to perform unit test of {@link SdcConfiguration}.
  *
  */
-public class TestSdcReceptionHandlerConfigurationParameterGroup {
+class TestSdcReceptionHandlerConfigurationParameterGroup {
 
     @Test
-    public void testSdcConfiguration() throws IOException {
-        SdcReceptionHandlerConfigurationParameterGroup configParameters = null;
-        final Gson gson = new GsonBuilder().create();
-        configParameters = gson.fromJson(new FileReader("src/test/resources/handling-sdc.json"),
+    void testSdcConfiguration() throws IOException {
+        final var gson = new GsonBuilder().create();
+        var configParameters = gson.fromJson(new FileReader("src/test/resources/handling-sdc.json"),
                SdcReceptionHandlerConfigurationParameterGroup.class);
 
-        final ValidationResult validationResult = configParameters.validate();
+        final var validationResult = configParameters.validate();
         assertTrue(validationResult.isValid());
-        final SdcConfiguration config = new SdcConfiguration(configParameters);
+        final var config = new SdcConfiguration(configParameters);
         assertEquals(Arrays.asList("TOSCA_CSAR", "HEAT"), config.getRelevantArtifactTypes());
         assertEquals("localhost", config.getSdcAddress());
         assertEquals("policy", config.getUser());
@@ -62,44 +60,41 @@ public class TestSdcReceptionHandlerConfigurationParameterGroup {
         assertEquals("TEST", config.getEnvironmentName());
         assertEquals("null", config.getKeyStorePath());
         assertEquals("null", config.getKeyStorePassword());
-        assertEquals(false, config.activateServerTLSAuth());
-        assertEquals(true, config.isFilterInEmptyResources());
-        assertEquals(false, config.isUseHttpsWithSDC());
+        assertFalse(config.activateServerTLSAuth());
+        assertTrue(config.isFilterInEmptyResources());
+        assertFalse(config.isUseHttpsWithSDC());
     }
 
     @Test
-    public void testSdcConfigurationNullParameters() throws IOException {
-        SdcReceptionHandlerConfigurationParameterGroup configParameters = null;
-        final Gson gson = new GsonBuilder().create();
-        configParameters = gson.fromJson(new FileReader("src/test/resources/handling-sdc-null-parameters.json"),
+    void testSdcConfigurationNullParameters() throws IOException {
+        final var gson = new GsonBuilder().create();
+        var configParameters = gson.fromJson(new FileReader("src/test/resources/handling-sdc-null-parameters.json"),
                SdcReceptionHandlerConfigurationParameterGroup.class);
 
-        final ValidationResult validationResult = configParameters.validate();
+        final var validationResult = configParameters.validate();
         assertTrue(validationResult.isValid());
-        final SdcConfiguration config = new SdcConfiguration(configParameters);
-        assertEquals(null, config.getKeyStorePath());
-        assertEquals(null, config.getKeyStorePassword());
+        final var config = new SdcConfiguration(configParameters);
+        assertThat(config.getKeyStorePath()).isNull();
+        assertThat(config.getKeyStorePassword()).isNull();
         //if boolean parameters are null they are set to false
-        assertEquals(false, config.activateServerTLSAuth());
-        assertEquals(false, config.isFilterInEmptyResources());
+        assertFalse(config.activateServerTLSAuth());
+        assertFalse(config.isFilterInEmptyResources());
     }
 
     @Test
-    public void testInvalidSdcConfiguration() throws IOException {
-        SdcReceptionHandlerConfigurationParameterGroup configParameters = null;
-
-        final Gson gson = new GsonBuilder().create();
-        configParameters = gson.fromJson(new FileReader("src/test/resources/handling-sdcInvalid.json"),
+    void testInvalidSdcConfiguration() throws IOException {
+        final var gson = new GsonBuilder().create();
+        var configParameters = gson.fromJson(new FileReader("src/test/resources/handling-sdcInvalid.json"),
                 SdcReceptionHandlerConfigurationParameterGroup.class);
 
-        final ValidationResult validationResult = configParameters.validate();
+        final var validationResult = configParameters.validate();
         assertFalse(validationResult.isValid());
 
     }
 
     @Test
-    public void testEmptyParameters() {
-        final SdcReceptionHandlerConfigurationParameterGroup configurationParameters =
+    void testEmptyParameters() {
+        final var configurationParameters =
                 CommonTestData.getPolicyDecoderParameters("src/test/resources/parameters/EmptyParameters.json",
                         SdcReceptionHandlerConfigurationParameterGroup.class);
 
diff --git a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/exceptions/TestExceptions.java b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/exceptions/TestExceptions.java
index 2b6c98dc..3d409575 100644
--- a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/exceptions/TestExceptions.java
+++ b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/handling/sdc/exceptions/TestExceptions.java
@@ -20,13 +20,13 @@
 
 package org.onap.policy.distribution.reception.handling.sdc.exceptions;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.onap.policy.common.utils.test.ExceptionsTester;
 
-public class TestExceptions {
+class TestExceptions {
 
     @Test
-    public void test() {
+    void test() {
         new ExceptionsTester().test(ArtifactDownloadException.class);
     }
 }