summaryrefslogtreecommitdiffstats
path: root/core/core-infrastructure
diff options
context:
space:
mode:
Diffstat (limited to 'core/core-infrastructure')
-rw-r--r--core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/java/compile/singleclass/SingleClassByteCodeFileObject.java12
-rw-r--r--core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/java/compile/singleclass/SingleClassCompilationUnit.java18
-rw-r--r--core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/java/compile/singleclass/SingleClassLoader.java6
-rw-r--r--core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/java/compile/singleclass/SingleFileManager.java13
-rw-r--r--core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/messaging/MessageHolder.java18
-rw-r--r--core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/messaging/impl/ws/client/MessagingClient.java33
-rw-r--r--core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/messaging/impl/ws/client/WebSocketClientImpl.java18
-rw-r--r--core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/messaging/impl/ws/server/InternalMessageBusServer.java6
-rw-r--r--core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/messaging/impl/ws/server/MessageServerImpl.java31
-rw-r--r--core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/messaging/impl/ws/server/WebSocketServerImpl.java20
-rw-r--r--core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/messaging/stringmessaging/WsStringMessageClient.java35
-rw-r--r--core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/messaging/stringmessaging/WsStringMessageServer.java35
-rw-r--r--core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/threading/ApplicationThreadFactory.java12
-rw-r--r--core/core-infrastructure/src/test/java/org/onap/policy/apex/core/infrastructure/messaging/DummyMessageListener.java7
-rw-r--r--core/core-infrastructure/src/test/java/org/onap/policy/apex/core/infrastructure/messaging/StringTestServer.java8
-rw-r--r--core/core-infrastructure/src/test/java/org/onap/policy/apex/core/infrastructure/threading/ThreadingTestThread.java6
16 files changed, 86 insertions, 192 deletions
diff --git a/core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/java/compile/singleclass/SingleClassByteCodeFileObject.java b/core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/java/compile/singleclass/SingleClassByteCodeFileObject.java
index 043657854..95e2fb949 100644
--- a/core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/java/compile/singleclass/SingleClassByteCodeFileObject.java
+++ b/core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/java/compile/singleclass/SingleClassByteCodeFileObject.java
@@ -53,10 +53,8 @@ public class SingleClassByteCodeFileObject extends SimpleJavaFileObject {
super(URI.create("byte:///" + className + ".class"), Kind.CLASS);
}
- /*
- * (non-Javadoc)
- *
- * @see javax.tools.SimpleJavaFileObject#openOutputStream()
+ /**
+ * {@inheritDoc}.
*/
@Override
public OutputStream openOutputStream() {
@@ -67,10 +65,8 @@ public class SingleClassByteCodeFileObject extends SimpleJavaFileObject {
return byteArrayOutputStream;
}
- /*
- * (non-Javadoc)
- *
- * @see javax.tools.SimpleJavaFileObject#openInputStream()
+ /**
+ * {@inheritDoc}.
*/
@Override
public InputStream openInputStream() {
diff --git a/core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/java/compile/singleclass/SingleClassCompilationUnit.java b/core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/java/compile/singleclass/SingleClassCompilationUnit.java
index a683cb730..63662f551 100644
--- a/core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/java/compile/singleclass/SingleClassCompilationUnit.java
+++ b/core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/java/compile/singleclass/SingleClassCompilationUnit.java
@@ -49,10 +49,8 @@ public class SingleClassCompilationUnit extends SimpleJavaFileObject {
this.source = source;
}
- /*
- * (non-Javadoc)
- *
- * @see javax.tools.SimpleJavaFileObject#getCharContent(boolean)
+ /**
+ * {@inheritDoc}.
*/
@Override
public CharSequence getCharContent(final boolean ignoreEncodingErrors) {
@@ -60,20 +58,16 @@ public class SingleClassCompilationUnit extends SimpleJavaFileObject {
return source;
}
- /*
- * (non-Javadoc)
- *
- * @see javax.tools.SimpleJavaFileObject#openOutputStream()
+ /**
+ * {@inheritDoc}.
*/
@Override
public OutputStream openOutputStream() {
throw new IllegalStateException();
}
- /*
- * (non-Javadoc)
- *
- * @see javax.tools.SimpleJavaFileObject#openInputStream()
+ /**
+ * {@inheritDoc}.
*/
@Override
public InputStream openInputStream() {
diff --git a/core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/java/compile/singleclass/SingleClassLoader.java b/core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/java/compile/singleclass/SingleClassLoader.java
index a7ad5e317..61293f5d9 100644
--- a/core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/java/compile/singleclass/SingleClassLoader.java
+++ b/core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/java/compile/singleclass/SingleClassLoader.java
@@ -38,10 +38,8 @@ public class SingleClassLoader extends ClassLoader {
this.byteCodeFileObject = byteCodeFileObject;
}
- /*
- * (non-Javadoc)
- *
- * @see java.lang.ClassLoader#findClass(java.lang.String)
+ /**
+ * {@inheritDoc}.
*/
@Override
protected Class<?> findClass(final String className) throws ClassNotFoundException {
diff --git a/core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/java/compile/singleclass/SingleFileManager.java b/core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/java/compile/singleclass/SingleFileManager.java
index 066765504..6bd7e3a55 100644
--- a/core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/java/compile/singleclass/SingleFileManager.java
+++ b/core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/java/compile/singleclass/SingleFileManager.java
@@ -54,11 +54,8 @@ public class SingleFileManager extends ForwardingJavaFileManager<StandardJavaFil
singleClassLoader = new SingleClassLoader(byteCodeFileObject);
}
- /*
- * (non-Javadoc)
- *
- * @see javax.tools.ForwardingJavaFileManager#getJavaFileForOutput(javax.tools.JavaFileManager.Location,
- * java.lang.String, javax.tools.JavaFileObject.Kind, javax.tools.FileObject)
+ /**
+ * {@inheritDoc}.
*/
@Override
public JavaFileObject getJavaFileForOutput(final Location notUsed, final String className,
@@ -67,10 +64,8 @@ public class SingleFileManager extends ForwardingJavaFileManager<StandardJavaFil
return singleClassLoader.getFileObject();
}
- /*
- * (non-Javadoc)
- *
- * @see javax.tools.ForwardingJavaFileManager#getClassLoader(javax.tools.JavaFileManager.Location)
+ /**
+ * {@inheritDoc}.
*/
@Override
public SingleClassLoader getClassLoader(final Location location) {
diff --git a/core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/messaging/MessageHolder.java b/core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/messaging/MessageHolder.java
index 243e057be..cd353b95d 100644
--- a/core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/messaging/MessageHolder.java
+++ b/core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/messaging/MessageHolder.java
@@ -104,20 +104,16 @@ public class MessageHolder<M> implements Serializable {
return senderHostAddress;
}
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#toString()
+ /**
+ * {@inheritDoc}.
*/
@Override
public String toString() {
return "ApexCommandProtocol [creationTime=" + creationTime + ", senderHostAddress=" + senderHostAddress + "]";
}
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#hashCode()
+ /**
+ * {@inheritDoc}.
*/
@Override
public int hashCode() {
@@ -129,10 +125,8 @@ public class MessageHolder<M> implements Serializable {
return result;
}
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#equals(java.lang.Object)
+ /**
+ * {@inheritDoc}.
*/
@Override
public boolean equals(final Object obj) {
diff --git a/core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/messaging/impl/ws/client/MessagingClient.java b/core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/messaging/impl/ws/client/MessagingClient.java
index dd9aac122..003a8ef26 100644
--- a/core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/messaging/impl/ws/client/MessagingClient.java
+++ b/core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/messaging/impl/ws/client/MessagingClient.java
@@ -54,10 +54,8 @@ public class MessagingClient<M> extends InternalMessageBusClient<M> implements M
super(serverUri);
}
- /*
- * (non-Javadoc)
- *
- * @see org.onap.policy.apex.core.infrastructure.messaging.MessagingService#stopConnection()
+ /**
+ * {@inheritDoc}.
*/
@Override
public void stopConnection() {
@@ -72,10 +70,8 @@ public class MessagingClient<M> extends InternalMessageBusClient<M> implements M
this.close();
}
- /*
- * (non-Javadoc)
- *
- * @see org.onap.policy.apex.core.infrastructure.messaging.MessagingService#startConnection()
+ /**
+ * {@inheritDoc}.
*/
@Override
public void startConnection() {
@@ -131,12 +127,8 @@ public class MessagingClient<M> extends InternalMessageBusClient<M> implements M
return false;
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.onap.policy.apex.core.infrastructure.messaging.MessagingService#send(org.onap.policy.apex
- * .core. infrastructure. messaging.MessageHolder)
+ /**
+ * {@inheritDoc}.
*/
@Override
public void send(final MessageHolder<M> commands) {
@@ -145,11 +137,8 @@ public class MessagingClient<M> extends InternalMessageBusClient<M> implements M
connection.send(MessagingUtils.serializeObject(commands));
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.onap.policy.apex.core.infrastructure.messaging.MessagingService#send(java.lang.String)
+ /**
+ * {@inheritDoc}.
*/
@Override
public void send(final String messageString) {
@@ -157,10 +146,8 @@ public class MessagingClient<M> extends InternalMessageBusClient<M> implements M
connection.send(messageString);
}
- /*
- * (non-Javadoc)
- *
- * @see org.onap.policy.apex.core.infrastructure.messaging.MessagingService#isStarted()
+ /**
+ * {@inheritDoc}.
*/
@Override
public boolean isStarted() {
diff --git a/core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/messaging/impl/ws/client/WebSocketClientImpl.java b/core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/messaging/impl/ws/client/WebSocketClientImpl.java
index b2e0953c7..daa22d7ff 100644
--- a/core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/messaging/impl/ws/client/WebSocketClientImpl.java
+++ b/core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/messaging/impl/ws/client/WebSocketClientImpl.java
@@ -46,10 +46,8 @@ abstract class WebSocketClientImpl extends WebSocketClient {
super(serverUri);
}
- /*
- * (non-Javadoc)
- *
- * @see org.java_websocket.client.WebSocketClient#onOpen(org.java_websocket.handshake.ServerHandshake)
+ /**
+ * {@inheritDoc}.
*/
@Override
public void onOpen(final ServerHandshake handshakedata) {
@@ -58,10 +56,8 @@ abstract class WebSocketClientImpl extends WebSocketClient {
}
}
- /*
- * (non-Javadoc)
- *
- * @see org.java_websocket.client.WebSocketClient#onClose(int, java.lang.String, boolean)
+ /**
+ * {@inheritDoc}.
*/
@Override
public void onClose(final int code, final String reason, final boolean remote) {
@@ -70,10 +66,8 @@ abstract class WebSocketClientImpl extends WebSocketClient {
}
}
- /*
- * (non-Javadoc)
- *
- * @see org.java_websocket.client.WebSocketClient#onError(java.lang.Exception)
+ /**
+ * {@inheritDoc}.
*/
@Override
public void onError(final Exception ex) {
diff --git a/core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/messaging/impl/ws/server/InternalMessageBusServer.java b/core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/messaging/impl/ws/server/InternalMessageBusServer.java
index a436bd7e3..1fbd65115 100644
--- a/core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/messaging/impl/ws/server/InternalMessageBusServer.java
+++ b/core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/messaging/impl/ws/server/InternalMessageBusServer.java
@@ -95,10 +95,8 @@ abstract class InternalMessageBusServer<M> extends WebSocketServerImpl implement
messageBlockHandler.post(new RawMessageBlock(rawMessage, webSocket));
}
- /*
- * (non-Javadoc)
- *
- * @see org.java_websocket.server.WebSocketServer#onMessage(org.java_websocket.WebSocket, java.lang.String)
+ /**
+ * {@inheritDoc}.
*/
@Override
public void onMessage(final WebSocket webSocket, final String stringMessage) {
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 d5ef40b5b..3844b9254 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
@@ -66,10 +66,8 @@ public class MessageServerImpl<M> extends InternalMessageBusServer<M> {
LOGGER.exit();
}
- /*
- * (non-Javadoc)
- *
- * @see org.java_websocket.server.WebSocketServer#start()
+ /**
+ * {@inheritDoc}.
*/
@Override
public void startConnection() {
@@ -78,10 +76,8 @@ public class MessageServerImpl<M> extends InternalMessageBusServer<M> {
isStarted = true;
}
- /*
- * (non-Javadoc)
- *
- * @see org.java_websocket.server.WebSocketServer#stop()
+ /**
+ * {@inheritDoc}.
*/
@Override
public void stopConnection() {
@@ -117,11 +113,8 @@ public class MessageServerImpl<M> extends InternalMessageBusServer<M> {
return connectionUri;
}
- /*
- * (non-Javadoc)
- *
- * @see org.onap.policy.apex.core.infrastructure.messaging.MessagingService#send(org.onap.policy.apex .core.
- * infrastructure. messaging.MessageHolder)
+ /**
+ * {@inheritDoc}.
*/
@Override
public void send(final MessageHolder<M> message) {
@@ -132,10 +125,8 @@ public class MessageServerImpl<M> extends InternalMessageBusServer<M> {
}
}
- /*
- * (non-Javadoc)
- *
- * @see org.onap.policy.apex.core.infrastructure.messaging.MessagingService#send(java.lang.String)
+ /**
+ * {@inheritDoc}.
*/
@Override
public void send(final String messageString) {
@@ -145,10 +136,8 @@ public class MessageServerImpl<M> extends InternalMessageBusServer<M> {
}
}
- /*
- * (non-Javadoc)
- *
- * @see org.onap.policy.apex.core.infrastructure.messaging.MessagingService#isStarted()
+ /**
+ * {@inheritDoc}.
*/
@Override
public boolean isStarted() {
diff --git a/core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/messaging/impl/ws/server/WebSocketServerImpl.java b/core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/messaging/impl/ws/server/WebSocketServerImpl.java
index 26acfe70c..122ab067a 100644
--- a/core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/messaging/impl/ws/server/WebSocketServerImpl.java
+++ b/core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/messaging/impl/ws/server/WebSocketServerImpl.java
@@ -48,11 +48,8 @@ abstract class WebSocketServerImpl extends WebSocketServer {
LOGGER.exit();
}
- /*
- * (non-Javadoc)
- *
- * @see org.java_websocket.server.WebSocketServer#onOpen(org.java_websocket.WebSocket ,
- * org.java_websocket.handshake.ClientHandshake)
+ /**
+ * {@inheritDoc}.
*/
@Override
public void onOpen(final WebSocket conn, final ClientHandshake handshake) {
@@ -62,11 +59,8 @@ abstract class WebSocketServerImpl extends WebSocketServer {
LOGGER.exit();
}
- /*
- * (non-Javadoc)
- *
- * @see org.java_websocket.server.WebSocketServer#onClose(org.java_websocket. WebSocket, int, java.lang.String,
- * boolean)
+ /**
+ * {@inheritDoc}.
*/
@Override
public void onClose(final WebSocket conn, final int code, final String reason, final boolean remote) {
@@ -76,10 +70,8 @@ abstract class WebSocketServerImpl extends WebSocketServer {
LOGGER.exit();
}
- /*
- * (non-Javadoc)
- *
- * @see org.java_websocket.server.WebSocketServer#onError(org.java_websocket.WebSocket, java.lang.Exception)
+ /**
+ * {@inheritDoc}.
*/
@Override
public void onError(final WebSocket conn, final Exception ex) {
diff --git a/core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/messaging/stringmessaging/WsStringMessageClient.java b/core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/messaging/stringmessaging/WsStringMessageClient.java
index 28afde03b..98bffdbc6 100644
--- a/core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/messaging/stringmessaging/WsStringMessageClient.java
+++ b/core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/messaging/stringmessaging/WsStringMessageClient.java
@@ -66,12 +66,8 @@ public class WsStringMessageClient implements WsStringMessager {
this.port = port;
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.onap.policy.apex.core.infrastructure.messaging.stringmessaging.WSStringMessageSender#start(org.onap.policy.
- * apex. core.infrastructure.messaging. stringmessaging.WSStringMessageListener)
+ /**
+ * {@inheritDoc}.
*/
@Override
public void start(final WsStringMessageListener newWsStringMessageListener) throws MessagingException {
@@ -94,10 +90,8 @@ public class WsStringMessageClient implements WsStringMessager {
LOGGER.exit(messagePreamble + "started");
}
- /*
- * (non-Javadoc)
- *
- * @see org.onap.policy.apex.core.infrastructure.messaging.stringmessaging.WSStringMessageSender#stop()
+ /**
+ * {@inheritDoc}.
*/
@Override
public void stop() {
@@ -106,12 +100,8 @@ public class WsStringMessageClient implements WsStringMessager {
LOGGER.exit(MESSAGE_PREAMBLE + uriString + "\" stopped");
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.onap.policy.apex.core.infrastructure.messaging.stringmessaging.WSStringMessageSender#sendString(java.lang.
- * String)
+ /**
+ * {@inheritDoc}.
*/
@Override
public void sendString(final String stringMessage) {
@@ -127,11 +117,8 @@ public class WsStringMessageClient implements WsStringMessager {
* The Class WSStringMessageClientListener.
*/
private class WsStringMessageClientListener implements MessageListener<String> {
- /*
- * (non-Javadoc)
- *
- * @see org.onap.policy.apex.core.infrastructure.messaging.MessageListener#onMessage(org.onap.policy.apex.core.
- * infrastructure.messaging.impl.ws.messageblock. MessageBlock)
+ /**
+ * {@inheritDoc}.
*/
@Subscribe
@Override
@@ -139,10 +126,8 @@ public class WsStringMessageClient implements WsStringMessager {
throw new UnsupportedOperationException("raw messages are not supported on string message clients");
}
- /*
- * (non-Javadoc)
- *
- * @see org.onap.policy.apex.core.infrastructure.messaging.MessageListener#onMessage(java.lang.String)
+ /**
+ * {@inheritDoc}.
*/
@Subscribe
@Override
diff --git a/core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/messaging/stringmessaging/WsStringMessageServer.java b/core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/messaging/stringmessaging/WsStringMessageServer.java
index 3e8db268c..b244feab0 100644
--- a/core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/messaging/stringmessaging/WsStringMessageServer.java
+++ b/core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/messaging/stringmessaging/WsStringMessageServer.java
@@ -61,12 +61,8 @@ public class WsStringMessageServer implements WsStringMessager {
this.port = port;
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.onap.policy.apex.core.infrastructure.messaging.stringmessaging.WSStringMessageSender#start(org.onap.policy.
- * apex. core.infrastructure.messaging. stringmessaging.WSStringMessageListener)
+ /**
+ * {@inheritDoc}.
*/
@Override
public void start(final WsStringMessageListener newWsStringMessageListener) throws MessagingException {
@@ -92,10 +88,8 @@ public class WsStringMessageServer implements WsStringMessager {
LOGGER.exit("web socket string message server started");
}
- /*
- * (non-Javadoc)
- *
- * @see org.onap.policy.apex.core.infrastructure.messaging.stringmessaging.WSStringMessageSender#stop()
+ /**
+ * {@inheritDoc}.
*/
@Override
public void stop() {
@@ -104,12 +98,8 @@ public class WsStringMessageServer implements WsStringMessager {
LOGGER.exit("web socket string message server stopped");
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.onap.policy.apex.core.infrastructure.messaging.stringmessaging.WSStringMessageSender#sendString(java.lang.
- * String)
+ /**
+ * {@inheritDoc}.
*/
@Override
public void sendString(final String stringMessage) {
@@ -124,11 +114,8 @@ public class WsStringMessageServer implements WsStringMessager {
*/
private class WsStringMessageServerListener implements MessageListener<String> {
- /*
- * (non-Javadoc)
- *
- * @see org.onap.policy.apex.core.infrastructure.messaging.MessageListener#onMessage(org.onap.policy.apex.core.
- * infrastructure.messaging.impl.ws.messageblock. MessageBlock)
+ /**
+ * {@inheritDoc}.
*/
@Subscribe
@Override
@@ -136,10 +123,8 @@ public class WsStringMessageServer implements WsStringMessager {
throw new UnsupportedOperationException("raw messages are not supported on string message clients");
}
- /*
- * (non-Javadoc)
- *
- * @see org.onap.policy.apex.core.infrastructure.messaging.MessageListener#onMessage(java.lang.String)
+ /**
+ * {@inheritDoc}.
*/
@Subscribe
@Override
diff --git a/core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/threading/ApplicationThreadFactory.java b/core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/threading/ApplicationThreadFactory.java
index 0d5f30737..dc9c13d7b 100644
--- a/core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/threading/ApplicationThreadFactory.java
+++ b/core/core-infrastructure/src/main/java/org/onap/policy/apex/core/infrastructure/threading/ApplicationThreadFactory.java
@@ -72,10 +72,8 @@ public class ApplicationThreadFactory implements ThreadFactory {
this.threadPriority = threadPriority;
}
- /*
- * (non-Javadoc)
- *
- * @see java.util.concurrent.ThreadFactory#newThread(java.lang.Runnable)
+ /**
+ * {@inheritDoc}.
*/
@Override
public Thread newThread(final Runnable runnable) {
@@ -129,10 +127,8 @@ public class ApplicationThreadFactory implements ThreadFactory {
return threadPriority;
}
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#toString()
+ /**
+ * {@inheritDoc}.
*/
@Override
public String toString() {
diff --git a/core/core-infrastructure/src/test/java/org/onap/policy/apex/core/infrastructure/messaging/DummyMessageListener.java b/core/core-infrastructure/src/test/java/org/onap/policy/apex/core/infrastructure/messaging/DummyMessageListener.java
index 4d5aedb3d..f85301710 100644
--- a/core/core-infrastructure/src/test/java/org/onap/policy/apex/core/infrastructure/messaging/DummyMessageListener.java
+++ b/core/core-infrastructure/src/test/java/org/onap/policy/apex/core/infrastructure/messaging/DummyMessageListener.java
@@ -45,11 +45,8 @@ public abstract class DummyMessageListener implements MessageListener<String> {
*/
public abstract void onCommand(MessageBlock<String> data);
- /*
- * (non-Javadoc)
- *
- * @see org.onap.policy.apex.core.infrastructure.messaging.MessageListener#onMessage(org.onap.policy.apex.core.
- * infrastructure. messaging.impl.ws.data.Data)
+ /**
+ * {@inheritDoc}.
*/
@Subscribe
@Override
diff --git a/core/core-infrastructure/src/test/java/org/onap/policy/apex/core/infrastructure/messaging/StringTestServer.java b/core/core-infrastructure/src/test/java/org/onap/policy/apex/core/infrastructure/messaging/StringTestServer.java
index c0d66b2d8..1471bf331 100644
--- a/core/core-infrastructure/src/test/java/org/onap/policy/apex/core/infrastructure/messaging/StringTestServer.java
+++ b/core/core-infrastructure/src/test/java/org/onap/policy/apex/core/infrastructure/messaging/StringTestServer.java
@@ -65,12 +65,8 @@ public class StringTestServer {
*/
private class WsStringServerMessageListener implements WsStringMessageListener {
- /*
- * (non-Javadoc)
- *
- * @see
- * org.onap.policy.apex.core.infrastructure.messaging.stringmessaging.WsStringMessageListener#receiveString(java
- * .lang.String)
+ /**
+ * {@inheritDoc}.
*/
@Override
public void receiveString(final String stringMessage) {
diff --git a/core/core-infrastructure/src/test/java/org/onap/policy/apex/core/infrastructure/threading/ThreadingTestThread.java b/core/core-infrastructure/src/test/java/org/onap/policy/apex/core/infrastructure/threading/ThreadingTestThread.java
index 765d12f6a..b504780b7 100644
--- a/core/core-infrastructure/src/test/java/org/onap/policy/apex/core/infrastructure/threading/ThreadingTestThread.java
+++ b/core/core-infrastructure/src/test/java/org/onap/policy/apex/core/infrastructure/threading/ThreadingTestThread.java
@@ -39,10 +39,8 @@ public class ThreadingTestThread implements Runnable {
private String threadName;
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Runnable#run()
+ /**
+ * {@inheritDoc}.
*/
@Override
public void run() {