Sonar/Checkstyle in model/context/core

Checkstyle and sonar changes in the model, contexot
and core modules.

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

2 files changed, 16 insertions, 16 deletions

diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/src/main/java/org/onap/policy/apex/plugins/event/carrier/websocket/ApexWebSocketConsumer.java b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/src/main/java/org/onap/policy/apex/plugins/event/carrier/websocket/ApexWebSocketConsumer.java
index f2c59453c..e80efa2ee 100644
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/src/main/java/org/onap/policy/apex/plugins/event/carrier/websocket/ApexWebSocketConsumer.java
+++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/src/main/java/org/onap/policy/apex/plugins/event/carrier/websocket/ApexWebSocketConsumer.java
@@ -24,10 +24,10 @@ import java.util.EnumMap;
 import java.util.Map;
 
 import org.onap.policy.apex.core.infrastructure.messaging.MessagingException;
-import org.onap.policy.apex.core.infrastructure.messaging.stringmessaging.WSStringMessageClient;
-import org.onap.policy.apex.core.infrastructure.messaging.stringmessaging.WSStringMessageListener;
-import org.onap.policy.apex.core.infrastructure.messaging.stringmessaging.WSStringMessageServer;
-import org.onap.policy.apex.core.infrastructure.messaging.stringmessaging.WSStringMessager;
+import org.onap.policy.apex.core.infrastructure.messaging.stringmessaging.WsStringMessageClient;
+import org.onap.policy.apex.core.infrastructure.messaging.stringmessaging.WsStringMessageListener;
+import org.onap.policy.apex.core.infrastructure.messaging.stringmessaging.WsStringMessageServer;
+import org.onap.policy.apex.core.infrastructure.messaging.stringmessaging.WsStringMessager;
 import org.onap.policy.apex.core.infrastructure.threading.ApplicationThreadFactory;
 import org.onap.policy.apex.core.infrastructure.threading.ThreadUtilities;
 import org.onap.policy.apex.service.engine.event.ApexEventConsumer;
@@ -44,7 +44,7 @@ import org.slf4j.LoggerFactory;
  *
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
-public class ApexWebSocketConsumer implements ApexEventConsumer, WSStringMessageListener, Runnable {
+public class ApexWebSocketConsumer implements ApexEventConsumer, WsStringMessageListener, Runnable {
     private static final int WEB_SOCKET_WAIT_SLEEP_TIME = 100;
 
     // Get a reference to the logger
@@ -54,7 +54,7 @@ public class ApexWebSocketConsumer implements ApexEventConsumer, WSStringMessage
     private WEBSOCKETCarrierTechnologyParameters webSocketConsumerProperties;
 
     // The web socket messager, may be WS a server or a client
-    private WSStringMessager wsStringMessager;
+    private WsStringMessager wsStringMessager;
 
     // The event receiver that will receive events from this consumer
     private ApexEventReceiver eventReceiver;
@@ -89,10 +89,10 @@ public class ApexWebSocketConsumer implements ApexEventConsumer, WSStringMessage
         // Check if this is a server or a client Web Socket
         if (webSocketConsumerProperties.isWsClient()) {
             // Create a WS client
-            wsStringMessager = new WSStringMessageClient(webSocketConsumerProperties.getHost(),
+            wsStringMessager = new WsStringMessageClient(webSocketConsumerProperties.getHost(),
                     webSocketConsumerProperties.getPort());
         } else {
-            wsStringMessager = new WSStringMessageServer(webSocketConsumerProperties.getPort());
+            wsStringMessager = new WsStringMessageServer(webSocketConsumerProperties.getPort());
         }
 
         // Start reception of event strings on the web socket
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/src/main/java/org/onap/policy/apex/plugins/event/carrier/websocket/ApexWebSocketProducer.java b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/src/main/java/org/onap/policy/apex/plugins/event/carrier/websocket/ApexWebSocketProducer.java
index 1fd146824..6be8a3d1a 100644
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/src/main/java/org/onap/policy/apex/plugins/event/carrier/websocket/ApexWebSocketProducer.java
+++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/src/main/java/org/onap/policy/apex/plugins/event/carrier/websocket/ApexWebSocketProducer.java
@@ -24,10 +24,10 @@ import java.util.EnumMap;
 import java.util.Map;
 
 import org.onap.policy.apex.core.infrastructure.messaging.MessagingException;
-import org.onap.policy.apex.core.infrastructure.messaging.stringmessaging.WSStringMessageClient;
-import org.onap.policy.apex.core.infrastructure.messaging.stringmessaging.WSStringMessageListener;
-import org.onap.policy.apex.core.infrastructure.messaging.stringmessaging.WSStringMessageServer;
-import org.onap.policy.apex.core.infrastructure.messaging.stringmessaging.WSStringMessager;
+import org.onap.policy.apex.core.infrastructure.messaging.stringmessaging.WsStringMessageClient;
+import org.onap.policy.apex.core.infrastructure.messaging.stringmessaging.WsStringMessageListener;
+import org.onap.policy.apex.core.infrastructure.messaging.stringmessaging.WsStringMessageServer;
+import org.onap.policy.apex.core.infrastructure.messaging.stringmessaging.WsStringMessager;
 import org.onap.policy.apex.service.engine.event.ApexEventException;
 import org.onap.policy.apex.service.engine.event.ApexEventProducer;
 import org.onap.policy.apex.service.engine.event.PeeredReference;
@@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory;
  *
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
-public class ApexWebSocketProducer implements ApexEventProducer, WSStringMessageListener {
+public class ApexWebSocketProducer implements ApexEventProducer, WsStringMessageListener {
     // Get a reference to the logger
     private static final Logger LOGGER = LoggerFactory.getLogger(ApexWebSocketProducer.class);
 
@@ -50,7 +50,7 @@ public class ApexWebSocketProducer implements ApexEventProducer, WSStringMessage
     private WEBSOCKETCarrierTechnologyParameters webSocketProducerProperties;
 
     // The web socket messager, may be WS a server or a client
-    private WSStringMessager wsStringMessager;
+    private WsStringMessager wsStringMessager;
 
     // The name for this producer
     private String name = null;
@@ -75,10 +75,10 @@ public class ApexWebSocketProducer implements ApexEventProducer, WSStringMessage
         // Check if this is a server or a client Web Socket
         if (webSocketProducerProperties.isWsClient()) {
             // Create a WS client
-            wsStringMessager = new WSStringMessageClient(webSocketProducerProperties.getHost(),
+            wsStringMessager = new WsStringMessageClient(webSocketProducerProperties.getHost(),
                     webSocketProducerProperties.getPort());
         } else {
-            wsStringMessager = new WSStringMessageServer(webSocketProducerProperties.getPort());
+            wsStringMessager = new WsStringMessageServer(webSocketProducerProperties.getPort());
         }
 
         // Start reception of event strings on the web socket