From 0e23f7634e1e1fb31454c516974613335fcea1a4 Mon Sep 17 00:00:00 2001 From: liamfallon Date: Wed, 12 Sep 2018 23:29:25 +0100 Subject: 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 --- .../test/common/model/javascript/DefaultState_Logic.javascript | 2 +- .../test/common/model/javascript/DefaultTask_Logic.javascript | 2 +- .../test/common/model/javascript/EvalState_Logic.javascript | 2 +- .../test/common/model/javascript/EvalTask_Logic.javascript | 2 +- .../apex/test/common/model/jython/DefaultState_Logic.jython | 2 +- .../apex/test/common/model/jython/DefaultTask_Logic.jython | 2 +- .../apex/test/common/model/jython/EvalState_Logic.jython | 2 +- .../src/test/resources/logback-test.xml | 2 +- .../test/adapt/websocket/WebSocketEventProducerClient.java | 10 +++++----- .../test/adapt/websocket/WebSocketEventProducerServer.java | 10 +++++----- .../test/adapt/websocket/WebSocketEventSubscriberClient.java | 10 +++++----- .../test/adapt/websocket/WebSocketEventSubscriberServer.java | 10 +++++----- 12 files changed, 28 insertions(+), 28 deletions(-) (limited to 'testsuites') diff --git a/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/test/common/model/javascript/DefaultState_Logic.javascript b/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/test/common/model/javascript/DefaultState_Logic.javascript index c8d212111..e25cb9c6e 100644 --- a/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/test/common/model/javascript/DefaultState_Logic.javascript +++ b/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/test/common/model/javascript/DefaultState_Logic.javascript @@ -23,5 +23,5 @@ var gc = executor.getContextAlbum("GlobalContextAlbum"); executor.logger.debug(gc.name); executor.subject.defaultTaskKey.copyTo(executor.selectedTask) -var returnValue = executor.TRUE; +var returnValue = executor.isTrue; diff --git a/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/test/common/model/javascript/DefaultTask_Logic.javascript b/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/test/common/model/javascript/DefaultTask_Logic.javascript index 79ea95919..f98e16555 100644 --- a/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/test/common/model/javascript/DefaultTask_Logic.javascript +++ b/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/test/common/model/javascript/DefaultTask_Logic.javascript @@ -31,4 +31,4 @@ timeNow = new JavaDate(); executor.outFields.put("TestStateTime", timeNow.getTime()); executor.logger.debug(executor.eo); -var returnValue = executor.TRUE; +var returnValue = executor.isTrue; diff --git a/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/test/common/model/javascript/EvalState_Logic.javascript b/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/test/common/model/javascript/EvalState_Logic.javascript index 4c6e66d36..535cad595 100644 --- a/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/test/common/model/javascript/EvalState_Logic.javascript +++ b/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/test/common/model/javascript/EvalState_Logic.javascript @@ -21,5 +21,5 @@ executor.logger.debug(executor.subject.id); executor.subject.defaultTaskKey.copyTo(executor.selectedTask); -var returnValue = executor.TRUE; +var returnValue = executor.isTrue; diff --git a/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/test/common/model/javascript/EvalTask_Logic.javascript b/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/test/common/model/javascript/EvalTask_Logic.javascript index 2c9bc6d2d..b0756504c 100644 --- a/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/test/common/model/javascript/EvalTask_Logic.javascript +++ b/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/test/common/model/javascript/EvalTask_Logic.javascript @@ -26,4 +26,4 @@ timeNow = new JavaDate(); executor.outFields.put("StateTimestamp", timeNow.getTime()); executor.logger.debug(executor.outFields); -var returnValue = executor.TRUE; +var returnValue = executor.isTrue; diff --git a/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/test/common/model/jython/DefaultState_Logic.jython b/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/test/common/model/jython/DefaultState_Logic.jython index 265316e1f..9752f057d 100644 --- a/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/test/common/model/jython/DefaultState_Logic.jython +++ b/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/test/common/model/jython/DefaultState_Logic.jython @@ -24,4 +24,4 @@ executor.logger.debug('id: ' + executor.subject.id) executor.logger.debug('ctxt name: ' + executor.getContextAlbum("GlobalContextAlbum").name) executor.subject.defaultTaskKey.copyTo(executor.selectedTask) -returnValue = executor.TRUE +returnValue = executor.isTrue diff --git a/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/test/common/model/jython/DefaultTask_Logic.jython b/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/test/common/model/jython/DefaultTask_Logic.jython index 16993d0df..f57ce3f0a 100644 --- a/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/test/common/model/jython/DefaultTask_Logic.jython +++ b/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/test/common/model/jython/DefaultTask_Logic.jython @@ -32,4 +32,4 @@ executor.outFields["TestCaseSelected"] = Byte("") timeValue = Long(Date().getTime()); executor.outFields["TestStateTime"] = timeValue executor.logger.debug('outFields: ' + executor.outFields.toString()) -returnValue = executor.TRUE +returnValue = executor.isTrue diff --git a/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/test/common/model/jython/EvalState_Logic.jython b/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/test/common/model/jython/EvalState_Logic.jython index 9a0102866..94f90b258 100644 --- a/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/test/common/model/jython/EvalState_Logic.jython +++ b/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/test/common/model/jython/EvalState_Logic.jython @@ -22,4 +22,4 @@ executor.logger.debug('id: ' + executor.subject.id); executor.subject.defaultTaskKey.copyTo(executor.selectedTask); -returnValue = executor.TRUE; +returnValue = executor.isTrue; diff --git a/testsuites/integration/integration-executor-test/src/test/resources/logback-test.xml b/testsuites/integration/integration-executor-test/src/test/resources/logback-test.xml index b0fa687ce..549fb1912 100644 --- a/testsuites/integration/integration-executor-test/src/test/resources/logback-test.xml +++ b/testsuites/integration/integration-executor-test/src/test/resources/logback-test.xml @@ -72,7 +72,7 @@ - + diff --git a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/apps/uservice/test/adapt/websocket/WebSocketEventProducerClient.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/apps/uservice/test/adapt/websocket/WebSocketEventProducerClient.java index dc186a1e8..bda312c42 100644 --- a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/apps/uservice/test/adapt/websocket/WebSocketEventProducerClient.java +++ b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/apps/uservice/test/adapt/websocket/WebSocketEventProducerClient.java @@ -22,11 +22,11 @@ package org.onap.policy.apex.apps.uservice.test.adapt.websocket; import org.onap.policy.apex.apps.uservice.test.adapt.events.EventGenerator; 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.WsStringMessageClient; +import org.onap.policy.apex.core.infrastructure.messaging.stringmessaging.WsStringMessageListener; import org.onap.policy.apex.core.infrastructure.threading.ThreadUtilities; -public class WebSocketEventProducerClient implements WSStringMessageListener { +public class WebSocketEventProducerClient implements WsStringMessageListener { private final String host; private final int port; private final int eventCount; @@ -34,7 +34,7 @@ public class WebSocketEventProducerClient implements WSStringMessageListener { private final long eventInterval; private long eventsSentCount = 0; - WSStringMessageClient client; + WsStringMessageClient client; public WebSocketEventProducerClient(final String host, final int port, final int eventCount, final boolean xmlEvents, final long eventInterval) throws MessagingException { @@ -44,7 +44,7 @@ public class WebSocketEventProducerClient implements WSStringMessageListener { this.xmlEvents = xmlEvents; this.eventInterval = eventInterval; - client = new WSStringMessageClient(host, port); + client = new WsStringMessageClient(host, port); client.start(this); System.out.println(WebSocketEventProducerClient.class.getCanonicalName() + ": host " + host + ", port " + port diff --git a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/apps/uservice/test/adapt/websocket/WebSocketEventProducerServer.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/apps/uservice/test/adapt/websocket/WebSocketEventProducerServer.java index 32b463d6f..a36c4d61e 100644 --- a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/apps/uservice/test/adapt/websocket/WebSocketEventProducerServer.java +++ b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/apps/uservice/test/adapt/websocket/WebSocketEventProducerServer.java @@ -22,18 +22,18 @@ package org.onap.policy.apex.apps.uservice.test.adapt.websocket; import org.onap.policy.apex.apps.uservice.test.adapt.events.EventGenerator; import org.onap.policy.apex.core.infrastructure.messaging.MessagingException; -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.WsStringMessageListener; +import org.onap.policy.apex.core.infrastructure.messaging.stringmessaging.WsStringMessageServer; import org.onap.policy.apex.core.infrastructure.threading.ThreadUtilities; -public class WebSocketEventProducerServer implements WSStringMessageListener { +public class WebSocketEventProducerServer implements WsStringMessageListener { private final int port; private final int eventCount; private final boolean xmlEvents; private final long eventInterval; private long eventsSentCount = 0; - WSStringMessageServer server; + WsStringMessageServer server; public WebSocketEventProducerServer(final int port, final int eventCount, final boolean xmlEvents, final long eventInterval) throws MessagingException { @@ -42,7 +42,7 @@ public class WebSocketEventProducerServer implements WSStringMessageListener { this.xmlEvents = xmlEvents; this.eventInterval = eventInterval; - server = new WSStringMessageServer(port); + server = new WsStringMessageServer(port); server.start(this); System.out.println(WebSocketEventProducerServer.class.getCanonicalName() + ": port " + port + ", event count " diff --git a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/apps/uservice/test/adapt/websocket/WebSocketEventSubscriberClient.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/apps/uservice/test/adapt/websocket/WebSocketEventSubscriberClient.java index 639d7ae77..48ca9c884 100644 --- a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/apps/uservice/test/adapt/websocket/WebSocketEventSubscriberClient.java +++ b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/apps/uservice/test/adapt/websocket/WebSocketEventSubscriberClient.java @@ -21,19 +21,19 @@ package org.onap.policy.apex.apps.uservice.test.adapt.websocket; 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.WsStringMessageClient; +import org.onap.policy.apex.core.infrastructure.messaging.stringmessaging.WsStringMessageListener; -public class WebSocketEventSubscriberClient implements WSStringMessageListener { +public class WebSocketEventSubscriberClient implements WsStringMessageListener { private final int port; private long eventsReceivedCount = 0; - private final WSStringMessageClient client; + private final WsStringMessageClient client; public WebSocketEventSubscriberClient(final String host, final int port) throws MessagingException { this.port = port; - client = new WSStringMessageClient(host, port); + client = new WsStringMessageClient(host, port); client.start(this); } diff --git a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/apps/uservice/test/adapt/websocket/WebSocketEventSubscriberServer.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/apps/uservice/test/adapt/websocket/WebSocketEventSubscriberServer.java index bfa543774..83e324b9c 100644 --- a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/apps/uservice/test/adapt/websocket/WebSocketEventSubscriberServer.java +++ b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/apps/uservice/test/adapt/websocket/WebSocketEventSubscriberServer.java @@ -21,19 +21,19 @@ package org.onap.policy.apex.apps.uservice.test.adapt.websocket; import org.onap.policy.apex.core.infrastructure.messaging.MessagingException; -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.WsStringMessageListener; +import org.onap.policy.apex.core.infrastructure.messaging.stringmessaging.WsStringMessageServer; -public class WebSocketEventSubscriberServer implements WSStringMessageListener { +public class WebSocketEventSubscriberServer implements WsStringMessageListener { private final int port; private long eventsReceivedCount = 0; - private final WSStringMessageServer server; + private final WsStringMessageServer server; public WebSocketEventSubscriberServer(final int port) throws MessagingException { this.port = port; - server = new WSStringMessageServer(port); + server = new WsStringMessageServer(port); server.start(this); System.out.println( -- cgit 1.2.3-korg