diff options
4 files changed, 8 insertions, 8 deletions
diff --git a/core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/messaging/impl/ws/server/MessageServerImpl.java b/core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/messaging/impl/ws/server/MessageServerImpl.java index ee6e1a329..389d04dcc 100644 --- a/core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/messaging/impl/ws/server/MessageServerImpl.java +++ b/core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/messaging/impl/ws/server/MessageServerImpl.java @@ -91,7 +91,7 @@ public class MessageServerImpl<MESSAGE> extends InternalMessageBusServer<MESSAGE // Stop the web socket server try { // Close all connections on this web socket server - for (final WebSocket connection : connections()) { + for (final WebSocket connection : getConnections()) { connection.closeConnection(0, ""); } stop(); @@ -128,7 +128,7 @@ public class MessageServerImpl<MESSAGE> extends InternalMessageBusServer<MESSAGE @Override public void send(final MessageHolder<MESSAGE> message) { // Send the incoming message to all clients connected to this web socket - final Collection<WebSocket> connections = connections(); + final Collection<WebSocket> connections = getConnections(); for (final WebSocket webSocket : connections) { webSocket.send(MessagingUtils.serializeObject(message)); } @@ -142,7 +142,7 @@ public class MessageServerImpl<MESSAGE> extends InternalMessageBusServer<MESSAGE */ @Override public void send(final String messageString) { - final Collection<WebSocket> connections = connections(); + final Collection<WebSocket> connections = getConnections(); for (final WebSocket webSocket : connections) { webSocket.send(messageString); } diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/service/AbstractParameters.java b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/service/AbstractParameters.java index c7ec2d662..cc7c7b06f 100644 --- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/service/AbstractParameters.java +++ b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/service/AbstractParameters.java @@ -32,7 +32,7 @@ import org.onap.policy.apex.model.utilities.Assertions; */ public abstract class AbstractParameters { // The name of the parameter subclass - private String parameterClassName = this.getClass().getCanonicalName(); + private final String parameterClassName; /** * Constructor, creates a parameter class that must be a subclass of {@link AbstractParameters}. @@ -47,6 +47,8 @@ public abstract class AbstractParameters { throw new ApexRuntimeException( "class \"" + parameterClassName + "\" not found or not an instance of \"" + this.getClass().getCanonicalName() + "\"", e); } + + this.parameterClassName = parameterClassName; } /** @@ -161,8 +161,8 @@ <module>plugins</module> <module>examples</module> <module>testsuites</module> - <module>packages</module> <module>client</module> <module>tools</module> + <module>packages</module> </modules> </project> diff --git a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/main/ApexMain.java b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/main/ApexMain.java index 1b5603482..436225fc4 100644 --- a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/main/ApexMain.java +++ b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/main/ApexMain.java @@ -45,7 +45,7 @@ public class ApexMain { private ApexParameters parameters; /** - * Instantiates the Apex Apex service. + * Instantiates the Apex service. * * @param args the commaind line arguments */ @@ -138,8 +138,6 @@ public class ApexMain { /** * The Class ApexMainShutdownHookClass terminates the Apex engine for the Apex service when its * run method is called. - * - * @author Liam Fallon (liam.fallon@ericsson.com) */ private class ApexMainShutdownHookClass extends Thread { /* |