Sonar/Checkstyle in service/plugins

Sonar and Checkstyle changes in plugins and services, and
knock on changes

Issue-ID: POLICY-1034
Change-Id: Iff7df74e54fce2c661dcc2fae75ae93d4cacfe5b
Signed-off-by: liamfallon <liam.fallon@ericsson.com>

9 files changed, 174 insertions, 46 deletions

diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/java/org/onap/policy/apex/apps/uservice/test/adapt/restrequestor/TestRESTRequestor.java b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/java/org/onap/policy/apex/apps/uservice/test/adapt/restrequestor/TestRestRequestor.java
index 3db0f1467..051647339 100644
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/java/org/onap/policy/apex/apps/uservice/test/adapt/restrequestor/TestRESTRequestor.java
+++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/java/org/onap/policy/apex/apps/uservice/test/adapt/restrequestor/TestRestRequestor.java
@@ -48,7 +48,10 @@ import org.onap.policy.apex.core.infrastructure.threading.ThreadUtilities;
 import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
 import org.onap.policy.apex.service.engine.main.ApexMain;
 
-public class TestRESTRequestor {
+/**
+ * The Class TestRestRequestor.
+ */
+public class TestRestRequestor {
     private static final String BASE_URI = "http://localhost:32801/TestRESTRequestor";
     private static HttpServer server;
 
@@ -58,6 +61,11 @@ public class TestRESTRequestor {
     private final PrintStream stdout = System.out;
     private final PrintStream stderr = System.err;
 
+    /**
+     * Sets the up.
+     *
+     * @throws Exception the exception
+     */
     @BeforeClass
     public static void setUp() throws Exception {
         final ResourceConfig rc = new ResourceConfig(TestRestRequestorEndpoint.class);
@@ -68,6 +76,11 @@ public class TestRESTRequestor {
         }
     }
 
+    /**
+     * Tear down.
+     *
+     * @throws Exception the exception
+     */
     @AfterClass
     public static void tearDown() throws Exception {
         server.shutdownNow();
@@ -77,16 +90,27 @@ public class TestRESTRequestor {
         new File("src/test/resources/events/EventsOutMulti1.json").delete();
     }
 
+    /**
+     * Reset counters.
+     */
     @Before
     public void resetCounters() {
         TestRestRequestorEndpoint.resetCounters();
     }
 
+    /**
+     * Test rest requestor get.
+     *
+     * @throws MessagingException the messaging exception
+     * @throws ApexException the apex exception
+     * @throws IOException Signals that an I/O exception has occurred.
+     */
     @Test
-    public void testRESTRequestorGet() throws MessagingException, ApexException, IOException {
+    public void testRestRequestorGet() throws MessagingException, ApexException, IOException {
         final Client client = ClientBuilder.newClient();
 
-        final String[] args = { "src/test/resources/prodcons/File2RESTRequest2FileGet.json" };
+        final String[] args =
+            { "src/test/resources/prodcons/File2RESTRequest2FileGet.json" };
         final ApexMain apexMain = new ApexMain(args);
 
         // Wait for the required amount of events to be received or for 10 seconds
@@ -95,7 +119,7 @@ public class TestRESTRequestor {
             ThreadUtilities.sleep(100);
 
             final Response response = client.target("http://localhost:32801/TestRESTRequestor/apex/event/Stats")
-                    .request("application/json").get();
+                            .request("application/json").get();
 
             assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
             final String responseString = response.readEntity(String.class);
@@ -115,11 +139,19 @@ public class TestRESTRequestor {
         assertEquals(Double.valueOf(50.0), getsSoFar);
     }
 
+    /**
+     * Test REST requestor put.
+     *
+     * @throws MessagingException the messaging exception
+     * @throws ApexException the apex exception
+     * @throws IOException Signals that an I/O exception has occurred.
+     */
     @Test
-    public void testRESTRequestorPut() throws MessagingException, ApexException, IOException {
+    public void testRestRequestorPut() throws MessagingException, ApexException, IOException {
         final Client client = ClientBuilder.newClient();
 
-        final String[] args = { "src/test/resources/prodcons/File2RESTRequest2FilePut.json" };
+        final String[] args =
+            { "src/test/resources/prodcons/File2RESTRequest2FilePut.json" };
         final ApexMain apexMain = new ApexMain(args);
 
         // Wait for the required amount of events to be received or for 10 seconds
@@ -128,7 +160,7 @@ public class TestRESTRequestor {
             ThreadUtilities.sleep(100);
 
             final Response response = client.target("http://localhost:32801/TestRESTRequestor/apex/event/Stats")
-                    .request("application/json").get();
+                            .request("application/json").get();
 
             assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
             final String responseString = response.readEntity(String.class);
@@ -148,11 +180,19 @@ public class TestRESTRequestor {
         assertEquals(Double.valueOf(50.0), putsSoFar);
     }
 
+    /**
+     * Test REST requestor post.
+     *
+     * @throws MessagingException the messaging exception
+     * @throws ApexException the apex exception
+     * @throws IOException Signals that an I/O exception has occurred.
+     */
     @Test
-    public void testRESTRequestorPost() throws MessagingException, ApexException, IOException {
+    public void testRestRequestorPost() throws MessagingException, ApexException, IOException {
         final Client client = ClientBuilder.newClient();
 
-        final String[] args = { "src/test/resources/prodcons/File2RESTRequest2FilePost.json" };
+        final String[] args =
+            { "src/test/resources/prodcons/File2RESTRequest2FilePost.json" };
         final ApexMain apexMain = new ApexMain(args);
 
         // Wait for the required amount of events to be received or for 10 seconds
@@ -161,7 +201,7 @@ public class TestRESTRequestor {
             ThreadUtilities.sleep(100);
 
             final Response response = client.target("http://localhost:32801/TestRESTRequestor/apex/event/Stats")
-                    .request("application/json").get();
+                            .request("application/json").get();
 
             assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
             final String responseString = response.readEntity(String.class);
@@ -181,11 +221,19 @@ public class TestRESTRequestor {
         assertEquals(Double.valueOf(50.0), postsSoFar);
     }
 
+    /**
+     * Test REST requestor delete.
+     *
+     * @throws MessagingException the messaging exception
+     * @throws ApexException the apex exception
+     * @throws IOException Signals that an I/O exception has occurred.
+     */
     @Test
-    public void testRESTRequestorDelete() throws MessagingException, ApexException, IOException {
+    public void testRestRequestorDelete() throws MessagingException, ApexException, IOException {
         final Client client = ClientBuilder.newClient();
 
-        final String[] args = { "src/test/resources/prodcons/File2RESTRequest2FileDelete.json" };
+        final String[] args =
+            { "src/test/resources/prodcons/File2RESTRequest2FileDelete.json" };
         final ApexMain apexMain = new ApexMain(args);
 
         // Wait for the required amount of events to be received or for 10 seconds
@@ -194,7 +242,7 @@ public class TestRESTRequestor {
             ThreadUtilities.sleep(100);
 
             final Response response = client.target("http://localhost:32801/TestRESTRequestor/apex/event/Stats")
-                    .request("application/json").get();
+                            .request("application/json").get();
 
             assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
             final String responseString = response.readEntity(String.class);
@@ -214,11 +262,19 @@ public class TestRESTRequestor {
         assertEquals(Double.valueOf(50.0), deletesSoFar);
     }
 
+    /**
+     * Test REST requestor multi inputs.
+     *
+     * @throws MessagingException the messaging exception
+     * @throws ApexException the apex exception
+     * @throws IOException Signals that an I/O exception has occurred.
+     */
     @Test
-    public void testRESTRequestorMultiInputs() throws MessagingException, ApexException, IOException {
+    public void testRestRequestorMultiInputs() throws MessagingException, ApexException, IOException {
         final Client client = ClientBuilder.newClient();
 
-        final String[] args = { "src/test/resources/prodcons/File2RESTRequest2FileGetMulti.json" };
+        final String[] args =
+            { "src/test/resources/prodcons/File2RESTRequest2FileGetMulti.json" };
         final ApexMain apexMain = new ApexMain(args);
 
         // Wait for the required amount of events to be received or for 10 seconds
@@ -227,7 +283,7 @@ public class TestRESTRequestor {
             ThreadUtilities.sleep(100);
 
             final Response response = client.target("http://localhost:32801/TestRESTRequestor/apex/event/Stats")
-                    .request("application/json").get();
+                            .request("application/json").get();
 
             assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
             final String responseString = response.readEntity(String.class);
@@ -249,12 +305,20 @@ public class TestRESTRequestor {
         ThreadUtilities.sleep(1000);
     }
 
+    /**
+     * Test REST requestor producer alone.
+     *
+     * @throws MessagingException the messaging exception
+     * @throws ApexException the apex exception
+     * @throws IOException Signals that an I/O exception has occurred.
+     */
     @Test
-    public void testRESTRequestorProducerAlone() throws MessagingException, ApexException, IOException {
+    public void testRestRequestorProducerAlone() throws MessagingException, ApexException, IOException {
         System.setOut(new PrintStream(outContent));
         System.setErr(new PrintStream(errContent));
 
-        final String[] args = { "src/test/resources/prodcons/File2RESTRequest2FileGetProducerAlone.json" };
+        final String[] args =
+            { "src/test/resources/prodcons/File2RESTRequest2FileGetProducerAlone.json" };
 
         final ApexMain apexMain = new ApexMain(args);
         ThreadUtilities.sleep(200);
@@ -265,16 +329,24 @@ public class TestRESTRequestor {
         System.setOut(stdout);
         System.setErr(stderr);
 
-        assertTrue(outString.contains(
-                "REST Requestor producer (RestRequestorProducer) must run in peered requestor mode with a REST Requestor consumer"));
+        assertTrue(outString.contains("REST Requestor producer (RestRequestorProducer) "
+                        + "must run in peered requestor mode with a REST Requestor consumer"));
     }
 
+    /**
+     * Test REST requestor consumer alone.
+     *
+     * @throws MessagingException the messaging exception
+     * @throws ApexException the apex exception
+     * @throws IOException Signals that an I/O exception has occurred.
+     */
     @Test
-    public void testRESTRequestorConsumerAlone() throws MessagingException, ApexException, IOException {
+    public void testRestRequestorConsumerAlone() throws MessagingException, ApexException, IOException {
         System.setOut(new PrintStream(outContent));
         System.setErr(new PrintStream(errContent));
 
-        final String[] args = { "src/test/resources/prodcons/File2RESTRequest2FileGetConsumerAlone.json" };
+        final String[] args =
+            { "src/test/resources/prodcons/File2RESTRequest2FileGetConsumerAlone.json" };
 
         final ApexMain apexMain = new ApexMain(args);
         ThreadUtilities.sleep(200);
@@ -285,7 +357,7 @@ public class TestRESTRequestor {
         System.setOut(stdout);
         System.setErr(stderr);
 
-        assertTrue(outString.contains(
-                "peer \"RestRequestorProducer for peered mode REQUESTOR does not exist or is not defined with the same peered mode"));
+        assertTrue(outString.contains("peer \"RestRequestorProducer for peered mode REQUESTOR "
+                        + "does not exist or is not defined with the same peered mode"));
     }
 }
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/java/org/onap/policy/apex/apps/uservice/test/adapt/restrequestor/TestRestRequestorEndpoint.java b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/java/org/onap/policy/apex/apps/uservice/test/adapt/restrequestor/TestRestRequestorEndpoint.java
index 4977b3efb..0de34eb9b 100644
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/java/org/onap/policy/apex/apps/uservice/test/adapt/restrequestor/TestRestRequestorEndpoint.java
+++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/java/org/onap/policy/apex/apps/uservice/test/adapt/restrequestor/TestRestRequestorEndpoint.java
@@ -34,6 +34,9 @@ import javax.ws.rs.PUT;
 import javax.ws.rs.Path;
 import javax.ws.rs.core.Response;
 
+/**
+ * The Class TestRestRequestorEndpoint.
+ */
 @Path("/apex")
 public class TestRestRequestorEndpoint {
 
@@ -50,6 +53,9 @@ public class TestRestRequestorEndpoint {
             + "\"TestMatchCase\": 2,\n" + "\"TestTimestamp\": " + System.currentTimeMillis() + ",\n"
             + "\"TestTemperature\": 9080.866\n" + "}";
 
+    /**
+     * Reset counters.
+     */
     public static void resetCounters() {
         postMessagesReceived = 0;
         putMessagesReceived = 0;
@@ -58,6 +64,11 @@ public class TestRestRequestorEndpoint {
         deleteMessagesReceived = 0;
     }
 
+    /**
+     * Service get stats.
+     *
+     * @return the response
+     */
     @Path("/event/Stats")
     @GET
     public Response serviceGetStats() {
@@ -71,6 +82,11 @@ public class TestRestRequestorEndpoint {
                 .build();
     }
 
+    /**
+     * Service get event.
+     *
+     * @return the response
+     */
     @Path("/event/GetEvent")
     @GET
     public Response serviceGetEvent() {
@@ -81,18 +97,34 @@ public class TestRestRequestorEndpoint {
         return Response.status(200).entity(EVENT_STRING).build();
     }
 
+    /**
+     * Service get empty event.
+     *
+     * @return the response
+     */
     @Path("/event/GetEmptyEvent")
     @GET
     public Response serviceGetEmptyEvent() {
         return Response.status(200).build();
     }
 
+    /**
+     * Service get event bad response.
+     *
+     * @return the response
+     */
     @Path("/event/GetEventBadResponse")
     @GET
     public Response serviceGetEventBadResponse() {
         return Response.status(400).build();
     }
 
+    /**
+     * Service post request.
+     *
+     * @param jsonString the json string
+     * @return the response
+     */
     @Path("/event/PostEvent")
     @POST
     public Response servicePostRequest(final String jsonString) {
@@ -111,12 +143,24 @@ public class TestRestRequestorEndpoint {
         return Response.status(200).entity(EVENT_STRING).build();
     }
 
+    /**
+     * Service post request bad response.
+     *
+     * @param jsonString the json string
+     * @return the response
+     */
     @Path("/event/PostEventBadResponse")
     @POST
     public Response servicePostRequestBadResponse(final String jsonString) {
         return Response.status(400).build();
     }
 
+    /**
+     * Service put request.
+     *
+     * @param jsonString the json string
+     * @return the response
+     */
     @Path("/event/PutEvent")
     @PUT
     public Response servicePutRequest(final String jsonString) {
@@ -135,6 +179,12 @@ public class TestRestRequestorEndpoint {
         return Response.status(200).entity(EVENT_STRING).build();
     }
 
+    /**
+     * Service delete request.
+     *
+     * @param jsonString the json string
+     * @return the response
+     */
     @Path("/event/DeleteEvent")
     @DELETE
     public Response serviceDeleteRequest(final String jsonString) {
@@ -145,6 +195,12 @@ public class TestRestRequestorEndpoint {
         return Response.status(200).entity(EVENT_STRING).build();
     }
 
+    /**
+     * Service delete request bad response.
+     *
+     * @param jsonString the json string
+     * @return the response
+     */
     @Path("/event/DeleteEventBadResponse")
     @DELETE
     public Response serviceDeleteRequestBadResponse(final String jsonString) {
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/resources/prodcons/File2RESTRequest2FileDelete.json b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/resources/prodcons/File2RESTRequest2FileDelete.json
index 6e12c0b1f..46da3970a 100644
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/resources/prodcons/File2RESTRequest2FileDelete.json
+++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/resources/prodcons/File2RESTRequest2FileDelete.json
@@ -9,7 +9,7 @@
 		"engineParameters": {
 			"executorParameters": {
 				"MVEL": {
-					"parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MVELExecutorParameters"
+					"parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MvelExecutorParameters"
 				}
 			}
 		}
@@ -29,7 +29,7 @@
 		"RestRequestorConsumer": {
 			"carrierTechnologyParameters": {
 				"carrierTechnology": "RESTREQUESTOR",
-				"parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restrequestor.RESTRequestorCarrierTechnologyParameters",
+				"parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restrequestor.RestRequestorCarrierTechnologyParameters",
 				"parameters": {
 					"url": "http://localhost:32801/TestRESTRequestor/apex/event/DeleteEvent",
 					"httpMethod": "DELETE",
@@ -49,7 +49,7 @@
 		"RestRequestorProducer": {
 			"carrierTechnologyParameters": {
 				"carrierTechnology": "RESTREQUESTOR",
-				"parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restrequestor.RESTRequestorCarrierTechnologyParameters"
+				"parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restrequestor.RestRequestorCarrierTechnologyParameters"
 			},
 			"eventProtocolParameters": {
 				"eventProtocol": "JSON"
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/resources/prodcons/File2RESTRequest2FileGet.json b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/resources/prodcons/File2RESTRequest2FileGet.json
index d0879eb73..3c1d314fe 100644
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/resources/prodcons/File2RESTRequest2FileGet.json
+++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/resources/prodcons/File2RESTRequest2FileGet.json
@@ -9,7 +9,7 @@
 		"engineParameters": {
 			"executorParameters": {
 				"MVEL": {
-					"parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MVELExecutorParameters"
+					"parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MvelExecutorParameters"
 				}
 			}
 		}
@@ -29,7 +29,7 @@
 		"RestRequestorConsumer": {
 			"carrierTechnologyParameters": {
 				"carrierTechnology": "RESTREQUESTOR",
-				"parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restrequestor.RESTRequestorCarrierTechnologyParameters",
+				"parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restrequestor.RestRequestorCarrierTechnologyParameters",
 				"parameters": {
 					"url": "http://localhost:32801/TestRESTRequestor/apex/event/GetEvent",
 					"httpMethod": "GET",
@@ -49,7 +49,7 @@
 		"RestRequestorProducer": {
 			"carrierTechnologyParameters": {
 				"carrierTechnology": "RESTREQUESTOR",
-				"parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restrequestor.RESTRequestorCarrierTechnologyParameters"
+				"parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restrequestor.RestRequestorCarrierTechnologyParameters"
 			},
 			"eventProtocolParameters": {
 				"eventProtocol": "JSON"
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/resources/prodcons/File2RESTRequest2FileGetConsumerAlone.json b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/resources/prodcons/File2RESTRequest2FileGetConsumerAlone.json
index b957b61de..9ebe89df5 100644
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/resources/prodcons/File2RESTRequest2FileGetConsumerAlone.json
+++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/resources/prodcons/File2RESTRequest2FileGetConsumerAlone.json
@@ -9,7 +9,7 @@
 		"engineParameters": {
 			"executorParameters": {
 				"MVEL": {
-					"parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MVELExecutorParameters"
+					"parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MvelExecutorParameters"
 				}
 			}
 		}
@@ -29,7 +29,7 @@
 		"RestRequestorConsumer": {
 			"carrierTechnologyParameters": {
 				"carrierTechnology": "RESTREQUESTOR",
-				"parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restrequestor.RESTRequestorCarrierTechnologyParameters",
+				"parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restrequestor.RestRequestorCarrierTechnologyParameters",
 				"parameters": {
 					"url": "http://localhost:32801/TestRESTRequestor/apex/event/GetEvent",
 					"httpMethod": "GET",
@@ -49,7 +49,7 @@
 		"RestRequestorProducer": {
 			"carrierTechnologyParameters": {
 				"carrierTechnology": "RESTREQUESTOR",
-				"parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restrequestor.RESTRequestorCarrierTechnologyParameters"
+				"parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restrequestor.RestRequestorCarrierTechnologyParameters"
 			},
 			"eventProtocolParameters": {
 				"eventProtocol": "JSON"
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/resources/prodcons/File2RESTRequest2FileGetMulti.json b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/resources/prodcons/File2RESTRequest2FileGetMulti.json
index ba1c997f5..424d2b454 100644
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/resources/prodcons/File2RESTRequest2FileGetMulti.json
+++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/resources/prodcons/File2RESTRequest2FileGetMulti.json
@@ -9,7 +9,7 @@
 		"engineParameters": {
 			"executorParameters": {
 				"MVEL": {
-					"parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MVELExecutorParameters"
+					"parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MvelExecutorParameters"
 				}
 			}
 		}
@@ -29,7 +29,7 @@
 		"RestRequestorConsumer0": {
 			"carrierTechnologyParameters": {
 				"carrierTechnology": "RESTREQUESTOR",
-				"parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restrequestor.RESTRequestorCarrierTechnologyParameters",
+				"parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restrequestor.RestRequestorCarrierTechnologyParameters",
 				"parameters": {
 					"url": "http://localhost:32801/TestRESTRequestor/apex/event/GetEvent",
 					"httpMethod": "GET",
@@ -58,7 +58,7 @@
 		"RestRequestorConsumer1": {
 			"carrierTechnologyParameters": {
 				"carrierTechnology": "RESTREQUESTOR",
-				"parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restrequestor.RESTRequestorCarrierTechnologyParameters",
+				"parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restrequestor.RestRequestorCarrierTechnologyParameters",
 				"parameters": {
 					"url": "http://localhost:32801/TestRESTRequestor/apex/event/GetEvent",
 					"httpMethod": "GET",
@@ -78,7 +78,7 @@
 		"RestRequestorProducer0": {
 			"carrierTechnologyParameters": {
 				"carrierTechnology": "RESTREQUESTOR",
-				"parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restrequestor.RESTRequestorCarrierTechnologyParameters"
+				"parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restrequestor.RestRequestorCarrierTechnologyParameters"
 			},
 			"eventProtocolParameters": {
 				"eventProtocol": "JSON"
@@ -103,7 +103,7 @@
 		"RestRequestorProducer1": {
 			"carrierTechnologyParameters": {
 				"carrierTechnology": "RESTREQUESTOR",
-				"parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restrequestor.RESTRequestorCarrierTechnologyParameters"
+				"parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restrequestor.RestRequestorCarrierTechnologyParameters"
 			},
 			"eventProtocolParameters": {
 				"eventProtocol": "JSON"
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/resources/prodcons/File2RESTRequest2FileGetProducerAlone.json b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/resources/prodcons/File2RESTRequest2FileGetProducerAlone.json
index a635e6c72..4fcbf59d9 100644
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/resources/prodcons/File2RESTRequest2FileGetProducerAlone.json
+++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/resources/prodcons/File2RESTRequest2FileGetProducerAlone.json
@@ -9,7 +9,7 @@
 		"engineParameters": {
 			"executorParameters": {
 				"MVEL": {
-					"parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MVELExecutorParameters"
+					"parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MvelExecutorParameters"
 				}
 			}
 		}
@@ -31,7 +31,7 @@
 		"RestRequestorProducer": {
 			"carrierTechnologyParameters": {
 				"carrierTechnology": "RESTREQUESTOR",
-				"parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restrequestor.RESTRequestorCarrierTechnologyParameters"
+				"parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restrequestor.RestRequestorCarrierTechnologyParameters"
 			},
 			"eventProtocolParameters": {
 				"eventProtocol": "JSON"
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/resources/prodcons/File2RESTRequest2FilePost.json b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/resources/prodcons/File2RESTRequest2FilePost.json
index 9db89ce89..fe5af67ee 100644
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/resources/prodcons/File2RESTRequest2FilePost.json
+++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/resources/prodcons/File2RESTRequest2FilePost.json
@@ -9,7 +9,7 @@
 		"engineParameters": {
 			"executorParameters": {
 				"MVEL": {
-					"parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MVELExecutorParameters"
+					"parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MvelExecutorParameters"
 				}
 			}
 		}
@@ -29,7 +29,7 @@
 		"RestRequestorConsumer": {
 			"carrierTechnologyParameters": {
 				"carrierTechnology": "RESTREQUESTOR",
-				"parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restrequestor.RESTRequestorCarrierTechnologyParameters",
+				"parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restrequestor.RestRequestorCarrierTechnologyParameters",
 				"parameters": {
 					"url": "http://localhost:32801/TestRESTRequestor/apex/event/PostEvent",
 					"httpMethod": "POST",
@@ -49,7 +49,7 @@
 		"RestRequestorProducer": {
 			"carrierTechnologyParameters": {
 				"carrierTechnology": "RESTREQUESTOR",
-				"parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restrequestor.RESTRequestorCarrierTechnologyParameters"
+				"parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restrequestor.RestRequestorCarrierTechnologyParameters"
 			},
 			"eventProtocolParameters": {
 				"eventProtocol": "JSON"
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/resources/prodcons/File2RESTRequest2FilePut.json b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/resources/prodcons/File2RESTRequest2FilePut.json
index 3eebe3d8a..e78446447 100644
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/resources/prodcons/File2RESTRequest2FilePut.json
+++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/resources/prodcons/File2RESTRequest2FilePut.json
@@ -9,7 +9,7 @@
 		"engineParameters": {
 			"executorParameters": {
 				"MVEL": {
-					"parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MVELExecutorParameters"
+					"parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MvelExecutorParameters"
 				}
 			}
 		}
@@ -29,7 +29,7 @@
 		"RestRequestorConsumer": {
 			"carrierTechnologyParameters": {
 				"carrierTechnology": "RESTREQUESTOR",
-				"parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restrequestor.RESTRequestorCarrierTechnologyParameters",
+				"parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restrequestor.RestRequestorCarrierTechnologyParameters",
 				"parameters": {
 					"url": "http://localhost:32801/TestRESTRequestor/apex/event/PutEvent",
 					"httpMethod": "PUT",
@@ -49,7 +49,7 @@
 		"RestRequestorProducer": {
 			"carrierTechnologyParameters": {
 				"carrierTechnology": "RESTREQUESTOR",
-				"parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restrequestor.RESTRequestorCarrierTechnologyParameters"
+				"parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restrequestor.RestRequestorCarrierTechnologyParameters"
 			},
 			"eventProtocolParameters": {
 				"eventProtocol": "JSON"