From 423e98641ca7fe79a1b1bb897aa8a4b17ba5ee4d Mon Sep 17 00:00:00 2001 From: liamfallon Date: Fri, 28 Jun 2019 10:42:34 +0000 Subject: Replace non-Javadoc comments with inheritDocs Copyright headers not changed as this review only amends comments. Issue-ID: POLICY-1791 Change-Id: Icbeb2c6e591b3b160ae102bb67aef2d407924a4d Signed-off-by: liamfallon --- .../apex/core/deployment/DeploymentClient.java | 19 +-- .../core/engine/context/ApexInternalContext.java | 38 ++---- .../core/engine/engine/impl/ApexEngineImpl.java | 77 ++++-------- .../policy/apex/core/engine/event/EnEvent.java | 56 +++------ .../policy/apex/core/engine/event/EnField.java | 6 +- .../engine/executor/impl/ExecutorFactoryImpl.java | 24 +--- .../engine/engine/impl/DummyEnEventListener.java | 7 +- .../core/engine/engine/impl/DummyListener.java | 7 +- .../engine/impl/DummySlowEnEventListener.java | 7 +- .../policy/apex/core/engine/event/DummyAxKey.java | 79 ++++-------- .../engine/executor/context/DummyContextAlbum.java | 140 +++++++-------------- .../singleclass/SingleClassByteCodeFileObject.java | 12 +- .../singleclass/SingleClassCompilationUnit.java | 18 +-- .../compile/singleclass/SingleClassLoader.java | 6 +- .../compile/singleclass/SingleFileManager.java | 13 +- .../infrastructure/messaging/MessageHolder.java | 18 +-- .../messaging/impl/ws/client/MessagingClient.java | 33 ++--- .../impl/ws/client/WebSocketClientImpl.java | 18 +-- .../impl/ws/server/InternalMessageBusServer.java | 6 +- .../impl/ws/server/MessageServerImpl.java | 31 ++--- .../impl/ws/server/WebSocketServerImpl.java | 20 +-- .../stringmessaging/WsStringMessageClient.java | 35 ++---- .../stringmessaging/WsStringMessageServer.java | 35 ++---- .../threading/ApplicationThreadFactory.java | 12 +- .../messaging/DummyMessageListener.java | 7 +- .../infrastructure/messaging/StringTestServer.java | 8 +- .../threading/ThreadingTestThread.java | 6 +- .../onap/policy/apex/core/protocols/Message.java | 18 +-- .../engdep/messages/EngineServiceInfoResponse.java | 8 +- .../protocols/engdep/messages/GetEngineInfo.java | 6 +- .../engdep/messages/GetEngineServiceInfo.java | 6 +- .../protocols/engdep/messages/GetEngineStatus.java | 6 +- .../core/protocols/engdep/messages/Response.java | 14 +-- .../protocols/engdep/messages/StartEngine.java | 6 +- .../engdep/messages/StartPeriodicEvents.java | 6 +- .../core/protocols/engdep/messages/StopEngine.java | 6 +- .../engdep/messages/StopPeriodicEvents.java | 6 +- .../protocols/engdep/messages/UpdateModel.java | 14 +-- .../policy/apex/core/protocols/DummyAction.java | 4 +- 39 files changed, 270 insertions(+), 568 deletions(-) (limited to 'core') diff --git a/core/core-deployment/src/main/java/org/onap/policy/apex/core/deployment/DeploymentClient.java b/core/core-deployment/src/main/java/org/onap/policy/apex/core/deployment/DeploymentClient.java index c46d6a1ba..eb51271d5 100644 --- a/core/core-deployment/src/main/java/org/onap/policy/apex/core/deployment/DeploymentClient.java +++ b/core/core-deployment/src/main/java/org/onap/policy/apex/core/deployment/DeploymentClient.java @@ -82,10 +82,8 @@ public class DeploymentClient implements Runnable { this.port = port; } - /* - * (non-Javadoc) - * - * @see java.lang.Runnable#run() + /** + * {@inheritDoc}. */ @Override public void run() { @@ -232,11 +230,8 @@ public class DeploymentClient implements Runnable { * @see DeploymentClientEvent */ private class DeploymentClientListener implements MessageListener { - /* - * (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 @@ -245,10 +240,8 @@ public class DeploymentClient implements Runnable { receiveQueue.addAll(messageData.getMessages()); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.infrastructure.messaging.MessageListener#onMessage(java.lang. String) + /** + * {@inheritDoc}. */ @Override public void onMessage(final String messageString) { diff --git a/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/context/ApexInternalContext.java b/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/context/ApexInternalContext.java index 8eb92a0f8..3d6a72451 100644 --- a/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/context/ApexInternalContext.java +++ b/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/context/ApexInternalContext.java @@ -173,10 +173,8 @@ public class ApexInternalContext implements AxConceptGetter { contextDistributor.clear(); } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { @@ -184,52 +182,40 @@ public class ApexInternalContext implements AxConceptGetter { + ", currentPolicyKey=" + currentPolicyKey + "]"; } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.core.basicmodel.concepts.AxConceptGetter#get(org.onap.policy.apex.core.basicmodel.concepts. - * AxArtifactKey) + /** + * {@inheritDoc}. */ @Override public ContextAlbum get(final AxArtifactKey conceptKey) { return new AxConceptGetterImpl<>(contextAlbums).get(conceptKey); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.basicmodel.concepts.AxConceptGetter#get(java.lang.String) + /** + * {@inheritDoc}. */ @Override public ContextAlbum get(final String conceptKeyName) { return new AxConceptGetterImpl<>(contextAlbums).get(conceptKeyName); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.basicmodel.concepts.AxConceptGetter#get(java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ContextAlbum get(final String conceptKeyName, final String conceptKeyVersion) { return new AxConceptGetterImpl<>(contextAlbums).get(conceptKeyName, conceptKeyVersion); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.basicmodel.concepts.AxConceptGetter#getAll(java.lang.String) + /** + * {@inheritDoc}. */ @Override public Set getAll(final String conceptKeyName) { return new AxConceptGetterImpl<>(contextAlbums).getAll(conceptKeyName); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.basicmodel.concepts.AxConceptGetter#getAll(java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public Set getAll(final String conceptKeyName, final String conceptKeyVersion) { diff --git a/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/engine/impl/ApexEngineImpl.java b/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/engine/impl/ApexEngineImpl.java index bf4219390..87ce1230e 100644 --- a/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/engine/impl/ApexEngineImpl.java +++ b/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/engine/impl/ApexEngineImpl.java @@ -101,12 +101,8 @@ public class ApexEngineImpl implements ApexEngine { LOGGER.exit("ApexEngine()<-" + key.getId() + "," + state); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.core.engine.engine.ApexEngine#updateModel(org.onap.policy.apex.model.policymodel.concepts. - * AxPolicyModel) + /** + * {@inheritDoc}. */ @Override public void updateModel(final AxPolicyModel apexModel) throws ApexException { @@ -154,10 +150,8 @@ public class ApexEngineImpl implements ApexEngine { LOGGER.exit(UPDATE_MODEL + key.getId()); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.engine.engine.ApexEngine#start() + /** + * {@inheritDoc}. */ @Override public void start() throws ApexException { @@ -195,10 +189,8 @@ public class ApexEngineImpl implements ApexEngine { LOGGER.exit("start()" + key); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.engine.engine.ApexEngine#stop() + /** + * {@inheritDoc}. */ @Override public void stop() throws ApexException { @@ -250,10 +242,8 @@ public class ApexEngineImpl implements ApexEngine { throw new ApexException(STOP + key.getId() + "," + state + ", error stopping engine, engine stop timed out"); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.engine.engine.ApexEngine#clear() + /** + * {@inheritDoc}. */ @Override public void clear() throws ApexException { @@ -273,11 +263,8 @@ public class ApexEngineImpl implements ApexEngine { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.engine.engine.ApexEngine#createEvent(org.onap.policy.apex.core.model.concepts. - * AxArtifactKey) + /** + * {@inheritDoc}. */ @Override public EnEvent createEvent(final AxArtifactKey eventKey) { @@ -295,11 +282,8 @@ public class ApexEngineImpl implements ApexEngine { } } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.core.engine.engine.ApexEngine#handleEvent(org.onap.policy.apex.core.engine.event.EnEvent) + /** + * {@inheritDoc}. */ @Override public boolean handleEvent(final EnEvent incomingEvent) { @@ -361,11 +345,8 @@ public class ApexEngineImpl implements ApexEngine { return ret; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.engine.engine.ApexEngine#addEventListener(java.lang.String, - * org.onap.policy.apex.core.engine.engine.EnEventListener) + /** + * {@inheritDoc}. */ @Override public void addEventListener(final String listenerName, final EnEventListener listener) { @@ -384,10 +365,8 @@ public class ApexEngineImpl implements ApexEngine { eventListeners.put(listenerName, listener); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.engine.engine.ApexEngine#removeEventListener(java.lang.String) + /** + * {@inheritDoc}. */ @Override public void removeEventListener(final String listenerName) { @@ -400,30 +379,24 @@ public class ApexEngineImpl implements ApexEngine { eventListeners.remove(listenerName); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.engine.engine.ApexEngine#getKey() + /** + * {@inheritDoc}. */ @Override public AxArtifactKey getKey() { return key; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.engine.engine.ApexEngine#getState() + /** + * {@inheritDoc}. */ @Override public final AxEngineState getState() { return state; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.engine.engine.ApexEngine#getEngineStatus() + /** + * {@inheritDoc}. */ @Override public AxEngineModel getEngineStatus() { @@ -434,10 +407,8 @@ public class ApexEngineImpl implements ApexEngine { return engineModel; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.engine.engine.ApexEngine#getEngineRuntime() + /** + * {@inheritDoc}. */ @Override public Map> getEngineContext() { diff --git a/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/event/EnEvent.java b/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/event/EnEvent.java index b7afedfea..d53fdf8ff 100644 --- a/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/event/EnEvent.java +++ b/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/event/EnEvent.java @@ -217,10 +217,8 @@ public class EnEvent extends HashMap { userArtifactStack = usedArtifactStackArray; } - /* - * (non-Javadoc) - * - * @see java.util.Map#get(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public Object get(final Object key) { @@ -245,10 +243,8 @@ public class EnEvent extends HashMap { return item; } - /* - * (non-Javadoc) - * - * @see java.util.Map#values() + /** + * {@inheritDoc}. */ @Override public Collection values() { @@ -263,10 +259,8 @@ public class EnEvent extends HashMap { return valueList; } - /* - * (non-Javadoc) - * - * @see java.util.Map#entrySet() + /** + * {@inheritDoc}. */ @Override public Set> entrySet() { @@ -281,10 +275,8 @@ public class EnEvent extends HashMap { return entrySet; } - /* - * (non-Javadoc) - * - * @see java.util.Map#put(java.lang.Object, java.lang.Object) + /** + * {@inheritDoc}. */ @Override public Object put(final String key, final Object incomingValue) { @@ -316,10 +308,8 @@ public class EnEvent extends HashMap { return super.put(key, valueToAssign); } - /* - * (non-Javadoc) - * - * @see java.util.Map#putAll(java.util.Map) + /** + * {@inheritDoc}. */ @Override public void putAll(final Map incomingMap) { @@ -329,10 +319,8 @@ public class EnEvent extends HashMap { } } - /* - * (non-Javadoc) - * - * @see java.util.Map#remove(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public Object remove(final Object key) { @@ -354,10 +342,8 @@ public class EnEvent extends HashMap { return removedValue; } - /* - * (non-Javadoc) - * - * @see java.util.Map#clear() + /** + * {@inheritDoc}. */ @Override public void clear() { @@ -370,10 +356,8 @@ public class EnEvent extends HashMap { } } - /* - * (non-Javadoc) - * - * @see java.util.AbstractMap#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { @@ -381,8 +365,8 @@ public class EnEvent extends HashMap { + super.toString() + "]"; } - /* (non-Javadoc) - * @see java.lang.Object#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -392,8 +376,8 @@ public class EnEvent extends HashMap { return result; } - /* (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(Object obj) { diff --git a/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/event/EnField.java b/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/event/EnField.java index a4b221897..e7d4643fd 100644 --- a/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/event/EnField.java +++ b/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/event/EnField.java @@ -117,10 +117,8 @@ public class EnField implements Serializable { return value; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { diff --git a/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/executor/impl/ExecutorFactoryImpl.java b/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/executor/impl/ExecutorFactoryImpl.java index 7bc437907..6565060c1 100644 --- a/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/executor/impl/ExecutorFactoryImpl.java +++ b/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/executor/impl/ExecutorFactoryImpl.java @@ -89,12 +89,8 @@ public class ExecutorFactoryImpl implements ExecutorFactory { } } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.core.engine.executor.ExecutorFactory#getTaskSelectionExecutor(org.onap.policy.apex.core. - * model. concepts.AxState, org.onap.policy.apex.core.engine.context.Context) + /** + * {@inheritDoc}. */ @Override public TaskSelectExecutor getTaskSelectionExecutor(final Executor parentExecutor, final AxState state, @@ -114,11 +110,8 @@ public class ExecutorFactoryImpl implements ExecutorFactory { return tsExecutor; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.engine.executor.ExecutorFactory#getTaskExecutor(org.onap.policy.apex.core.model. - * concepts. AxTask, org.onap.policy.apex.core.engine.context.Context) + /** + * {@inheritDoc}. */ @Override public TaskExecutor getTaskExecutor(final Executor parentExecutor, final AxTask task, @@ -132,13 +125,8 @@ public class ExecutorFactoryImpl implements ExecutorFactory { return taskExecutor; } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.core.engine.executor.ExecutorFactory#getStateFinalizerExecutor(org.onap.policy.apex.core. - * engine. executor.Executor, org.onap.policy.apex.core.policymodel.concepts.AxStateFinalizerLogic, - * org.onap.policy.apex.core.engine.context.ApexInternalContext) + /** + * {@inheritDoc}. */ @Override public StateFinalizerExecutor getStateFinalizerExecutor(final Executor parentExecutor, diff --git a/core/core-engine/src/test/java/org/onap/policy/apex/core/engine/engine/impl/DummyEnEventListener.java b/core/core-engine/src/test/java/org/onap/policy/apex/core/engine/engine/impl/DummyEnEventListener.java index e67d256fe..b429295ad 100644 --- a/core/core-engine/src/test/java/org/onap/policy/apex/core/engine/engine/impl/DummyEnEventListener.java +++ b/core/core-engine/src/test/java/org/onap/policy/apex/core/engine/engine/impl/DummyEnEventListener.java @@ -30,11 +30,8 @@ import org.onap.policy.apex.model.basicmodel.concepts.ApexException; */ public class DummyEnEventListener implements EnEventListener { - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.core.engine.engine.EnEventListener#onEnEvent(org.onap.policy.apex.core.engine.event.EnEvent) + /** + * {@inheritDoc}. */ @Override public void onEnEvent(EnEvent enEvent) throws ApexException { diff --git a/core/core-engine/src/test/java/org/onap/policy/apex/core/engine/engine/impl/DummyListener.java b/core/core-engine/src/test/java/org/onap/policy/apex/core/engine/engine/impl/DummyListener.java index 33b434af1..6256ff498 100644 --- a/core/core-engine/src/test/java/org/onap/policy/apex/core/engine/engine/impl/DummyListener.java +++ b/core/core-engine/src/test/java/org/onap/policy/apex/core/engine/engine/impl/DummyListener.java @@ -30,11 +30,8 @@ import org.onap.policy.apex.model.basicmodel.concepts.ApexException; */ public class DummyListener implements EnEventListener { - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.core.engine.engine.EnEventListener#onEnEvent(org.onap.policy.apex.core.engine.event.EnEvent) + /** + * {@inheritDoc}. */ @Override public void onEnEvent(EnEvent enEvent) throws ApexException { diff --git a/core/core-engine/src/test/java/org/onap/policy/apex/core/engine/engine/impl/DummySlowEnEventListener.java b/core/core-engine/src/test/java/org/onap/policy/apex/core/engine/engine/impl/DummySlowEnEventListener.java index fbb38c99e..9b6fc398c 100644 --- a/core/core-engine/src/test/java/org/onap/policy/apex/core/engine/engine/impl/DummySlowEnEventListener.java +++ b/core/core-engine/src/test/java/org/onap/policy/apex/core/engine/engine/impl/DummySlowEnEventListener.java @@ -32,11 +32,8 @@ public class DummySlowEnEventListener implements EnEventListener { private long waitTime; - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.core.engine.engine.EnEventListener#onEnEvent(org.onap.policy.apex.core.engine.event.EnEvent) + /** + * {@inheritDoc}. */ @Override public void onEnEvent(EnEvent enEvent) throws ApexException { diff --git a/core/core-engine/src/test/java/org/onap/policy/apex/core/engine/event/DummyAxKey.java b/core/core-engine/src/test/java/org/onap/policy/apex/core/engine/event/DummyAxKey.java index 0a86c070a..cef1c7bc5 100644 --- a/core/core-engine/src/test/java/org/onap/policy/apex/core/engine/event/DummyAxKey.java +++ b/core/core-engine/src/test/java/org/onap/policy/apex/core/engine/event/DummyAxKey.java @@ -33,85 +33,64 @@ import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult; public class DummyAxKey extends AxKey { private static final long serialVersionUID = 964899169013353800L; - /* - * (non-Javadoc) - * - * @see java.lang.Comparable#compareTo(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public int compareTo(AxConcept concept) { throw new NotImplementedException("Not implemented on dummy class"); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxKey#getId() + /** + * {@inheritDoc}. */ @Override public String getId() { throw new NotImplementedException("Not implemented on dummy class"); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxKey#getCompatibility(org.onap.policy.apex.model.basicmodel. - * concepts.AxKey) + /** + * {@inheritDoc}. */ @Override public Compatibility getCompatibility(AxKey otherKey) { throw new NotImplementedException("Not implemented on dummy class"); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.model.basicmodel.concepts.AxKey#isCompatible(org.onap.policy.apex.model.basicmodel.concepts. - * AxKey) + /** + * {@inheritDoc}. */ @Override public boolean isCompatible(AxKey otherKey) { throw new NotImplementedException("Not implemented on dummy class"); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKey() + /** + * {@inheritDoc}. */ @Override public AxKey getKey() { throw new NotImplementedException("Not implemented on dummy class"); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKeys() + /** + * {@inheritDoc}. */ @Override public List getKeys() { throw new NotImplementedException("Not implemented on dummy class"); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.model.basicmodel.concepts.AxConcept#validate(org.onap.policy.apex.model.basicmodel.concepts. - * AxValidationResult) + /** + * {@inheritDoc}. */ @Override public AxValidationResult validate(AxValidationResult result) { throw new NotImplementedException("Not implemented on dummy class"); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#clean() + /** + * {@inheritDoc}. */ @Override public void clean() { @@ -119,42 +98,32 @@ public class DummyAxKey extends AxKey { } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(Object otherObject) { throw new NotImplementedException("Not implemented on dummy class"); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { return "Dummy Key"; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { throw new NotImplementedException("Not implemented on dummy class"); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.model.basicmodel.concepts.AxConcept#copyTo(org.onap.policy.apex.model.basicmodel.concepts. - * AxConcept) + /** + * {@inheritDoc}. */ @Override public AxConcept copyTo(AxConcept target) { diff --git a/core/core-engine/src/test/java/org/onap/policy/apex/core/engine/executor/context/DummyContextAlbum.java b/core/core-engine/src/test/java/org/onap/policy/apex/core/engine/executor/context/DummyContextAlbum.java index 5d5583ff6..9dd5cada2 100644 --- a/core/core-engine/src/test/java/org/onap/policy/apex/core/engine/executor/context/DummyContextAlbum.java +++ b/core/core-engine/src/test/java/org/onap/policy/apex/core/engine/executor/context/DummyContextAlbum.java @@ -47,232 +47,184 @@ public class DummyContextAlbum implements ContextAlbum { this.key = key; } - /* - * (non-Javadoc) - * - * @see java.util.Map#clear() + /** + * {@inheritDoc}. */ @Override public void clear() { throw new NotImplementedException("Not implemented on dummy class"); } - /* - * (non-Javadoc) - * - * @see java.util.Map#containsKey(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean containsKey(Object key) { throw new NotImplementedException("Not implemented on dummy class"); } - /* - * (non-Javadoc) - * - * @see java.util.Map#containsValue(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean containsValue(Object value) { throw new NotImplementedException("Not implemented on dummy class"); } - /* - * (non-Javadoc) - * - * @see java.util.Map#entrySet() + /** + * {@inheritDoc}. */ @Override public Set> entrySet() { throw new NotImplementedException("Not implemented on dummy class"); } - /* - * (non-Javadoc) - * - * @see java.util.Map#get(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public Object get(Object key) { throw new NotImplementedException("Not implemented on dummy class"); } - /* - * (non-Javadoc) - * - * @see java.util.Map#isEmpty() + /** + * {@inheritDoc}. */ @Override public boolean isEmpty() { throw new NotImplementedException("Not implemented on dummy class"); } - /* - * (non-Javadoc) - * - * @see java.util.Map#keySet() + /** + * {@inheritDoc}. */ @Override public Set keySet() { throw new NotImplementedException("Not implemented on dummy class"); } - /* - * (non-Javadoc) - * - * @see java.util.Map#put(java.lang.Object, java.lang.Object) + /** + * {@inheritDoc}. */ @Override public Object put(String key, Object value) { throw new NotImplementedException("Not implemented on dummy class"); } - /* - * (non-Javadoc) - * - * @see java.util.Map#putAll(java.util.Map) + /** + * {@inheritDoc}. */ @Override public void putAll(Map map) { throw new NotImplementedException("Not implemented on dummy class"); } - /* - * (non-Javadoc) - * - * @see java.util.Map#remove(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public Object remove(Object key) { throw new NotImplementedException("Not implemented on dummy class"); } - /* - * (non-Javadoc) - * - * @see java.util.Map#size() + /** + * {@inheritDoc}. */ @Override public int size() { throw new NotImplementedException("Not implemented on dummy class"); } - /* - * (non-Javadoc) - * - * @see java.util.Map#values() + /** + * {@inheritDoc}. */ @Override public Collection values() { throw new NotImplementedException("Not implemented on dummy class"); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.ContextAlbum#getKey() + /** + * {@inheritDoc}. */ @Override public AxArtifactKey getKey() { return key; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.ContextAlbum#getName() + /** + * {@inheritDoc}. */ @Override public String getName() { throw new NotImplementedException("Not implemented on dummy class"); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.ContextAlbum#getAlbumDefinition() + /** + * {@inheritDoc}. */ @Override public AxContextAlbum getAlbumDefinition() { throw new NotImplementedException("Not implemented on dummy class"); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.ContextAlbum#getSchemaHelper() + /** + * {@inheritDoc}. */ @Override public SchemaHelper getSchemaHelper() { throw new NotImplementedException("Not implemented on dummy class"); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.ContextAlbum#lockForReading(java.lang.String) + /** + * {@inheritDoc}. */ @Override public void lockForReading(String key) throws ContextException { throw new NotImplementedException("Not implemented on dummy class"); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.ContextAlbum#lockForWriting(java.lang.String) + /** + * {@inheritDoc}. */ @Override public void lockForWriting(String key) throws ContextException { throw new NotImplementedException("Not implemented on dummy class"); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.ContextAlbum#unlockForReading(java.lang.String) + /** + * {@inheritDoc}. */ @Override public void unlockForReading(String key) throws ContextException { throw new NotImplementedException("Not implemented on dummy class"); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.ContextAlbum#unlockForWriting(java.lang.String) + /** + * {@inheritDoc}. */ @Override public void unlockForWriting(String key) throws ContextException { throw new NotImplementedException("Not implemented on dummy class"); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.ContextAlbum#getUserArtifactStack() + /** + * {@inheritDoc}. */ @Override public AxConcept[] getUserArtifactStack() { throw new NotImplementedException("Not implemented on dummy class"); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.context.ContextAlbum#setUserArtifactStack(org.onap.policy.apex.model.basicmodel.concepts. - * AxConcept[]) + /** + * {@inheritDoc}. */ @Override public void setUserArtifactStack(AxConcept[] userArtifactStack) { // Do nothing } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.ContextAlbum#flush() + /** + * {@inheritDoc}. */ @Override public void flush() throws ContextException { 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 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 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 extends InternalMessageBusClient 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 extends InternalMessageBusClient 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 extends InternalMessageBusClient 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 commands) { @@ -145,11 +137,8 @@ public class MessagingClient extends InternalMessageBusClient 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 extends InternalMessageBusClient 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 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 extends InternalMessageBusServer { LOGGER.exit(); } - /* - * (non-Javadoc) - * - * @see org.java_websocket.server.WebSocketServer#start() + /** + * {@inheritDoc}. */ @Override public void startConnection() { @@ -78,10 +76,8 @@ public class MessageServerImpl extends InternalMessageBusServer { isStarted = true; } - /* - * (non-Javadoc) - * - * @see org.java_websocket.server.WebSocketServer#stop() + /** + * {@inheritDoc}. */ @Override public void stopConnection() { @@ -117,11 +113,8 @@ public class MessageServerImpl extends InternalMessageBusServer { 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 message) { @@ -132,10 +125,8 @@ public class MessageServerImpl extends InternalMessageBusServer { } } - /* - * (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 extends InternalMessageBusServer { } } - /* - * (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 { - /* - * (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 { - /* - * (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 { */ public abstract void onCommand(MessageBlock 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() { diff --git a/core/core-protocols/src/main/java/org/onap/policy/apex/core/protocols/Message.java b/core/core-protocols/src/main/java/org/onap/policy/apex/core/protocols/Message.java index 95f786cad..ad025555b 100644 --- a/core/core-protocols/src/main/java/org/onap/policy/apex/core/protocols/Message.java +++ b/core/core-protocols/src/main/java/org/onap/policy/apex/core/protocols/Message.java @@ -140,10 +140,8 @@ public abstract class Message implements Serializable { return messageData; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object object) { @@ -166,10 +164,8 @@ public abstract class Message implements Serializable { } - /* - * (non-Javadoc) - * - * @see java.lang.Object#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -179,10 +175,8 @@ public abstract class Message implements Serializable { return result; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { diff --git a/core/core-protocols/src/main/java/org/onap/policy/apex/core/protocols/engdep/messages/EngineServiceInfoResponse.java b/core/core-protocols/src/main/java/org/onap/policy/apex/core/protocols/engdep/messages/EngineServiceInfoResponse.java index 4cac23158..0df23d399 100644 --- a/core/core-protocols/src/main/java/org/onap/policy/apex/core/protocols/engdep/messages/EngineServiceInfoResponse.java +++ b/core/core-protocols/src/main/java/org/onap/policy/apex/core/protocols/engdep/messages/EngineServiceInfoResponse.java @@ -128,8 +128,8 @@ public class EngineServiceInfoResponse extends Response { this.apexModelKey = apexModelKey; } - /* (non-Javadoc) - * @see java.lang.Object#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -141,8 +141,8 @@ public class EngineServiceInfoResponse extends Response { return result; } - /* (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(Object obj) { diff --git a/core/core-protocols/src/main/java/org/onap/policy/apex/core/protocols/engdep/messages/GetEngineInfo.java b/core/core-protocols/src/main/java/org/onap/policy/apex/core/protocols/engdep/messages/GetEngineInfo.java index 5b53856d8..453e037ed 100644 --- a/core/core-protocols/src/main/java/org/onap/policy/apex/core/protocols/engdep/messages/GetEngineInfo.java +++ b/core/core-protocols/src/main/java/org/onap/policy/apex/core/protocols/engdep/messages/GetEngineInfo.java @@ -51,10 +51,8 @@ public class GetEngineInfo extends Message { super(EngDepAction.GET_ENGINE_INFO, engineKey, messageData); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.model.protocols.Message#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { diff --git a/core/core-protocols/src/main/java/org/onap/policy/apex/core/protocols/engdep/messages/GetEngineServiceInfo.java b/core/core-protocols/src/main/java/org/onap/policy/apex/core/protocols/engdep/messages/GetEngineServiceInfo.java index bdab1ce9f..1f44e9ce7 100644 --- a/core/core-protocols/src/main/java/org/onap/policy/apex/core/protocols/engdep/messages/GetEngineServiceInfo.java +++ b/core/core-protocols/src/main/java/org/onap/policy/apex/core/protocols/engdep/messages/GetEngineServiceInfo.java @@ -51,10 +51,8 @@ public class GetEngineServiceInfo extends Message { super(EngDepAction.GET_ENGINE_SERVICE_INFO, nullKey, messageData); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.model.protocols.Message#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { diff --git a/core/core-protocols/src/main/java/org/onap/policy/apex/core/protocols/engdep/messages/GetEngineStatus.java b/core/core-protocols/src/main/java/org/onap/policy/apex/core/protocols/engdep/messages/GetEngineStatus.java index 59c345647..17846ec2c 100644 --- a/core/core-protocols/src/main/java/org/onap/policy/apex/core/protocols/engdep/messages/GetEngineStatus.java +++ b/core/core-protocols/src/main/java/org/onap/policy/apex/core/protocols/engdep/messages/GetEngineStatus.java @@ -51,10 +51,8 @@ public class GetEngineStatus extends Message { super(EngDepAction.GET_ENGINE_STATUS, engineKey, messageData); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.model.protocols.Message#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { diff --git a/core/core-protocols/src/main/java/org/onap/policy/apex/core/protocols/engdep/messages/Response.java b/core/core-protocols/src/main/java/org/onap/policy/apex/core/protocols/engdep/messages/Response.java index c9d4239a1..ddd2c8cb9 100644 --- a/core/core-protocols/src/main/java/org/onap/policy/apex/core/protocols/engdep/messages/Response.java +++ b/core/core-protocols/src/main/java/org/onap/policy/apex/core/protocols/engdep/messages/Response.java @@ -80,8 +80,8 @@ public class Response extends Message { return responseTo; } - /* (non-Javadoc) - * @see java.lang.Object#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -92,8 +92,8 @@ public class Response extends Message { return result; } - /* (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(Object obj) { @@ -115,10 +115,8 @@ public class Response extends Message { return successful == other.successful; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.model.protocols.Message#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { diff --git a/core/core-protocols/src/main/java/org/onap/policy/apex/core/protocols/engdep/messages/StartEngine.java b/core/core-protocols/src/main/java/org/onap/policy/apex/core/protocols/engdep/messages/StartEngine.java index 81353236f..60c26762b 100644 --- a/core/core-protocols/src/main/java/org/onap/policy/apex/core/protocols/engdep/messages/StartEngine.java +++ b/core/core-protocols/src/main/java/org/onap/policy/apex/core/protocols/engdep/messages/StartEngine.java @@ -51,10 +51,8 @@ public class StartEngine extends Message { super(EngDepAction.START_ENGINE, engineKey, messageData); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.model.protocols.Message#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { diff --git a/core/core-protocols/src/main/java/org/onap/policy/apex/core/protocols/engdep/messages/StartPeriodicEvents.java b/core/core-protocols/src/main/java/org/onap/policy/apex/core/protocols/engdep/messages/StartPeriodicEvents.java index 32b0be4d0..f50a8e23f 100644 --- a/core/core-protocols/src/main/java/org/onap/policy/apex/core/protocols/engdep/messages/StartPeriodicEvents.java +++ b/core/core-protocols/src/main/java/org/onap/policy/apex/core/protocols/engdep/messages/StartPeriodicEvents.java @@ -51,10 +51,8 @@ public class StartPeriodicEvents extends Message { super(EngDepAction.START_PERIODIC_EVENTS, engineKey, messageData); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.model.protocols.Message#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { diff --git a/core/core-protocols/src/main/java/org/onap/policy/apex/core/protocols/engdep/messages/StopEngine.java b/core/core-protocols/src/main/java/org/onap/policy/apex/core/protocols/engdep/messages/StopEngine.java index 33e66ba6d..844203180 100644 --- a/core/core-protocols/src/main/java/org/onap/policy/apex/core/protocols/engdep/messages/StopEngine.java +++ b/core/core-protocols/src/main/java/org/onap/policy/apex/core/protocols/engdep/messages/StopEngine.java @@ -51,10 +51,8 @@ public class StopEngine extends Message { super(EngDepAction.STOP_ENGINE, engineKey, messageData); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.model.protocols.Message#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { diff --git a/core/core-protocols/src/main/java/org/onap/policy/apex/core/protocols/engdep/messages/StopPeriodicEvents.java b/core/core-protocols/src/main/java/org/onap/policy/apex/core/protocols/engdep/messages/StopPeriodicEvents.java index 49f80ecb0..464c85e89 100644 --- a/core/core-protocols/src/main/java/org/onap/policy/apex/core/protocols/engdep/messages/StopPeriodicEvents.java +++ b/core/core-protocols/src/main/java/org/onap/policy/apex/core/protocols/engdep/messages/StopPeriodicEvents.java @@ -51,10 +51,8 @@ public class StopPeriodicEvents extends Message { super(EngDepAction.STOP_PERIODIC_EVENTS, engineKey, messageData); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.model.protocols.Message#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { diff --git a/core/core-protocols/src/main/java/org/onap/policy/apex/core/protocols/engdep/messages/UpdateModel.java b/core/core-protocols/src/main/java/org/onap/policy/apex/core/protocols/engdep/messages/UpdateModel.java index e29889ea8..741d4736e 100644 --- a/core/core-protocols/src/main/java/org/onap/policy/apex/core/protocols/engdep/messages/UpdateModel.java +++ b/core/core-protocols/src/main/java/org/onap/policy/apex/core/protocols/engdep/messages/UpdateModel.java @@ -88,18 +88,16 @@ public class UpdateModel extends Message { return forceInstall; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.model.protocols.Message#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { return "UpdateModel {" + super.toString() + "}[]"; } - /* (non-Javadoc) - * @see java.lang.Object#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -110,8 +108,8 @@ public class UpdateModel extends Message { return result; } - /* (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(Object obj) { diff --git a/core/core-protocols/src/test/java/org/onap/policy/apex/core/protocols/DummyAction.java b/core/core-protocols/src/test/java/org/onap/policy/apex/core/protocols/DummyAction.java index 9f63e5294..bc8d5e5c1 100644 --- a/core/core-protocols/src/test/java/org/onap/policy/apex/core/protocols/DummyAction.java +++ b/core/core-protocols/src/test/java/org/onap/policy/apex/core/protocols/DummyAction.java @@ -34,8 +34,8 @@ public class DummyAction implements Action { this.actionString = actionString; } - /* (non-Javadoc) - * @see org.onap.policy.apex.core.protocols.Action#getActionString() + /** + * {@inheritDoc}. */ @Override public String getActionString() { -- cgit 1.2.3-korg