diff options
250 files changed, 2301 insertions, 4985 deletions
diff --git a/auth/cli-codegen/src/main/java/org/onap/policy/apex/auth/clicodegen/CgStringRenderer.java b/auth/cli-codegen/src/main/java/org/onap/policy/apex/auth/clicodegen/CgStringRenderer.java index dbf8f3844..f17ac6a1e 100644 --- a/auth/cli-codegen/src/main/java/org/onap/policy/apex/auth/clicodegen/CgStringRenderer.java +++ b/auth/cli-codegen/src/main/java/org/onap/policy/apex/auth/clicodegen/CgStringRenderer.java @@ -33,11 +33,8 @@ import org.stringtemplate.v4.StringRenderer; */ public class CgStringRenderer implements AttributeRenderer { - /* - * (non-Javadoc) - * - * @see org.stringtemplate.v4.AttributeRenderer#toString(java.lang.Object, java.lang.String, - * java.util.Locale) + /** + * {@inheritDoc}. */ @Override public String toString(final Object obj, final String format, final Locale locale) { diff --git a/auth/cli-codegen/src/test/java/org/onap/policy/apex/auth/clicodegen/DummyStErrorListener.java b/auth/cli-codegen/src/test/java/org/onap/policy/apex/auth/clicodegen/DummyStErrorListener.java index 33387accc..45d307b47 100644 --- a/auth/cli-codegen/src/test/java/org/onap/policy/apex/auth/clicodegen/DummyStErrorListener.java +++ b/auth/cli-codegen/src/test/java/org/onap/policy/apex/auth/clicodegen/DummyStErrorListener.java @@ -33,8 +33,8 @@ public class DummyStErrorListener implements STErrorListener { /** Counts errors of the listener. */ private int errorCount; - /* (non-Javadoc) - * @see org.stringtemplate.v4.STErrorListener#IOError(org.stringtemplate.v4.misc.STMessage) + /** + * {@inheritDoc}. */ @Override public void IOError(final STMessage msg) { @@ -44,8 +44,8 @@ public class DummyStErrorListener implements STErrorListener { } } - /* (non-Javadoc) - * @see org.stringtemplate.v4.STErrorListener#compileTimeError(org.stringtemplate.v4.misc.STMessage) + /** + * {@inheritDoc}. */ @Override public void compileTimeError(final STMessage msg) { @@ -55,8 +55,8 @@ public class DummyStErrorListener implements STErrorListener { } } - /* (non-Javadoc) - * @see org.stringtemplate.v4.STErrorListener#internalError(org.stringtemplate.v4.misc.STMessage) + /** + * {@inheritDoc}. */ @Override public void internalError(final STMessage msg) { @@ -66,8 +66,8 @@ public class DummyStErrorListener implements STErrorListener { } } - /* (non-Javadoc) - * @see org.stringtemplate.v4.STErrorListener#runTimeError(org.stringtemplate.v4.misc.STMessage) + /** + * {@inheritDoc}. */ @Override public void runTimeError(final STMessage msg) { diff --git a/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/ApexModelProperties.java b/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/ApexModelProperties.java index 6ed68288a..0e3cd0634 100644 --- a/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/ApexModelProperties.java +++ b/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/ApexModelProperties.java @@ -199,10 +199,8 @@ public class ApexModelProperties { return defaultMacroFileTag; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { diff --git a/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/CommandLineArgument.java b/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/CommandLineArgument.java index 6ce1979b2..48899baa6 100644 --- a/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/CommandLineArgument.java +++ b/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/CommandLineArgument.java @@ -105,10 +105,8 @@ public class CommandLineArgument implements Comparable<CommandLineArgument> { return builder.toString(); } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { @@ -116,10 +114,8 @@ public class CommandLineArgument implements Comparable<CommandLineArgument> { + "]"; } - /* - * (non-Javadoc) - * - * @see java.lang.Comparable#compareTo(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public int compareTo(final CommandLineArgument otherArgument) { @@ -143,8 +139,8 @@ public class CommandLineArgument implements Comparable<CommandLineArgument> { return description.compareTo(otherArgument.description); } - /* (non-Javadoc) - * @see java.lang.Object#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -156,8 +152,8 @@ public class CommandLineArgument implements Comparable<CommandLineArgument> { return result; } - /* (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(Object obj) { diff --git a/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/CommandLineArgumentValue.java b/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/CommandLineArgumentValue.java index 64059e31b..732f88c8e 100644 --- a/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/CommandLineArgumentValue.java +++ b/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/CommandLineArgumentValue.java @@ -79,10 +79,8 @@ public class CommandLineArgumentValue { specified = true; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { diff --git a/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/CommandLineCommand.java b/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/CommandLineCommand.java index 564c5320a..38ff98010 100644 --- a/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/CommandLineCommand.java +++ b/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/CommandLineCommand.java @@ -187,10 +187,8 @@ public class CommandLineCommand implements Comparable<CommandLineCommand> { return builder.toString(); } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { @@ -199,10 +197,8 @@ public class CommandLineCommand implements Comparable<CommandLineCommand> { + "]"; } - /* - * (non-Javadoc) - * - * @see java.lang.Comparable#compareTo(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public int compareTo(final CommandLineCommand otherCommand) { @@ -255,8 +251,8 @@ public class CommandLineCommand implements Comparable<CommandLineCommand> { return 0; } - /* (non-Javadoc) - * @see java.lang.Object#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -271,8 +267,8 @@ public class CommandLineCommand implements Comparable<CommandLineCommand> { return result; } - /* (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(Object obj) { diff --git a/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/CommandLineParameters.java b/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/CommandLineParameters.java index 9a03dcfde..036208fd2 100644 --- a/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/CommandLineParameters.java +++ b/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/CommandLineParameters.java @@ -560,10 +560,8 @@ public class CommandLineParameters { this.ignoreCommandFailures = ignoreCommandFailures; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { diff --git a/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/KeywordNode.java b/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/KeywordNode.java index f6932e993..4fe67b357 100644 --- a/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/KeywordNode.java +++ b/auth/cli-editor/src/main/java/org/onap/policy/apex/auth/clieditor/KeywordNode.java @@ -133,10 +133,8 @@ public class KeywordNode implements Comparable<KeywordNode> { return command; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { @@ -161,10 +159,8 @@ public class KeywordNode implements Comparable<KeywordNode> { return commandSet; } - /* - * (non-Javadoc) - * - * @see java.lang.Comparable#compareTo(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public int compareTo(final KeywordNode otherKeywordNode) { diff --git a/client/client-deployment/src/main/java/org/onap/policy/apex/client/deployment/rest/ApexDeploymentRestMain.java b/client/client-deployment/src/main/java/org/onap/policy/apex/client/deployment/rest/ApexDeploymentRestMain.java index 8f6dcd089..b7d566ccf 100644 --- a/client/client-deployment/src/main/java/org/onap/policy/apex/client/deployment/rest/ApexDeploymentRestMain.java +++ b/client/client-deployment/src/main/java/org/onap/policy/apex/client/deployment/rest/ApexDeploymentRestMain.java @@ -174,10 +174,8 @@ public class ApexDeploymentRestMain { * This class is a shutdown hook for the Apex services command. */ private class ApexServicesShutdownHook implements Runnable { - /* - * (non-Javadoc) - * - * @see java.lang.Runnable#run() + /** + * {@inheritDoc}. */ @Override public void run() { diff --git a/client/client-deployment/src/main/java/org/onap/policy/apex/client/deployment/rest/ApexDeploymentRestParameters.java b/client/client-deployment/src/main/java/org/onap/policy/apex/client/deployment/rest/ApexDeploymentRestParameters.java index cadc3ef4e..70765ebc6 100644 --- a/client/client-deployment/src/main/java/org/onap/policy/apex/client/deployment/rest/ApexDeploymentRestParameters.java +++ b/client/client-deployment/src/main/java/org/onap/policy/apex/client/deployment/rest/ApexDeploymentRestParameters.java @@ -164,8 +164,8 @@ public class ApexDeploymentRestParameters { this.timeToLive = timeToLive; } - /* (non-Javadoc) - * @see java.lang.Object#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/ApexEditorMain.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/ApexEditorMain.java index 4d0959977..b7e1f97c6 100644 --- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/ApexEditorMain.java +++ b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/ApexEditorMain.java @@ -157,10 +157,8 @@ public class ApexEditorMain { return state; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { @@ -186,10 +184,8 @@ public class ApexEditorMain { * This class is a shutdown hook for the Apex editor command. */ private class ApexEditorShutdownHook implements Runnable { - /* - * (non-Javadoc) - * - * @see java.lang.Runnable#run() + /** + * {@inheritDoc}. */ @Override public void run() { diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/ApexEditorParameters.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/ApexEditorParameters.java index 5c0c5eb7c..d220d85c4 100644 --- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/ApexEditorParameters.java +++ b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/ApexEditorParameters.java @@ -199,10 +199,8 @@ public class ApexEditorParameters { this.timeToLive = timeToLive; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanContextAlbum.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanContextAlbum.java index 53cb911e1..4808a6531 100644 --- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanContextAlbum.java +++ b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanContextAlbum.java @@ -98,10 +98,8 @@ public class BeanContextAlbum extends BeanBase { return writeable; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanContextSchema.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanContextSchema.java index cab624c15..20ac61709 100644 --- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanContextSchema.java +++ b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanContextSchema.java @@ -88,10 +88,8 @@ public class BeanContextSchema extends BeanBase { return schemaDefinition; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanEvent.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanEvent.java index 16cb16cf8..c96e43c29 100644 --- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanEvent.java +++ b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanEvent.java @@ -123,10 +123,8 @@ public class BeanEvent extends BeanBase { return null; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanField.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanField.java index 0fcc58140..472f94f2b 100644 --- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanField.java +++ b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanField.java @@ -49,10 +49,8 @@ public class BeanField extends BeanKeyRef { return optional; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.client.editor.rest.bean.Bean_KeyRef#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanKeyRef.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanKeyRef.java index 7aabacd57..d9c0269e2 100644 --- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanKeyRef.java +++ b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanKeyRef.java @@ -48,10 +48,8 @@ public class BeanKeyRef extends BeanBase { return version; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanLogic.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanLogic.java index 3c38dbde8..ea61492a0 100644 --- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanLogic.java +++ b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanLogic.java @@ -48,10 +48,8 @@ public class BeanLogic extends BeanBase { return logic; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanModel.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanModel.java index 7f03a2413..d65cbe7a9 100644 --- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanModel.java +++ b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanModel.java @@ -69,10 +69,8 @@ public class BeanModel extends BeanBase { return description; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanPolicy.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanPolicy.java index cb960b88a..da2f721e7 100644 --- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanPolicy.java +++ b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanPolicy.java @@ -100,10 +100,8 @@ public class BeanPolicy extends BeanBase { return states; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanState.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanState.java index 9472c3b89..8ca5912fa 100644 --- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanState.java +++ b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanState.java @@ -121,10 +121,8 @@ public class BeanState extends BeanBase { this.defaultTask = defaultTask; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanStateOutput.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanStateOutput.java index 9d60897d4..a01a05221 100644 --- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanStateOutput.java +++ b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanStateOutput.java @@ -49,10 +49,8 @@ public class BeanStateOutput extends BeanBase { return nextState; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanStateTaskRef.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanStateTaskRef.java index c82bd7828..87396c4ed 100644 --- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanStateTaskRef.java +++ b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanStateTaskRef.java @@ -58,10 +58,8 @@ public class BeanStateTaskRef extends BeanBase { return outputName; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanTask.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanTask.java index f9c1706cf..b5a231bcd 100644 --- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanTask.java +++ b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanTask.java @@ -121,10 +121,8 @@ public class BeanTask extends BeanBase { return contexts; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanTaskParameter.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanTaskParameter.java index 33b70056e..8cedbb89d 100644 --- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanTaskParameter.java +++ b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanTaskParameter.java @@ -49,10 +49,8 @@ public class BeanTaskParameter extends BeanBase { return defaultValue; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { diff --git a/client/client-full/src/main/java/org/onap/policy/apex/client/full/rest/ApexServicesRestMain.java b/client/client-full/src/main/java/org/onap/policy/apex/client/full/rest/ApexServicesRestMain.java index 02670511c..df877baff 100644 --- a/client/client-full/src/main/java/org/onap/policy/apex/client/full/rest/ApexServicesRestMain.java +++ b/client/client-full/src/main/java/org/onap/policy/apex/client/full/rest/ApexServicesRestMain.java @@ -158,10 +158,8 @@ public class ApexServicesRestMain { return state; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { @@ -187,10 +185,8 @@ public class ApexServicesRestMain { * This class is a shutdown hook for the Apex editor command. */ private class ApexServicesRestShutdownHook implements Runnable { - /* - * (non-Javadoc) - * - * @see java.lang.Runnable#run() + /** + * {@inheritDoc}. */ @Override public void run() { diff --git a/client/client-monitoring/src/main/java/org/onap/policy/apex/client/monitoring/rest/ApexMonitoringRestMain.java b/client/client-monitoring/src/main/java/org/onap/policy/apex/client/monitoring/rest/ApexMonitoringRestMain.java index 523a6eebb..468fd5aa7 100644 --- a/client/client-monitoring/src/main/java/org/onap/policy/apex/client/monitoring/rest/ApexMonitoringRestMain.java +++ b/client/client-monitoring/src/main/java/org/onap/policy/apex/client/monitoring/rest/ApexMonitoringRestMain.java @@ -174,10 +174,8 @@ public class ApexMonitoringRestMain { * This class is a shutdown hook for the Apex services command. */ private class ApexServicesShutdownHook implements Runnable { - /* - * (non-Javadoc) - * - * @see java.lang.Runnable#run() + /** + * {@inheritDoc}. */ @Override public void run() { diff --git a/context/context-management/src/main/java/org/onap/policy/apex/context/impl/ContextAlbumImpl.java b/context/context-management/src/main/java/org/onap/policy/apex/context/impl/ContextAlbumImpl.java index f2a4d5832..9d44cd38b 100644 --- a/context/context-management/src/main/java/org/onap/policy/apex/context/impl/ContextAlbumImpl.java +++ b/context/context-management/src/main/java/org/onap/policy/apex/context/impl/ContextAlbumImpl.java @@ -111,50 +111,40 @@ public final class ContextAlbumImpl implements ContextAlbum, Comparable<ContextA } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.ContextAlbum#getKey() + /** + * {@inheritDoc}. */ @Override public AxArtifactKey getKey() { return albumDefinition.getKey(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.ContextAlbum#getName() + /** + * {@inheritDoc}. */ @Override public String getName() { return albumDefinition.getKey().getName(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.ContextAlbum#getAxContextAlbum() + /** + * {@inheritDoc}. */ @Override public AxContextAlbum getAlbumDefinition() { return albumDefinition; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.ContextAlbum#getSchemaHelper() + /** + * {@inheritDoc}. */ @Override public SchemaHelper getSchemaHelper() { return schemaHelper; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.ContextAlbum#lockForReading(java.lang.String) + /** + * {@inheritDoc}. */ @Override public void lockForReading(final String keyOnAlbum) throws ContextException { @@ -163,10 +153,8 @@ public final class ContextAlbumImpl implements ContextAlbum, Comparable<ContextA userArtifactStack); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.ContextAlbum#lockForWriting(java.lang.String) + /** + * {@inheritDoc}. */ @Override public void lockForWriting(final String keyOnAlbum) throws ContextException { @@ -175,10 +163,8 @@ public final class ContextAlbumImpl implements ContextAlbum, Comparable<ContextA userArtifactStack); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.ContextAlbum#unlockForReading(java.lang.String) + /** + * {@inheritDoc}. */ @Override public void unlockForReading(final String keyOnAlbum) throws ContextException { @@ -187,10 +173,8 @@ public final class ContextAlbumImpl implements ContextAlbum, Comparable<ContextA userArtifactStack); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.ContextAlbum#unlockForWriting(java.lang.String) + /** + * {@inheritDoc}. */ @Override public void unlockForWriting(final String keyOnAlbum) throws ContextException { @@ -199,33 +183,24 @@ public final class ContextAlbumImpl implements ContextAlbum, Comparable<ContextA userArtifactStack); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.context.ContextAlbum#getUserArtifactStack() + /** + * {@inheritDoc}. */ @Override public AxConcept[] getUserArtifactStack() { return userArtifactStack; } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.context.ContextAlbum#setUserArtifactStack(org.onap.policy.apex.model.basicmodel.concepts. - * AxConcept []) + /** + * {@inheritDoc}. */ @Override public void setUserArtifactStack(final AxConcept[] userArtifactStack) { this.userArtifactStack = userArtifactStack; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.ContextAlbum#flush() + /** + * {@inheritDoc}. */ @Override public void flush() throws ContextException { @@ -236,30 +211,24 @@ public final class ContextAlbumImpl implements ContextAlbum, Comparable<ContextA * The Map interface */ - /* - * (non-Javadoc) - * - * @see java.util.Map#size() + /** + * {@inheritDoc}. */ @Override public int size() { return albumMap.size(); } - /* - * (non-Javadoc) - * - * @see java.util.Map#isEmpty() + /** + * {@inheritDoc}. */ @Override public boolean isEmpty() { return albumMap.isEmpty(); } - /* - * (non-Javadoc) - * - * @see java.util.Map#containsKey(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean containsKey(final Object key) { @@ -271,10 +240,8 @@ public final class ContextAlbumImpl implements ContextAlbum, Comparable<ContextA return albumMap.containsKey(key); } - /* - * (non-Javadoc) - * - * @see java.util.Map#containsValue(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean containsValue(final Object value) { @@ -286,10 +253,8 @@ public final class ContextAlbumImpl implements ContextAlbum, Comparable<ContextA return albumMap.containsValue(value); } - /* - * (non-Javadoc) - * - * @see java.util.Map#get(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public Object get(final Object key) { @@ -311,20 +276,16 @@ public final class ContextAlbumImpl implements ContextAlbum, Comparable<ContextA return item; } - /* - * (non-Javadoc) - * - * @see java.util.Map#keySet() + /** + * {@inheritDoc}. */ @Override public Set<String> keySet() { return albumMap.keySet(); } - /* - * (non-Javadoc) - * - * @see java.util.Map#values() + /** + * {@inheritDoc}. */ @Override public Collection<Object> values() { @@ -341,10 +302,8 @@ public final class ContextAlbumImpl implements ContextAlbum, Comparable<ContextA return valueList; } - /* - * (non-Javadoc) - * - * @see java.util.Map#entrySet() + /** + * {@inheritDoc}. */ @Override public Set<Entry<String, Object>> entrySet() { @@ -361,10 +320,8 @@ public final class ContextAlbumImpl implements ContextAlbum, Comparable<ContextA 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) { @@ -414,10 +371,8 @@ public final class ContextAlbumImpl implements ContextAlbum, Comparable<ContextA } } - /* - * (non-Javadoc) - * - * @see java.util.Map#putAll(java.util.Map) + /** + * {@inheritDoc}. */ @Override public void putAll(final Map<? extends String, ? extends Object> incomingContextAlbum) { @@ -451,10 +406,8 @@ public final class ContextAlbumImpl implements ContextAlbum, Comparable<ContextA } } - /* - * (non-Javadoc) - * - * @see java.util.Map#remove(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public Object remove(final Object key) { @@ -479,10 +432,8 @@ public final class ContextAlbumImpl implements ContextAlbum, Comparable<ContextA return removedValue; } - /* - * (non-Javadoc) - * - * @see java.util.Map#clear() + /** + * {@inheritDoc}. */ @Override public void clear() { @@ -504,16 +455,16 @@ public final class ContextAlbumImpl implements ContextAlbum, Comparable<ContextA albumMap.clear(); } - /* (non-Javadoc) - * @see java.lang.Comparable#compareTo(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public int compareTo(ContextAlbumImpl otherContextAlbumImpl) { return (equals(otherContextAlbumImpl) ? 0 : 1); } - /* (non-Javadoc) - * @see java.lang.Object#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -524,8 +475,8 @@ public final class ContextAlbumImpl implements ContextAlbum, Comparable<ContextA return result; } - /* (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(Object obj) { diff --git a/context/context-management/src/main/java/org/onap/policy/apex/context/impl/distribution/AbstractDistributor.java b/context/context-management/src/main/java/org/onap/policy/apex/context/impl/distribution/AbstractDistributor.java index 63ad77a32..49b0a669a 100644 --- a/context/context-management/src/main/java/org/onap/policy/apex/context/impl/distribution/AbstractDistributor.java +++ b/context/context-management/src/main/java/org/onap/policy/apex/context/impl/distribution/AbstractDistributor.java @@ -79,11 +79,8 @@ public abstract class AbstractDistributor implements Distributor { LOGGER.exit("AbstractContextDistributor()"); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.ContextDistributor#init(org.onap.policy.apex.model.basicmodel.concepts. - * AxArtifactKey) + /** + * {@inheritDoc}. */ @Override public void init(final AxArtifactKey distributorKey) throws ContextException { @@ -125,18 +122,14 @@ public abstract class AbstractDistributor implements Distributor { flushTimer = incomingFlushTimer; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.ContextDistributor#shutdown() + /** + * {@inheritDoc}. */ @Override public abstract void shutdown(); - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.ContextDistributor#getKey() + /** + * {@inheritDoc}. */ @Override public AxArtifactKey getKey() { @@ -151,11 +144,8 @@ public abstract class AbstractDistributor implements Distributor { */ public abstract Map<String, Object> getContextAlbumMap(AxArtifactKey contextAlbumKey); - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.Distributor#registerModel(org.onap.policy.apex.model.contextmodel.concepts. - * AxContextModel) + /** + * {@inheritDoc}. */ @Override public void registerModel(final AxContextModel contextModel) throws ContextException { @@ -164,12 +154,8 @@ public abstract class AbstractDistributor implements Distributor { ModelService.registerModel(AxContextAlbums.class, contextModel.getAlbums()); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.core.context.ContextDistributor#createContextAlbum(org.onap.policy.apex.core.basicmodel. - * concepts. AxArtifactKey) + /** + * {@inheritDoc}. */ @Override public synchronized ContextAlbum createContextAlbum(final AxArtifactKey axContextAlbumKey) throws ContextException { @@ -220,12 +206,8 @@ public abstract class AbstractDistributor implements Distributor { } } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.core.context.ContextDistributor#removeContextAlbum(org.onap.policy.apex.core.basicmodel. - * concepts. AxArtifactKey) + /** + * {@inheritDoc}. */ @Override public void removeContextAlbum(final AxContextAlbum contextAlbum) throws ContextException { @@ -241,10 +223,8 @@ public abstract class AbstractDistributor implements Distributor { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.context.ContextDistributor#flush() + /** + * {@inheritDoc}. */ @Override public void flush() throws ContextException { @@ -259,11 +239,8 @@ public abstract class AbstractDistributor implements Distributor { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.context.ContextDistributor#flushContextAlbum(org.onap.policy.apex.core.context. - * ContextAlbum) + /** + * {@inheritDoc}. */ @Override public void flushContextAlbum(final ContextAlbum contextAlbum) throws ContextException { @@ -281,10 +258,8 @@ public abstract class AbstractDistributor implements Distributor { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.context.ContextDistributor#lockForReading(java.lang.String) + /** + * {@inheritDoc}. */ @Override public synchronized void lockForReading(final AxArtifactKey mapKey, final String itemKey) throws ContextException { @@ -292,10 +267,8 @@ public abstract class AbstractDistributor implements Distributor { lockManager.lockForReading(mapKey.getId(), itemKey); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.context.ContextDistributor#lockForWriting(java.lang.String) + /** + * {@inheritDoc}. */ @Override public synchronized void lockForWriting(final AxArtifactKey mapKey, final String itemKey) throws ContextException { @@ -303,10 +276,8 @@ public abstract class AbstractDistributor implements Distributor { lockManager.lockForWriting(mapKey.getId(), itemKey); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.context.ContextDistributor#unlockForReading(java.lang.String) + /** + * {@inheritDoc}. */ @Override public void unlockForReading(final AxArtifactKey mapKey, final String itemKey) throws ContextException { @@ -314,10 +285,8 @@ public abstract class AbstractDistributor implements Distributor { lockManager.unlockForReading(mapKey.getId(), itemKey); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.context.ContextDistributor#unlockForWriting(java.lang.String) + /** + * {@inheritDoc}. */ @Override public void unlockForWriting(final AxArtifactKey mapKey, final String itemKey) throws ContextException { @@ -325,10 +294,8 @@ public abstract class AbstractDistributor implements Distributor { lockManager.unlockForWriting(mapKey.getId(), itemKey); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.context.ContextDistributor#clear() + /** + * {@inheritDoc}. */ @Override public void clear() { diff --git a/context/context-management/src/main/java/org/onap/policy/apex/context/impl/distribution/DistributorFlushTimerTask.java b/context/context-management/src/main/java/org/onap/policy/apex/context/impl/distribution/DistributorFlushTimerTask.java index 0dd1d9966..e0de4a348 100644 --- a/context/context-management/src/main/java/org/onap/policy/apex/context/impl/distribution/DistributorFlushTimerTask.java +++ b/context/context-management/src/main/java/org/onap/policy/apex/context/impl/distribution/DistributorFlushTimerTask.java @@ -106,10 +106,8 @@ public class DistributorFlushTimerTask extends TimerTask { return true; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { diff --git a/context/context-management/src/main/java/org/onap/policy/apex/context/impl/distribution/jvmlocal/JvmLocalDistributor.java b/context/context-management/src/main/java/org/onap/policy/apex/context/impl/distribution/jvmlocal/JvmLocalDistributor.java index 701c59342..cafc96c93 100644 --- a/context/context-management/src/main/java/org/onap/policy/apex/context/impl/distribution/jvmlocal/JvmLocalDistributor.java +++ b/context/context-management/src/main/java/org/onap/policy/apex/context/impl/distribution/jvmlocal/JvmLocalDistributor.java @@ -45,12 +45,8 @@ public class JvmLocalDistributor extends AbstractDistributor { super(); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.context.impl.distribution.AbstractDistributor#getContextAlbumMap(org.onap.policy.apex.model. - * basicmodel.concepts.AxArtifactKey) + /** + * {@inheritDoc}. */ @Override public Map<String, Object> getContextAlbumMap(final AxArtifactKey contextMapKey) { @@ -58,10 +54,8 @@ public class JvmLocalDistributor extends AbstractDistributor { return Collections.synchronizedMap(new HashMap<String, Object>()); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.impl.distribution.AbstractDistributor#shutdown() + /** + * {@inheritDoc}. */ @Override public void shutdown() { diff --git a/context/context-management/src/main/java/org/onap/policy/apex/context/impl/locking/AbstractLockManager.java b/context/context-management/src/main/java/org/onap/policy/apex/context/impl/locking/AbstractLockManager.java index 88908b965..7a7b237d6 100644 --- a/context/context-management/src/main/java/org/onap/policy/apex/context/impl/locking/AbstractLockManager.java +++ b/context/context-management/src/main/java/org/onap/policy/apex/context/impl/locking/AbstractLockManager.java @@ -51,31 +51,24 @@ public abstract class AbstractLockManager implements LockManager { private final Map<String, Map<String, ReadWriteLock>> lockMaps = Collections .synchronizedMap(new HashMap<String, Map<String, ReadWriteLock>>()); - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.LockManager#init(org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey) + /** + * {@inheritDoc}. */ @Override public void init(final AxArtifactKey lockManagerKey) throws ContextException { this.key = lockManagerKey; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.LockManager#getKey() + /** + * {@inheritDoc}. */ @Override public AxArtifactKey getKey() { return key; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.context.LockManager#lockForReading(org.onap.policy.apex.core.model.concepts. - * AxArtifactKey, java.lang.String) + /** + * {@inheritDoc}. */ @Override public synchronized void lockForReading(final String lockTypeKey, final String lockKey) throws ContextException { @@ -94,10 +87,8 @@ public abstract class AbstractLockManager implements LockManager { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.context.LockManager#lockForWriting(java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public synchronized void lockForWriting(final String lockTypeKey, final String lockKey) throws ContextException { @@ -116,10 +107,8 @@ public abstract class AbstractLockManager implements LockManager { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.context.LockManager#unlockForReading(java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public void unlockForReading(final String lockTypeKey, final String lockKey) throws ContextException { @@ -138,10 +127,8 @@ public abstract class AbstractLockManager implements LockManager { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.context.LockManager#unlockForWriting(java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public void unlockForWriting(final String lockTypeKey, final String lockKey) throws ContextException { diff --git a/context/context-management/src/main/java/org/onap/policy/apex/context/impl/locking/jvmlocal/JvmLocalLockManager.java b/context/context-management/src/main/java/org/onap/policy/apex/context/impl/locking/jvmlocal/JvmLocalLockManager.java index 721aa7f3c..444a0857d 100644 --- a/context/context-management/src/main/java/org/onap/policy/apex/context/impl/locking/jvmlocal/JvmLocalLockManager.java +++ b/context/context-management/src/main/java/org/onap/policy/apex/context/impl/locking/jvmlocal/JvmLocalLockManager.java @@ -33,21 +33,16 @@ import org.onap.policy.apex.context.impl.locking.AbstractLockManager; * @author Liam Fallon (liam.fallon@ericsson.com) */ public class JvmLocalLockManager extends AbstractLockManager { - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.core.context.impl.locking.AbstractLockManager#getReentrantReadWriteLock(java.lang.String) + /** + * {@inheritDoc}. */ @Override public ReadWriteLock getReentrantReadWriteLock(final String lockId) throws ContextException { return new ReentrantReadWriteLock(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.context.LockManager#shutdown() + /** + * {@inheritDoc}. */ @Override public void shutdown() { diff --git a/context/context-management/src/main/java/org/onap/policy/apex/context/impl/persistence/ephemeral/EphemeralPersistor.java b/context/context-management/src/main/java/org/onap/policy/apex/context/impl/persistence/ephemeral/EphemeralPersistor.java index b875978be..96567f0e3 100644 --- a/context/context-management/src/main/java/org/onap/policy/apex/context/impl/persistence/ephemeral/EphemeralPersistor.java +++ b/context/context-management/src/main/java/org/onap/policy/apex/context/impl/persistence/ephemeral/EphemeralPersistor.java @@ -40,31 +40,24 @@ public class EphemeralPersistor implements Persistor { // The key of this persistor private AxArtifactKey key; - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.Persistor#init(org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey) + /** + * {@inheritDoc}. */ @Override public void init(final AxArtifactKey persistorKey) throws ContextException { this.key = persistorKey; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.Persistor#getKey() + /** + * {@inheritDoc}. */ @Override public AxArtifactKey getKey() { return key; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.context.Persistor#readContextItem(org.onap.policy.apex.core.basicmodel.concepts. - * AxReferenceKey, java.lang.Class) + /** + * {@inheritDoc}. */ @Override public AxContextSchema readContextItem(final AxReferenceKey itemKey, final Class<?> contextItemClass) { @@ -72,11 +65,8 @@ public class EphemeralPersistor implements Persistor { return null; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.context.Persistor#readContextItems(org.onap.policy.apex.core.basicmodel.concepts. - * AxArtifactKey, java.lang.Class) + /** + * {@inheritDoc}. */ @Override public Set<AxContextSchema> readContextItems(final AxArtifactKey ownerKey, final Class<?> contextItemClass) @@ -85,12 +75,8 @@ public class EphemeralPersistor implements Persistor { return new TreeSet<>(); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.core.context.Persistor#writeContextItem(org.onap.policy.apex.core.contextmodel.concepts. - * AxContextItem) + /** + * {@inheritDoc}. */ @Override public Object writeContextItem(final Object contextItem) { diff --git a/context/context-management/src/main/java/org/onap/policy/apex/context/impl/schema/AbstractSchemaHelper.java b/context/context-management/src/main/java/org/onap/policy/apex/context/impl/schema/AbstractSchemaHelper.java index aa641ad9b..c4b1a0254 100644 --- a/context/context-management/src/main/java/org/onap/policy/apex/context/impl/schema/AbstractSchemaHelper.java +++ b/context/context-management/src/main/java/org/onap/policy/apex/context/impl/schema/AbstractSchemaHelper.java @@ -61,11 +61,8 @@ public abstract class AbstractSchemaHelper implements SchemaHelper { this.schemaClass = schemaClass; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.SchemaHelper#init(org.onap.policy.apex.model.basicmodel.concepts .AxKey, - * org.onap.policy.apex.model.contextmodel.concepts.AxContextSchema) + /** + * {@inheritDoc}. */ @Override public void init(final AxKey incomingUserKey, final AxContextSchema incomingSchema) { @@ -78,50 +75,40 @@ public abstract class AbstractSchemaHelper implements SchemaHelper { this.schema = incomingSchema; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.SchemaHelper#getKey() + /** + * {@inheritDoc}. */ @Override public AxKey getUserKey() { return userKey; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.SchemaHelper#getSchema() + /** + * {@inheritDoc}. */ @Override public AxContextSchema getSchema() { return schema; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.SchemaHelper#getSchemaClass() + /** + * {@inheritDoc}. */ @Override public Class<?> getSchemaClass() { return schemaClass; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.SchemaHelper#getSchemaObject() + /** + * {@inheritDoc}. */ @Override public Object getSchemaObject() { return null; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.SchemaHelper#createNewInstance() + /** + * {@inheritDoc}. */ @Override public Object createNewInstance() { @@ -143,10 +130,8 @@ public abstract class AbstractSchemaHelper implements SchemaHelper { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.SchemaHelper#createNewInstance(java.lang.String) + /** + * {@inheritDoc}. */ @Override public Object createNewInstance(final String stringValue) { @@ -172,8 +157,8 @@ public abstract class AbstractSchemaHelper implements SchemaHelper { } } - /* (non-Javadoc) - * @see org.onap.policy.apex.context.SchemaHelper#createNewSubInstance(java.lang.String) + /** + * {@inheritDoc}. */ @Override public Object createNewSubInstance(String subType) { diff --git a/context/context-management/src/main/java/org/onap/policy/apex/context/impl/schema/java/JavaSchemaHelper.java b/context/context-management/src/main/java/org/onap/policy/apex/context/impl/schema/java/JavaSchemaHelper.java index 407239ae8..a8fedf24a 100644 --- a/context/context-management/src/main/java/org/onap/policy/apex/context/impl/schema/java/JavaSchemaHelper.java +++ b/context/context-management/src/main/java/org/onap/policy/apex/context/impl/schema/java/JavaSchemaHelper.java @@ -67,11 +67,8 @@ public class JavaSchemaHelper extends AbstractSchemaHelper { } // @formatter:on - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.impl.schema.AbstractSchemaHelper#init(org.onap.policy.apex.model .basicmodel. - * concepts. AxKey, org.onap.policy.apex.model.contextmodel.concepts.AxContextSchema) + /** + * {@inheritDoc}. */ @Override public void init(final AxKey userKey, final AxContextSchema schema) { @@ -96,10 +93,8 @@ public class JavaSchemaHelper extends AbstractSchemaHelper { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.SchemaHelper#createNewInstance(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public Object createNewInstance(final Object incomingObject) { @@ -131,10 +126,8 @@ public class JavaSchemaHelper extends AbstractSchemaHelper { throw new ContextRuntimeException(returnString); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.SchemaHelper#object2SchemaObject(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public Object unmarshal(final Object object) { @@ -159,10 +152,8 @@ public class JavaSchemaHelper extends AbstractSchemaHelper { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.SchemaHelper#schemaObject2Json(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public String marshal2String(final Object schemaObject) { @@ -183,10 +174,8 @@ public class JavaSchemaHelper extends AbstractSchemaHelper { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.SchemaHelper#marshal2JsonElement(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public Object marshal2Object(final Object schemaObject) { diff --git a/context/context-management/src/main/java/org/onap/policy/apex/context/impl/schema/java/JavaSchemaHelperParameters.java b/context/context-management/src/main/java/org/onap/policy/apex/context/impl/schema/java/JavaSchemaHelperParameters.java index 7e6df77f3..2c57d4ea9 100644 --- a/context/context-management/src/main/java/org/onap/policy/apex/context/impl/schema/java/JavaSchemaHelperParameters.java +++ b/context/context-management/src/main/java/org/onap/policy/apex/context/impl/schema/java/JavaSchemaHelperParameters.java @@ -61,10 +61,8 @@ public class JavaSchemaHelperParameters extends SchemaHelperParameters { this.jsonAdapters = jsonAdapters; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.parameters.ApexParameterValidator#validate() + /** + * {@inheritDoc}. */ @Override public GroupValidationResult validate() { diff --git a/context/context-management/src/test/java/org/onap/policy/apex/context/impl/DummyContextAlbumImpl.java b/context/context-management/src/test/java/org/onap/policy/apex/context/impl/DummyContextAlbumImpl.java index 9109ec694..f080c1f09 100644 --- a/context/context-management/src/test/java/org/onap/policy/apex/context/impl/DummyContextAlbumImpl.java +++ b/context/context-management/src/test/java/org/onap/policy/apex/context/impl/DummyContextAlbumImpl.java @@ -38,90 +38,72 @@ import org.onap.policy.apex.model.contextmodel.concepts.AxContextAlbum; */ public class DummyContextAlbumImpl implements ContextAlbum { - /* - * (non-Javadoc) - * - * @see java.util.Map#clear() + /** + * {@inheritDoc}. */ @Override public void clear() { throw new NotImplementedException("Not Implemeted on dummy class"); } - /* - * (non-Javadoc) - * - * @see java.util.Map#containsKey(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean containsKey(Object key) { throw new NotImplementedException("Not Implemeted on dummy class"); } - /* - * (non-Javadoc) - * - * @see java.util.Map#containsValue(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean containsValue(Object value) { throw new NotImplementedException("Not Implemeted on dummy class"); } - /* - * (non-Javadoc) - * - * @see java.util.Map#entrySet() + /** + * {@inheritDoc}. */ @Override public Set<Entry<String, Object>> entrySet() { throw new NotImplementedException("Not Implemeted on dummy class"); } - /* - * (non-Javadoc) - * - * @see java.util.Map#get(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public Object get(Object key) { throw new NotImplementedException("Not Implemeted on dummy class"); } - /* - * (non-Javadoc) - * - * @see java.util.Map#isEmpty() + /** + * {@inheritDoc}. */ @Override public boolean isEmpty() { throw new NotImplementedException("Not Implemeted on dummy class"); } - /* - * (non-Javadoc) - * - * @see java.util.Map#keySet() + /** + * {@inheritDoc}. */ @Override public Set<String> keySet() { throw new NotImplementedException("Not Implemeted 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 Implemeted on dummy class"); } - /* - * (non-Javadoc) - * - * @see java.util.Map#putAll(java.util.Map) + /** + * {@inheritDoc}. */ @Override public void putAll(Map<? extends String, ? extends Object> map) { @@ -129,80 +111,64 @@ public class DummyContextAlbumImpl implements ContextAlbum { } - /* - * (non-Javadoc) - * - * @see java.util.Map#remove(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public Object remove(Object key) { throw new NotImplementedException("Not Implemeted on dummy class"); } - /* - * (non-Javadoc) - * - * @see java.util.Map#size() + /** + * {@inheritDoc}. */ @Override public int size() { throw new NotImplementedException("Not Implemeted on dummy class"); } - /* - * (non-Javadoc) - * - * @see java.util.Map#values() + /** + * {@inheritDoc}. */ @Override public Collection<Object> values() { throw new NotImplementedException("Not Implemeted on dummy class"); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.ContextAlbum#getKey() + /** + * {@inheritDoc}. */ @Override public AxArtifactKey getKey() { throw new NotImplementedException("Not Implemeted on dummy class"); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.ContextAlbum#getName() + /** + * {@inheritDoc}. */ @Override public String getName() { throw new NotImplementedException("Not Implemeted on dummy class"); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.ContextAlbum#getAlbumDefinition() + /** + * {@inheritDoc}. */ @Override public AxContextAlbum getAlbumDefinition() { throw new NotImplementedException("Not Implemeted on dummy class"); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.ContextAlbum#getSchemaHelper() + /** + * {@inheritDoc}. */ @Override public SchemaHelper getSchemaHelper() { throw new NotImplementedException("Not Implemeted 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 { @@ -210,10 +176,8 @@ public class DummyContextAlbumImpl implements ContextAlbum { } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.ContextAlbum#lockForWriting(java.lang.String) + /** + * {@inheritDoc}. */ @Override public void lockForWriting(String key) throws ContextException { @@ -221,10 +185,8 @@ public class DummyContextAlbumImpl implements ContextAlbum { } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.ContextAlbum#unlockForReading(java.lang.String) + /** + * {@inheritDoc}. */ @Override public void unlockForReading(String key) throws ContextException { @@ -232,10 +194,8 @@ public class DummyContextAlbumImpl implements ContextAlbum { } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.ContextAlbum#unlockForWriting(java.lang.String) + /** + * {@inheritDoc}. */ @Override public void unlockForWriting(String key) throws ContextException { @@ -243,22 +203,16 @@ public class DummyContextAlbumImpl implements ContextAlbum { } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.ContextAlbum#getUserArtifactStack() + /** + * {@inheritDoc}. */ @Override public AxConcept[] getUserArtifactStack() { throw new NotImplementedException("Not Implemeted 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) { @@ -266,10 +220,8 @@ public class DummyContextAlbumImpl implements ContextAlbum { } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.ContextAlbum#flush() + /** + * {@inheritDoc}. */ @Override public void flush() throws ContextException { 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<Message> { - /* - * (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<ContextAlbum> { contextDistributor.clear(); } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { @@ -184,52 +182,40 @@ public class ApexInternalContext implements AxConceptGetter<ContextAlbum> { + ", 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<ContextAlbum> 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<ContextAlbum> 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<AxArtifactKey, Map<String, Object>> 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<String, Object> { 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<String, Object> { return item; } - /* - * (non-Javadoc) - * - * @see java.util.Map#values() + /** + * {@inheritDoc}. */ @Override public Collection<Object> values() { @@ -263,10 +259,8 @@ public class EnEvent extends HashMap<String, Object> { return valueList; } - /* - * (non-Javadoc) - * - * @see java.util.Map#entrySet() + /** + * {@inheritDoc}. */ @Override public Set<Map.Entry<String, Object>> entrySet() { @@ -281,10 +275,8 @@ public class EnEvent extends HashMap<String, Object> { 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<String, Object> { return super.put(key, valueToAssign); } - /* - * (non-Javadoc) - * - * @see java.util.Map#putAll(java.util.Map) + /** + * {@inheritDoc}. */ @Override public void putAll(final Map<? extends String, ? extends Object> incomingMap) { @@ -329,10 +319,8 @@ public class EnEvent extends HashMap<String, Object> { } } - /* - * (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<String, Object> { return removedValue; } - /* - * (non-Javadoc) - * - * @see java.util.Map#clear() + /** + * {@inheritDoc}. */ @Override public void clear() { @@ -370,10 +356,8 @@ public class EnEvent extends HashMap<String, Object> { } } - /* - * (non-Javadoc) - * - * @see java.util.AbstractMap#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { @@ -381,8 +365,8 @@ public class EnEvent extends HashMap<String, Object> { + super.toString() + "]"; } - /* (non-Javadoc) - * @see java.lang.Object#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -392,8 +376,8 @@ public class EnEvent extends HashMap<String, Object> { 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<AxKey> 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<Entry<String, Object>> 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<String> 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<? extends String, ? extends Object> 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<Object> 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<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() { 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() { diff --git a/examples/examples-aadm/src/test/java/org/onap/policy/apex/examples/aadm/TestApexActionListener.java b/examples/examples-aadm/src/test/java/org/onap/policy/apex/examples/aadm/TestApexActionListener.java index 60fa169dd..03372d745 100644 --- a/examples/examples-aadm/src/test/java/org/onap/policy/apex/examples/aadm/TestApexActionListener.java +++ b/examples/examples-aadm/src/test/java/org/onap/policy/apex/examples/aadm/TestApexActionListener.java @@ -61,11 +61,8 @@ public class TestApexActionListener implements EnEventListener { return resultEvents.remove(0); } - /* - * (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(final EnEvent actionEvent) { diff --git a/examples/examples-adaptive/src/main/java/org/onap/policy/apex/examples/adaptive/concepts/AnomalyDetection.java b/examples/examples-adaptive/src/main/java/org/onap/policy/apex/examples/adaptive/concepts/AnomalyDetection.java index 9dbfe266f..6ff5ebccc 100644 --- a/examples/examples-adaptive/src/main/java/org/onap/policy/apex/examples/adaptive/concepts/AnomalyDetection.java +++ b/examples/examples-adaptive/src/main/java/org/onap/policy/apex/examples/adaptive/concepts/AnomalyDetection.java @@ -174,10 +174,8 @@ public class AnomalyDetection implements Serializable { frequencyForecasted = null; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { @@ -185,10 +183,8 @@ public class AnomalyDetection implements Serializable { + anomalyScores + ", frequencyForecasted=" + frequencyForecasted + "]"; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -201,10 +197,8 @@ public class AnomalyDetection 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/examples/examples-adaptive/src/main/java/org/onap/policy/apex/examples/adaptive/concepts/AutoLearn.java b/examples/examples-adaptive/src/main/java/org/onap/policy/apex/examples/adaptive/concepts/AutoLearn.java index 968b20499..dd5bf0c45 100644 --- a/examples/examples-adaptive/src/main/java/org/onap/policy/apex/examples/adaptive/concepts/AutoLearn.java +++ b/examples/examples-adaptive/src/main/java/org/onap/policy/apex/examples/adaptive/concepts/AutoLearn.java @@ -133,20 +133,16 @@ public class AutoLearn implements Serializable { counts = null; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { return "AutoLearn [avDiffs=" + avDiffs + ", counts=" + counts + "]"; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -157,10 +153,8 @@ public class AutoLearn 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/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/TestApexActionListener.java b/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/TestApexActionListener.java index 006d3de6f..cd1327123 100644 --- a/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/TestApexActionListener.java +++ b/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/TestApexActionListener.java @@ -61,11 +61,8 @@ public class TestApexActionListener implements EnEventListener { return resultEvents.remove(0); } - /* - * (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(final EnEvent actionEvent) { diff --git a/examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/TestMfpModelCreator.java b/examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/TestMfpModelCreator.java index d77405d9e..540d1e341 100644 --- a/examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/TestMfpModelCreator.java +++ b/examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/TestMfpModelCreator.java @@ -31,40 +31,32 @@ import org.onap.policy.apex.model.policymodel.concepts.AxPolicyModel; */ public abstract class TestMfpModelCreator implements TestApexModelCreator<AxPolicyModel> { - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.test.TestApexModelCreator#getMalstructuredModel() + /** + * {@inheritDoc}. */ @Override public AxPolicyModel getMalstructuredModel() { return null; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.test.TestApexModelCreator#getObservationModel() + /** + * {@inheritDoc}. */ @Override public AxPolicyModel getObservationModel() { return null; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.test.TestApexModelCreator#getWarningModel() + /** + * {@inheritDoc}. */ @Override public AxPolicyModel getWarningModel() { return getModel(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.test.TestApexModelCreator#getInvalidModel() + /** + * {@inheritDoc}. */ @Override public AxPolicyModel getInvalidModel() { @@ -76,10 +68,8 @@ public abstract class TestMfpModelCreator implements TestApexModelCreator<AxPoli */ public static class TestMfp1ModelCreator extends TestMfpModelCreator { - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.handling.ApexModelCreator#getModel() + /** + * {@inheritDoc}. */ @Override public AxPolicyModel getModel() { @@ -92,15 +82,12 @@ public abstract class TestMfpModelCreator implements TestApexModelCreator<AxPoli */ public static class TestMfp2ModelCreator extends TestMfpModelCreator { - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.handling.ApexModelCreator#getModel() + /** + * {@inheritDoc}. */ @Override public AxPolicyModel getModel() { return new MfpDomainModelFactory().getMfp2PolicyModel(); } } - } diff --git a/examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/TestSaleAuthListener.java b/examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/TestSaleAuthListener.java index b2722fd78..3fce59c93 100644 --- a/examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/TestSaleAuthListener.java +++ b/examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/TestSaleAuthListener.java @@ -63,11 +63,8 @@ public class TestSaleAuthListener implements EnEventListener { return resultEvents.remove(0); } - /* - * (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(final EnEvent saleauthEvent) { diff --git a/examples/examples-onap-vcpe/src/test/java/org/onap/policy/apex/domains/onap/vcpe/AppcResponseCreator.java b/examples/examples-onap-vcpe/src/test/java/org/onap/policy/apex/domains/onap/vcpe/AppcResponseCreator.java index f5f2b2792..4a12b3baa 100644 --- a/examples/examples-onap-vcpe/src/test/java/org/onap/policy/apex/domains/onap/vcpe/AppcResponseCreator.java +++ b/examples/examples-onap-vcpe/src/test/java/org/onap/policy/apex/domains/onap/vcpe/AppcResponseCreator.java @@ -63,10 +63,8 @@ public class AppcResponseCreator { } private class AppcTimerTask extends TimerTask { - /* - * (non-Javadoc) - * - * @see java.util.TimerTask#run() + /** + * {@inheritDoc}. */ @Override public void run() { diff --git a/examples/examples-servlet/src/main/java/org/onap/policy/apex/examples/servlet/ApexServletListener.java b/examples/examples-servlet/src/main/java/org/onap/policy/apex/examples/servlet/ApexServletListener.java index 78871c385..859d1b00f 100644 --- a/examples/examples-servlet/src/main/java/org/onap/policy/apex/examples/servlet/ApexServletListener.java +++ b/examples/examples-servlet/src/main/java/org/onap/policy/apex/examples/servlet/ApexServletListener.java @@ -46,10 +46,8 @@ public class ApexServletListener implements ServletContextListener { // The Apex engine reference private ApexMain apexMain; - /* - * (non-Javadoc) - * - * @see javax.servlet.ServletContextListener#contextInitialized(javax.servlet.ServletContextEvent) + /** + * {@inheritDoc}. */ @Override public void contextInitialized(final ServletContextEvent servletContextEvent) { @@ -83,10 +81,8 @@ public class ApexServletListener implements ServletContextListener { } - /* - * (non-Javadoc) - * - * @see javax.servlet.ServletContextListener#contextDestroyed(javax.servlet.ServletContextEvent) + /** + * {@inheritDoc}. */ @Override public void contextDestroyed(final ServletContextEvent servletContextEvent) { diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxArtifactKey.java b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxArtifactKey.java index 9b1dd6293..ad0e3fe8f 100644 --- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxArtifactKey.java +++ b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxArtifactKey.java @@ -122,20 +122,16 @@ public class AxArtifactKey extends AxKey { return new AxArtifactKey(AxKey.NULL_KEY_NAME, AxKey.NULL_KEY_VERSION); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKey() + /** + * {@inheritDoc}. */ @Override public AxArtifactKey getKey() { return this; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKeys() + /** + * {@inheritDoc}. */ @Override public List<AxKey> getKeys() { @@ -144,10 +140,8 @@ public class AxArtifactKey extends AxKey { return keyList; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxKey#getID() + /** + * {@inheritDoc}. */ @Override public String getId() { @@ -190,11 +184,8 @@ public class AxArtifactKey extends AxKey { this.version = Assertions.validateStringParameter(VERSION_TOKEN, version, VERSION_REGEXP); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxKey#getCompatibility(org.onap.policy.apex.model.basicmodel. - * concepts.AxKey) + /** + * {@inheritDoc}. */ @Override public AxKey.Compatibility getCompatibility(final AxKey otherKey) { @@ -226,12 +217,8 @@ public class AxArtifactKey extends AxKey { return Compatibility.PATCH; } - /* - * (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(final AxKey otherKey) { @@ -245,12 +232,8 @@ public class AxArtifactKey extends AxKey { return !(compatibility == Compatibility.DIFFERENT || compatibility == Compatibility.MAJOR); } - /* - * (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(final AxValidationResult result) { @@ -271,10 +254,8 @@ public class AxArtifactKey extends AxKey { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#clean() + /** + * {@inheritDoc}. */ @Override public void clean() { @@ -282,10 +263,8 @@ public class AxArtifactKey extends AxKey { version = Assertions.validateStringParameter(VERSION_TOKEN, version, VERSION_REGEXP); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { @@ -300,12 +279,8 @@ public class AxArtifactKey extends AxKey { return builder.toString(); } - /* - * (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(final AxConcept target) { @@ -321,10 +296,8 @@ public class AxArtifactKey extends AxKey { return copyObject; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -335,10 +308,8 @@ public class AxArtifactKey extends AxKey { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#equals(java.lang. Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -360,10 +331,8 @@ public class AxArtifactKey extends AxKey { return version.equals(other.version); } - /* - * (non-Javadoc) - * - * @see java.lang.Comparable#compareTo(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public int compareTo(final AxConcept otherObj) { diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxConcept.java b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxConcept.java index e9aad675b..6eff2d806 100644 --- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxConcept.java +++ b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxConcept.java @@ -84,26 +84,20 @@ public abstract class AxConcept implements Serializable, Comparable<AxConcept> { */ public abstract void clean(); - /* - * (non-Javadoc) - * - * @see java.lang.Object#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public abstract boolean equals(Object otherObject); - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() + /** + * {@inheritDoc}. */ @Override public abstract String toString(); - /* - * (non-Javadoc) - * - * @see java.lang.Object#hashCode() + /** + * {@inheritDoc}. */ @Override public abstract int hashCode(); diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxConceptGetterImpl.java b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxConceptGetterImpl.java index e9c878346..34c704c7b 100644 --- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxConceptGetterImpl.java +++ b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxConceptGetterImpl.java @@ -47,21 +47,16 @@ public class AxConceptGetterImpl<C> implements AxConceptGetter<C> { this.conceptMap = conceptMap; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.basicmodel.concepts.AxConceptGetter#get(org.onap.policy.apex.apex.core.basicmodel. - * concepts.AxArtifactKey) + /** + * {@inheritDoc}. */ @Override public C get(final AxArtifactKey conceptKey) { return conceptMap.get(conceptKey); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.basicmodel.concepts.AxConceptGetter#get(java.lang. String) + /** + * {@inheritDoc}. */ @Override public C get(final String conceptKeyName) { @@ -89,10 +84,8 @@ public class AxConceptGetterImpl<C> implements AxConceptGetter<C> { return conceptMap.get(foundKey); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.basicmodel.concepts.AxConceptGetter#get(java.lang. String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public C get(final String conceptKeyName, final String conceptKeyVersion) { @@ -105,20 +98,16 @@ public class AxConceptGetterImpl<C> implements AxConceptGetter<C> { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.basicmodel.concepts.AxConceptGetter#getAll(java. lang.String) + /** + * {@inheritDoc}. */ @Override public Set<C> getAll(final String conceptKeyName) { return getAll(conceptKeyName, null); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.basicmodel.concepts.AxConceptGetter#getAll(java. lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public Set<C> getAll(final String conceptKeyName, final String conceptKeyVersion) { diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKey.java b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKey.java index 5702a6577..743847358 100644 --- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKey.java +++ b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKey.java @@ -80,10 +80,8 @@ public abstract class AxKey extends AxConcept { super(copyConcept); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getID() + /** + * {@inheritDoc}. */ @Override public abstract String getId(); diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInfo.java b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInfo.java index 5bcd8727e..a60c609e2 100644 --- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInfo.java +++ b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInfo.java @@ -123,20 +123,16 @@ public class AxKeyInfo extends AxConcept { this.description = description.trim(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKey() + /** + * {@inheritDoc}. */ @Override public AxArtifactKey getKey() { return key; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKeys() + /** + * {@inheritDoc}. */ @Override public List<AxKey> getKeys() { @@ -191,12 +187,8 @@ public class AxKeyInfo extends AxConcept { this.description = description.trim(); } - /* - * (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(final AxValidationResult resultIn) { @@ -222,10 +214,8 @@ public class AxKeyInfo extends AxConcept { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#clean() + /** + * {@inheritDoc}. */ @Override public void clean() { @@ -233,10 +223,8 @@ public class AxKeyInfo extends AxConcept { description = description.trim(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { @@ -253,12 +241,8 @@ public class AxKeyInfo extends AxConcept { return builder.toString(); } - /* - * (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(final AxConcept target) { @@ -275,10 +259,8 @@ public class AxKeyInfo extends AxConcept { return copy; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -290,10 +272,8 @@ public class AxKeyInfo extends AxConcept { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#equals(java.lang. Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -319,10 +299,8 @@ public class AxKeyInfo extends AxConcept { return thisdesc.equals(otherdesc); } - /* - * (non-Javadoc) - * - * @see java.lang.Comparable#compareTo(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public int compareTo(final AxConcept otherObj) { diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInformation.java b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInformation.java index 2b0594591..977cfcf4f 100644 --- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInformation.java +++ b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInformation.java @@ -159,20 +159,16 @@ public class AxKeyInformation extends AxConcept implements AxConceptGetter<AxKey } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKey() + /** + * {@inheritDoc}. */ @Override public AxArtifactKey getKey() { return key; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKeys() + /** + * {@inheritDoc}. */ @Override public List<AxKey> getKeys() { @@ -212,12 +208,8 @@ public class AxKeyInformation extends AxConcept implements AxConceptGetter<AxKey this.keyInfoMap.putAll(keyInfoMap); } - /* - * (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(final AxValidationResult resultIn) { @@ -281,10 +273,8 @@ public class AxKeyInformation extends AxConcept implements AxConceptGetter<AxKey return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#clean() + /** + * {@inheritDoc}. */ @Override public void clean() { @@ -295,10 +285,8 @@ public class AxKeyInformation extends AxConcept implements AxConceptGetter<AxKey } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { @@ -313,12 +301,8 @@ public class AxKeyInformation extends AxConcept implements AxConceptGetter<AxKey return builder.toString(); } - /* - * (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(final AxConcept target) { @@ -338,10 +322,8 @@ public class AxKeyInformation extends AxConcept implements AxConceptGetter<AxKey return copy; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -352,10 +334,8 @@ public class AxKeyInformation extends AxConcept implements AxConceptGetter<AxKey return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#equals(java.lang. Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -377,10 +357,8 @@ public class AxKeyInformation extends AxConcept implements AxConceptGetter<AxKey return keyInfoMap.equals(other.keyInfoMap); } - /* - * (non-Javadoc) - * - * @see java.lang.Comparable#compareTo(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public int compareTo(final AxConcept otherObj) { @@ -405,32 +383,24 @@ public class AxKeyInformation extends AxConcept implements AxConceptGetter<AxKey return 0; } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.core.basicmodel.concepts.AxConceptGetter#get(org.onap.policy.apex.core.basicmodel.concepts. - * AxArtifactKey) + /** + * {@inheritDoc}. */ @Override public AxKeyInfo get(final AxArtifactKey conceptKey) { return new AxConceptGetterImpl<>((NavigableMap<AxArtifactKey, AxKeyInfo>) keyInfoMap).get(conceptKey); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.basicmodel.concepts.AxConceptGetter#get(java.lang. String) + /** + * {@inheritDoc}. */ @Override public AxKeyInfo get(final String conceptKeyName) { return new AxConceptGetterImpl<>((NavigableMap<AxArtifactKey, AxKeyInfo>) keyInfoMap).get(conceptKeyName); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.basicmodel.concepts.AxConceptGetter#get(java.lang. String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public AxKeyInfo get(final String conceptKeyName, final String conceptKeyVersion) { @@ -438,20 +408,16 @@ public class AxKeyInformation extends AxConcept implements AxConceptGetter<AxKey conceptKeyVersion); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.basicmodel.concepts.AxConceptGetter#getAll(java. lang.String) + /** + * {@inheritDoc}. */ @Override public Set<AxKeyInfo> getAll(final String conceptKeyName) { return new AxConceptGetterImpl<>((NavigableMap<AxArtifactKey, AxKeyInfo>) keyInfoMap).getAll(conceptKeyName); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.basicmodel.concepts.AxConceptGetter#getAll(java. lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public Set<AxKeyInfo> getAll(final String conceptKeyName, final String conceptKeyVersion) { diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyUse.java b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyUse.java index b37519d41..aff688bf8 100644 --- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyUse.java +++ b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyUse.java @@ -65,30 +65,24 @@ public class AxKeyUse extends AxKey { this.usedKey = usedKey; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKey() + /** + * {@inheritDoc}. */ @Override public AxKey getKey() { return usedKey; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKeys() + /** + * {@inheritDoc}. */ @Override public List<AxKey> getKeys() { return usedKey.getKeys(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxKey#getID() + /** + * {@inheritDoc}. */ @Override public String getId() { @@ -105,35 +99,24 @@ public class AxKeyUse extends AxKey { this.usedKey = key; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxKey#getCompatibility(org.onap.policy.apex.model.basicmodel. - * concepts.AxKey) + /** + * {@inheritDoc}. */ @Override public AxKey.Compatibility getCompatibility(final AxKey otherKey) { return usedKey.getCompatibility(otherKey); } - /* - * (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(final AxKey otherKey) { return usedKey.isCompatible(otherKey); } - /* - * (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(final AxValidationResult result) { @@ -144,20 +127,16 @@ public class AxKeyUse extends AxKey { return usedKey.validate(result); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#clean() + /** + * {@inheritDoc}. */ @Override public void clean() { usedKey.clean(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { @@ -170,12 +149,8 @@ public class AxKeyUse extends AxKey { return builder.toString(); } - /* - * (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(final AxConcept target) { @@ -195,10 +170,8 @@ public class AxKeyUse extends AxKey { return copy; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -208,10 +181,8 @@ public class AxKeyUse extends AxKey { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#equals(java.lang. Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -230,10 +201,8 @@ public class AxKeyUse extends AxKey { return usedKey.equals(other.usedKey); } - /* - * (non-Javadoc) - * - * @see java.lang.Comparable#compareTo(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public int compareTo(final AxConcept otherObj) { diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxModel.java b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxModel.java index 1a604a3c4..03c578e21 100644 --- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxModel.java +++ b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxModel.java @@ -131,20 +131,16 @@ public class AxModel extends AxConcept { ModelService.registerModel(AxKeyInformation.class, getKeyInformation()); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKey() + /** + * {@inheritDoc}. */ @Override public AxArtifactKey getKey() { return key; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKeys() + /** + * {@inheritDoc}. */ @Override public List<AxKey> getKeys() { @@ -187,12 +183,8 @@ public class AxModel extends AxConcept { this.keyInformation = keyInformation; } - /* - * (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(final AxValidationResult resultIn) { @@ -366,10 +358,8 @@ public class AxModel extends AxConcept { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#clean() + /** + * {@inheritDoc}. */ @Override public void clean() { @@ -377,10 +367,8 @@ public class AxModel extends AxConcept { keyInformation.clean(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { @@ -395,12 +383,8 @@ public class AxModel extends AxConcept { return builder.toString(); } - /* - * (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(final AxConcept target) { @@ -416,10 +400,8 @@ public class AxModel extends AxConcept { return copy; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -430,10 +412,8 @@ public class AxModel extends AxConcept { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#equals(java.lang. Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -454,10 +434,8 @@ public class AxModel extends AxConcept { return keyInformation.equals(other.keyInformation); } - /* - * (non-Javadoc) - * - * @see java.lang.Comparable#compareTo(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public int compareTo(final AxConcept otherObj) { diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxReferenceKey.java b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxReferenceKey.java index 04d9e23f6..32fb76c99 100644 --- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxReferenceKey.java +++ b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxReferenceKey.java @@ -236,20 +236,16 @@ public class AxReferenceKey extends AxKey { AxKey.NULL_KEY_NAME); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKey() + /** + * {@inheritDoc}. */ @Override public AxReferenceKey getKey() { return this; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKeys() + /** + * {@inheritDoc}. */ @Override public List<AxKey> getKeys() { @@ -258,10 +254,8 @@ public class AxReferenceKey extends AxKey { return keyList; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxKey#getID() + /** + * {@inheritDoc}. */ @Override public String getId() { @@ -392,11 +386,8 @@ public class AxReferenceKey extends AxKey { this.localName = Assertions.validateStringParameter(LOCAL_NAME, localName, LOCAL_NAME_REGEXP); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxKey#getCompatibility(org.onap.policy.apex.model.basicmodel. - * concepts.AxKey) + /** + * {@inheritDoc}. */ @Override public AxKey.Compatibility getCompatibility(final AxKey otherKey) { @@ -408,12 +399,8 @@ public class AxReferenceKey extends AxKey { return this.getParentArtifactKey().getCompatibility(otherReferenceKey.getParentArtifactKey()); } - /* - * (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(final AxKey otherKey) { @@ -425,12 +412,8 @@ public class AxReferenceKey extends AxKey { return this.getParentArtifactKey().isCompatible(otherReferenceKey.getParentArtifactKey()); } - /* - * (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(final AxValidationResult result) { @@ -465,10 +448,8 @@ public class AxReferenceKey extends AxKey { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#clean() + /** + * {@inheritDoc}. */ @Override public void clean() { @@ -478,10 +459,8 @@ public class AxReferenceKey extends AxKey { localName = Assertions.validateStringParameter(LOCAL_NAME, localName, LOCAL_NAME_REGEXP); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { @@ -500,12 +479,8 @@ public class AxReferenceKey extends AxKey { return builder.toString(); } - /* - * (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(final AxConcept target) { @@ -523,10 +498,8 @@ public class AxReferenceKey extends AxKey { return copy; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -539,10 +512,8 @@ public class AxReferenceKey extends AxKey { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#equals(java.lang. Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -572,10 +543,8 @@ public class AxReferenceKey extends AxKey { return localName.equals(other.localName); } - /* - * (non-Javadoc) - * - * @see java.lang.Comparable#compareTo(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public int compareTo(final AxConcept otherObj) { diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxValidationMessage.java b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxValidationMessage.java index c98ce5178..9e245c07b 100644 --- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxValidationMessage.java +++ b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxValidationMessage.java @@ -94,10 +94,8 @@ public class AxValidationMessage { return message; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxValidationResult.java b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxValidationResult.java index dbe4c6a75..10ccb30aa 100644 --- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxValidationResult.java +++ b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxValidationResult.java @@ -112,10 +112,8 @@ public class AxValidationResult { } } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/dao/DaoParameters.java b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/dao/DaoParameters.java index cdaf64ed0..c575bd7c0 100644 --- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/dao/DaoParameters.java +++ b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/dao/DaoParameters.java @@ -112,10 +112,8 @@ public class DaoParameters { jdbcProperties.setProperty(key, value); } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/dao/converters/CDataConditioner.java b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/dao/converters/CDataConditioner.java index 93c891b13..460714683 100644 --- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/dao/converters/CDataConditioner.java +++ b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/dao/converters/CDataConditioner.java @@ -35,40 +35,32 @@ public class CDataConditioner extends XmlAdapter<String, String> implements Attr private static final String NL = "\n"; - /* - * (non-Javadoc) - * - * @see javax.persistence.AttributeConverter#convertToDatabaseColumn(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public String convertToDatabaseColumn(final String raw) { return clean(raw); } - /* - * (non-Javadoc) - * - * @see javax.persistence.AttributeConverter#convertToEntityAttribute(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public String convertToEntityAttribute(final String db) { return clean(db); } - /* - * (non-Javadoc) - * - * @see javax.xml.bind.annotation.adapters.XmlAdapter + /** + * {@inheritDoc}. */ @Override public String unmarshal(final String value) throws Exception { return this.convertToEntityAttribute(value); } - /* - * (non-Javadoc) - * - * @see javax.xml.bind.annotation.adapters.XmlAdapter + /** + * {@inheritDoc}. */ @Override public String marshal(final String value) throws Exception { diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/dao/converters/Uuid2String.java b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/dao/converters/Uuid2String.java index 3f7bddbd1..37943ff56 100644 --- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/dao/converters/Uuid2String.java +++ b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/dao/converters/Uuid2String.java @@ -34,10 +34,8 @@ import javax.xml.bind.annotation.adapters.XmlAdapter; @Converter public class Uuid2String extends XmlAdapter<String, UUID> implements AttributeConverter<UUID, String> { - /* - * (non-Javadoc) - * - * @see javax.persistence.AttributeConverter#convertToDatabaseColumn(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public String convertToDatabaseColumn(final UUID uuid) { @@ -51,30 +49,24 @@ public class Uuid2String extends XmlAdapter<String, UUID> implements AttributeCo return returnString; } - /* - * (non-Javadoc) - * - * @see javax.persistence.AttributeConverter#convertToEntityAttribute(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public UUID convertToEntityAttribute(final String uuidString) { return UUID.fromString(uuidString); } - /* - * (non-Javadoc) - * - * @see javax.xml.bind.annotation.adapters.XmlAdapter + /** + * {@inheritDoc}. */ @Override public UUID unmarshal(final String value) throws Exception { return this.convertToEntityAttribute(value); } - /* - * (non-Javadoc) - * - * @see javax.xml.bind.annotation.adapters.XmlAdapter + /** + * {@inheritDoc}. */ @Override public String marshal(final UUID value) throws Exception { diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/dao/impl/DefaultApexDao.java b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/dao/impl/DefaultApexDao.java index 7945a0837..693284dd0 100644 --- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/dao/impl/DefaultApexDao.java +++ b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/dao/impl/DefaultApexDao.java @@ -59,11 +59,8 @@ public class DefaultApexDao implements ApexDao { // Entity manager for JPA private EntityManagerFactory emf = null; - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.model.basicmodel.dao.ApexDao#init(org.onap.policy.apex.model.basicmodel.dao.DAOParameters) + /** + * {@inheritDoc}. */ @Override public void init(final DaoParameters daoParameters) throws ApexException { @@ -99,10 +96,8 @@ public class DefaultApexDao implements ApexDao { return emf.createEntityManager(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.dao.ApexDao#close() + /** + * {@inheritDoc}. */ @Override public final void close() { @@ -111,11 +106,8 @@ public class DefaultApexDao implements ApexDao { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.dao.ApexDao#create(org.onap.policy.apex.model.basicmodel.concepts. - * AxConcept) + /** + * {@inheritDoc}. */ @Override public <T extends AxConcept> void create(final T obj) { @@ -132,11 +124,8 @@ public class DefaultApexDao implements ApexDao { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.dao.ApexDao#delete(org.onap.policy.apex.model.basicmodel.concepts. - * AxConcept) + /** + * {@inheritDoc}. */ @Override public <T extends AxConcept> void delete(final T obj) { @@ -153,11 +142,8 @@ public class DefaultApexDao implements ApexDao { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.dao.ApexDao#delete(java.lang.Class, - * org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey) + /** + * {@inheritDoc}. */ @Override public <T extends AxConcept> void delete(final Class<T> someClass, final AxArtifactKey key) { @@ -175,11 +161,8 @@ public class DefaultApexDao implements ApexDao { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.dao.ApexDao#delete(java.lang.Class, - * org.onap.policy.apex.model.basicmodel.concepts.AxReferenceKey) + /** + * {@inheritDoc}. */ @Override public <T extends AxConcept> void delete(final Class<T> someClass, final AxReferenceKey key) { @@ -198,10 +181,8 @@ public class DefaultApexDao implements ApexDao { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.dao.ApexDao#create(java.util.Collection) + /** + * {@inheritDoc}. */ @Override public <T extends AxConcept> void createCollection(final Collection<T> objs) { @@ -220,10 +201,8 @@ public class DefaultApexDao implements ApexDao { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.dao.ApexDao#delete(java.util.Collection) + /** + * {@inheritDoc}. */ @Override public <T extends AxConcept> void deleteCollection(final Collection<T> objs) { @@ -242,10 +221,8 @@ public class DefaultApexDao implements ApexDao { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.dao.ApexDao#deleteByArtifactKey(java.lang.Class, java.util.Collection) + /** + * {@inheritDoc}. */ @Override public <T extends AxConcept> int deleteByArtifactKey(final Class<T> someClass, @@ -270,11 +247,8 @@ public class DefaultApexDao implements ApexDao { return deletedCount; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.dao.ApexDao#deleteByReferenceKey(java.lang.Class, - * java.util.Collection) + /** + * {@inheritDoc}. */ @Override public <T extends AxConcept> int deleteByReferenceKey(final Class<T> someClass, @@ -298,10 +272,8 @@ public class DefaultApexDao implements ApexDao { return deletedCount; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.dao.ApexDao#deleteAll(java.lang.Class) + /** + * {@inheritDoc}. */ @Override public <T extends AxConcept> void deleteAll(final Class<T> someClass) { @@ -315,11 +287,8 @@ public class DefaultApexDao implements ApexDao { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.dao.ApexDao#get(java.lang.Class, - * org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey) + /** + * {@inheritDoc}. */ @Override public <T extends AxConcept> T get(final Class<T> someClass, final AxArtifactKey key) { @@ -347,11 +316,8 @@ public class DefaultApexDao implements ApexDao { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.dao.ApexDao#get(java.lang.Class, - * org.onap.policy.apex.model.basicmodel.concepts.AxReferenceKey) + /** + * {@inheritDoc}. */ @Override public <T extends AxConcept> T get(final Class<T> someClass, final AxReferenceKey key) { @@ -378,10 +344,8 @@ public class DefaultApexDao implements ApexDao { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.dao.ApexDao#getAll(java.lang.Class) + /** + * {@inheritDoc}. */ @Override public <T extends AxConcept> List<T> getAll(final Class<T> someClass) { @@ -396,11 +360,8 @@ public class DefaultApexDao implements ApexDao { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.dao.ApexDao#getAll(java.lang.Class, - * org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey) + /** + * {@inheritDoc}. */ @Override public <T extends AxConcept> List<T> getAll(final Class<T> someClass, final AxArtifactKey parentKey) { @@ -417,11 +378,8 @@ public class DefaultApexDao implements ApexDao { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.dao.ApexDao#getArtifact(java.lang.Class, - * org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey) + /** + * {@inheritDoc}. */ @Override public <T extends AxConcept> T getArtifact(final Class<T> someClass, final AxArtifactKey key) { @@ -446,11 +404,8 @@ public class DefaultApexDao implements ApexDao { return ret.get(0); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.dao.ApexDao#getArtifact(java.lang.Class, - * org.onap.policy.apex.model.basicmodel.concepts.AxReferenceKey) + /** + * {@inheritDoc}. */ @Override public <T extends AxConcept> T getArtifact(final Class<T> someClass, final AxReferenceKey key) { @@ -476,11 +431,8 @@ public class DefaultApexDao implements ApexDao { return ret.get(0); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.dao.ApexDao#update(org.onap.policy.apex.model.basicmodel.concepts. - * AxConcept) + /** + * {@inheritDoc}. */ @Override public <T extends AxConcept> T update(final T obj) { @@ -497,10 +449,8 @@ public class DefaultApexDao implements ApexDao { return ret; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.dao.ApexDao#size(java.lang.Class) + /** + * {@inheritDoc}. */ @Override public <T extends AxConcept> long size(final Class<T> someClass) { diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexSchemaGenerator.java b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexSchemaGenerator.java index 46e30bf10..a793a60d5 100644 --- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexSchemaGenerator.java +++ b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexSchemaGenerator.java @@ -140,10 +140,8 @@ public class ApexSchemaGenerator { private class ApexSchemaOutputResolver extends SchemaOutputResolver { private final StringWriter stringWriter = new StringWriter(); - /* - * (non-Javadoc) - * - * @see javax.xml.bind.SchemaOutputResolver#createOutput(java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public Result createOutput(final String namespaceUri, final String suggestedFileName) throws IOException { diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/xml/AxReferenceKeyAdapter.java b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/xml/AxReferenceKeyAdapter.java index 28f0cf7af..c70e51ab2 100644 --- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/xml/AxReferenceKeyAdapter.java +++ b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/xml/AxReferenceKeyAdapter.java @@ -39,20 +39,16 @@ public class AxReferenceKeyAdapter extends XmlAdapter<String, AxReferenceKey> im private static final long serialVersionUID = -3480405083900107029L; - /* - * (non-Javadoc) - * - * @see javax.xml.bind.annotation.adapters.XmlAdapter#marshal(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public final String marshal(final AxReferenceKey key) throws Exception { return key.getLocalName(); } - /* - * (non-Javadoc) - * - * @see javax.xml.bind.annotation.adapters.XmlAdapter#unmarshal(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public final AxReferenceKey unmarshal(final String key) throws Exception { diff --git a/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextAlbum.java b/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextAlbum.java index 7dddc4099..7e15003a0 100644 --- a/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextAlbum.java +++ b/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextAlbum.java @@ -163,20 +163,16 @@ public class AxContextAlbum extends AxConcept { this.itemSchema = itemSchema; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKey() + /** + * {@inheritDoc}. */ @Override public AxArtifactKey getKey() { return key; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKeys() + /** + * {@inheritDoc}. */ @Override public List<AxKey> getKeys() { @@ -252,11 +248,8 @@ public class AxContextAlbum extends AxConcept { this.itemSchema = itemSchema; } - /* - * (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(final AxValidationResult resultIn) { @@ -288,10 +281,8 @@ public class AxContextAlbum extends AxConcept { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#clean() + /** + * {@inheritDoc}. */ @Override public void clean() { @@ -300,10 +291,8 @@ public class AxContextAlbum extends AxConcept { itemSchema.clean(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { @@ -322,11 +311,8 @@ public class AxContextAlbum extends AxConcept { return builder.toString(); } - /* - * (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(final AxConcept target) { @@ -344,10 +330,8 @@ public class AxContextAlbum extends AxConcept { return copy; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -360,10 +344,8 @@ public class AxContextAlbum extends AxConcept { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -391,10 +373,8 @@ public class AxContextAlbum extends AxConcept { return itemSchema.equals(other.itemSchema); } - /* - * (non-Javadoc) - * - * @see java.lang.Comparable#compareTo(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public int compareTo(final AxConcept otherObj) { diff --git a/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextAlbums.java b/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextAlbums.java index ddf363ed3..cbd923b6c 100644 --- a/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextAlbums.java +++ b/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextAlbums.java @@ -146,20 +146,16 @@ public final class AxContextAlbums extends AxConcept implements AxConceptGetter< albums = navigableAlbums; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKey() + /** + * {@inheritDoc}. */ @Override public AxArtifactKey getKey() { return key; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKeys() + /** + * {@inheritDoc}. */ @Override public List<AxKey> getKeys() { @@ -202,10 +198,8 @@ public final class AxContextAlbums extends AxConcept implements AxConceptGetter< this.albums.putAll(albumsMap); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#clean() + /** + * {@inheritDoc}. */ @Override public void clean() { @@ -216,10 +210,8 @@ public final class AxContextAlbums extends AxConcept implements AxConceptGetter< } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { @@ -236,11 +228,8 @@ public final class AxContextAlbums extends AxConcept implements AxConceptGetter< return builder.toString(); } - /* - * (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(final AxValidationResult resultIn) { @@ -286,11 +275,8 @@ public final class AxContextAlbums extends AxConcept implements AxConceptGetter< } } - /* - * (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(final AxConcept target) { @@ -311,10 +297,8 @@ public final class AxContextAlbums extends AxConcept implements AxConceptGetter< return copy; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -325,10 +309,8 @@ public final class AxContextAlbums extends AxConcept implements AxConceptGetter< return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -350,10 +332,8 @@ public final class AxContextAlbums extends AxConcept implements AxConceptGetter< return albums.equals(other.albums); } - /* - * (non-Javadoc) - * - * @see java.lang.Comparable#compareTo(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public int compareTo(final AxConcept otherObj) { @@ -378,31 +358,24 @@ public final class AxContextAlbums extends AxConcept implements AxConceptGetter< return 0; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConceptGetter#get(org.onap.policy.apex. - * model.basicmodel.concepts.AxArtifactKey) + /** + * {@inheritDoc}. */ @Override public AxContextAlbum get(final AxArtifactKey conceptKey) { return new AxConceptGetterImpl<>((NavigableMap<AxArtifactKey, AxContextAlbum>) albums).get(conceptKey); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConceptGetter#get(java.lang.String) + /** + * {@inheritDoc}. */ @Override public AxContextAlbum get(final String conceptKeyName) { return new AxConceptGetterImpl<>((NavigableMap<AxArtifactKey, AxContextAlbum>) albums).get(conceptKeyName); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConceptGetter#get(java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public AxContextAlbum get(final String conceptKeyName, final String conceptKeyVersion) { @@ -410,20 +383,16 @@ public final class AxContextAlbums extends AxConcept implements AxConceptGetter< conceptKeyVersion); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConceptGetter#getAll(java.lang.String) + /** + * {@inheritDoc}. */ @Override public Set<AxContextAlbum> getAll(final String conceptKeyName) { return new AxConceptGetterImpl<>((NavigableMap<AxArtifactKey, AxContextAlbum>) albums).getAll(conceptKeyName); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConceptGetter#getAll(java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public Set<AxContextAlbum> getAll(final String conceptKeyName, final String conceptKeyVersion) { diff --git a/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextModel.java b/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextModel.java index 17980ed65..da04aad83 100644 --- a/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextModel.java +++ b/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextModel.java @@ -140,10 +140,8 @@ public class AxContextModel extends AxModel { this.albums = albums; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxModel#register() + /** + * {@inheritDoc}. */ @Override public void register() { @@ -152,10 +150,8 @@ public class AxContextModel extends AxModel { ModelService.registerModel(AxContextAlbums.class, getAlbums()); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxModel#getKeys() + /** + * {@inheritDoc}. */ @Override public List<AxKey> getKeys() { @@ -205,11 +201,8 @@ public class AxContextModel extends AxModel { this.albums = albums; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxModel#validate(org.onap.policy.apex.model. - * basicmodel.concepts.AxValidationResult) + /** + * {@inheritDoc}. */ @Override public AxValidationResult validate(final AxValidationResult resultIn) { @@ -220,10 +213,8 @@ public class AxContextModel extends AxModel { return albums.validate(result); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxModel#clean() + /** + * {@inheritDoc}. */ @Override public void clean() { @@ -232,10 +223,8 @@ public class AxContextModel extends AxModel { albums.clean(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxModel#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { @@ -251,11 +240,8 @@ public class AxContextModel extends AxModel { return builder.toString(); } - /* - * (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(final AxConcept target) { @@ -272,10 +258,8 @@ public class AxContextModel extends AxModel { return copy; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxModel#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -287,10 +271,8 @@ public class AxContextModel extends AxModel { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxModel#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -315,11 +297,8 @@ public class AxContextModel extends AxModel { return albums.equals(other.albums); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxModel#compareTo(org.onap.policy.apex.model. - * basicmodel.concepts.AxConcept) + /** + * {@inheritDoc}. */ @Override public int compareTo(final AxConcept otherObj) { diff --git a/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchema.java b/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchema.java index f2e3dc3cf..17629605e 100644 --- a/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchema.java +++ b/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchema.java @@ -145,20 +145,16 @@ public class AxContextSchema extends AxConcept { this.schemaDefinition = schemaDefinition.replaceAll(WHITESPACE_REGEXP, ""); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKey() + /** + * {@inheritDoc}. */ @Override public AxArtifactKey getKey() { return key; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKeys() + /** + * {@inheritDoc}. */ @Override public List<AxKey> getKeys() { @@ -212,11 +208,8 @@ public class AxContextSchema extends AxConcept { this.schemaDefinition = schema.replaceAll(WHITESPACE_REGEXP, ""); } - /* - * (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(final AxValidationResult resultIn) { @@ -250,10 +243,8 @@ public class AxContextSchema extends AxConcept { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#clean() + /** + * {@inheritDoc}. */ @Override public void clean() { @@ -262,10 +253,8 @@ public class AxContextSchema extends AxConcept { schemaDefinition = schemaDefinition.replaceAll(WHITESPACE_REGEXP, ""); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { @@ -282,11 +271,8 @@ public class AxContextSchema extends AxConcept { return builder.toString(); } - /* - * (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(final AxConcept target) { @@ -303,10 +289,8 @@ public class AxContextSchema extends AxConcept { return copy; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -318,10 +302,8 @@ public class AxContextSchema extends AxConcept { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -349,10 +331,8 @@ public class AxContextSchema extends AxConcept { return thisSchema.equals(otherSchema); } - /* - * (non-Javadoc) - * - * @see java.lang.Comparable#compareTo(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public int compareTo(final AxConcept otherObj) { diff --git a/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchemas.java b/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchemas.java index b2456bfbf..5bd0c1f5e 100644 --- a/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchemas.java +++ b/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchemas.java @@ -145,20 +145,16 @@ public class AxContextSchemas extends AxConcept implements AxConceptGetter<AxCon schemas = navigableContextSchemas; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKey() + /** + * {@inheritDoc}. */ @Override public AxArtifactKey getKey() { return key; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKeys() + /** + * {@inheritDoc}. */ @Override public List<AxKey> getKeys() { @@ -199,11 +195,8 @@ public class AxContextSchemas extends AxConcept implements AxConceptGetter<AxCon this.schemas.putAll(schemasMap); } - /* - * (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(final AxValidationResult resultIn) { @@ -245,10 +238,8 @@ public class AxContextSchemas extends AxConcept implements AxConceptGetter<AxCon return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#clean() + /** + * {@inheritDoc}. */ @Override public void clean() { @@ -259,10 +250,8 @@ public class AxContextSchemas extends AxConcept implements AxConceptGetter<AxCon } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { @@ -277,11 +266,8 @@ public class AxContextSchemas extends AxConcept implements AxConceptGetter<AxCon return builder.toString(); } - /* - * (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(final AxConcept target) { @@ -303,10 +289,8 @@ public class AxContextSchemas extends AxConcept implements AxConceptGetter<AxCon return copy; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -317,10 +301,8 @@ public class AxContextSchemas extends AxConcept implements AxConceptGetter<AxCon return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -341,10 +323,8 @@ public class AxContextSchemas extends AxConcept implements AxConceptGetter<AxCon return schemas.equals(other.schemas); } - /* - * (non-Javadoc) - * - * @see java.lang.Comparable#compareTo(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public int compareTo(final AxConcept otherObj) { @@ -369,31 +349,24 @@ public class AxContextSchemas extends AxConcept implements AxConceptGetter<AxCon return 0; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.basicmodel.concepts.AxConceptGetter#get(org.onap.policy.apex.core. - * basicmodel.concepts.AxArtifactKey) + /** + * {@inheritDoc}. */ @Override public AxContextSchema get(final AxArtifactKey conceptKey) { return new AxConceptGetterImpl<>((NavigableMap<AxArtifactKey, AxContextSchema>) schemas).get(conceptKey); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.basicmodel.concepts.AxConceptGetter#get(java.lang.String) + /** + * {@inheritDoc}. */ @Override public AxContextSchema get(final String conceptKeyName) { return new AxConceptGetterImpl<>((NavigableMap<AxArtifactKey, AxContextSchema>) schemas).get(conceptKeyName); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.basicmodel.concepts.AxConceptGetter#get(java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public AxContextSchema get(final String conceptKeyName, final String conceptKeyVersion) { @@ -401,20 +374,16 @@ public class AxContextSchemas extends AxConcept implements AxConceptGetter<AxCon conceptKeyVersion); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.basicmodel.concepts.AxConceptGetter#getAll(java.lang.String) + /** + * {@inheritDoc}. */ @Override public Set<AxContextSchema> getAll(final String conceptKeyName) { return new AxConceptGetterImpl<>((NavigableMap<AxArtifactKey, AxContextSchema>) schemas).getAll(conceptKeyName); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.basicmodel.concepts.AxConceptGetter#getAll(java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public Set<AxContextSchema> getAll(final String conceptKeyName, final String conceptKeyVersion) { diff --git a/model/engine-model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineModel.java b/model/engine-model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineModel.java index 785845532..79c5d89d6 100644 --- a/model/engine-model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineModel.java +++ b/model/engine-model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineModel.java @@ -157,10 +157,8 @@ public class AxEngineModel extends AxContextModel { this.stats = stats; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.contextmodel.concepts.AxContextModel#getKeys() + /** + * {@inheritDoc}. */ @Override public List<AxKey> getKeys() { @@ -234,12 +232,8 @@ public class AxEngineModel extends AxContextModel { this.stats = stats; } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.model.contextmodel.concepts.AxContextModel#validate(org.onap.policy.apex - * .model .basicmodel.concepts.AxValidationResult) + /** + * {@inheritDoc}. */ @Override public AxValidationResult validate(final AxValidationResult resultIn) { @@ -260,10 +254,8 @@ public class AxEngineModel extends AxContextModel { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.contextmodel.concepts.AxContextModel#clean() + /** + * {@inheritDoc}. */ @Override public void clean() { @@ -271,10 +263,8 @@ public class AxEngineModel extends AxContextModel { stats.clean(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.contextmodel.concepts.AxContextModel#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { @@ -292,12 +282,8 @@ public class AxEngineModel extends AxContextModel { return builder.toString(); } - /* - * (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(final AxConcept targetObject) { @@ -315,10 +301,8 @@ public class AxEngineModel extends AxContextModel { return copy; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.contextmodel.concepts.AxContextModel#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -331,10 +315,8 @@ public class AxEngineModel extends AxContextModel { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.contextmodel.concepts.AxContextModel#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -363,12 +345,8 @@ public class AxEngineModel extends AxContextModel { return stats.equals(other.stats); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.model.contextmodel.concepts.AxContextModel#compareTo(org.onap.policy. - * apex.model.basicmodel.concepts.AxConcept) + /** + * {@inheritDoc}. */ @Override public int compareTo(final AxConcept otherObj) { diff --git a/model/engine-model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineStats.java b/model/engine-model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineStats.java index adda0c1f3..a66274431 100644 --- a/model/engine-model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineStats.java +++ b/model/engine-model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineStats.java @@ -152,20 +152,16 @@ public class AxEngineStats extends AxConcept { this.lastStart = lastStart; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKey() + /** + * {@inheritDoc}. */ @Override public AxReferenceKey getKey() { return key; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKeys() + /** + * {@inheritDoc}. */ @Override public List<AxKey> getKeys() { @@ -363,12 +359,8 @@ public class AxEngineStats extends AxConcept { this.setLastStart(0); } - /* - * (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(final AxValidationResult result) { @@ -380,20 +372,16 @@ public class AxEngineStats extends AxConcept { return key.validate(result); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#clean() + /** + * {@inheritDoc}. */ @Override public void clean() { key.clean(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { @@ -416,12 +404,8 @@ public class AxEngineStats extends AxConcept { return builder.toString(); } - /* - * (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(final AxConcept targetObject) { @@ -442,10 +426,8 @@ public class AxEngineStats extends AxConcept { return copy; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -461,10 +443,8 @@ public class AxEngineStats extends AxConcept { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -501,10 +481,8 @@ public class AxEngineStats extends AxConcept { return getLastStart() == other.getLastStart(); } - /* - * (non-Javadoc) - * - * @see java.lang.Comparable#compareTo(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public int compareTo(final AxConcept otherObj) { diff --git a/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEvent.java b/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEvent.java index c83b7b86a..74ba1f958 100644 --- a/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEvent.java +++ b/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEvent.java @@ -208,20 +208,16 @@ public class AxEvent extends AxConcept { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKey() + /** + * {@inheritDoc}. */ @Override public AxArtifactKey getKey() { return key; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKeys() + /** + * {@inheritDoc}. */ @Override public List<AxKey> getKeys() { @@ -332,12 +328,8 @@ public class AxEvent extends AxConcept { this.parameterMap = parameterMap; } - /* - * (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(final AxValidationResult resultIn) { @@ -405,10 +397,8 @@ public class AxEvent extends AxConcept { return eventParameterEntry.getValue().validate(result); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#clean() + /** + * {@inheritDoc}. */ @Override public void clean() { @@ -418,10 +408,8 @@ public class AxEvent extends AxConcept { target = target.trim(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { @@ -442,12 +430,8 @@ public class AxEvent extends AxConcept { return builder.toString(); } - /* - * (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(final AxConcept targetObject) { @@ -472,10 +456,8 @@ public class AxEvent extends AxConcept { return copy; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -489,10 +471,8 @@ public class AxEvent extends AxConcept { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -523,10 +503,8 @@ public class AxEvent extends AxConcept { return parameterMap.equals(other.parameterMap); } - /* - * (non-Javadoc) - * - * @see java.lang.Comparable#compareTo(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public int compareTo(final AxConcept otherObj) { diff --git a/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEventModel.java b/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEventModel.java index 69ae01acf..6c8ce15f1 100644 --- a/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEventModel.java +++ b/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEventModel.java @@ -124,10 +124,8 @@ public class AxEventModel extends AxModel { this.events = events; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxModel#register() + /** + * {@inheritDoc}. */ @Override public void register() { @@ -136,10 +134,8 @@ public class AxEventModel extends AxModel { ModelService.registerModel(AxEvents.class, getEvents()); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxModel#getKeys() + /** + * {@inheritDoc}. */ @Override public List<AxKey> getKeys() { @@ -189,12 +185,8 @@ public class AxEventModel extends AxModel { this.events = events; } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.model.basicmodel.concepts.AxModel#validate(org.onap.policy.apex.model.basicmodel.concepts. - * AxValidationResult) + /** + * {@inheritDoc}. */ @Override public AxValidationResult validate(final AxValidationResult resultIn) { @@ -205,10 +197,8 @@ public class AxEventModel extends AxModel { return events.validate(result); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxModel#clean() + /** + * {@inheritDoc}. */ @Override public void clean() { @@ -217,10 +207,8 @@ public class AxEventModel extends AxModel { events.clean(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxModel#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { @@ -236,12 +224,8 @@ public class AxEventModel extends AxModel { return builder.toString(); } - /* - * (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(final AxConcept targetObject) { @@ -258,10 +242,8 @@ public class AxEventModel extends AxModel { return copy; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxModel#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -273,10 +255,8 @@ public class AxEventModel extends AxModel { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxModel#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -301,12 +281,8 @@ public class AxEventModel extends AxModel { return events.equals(other.events); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.model.basicmodel.concepts.AxModel#compareTo(org.onap.policy.apex.model.basicmodel.concepts. - * AxConcept) + /** + * {@inheritDoc}. */ @Override public int compareTo(final AxConcept otherObj) { diff --git a/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEvents.java b/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEvents.java index 4ec3af3b3..3d0d9b7f2 100644 --- a/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEvents.java +++ b/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEvents.java @@ -143,20 +143,16 @@ public class AxEvents extends AxConcept implements AxConceptGetter<AxEvent> { eventMap = navigableEventMap; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKey() + /** + * {@inheritDoc}. */ @Override public AxArtifactKey getKey() { return key; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKeys() + /** + * {@inheritDoc}. */ @Override public List<AxKey> getKeys() { @@ -199,12 +195,8 @@ public class AxEvents extends AxConcept implements AxConceptGetter<AxEvent> { this.eventMap.putAll(eventMap); } - /* - * (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(final AxValidationResult resultIn) { @@ -245,10 +237,8 @@ public class AxEvents extends AxConcept implements AxConceptGetter<AxEvent> { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#clean() + /** + * {@inheritDoc}. */ @Override public void clean() { @@ -259,10 +249,8 @@ public class AxEvents extends AxConcept implements AxConceptGetter<AxEvent> { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { @@ -277,12 +265,8 @@ public class AxEvents extends AxConcept implements AxConceptGetter<AxEvent> { return builder.toString(); } - /* - * (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(final AxConcept targetObject) { @@ -302,10 +286,8 @@ public class AxEvents extends AxConcept implements AxConceptGetter<AxEvent> { return copy; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -316,10 +298,8 @@ public class AxEvents extends AxConcept implements AxConceptGetter<AxEvent> { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -341,10 +321,8 @@ public class AxEvents extends AxConcept implements AxConceptGetter<AxEvent> { return eventMap.equals(other.eventMap); } - /* - * (non-Javadoc) - * - * @see java.lang.Comparable#compareTo(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public int compareTo(final AxConcept otherObj) { @@ -369,31 +347,24 @@ public class AxEvents extends AxConcept implements AxConceptGetter<AxEvent> { return 0; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConceptGetter#get(org.onap.policy.apex.model.basicmodel. - * concepts. AxArtifactKey) + /** + * {@inheritDoc}. */ @Override public AxEvent get(final AxArtifactKey conceptKey) { return new AxConceptGetterImpl<>((NavigableMap<AxArtifactKey, AxEvent>) eventMap).get(conceptKey); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConceptGetter#get(java.lang.String) + /** + * {@inheritDoc}. */ @Override public AxEvent get(final String conceptKeyName) { return new AxConceptGetterImpl<>((NavigableMap<AxArtifactKey, AxEvent>) eventMap).get(conceptKeyName); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConceptGetter#get(java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public AxEvent get(final String conceptKeyName, final String conceptKeyVersion) { @@ -401,20 +372,16 @@ public class AxEvents extends AxConcept implements AxConceptGetter<AxEvent> { conceptKeyVersion); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConceptGetter#getAll(java.lang.String) + /** + * {@inheritDoc}. */ @Override public Set<AxEvent> getAll(final String conceptKeyName) { return new AxConceptGetterImpl<>((NavigableMap<AxArtifactKey, AxEvent>) eventMap).getAll(conceptKeyName); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConceptGetter#getAll(java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public Set<AxEvent> getAll(final String conceptKeyName, final String conceptKeyVersion) { diff --git a/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxField.java b/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxField.java index 300f6beb5..c3f9d3329 100644 --- a/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxField.java +++ b/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxField.java @@ -189,20 +189,16 @@ public class AxField extends AxConcept { this.optional = optional; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKey() + /** + * {@inheritDoc}. */ @Override public AxReferenceKey getKey() { return key; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKeys() + /** + * {@inheritDoc}. */ @Override public List<AxKey> getKeys() { @@ -258,12 +254,8 @@ public class AxField extends AxConcept { this.optional = optional; } - /* - * (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(final AxValidationResult resultIn) { @@ -283,10 +275,8 @@ public class AxField extends AxConcept { return fieldSchemaKey.validate(result); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#clean() + /** + * {@inheritDoc}. */ @Override public void clean() { @@ -294,10 +284,8 @@ public class AxField extends AxConcept { fieldSchemaKey.clean(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { @@ -314,12 +302,8 @@ public class AxField extends AxConcept { return builder.toString(); } - /* - * (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(final AxConcept targetObject) { @@ -335,10 +319,8 @@ public class AxField extends AxConcept { return copy; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -378,10 +360,8 @@ public class AxField extends AxConcept { return fieldSchemaKey.equals(other.fieldSchemaKey); } - /* - * (non-Javadoc) - * - * @see java.lang.Comparable#compareTo(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public int compareTo(final AxConcept otherObj) { diff --git a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/ApexApiResult.java b/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/ApexApiResult.java index 2b1dc5505..65bd84add 100644 --- a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/ApexApiResult.java +++ b/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/ApexApiResult.java @@ -280,10 +280,8 @@ public class ApexApiResult { return builder.toString(); } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { diff --git a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ApexModelImpl.java b/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ApexModelImpl.java index 6719dea99..77ded31d6 100644 --- a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ApexModelImpl.java +++ b/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ApexModelImpl.java @@ -83,10 +83,8 @@ public final class ApexModelImpl implements ApexModel { */ private ApexModelImpl() {} - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.modelapi.ApexModel#clone() + /** + * {@inheritDoc}. */ @Override public ApexModel clone() { @@ -109,11 +107,8 @@ public final class ApexModelImpl implements ApexModel { return ret; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.modelapi.ApexModel#createModel(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult createModel(final String name, final String version, final String uuid, @@ -121,11 +116,8 @@ public final class ApexModelImpl implements ApexModel { return modelFacade.createModel(name, version, uuid, description); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.modelapi.ApexModel#updateModel(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult updateModel(final String name, final String version, final String uuid, @@ -133,41 +125,32 @@ public final class ApexModelImpl implements ApexModel { return modelFacade.updateModel(name, version, uuid, description); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.modelapi.ApexEditorAPI#getModelKey() + /** + * {@inheritDoc}. */ @Override public ApexApiResult getModelKey() { return modelFacade.getModelKey(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#listModel() + /** + * {@inheritDoc}. */ @Override public ApexApiResult listModel() { return modelFacade.listModel(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#deleteModel() + /** + * {@inheritDoc}. */ @Override public ApexApiResult deleteModel() { return modelFacade.deleteModel(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#createKeyInformation(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult createKeyInformation(final String name, final String version, final String uuid, @@ -175,11 +158,8 @@ public final class ApexModelImpl implements ApexModel { return keyInformationFacade.createKeyInformation(name, version, uuid, description); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#updateKeyInformation(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult updateKeyInformation(final String name, final String version, final String uuid, @@ -187,44 +167,32 @@ public final class ApexModelImpl implements ApexModel { return keyInformationFacade.updateKeyInformation(name, version, uuid, description); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#listKeyInformation(java.lang.String, - * java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult listKeyInformation(final String name, final String version) { return keyInformationFacade.listKeyInformation(name, version); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#deleteKeyInformation(java.lang.String, - * java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult deleteKeyInformation(final String name, final String version) { return keyInformationFacade.deleteKeyInformation(name, version); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#validateKeyInformation(java.lang.String, - * java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult validateKeyInformation(final String name, final String version) { return keyInformationFacade.validateKeyInformation(name, version); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#createContextSchema(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult createContextSchema(final String name, final String version, final String schemaFlavour, @@ -233,11 +201,8 @@ public final class ApexModelImpl implements ApexModel { description); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#updateContextSchema(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult updateContextSchema(final String name, final String version, final String schemaFlavour, @@ -246,45 +211,32 @@ public final class ApexModelImpl implements ApexModel { description); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#listContextSchemas(java.lang.String, - * java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult listContextSchemas(final String name, final String version) { return contextSchemaFacade.listContextSchemas(name, version); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#deleteContextSchema(java.lang.String, - * java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult deleteContextSchema(final String name, final String version) { return contextSchemaFacade.deleteContextSchema(name, version); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#validateContextSchemas(java.lang.String, - * java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult validateContextSchemas(final String name, final String version) { return contextSchemaFacade.validateContextSchemas(name, version); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#createEvent(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, - * java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult createEvent(final String name, final String version, final String nameSpace, @@ -292,12 +244,8 @@ public final class ApexModelImpl implements ApexModel { return eventFacade.createEvent(name, version, nameSpace, source, target, uuid, description); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#updateEvent(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, - * java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult updateEvent(final String name, final String version, final String nameSpace, @@ -305,44 +253,32 @@ public final class ApexModelImpl implements ApexModel { return eventFacade.updateEvent(name, version, nameSpace, source, target, uuid, description); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#listEvent(java.lang.String, - * java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult listEvent(final String name, final String version) { return eventFacade.listEvent(name, version); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#deleteEvent(java.lang.String, - * java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult deleteEvent(final String name, final String version) { return eventFacade.deleteEvent(name, version); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#validateEvent(java.lang.String, - * java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult validateEvent(final String name, final String version) { return eventFacade.validateEvent(name, version); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.modelapi.ApexEditorAPI#createEventPar(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String, java.lang.String, boolean) + /** + * {@inheritDoc}. */ @Override public ApexApiResult createEventPar(final String name, final String version, final String parName, @@ -350,34 +286,24 @@ public final class ApexModelImpl implements ApexModel { return eventFacade.createEventPar(name, version, parName, contextSchemaName, contextSchemaVersion, optional); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#listEventPar(java.lang.String, - * java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult listEventPar(final String name, final String version, final String parName) { return eventFacade.listEventPar(name, version, parName); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#deleteEventPar(java.lang.String, - * java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult deleteEventPar(final String name, final String version, final String parName) { return eventFacade.deleteEventPar(name, version, parName); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.modelapi.ApexEditorAPI#createContextAlbum(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, - * java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override // CHECKSTYLE:OFF: checkstyle:parameterNumber @@ -390,12 +316,8 @@ public final class ApexModelImpl implements ApexModel { } // CHECKSTYLE:ON: checkstyle:parameterNumber - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.modelapi.ApexEditorAPI#updateContextAlbum(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, - * java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ // CHECKSTYLE:OFF: checkstyle:parameterNumber @Override @@ -408,44 +330,32 @@ public final class ApexModelImpl implements ApexModel { } // CHECKSTYLE:ON: checkstyle:parameterNumber - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#listContextAlbum(java.lang.String, - * java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult listContextAlbum(final String name, final String version) { return contextAlbumFacade.listContextAlbum(name, version); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#deleteContextAlbum(java.lang.String, - * java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult deleteContextAlbum(final String name, final String version) { return contextAlbumFacade.deleteContextAlbum(name, version); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#validateContextAlbum(java.lang.String, - * java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult validateContextAlbum(final String name, final String version) { return contextAlbumFacade.validateContextAlbum(name, version); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#createTask(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult createTask(final String name, final String version, final String uuid, @@ -453,11 +363,8 @@ public final class ApexModelImpl implements ApexModel { return taskFacade.createTask(name, version, uuid, description); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#updateTask(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult updateTask(final String name, final String version, final String uuid, @@ -465,43 +372,32 @@ public final class ApexModelImpl implements ApexModel { return taskFacade.updateTask(name, version, uuid, description); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#listTask(java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult listTask(final String name, final String version) { return taskFacade.listTask(name, version); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#deleteTask(java.lang.String, - * java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult deleteTask(final String name, final String version) { return taskFacade.deleteTask(name, version); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#validateTask(java.lang.String, - * java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult validateTask(final String name, final String version) { return taskFacade.validateTask(name, version); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#createTaskLogic(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult createTaskLogic(final String name, final String version, final String logicFlavour, @@ -509,11 +405,8 @@ public final class ApexModelImpl implements ApexModel { return taskFacade.createTaskLogic(name, version, logicFlavour, logic); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#updateTaskLogic(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult updateTaskLogic(final String name, final String version, final String logicFlavour, @@ -521,33 +414,24 @@ public final class ApexModelImpl implements ApexModel { return taskFacade.updateTaskLogic(name, version, logicFlavour, logic); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#listTaskLogic(java.lang.String, - * java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult listTaskLogic(final String name, final String version) { return taskFacade.listTaskLogic(name, version); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#deleteTaskLogic(java.lang.String, - * java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult deleteTaskLogic(final String name, final String version) { return taskFacade.deleteTaskLogic(name, version); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#createTaskInputField(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.boolean) + /** + * {@inheritDoc}. */ @Override public ApexApiResult createTaskInputField(final String name, final String version, final String fieldName, @@ -555,33 +439,24 @@ public final class ApexModelImpl implements ApexModel { return taskFacade.createTaskInputField(name, version, fieldName, dataTypeName, dataTypeVersion, optional); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#listTaskInputField(java.lang.String, - * java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult listTaskInputField(final String name, final String version, final String fieldName) { return taskFacade.listTaskInputField(name, version, fieldName); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#deleteTaskInputField(java.lang.String, - * java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult deleteTaskInputField(final String name, final String version, final String fieldName) { return taskFacade.deleteTaskInputField(name, version, fieldName); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#createTaskOutputField(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.boolean) + /** + * {@inheritDoc}. */ @Override public ApexApiResult createTaskOutputField(final String name, final String version, final String fieldName, @@ -589,33 +464,24 @@ public final class ApexModelImpl implements ApexModel { return taskFacade.createTaskOutputField(name, version, fieldName, dataTypeName, dataTypeVersion, optional); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#listTaskOutputField(java.lang.String, - * java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult listTaskOutputField(final String name, final String version, final String fieldName) { return taskFacade.listTaskOutputField(name, version, fieldName); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#deleteTaskOutputField(java.lang.String, - * java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult deleteTaskOutputField(final String name, final String version, final String fieldName) { return taskFacade.deleteTaskOutputField(name, version, fieldName); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#createTaskParameter(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult createTaskParameter(final String name, final String version, final String parName, @@ -623,33 +489,24 @@ public final class ApexModelImpl implements ApexModel { return taskFacade.createTaskParameter(name, version, parName, defaultValue); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#listTaskParameter(java.lang.String, - * java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult listTaskParameter(final String name, final String version, final String parName) { return taskFacade.listTaskParameter(name, version, parName); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#deleteTaskParameter(java.lang.String, - * java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult deleteTaskParameter(final String name, final String version, final String parName) { return taskFacade.deleteTaskParameter(name, version, parName); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#createTaskContextRef(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult createTaskContextRef(final String name, final String version, final String contextAlbumName, @@ -657,11 +514,8 @@ public final class ApexModelImpl implements ApexModel { return taskFacade.createTaskContextRef(name, version, contextAlbumName, contextAlbumVersion); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#listTaskContextRef(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult listTaskContextRef(final String name, final String version, final String contextAlbumName, @@ -669,11 +523,8 @@ public final class ApexModelImpl implements ApexModel { return taskFacade.listTaskContextRef(name, version, contextAlbumName, contextAlbumVersion); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#deleteTaskContextRef(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult deleteTaskContextRef(final String name, final String version, final String contextAlbumName, @@ -681,11 +532,8 @@ public final class ApexModelImpl implements ApexModel { return taskFacade.deleteTaskContextRef(name, version, contextAlbumName, contextAlbumVersion); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#createPolicy(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult createPolicy(final String name, final String version, final String template, @@ -693,11 +541,8 @@ public final class ApexModelImpl implements ApexModel { return policyFacade.createPolicy(name, version, template, firstState, uuid, description); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#updatePolicy(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult updatePolicy(final String name, final String version, final String template, @@ -705,45 +550,32 @@ public final class ApexModelImpl implements ApexModel { return policyFacade.updatePolicy(name, version, template, firstState, uuid, description); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#listPolicy(java.lang.String, - * java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult listPolicy(final String name, final String version) { return policyFacade.listPolicy(name, version); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#deletePolicy(java.lang.String, - * java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult deletePolicy(final String name, final String version) { return policyFacade.deletePolicy(name, version); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#validatePolicy(java.lang.String, - * java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult validatePolicy(final String name, final String version) { return policyFacade.validatePolicy(name, version); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#createPolicyState(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, - * java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult createPolicyState(final String name, final String version, final String stateName, @@ -753,12 +585,8 @@ public final class ApexModelImpl implements ApexModel { defaltTaskVersion); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#updatePolicyState(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, - * java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult updatePolicyState(final String name, final String version, final String stateName, @@ -768,34 +596,24 @@ public final class ApexModelImpl implements ApexModel { defaltTaskVersion); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#listPolicyState(java.lang.String, - * java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult listPolicyState(final String name, final String version, final String stateName) { return policyFacade.listPolicyState(name, version, stateName); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#deletePolicyState(java.lang.String, - * java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult deletePolicyState(final String name, final String version, final String stateName) { return policyFacade.deletePolicyState(name, version, stateName); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.auth.api.ApexEditorAPI#createPolicyStateTaskSelectionLogic(java.lang. - * String, java.lang.String, java.lang.String, java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult createPolicyStateTaskSelectionLogic(final String name, final String version, @@ -803,12 +621,8 @@ public final class ApexModelImpl implements ApexModel { return policyFacade.createPolicyStateTaskSelectionLogic(name, version, stateName, logicFlavour, logic); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.auth.api.ApexEditorAPI#updatePolicyStateTaskSelectionLogic(java.lang. - * String, java.lang.String, java.lang.String, java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult updatePolicyStateTaskSelectionLogic(final String name, final String version, @@ -816,11 +630,8 @@ public final class ApexModelImpl implements ApexModel { return policyFacade.updatePolicyStateTaskSelectionLogic(name, version, stateName, logicFlavour, logic); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#listPolicyStateTaskSelectionLogic(java.lang. - * String, java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult listPolicyStateTaskSelectionLogic(final String name, final String version, @@ -828,12 +639,8 @@ public final class ApexModelImpl implements ApexModel { return policyFacade.listPolicyStateTaskSelectionLogic(name, version, stateName); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.auth.api.ApexEditorAPI#deletePolicyStateTaskSelectionLogic(java.lang. - * String, java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult deletePolicyStateTaskSelectionLogic(final String name, final String version, @@ -841,12 +648,8 @@ public final class ApexModelImpl implements ApexModel { return policyFacade.deletePolicyStateTaskSelectionLogic(name, version, stateName); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#createPolicyStateOutput(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, - * java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult createPolicyStateOutput(final String name, final String version, final String stateName, @@ -855,11 +658,8 @@ public final class ApexModelImpl implements ApexModel { nextState); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#listPolicyStateOutput(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult listPolicyStateOutput(final String name, final String version, final String stateName, @@ -867,11 +667,8 @@ public final class ApexModelImpl implements ApexModel { return policyFacade.listPolicyStateOutput(name, version, stateName, outputName); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#deletePolicyStateOutput(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult deletePolicyStateOutput(final String name, final String version, final String stateName, @@ -879,13 +676,8 @@ public final class ApexModelImpl implements ApexModel { return policyFacade.deletePolicyStateOutput(name, version, stateName, outputName); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.core.modelapi.ApexEditorAPI#createPolicyStateFinalizerLogic(java.lang. - * String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, - * java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult createPolicyStateFinalizerLogic(final String name, final String version, @@ -894,13 +686,8 @@ public final class ApexModelImpl implements ApexModel { logic); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.core.modelapi.ApexEditorAPI#updatePolicyStateFinalizerLogic(java.lang. - * String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, - * java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult updatePolicyStateFinalizerLogic(final String name, final String version, @@ -909,12 +696,8 @@ public final class ApexModelImpl implements ApexModel { logic); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.core.modelapi.ApexEditorAPI#listPolicyStateFinalizerLogic(java.lang. - * String, java.lang.String, java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult listPolicyStateFinalizerLogic(final String name, final String version, final String stateName, @@ -922,12 +705,8 @@ public final class ApexModelImpl implements ApexModel { return policyFacade.listPolicyStateFinalizerLogic(name, version, stateName, finalizerLogicName); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.core.modelapi.ApexEditorAPI#deletePolicyStateFinalizerLogic(java.lang. - * String, java.lang.String, java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult deletePolicyStateFinalizerLogic(final String name, final String version, @@ -935,13 +714,8 @@ public final class ApexModelImpl implements ApexModel { return policyFacade.deletePolicyStateFinalizerLogic(name, version, stateName, finalizerLogicName); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.core.modelapi.ApexEditorAPI#createPolicyStateTaskRef(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, - * java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override // CHECKSTYLE:OFF: checkstyle:parameterNumber @@ -954,11 +728,8 @@ public final class ApexModelImpl implements ApexModel { } // CHECKSTYLE:ON: checkstyle:parameterNumber - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#listPolicyStateTaskRef(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult listPolicyStateTaskRef(final String name, final String version, final String stateName, @@ -966,11 +737,8 @@ public final class ApexModelImpl implements ApexModel { return policyFacade.listPolicyStateTaskRef(name, version, stateName, taskName, taskVersion); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#deletePolicyStateTaskRef(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult deletePolicyStateTaskRef(final String name, final String version, final String stateName, @@ -978,12 +746,8 @@ public final class ApexModelImpl implements ApexModel { return policyFacade.deletePolicyStateTaskRef(name, version, stateName, taskName, taskVersion); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.auth.api.ApexEditorAPI#createPolicyStateContextRef(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult createPolicyStateContextRef(final String name, final String version, final String stateName, @@ -992,11 +756,8 @@ public final class ApexModelImpl implements ApexModel { contextAlbumVersion); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#listPolicyStateContextRef(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult listPolicyStateContextRef(final String name, final String version, final String stateName, @@ -1004,12 +765,8 @@ public final class ApexModelImpl implements ApexModel { return policyFacade.listPolicyStateContextRef(name, version, stateName, contextAlbumName, contextAlbumVersion); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.auth.api.ApexEditorAPI#deletePolicyStateContextRef(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult deletePolicyStateContextRef(final String name, final String version, final String stateName, @@ -1018,20 +775,16 @@ public final class ApexModelImpl implements ApexModel { contextAlbumVersion); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.modelapi.ApexModel#loadFromString(java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult loadFromString(final String modelString) { return modelHandlerFacade.loadFromString(modelString); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexModel#loadFromFile(java.lang.String) + /** + * {@inheritDoc}. */ @Override // CHECKSTYLE:OFF: checkstyle:HiddenField @@ -1041,10 +794,8 @@ public final class ApexModelImpl implements ApexModel { } // CHECKSTYLE:ON: checkstyle:HiddenField - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexModel#saveToFile(java.lang.String, boolean) + /** + * {@inheritDoc}. */ @Override public ApexApiResult saveToFile(final String saveFileName, final boolean xmlFlag) { @@ -1055,11 +806,8 @@ public final class ApexModelImpl implements ApexModel { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.modelapi.ApexModel#loadFromDatabase(java.lang.String, - * java.lang.String, org.onap.policy.apex.model.basicmodel.dao.DaoParameters) + /** + * {@inheritDoc}. */ @Override public ApexApiResult loadFromDatabase(final String modelName, final String modelVersion, @@ -1067,72 +815,56 @@ public final class ApexModelImpl implements ApexModel { return modelHandlerFacade.loadFromDatabase(modelName, modelVersion, daoParameters); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.modelapi.ApexModel#saveToDatabase(org.onap.policy.apex.model. - * basicmodel. dao.DaoParameters) + /** + * {@inheritDoc}. */ @Override public ApexApiResult saveToDatabase(final DaoParameters daoParameters) { return modelHandlerFacade.saveToDatabase(daoParameters); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexModel#readFromURL(java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult readFromUrl(final String urlString) { return modelHandlerFacade.readFromUrl(urlString); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexModel#writeToURL(java.lang.String, boolean) + /** + * {@inheritDoc}. */ @Override public ApexApiResult writeToUrl(final String urlString, final boolean xmlFlag) { return modelHandlerFacade.writeToUrl(urlString, xmlFlag); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexModel#analyse() + /** + * {@inheritDoc}. */ @Override public ApexApiResult analyse() { return modelHandlerFacade.analyse(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexModel#validate() + /** + * {@inheritDoc}. */ @Override public ApexApiResult validate() { return modelHandlerFacade.validate(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexModel#compare(java.lang.String, boolean, boolean) + /** + * {@inheritDoc}. */ @Override public ApexApiResult compare(final String otherModelFileName, final boolean diffsOnly, final boolean keysOnly) { return modelHandlerFacade.compare(otherModelFileName, diffsOnly, keysOnly); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.modelapi.ApexModel#compareWithString(java.lang.String, - * boolean, boolean) + /** + * {@inheritDoc}. */ @Override public ApexApiResult compareWithString(final String otherModelString, final boolean diffsOnly, @@ -1140,72 +872,56 @@ public final class ApexModelImpl implements ApexModel { return modelHandlerFacade.compareWithString(otherModelString, diffsOnly, keysOnly); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexModel#split(java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult split(final String targetModelFileName, final String splitOutPolicies) { return modelHandlerFacade.split(targetModelFileName, splitOutPolicies); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.modelapi.ApexModel#split(java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult split(final String splitOutPolicies) { return modelHandlerFacade.split(splitOutPolicies); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexModel#merge(java.lang.String, boolean) + /** + * {@inheritDoc}. */ @Override public ApexApiResult merge(final String mergeInModelFileName, final boolean keepOriginal) { return modelHandlerFacade.merge(mergeInModelFileName, keepOriginal); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.modelapi.ApexModel#mergeWithString(java.lang.String, boolean) + /** + * {@inheritDoc}. */ @Override public ApexApiResult mergeWithString(final String otherModelString, final boolean keepOriginal) { return modelHandlerFacade.mergeWithString(otherModelString, keepOriginal); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexModel#getModel() + /** + * {@inheritDoc}. */ @Override public AxPolicyModel getPolicyModel() { return policyModel; } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.auth.api.ApexModel#setPolicyModel(org.onap.policy.apex.core.policymodel. - * concepts.AxPolicyModel) + /** + * {@inheritDoc}. */ @Override public void setPolicyModel(final AxPolicyModel policyModel) { this.policyModel = policyModel; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.modelapi.ApexModel#build() + /** + * {@inheritDoc}. */ @Override public AxPolicyModel build() { diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxLogic.java b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxLogic.java index 2fed326f9..f7680a772 100644 --- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxLogic.java +++ b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxLogic.java @@ -182,20 +182,16 @@ public class AxLogic extends AxConcept { logic = logicReader.readLogic(this); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKey() + /** + * {@inheritDoc}. */ @Override public AxReferenceKey getKey() { return key; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKeys() + /** + * {@inheritDoc}. */ @Override public List<AxKey> getKeys() { @@ -249,11 +245,8 @@ public class AxLogic extends AxConcept { this.logic = logic.replaceAll(WHITESPACE_REGEXP, ""); } - /* - * (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(final AxValidationResult resultIn) { @@ -287,10 +280,8 @@ public class AxLogic extends AxConcept { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#clean() + /** + * {@inheritDoc}. */ @Override public void clean() { @@ -301,10 +292,8 @@ public class AxLogic extends AxConcept { logic = logic.replaceAll(WHITESPACE_REGEXP, ""); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { @@ -321,11 +310,8 @@ public class AxLogic extends AxConcept { return builder.toString(); } - /* - * (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(final AxConcept targetObject) { @@ -342,10 +328,8 @@ public class AxLogic extends AxConcept { return copy; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -357,10 +341,8 @@ public class AxLogic extends AxConcept { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -386,10 +368,8 @@ public class AxLogic extends AxConcept { return thislogic.equals(otherlogic); } - /* - * (non-Javadoc) - * - * @see java.lang.Comparable#compareTo(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public int compareTo(final AxConcept otherObj) { diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicies.java b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicies.java index 493cf79c1..d6a7efb71 100644 --- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicies.java +++ b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicies.java @@ -145,20 +145,16 @@ public class AxPolicies extends AxConcept implements AxConceptGetter<AxPolicy> { policyMap = navigablePolicyMap; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKey() + /** + * {@inheritDoc}. */ @Override public AxArtifactKey getKey() { return key; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKeys() + /** + * {@inheritDoc}. */ @Override public List<AxKey> getKeys() { @@ -201,11 +197,8 @@ public class AxPolicies extends AxConcept implements AxConceptGetter<AxPolicy> { this.policyMap.putAll(policyMap); } - /* - * (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(final AxValidationResult resultIn) { @@ -249,10 +242,8 @@ public class AxPolicies extends AxConcept implements AxConceptGetter<AxPolicy> { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#clean() + /** + * {@inheritDoc}. */ @Override public void clean() { @@ -263,10 +254,8 @@ public class AxPolicies extends AxConcept implements AxConceptGetter<AxPolicy> { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { @@ -281,11 +270,8 @@ public class AxPolicies extends AxConcept implements AxConceptGetter<AxPolicy> { return builder.toString(); } - /* - * (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(final AxConcept targetObject) { @@ -306,10 +292,8 @@ public class AxPolicies extends AxConcept implements AxConceptGetter<AxPolicy> { return copy; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -320,10 +304,8 @@ public class AxPolicies extends AxConcept implements AxConceptGetter<AxPolicy> { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -345,10 +327,8 @@ public class AxPolicies extends AxConcept implements AxConceptGetter<AxPolicy> { return policyMap.equals(other.policyMap); } - /* - * (non-Javadoc) - * - * @see java.lang.Comparable#compareTo(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public int compareTo(final AxConcept otherObj) { @@ -373,31 +353,24 @@ public class AxPolicies extends AxConcept implements AxConceptGetter<AxPolicy> { return 0; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConceptGetter#get(org.onap.policy.apex.model - * .basicmodel.concepts.AxArtifactKey) + /** + * {@inheritDoc}. */ @Override public AxPolicy get(final AxArtifactKey conceptKey) { return new AxConceptGetterImpl<>((NavigableMap<AxArtifactKey, AxPolicy>) policyMap).get(conceptKey); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConceptGetter#get(java.lang.String) + /** + * {@inheritDoc}. */ @Override public AxPolicy get(final String conceptKeyName) { return new AxConceptGetterImpl<>((NavigableMap<AxArtifactKey, AxPolicy>) policyMap).get(conceptKeyName); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConceptGetter#get(java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public AxPolicy get(final String conceptKeyName, final String conceptKeyVersion) { @@ -405,20 +378,16 @@ public class AxPolicies extends AxConcept implements AxConceptGetter<AxPolicy> { conceptKeyVersion); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConceptGetter#getAll(java.lang.String) + /** + * {@inheritDoc}. */ @Override public Set<AxPolicy> getAll(final String conceptKeyName) { return new AxConceptGetterImpl<>((NavigableMap<AxArtifactKey, AxPolicy>) policyMap).getAll(conceptKeyName); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConceptGetter#getAll(java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public Set<AxPolicy> getAll(final String conceptKeyName, final String conceptKeyVersion) { diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicy.java b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicy.java index 00db24124..8157d91d4 100644 --- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicy.java +++ b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicy.java @@ -171,20 +171,16 @@ public class AxPolicy extends AxConcept { return new AxStateTree(this, stateMap.get(firstState), null); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKey() + /** + * {@inheritDoc}. */ @Override public AxArtifactKey getKey() { return key; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKeys() + /** + * {@inheritDoc}. */ @Override public List<AxKey> getKeys() { @@ -262,11 +258,8 @@ public class AxPolicy extends AxConcept { this.firstState = firstState; } - /* - * (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(final AxValidationResult resultIn) { @@ -393,10 +386,8 @@ public class AxPolicy extends AxConcept { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#clean() + /** + * {@inheritDoc}. */ @Override public void clean() { @@ -404,10 +395,8 @@ public class AxPolicy extends AxConcept { firstState = firstState.trim(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { @@ -426,11 +415,8 @@ public class AxPolicy extends AxConcept { return builder.toString(); } - /* - * (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(final AxConcept targetObject) { @@ -454,10 +440,8 @@ public class AxPolicy extends AxConcept { return copy; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -470,10 +454,8 @@ public class AxPolicy extends AxConcept { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -500,10 +482,8 @@ public class AxPolicy extends AxConcept { return firstState.equals(other.firstState); } - /* - * (non-Javadoc) - * - * @see java.lang.Comparable#compareTo(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public int compareTo(final AxConcept otherObj) { diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicyModel.java b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicyModel.java index acc2c8e04..ca7e7b335 100644 --- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicyModel.java +++ b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicyModel.java @@ -206,10 +206,8 @@ public class AxPolicyModel extends AxModel { this.policies = policies; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxModel#register() + /** + * {@inheritDoc}. */ @Override public void register() { @@ -222,10 +220,8 @@ public class AxPolicyModel extends AxModel { ModelService.registerModel(AxPolicyModel.class, this); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxModel#getKeys() + /** + * {@inheritDoc}. */ @Override public List<AxKey> getKeys() { @@ -345,12 +341,8 @@ public class AxPolicyModel extends AxModel { this.schemas = schemas; } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.model.basicmodel.concepts.AxModel#validate(org.onap.policy.apex.model. - * basicmodel.concepts.AxValidationResult) + /** + * {@inheritDoc}. */ @Override public AxValidationResult validate(final AxValidationResult resultIn) { @@ -579,10 +571,8 @@ public class AxPolicyModel extends AxModel { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxModel#clean() + /** + * {@inheritDoc}. */ @Override public void clean() { @@ -594,10 +584,8 @@ public class AxPolicyModel extends AxModel { schemas.clean(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxModel#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { @@ -619,12 +607,8 @@ public class AxPolicyModel extends AxModel { return builder.toString(); } - /* - * (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(final AxConcept targetObject) { @@ -644,10 +628,8 @@ public class AxPolicyModel extends AxModel { return copy; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxModel#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -662,10 +644,8 @@ public class AxPolicyModel extends AxModel { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxModel#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -699,12 +679,8 @@ public class AxPolicyModel extends AxModel { return schemas.equals(other.schemas); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.model.basicmodel.concepts.AxModel#compareTo(org.onap.policy.apex.model. - * basicmodel.concepts.AxConcept) + /** + * {@inheritDoc}. */ @Override public int compareTo(final AxConcept otherObj) { diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxState.java b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxState.java index cb5331f94..f94cb2ef4 100644 --- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxState.java +++ b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxState.java @@ -324,20 +324,16 @@ public class AxState extends AxConcept { return nextStateSet; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKey() + /** + * {@inheritDoc}. */ @Override public AxReferenceKey getKey() { return key; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKeys() + /** + * {@inheritDoc}. */ @Override public List<AxKey> getKeys() { @@ -531,11 +527,8 @@ public class AxState extends AxConcept { this.taskReferenceMap = taskReferences; } - /* - * (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(final AxValidationResult resultIn) { @@ -768,10 +761,8 @@ public class AxState extends AxConcept { return taskReference.validate(result); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#clean() + /** + * {@inheritDoc}. */ @Override public void clean() { @@ -793,10 +784,8 @@ public class AxState extends AxConcept { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { @@ -823,11 +812,8 @@ public class AxState extends AxConcept { return builder.toString(); } - /* - * (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(final AxConcept targetObject) { @@ -873,10 +859,8 @@ public class AxState extends AxConcept { return copy; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -893,10 +877,8 @@ public class AxState extends AxConcept { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -936,10 +918,8 @@ public class AxState extends AxConcept { return taskReferenceMap.equals(other.taskReferenceMap); } - /* - * (non-Javadoc) - * - * @see java.lang.Comparable#compareTo(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public int compareTo(final AxConcept otherObj) { diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateOutput.java b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateOutput.java index 67ed4f16a..34c8f2f2d 100644 --- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateOutput.java +++ b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateOutput.java @@ -162,20 +162,16 @@ public class AxStateOutput extends AxConcept { this.nextState = nextState; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKey() + /** + * {@inheritDoc}. */ @Override public AxReferenceKey getKey() { return key; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKeys() + /** + * {@inheritDoc}. */ @Override public List<AxKey> getKeys() { @@ -237,11 +233,8 @@ public class AxStateOutput extends AxConcept { this.nextState = nextState; } - /* - * (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(final AxValidationResult resultIn) { @@ -266,10 +259,8 @@ public class AxStateOutput extends AxConcept { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#clean() + /** + * {@inheritDoc}. */ @Override public void clean() { @@ -278,10 +269,8 @@ public class AxStateOutput extends AxConcept { nextState.clean(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { @@ -298,11 +287,8 @@ public class AxStateOutput extends AxConcept { return builder.toString(); } - /* - * (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(final AxConcept targetObject) { @@ -319,10 +305,8 @@ public class AxStateOutput extends AxConcept { return copy; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -334,10 +318,8 @@ public class AxStateOutput extends AxConcept { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -361,10 +343,8 @@ public class AxStateOutput extends AxConcept { return nextState.equals(other.nextState); } - /* - * (non-Javadoc) - * - * @see java.lang.Comparable#compareTo(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public int compareTo(final AxConcept otherObj) { diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateTaskReference.java b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateTaskReference.java index 13c21b65e..748abdbe1 100644 --- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateTaskReference.java +++ b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateTaskReference.java @@ -169,20 +169,16 @@ public class AxStateTaskReference extends AxConcept { this.output = output; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKey() + /** + * {@inheritDoc}. */ @Override public AxReferenceKey getKey() { return key; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKeys() + /** + * {@inheritDoc}. */ @Override public List<AxKey> getKeys() { @@ -244,12 +240,8 @@ public class AxStateTaskReference extends AxConcept { this.output = output; } - /* - * (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(final AxValidationResult resultIn) { @@ -276,10 +268,8 @@ public class AxStateTaskReference extends AxConcept { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#clean() + /** + * {@inheritDoc}. */ @Override public void clean() { @@ -287,10 +277,8 @@ public class AxStateTaskReference extends AxConcept { output.clean(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { @@ -307,12 +295,8 @@ public class AxStateTaskReference extends AxConcept { return builder.toString(); } - /* - * (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(final AxConcept targetObject) { @@ -329,10 +313,8 @@ public class AxStateTaskReference extends AxConcept { return copy; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -344,10 +326,8 @@ public class AxStateTaskReference extends AxConcept { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -371,10 +351,8 @@ public class AxStateTaskReference extends AxConcept { return output.equals(other.output); } - /* - * (non-Javadoc) - * - * @see java.lang.Comparable#compareTo(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public int compareTo(final AxConcept otherObj) { diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateTree.java b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateTree.java index e68bf9613..e3120db29 100644 --- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateTree.java +++ b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateTree.java @@ -133,10 +133,8 @@ public class AxStateTree implements Comparable<AxStateTree> { return referencedStateSet; } - /* - * (non-Javadoc) - * - * @see java.lang.Comparable#compareTo(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public int compareTo(final AxStateTree otherObj) { diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTask.java b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTask.java index 7db1c7c31..31545b3f2 100644 --- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTask.java +++ b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTask.java @@ -217,20 +217,16 @@ public class AxTask extends AxConcept { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKey() + /** + * {@inheritDoc}. */ @Override public AxArtifactKey getKey() { return key; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKeys() + /** + * {@inheritDoc}. */ @Override public List<AxKey> getKeys() { @@ -438,12 +434,8 @@ public class AxTask extends AxConcept { this.taskLogic = taskLogic; } - /* - * (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(final AxValidationResult resultIn) { @@ -558,10 +550,8 @@ public class AxTask extends AxConcept { return contextAlbumReference.validate(result); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#clean() + /** + * {@inheritDoc}. */ @Override public void clean() { @@ -581,10 +571,8 @@ public class AxTask extends AxConcept { taskLogic.clean(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { @@ -607,12 +595,8 @@ public class AxTask extends AxConcept { return builder.toString(); } - /* - * (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(final AxConcept targetObject) { @@ -653,10 +637,8 @@ public class AxTask extends AxConcept { return copy; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -671,10 +653,8 @@ public class AxTask extends AxConcept { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -708,10 +688,8 @@ public class AxTask extends AxConcept { return taskLogic.equals(other.taskLogic); } - /* - * (non-Javadoc) - * - * @see java.lang.Comparable#compareTo(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public int compareTo(final AxConcept otherObj) { diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTaskParameter.java b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTaskParameter.java index 4846c59cf..95b8ff0cf 100644 --- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTaskParameter.java +++ b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTaskParameter.java @@ -111,20 +111,16 @@ public class AxTaskParameter extends AxConcept { this.defaultValue = defaultValue.trim(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKey() + /** + * {@inheritDoc}. */ @Override public AxReferenceKey getKey() { return key; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKeys() + /** + * {@inheritDoc}. */ @Override public List<AxKey> getKeys() { @@ -160,12 +156,8 @@ public class AxTaskParameter extends AxConcept { this.defaultValue = defaultValue.trim(); } - /* - * (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(final AxValidationResult resultIn) { @@ -186,10 +178,8 @@ public class AxTaskParameter extends AxConcept { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#clean() + /** + * {@inheritDoc}. */ @Override public void clean() { @@ -197,10 +187,8 @@ public class AxTaskParameter extends AxConcept { defaultValue = defaultValue.trim(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { @@ -215,12 +203,8 @@ public class AxTaskParameter extends AxConcept { return builder.toString(); } - /* - * (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(final AxConcept targetObject) { @@ -236,10 +220,8 @@ public class AxTaskParameter extends AxConcept { return copy; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -250,10 +232,8 @@ public class AxTaskParameter extends AxConcept { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -274,10 +254,8 @@ public class AxTaskParameter extends AxConcept { return defaultValue.equals(other.defaultValue); } - /* - * (non-Javadoc) - * - * @see java.lang.Comparable#compareTo(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public int compareTo(final AxConcept otherObj) { diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTasks.java b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTasks.java index b73b6d32b..b53159ce3 100644 --- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTasks.java +++ b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTasks.java @@ -144,20 +144,16 @@ public class AxTasks extends AxConcept implements AxConceptGetter<AxTask> { taskMap = navigableTaskMap; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKey() + /** + * {@inheritDoc}. */ @Override public AxArtifactKey getKey() { return key; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKeys() + /** + * {@inheritDoc}. */ @Override public List<AxKey> getKeys() { @@ -200,12 +196,8 @@ public class AxTasks extends AxConcept implements AxConceptGetter<AxTask> { this.taskMap.putAll(taskMap); } - /* - * (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(final AxValidationResult resultIn) { @@ -244,10 +236,8 @@ public class AxTasks extends AxConcept implements AxConceptGetter<AxTask> { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#clean() + /** + * {@inheritDoc}. */ @Override public void clean() { @@ -258,10 +248,8 @@ public class AxTasks extends AxConcept implements AxConceptGetter<AxTask> { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { @@ -276,12 +264,8 @@ public class AxTasks extends AxConcept implements AxConceptGetter<AxTask> { return builder.toString(); } - /* - * (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(final AxConcept targetObject) { @@ -302,10 +286,8 @@ public class AxTasks extends AxConcept implements AxConceptGetter<AxTask> { return copy; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -316,10 +298,8 @@ public class AxTasks extends AxConcept implements AxConceptGetter<AxTask> { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -341,10 +321,8 @@ public class AxTasks extends AxConcept implements AxConceptGetter<AxTask> { return taskMap.equals(other.taskMap); } - /* - * (non-Javadoc) - * - * @see java.lang.Comparable#compareTo(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public int compareTo(final AxConcept otherObj) { @@ -369,32 +347,24 @@ public class AxTasks extends AxConcept implements AxConceptGetter<AxTask> { return 0; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConceptGetter#get(org.onap.policy.apex. - * model. basicmodel.concepts.AxArtifactKey) + /** + * {@inheritDoc}. */ @Override public AxTask get(final AxArtifactKey conceptKey) { return new AxConceptGetterImpl<>((NavigableMap<AxArtifactKey, AxTask>) taskMap).get(conceptKey); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConceptGetter#get(java.lang.String) + /** + * {@inheritDoc}. */ @Override public AxTask get(final String conceptKeyName) { return new AxConceptGetterImpl<>((NavigableMap<AxArtifactKey, AxTask>) taskMap).get(conceptKeyName); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConceptGetter#get(java.lang.String, - * java.lang.String) + /** + * {@inheritDoc}. */ @Override public AxTask get(final String conceptKeyName, final String conceptKeyVersion) { @@ -402,21 +372,16 @@ public class AxTasks extends AxConcept implements AxConceptGetter<AxTask> { conceptKeyVersion); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConceptGetter#getAll(java.lang.String) + /** + * {@inheritDoc}. */ @Override public Set<AxTask> getAll(final String conceptKeyName) { return new AxConceptGetterImpl<>((NavigableMap<AxArtifactKey, AxTask>) taskMap).getAll(conceptKeyName); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConceptGetter#getAll(java.lang.String, - * java.lang.String) + /** + * {@inheritDoc}. */ @Override public Set<AxTask> getAll(final String conceptKeyName, final String conceptKeyVersion) { diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyAnalysisResult.java b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyAnalysisResult.java index 654ab2fc5..a5fbc09a2 100644 --- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyAnalysisResult.java +++ b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyAnalysisResult.java @@ -183,10 +183,8 @@ public class PolicyAnalysisResult { return getUnusedKeySet(taskUsage); } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyLogicReader.java b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyLogicReader.java index f1bc4aece..0fed8d385 100644 --- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyLogicReader.java +++ b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyLogicReader.java @@ -46,21 +46,16 @@ public class PolicyLogicReader implements AxLogicReader { // Flag indicating if default logic should be returned private String defaultLogic; - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.policymodel.concepts.AxLogicReader#getLogicPackage() + /** + * {@inheritDoc}. */ @Override public String getLogicPackage() { return logicPackage; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.policymodel.concepts.AxLogicReader#setLogicPackage(java.lang. - * String) + /** + * {@inheritDoc}. */ @Override public AxLogicReader setLogicPackage(final String incomingLogicPackage) { @@ -68,20 +63,16 @@ public class PolicyLogicReader implements AxLogicReader { return this; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.policymodel.concepts.AxLogicReader#getDefaultLogic() + /** + * {@inheritDoc}. */ @Override public String getDefaultLogic() { return defaultLogic; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.policymodel.concepts.AxLogicReader#setDefaultLogic(boolean) + /** + * {@inheritDoc}. */ @Override public AxLogicReader setDefaultLogic(final String incomingDefaultLogic) { @@ -89,12 +80,8 @@ public class PolicyLogicReader implements AxLogicReader { return this; } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.model.policymodel.concepts.AxLogicReader#readLogic(.policymodel.concepts - * .AxLogic) + /** + * {@inheritDoc}. */ @Override public String readLogic(final AxLogic axLogic) { diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelComparer.java b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelComparer.java index 723e8b235..f3bbdcbcf 100644 --- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelComparer.java +++ b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelComparer.java @@ -216,10 +216,8 @@ public class PolicyModelComparer { return keyInfoComparisonResult; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/DummyLogicReader.java b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/DummyLogicReader.java index 093ed483e..422f923d2 100644 --- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/DummyLogicReader.java +++ b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/DummyLogicReader.java @@ -25,54 +25,40 @@ import org.onap.policy.apex.model.policymodel.concepts.AxLogicReader; public class DummyLogicReader implements AxLogicReader { - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.policymodel.concepts.AxLogicReader#getLogicPackage() + /** + * {@inheritDoc}. */ @Override public String getLogicPackage() { return null; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.policymodel.concepts.AxLogicReader#setLogicPackage(java.lang. - * String) + /** + * {@inheritDoc}. */ @Override public AxLogicReader setLogicPackage(final String logicPackage) { return null; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.policymodel.concepts.AxLogicReader#getDefaultLogic() + /** + * {@inheritDoc}. */ @Override public String getDefaultLogic() { return null; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.policymodel.concepts.AxLogicReader#setDefaultLogic(java.lang. - * String) + /** + * {@inheritDoc}. */ @Override public AxLogicReader setDefaultLogic(final String defaultLogic) { return null; } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.model.policymodel.concepts.AxLogicReader#readLogic(org.onap.policy.apex. - * model.policymodel.concepts.AxLogic) + /** + * {@inheritDoc}. */ @Override public String readLogic(final AxLogic axLogic) { diff --git a/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/DirectoryDeleteShutdownHook.java b/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/DirectoryDeleteShutdownHook.java index 5f9b8aaf8..f0fd8950f 100644 --- a/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/DirectoryDeleteShutdownHook.java +++ b/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/DirectoryDeleteShutdownHook.java @@ -40,10 +40,8 @@ final class DirectoryDeleteShutdownHook extends Thread { this.tempDir = tempDir; } - /* - * (non-Javadoc) - * - * @see java.lang.Runnable#run() + /** + * {@inheritDoc}. */ @Override public void run() { diff --git a/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/distribution/hazelcast/HazelcastContextDistributor.java b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/distribution/hazelcast/HazelcastContextDistributor.java index 123d834ff..66acc7112 100644 --- a/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/distribution/hazelcast/HazelcastContextDistributor.java +++ b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/distribution/hazelcast/HazelcastContextDistributor.java @@ -56,11 +56,8 @@ public class HazelcastContextDistributor extends AbstractDistributor { LOGGER.exit("HazelcastContextDistributor()"); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.impl.distribution.AbstractContextDistributor#init(org.onap. - * policy.apex.model.basicmodel.concepts.AxArtifactKey) + /** + * {@inheritDoc}. */ @Override public void init(final AxArtifactKey key) throws ContextException { @@ -84,11 +81,8 @@ public class HazelcastContextDistributor extends AbstractDistributor { hazelcastInstance = newHazelcastInstance; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.context.impl.distribution.AbstractContextDistributor# - * getContextAlbumMap(org.onap.policy.apex.core.model.concepts.AxArtifactKey) + /** + * {@inheritDoc}. */ @Override public Map<String, Object> getContextAlbumMap(final AxArtifactKey contextAlbumKey) { @@ -97,11 +91,8 @@ public class HazelcastContextDistributor extends AbstractDistributor { return hazelcastInstance.getMap(contextAlbumKey.getId()); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.core.context.impl.distribution.AbstractContextDistributor#shutdown() + /** + * {@inheritDoc}. */ @Override public void shutdown() { diff --git a/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanContextDistributor.java b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanContextDistributor.java index e11f3da8b..a94805cdd 100644 --- a/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanContextDistributor.java +++ b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanContextDistributor.java @@ -54,11 +54,8 @@ public class InfinispanContextDistributor extends AbstractDistributor { LOGGER.exit("InfinispanContextDistributor()"); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.impl.distribution.AbstractContextDistributor#init(org.onap.policy.apex - * .model.basicmodel.concepts.AxArtifactKey) + /** + * {@inheritDoc}. */ @Override public void init(final AxArtifactKey key) throws ContextException { @@ -89,11 +86,8 @@ public class InfinispanContextDistributor extends AbstractDistributor { infinispanManager = newInfinispanManager; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.context.impl.distribution.AbstractContextDistributor# - * getContextAlbumMap(org.onap.policy.apex.core.model.concepts.AxArtifactKey) + /** + * {@inheritDoc}. */ @Override public Map<String, Object> getContextAlbumMap(final AxArtifactKey contextAlbumKey) { @@ -103,10 +97,8 @@ public class InfinispanContextDistributor extends AbstractDistributor { return infinispanManager.getCacheManager().getCache(contextAlbumKey.getId().replace(':', '_')); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.context.impl.distribution.AbstractContextDistributor#shutdown() + /** + * {@inheritDoc}. */ @Override public void shutdown() { diff --git a/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanDistributorParameters.java b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanDistributorParameters.java index 1993d21de..f6ee14886 100644 --- a/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanDistributorParameters.java +++ b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanDistributorParameters.java @@ -128,10 +128,8 @@ public class InfinispanDistributorParameters extends DistributorParameters { this.jgroupsBindAddress = jgroupsBindAddress; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.parameters.DistributorParameters#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { diff --git a/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanManager.java b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanManager.java index 843a6b971..16b022abb 100644 --- a/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanManager.java +++ b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanManager.java @@ -109,10 +109,8 @@ public class InfinispanManager { * Private class to implement the shutdown hook for this infinispan manager. */ public class InfinspanManagerShutdownHook extends Thread { - /* - * (non-Javadoc) - * - * @see java.lang.Thread#run() + /** + * {@inheritDoc}. */ @Override public void run() { diff --git a/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorLockFacade.java b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorLockFacade.java index 4e6ab71a4..dc8fdb100 100644 --- a/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorLockFacade.java +++ b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorLockFacade.java @@ -57,10 +57,8 @@ public class CuratorLockFacade implements Lock { this.lockMutex = lockMutex; } - /* - * (non-Javadoc) - * - * @see java.util.concurrent.locks.Lock#lock() + /** + * {@inheritDoc}. */ @Override public void lock() { @@ -71,20 +69,16 @@ public class CuratorLockFacade implements Lock { } } - /* - * (non-Javadoc) - * - * @see java.util.concurrent.locks.Lock#lockInterruptibly() + /** + * {@inheritDoc}. */ @Override public void lockInterruptibly() throws InterruptedException { LOGGER.warn("lockInterruptibly() not supported for \"{}\"", lockId); } - /* - * (non-Javadoc) - * - * @see java.util.concurrent.locks.Lock#tryLock() + /** + * {@inheritDoc}. */ @Override public boolean tryLock() { @@ -97,10 +91,8 @@ public class CuratorLockFacade implements Lock { } } - /* - * (non-Javadoc) - * - * @see java.util.concurrent.locks.Lock#tryLock(long, java.util.concurrent.TimeUnit) + /** + * {@inheritDoc}. */ @Override public boolean tryLock(final long time, final TimeUnit unit) throws InterruptedException { @@ -113,10 +105,8 @@ public class CuratorLockFacade implements Lock { } } - /* - * (non-Javadoc) - * - * @see java.util.concurrent.locks.Lock#unlock() + /** + * {@inheritDoc}. */ @Override public void unlock() { @@ -127,10 +117,8 @@ public class CuratorLockFacade implements Lock { } } - /* - * (non-Javadoc) - * - * @see java.util.concurrent.locks.Lock#newCondition() + /** + * {@inheritDoc}. */ @Override public Condition newCondition() { diff --git a/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorLockManager.java b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorLockManager.java index ce727b8bf..4ab0ca5e8 100644 --- a/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorLockManager.java +++ b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorLockManager.java @@ -65,11 +65,8 @@ public class CuratorLockManager extends AbstractLockManager { LOGGER.exit("CuratorLockManager(): Curator lock manager set up"); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.impl.locking.AbstractLockManager#init(org.onap.policy.apex. model. - * basicmodel.concepts.AxArtifactKey) + /** + * {@inheritDoc}. */ @Override public void init(final AxArtifactKey key) throws ContextException { @@ -137,11 +134,8 @@ public class CuratorLockManager extends AbstractLockManager { LOGGER.exit("init(" + key + "," + curatorLockPars + ")"); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.context.impl.locking.AbstractLockManager#getReentrantReadWriteLock( - * java.lang.String) + /** + * {@inheritDoc}. */ @Override public ReadWriteLock getReentrantReadWriteLock(final String lockId) throws ContextException { @@ -154,10 +148,8 @@ public class CuratorLockManager extends AbstractLockManager { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.context.LockManager#shutdown() + /** + * {@inheritDoc}. */ @Override public void shutdown() { @@ -173,11 +165,8 @@ public class CuratorLockManager extends AbstractLockManager { */ private class CuratorManagerConnectionStateListener implements ConnectionStateListener { - /* - * (non-Javadoc) - * - * @see org.apache.curator.framework.state.ConnectionStateListener#stateChanged(org.apache. - * curator.framework.CuratorFramework, org.apache.curator.framework.state.ConnectionState) + /** + * {@inheritDoc}. */ @Override public void stateChanged(final CuratorFramework incomngCuratorFramework, final ConnectionState newState) { diff --git a/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorLockManagerParameters.java b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorLockManagerParameters.java index 39972a7f1..1b525e147 100644 --- a/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorLockManagerParameters.java +++ b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorLockManagerParameters.java @@ -106,10 +106,8 @@ public class CuratorLockManagerParameters extends LockManagerParameters { this.zookeeperContextRetries = zookeeperContextRetries; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.parameters.LockManagerParameters#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { diff --git a/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorReentrantReadWriteLock.java b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorReentrantReadWriteLock.java index 5a24fb701..08c2deeb7 100644 --- a/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorReentrantReadWriteLock.java +++ b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorReentrantReadWriteLock.java @@ -68,20 +68,16 @@ public class CuratorReentrantReadWriteLock implements ReadWriteLock { return lockId; } - /* - * (non-Javadoc) - * - * @see java.util.concurrent.locks.ReadWriteLock#readLock() + /** + * {@inheritDoc}. */ @Override public Lock readLock() { return readLockFacade; } - /* - * (non-Javadoc) - * - * @see java.util.concurrent.locks.ReadWriteLock#writeLock() + /** + * {@inheritDoc}. */ @Override public Lock writeLock() { diff --git a/plugins/plugins-context/plugins-context-locking/plugins-context-locking-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/locking/hazelcast/HazelcastLock.java b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/locking/hazelcast/HazelcastLock.java index 9d4a5ca8f..291392ad6 100644 --- a/plugins/plugins-context/plugins-context-locking/plugins-context-locking-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/locking/hazelcast/HazelcastLock.java +++ b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/locking/hazelcast/HazelcastLock.java @@ -62,20 +62,16 @@ public class HazelcastLock implements ReadWriteLock { return lockId; } - /* - * (non-Javadoc) - * - * @see java.util.concurrent.locks.ReadWriteLock#readLock() + /** + * {@inheritDoc}. */ @Override public Lock readLock() { return readLock; } - /* - * (non-Javadoc) - * - * @see java.util.concurrent.locks.ReadWriteLock#writeLock() + /** + * {@inheritDoc}. */ @Override public Lock writeLock() { diff --git a/plugins/plugins-context/plugins-context-locking/plugins-context-locking-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/locking/hazelcast/HazelcastLockManager.java b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/locking/hazelcast/HazelcastLockManager.java index 4994cf7f5..b868110a4 100644 --- a/plugins/plugins-context/plugins-context-locking/plugins-context-locking-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/locking/hazelcast/HazelcastLockManager.java +++ b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/locking/hazelcast/HazelcastLockManager.java @@ -53,11 +53,8 @@ public class HazelcastLockManager extends AbstractLockManager { LOGGER.exit("HazelcastLockManager(): Hazelcast lock manager set up"); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.impl.locking.AbstractLockManager#init(org.onap.policy.apex. - * model. basicmodel.concepts.AxArtifactKey) + /** + * {@inheritDoc}. */ @Override public void init(final AxArtifactKey key) throws ContextException { @@ -71,12 +68,8 @@ public class HazelcastLockManager extends AbstractLockManager { LOGGER.exit("init(" + key + ")"); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.core.context.impl.locking.AbstractLockManager#getReentrantReadWriteLock( - * java.lang.String) + /** + * {@inheritDoc}. */ @Override public ReadWriteLock getReentrantReadWriteLock(final String lockId) throws ContextException { @@ -88,10 +81,8 @@ public class HazelcastLockManager extends AbstractLockManager { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.context.LockManager#shutdown() + /** + * {@inheritDoc}. */ @Override public void shutdown() { diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroArrayObjectMapper.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroArrayObjectMapper.java index 56d84251f..69043b3bb 100644 --- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroArrayObjectMapper.java +++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroArrayObjectMapper.java @@ -30,11 +30,8 @@ import org.apache.avro.generic.GenericData.Array; * @author Liam Fallon (liam.fallon@ericsson.com) */ public class AvroArrayObjectMapper extends AvroDirectObjectMapper { - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.plugins.context.schema.avro.AvroObjectMapper#createNewinstance(org. - * apache.avro.Schema) + /** + * {@inheritDoc}. */ @SuppressWarnings("rawtypes") @Override diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroBytesObjectMapper.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroBytesObjectMapper.java index bee2f5957..d8d0d8c19 100644 --- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroBytesObjectMapper.java +++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroBytesObjectMapper.java @@ -45,22 +45,16 @@ public class AvroBytesObjectMapper implements AvroObjectMapper { // The Apex compatible class private static final Class<Byte[]> schemaClass = Byte[].class; - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.plugins.context.schema.avro.AvroObjectMapper#getJavaClass() + /** + * {@inheritDoc}. */ @Override public Class<?> getJavaClass() { return schemaClass; } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.plugins.context.schema.avro.AvroObjectMapper#setAvroType(org.apache. - * avro. Schema.Type) + /** + * {@inheritDoc}. */ @Override public void init(final AxKey intUserKey, final Type initAvroType) { @@ -68,11 +62,8 @@ public class AvroBytesObjectMapper implements AvroObjectMapper { this.avroType = initAvroType; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.plugins.context.schema.avro.AvroObjectMapper#createNewinstance(org. - * apache. avro.Schema) + /** + * {@inheritDoc}. */ @Override public Object createNewInstance(final Schema avroSchema) { @@ -81,21 +72,16 @@ public class AvroBytesObjectMapper implements AvroObjectMapper { return null; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.plugins.context.schema.avro.AvroObjectMapper#getAvroType() + /** + * {@inheritDoc}. */ @Override public Type getAvroType() { return avroType; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.plugins.context.schema.avro.AvroObjectMapper#mapFromAvro(java.lang. - * Object) + /** + * {@inheritDoc}. */ @Override public Object mapFromAvro(final Object avroObject) { @@ -118,11 +104,8 @@ public class AvroBytesObjectMapper implements AvroObjectMapper { return byteArray; } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.plugins.context.schema.avro.AvroObjectMapper#mapToAvro(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public Object mapToAvro(final Object object) { diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroDirectObjectMapper.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroDirectObjectMapper.java index ca771d957..f627651fa 100644 --- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroDirectObjectMapper.java +++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroDirectObjectMapper.java @@ -69,22 +69,16 @@ public class AvroDirectObjectMapper implements AvroObjectMapper { // The Apex compatible class private Class<?> schemaClass; - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.plugins.context.schema.avro.AvroObjectMapper#getJavaClass() + /** + * {@inheritDoc}. */ @Override public Class<?> getJavaClass() { return schemaClass; } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.plugins.context.schema.avro.AvroObjectMapper#setAvroType(org.apache. - * avro. Schema.Type) + /** + * {@inheritDoc}. */ @Override public void init(final AxKey initUserKey, final Type initAvroType) { @@ -93,11 +87,8 @@ public class AvroDirectObjectMapper implements AvroObjectMapper { schemaClass = AVRO_JAVA_TYPE_MAP.get(avroType); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.plugins.context.schema.avro.AvroObjectMapper#createNewinstance(org. - * apache. avro.Schema) + /** + * {@inheritDoc}. */ @Override public Object createNewInstance(final Schema avroSchema) { @@ -105,21 +96,16 @@ public class AvroDirectObjectMapper implements AvroObjectMapper { return null; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.plugins.context.schema.avro.AvroObjectMapper#getAvroType() + /** + * {@inheritDoc}. */ @Override public Type getAvroType() { return avroType; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.plugins.context.schema.avro.AvroObjectMapper#mapFromAvro(java.lang. - * Object) + /** + * {@inheritDoc}. */ @Override public Object mapFromAvro(final Object avroObject) { @@ -141,11 +127,8 @@ public class AvroDirectObjectMapper implements AvroObjectMapper { return avroObject; } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.plugins.context.schema.avro.AvroObjectMapper#mapToAvro(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public Object mapToAvro(final Object object) { diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroEnumObjectMapper.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroEnumObjectMapper.java index ec84450d5..cfdd2ed76 100644 --- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroEnumObjectMapper.java +++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroEnumObjectMapper.java @@ -32,11 +32,8 @@ import org.apache.avro.generic.GenericData.EnumSymbol; * @author Liam Fallon (liam.fallon@ericsson.com) */ public class AvroEnumObjectMapper extends AvroDirectObjectMapper { - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.plugins.context.schema.avro.AvroObjectMapper#createNewinstance(org. - * apache.avro.Schema) + /** + * {@inheritDoc}. */ @Override public Object createNewInstance(final Schema avroSchema) { diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroNullableMapper.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroNullableMapper.java index ff8806c86..1196cf6d9 100644 --- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroNullableMapper.java +++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroNullableMapper.java @@ -44,56 +44,40 @@ public class AvroNullableMapper extends AvroDirectObjectMapper { this.wrappedMapper = wrappedMapper; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.plugins.context.schema.avro.AvroDirectObjectMapper#getJavaClass() + /** + * {@inheritDoc}. */ @Override public Class<?> getJavaClass() { return wrappedMapper.getJavaClass(); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.plugins.context.schema.avro.AvroDirectObjectMapper#init(org.onap.policy. - * apex. model.basicmodel.concepts.AxKey, org.apache.avro.Schema.Type) + /** + * {@inheritDoc}. */ @Override public void init(final AxKey userKey, final Type avroType) { wrappedMapper.init(userKey, avroType); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.plugins.context.schema.avro.AvroDirectObjectMapper#createNewInstance( - * org. apache.avro.Schema) + /** + * {@inheritDoc}. */ @Override public Object createNewInstance(final Schema avroSchema) { return wrappedMapper.createNewInstance(avroSchema); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.plugins.context.schema.avro.AvroDirectObjectMapper#getAvroType() + /** + * {@inheritDoc}. */ @Override public Type getAvroType() { return Schema.Type.UNION; } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.plugins.context.schema.avro.AvroDirectObjectMapper#mapFromAvro(java. - * lang. Object) + /** + * {@inheritDoc}. */ @Override public Object mapFromAvro(final Object avroObject) { @@ -104,12 +88,8 @@ public class AvroNullableMapper extends AvroDirectObjectMapper { } } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.plugins.context.schema.avro.AvroDirectObjectMapper#mapToAvro(java.lang. - * Object) + /** + * {@inheritDoc}. */ @Override public Object mapToAvro(final Object object) { diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroRecordObjectMapper.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroRecordObjectMapper.java index 9d24a9a86..9092dca36 100644 --- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroRecordObjectMapper.java +++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroRecordObjectMapper.java @@ -30,11 +30,8 @@ import org.apache.avro.generic.GenericData.Record; * @author Liam Fallon (liam.fallon@ericsson.com) */ public class AvroRecordObjectMapper extends AvroDirectObjectMapper { - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.plugins.context.schema.avro.AvroObjectMapper#createNewinstance(org. - * apache. avro.Schema) + /** + * {@inheritDoc}. */ @Override public Object createNewInstance(final Schema avroSchema) { diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroStringObjectMapper.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroStringObjectMapper.java index a9acb1c12..46e6c43ef 100644 --- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroStringObjectMapper.java +++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroStringObjectMapper.java @@ -44,22 +44,16 @@ public class AvroStringObjectMapper implements AvroObjectMapper { // The Apex compatible class private static final Class<String> schemaClass = String.class; - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.plugins.context.schema.avro.AvroObjectMapper#getJavaClass() + /** + * {@inheritDoc}. */ @Override public Class<?> getJavaClass() { return schemaClass; } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.plugins.context.schema.avro.AvroObjectMapper#setAvroType(org.apache. - * avro. Schema.Type) + /** + * {@inheritDoc}. */ @Override public void init(final AxKey initUserKey, final Type initAvroType) { @@ -67,11 +61,8 @@ public class AvroStringObjectMapper implements AvroObjectMapper { this.avroType = initAvroType; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.plugins.context.schema.avro.AvroObjectMapper#createNewinstance(org. - * apache. avro.Schema) + /** + * {@inheritDoc}. */ @Override public Object createNewInstance(final Schema avroSchema) { @@ -80,21 +71,16 @@ public class AvroStringObjectMapper implements AvroObjectMapper { return null; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.plugins.context.schema.avro.AvroObjectMapper#getAvroType() + /** + * {@inheritDoc}. */ @Override public Type getAvroType() { return avroType; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.plugins.context.schema.avro.AvroObjectMapper#mapFromAvro(java.lang. - * Object) + /** + * {@inheritDoc}. */ @Override public Object mapFromAvro(final Object avroObject) { @@ -110,11 +96,8 @@ public class AvroStringObjectMapper implements AvroObjectMapper { return avroObject.toString(); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.plugins.context.schema.avro.AvroObjectMapper#mapToAvro(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public Object mapToAvro(final Object object) { diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/src/main/java/org/onap/policy/apex/plugins/event/carrier/jms/ApexJmsConsumer.java b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/src/main/java/org/onap/policy/apex/plugins/event/carrier/jms/ApexJmsConsumer.java index b857d8e14..eb0357220 100644 --- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/src/main/java/org/onap/policy/apex/plugins/event/carrier/jms/ApexJmsConsumer.java +++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/src/main/java/org/onap/policy/apex/plugins/event/carrier/jms/ApexJmsConsumer.java @@ -171,21 +171,16 @@ public class ApexJmsConsumer implements MessageListener, ApexEventConsumer, Runn return peerReferenceMap.get(peeredMode); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventConsumer#setPeeredReference(org.onap.policy.apex.service. - * parameters. eventhandler.EventHandlerPeeredMode, org.onap.policy.apex.service.engine.event.PeeredReference) + /** + * {@inheritDoc}. */ @Override public void setPeeredReference(final EventHandlerPeeredMode peeredMode, final PeeredReference peeredReference) { peerReferenceMap.put(peeredMode, peeredReference); } - /* - * (non-Javadoc) - * - * @see java.lang.Runnable#run() + /** + * {@inheritDoc}. */ @Override public void run() { diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/src/main/java/org/onap/policy/apex/plugins/event/carrier/jms/ApexJmsProducer.java b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/src/main/java/org/onap/policy/apex/plugins/event/carrier/jms/ApexJmsProducer.java index e98ee8ff8..4bd7be586 100644 --- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/src/main/java/org/onap/policy/apex/plugins/event/carrier/jms/ApexJmsProducer.java +++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/src/main/java/org/onap/policy/apex/plugins/event/carrier/jms/ApexJmsProducer.java @@ -75,11 +75,8 @@ public class ApexJmsProducer implements ApexEventProducer { // The peer references for this event handler private Map<EventHandlerPeeredMode, PeeredReference> peerReferenceMap = new EnumMap<>(EventHandlerPeeredMode.class); - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventProducer#init(java.lang.String, - * org.onap.policy.apex.service.parameters.eventhandler.EventHandlerParameters) + /** + * {@inheritDoc}. */ @Override public void init(final String producerName, final EventHandlerParameters producerParameters) @@ -168,43 +165,32 @@ public class ApexJmsProducer implements ApexEventProducer { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventProducer#getName() + /** + * {@inheritDoc}. */ @Override public String getName() { return name; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventProducer#getPeeredReference(org.onap.policy.apex.service. - * parameters. eventhandler.EventHandlerPeeredMode) + /** + * {@inheritDoc}. */ @Override public PeeredReference getPeeredReference(final EventHandlerPeeredMode peeredMode) { return peerReferenceMap.get(peeredMode); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventProducer#setPeeredReference(org.onap.policy.apex.service. - * parameters. eventhandler.EventHandlerPeeredMode, org.onap.policy.apex.service.engine.event.PeeredReference) + /** + * {@inheritDoc}. */ @Override public void setPeeredReference(final EventHandlerPeeredMode peeredMode, final PeeredReference peeredReference) { peerReferenceMap.put(peeredMode, peeredReference); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventProducer#sendEvent(long, java.lang.String, - * java.lang.Object) + /** + * {@inheritDoc}. */ @Override public void sendEvent(final long executionId, final Properties executionProperties, final String eventname, @@ -260,10 +246,8 @@ public class ApexJmsProducer implements ApexEventProducer { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.apps.uservice.producer.ApexEventProducer#stop() + /** + * {@inheritDoc}. */ @Override public void stop() { diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/src/main/java/org/onap/policy/apex/plugins/event/carrier/jms/JmsCarrierTechnologyParameters.java b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/src/main/java/org/onap/policy/apex/plugins/event/carrier/jms/JmsCarrierTechnologyParameters.java index 8aed15ece..6eba263e6 100644 --- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/src/main/java/org/onap/policy/apex/plugins/event/carrier/jms/JmsCarrierTechnologyParameters.java +++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/src/main/java/org/onap/policy/apex/plugins/event/carrier/jms/JmsCarrierTechnologyParameters.java @@ -320,10 +320,8 @@ public class JmsCarrierTechnologyParameters extends CarrierTechnologyParameters this.objectMessageSending = objectMessageSending; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.apps.uservice.parameters.ApexParameterValidator#validate() + /** + * {@inheritDoc}. */ @Override public GroupValidationResult validate() { diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/src/main/java/org/onap/policy/apex/plugins/event/carrier/kafka/ApexKafkaConsumer.java b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/src/main/java/org/onap/policy/apex/plugins/event/carrier/kafka/ApexKafkaConsumer.java index 3ddc97a86..8df8e6117 100644 --- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/src/main/java/org/onap/policy/apex/plugins/event/carrier/kafka/ApexKafkaConsumer.java +++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/src/main/java/org/onap/policy/apex/plugins/event/carrier/kafka/ApexKafkaConsumer.java @@ -65,12 +65,8 @@ public class ApexKafkaConsumer implements ApexEventConsumer, Runnable { private Thread consumerThread; private boolean stopOrderedFlag = false; - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventConsumer#init(java.lang.String, - * org.onap.policy.apex.service.parameters.eventhandler.EventHandlerParameters, - * org.onap.policy.apex.service.engine.event.ApexEventReceiver) + /** + * {@inheritDoc}. */ @Override public void init(final String consumerName, final EventHandlerParameters consumerParameters, @@ -99,10 +95,8 @@ public class ApexKafkaConsumer implements ApexEventConsumer, Runnable { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventConsumer#start() + /** + * {@inheritDoc}. */ @Override public void start() { @@ -113,42 +107,32 @@ public class ApexKafkaConsumer implements ApexEventConsumer, Runnable { consumerThread.start(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventConsumer#getName() + /** + * {@inheritDoc}. */ @Override public String getName() { return name; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventConsumer#getPeeredReference(org.onap.policy.apex.service. - * parameters.eventhandler.EventHandlerPeeredMode) + /** + * {@inheritDoc}. */ @Override public PeeredReference getPeeredReference(final EventHandlerPeeredMode peeredMode) { return peerReferenceMap.get(peeredMode); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventConsumer#setPeeredReference(org.onap.policy.apex.service. - * parameters.eventhandler.EventHandlerPeeredMode, org.onap.policy.apex.service.engine.event.PeeredReference) + /** + * {@inheritDoc}. */ @Override public void setPeeredReference(final EventHandlerPeeredMode peeredMode, final PeeredReference peeredReference) { peerReferenceMap.put(peeredMode, peeredReference); } - /* - * (non-Javadoc) - * - * @see java.lang.Runnable#run() + /** + * {@inheritDoc}. */ @Override public void run() { @@ -191,10 +175,8 @@ public class ApexKafkaConsumer implements ApexEventConsumer, Runnable { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventConsumer#stop() + /** + * {@inheritDoc}. */ @Override public void stop() { diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/src/main/java/org/onap/policy/apex/plugins/event/carrier/kafka/ApexKafkaProducer.java b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/src/main/java/org/onap/policy/apex/plugins/event/carrier/kafka/ApexKafkaProducer.java index 706568ae7..98ff61121 100644 --- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/src/main/java/org/onap/policy/apex/plugins/event/carrier/kafka/ApexKafkaProducer.java +++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/src/main/java/org/onap/policy/apex/plugins/event/carrier/kafka/ApexKafkaProducer.java @@ -73,43 +73,32 @@ public class ApexKafkaProducer implements ApexEventProducer { (KafkaCarrierTechnologyParameters) producerParameters.getCarrierTechnologyParameters(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventProducer#getName() + /** + * {@inheritDoc}. */ @Override public String getName() { return name; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventProducer#getPeeredReference(org.onap.policy.apex.service. - * parameters.eventhandler.EventHandlerPeeredMode) + /** + * {@inheritDoc}. */ @Override public PeeredReference getPeeredReference(final EventHandlerPeeredMode peeredMode) { return peerReferenceMap.get(peeredMode); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventProducer#setPeeredReference(org.onap.policy.apex.service. - * parameters.eventhandler.EventHandlerPeeredMode, org.onap.policy.apex.service.engine.event.PeeredReference) + /** + * {@inheritDoc}. */ @Override public void setPeeredReference(final EventHandlerPeeredMode peeredMode, final PeeredReference peeredReference) { peerReferenceMap.put(peeredMode, peeredReference); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.apps.uservice.producer.ApexEventProducer#sendEvent(long, java.lang.String, - * java.lang.Object) + /** + * {@inheritDoc}. */ @Override public void sendEvent(final long executionId, final Properties executionProperties, final String eventName, @@ -138,10 +127,8 @@ public class ApexKafkaProducer implements ApexEventProducer { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.apps.uservice.producer.ApexEventProducer#stop() + /** + * {@inheritDoc}. */ @Override public void stop() { diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/src/main/java/org/onap/policy/apex/plugins/event/carrier/kafka/KafkaCarrierTechnologyParameters.java b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/src/main/java/org/onap/policy/apex/plugins/event/carrier/kafka/KafkaCarrierTechnologyParameters.java index fc5754ebc..927d79ee1 100644 --- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/src/main/java/org/onap/policy/apex/plugins/event/carrier/kafka/KafkaCarrierTechnologyParameters.java +++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/src/main/java/org/onap/policy/apex/plugins/event/carrier/kafka/KafkaCarrierTechnologyParameters.java @@ -219,10 +219,8 @@ public class KafkaCarrierTechnologyParameters extends CarrierTechnologyParameter return Duration.ofMillis(consumerPollTime); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.apps.uservice.parameters.ApexParameterValidator#validate() + /** + * {@inheritDoc}. */ @Override public GroupValidationResult validate() { diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/src/main/java/org/onap/policy/apex/plugins/event/carrier/restclient/ApexRestClientConsumer.java b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/src/main/java/org/onap/policy/apex/plugins/event/carrier/restclient/ApexRestClientConsumer.java index 39389c297..ed501687b 100644 --- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/src/main/java/org/onap/policy/apex/plugins/event/carrier/restclient/ApexRestClientConsumer.java +++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/src/main/java/org/onap/policy/apex/plugins/event/carrier/restclient/ApexRestClientConsumer.java @@ -103,10 +103,8 @@ public class ApexRestClientConsumer implements ApexEventConsumer, Runnable { client = ClientBuilder.newClient(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventConsumer#start() + /** + * {@inheritDoc}. */ @Override public void start() { @@ -117,42 +115,32 @@ public class ApexRestClientConsumer implements ApexEventConsumer, Runnable { consumerThread.start(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventConsumer#getName() + /** + * {@inheritDoc}. */ @Override public String getName() { return name; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventConsumer#getPeeredReference(org.onap.policy.apex.service. - * parameters. eventhandler.EventHandlerPeeredMode) + /** + * {@inheritDoc}. */ @Override public PeeredReference getPeeredReference(final EventHandlerPeeredMode peeredMode) { return peerReferenceMap.get(peeredMode); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventConsumer#setPeeredReference(org.onap.policy.apex.service. - * parameters. eventhandler.EventHandlerPeeredMode, org.onap.policy.apex.service.engine.event.PeeredReference) + /** + * {@inheritDoc}. */ @Override public void setPeeredReference(final EventHandlerPeeredMode peeredMode, final PeeredReference peeredReference) { peerReferenceMap.put(peeredMode, peeredReference); } - /* - * (non-Javadoc) - * - * @see java.lang.Runnable#run() + /** + * {@inheritDoc}. */ @Override public void run() { @@ -173,10 +161,8 @@ public class ApexRestClientConsumer implements ApexEventConsumer, Runnable { client.close(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.apps.uservice.producer.ApexEventConsumer#stop() + /** + * {@inheritDoc}. */ @Override public void stop() { @@ -193,10 +179,8 @@ public class ApexRestClientConsumer implements ApexEventConsumer, Runnable { * @author Liam Fallon (liam.fallon@ericsson.com) */ private class RequestRunner implements Runnable { - /* - * (non-Javadoc) - * - * @see java.lang.Runnable#run() + /** + * {@inheritDoc}. */ @Override public void run() { diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/src/main/java/org/onap/policy/apex/plugins/event/carrier/restclient/ApexRestClientProducer.java b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/src/main/java/org/onap/policy/apex/plugins/event/carrier/restclient/ApexRestClientProducer.java index 275f5a8c2..6739d82a9 100644 --- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/src/main/java/org/onap/policy/apex/plugins/event/carrier/restclient/ApexRestClientProducer.java +++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/src/main/java/org/onap/policy/apex/plugins/event/carrier/restclient/ApexRestClientProducer.java @@ -60,11 +60,8 @@ public class ApexRestClientProducer implements ApexEventProducer { // The peer references for this event handler private Map<EventHandlerPeeredMode, PeeredReference> peerReferenceMap = new EnumMap<>(EventHandlerPeeredMode.class); - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventProducer#init(java.lang.String, - * org.onap.policy.apex.service.parameters.eventhandler.EventHandlerParameters) + /** + * {@inheritDoc}. */ @Override public void init(final String producerName, final EventHandlerParameters producerParameters) @@ -100,43 +97,32 @@ public class ApexRestClientProducer implements ApexEventProducer { client = ClientBuilder.newClient(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventProducer#getName() + /** + * {@inheritDoc}. */ @Override public String getName() { return name; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventProducer#getPeeredReference(org.onap.policy.apex.service. - * parameters. eventhandler.EventHandlerPeeredMode) + /** + * {@inheritDoc}. */ @Override public PeeredReference getPeeredReference(final EventHandlerPeeredMode peeredMode) { return peerReferenceMap.get(peeredMode); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventProducer#setPeeredReference(org.onap.policy.apex.service. - * parameters. eventhandler.EventHandlerPeeredMode, org.onap.policy.apex.service.engine.event.PeeredReference) + /** + * {@inheritDoc}. */ @Override public void setPeeredReference(final EventHandlerPeeredMode peeredMode, final PeeredReference peeredReference) { peerReferenceMap.put(peeredMode, peeredReference); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventProducer#sendEvent(long, java.lang. String, - * java.lang.Object) + /** + * {@inheritDoc}. */ @Override public void sendEvent(final long executionId, final Properties executionProperties, final String eventName, @@ -166,10 +152,8 @@ public class ApexRestClientProducer implements ApexEventProducer { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventProducer#stop() + /** + * {@inheritDoc}. */ @Override public void stop() { diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/src/test/java/org/onap/policy/apex/plugins/event/carrier/restclient/SupportApexEventReceiver.java b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/src/test/java/org/onap/policy/apex/plugins/event/carrier/restclient/SupportApexEventReceiver.java index 5459310fa..739a6660a 100644 --- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/src/test/java/org/onap/policy/apex/plugins/event/carrier/restclient/SupportApexEventReceiver.java +++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/src/test/java/org/onap/policy/apex/plugins/event/carrier/restclient/SupportApexEventReceiver.java @@ -34,10 +34,8 @@ public class SupportApexEventReceiver implements ApexEventReceiver { private Object lastEvent; private int eventCount; - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventReceiver#receiveEvent(long, java.lang.Object) + /** + * {@inheritDoc}. */ @Override public void receiveEvent(final long executionId, final Properties executionProperties, final Object event) @@ -47,10 +45,8 @@ public class SupportApexEventReceiver implements ApexEventReceiver { this.eventCount++; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventReceiver#receiveEvent(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public void receiveEvent(final Properties executionProperties, final Object event) throws ApexEventException { diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/main/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequest.java b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/main/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequest.java index 4b16d30d4..8ada5e617 100644 --- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/main/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequest.java +++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/main/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequest.java @@ -89,8 +89,8 @@ public class ApexRestRequest { this.timestamp = timestamp; } - /* (non-Javadoc) - * @see java.lang.Object#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/main/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequestorConsumer.java b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/main/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequestorConsumer.java index 1ba00ec0a..776440232 100644 --- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/main/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequestorConsumer.java +++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/main/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequestorConsumer.java @@ -178,10 +178,8 @@ public class ApexRestRequestorConsumer implements ApexEventConsumer, Runnable { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventConsumer#start() + /** + * {@inheritDoc}. */ @Override public void start() { @@ -192,10 +190,8 @@ public class ApexRestRequestorConsumer implements ApexEventConsumer, Runnable { consumerThread.start(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventConsumer#getName() + /** + * {@inheritDoc}. */ @Override public String getName() { @@ -211,33 +207,24 @@ public class ApexRestRequestorConsumer implements ApexEventConsumer, Runnable { return eventsReceived; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventConsumer#getPeeredReference(org.onap. - * policy.apex.service. parameters.eventhandler.EventHandlerPeeredMode) + /** + * {@inheritDoc}. */ @Override public PeeredReference getPeeredReference(final EventHandlerPeeredMode peeredMode) { return peerReferenceMap.get(peeredMode); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventConsumer#setPeeredReference(org.onap. - * policy.apex.service. parameters.eventhandler.EventHandlerPeeredMode, - * org.onap.policy.apex.service.engine.event.PeeredReference) + /** + * {@inheritDoc}. */ @Override public void setPeeredReference(final EventHandlerPeeredMode peeredMode, final PeeredReference peeredReference) { peerReferenceMap.put(peeredMode, peeredReference); } - /* - * (non-Javadoc) - * - * @see java.lang.Runnable#run() + /** + * {@inheritDoc}. */ @Override public void run() { @@ -299,10 +286,8 @@ public class ApexRestRequestorConsumer implements ApexEventConsumer, Runnable { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.apps.uservice.producer.ApexEventConsumer#stop() + /** + * {@inheritDoc}. */ @Override public void stop() { @@ -336,10 +321,8 @@ public class ApexRestRequestorConsumer implements ApexEventConsumer, Runnable { this.request = request; } - /* - * (non-Javadoc) - * - * @see java.lang.Runnable#run() + /** + * {@inheritDoc}. */ @Override public void run() { diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/main/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequestorProducer.java b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/main/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequestorProducer.java index cf5294253..bbe61f3fe 100644 --- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/main/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequestorProducer.java +++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/main/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequestorProducer.java @@ -56,11 +56,8 @@ public class ApexRestRequestorProducer implements ApexEventProducer { // The number of events sent private int eventsSent = 0; - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventProducer#init(java.lang.String, - * org.onap.policy.apex.service.parameters.eventhandler.EventHandlerParameters) + /** + * {@inheritDoc}. */ @Override public void init(final String producerName, final EventHandlerParameters producerParameters) @@ -102,10 +99,8 @@ public class ApexRestRequestorProducer implements ApexEventProducer { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventProducer#getName() + /** + * {@inheritDoc}. */ @Override public String getName() { @@ -121,33 +116,24 @@ public class ApexRestRequestorProducer implements ApexEventProducer { return eventsSent; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventProducer#getPeeredReference(org.onap.policy.apex.service. - * parameters.eventhandler.EventHandlerPeeredMode) + /** + * {@inheritDoc}. */ @Override public PeeredReference getPeeredReference(final EventHandlerPeeredMode peeredMode) { return peerReferenceMap.get(peeredMode); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventProducer#setPeeredReference(org.onap.policy.apex.service. - * parameters.eventhandler.EventHandlerPeeredMode, org.onap.policy.apex.service.engine.event.PeeredReference) + /** + * {@inheritDoc}. */ @Override public void setPeeredReference(final EventHandlerPeeredMode peeredMode, final PeeredReference peeredReference) { peerReferenceMap.put(peeredMode, peeredReference); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventProducer#sendEvent(long, java.lang. String, - * java.lang.Object) + /** + * {@inheritDoc}. */ @Override public void sendEvent(final long executionId, final Properties executionProperties, final String eventName, @@ -185,10 +171,8 @@ public class ApexRestRequestorProducer implements ApexEventProducer { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventProducer#stop() + /** + * {@inheritDoc}. */ @Override public void stop() { diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/main/java/org/onap/policy/apex/plugins/event/carrier/restserver/ApexRestServerConsumer.java b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/main/java/org/onap/policy/apex/plugins/event/carrier/restserver/ApexRestServerConsumer.java index b18c658af..9cb7f765c 100644 --- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/main/java/org/onap/policy/apex/plugins/event/carrier/restserver/ApexRestServerConsumer.java +++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/main/java/org/onap/policy/apex/plugins/event/carrier/restserver/ApexRestServerConsumer.java @@ -85,12 +85,8 @@ public class ApexRestServerConsumer implements ApexEventConsumer, Runnable { return nextExecutionID.getAndIncrement(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventConsumer#init(java.lang.String, - * org.onap.policy.apex.service.parameters.eventhandler.EventHandlerParameters, - * org.onap.policy.apex.service.engine.event.ApexEventReceiver) + /** + * {@inheritDoc}. */ @Override public void init(final String consumerName, final EventHandlerParameters consumerParameters, @@ -146,10 +142,8 @@ public class ApexRestServerConsumer implements ApexEventConsumer, Runnable { RestServerEndpoint.registerApexRestServerConsumer(this.name, this); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventConsumer#start() + /** + * {@inheritDoc}. */ @Override public void start() { @@ -160,32 +154,24 @@ public class ApexRestServerConsumer implements ApexEventConsumer, Runnable { consumerThread.start(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventConsumer#getName() + /** + * {@inheritDoc}. */ @Override public String getName() { return name; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventConsumer#getPeeredReference(org.onap.policy.apex.service. - * parameters. eventhandler.EventHandlerPeeredMode) + /** + * {@inheritDoc}. */ @Override public PeeredReference getPeeredReference(final EventHandlerPeeredMode peeredMode) { return peerReferenceMap.get(peeredMode); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventConsumer#setPeeredReference(org.onap.policy.apex.service. - * parameters. eventhandler.EventHandlerPeeredMode, org.onap.policy.apex.service.engine.event.PeeredReference) + /** + * {@inheritDoc}. */ @Override public void setPeeredReference(final EventHandlerPeeredMode peeredMode, final PeeredReference peeredReference) { @@ -249,10 +235,8 @@ public class ApexRestServerConsumer implements ApexEventConsumer, Runnable { .entity("{'errorMessage', '" + errorMessage + "'}").build(); } - /* - * (non-Javadoc) - * - * @see java.lang.Runnable#run() + /** + * {@inheritDoc}. */ @Override public void run() { @@ -267,10 +251,8 @@ public class ApexRestServerConsumer implements ApexEventConsumer, Runnable { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.apps.uservice.consumer.ApexEventConsumer#stop() + /** + * {@inheritDoc}. */ @Override public void stop() { diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/main/java/org/onap/policy/apex/plugins/event/carrier/restserver/ApexRestServerProducer.java b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/main/java/org/onap/policy/apex/plugins/event/carrier/restserver/ApexRestServerProducer.java index b228ccbf0..aabf16641 100644 --- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/main/java/org/onap/policy/apex/plugins/event/carrier/restserver/ApexRestServerProducer.java +++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/main/java/org/onap/policy/apex/plugins/event/carrier/restserver/ApexRestServerProducer.java @@ -48,11 +48,8 @@ public class ApexRestServerProducer implements ApexEventProducer { // The peer references for this event handler private Map<EventHandlerPeeredMode, PeeredReference> peerReferenceMap = new EnumMap<>(EventHandlerPeeredMode.class); - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventProducer#init(java.lang.String, - * org.onap.policy.apex.service.parameters.eventhandler.EventHandlerParameters) + /** + * {@inheritDoc}. */ @Override public void init(final String producerName, final EventHandlerParameters producerParameters) @@ -90,43 +87,32 @@ public class ApexRestServerProducer implements ApexEventProducer { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventProducer#getName() + /** + * {@inheritDoc}. */ @Override public String getName() { return name; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventProducer#getPeeredReference(org.onap.policy.apex.service. - * parameters. eventhandler.EventHandlerPeeredMode) + /** + * {@inheritDoc}. */ @Override public PeeredReference getPeeredReference(final EventHandlerPeeredMode peeredMode) { return peerReferenceMap.get(peeredMode); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventProducer#setPeeredReference(org.onap.policy.apex.service. - * parameters. eventhandler.EventHandlerPeeredMode, org.onap.policy.apex.service.engine.event.PeeredReference) + /** + * {@inheritDoc}. */ @Override public void setPeeredReference(final EventHandlerPeeredMode peeredMode, final PeeredReference peeredReference) { peerReferenceMap.put(peeredMode, peeredReference); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventProducer#sendEvent(long, java.lang. String, - * java.lang.Object) + /** + * {@inheritDoc}. */ @Override public void sendEvent(final long executionId, final Properties executionProperties, final String eventName, @@ -159,10 +145,8 @@ public class ApexRestServerProducer implements ApexEventProducer { synchronousEventCache.cacheSynchronizedEventFromApex(executionId, event); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventProducer#stop() + /** + * {@inheritDoc}. */ @Override public void stop() { diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/main/java/org/onap/policy/apex/plugins/event/carrier/restserver/RestServerCarrierTechnologyParameters.java b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/main/java/org/onap/policy/apex/plugins/event/carrier/restserver/RestServerCarrierTechnologyParameters.java index 7f6a09e11..9a98588a5 100644 --- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/main/java/org/onap/policy/apex/plugins/event/carrier/restserver/RestServerCarrierTechnologyParameters.java +++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/main/java/org/onap/policy/apex/plugins/event/carrier/restserver/RestServerCarrierTechnologyParameters.java @@ -101,10 +101,8 @@ public class RestServerCarrierTechnologyParameters extends CarrierTechnologyPara return port; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.apps.uservice.parameters.ApexParameterValidator#validate() + /** + * {@inheritDoc}. */ @Override public GroupValidationResult validate() { diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/test/java/org/onap/policy/apex/plugins/event/carrier/restserver/SupportApexEventReceiver.java b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/test/java/org/onap/policy/apex/plugins/event/carrier/restserver/SupportApexEventReceiver.java index 8f6e72b14..1831aea25 100644 --- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/test/java/org/onap/policy/apex/plugins/event/carrier/restserver/SupportApexEventReceiver.java +++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/test/java/org/onap/policy/apex/plugins/event/carrier/restserver/SupportApexEventReceiver.java @@ -34,10 +34,8 @@ public class SupportApexEventReceiver implements ApexEventReceiver { private Object lastEvent; private int eventCount; - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventReceiver#receiveEvent(long, java.lang.Object) + /** + * {@inheritDoc}. */ @Override public void receiveEvent(final long executionId, final Properties executionProperties, final Object event) @@ -47,10 +45,8 @@ public class SupportApexEventReceiver implements ApexEventReceiver { this.eventCount++; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventReceiver#receiveEvent(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public void receiveEvent(final Properties executionProperties, final Object event) throws ApexEventException { diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/src/main/java/org/onap/policy/apex/plugins/event/carrier/websocket/ApexWebSocketConsumer.java b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/src/main/java/org/onap/policy/apex/plugins/event/carrier/websocket/ApexWebSocketConsumer.java index f6ed6895d..87a88714e 100644 --- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/src/main/java/org/onap/policy/apex/plugins/event/carrier/websocket/ApexWebSocketConsumer.java +++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/src/main/java/org/onap/policy/apex/plugins/event/carrier/websocket/ApexWebSocketConsumer.java @@ -102,10 +102,8 @@ public class ApexWebSocketConsumer implements ApexEventConsumer, WsStringMessage } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventConsumer#start() + /** + * {@inheritDoc}. */ @Override public void start() { @@ -116,42 +114,32 @@ public class ApexWebSocketConsumer implements ApexEventConsumer, WsStringMessage consumerThread.start(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventConsumer#getName() + /** + * {@inheritDoc}. */ @Override public String getName() { return name; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventConsumer#getPeeredReference(org.onap.policy.apex.service. - * parameters. eventhandler.EventHandlerPeeredMode) + /** + * {@inheritDoc}. */ @Override public PeeredReference getPeeredReference(final EventHandlerPeeredMode peeredMode) { return peerReferenceMap.get(peeredMode); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventConsumer#setPeeredReference(org.onap.policy.apex.service. - * parameters. eventhandler.EventHandlerPeeredMode, org.onap.policy.apex.service.engine.event.PeeredReference) + /** + * {@inheritDoc}. */ @Override public void setPeeredReference(final EventHandlerPeeredMode peeredMode, final PeeredReference peeredReference) { peerReferenceMap.put(peeredMode, peeredReference); } - /* - * (non-Javadoc) - * - * @see java.lang.Runnable#run() + /** + * {@inheritDoc}. */ @Override public void run() { @@ -160,10 +148,8 @@ public class ApexWebSocketConsumer implements ApexEventConsumer, WsStringMessage } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.apps.uservice.producer.ApexEventProducer#stop() + /** + * {@inheritDoc}. */ @Override public void stop() { @@ -173,12 +159,8 @@ public class ApexWebSocketConsumer implements ApexEventConsumer, WsStringMessage stopOrderedFlag = true; } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.core.infrastructure.messaging.stringmessaging.WSStringMessageListener#receiveString(java. - * lang. String) + /** + * {@inheritDoc}. */ @Override public void receiveString(final String eventString) { diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/src/main/java/org/onap/policy/apex/plugins/event/carrier/websocket/ApexWebSocketProducer.java b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/src/main/java/org/onap/policy/apex/plugins/event/carrier/websocket/ApexWebSocketProducer.java index 07b6d42e6..407d73705 100644 --- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/src/main/java/org/onap/policy/apex/plugins/event/carrier/websocket/ApexWebSocketProducer.java +++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/src/main/java/org/onap/policy/apex/plugins/event/carrier/websocket/ApexWebSocketProducer.java @@ -90,43 +90,32 @@ public class ApexWebSocketProducer implements ApexEventProducer, WsStringMessage } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventProducer#getName() + /** + * {@inheritDoc}. */ @Override public String getName() { return name; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventProducer#getPeeredReference(org.onap.policy.apex.service. - * parameters. eventhandler.EventHandlerPeeredMode) + /** + * {@inheritDoc}. */ @Override public PeeredReference getPeeredReference(final EventHandlerPeeredMode peeredMode) { return peerReferenceMap.get(peeredMode); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventProducer#setPeeredReference(org.onap.policy.apex.service. - * parameters. eventhandler.EventHandlerPeeredMode, org.onap.policy.apex.service.engine.event.PeeredReference) + /** + * {@inheritDoc}. */ @Override public void setPeeredReference(final EventHandlerPeeredMode peeredMode, final PeeredReference peeredReference) { peerReferenceMap.put(peeredMode, peeredReference); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.apps.uservice.producer.ApexEventProducer#sendEvent(long, java.lang.String, - * java.lang.Object) + /** + * {@inheritDoc}. */ @Override public void sendEvent(final long executionId, final Properties executionProperties, final String eventName, @@ -141,10 +130,8 @@ public class ApexWebSocketProducer implements ApexEventProducer, WsStringMessage wsStringMessager.sendString((String) event); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.apps.uservice.producer.ApexEventProducer#stop() + /** + * {@inheritDoc}. */ @Override public void stop() { @@ -153,12 +140,8 @@ public class ApexWebSocketProducer implements ApexEventProducer, WsStringMessage } } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.core.infrastructure.messaging.stringmessaging.WSStringMessageListener#receiveString(java. - * lang. String) + /** + * {@inheritDoc}. */ @Override public void receiveString(final String messageString) { diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/src/main/java/org/onap/policy/apex/plugins/event/carrier/websocket/WebSocketCarrierTechnologyParameters.java b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/src/main/java/org/onap/policy/apex/plugins/event/carrier/websocket/WebSocketCarrierTechnologyParameters.java index 1fc18f6e2..c77aac9a9 100644 --- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/src/main/java/org/onap/policy/apex/plugins/event/carrier/websocket/WebSocketCarrierTechnologyParameters.java +++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/src/main/java/org/onap/policy/apex/plugins/event/carrier/websocket/WebSocketCarrierTechnologyParameters.java @@ -93,10 +93,8 @@ public class WebSocketCarrierTechnologyParameters extends CarrierTechnologyParam return wsClient; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.apps.uservice.parameters.ApexParameterValidator#validate() + /** + * {@inheritDoc}. */ @Override public GroupValidationResult validate() { diff --git a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/src/main/java/org/onap/policy/apex/plugins/event/protocol/jms/Apex2JmsObjectEventConverter.java b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/src/main/java/org/onap/policy/apex/plugins/event/protocol/jms/Apex2JmsObjectEventConverter.java index 25aa4f8ee..fe11cdca3 100644 --- a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/src/main/java/org/onap/policy/apex/plugins/event/protocol/jms/Apex2JmsObjectEventConverter.java +++ b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/src/main/java/org/onap/policy/apex/plugins/event/protocol/jms/Apex2JmsObjectEventConverter.java @@ -69,10 +69,8 @@ public final class Apex2JmsObjectEventConverter implements ApexEventProtocolConv } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventConverter#toApexEvent(java.lang.String, java.lang.Object) + /** + * {@inheritDoc}. */ @Override public List<ApexEvent> toApexEvent(final String eventName, final Object eventObject) throws ApexEventException { @@ -125,11 +123,8 @@ public final class Apex2JmsObjectEventConverter implements ApexEventProtocolConv return eventList; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventConverter#fromApexEvent - * (org.onap.policy.apex.service.engine.event.ApexEvent) + /** + * {@inheritDoc}. */ @Override public Object fromApexEvent(final ApexEvent apexEvent) throws ApexEventException { diff --git a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/src/main/java/org/onap/policy/apex/plugins/event/protocol/jms/Apex2JmsTextEventConverter.java b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/src/main/java/org/onap/policy/apex/plugins/event/protocol/jms/Apex2JmsTextEventConverter.java index 55548b9d7..b938eaf91 100644 --- a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/src/main/java/org/onap/policy/apex/plugins/event/protocol/jms/Apex2JmsTextEventConverter.java +++ b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/src/main/java/org/onap/policy/apex/plugins/event/protocol/jms/Apex2JmsTextEventConverter.java @@ -40,10 +40,8 @@ import org.slf4j.ext.XLoggerFactory; public final class Apex2JmsTextEventConverter extends Apex2JsonEventConverter { private static final XLogger LOGGER = XLoggerFactory.getXLogger(Apex2JmsTextEventConverter.class); - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventConverter#toApexEvent(java.lang.String, java.lang.Object) + /** + * {@inheritDoc}. */ @Override public List<ApexEvent> toApexEvent(final String eventName, final Object eventObject) throws ApexEventException { @@ -74,12 +72,8 @@ public final class Apex2JmsTextEventConverter extends Apex2JsonEventConverter { return super.toApexEvent(eventName, jmsString); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.service.engine.event.ApexEventConverter#fromApexEvent(org.onap.policy.apex.service.engine. - * event. ApexEvent) + /** + * {@inheritDoc}. */ @Override public Object fromApexEvent(final ApexEvent apexEvent) throws ApexEventException { diff --git a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/main/java/org/onap/policy/apex/plugins/event/protocol/xml/Apex2XmlEventConverter.java b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/main/java/org/onap/policy/apex/plugins/event/protocol/xml/Apex2XmlEventConverter.java index 767c24fdd..cea49001d 100644 --- a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/main/java/org/onap/policy/apex/plugins/event/protocol/xml/Apex2XmlEventConverter.java +++ b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/main/java/org/onap/policy/apex/plugins/event/protocol/xml/Apex2XmlEventConverter.java @@ -94,21 +94,16 @@ public final class Apex2XmlEventConverter implements ApexEventProtocolConverter } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventProtocolConverter#init(org.onap.policy.apex.service. - * parameters. eventprotocol.EventProtocolParameters) + /** + * {@inheritDoc}. */ @Override public void init(final EventProtocolParameters parameters) { // No initialization necessary on this class } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventConverter#toApexEvent(java.lang.String, java.lang.Object) + /** + * {@inheritDoc}. */ @Override public List<ApexEvent> toApexEvent(final String eventName, final Object eventObject) throws ApexEventException { @@ -156,12 +151,8 @@ public final class Apex2XmlEventConverter implements ApexEventProtocolConverter return eventList; } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.service.engine.event.ApexEventConverter#fromApexEvent(org.onap.policy.apex.service.engine. - * event. ApexEvent) + /** + * {@inheritDoc}. */ @Override public String fromApexEvent(final ApexEvent apexEvent) throws ApexEventException { diff --git a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/src/main/java/org/onap/policy/apex/plugins/event/protocol/yaml/Apex2YamlEventConverter.java b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/src/main/java/org/onap/policy/apex/plugins/event/protocol/yaml/Apex2YamlEventConverter.java index f3afdde32..17c535990 100644 --- a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/src/main/java/org/onap/policy/apex/plugins/event/protocol/yaml/Apex2YamlEventConverter.java +++ b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/src/main/java/org/onap/policy/apex/plugins/event/protocol/yaml/Apex2YamlEventConverter.java @@ -53,11 +53,8 @@ public class Apex2YamlEventConverter implements ApexEventProtocolConverter { // The parameters for the YAML event protocol private YamlEventProtocolParameters yamlPars; - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventProtocolConverter#init(org.onap.policy. - * apex.service.parameters.eventprotocol.EventProtocolParameters) + /** + * {@inheritDoc}. */ @Override public void init(final EventProtocolParameters parameters) { @@ -71,10 +68,8 @@ public class Apex2YamlEventConverter implements ApexEventProtocolConverter { yamlPars = (YamlEventProtocolParameters) parameters; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventConverter#toApexEvent(java.lang.String, java.lang.Object) + /** + * {@inheritDoc}. */ @Override public List<ApexEvent> toApexEvent(final String eventName, final Object eventObject) throws ApexEventException { @@ -127,11 +122,8 @@ public class Apex2YamlEventConverter implements ApexEventProtocolConverter { return eventList; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventConverter#fromApexEvent(org.onap.policy. - * apex.service.engine.event.ApexEvent) + /** + * {@inheritDoc}. */ @Override public Object fromApexEvent(final ApexEvent apexEvent) throws ApexEventException { diff --git a/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/src/test/java/org/onap/policy/apex/plugins/persistence/jpa/eclipselink/entities/ArtifactKeyTestEntity.java b/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/src/test/java/org/onap/policy/apex/plugins/persistence/jpa/eclipselink/entities/ArtifactKeyTestEntity.java index cd0d7d16d..dad167d02 100644 --- a/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/src/test/java/org/onap/policy/apex/plugins/persistence/jpa/eclipselink/entities/ArtifactKeyTestEntity.java +++ b/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/src/test/java/org/onap/policy/apex/plugins/persistence/jpa/eclipselink/entities/ArtifactKeyTestEntity.java @@ -76,20 +76,16 @@ public class ArtifactKeyTestEntity extends AxConcept { this.doubleValue = doubleValue; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKey() + /** + * {@inheritDoc}. */ @Override public AxArtifactKey getKey() { return key; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKeys() + /** + * {@inheritDoc}. */ @Override public List<AxKey> getKeys() { @@ -132,44 +128,32 @@ public class ArtifactKeyTestEntity extends AxConcept { this.doubleValue = doubleValue; } - /* - * (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(final AxValidationResult result) { return key.validate(result); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#clean() + /** + * {@inheritDoc}. */ @Override public void clean() { key.clean(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { return "ArtifactKeyTestEntity [key=" + key + ", doubleValue=" + doubleValue + "]"; } - /* - * (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(final AxConcept target) { @@ -188,10 +172,8 @@ public class ArtifactKeyTestEntity extends AxConcept { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -201,10 +183,8 @@ public class ArtifactKeyTestEntity extends AxConcept { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -228,10 +208,8 @@ public class ArtifactKeyTestEntity extends AxConcept { return (Double.compare(doubleValue, other.doubleValue) == 0); } - /* - * (non-Javadoc) - * - * @see java.lang.Comparable#compareTo(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public int compareTo(final AxConcept otherObj) { diff --git a/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/src/test/java/org/onap/policy/apex/plugins/persistence/jpa/eclipselink/entities/ReferenceKeyTestEntity.java b/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/src/test/java/org/onap/policy/apex/plugins/persistence/jpa/eclipselink/entities/ReferenceKeyTestEntity.java index eb5db7145..ba857223e 100644 --- a/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/src/test/java/org/onap/policy/apex/plugins/persistence/jpa/eclipselink/entities/ReferenceKeyTestEntity.java +++ b/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/src/test/java/org/onap/policy/apex/plugins/persistence/jpa/eclipselink/entities/ReferenceKeyTestEntity.java @@ -79,20 +79,16 @@ public class ReferenceKeyTestEntity extends AxConcept { this.doubleValue = doubleValue; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKey() + /** + * {@inheritDoc}. */ @Override public AxReferenceKey getKey() { return key; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKeys() + /** + * {@inheritDoc}. */ @Override public List<AxKey> getKeys() { @@ -135,44 +131,32 @@ public class ReferenceKeyTestEntity extends AxConcept { this.doubleValue = doubleValue; } - /* - * (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(final AxValidationResult result) { return key.validate(result); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#clean() + /** + * {@inheritDoc}. */ @Override public void clean() { key.clean(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { return "ReferenceKeyTestEntity [key=" + key + ", doubleValue=" + doubleValue + "]"; } - /* - * (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(final AxConcept target) { @@ -191,10 +175,8 @@ public class ReferenceKeyTestEntity extends AxConcept { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -204,10 +186,8 @@ public class ReferenceKeyTestEntity extends AxConcept { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -231,10 +211,8 @@ public class ReferenceKeyTestEntity extends AxConcept { return (Double.compare(doubleValue, other.doubleValue) == 0); } - /* - * (non-Javadoc) - * - * @see java.lang.Comparable#compareTo(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public int compareTo(final AxConcept otherObj) { diff --git a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/engdep/EngDepMessageListener.java b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/engdep/EngDepMessageListener.java index 1b84c0a92..358069657 100644 --- a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/engdep/EngDepMessageListener.java +++ b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/engdep/EngDepMessageListener.java @@ -110,10 +110,8 @@ public class EngDepMessageListener implements MessageListener<Message>, Runnable messageQueue.add(data); } - /* - * (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/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/ApexEvent.java b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/ApexEvent.java index 06b9ddf53..b820ee3fd 100644 --- a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/ApexEvent.java +++ b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/ApexEvent.java @@ -232,10 +232,8 @@ public class ApexEvent extends HashMap<String, Object> implements Serializable { * Map overrides from here */ - /* - * (non-Javadoc) - * - * @see java.util.Map#put(java.lang.Object, java.lang.Object) + /** + * {@inheritDoc}. */ @Override public Object put(final String key, final Object value) { @@ -250,10 +248,8 @@ public class ApexEvent extends HashMap<String, Object> implements Serializable { } } - /* - * (non-Javadoc) - * - * @see java.util.Map#putAll(java.util.Map) + /** + * {@inheritDoc}. */ @Override public void putAll(final Map<? extends String, ? extends Object> incomingMap) { diff --git a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/ApexPeriodicEventGenerator.java b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/ApexPeriodicEventGenerator.java index fbb1ec053..198e70194 100644 --- a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/ApexPeriodicEventGenerator.java +++ b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/ApexPeriodicEventGenerator.java @@ -163,10 +163,8 @@ public class ApexPeriodicEventGenerator extends TimerTask { return true; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { diff --git a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/SynchronousEventCache.java b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/SynchronousEventCache.java index 5e48a5894..0fbb009b9 100644 --- a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/SynchronousEventCache.java +++ b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/SynchronousEventCache.java @@ -170,10 +170,8 @@ public class SynchronousEventCache extends PeeredReference implements Runnable { } } - /* - * (non-Javadoc) - * - * @see java.lang.Runnable#run() + /** + * {@inheritDoc}. */ @Override public void run() { diff --git a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/apexprotocolplugin/Apex2ApexEventConverter.java b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/apexprotocolplugin/Apex2ApexEventConverter.java index b73aeb567..64b4aa88d 100644 --- a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/apexprotocolplugin/Apex2ApexEventConverter.java +++ b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/apexprotocolplugin/Apex2ApexEventConverter.java @@ -41,12 +41,8 @@ import org.slf4j.ext.XLoggerFactory; public class Apex2ApexEventConverter implements ApexEventProtocolConverter { private static final XLogger LOGGER = XLoggerFactory.getXLogger(Apex2ApexEventConverter.class); - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.service.engine.event.ApexEventProtocolConverter#init(org.onap.policy. - * apex. service.parameters.eventprotocol.EventProtocolParameters) + /** + * {@inheritDoc}. */ @Override public void init(final EventProtocolParameters parameters) { @@ -58,12 +54,8 @@ public class Apex2ApexEventConverter implements ApexEventProtocolConverter { } } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.service.engine.event.ApexEventConverter#toApexEvent(java.lang.String, - * java.lang.Object) + /** + * {@inheritDoc}. */ @Override public List<ApexEvent> toApexEvent(final String eventName, final Object eventObject) throws ApexEventException { @@ -120,12 +112,8 @@ public class Apex2ApexEventConverter implements ApexEventProtocolConverter { return eventList; } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.service.engine.event.ApexEventConverter#fromApexEvent(org.onap.policy. - * apex.service.engine.event.ApexEvent) + /** + * {@inheritDoc}. */ @Override public Object fromApexEvent(final ApexEvent apexEvent) throws ApexEventException { diff --git a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/enevent/ApexEvent2EnEventConverter.java b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/enevent/ApexEvent2EnEventConverter.java index 5fce2c89f..bd0753d02 100644 --- a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/enevent/ApexEvent2EnEventConverter.java +++ b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/enevent/ApexEvent2EnEventConverter.java @@ -57,12 +57,8 @@ public final class ApexEvent2EnEventConverter implements ApexEventConverter { this.apexEngine = apexEngine; } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.service.engine.event.ApexEventConverter#toApexEvent(java.lang.String, - * java.lang.Object) + /** + * {@inheritDoc}. */ @Override public List<ApexEvent> toApexEvent(final String eventName, final Object event) throws ApexException { @@ -105,12 +101,8 @@ public final class ApexEvent2EnEventConverter implements ApexEventConverter { return eventList; } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.service.engine.event.ApexEventConverter#fromApexEvent(org.onap.policy. - * apex.service.engine.event.ApexEvent) + /** + * {@inheritDoc}. */ @Override public EnEvent fromApexEvent(final ApexEvent apexEvent) throws ApexException { diff --git a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/eventrequestor/EventRequestorCarrierTechnologyParameters.java b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/eventrequestor/EventRequestorCarrierTechnologyParameters.java index 0d2be38f8..6f352599c 100644 --- a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/eventrequestor/EventRequestorCarrierTechnologyParameters.java +++ b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/eventrequestor/EventRequestorCarrierTechnologyParameters.java @@ -56,18 +56,16 @@ public class EventRequestorCarrierTechnologyParameters extends CarrierTechnology this.setEventConsumerPluginClass(EVENT_REQUESTOR_EVENT_CONSUMER_PLUGIN_CLASS); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.apps.uservice.parameters.ApexParameterValidator#validate() + /** + * {@inheritDoc}. */ @Override public GroupValidationResult validate() { return new GroupValidationResult(this); } - /* (non-Javadoc) - * @see org.onap.policy.common.parameters.ParameterGroup#getName() + /** + * {@inheritDoc}. */ @Override public String getName() { diff --git a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/eventrequestor/EventRequestorConsumer.java b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/eventrequestor/EventRequestorConsumer.java index 8d845e0ce..da945209b 100644 --- a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/eventrequestor/EventRequestorConsumer.java +++ b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/eventrequestor/EventRequestorConsumer.java @@ -115,10 +115,8 @@ public class EventRequestorConsumer implements ApexEventConsumer, Runnable { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventConsumer#start() + /** + * {@inheritDoc}. */ @Override public void start() { @@ -129,10 +127,8 @@ public class EventRequestorConsumer implements ApexEventConsumer, Runnable { consumerThread.start(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventConsumer#getName() + /** + * {@inheritDoc}. */ @Override public String getName() { @@ -148,33 +144,24 @@ public class EventRequestorConsumer implements ApexEventConsumer, Runnable { return eventsReceived; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventConsumer#getPeeredReference(org.onap. - * policy.apex.service.parameters.eventhandler.EventHandlerPeeredMode) + /** + * {@inheritDoc}. */ @Override public PeeredReference getPeeredReference(final EventHandlerPeeredMode peeredMode) { return peerReferenceMap.get(peeredMode); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventConsumer#setPeeredReference(org.onap. - * policy.apex.service.parameters.eventhandler.EventHandlerPeeredMode, - * org.onap.policy.apex.service.engine.event.PeeredReference) + /** + * {@inheritDoc}. */ @Override public void setPeeredReference(final EventHandlerPeeredMode peeredMode, final PeeredReference peeredReference) { peerReferenceMap.put(peeredMode, peeredReference); } - /* - * (non-Javadoc) - * - * @see java.lang.Runnable#run() + /** + * {@inheritDoc}. */ @Override public void run() { @@ -202,10 +189,8 @@ public class EventRequestorConsumer implements ApexEventConsumer, Runnable { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.apps.uservice.producer.ApexEventConsumer#stop() + /** + * {@inheritDoc}. */ @Override public void stop() { diff --git a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/eventrequestor/EventRequestorProducer.java b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/eventrequestor/EventRequestorProducer.java index 18429dbd2..b08b7eca3 100644 --- a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/eventrequestor/EventRequestorProducer.java +++ b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/eventrequestor/EventRequestorProducer.java @@ -56,11 +56,8 @@ public class EventRequestorProducer implements ApexEventProducer { // The number of events sent private int eventsSent = 0; - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventProducer#init(java.lang.String, - * org.onap.policy.apex.service.parameters.eventhandler.EventHandlerParameters) + /** + * {@inheritDoc}. */ @Override public void init(final String producerName, final EventHandlerParameters producerParameters) @@ -85,10 +82,8 @@ public class EventRequestorProducer implements ApexEventProducer { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventProducer#getName() + /** + * {@inheritDoc}. */ @Override public String getName() { diff --git a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/filecarrierplugin/FileCarrierTechnologyParameters.java b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/filecarrierplugin/FileCarrierTechnologyParameters.java index 31cd28d8d..91551e57e 100644 --- a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/filecarrierplugin/FileCarrierTechnologyParameters.java +++ b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/filecarrierplugin/FileCarrierTechnologyParameters.java @@ -167,10 +167,8 @@ public class FileCarrierTechnologyParameters extends CarrierTechnologyParameters this.startDelay = startDelay; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.parameters.carriertechnology.CarrierTechnologyParameters# toString() + /** + * {@inheritDoc}. */ @Override public String toString() { @@ -179,20 +177,16 @@ public class FileCarrierTechnologyParameters extends CarrierTechnologyParameters + startDelay + "]"; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.common.parameters.ParameterGroup#getName() + /** + * {@inheritDoc}. */ @Override public String getName() { return this.getLabel(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.apps.uservice.parameters.ApexParameterValidator#validate() + /** + * {@inheritDoc}. */ @Override public GroupValidationResult validate() { diff --git a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/filecarrierplugin/consumer/ApexFileEventConsumer.java b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/filecarrierplugin/consumer/ApexFileEventConsumer.java index 076c031e9..e99663c9e 100644 --- a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/filecarrierplugin/consumer/ApexFileEventConsumer.java +++ b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/filecarrierplugin/consumer/ApexFileEventConsumer.java @@ -87,11 +87,8 @@ public class ApexFileEventConsumer implements ApexEventConsumer, Runnable { return nextExecutionID.getAndIncrement(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.apps.uservice.consumer.ApexEventConsumer#init(org.onap.policy.apex.apps. - * uservice.consumer.ApexEventReceiver) + /** + * {@inheritDoc}. */ @Override public void init(final String name, final EventHandlerParameters consumerParameters, @@ -140,43 +137,32 @@ public class ApexFileEventConsumer implements ApexEventConsumer, Runnable { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventConsumer#getName() + /** + * {@inheritDoc}. */ @Override public String getName() { return consumerName; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventConsumer#getPeeredReference(org.onap. - * policy.apex.service.parameters.eventhandler.EventHandlerPeeredMode) + /** + * {@inheritDoc}. */ @Override public PeeredReference getPeeredReference(final EventHandlerPeeredMode peeredMode) { return peerReferenceMap.get(peeredMode); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventConsumer#setPeeredReference(org.onap. - * policy.apex.service.parameters.eventhandler.EventHandlerPeeredMode, - * org.onap.policy.apex.service.engine.event.PeeredReference) + /** + * {@inheritDoc}. */ @Override public void setPeeredReference(final EventHandlerPeeredMode peeredMode, final PeeredReference peeredReference) { peerReferenceMap.put(peeredMode, peeredReference); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventConsumer#start() + /** + * {@inheritDoc}. */ @Override public void start() { @@ -187,10 +173,8 @@ public class ApexFileEventConsumer implements ApexEventConsumer, Runnable { consumerThread.start(); } - /* - * (non-Javadoc) - * - * @see java.lang.Runnable#run() + /** + * {@inheritDoc}. */ @Override public void run() { @@ -229,10 +213,8 @@ public class ApexFileEventConsumer implements ApexEventConsumer, Runnable { } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.apps.uservice.producer.ApexEventProducer#stop() + /** + * {@inheritDoc}. */ @Override public void stop() { diff --git a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/filecarrierplugin/consumer/CharacterDelimitedTextBlockReader.java b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/filecarrierplugin/consumer/CharacterDelimitedTextBlockReader.java index bd7310d0a..243281965 100644 --- a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/filecarrierplugin/consumer/CharacterDelimitedTextBlockReader.java +++ b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/filecarrierplugin/consumer/CharacterDelimitedTextBlockReader.java @@ -68,23 +68,16 @@ public class CharacterDelimitedTextBlockReader implements TextBlockReader { this.endTagChar = charDelimitedParameters.getEndChar(); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.service.engine.event.impl.filecarrierplugin.consumer.TextBlockReader#init( - * java.io.InputStream) + /** + * {@inheritDoc}. */ @Override public void init(final InputStream incomingInputStream) { this.inputStream = incomingInputStream; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.impl.filecarrierplugin.consumer.TextBlockReader# - * readTextBlock() + /** + * {@inheritDoc}. */ @Override public TextBlock readTextBlock() throws IOException { diff --git a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/filecarrierplugin/consumer/HeaderDelimitedTextBlockReader.java b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/filecarrierplugin/consumer/HeaderDelimitedTextBlockReader.java index 9786a3623..eecd47c17 100644 --- a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/filecarrierplugin/consumer/HeaderDelimitedTextBlockReader.java +++ b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/filecarrierplugin/consumer/HeaderDelimitedTextBlockReader.java @@ -100,11 +100,8 @@ public class HeaderDelimitedTextBlockReader implements TextBlockReader, Runnable } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.impl.filecarrierplugin.consumer.TextBlockReader# init( - * java.io.InputStream) + /** + * {@inheritDoc}. */ @Override public void init(final InputStream incomingInputStream) { @@ -116,10 +113,8 @@ public class HeaderDelimitedTextBlockReader implements TextBlockReader, Runnable textConsumputionThread.start(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.impl.filecarrierplugin.consumer.TextBlockReader# readTextBlock() + /** + * {@inheritDoc}. */ @Override public TextBlock readTextBlock() throws IOException { @@ -171,10 +166,8 @@ public class HeaderDelimitedTextBlockReader implements TextBlockReader, Runnable } } - /* - * (non-Javadoc) - * - * @see java.lang.Runnable#run() + /** + * {@inheritDoc}. */ @Override public void run() { diff --git a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/jsonprotocolplugin/Apex2JsonEventConverter.java b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/jsonprotocolplugin/Apex2JsonEventConverter.java index 549947e9b..b1c62b298 100644 --- a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/jsonprotocolplugin/Apex2JsonEventConverter.java +++ b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/jsonprotocolplugin/Apex2JsonEventConverter.java @@ -60,11 +60,8 @@ public class Apex2JsonEventConverter implements ApexEventProtocolConverter { // The parameters for the JSON event protocol private JsonEventProtocolParameters jsonPars; - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventProtocolConverter#init(org.onap.policy. - * apex.service.parameters.eventprotocol.EventProtocolParameters) + /** + * {@inheritDoc}. */ @Override public void init(final EventProtocolParameters parameters) { @@ -78,10 +75,8 @@ public class Apex2JsonEventConverter implements ApexEventProtocolConverter { jsonPars = (JsonEventProtocolParameters) parameters; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventConverter#toApexEvent(java.lang.String, java.lang.Object) + /** + * {@inheritDoc}. */ @Override public List<ApexEvent> toApexEvent(final String eventName, final Object eventObject) throws ApexEventException { @@ -162,11 +157,8 @@ public class Apex2JsonEventConverter implements ApexEventProtocolConverter { return eventList; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventConverter#fromApexEvent(org.onap.policy. - * apex.service.engine.event.ApexEvent) + /** + * {@inheritDoc}. */ @Override public Object fromApexEvent(final ApexEvent apexEvent) throws ApexEventException { diff --git a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/jsonprotocolplugin/JsonEventProtocolParameters.java b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/jsonprotocolplugin/JsonEventProtocolParameters.java index d8cd12829..b5aa1cde8 100644 --- a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/jsonprotocolplugin/JsonEventProtocolParameters.java +++ b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/jsonprotocolplugin/JsonEventProtocolParameters.java @@ -92,10 +92,8 @@ public class JsonEventProtocolParameters extends EventProtocolTextCharDelimitedP this.setEventProtocolPluginClass(Apex2JsonEventConverter.class.getName()); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.common.parameters.ParameterGroup#getName() + /** + * {@inheritDoc}. */ @Override public String getName() { 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 3b20d3d68..2c649c274 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 @@ -136,10 +136,8 @@ public class ApexMain { * called. */ private class ApexMainShutdownHookClass extends Thread { - /* - * (non-Javadoc) - * - * @see java.lang.Runnable#run() + /** + * {@inheritDoc}. */ @Override public void run() { diff --git a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/runtime/impl/EnEventListenerImpl.java b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/runtime/impl/EnEventListenerImpl.java index abd6db2d9..877ac85f1 100644 --- a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/runtime/impl/EnEventListenerImpl.java +++ b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/runtime/impl/EnEventListenerImpl.java @@ -55,12 +55,8 @@ public final class EnEventListenerImpl implements EnEventListener { this.apexEnEventConverter = apexEnEventConverter; } - /* - * (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(final EnEvent enEvent) throws ApexException { diff --git a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/runtime/impl/EngineServiceImpl.java b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/runtime/impl/EngineServiceImpl.java index ee1a5dcdf..e9edd40e2 100644 --- a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/runtime/impl/EngineServiceImpl.java +++ b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/runtime/impl/EngineServiceImpl.java @@ -147,11 +147,8 @@ public final class EngineServiceImpl implements EngineService, EngineServiceEven return new EngineServiceImpl(engineServiceKey, threadCount, config.getPeriodicEventPeriod()); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#registerActionListener(java.lang. String, - * org.onap.policy.apex.service.engine.runtime.ApexEventListener) + /** + * {@inheritDoc}. */ @Override public void registerActionListener(final String listenerName, final ApexEventListener apexEventListener) { @@ -179,10 +176,8 @@ public final class EngineServiceImpl implements EngineService, EngineServiceEven LOGGER.exit(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#deregisterActionListener(java.lang. String) + /** + * {@inheritDoc}. */ @Override public void deregisterActionListener(final String listenerName) { @@ -198,40 +193,32 @@ public final class EngineServiceImpl implements EngineService, EngineServiceEven LOGGER.exit(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#getEngineServiceEventInterface() + /** + * {@inheritDoc}. */ @Override public EngineServiceEventInterface getEngineServiceEventInterface() { return this; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#getKey() + /** + * {@inheritDoc}. */ @Override public AxArtifactKey getKey() { return engineServiceKey; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#getInfo() + /** + * {@inheritDoc}. */ @Override public Collection<AxArtifactKey> getEngineKeys() { return engineWorkerMap.keySet(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#getApexModelKey() + /** + * {@inheritDoc}. */ @Override public AxArtifactKey getApexModelKey() { @@ -242,11 +229,8 @@ public final class EngineServiceImpl implements EngineService, EngineServiceEven return engineWorkerMap.entrySet().iterator().next().getValue().getApexModelKey(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#updateModel(org.onap.policy.apex.model. - * basicmodel.concepts.AxArtifactKey, java.lang.String, boolean) + /** + * {@inheritDoc}. */ @Override public void updateModel(final AxArtifactKey incomingEngineServiceKey, final String apexModelString, @@ -283,11 +267,8 @@ public final class EngineServiceImpl implements EngineService, EngineServiceEven LOGGER.exit(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#updateModel(org.onap.policy.apex.model. - * basicmodel.concepts.AxArtifactKey, org.onap.policy.apex.model.policymodel.concepts.AxPolicyModel, boolean) + /** + * {@inheritDoc}. */ @Override public void updateModel(final AxArtifactKey incomingEngineServiceKey, final AxPolicyModel apexModel, @@ -430,10 +411,8 @@ public final class EngineServiceImpl implements EngineService, EngineServiceEven } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#getState() + /** + * {@inheritDoc}. */ @Override public AxEngineState getState() { @@ -447,10 +426,8 @@ public final class EngineServiceImpl implements EngineService, EngineServiceEven return AxEngineState.STOPPED; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#startAll() + /** + * {@inheritDoc}. */ @Override public void startAll() throws ApexException { @@ -459,11 +436,8 @@ public final class EngineServiceImpl implements EngineService, EngineServiceEven } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#start(org.onap.policy.apex.core.model. - * concepts.AxArtifactKey) + /** + * {@inheritDoc}. */ @Override public void start(final AxArtifactKey engineKey) throws ApexException { @@ -493,10 +467,8 @@ public final class EngineServiceImpl implements EngineService, EngineServiceEven LOGGER.exit(engineKey); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#stop() + /** + * {@inheritDoc}. */ @Override public void stop() throws ApexException { @@ -517,11 +489,8 @@ public final class EngineServiceImpl implements EngineService, EngineServiceEven LOGGER.exit(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#stop(org.onap.policy.apex.core.model. - * concepts.AxArtifactKey) + /** + * {@inheritDoc}. */ @Override public void stop(final AxArtifactKey engineKey) throws ApexException { @@ -545,10 +514,8 @@ public final class EngineServiceImpl implements EngineService, EngineServiceEven LOGGER.exit(engineKey); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#clear() + /** + * {@inheritDoc}. */ @Override public void clear() throws ApexException { @@ -564,11 +531,8 @@ public final class EngineServiceImpl implements EngineService, EngineServiceEven LOGGER.exit(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#clear(org.onap.policy.apex.core.model. - * concepts.AxArtifactKey) + /** + * {@inheritDoc}. */ @Override public void clear(final AxArtifactKey engineKey) throws ApexException { @@ -610,11 +574,8 @@ public final class EngineServiceImpl implements EngineService, EngineServiceEven return true; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#isStarted(org.onap.policy.apex.model. - * basicmodel.concepts.AxArtifactKey) + /** + * {@inheritDoc}. */ @Override public boolean isStarted(final AxArtifactKey engineKey) { @@ -648,11 +609,8 @@ public final class EngineServiceImpl implements EngineService, EngineServiceEven return true; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#isStopped(org.onap.policy.apex.model. - * basicmodel.concepts.AxArtifactKey) + /** + * {@inheritDoc}. */ @Override public boolean isStopped(final AxArtifactKey engineKey) { @@ -670,10 +628,8 @@ public final class EngineServiceImpl implements EngineService, EngineServiceEven return engineWorkerMap.get(engineKey).isStopped(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#startPeriodicEvents(long) + /** + * {@inheritDoc}. */ @Override public void startPeriodicEvents(final long period) throws ApexException { @@ -693,10 +649,8 @@ public final class EngineServiceImpl implements EngineService, EngineServiceEven this.periodicEventPeriod = period; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#stopPeriodicEvents() + /** + * {@inheritDoc}. */ @Override public void stopPeriodicEvents() throws ApexException { @@ -712,11 +666,8 @@ public final class EngineServiceImpl implements EngineService, EngineServiceEven periodicEventPeriod = 0; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#getStatus(org.onap.policy.apex.core.model - * .concepts.AxArtifactKey) + /** + * {@inheritDoc}. */ @Override public String getStatus(final AxArtifactKey engineKey) throws ApexException { @@ -736,11 +687,8 @@ public final class EngineServiceImpl implements EngineService, EngineServiceEven return engineWorkerMap.get(engineKey).getStatus(engineKey); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#getRuntimeInfo(org.onap.policy.apex.core. - * model.concepts.AxArtifactKey) + /** + * {@inheritDoc}. */ @Override public String getRuntimeInfo(final AxArtifactKey engineKey) throws ApexException { @@ -760,11 +708,8 @@ public final class EngineServiceImpl implements EngineService, EngineServiceEven return engineWorkerMap.get(engineKey).getRuntimeInfo(engineKey); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineServiceEventInterface#sendEvent(org.onap.policy. - * apex.service.engine.event.ApexEvent) + /** + * {@inheritDoc}. */ @Override public void sendEvent(final ApexEvent event) { diff --git a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/runtime/impl/EngineWorker.java b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/runtime/impl/EngineWorker.java index 0ca7fe837..a24d9618a 100644 --- a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/runtime/impl/EngineWorker.java +++ b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/runtime/impl/EngineWorker.java @@ -126,31 +126,24 @@ final class EngineWorker implements EngineService { LOGGER.exit(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#registerActionListener(java.lang. String, - * org.onap.policy.apex.service.engine.runtime.ApexEventListener) + /** + * {@inheritDoc}. */ @Override public void registerActionListener(final String listenerName, final ApexEventListener apexEventListener) { engine.addEventListener(listenerName, new EnEventListenerImpl(apexEventListener, apexEnEventConverter)); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#deregisterActionListener(java.lang. String) + /** + * {@inheritDoc}. */ @Override public void deregisterActionListener(final String listenerName) { engine.removeEventListener(listenerName); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#getEngineServiceEventInterface() + /** + * {@inheritDoc}. */ @Override public EngineServiceEventInterface getEngineServiceEventInterface() { @@ -158,30 +151,24 @@ final class EngineWorker implements EngineService { "getEngineServiceEventInterface() call is not allowed on an Apex Engine Worker"); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#getKey() + /** + * {@inheritDoc}. */ @Override public AxArtifactKey getKey() { return engineWorkerKey; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#getInfo() + /** + * {@inheritDoc}. */ @Override public Collection<AxArtifactKey> getEngineKeys() { return Arrays.asList(engineWorkerKey); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#getApexModelKey() + /** + * {@inheritDoc}. */ @Override public AxArtifactKey getApexModelKey() { @@ -192,11 +179,8 @@ final class EngineWorker implements EngineService { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#updateModel(org.onap.policy.apex. model. - * basicmodel.concepts.AxArtifactKey, java.lang.String, boolean) + /** + * {@inheritDoc}. */ @Override public void updateModel(final AxArtifactKey engineKey, final String engineModel, final boolean forceFlag) @@ -219,11 +203,8 @@ final class EngineWorker implements EngineService { LOGGER.exit(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#updateModel(org.onap.policy.apex. model. - * basicmodel.concepts.AxArtifactKey, org.onap.policy.apex.model.policymodel.concepts.AxPolicyModel, boolean) + /** + * {@inheritDoc}. */ @Override public void updateModel(final AxArtifactKey engineKey, final AxPolicyModel apexModel, final boolean forceFlag) @@ -263,31 +244,24 @@ final class EngineWorker implements EngineService { LOGGER.exit(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#getState() + /** + * {@inheritDoc}. */ @Override public AxEngineState getState() { return engine.getState(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#startAll() + /** + * {@inheritDoc}. */ @Override public void startAll() throws ApexException { start(this.getKey()); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#start(org.onap.policy.apex.core. model. - * concepts.AxArtifactKey) + /** + * {@inheritDoc}. */ @Override public void start(final AxArtifactKey engineKey) throws ApexException { @@ -319,21 +293,16 @@ final class EngineWorker implements EngineService { LOGGER.exit(engineKey); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#stop() + /** + * {@inheritDoc}. */ @Override public void stop() throws ApexException { stop(this.getKey()); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#stop(org.onap.policy.apex.core. model. - * concepts.AxArtifactKey) + /** + * {@inheritDoc}. */ @Override public void stop(final AxArtifactKey engineKey) throws ApexException { @@ -364,21 +333,16 @@ final class EngineWorker implements EngineService { LOGGER.exit(engineKey); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#clear() + /** + * {@inheritDoc}. */ @Override public void clear() throws ApexException { clear(this.getKey()); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#clear(org.onap.policy.apex.core. model. - * concepts.AxArtifactKey) + /** + * {@inheritDoc}. */ @Override public void clear(final AxArtifactKey engineKey) throws ApexException { @@ -402,21 +366,16 @@ final class EngineWorker implements EngineService { LOGGER.exit(engineKey); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#isStarted() + /** + * {@inheritDoc}. */ @Override public boolean isStarted() { return isStarted(this.getKey()); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#isStarted(org.onap.policy.apex. model. - * basicmodel.concepts.AxArtifactKey) + /** + * {@inheritDoc}. */ @Override public boolean isStarted(final AxArtifactKey engineKey) { @@ -435,21 +394,16 @@ final class EngineWorker implements EngineService { return false; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#isStopped() + /** + * {@inheritDoc}. */ @Override public boolean isStopped() { return isStopped(this.getKey()); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#isStopped(org.onap.policy.apex. model. - * basicmodel.concepts.AxArtifactKey) + /** + * {@inheritDoc}. */ @Override public boolean isStopped(final AxArtifactKey engineKey) { @@ -468,31 +422,24 @@ final class EngineWorker implements EngineService { return false; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#startPeriodicEvents(long) + /** + * {@inheritDoc}. */ @Override public void startPeriodicEvents(final long period) { throw new UnsupportedOperationException("startPeriodicEvents() call is not allowed on an Apex Engine Worker"); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#stopPeriodicEvents() + /** + * {@inheritDoc}. */ @Override public void stopPeriodicEvents() { throw new UnsupportedOperationException("stopPeriodicEvents() call is not allowed on an Apex Engine Worker"); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#getStatus(org.onap.policy.apex.core .model - * .concepts.AxArtifactKey) + /** + * {@inheritDoc}. */ @Override public String getStatus(final AxArtifactKey engineKey) { @@ -513,11 +460,8 @@ final class EngineWorker implements EngineService { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#getRuntimeInfo(org.onap.policy.apex - * .core.model.concepts.AxArtifactKey) + /** + * {@inheritDoc}. */ @Override public String getRuntimeInfo(final AxArtifactKey engineKey) { @@ -629,10 +573,8 @@ final class EngineWorker implements EngineService { this.eventProcessingQueue = eventProcessingQueue; } - /* - * (non-Javadoc) - * - * @see java.lang.Runnable#run() + /** + * {@inheritDoc}. */ @Override public void run() { diff --git a/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/carriertechnology/CarrierTechnologyParameters.java b/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/carriertechnology/CarrierTechnologyParameters.java index bab76b59b..5a90f847d 100644 --- a/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/carriertechnology/CarrierTechnologyParameters.java +++ b/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/carriertechnology/CarrierTechnologyParameters.java @@ -120,10 +120,8 @@ public abstract class CarrierTechnologyParameters implements ParameterGroup { } } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { @@ -131,10 +129,8 @@ public abstract class CarrierTechnologyParameters implements ParameterGroup { + ", eventConsumerPluginClass=" + eventConsumerPluginClass + "]"; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.parameters.ApexParameterValidator#validate() + /** + * {@inheritDoc}. */ @Override public GroupValidationResult validate() { diff --git a/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/carriertechnology/CarrierTechnologyParametersJsonAdapter.java b/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/carriertechnology/CarrierTechnologyParametersJsonAdapter.java index 6398008c6..35f648307 100644 --- a/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/carriertechnology/CarrierTechnologyParametersJsonAdapter.java +++ b/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/carriertechnology/CarrierTechnologyParametersJsonAdapter.java @@ -68,11 +68,8 @@ public class CarrierTechnologyParametersJsonAdapter EventRequestorCarrierTechnologyParameters.class.getName()); } - /* - * (non-Javadoc) - * - * @see com.google.gson.JsonSerializer#serialize(java.lang.Object, java.lang.reflect.Type, - * com.google.gson.JsonSerializationContext) + /** + * {@inheritDoc}. */ @Override public JsonElement serialize(final CarrierTechnologyParameters src, final Type typeOfSrc, @@ -82,11 +79,8 @@ public class CarrierTechnologyParametersJsonAdapter throw new ParameterRuntimeException(returnMessage); } - /* - * (non-Javadoc) - * - * @see com.google.gson.JsonDeserializer#deserialize(com.google.gson.JsonElement, - * java.lang.reflect.Type, com.google.gson.JsonDeserializationContext) + /** + * {@inheritDoc}. */ @Override public CarrierTechnologyParameters deserialize(final JsonElement json, final Type typeOfT, diff --git a/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/engineservice/EngineServiceParameters.java b/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/engineservice/EngineServiceParameters.java index 35c8237c6..9d4566b78 100644 --- a/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/engineservice/EngineServiceParameters.java +++ b/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/engineservice/EngineServiceParameters.java @@ -265,10 +265,8 @@ public class EngineServiceParameters implements ParameterGroup { this.engineParameters = engineParameters; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.apps.uservice.parameters.ApexParameterValidator#validate() + /** + * {@inheritDoc}. */ @Override public GroupValidationResult validate() { diff --git a/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/engineservice/EngineServiceParametersJsonAdapter.java b/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/engineservice/EngineServiceParametersJsonAdapter.java index 06cbd416f..902322ca1 100644 --- a/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/engineservice/EngineServiceParametersJsonAdapter.java +++ b/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/engineservice/EngineServiceParametersJsonAdapter.java @@ -66,11 +66,8 @@ public class EngineServiceParametersJsonAdapter private static final String EXECUTOR_PARAMETERS = "executorParameters"; // @formatter:on - /* - * (non-Javadoc) - * - * @see com.google.gson.JsonSerializer#serialize(java.lang.Object, java.lang.reflect.Type, - * com.google.gson.JsonSerializationContext) + /** + * {@inheritDoc}. */ @Override public JsonElement serialize(final EngineParameters src, final Type typeOfSrc, @@ -80,11 +77,8 @@ public class EngineServiceParametersJsonAdapter throw new ParameterRuntimeException(returnMessage); } - /* - * (non-Javadoc) - * - * @see com.google.gson.JsonDeserializer#deserialize(com.google.gson.JsonElement, java.lang.reflect.Type, - * com.google.gson.JsonDeserializationContext) + /** + * {@inheritDoc}. */ @Override public EngineParameters deserialize(final JsonElement json, final Type typeOfT, diff --git a/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/eventhandler/EventHandlerParameters.java b/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/eventhandler/EventHandlerParameters.java index 8505127e6..e140a8071 100644 --- a/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/eventhandler/EventHandlerParameters.java +++ b/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/eventhandler/EventHandlerParameters.java @@ -303,10 +303,8 @@ public class EventHandlerParameters implements ParameterGroup { this.eventNameFilter = eventNameFilter; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.parameters.ApexParameterValidator#validate() + /** + * {@inheritDoc}. */ @Override public GroupValidationResult validate() { @@ -393,10 +391,8 @@ public class EventHandlerParameters implements ParameterGroup { return requestorTimeout; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { diff --git a/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/eventprotocol/EventProtocolParameters.java b/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/eventprotocol/EventProtocolParameters.java index 92efb53b3..b3a264481 100644 --- a/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/eventprotocol/EventProtocolParameters.java +++ b/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/eventprotocol/EventProtocolParameters.java @@ -89,10 +89,8 @@ public abstract class EventProtocolParameters implements ParameterGroup { this.eventProtocolPluginClass = eventProtocolPluginClass.replaceAll("\\s+", ""); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.service.AbstractParameters#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { @@ -100,10 +98,8 @@ public abstract class EventProtocolParameters implements ParameterGroup { + "]"; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.parameters.ApexParameterValidator#validate() + /** + * {@inheritDoc}. */ @Override public GroupValidationResult validate() { diff --git a/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/eventprotocol/EventProtocolParametersJsonAdapter.java b/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/eventprotocol/EventProtocolParametersJsonAdapter.java index b03c365f1..10941405b 100644 --- a/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/eventprotocol/EventProtocolParametersJsonAdapter.java +++ b/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/eventprotocol/EventProtocolParametersJsonAdapter.java @@ -65,11 +65,8 @@ public class EventProtocolParametersJsonAdapter BUILT_IN_EVENT_PROTOCOL_PARMETER_CLASS_MAP.put("APEX", ApexEventProtocolParameters.class.getName()); } - /* - * (non-Javadoc) - * - * @see com.google.gson.JsonSerializer#serialize(java.lang.Object, java.lang.reflect.Type, - * com.google.gson.JsonSerializationContext) + /** + * {@inheritDoc}. */ @Override public JsonElement serialize(final EventProtocolParameters src, final Type typeOfSrc, @@ -79,11 +76,8 @@ public class EventProtocolParametersJsonAdapter throw new ParameterRuntimeException(returnMessage); } - /* - * (non-Javadoc) - * - * @see com.google.gson.JsonDeserializer#deserialize(com.google.gson.JsonElement, - * java.lang.reflect.Type, com.google.gson.JsonDeserializationContext) + /** + * {@inheritDoc}. */ @Override public EventProtocolParameters deserialize(final JsonElement json, final Type typeOfT, diff --git a/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/eventprotocol/EventProtocolTextCharDelimitedParameters.java b/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/eventprotocol/EventProtocolTextCharDelimitedParameters.java index 8d8766772..989d3f266 100644 --- a/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/eventprotocol/EventProtocolTextCharDelimitedParameters.java +++ b/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/eventprotocol/EventProtocolTextCharDelimitedParameters.java @@ -83,10 +83,8 @@ public abstract class EventProtocolTextCharDelimitedParameters extends EventProt this.endChar = endChar; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.parameters.eventprotocol.EventProtocolParameters#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { @@ -94,10 +92,8 @@ public abstract class EventProtocolTextCharDelimitedParameters extends EventProt + ", endChar=" + endChar + "]"; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.parameters.eventprotocol.EventProtocolParameters#validate() + /** + * {@inheritDoc}. */ @Override public GroupValidationResult validate() { diff --git a/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/eventprotocol/EventProtocolTextTokenDelimitedParameters.java b/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/eventprotocol/EventProtocolTextTokenDelimitedParameters.java index 402d015fc..f9328f418 100644 --- a/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/eventprotocol/EventProtocolTextTokenDelimitedParameters.java +++ b/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/eventprotocol/EventProtocolTextTokenDelimitedParameters.java @@ -115,10 +115,8 @@ public abstract class EventProtocolTextTokenDelimitedParameters extends EventPro + ", endDelimiterToken=" + endDelimiterToken + ", delimiterAtStart=" + delimiterAtStart + "]"; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.parameters.ApexParameterValidator#validate() + /** + * {@inheritDoc}. */ @Override public GroupValidationResult validate() { diff --git a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/engdep/DummyEngineService.java b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/engdep/DummyEngineService.java index aa6eb3bb7..ef54e8e0e 100644 --- a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/engdep/DummyEngineService.java +++ b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/engdep/DummyEngineService.java @@ -46,51 +46,40 @@ public class DummyEngineService implements EngineService { private int modelKeyGetCalled; private AxArtifactKey updateModelKey; - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#registerActionListener(java.lang.String, - * org.onap.policy.apex.service.engine.runtime.ApexEventListener) + /** + * {@inheritDoc}. */ @Override public void registerActionListener(String listenerName, ApexEventListener listener) { throw new NotImplementedException("Not implemented on dummy class"); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#deregisterActionListener(java.lang.String) + /** + * {@inheritDoc}. */ @Override public void deregisterActionListener(String listenerName) { throw new NotImplementedException("Not implemented on dummy class"); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#getEngineServiceEventInterface() + /** + * {@inheritDoc}. */ @Override public EngineServiceEventInterface getEngineServiceEventInterface() { throw new NotImplementedException("Not implemented on dummy class"); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#getKey() + /** + * {@inheritDoc}. */ @Override public AxArtifactKey getKey() { return new AxArtifactKey("DummyEngineService:0.0.1"); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#getEngineKeys() + /** + * {@inheritDoc}. */ @Override public Collection<AxArtifactKey> getEngineKeys() { @@ -99,10 +88,8 @@ public class DummyEngineService implements EngineService { return keys; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#getApexModelKey() + /** + * {@inheritDoc}. */ @Override public AxArtifactKey getApexModelKey() { @@ -111,11 +98,8 @@ public class DummyEngineService implements EngineService { return new AxArtifactKey("DummyApexModelKey:0.0.1"); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#updateModel(org.onap.policy.apex.model.basicmodel. - * concepts.AxArtifactKey, java.lang.String, boolean) + /** + * {@inheritDoc}. */ @Override public void updateModel(AxArtifactKey engineServiceKey, String apexModelString, boolean forceFlag) @@ -123,11 +107,8 @@ public class DummyEngineService implements EngineService { updateModelKey = engineServiceKey; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#updateModel(org.onap.policy.apex.model.basicmodel. - * concepts.AxArtifactKey, org.onap.policy.apex.model.policymodel.concepts.AxPolicyModel, boolean) + /** + * {@inheritDoc}. */ @Override public void updateModel(AxArtifactKey engineServiceKey, AxPolicyModel apexModel, boolean forceFlag) @@ -135,148 +116,111 @@ public class DummyEngineService implements EngineService { throw new NotImplementedException("Not implemented on dummy class"); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#getState() + /** + * {@inheritDoc}. */ @Override public AxEngineState getState() { throw new NotImplementedException("Not implemented on dummy class"); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#startAll() + /** + * {@inheritDoc}. */ @Override public void startAll() throws ApexException { throw new NotImplementedException("Not implemented on dummy class"); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.service.engine.runtime.EngineService#start(org.onap.policy.apex.model.basicmodel.concepts. - * AxArtifactKey) + /** + * {@inheritDoc}. */ @Override public void start(AxArtifactKey engineKey) throws ApexException { startEngineKey = engineKey; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#stop() + /** + * {@inheritDoc}. */ @Override public void stop() throws ApexException { } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.service.engine.runtime.EngineService#stop(org.onap.policy.apex.model.basicmodel.concepts. - * AxArtifactKey) + /** + * {@inheritDoc}. */ @Override public void stop(AxArtifactKey engineKey) throws ApexException { stopEngineKey = engineKey; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#clear() + /** + * {@inheritDoc}. */ @Override public void clear() throws ApexException { throw new NotImplementedException("Not implemented on dummy class"); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.service.engine.runtime.EngineService#clear(org.onap.policy.apex.model.basicmodel.concepts. - * AxArtifactKey) + /** + * {@inheritDoc}. */ @Override public void clear(AxArtifactKey engineKey) throws ApexException { throw new NotImplementedException("Not implemented on dummy class"); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#isStarted() + /** + * {@inheritDoc}. */ @Override public boolean isStarted() { throw new NotImplementedException("Not implemented on dummy class"); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#isStarted(org.onap.policy.apex.model.basicmodel. - * concepts.AxArtifactKey) + /** + * {@inheritDoc}. */ @Override public boolean isStarted(AxArtifactKey engineKey) { throw new NotImplementedException("Not implemented on dummy class"); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#isStopped() + /** + * {@inheritDoc}. */ @Override public boolean isStopped() { throw new NotImplementedException("Not implemented on dummy class"); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#isStopped(org.onap.policy.apex.model.basicmodel. - * concepts.AxArtifactKey) + /** + * {@inheritDoc}. */ @Override public boolean isStopped(AxArtifactKey engineKey) { throw new NotImplementedException("Not implemented on dummy class"); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#startPeriodicEvents(long) + /** + * {@inheritDoc}. */ @Override public void startPeriodicEvents(long period) throws ApexException { periodicPeriod = period; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#stopPeriodicEvents() + /** + * {@inheritDoc}. */ @Override public void stopPeriodicEvents() throws ApexException { periodicPeriod = 0; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.EngineService#getStatus(org.onap.policy.apex.model.basicmodel. - * concepts.AxArtifactKey) + /** + * {@inheritDoc}. */ @Override public String getStatus(AxArtifactKey engineKey) throws ApexException { @@ -284,12 +228,8 @@ public class DummyEngineService implements EngineService { return "The Status"; } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.service.engine.runtime.EngineService#getRuntimeInfo(org.onap.policy.apex.model.basicmodel. - * concepts.AxArtifactKey) + /** + * {@inheritDoc}. */ @Override public String getRuntimeInfo(AxArtifactKey engineKey) throws ApexException { diff --git a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/parameters/dummyclasses/SuperDooperCarrierTechnologyParameters.java b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/parameters/dummyclasses/SuperDooperCarrierTechnologyParameters.java index ccde5199a..6acca2702 100644 --- a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/parameters/dummyclasses/SuperDooperCarrierTechnologyParameters.java +++ b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/parameters/dummyclasses/SuperDooperCarrierTechnologyParameters.java @@ -449,20 +449,16 @@ public class SuperDooperCarrierTechnologyParameters extends CarrierTechnologyPar this.valueDeserializer = valueDeserializer; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.common.parameters.ParameterGroup#getName() + /** + * {@inheritDoc}. */ @Override public String getName() { return this.getLabel(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.apps.uservice.parameters.ApexParameterValidator#validate() + /** + * {@inheritDoc}. */ @Override public GroupValidationResult validate() { diff --git a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/parameters/dummyclasses/SuperDooperEventSubscriber.java b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/parameters/dummyclasses/SuperDooperEventSubscriber.java index c791d31e1..6c5d55183 100644 --- a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/parameters/dummyclasses/SuperDooperEventSubscriber.java +++ b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/parameters/dummyclasses/SuperDooperEventSubscriber.java @@ -49,23 +49,16 @@ public class SuperDooperEventSubscriber implements ApexEventConsumer { return name; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventConsumer#getPeeredReference(org.onap. - * policy.apex .service.parameters.eventhandler.EventHandlerPeeredMode) + /** + * {@inheritDoc}. */ @Override public PeeredReference getPeeredReference(final EventHandlerPeeredMode peeredMode) { return null; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.event.ApexEventConsumer#setPeeredReference(org.onap. - * policy.apex.service.parameters.eventhandler.EventHandlerPeeredMode, - * org.onap.policy.apex.service.engine.event.PeeredReference) + /** + * {@inheritDoc}. */ @Override public void setPeeredReference(final EventHandlerPeeredMode peeredMode, final PeeredReference peeredReference) {} diff --git a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/parameters/dummyclasses/SuperTokenDelimitedEventConverter.java b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/parameters/dummyclasses/SuperTokenDelimitedEventConverter.java index e807f7fb5..678961dea 100644 --- a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/parameters/dummyclasses/SuperTokenDelimitedEventConverter.java +++ b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/parameters/dummyclasses/SuperTokenDelimitedEventConverter.java @@ -29,24 +29,16 @@ import org.onap.policy.apex.service.parameters.eventprotocol.EventProtocolParame public final class SuperTokenDelimitedEventConverter implements ApexEventProtocolConverter { - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.service.engine.event.ApexEventConverter#toApexEvent(java.lang.String, - * java.lang.Object) + /** + * {@inheritDoc}. */ @Override public List<ApexEvent> toApexEvent(final String eventName, final Object eventOfOtherType) throws ApexException { return null; } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.service.engine.event.ApexEventConverter#fromApexEvent(org.onap.policy. - * apex.service.engine.event.ApexEvent) + /** + * {@inheritDoc}. */ @Override public String fromApexEvent(final ApexEvent apexEvent) throws ApexException { diff --git a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/runtime/impl/DummyApexEventListener.java b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/runtime/impl/DummyApexEventListener.java index b3db3946f..92b5bcd67 100644 --- a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/runtime/impl/DummyApexEventListener.java +++ b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/runtime/impl/DummyApexEventListener.java @@ -28,12 +28,8 @@ import org.onap.policy.apex.service.engine.runtime.ApexEventListener; */ public class DummyApexEventListener implements ApexEventListener { - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.service.engine.runtime.ApexEventListener#onApexEvent(org.onap.policy.apex.service.engine. - * event.ApexEvent) + /** + * {@inheritDoc}. */ @Override public void onApexEvent(ApexEvent apexEvent) { diff --git a/services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/ApexStarterMain.java b/services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/ApexStarterMain.java index dcd797249..15d9a8395 100644 --- a/services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/ApexStarterMain.java +++ b/services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/ApexStarterMain.java @@ -127,10 +127,8 @@ public class ApexStarterMain { * called. */ private class ApexStarterShutdownHookClass extends Thread { - /* - * (non-Javadoc) - * - * @see java.lang.Runnable#run() + /** + * {@inheritDoc}. */ @Override public void run() { diff --git a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextBooleanItem.java b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextBooleanItem.java index 84d896c8a..8786d4071 100644 --- a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextBooleanItem.java +++ b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextBooleanItem.java @@ -67,10 +67,8 @@ public class TestContextBooleanItem implements Serializable { this.flag = flag; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -80,10 +78,8 @@ public class TestContextBooleanItem implements Serializable { return result; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -100,10 +96,8 @@ public class TestContextBooleanItem implements Serializable { return flag == other.flag; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { diff --git a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextByteItem.java b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextByteItem.java index 87d9bc678..4a0746c15 100644 --- a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextByteItem.java +++ b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextByteItem.java @@ -65,10 +65,8 @@ public class TestContextByteItem implements Serializable { this.byteValue = byteValue; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -78,10 +76,8 @@ public class TestContextByteItem implements Serializable { return result; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -98,10 +94,8 @@ public class TestContextByteItem implements Serializable { return byteValue == other.byteValue; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { diff --git a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextDateItem.java b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextDateItem.java index c6cc4a781..4ed506977 100644 --- a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextDateItem.java +++ b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextDateItem.java @@ -189,10 +189,8 @@ public class TestContextDateItem implements Serializable { } - /* - * (non-Javadoc) - * - * @see java.lang.Object#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -209,10 +207,8 @@ public class TestContextDateItem implements Serializable { return result; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -229,10 +225,8 @@ public class TestContextDateItem implements Serializable { return time == other.time; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { diff --git a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextDateLocaleItem.java b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextDateLocaleItem.java index 84024578d..22c46b4a7 100644 --- a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextDateLocaleItem.java +++ b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextDateLocaleItem.java @@ -180,10 +180,8 @@ public class TestContextDateLocaleItem implements Serializable { } } - /* - * (non-Javadoc) - * - * @see java.lang.Object#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -197,10 +195,8 @@ public class TestContextDateLocaleItem implements Serializable { return result; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -241,10 +237,8 @@ public class TestContextDateLocaleItem implements Serializable { return utcOffset == other.utcOffset; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { diff --git a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextDateTzItem.java b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextDateTzItem.java index 90f108ce2..602f20917 100644 --- a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextDateTzItem.java +++ b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextDateTzItem.java @@ -128,10 +128,8 @@ public class TestContextDateTzItem implements Serializable { this.dst = newDst; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -143,10 +141,8 @@ public class TestContextDateTzItem implements Serializable { return result; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -181,10 +177,8 @@ public class TestContextDateTzItem implements Serializable { return true; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { diff --git a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextDoubleItem.java b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextDoubleItem.java index 99bde4a5c..aa3830a4a 100644 --- a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextDoubleItem.java +++ b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextDoubleItem.java @@ -66,10 +66,8 @@ public class TestContextDoubleItem implements Serializable { this.doubleValue = doubleValue; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -81,10 +79,8 @@ public class TestContextDoubleItem implements Serializable { return result; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -101,10 +97,8 @@ public class TestContextDoubleItem implements Serializable { return Double.doubleToLongBits(doubleValue) == Double.doubleToLongBits(other.doubleValue); } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { diff --git a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextFloatItem.java b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextFloatItem.java index b7545653e..350f2bac8 100644 --- a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextFloatItem.java +++ b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextFloatItem.java @@ -65,10 +65,8 @@ public class TestContextFloatItem implements Serializable { this.floatValue = floatValue; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -78,10 +76,8 @@ public class TestContextFloatItem implements Serializable { return result; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -98,10 +94,8 @@ public class TestContextFloatItem implements Serializable { return Float.floatToIntBits(floatValue) == Float.floatToIntBits(other.floatValue); } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { diff --git a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextIntItem.java b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextIntItem.java index e2b68f78b..a565583ca 100644 --- a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextIntItem.java +++ b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextIntItem.java @@ -74,10 +74,8 @@ public class TestContextIntItem implements Serializable { this.intValue = intValue; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -87,10 +85,8 @@ public class TestContextIntItem implements Serializable { return result; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -107,10 +103,8 @@ public class TestContextIntItem implements Serializable { return intValue == other.intValue; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { diff --git a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextLongItem.java b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextLongItem.java index 6c9571f4d..1c3d5bfd9 100644 --- a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextLongItem.java +++ b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextLongItem.java @@ -66,10 +66,8 @@ public class TestContextLongItem implements Serializable { this.longValue = longValue; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -79,10 +77,8 @@ public class TestContextLongItem implements Serializable { return result; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -99,10 +95,8 @@ public class TestContextLongItem implements Serializable { return longValue == other.longValue; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { diff --git a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextLongObjectItem.java b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextLongObjectItem.java index 73d47c414..20a7492db 100644 --- a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextLongObjectItem.java +++ b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextLongObjectItem.java @@ -65,10 +65,8 @@ public class TestContextLongObjectItem implements Serializable { this.longValue = longValue; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -78,10 +76,8 @@ public class TestContextLongObjectItem implements Serializable { return result; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -105,10 +101,8 @@ public class TestContextLongObjectItem implements Serializable { return true; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { diff --git a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextStringItem.java b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextStringItem.java index b1b27e7d3..02f39daff 100644 --- a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextStringItem.java +++ b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextStringItem.java @@ -65,10 +65,8 @@ public class TestContextStringItem implements Serializable { this.stringValue = stringValue; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -78,10 +76,8 @@ public class TestContextStringItem implements Serializable { return result; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -105,10 +101,8 @@ public class TestContextStringItem implements Serializable { return true; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { diff --git a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextTreeMapItem.java b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextTreeMapItem.java index 9111109fe..4a5c75066 100644 --- a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextTreeMapItem.java +++ b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextTreeMapItem.java @@ -70,10 +70,8 @@ public class TestContextTreeMapItem implements Serializable { this.mapValue = mapValue; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -83,10 +81,8 @@ public class TestContextTreeMapItem implements Serializable { return result; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -110,10 +106,8 @@ public class TestContextTreeMapItem implements Serializable { return true; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { diff --git a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextTreeSetItem.java b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextTreeSetItem.java index 7172fa478..610dc10c6 100644 --- a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextTreeSetItem.java +++ b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextTreeSetItem.java @@ -81,10 +81,8 @@ public class TestContextTreeSetItem implements Serializable { this.setValue = setValue; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -94,10 +92,8 @@ public class TestContextTreeSetItem implements Serializable { return result; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -121,10 +117,8 @@ public class TestContextTreeSetItem implements Serializable { return true; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { diff --git a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestExternalContextItem.java b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestExternalContextItem.java index 77f86d226..3d17eeccc 100644 --- a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestExternalContextItem.java +++ b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestExternalContextItem.java @@ -279,10 +279,8 @@ public class TestExternalContextItem implements Serializable { this.testExternalContextItem00C = testExternalContextItem00C; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -304,10 +302,8 @@ public class TestExternalContextItem implements Serializable { return result; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -415,10 +411,8 @@ public class TestExternalContextItem implements Serializable { return true; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { diff --git a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestGlobalContextItem.java b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestGlobalContextItem.java index 5cd6a437d..94707082d 100644 --- a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestGlobalContextItem.java +++ b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestGlobalContextItem.java @@ -279,10 +279,8 @@ public class TestGlobalContextItem implements Serializable { this.testGlobalContextItem00C = testGlobalContextItem00C; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -304,10 +302,8 @@ public class TestGlobalContextItem implements Serializable { return result; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -415,10 +411,8 @@ public class TestGlobalContextItem implements Serializable { return true; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { diff --git a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestPolicyContextItem.java b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestPolicyContextItem.java index f52d60228..23d506639 100644 --- a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestPolicyContextItem.java +++ b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestPolicyContextItem.java @@ -146,10 +146,8 @@ public class TestPolicyContextItem implements Serializable { this.testPolicyContextItem005 = testPolicyContextItem005; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -164,10 +162,8 @@ public class TestPolicyContextItem implements Serializable { return result; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -226,10 +222,8 @@ public class TestPolicyContextItem implements Serializable { return true; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { diff --git a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/testsuites/integration/common/testclasses/PingTestClass.java b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/testsuites/integration/common/testclasses/PingTestClass.java index 31e0f3978..b64f76b93 100644 --- a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/testsuites/integration/common/testclasses/PingTestClass.java +++ b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/testsuites/integration/common/testclasses/PingTestClass.java @@ -109,8 +109,8 @@ public class PingTestClass implements Serializable { this.pongTime = pongTime; } - /* (non-Javadoc) - * @see java.lang.Object#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { diff --git a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/entities/ArtifactKeyTestEntity.java b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/entities/ArtifactKeyTestEntity.java index 1f3ea3c20..f93f914be 100644 --- a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/entities/ArtifactKeyTestEntity.java +++ b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/entities/ArtifactKeyTestEntity.java @@ -77,20 +77,16 @@ public class ArtifactKeyTestEntity extends AxConcept { this.doubleValue = doubleValue; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKey() + /** + * {@inheritDoc}. */ @Override public AxArtifactKey getKey() { return key; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKeys() + /** + * {@inheritDoc}. */ @Override public List<AxKey> getKeys() { @@ -133,44 +129,32 @@ public class ArtifactKeyTestEntity extends AxConcept { this.doubleValue = doubleValue; } - /* - * (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(final AxValidationResult result) { return key.validate(result); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#clean() + /** + * {@inheritDoc}. */ @Override public void clean() { key.clean(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { return "ArtifactKeyTestEntity [key=" + key + ", doubleValue=" + doubleValue + "]"; } - /* - * (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(final AxConcept target) { @@ -189,10 +173,8 @@ public class ArtifactKeyTestEntity extends AxConcept { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -202,10 +184,8 @@ public class ArtifactKeyTestEntity extends AxConcept { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -229,10 +209,8 @@ public class ArtifactKeyTestEntity extends AxConcept { return (Double.compare(doubleValue, other.doubleValue) == 0); } - /* - * (non-Javadoc) - * - * @see java.lang.Comparable#compareTo(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public int compareTo(final AxConcept otherObj) { diff --git a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/entities/ReferenceKeyTestEntity.java b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/entities/ReferenceKeyTestEntity.java index 2eef94ed7..1ca64c477 100644 --- a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/entities/ReferenceKeyTestEntity.java +++ b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/entities/ReferenceKeyTestEntity.java @@ -80,20 +80,16 @@ public class ReferenceKeyTestEntity extends AxConcept { this.doubleValue = doubleValue; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKey() + /** + * {@inheritDoc}. */ @Override public AxReferenceKey getKey() { return key; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKeys() + /** + * {@inheritDoc}. */ @Override public List<AxKey> getKeys() { @@ -136,44 +132,32 @@ public class ReferenceKeyTestEntity extends AxConcept { this.doubleValue = doubleValue; } - /* - * (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(final AxValidationResult result) { return key.validate(result); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#clean() + /** + * {@inheritDoc}. */ @Override public void clean() { key.clean(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { return "ReferenceKeyTestEntity [key=" + key + ", doubleValue=" + doubleValue + "]"; } - /* - * (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(final AxConcept target) { @@ -192,10 +176,8 @@ public class ReferenceKeyTestEntity extends AxConcept { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -205,10 +187,8 @@ public class ReferenceKeyTestEntity extends AxConcept { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -232,10 +212,8 @@ public class ReferenceKeyTestEntity extends AxConcept { return (Double.compare(doubleValue, other.doubleValue) == 0); } - /* - * (non-Javadoc) - * - * @see java.lang.Comparable#compareTo(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public int compareTo(final AxConcept otherObj) { diff --git a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/lock/modifier/NoLockAlbumModifier.java b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/lock/modifier/NoLockAlbumModifier.java index e541aada7..97ccd0f61 100644 --- a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/lock/modifier/NoLockAlbumModifier.java +++ b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/lock/modifier/NoLockAlbumModifier.java @@ -34,11 +34,8 @@ import org.slf4j.ext.XLoggerFactory; public class NoLockAlbumModifier implements AlbumModifier { private static final XLogger LOGGER = XLoggerFactory.getXLogger(NoLockAlbumModifier.class); - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.test.lock.modifier.AlbumModifier#modifyAlbum(org.onap.policy.apex.context. - * ContextAlbum, int, int) + /** + * {@inheritDoc}. */ @Override public void modifyAlbum(final ContextAlbum contextAlbum, final int loopSize, final int arraySize) { diff --git a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/lock/modifier/ReadLockAlbumModifier.java b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/lock/modifier/ReadLockAlbumModifier.java index e9c435af5..2500017a4 100644 --- a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/lock/modifier/ReadLockAlbumModifier.java +++ b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/lock/modifier/ReadLockAlbumModifier.java @@ -35,11 +35,8 @@ import org.slf4j.ext.XLoggerFactory; public class ReadLockAlbumModifier implements AlbumModifier { private static final XLogger LOGGER = XLoggerFactory.getXLogger(ReadLockAlbumModifier.class); - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.test.lock.modifier.AlbumModifier#modifyAlbum(org.onap.policy.apex.context. - * ContextAlbum, int, int) + /** + * {@inheritDoc}. */ @Override public void modifyAlbum(final ContextAlbum contextAlbum, final int loopSize, final int arraySize) { diff --git a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/lock/modifier/SingleValueWriteLockAlbumModifier.java b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/lock/modifier/SingleValueWriteLockAlbumModifier.java index ad38b03b5..1f6e399a9 100644 --- a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/lock/modifier/SingleValueWriteLockAlbumModifier.java +++ b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/lock/modifier/SingleValueWriteLockAlbumModifier.java @@ -35,11 +35,8 @@ import org.slf4j.ext.XLoggerFactory; public class SingleValueWriteLockAlbumModifier implements AlbumModifier { private static final XLogger LOGGER = XLoggerFactory.getXLogger(SingleValueWriteLockAlbumModifier.class); - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.test.lock.modifier.AlbumModifier#modifyAlbum(org.onap.policy.apex.context. - * ContextAlbum, int, int) + /** + * {@inheritDoc}. */ @Override public void modifyAlbum(final ContextAlbum contextAlbum, final int loopSize, final int arraySize) diff --git a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/lock/modifier/WriteLockAlbumModifier.java b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/lock/modifier/WriteLockAlbumModifier.java index 552365e92..3fb2901ae 100644 --- a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/lock/modifier/WriteLockAlbumModifier.java +++ b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/lock/modifier/WriteLockAlbumModifier.java @@ -35,11 +35,8 @@ import org.slf4j.ext.XLoggerFactory; public class WriteLockAlbumModifier implements AlbumModifier { private static final XLogger LOGGER = XLoggerFactory.getXLogger(WriteLockAlbumModifier.class); - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.test.lock.modifier.AlbumModifier#modifyAlbum(org.onap.policy.apex.context. - * ContextAlbum, int, int) + /** + * {@inheritDoc}. */ @Override public void modifyAlbum(final ContextAlbum contextAlbum, final int loopSize, final int arraySize) { diff --git a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/locking/ConcurrentContextJvmThread.java b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/locking/ConcurrentContextJvmThread.java index 4915e7b89..6d6ea6a58 100644 --- a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/locking/ConcurrentContextJvmThread.java +++ b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/locking/ConcurrentContextJvmThread.java @@ -57,10 +57,8 @@ public class ConcurrentContextJvmThread implements Runnable, Closeable { this.configrationProvider = configrationProvider; } - /* - * (non-Javadoc) - * - * @see java.lang.Runnable#run() + /** + * {@inheritDoc}. */ @Override public void run() { diff --git a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/locking/ConcurrentContextThread.java b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/locking/ConcurrentContextThread.java index baad04e19..9826de725 100644 --- a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/locking/ConcurrentContextThread.java +++ b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/locking/ConcurrentContextThread.java @@ -59,10 +59,8 @@ public class ConcurrentContextThread implements Runnable, Closeable { new ContextParameters(); } - /* - * (non-Javadoc) - * - * @see java.lang.Runnable#run() + /** + * {@inheritDoc}. */ @Override public void run() { diff --git a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/ConfigrationProviderImpl.java b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/ConfigrationProviderImpl.java index 0a9a195e9..ad2d0720e 100644 --- a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/ConfigrationProviderImpl.java +++ b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/ConfigrationProviderImpl.java @@ -71,60 +71,48 @@ public class ConfigrationProviderImpl implements ConfigrationProvider { this.lockType = LockType.getLockType(lockType); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.test.utils.ConfigrationProvider#getTestName() + /** + * {@inheritDoc}. */ @Override public String getTestName() { return testType; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.test.utils.ConfigrationProvider#getLoopSize() + /** + * {@inheritDoc}. */ @Override public int getLoopSize() { return loopSize; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.test.utils.ConfigrationProvider#getThreadCount() + /** + * {@inheritDoc}. */ @Override public int getThreadCount() { return threadCount; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.test.utils.ConfigrationProvider#getJvmCount() + /** + * {@inheritDoc}. */ @Override public int getJvmCount() { return jvmCount; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.test.utils.ConfigrationProvider#getAlbumSize() + /** + * {@inheritDoc}. */ @Override public int getAlbumSize() { return albumSize; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.test.utils.ConfigrationProvider#getExecutorService() + /** + * {@inheritDoc}. */ @Override public ExecutorService getExecutorService() { @@ -133,10 +121,8 @@ public class ConfigrationProviderImpl implements ConfigrationProvider { return Executors.newFixedThreadPool(threadCount, threadFactory); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.test.utils.ConfigrationProvider#getExecutorService(java.lang.String, int) + /** + * {@inheritDoc}. */ @Override public ExecutorService getExecutorService(final String threadFactoryName, final int threadPoolSize) { @@ -144,12 +130,8 @@ public class ConfigrationProviderImpl implements ConfigrationProvider { return Executors.newFixedThreadPool(threadPoolSize, threadFactory); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.context.test.utils.ConfigrationProvider#getDistributor(org.onap.policy.apex.model.basicmodel - * .concepts.AxArtifactKey) + /** + * {@inheritDoc}. */ @Override public Distributor getDistributor(final AxArtifactKey key) { @@ -160,10 +142,8 @@ public class ConfigrationProviderImpl implements ConfigrationProvider { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.test.utils.ConfigrationProvider#getDistributor() + /** + * {@inheritDoc}. */ @Override public Distributor getDistributor() { @@ -171,23 +151,17 @@ public class ConfigrationProviderImpl implements ConfigrationProvider { return getDistributor(distributorKey); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.test.utils.ConfigrationProvider#getContextAlbum(org.onap.policy.apex.context. - * Distributor) + /** + * {@inheritDoc}. */ @Override public ContextAlbum getContextAlbum(final Distributor distributor) { return getContextAlbum(distributor, Constants.L_TYPE_CONTEXT_ALBUM, Constants.getAxArtifactKeyArray()); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.test.utils.ConfigrationProvider#getContextAlbum(org.onap.policy.apex.context. - * Distributor, org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey, - * org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey[]) + /** + * {@inheritDoc}. + *[]) */ @Override public ContextAlbum getContextAlbum(final Distributor distributor, final AxArtifactKey axContextAlbumKey, @@ -204,10 +178,8 @@ public class ConfigrationProviderImpl implements ConfigrationProvider { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.test.utils.ConfigrationProvider#getContextAlbumInitValues() + /** + * {@inheritDoc}. */ @Override public Map<String, Object> getContextAlbumInitValues() { @@ -218,20 +190,16 @@ public class ConfigrationProviderImpl implements ConfigrationProvider { return values; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.test.utils.ConfigrationProvider#getAlbumModifier() + /** + * {@inheritDoc}. */ @Override public AlbumModifier getAlbumModifier() { return lockType.getAlbumModifier(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.context.test.utils.ConfigrationProvider#getLockType() + /** + * {@inheritDoc}. */ @Override public LockType getLockType() { @@ -250,10 +218,8 @@ public class ConfigrationProviderImpl implements ConfigrationProvider { : testType + ":TestConcurrentContextJVMThread_"; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { diff --git a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/IntegrationThreadFactory.java b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/IntegrationThreadFactory.java index 271bb9519..a93358d65 100644 --- a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/IntegrationThreadFactory.java +++ b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/IntegrationThreadFactory.java @@ -47,8 +47,8 @@ public class IntegrationThreadFactory implements ThreadFactory { this.threadFactoryName = threadFactoryName; } - /* (non-Javadoc) - * @see java.util.concurrent.ThreadFactory#newThread(java.lang.Runnable) + /** + * {@inheritDoc}. */ @Override public Thread newThread(final Runnable runnable) { diff --git a/testsuites/integration/integration-executor-test/src/test/java/org/onap/policy/apex/testsuites/integration/executor/engine/TestApexActionListener.java b/testsuites/integration/integration-executor-test/src/test/java/org/onap/policy/apex/testsuites/integration/executor/engine/TestApexActionListener.java index 2860f1736..8a3d238a6 100644 --- a/testsuites/integration/integration-executor-test/src/test/java/org/onap/policy/apex/testsuites/integration/executor/engine/TestApexActionListener.java +++ b/testsuites/integration/integration-executor-test/src/test/java/org/onap/policy/apex/testsuites/integration/executor/engine/TestApexActionListener.java @@ -74,12 +74,8 @@ public class TestApexActionListener implements EnEventListener { return result; } - /* - * (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(final EnEvent actionEvent) { diff --git a/testsuites/integration/integration-executor-test/src/test/java/org/onap/policy/apex/testsuites/integration/executor/handling/TestApexSamplePolicyModelCreator.java b/testsuites/integration/integration-executor-test/src/test/java/org/onap/policy/apex/testsuites/integration/executor/handling/TestApexSamplePolicyModelCreator.java index 7e44dd32e..f8afc665f 100644 --- a/testsuites/integration/integration-executor-test/src/test/java/org/onap/policy/apex/testsuites/integration/executor/handling/TestApexSamplePolicyModelCreator.java +++ b/testsuites/integration/integration-executor-test/src/test/java/org/onap/policy/apex/testsuites/integration/executor/handling/TestApexSamplePolicyModelCreator.java @@ -41,40 +41,40 @@ public class TestApexSamplePolicyModelCreator implements TestApexModelCreator<Ax this.logicExecutorType = logicExecutorType; } - /* (non-Javadoc) - * @see org.onap.policy.apex.model.basicmodel.handling.ApexModelCreator#getModel() + /** + * {@inheritDoc}. */ @Override public AxPolicyModel getModel() { return new SampleDomainModelFactory().getSamplePolicyModel(logicExecutorType); } - /* (non-Javadoc) - * @see org.onap.policy.apex.model.basicmodel.test.TestApexModelCreator#getMalstructuredModel() + /** + * {@inheritDoc}. */ @Override public AxPolicyModel getMalstructuredModel() { return null; } - /* (non-Javadoc) - * @see org.onap.policy.apex.model.basicmodel.test.TestApexModelCreator#getObservationModel() + /** + * {@inheritDoc}. */ @Override public AxPolicyModel getObservationModel() { return null; } - /* (non-Javadoc) - * @see org.onap.policy.apex.model.basicmodel.test.TestApexModelCreator#getWarningModel() + /** + * {@inheritDoc}. */ @Override public AxPolicyModel getWarningModel() { return getModel(); } - /* (non-Javadoc) - * @see org.onap.policy.apex.model.basicmodel.test.TestApexModelCreator#getInvalidModel() + /** + * {@inheritDoc}. */ @Override public AxPolicyModel getInvalidModel() { diff --git a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/jms/JmsEventProducer.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/jms/JmsEventProducer.java index ab2f45c22..dcec4a944 100644 --- a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/jms/JmsEventProducer.java +++ b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/jms/JmsEventProducer.java @@ -81,8 +81,8 @@ public class JmsEventProducer implements Runnable { producerThread.start(); } - /* (non-Javadoc) - * @see java.lang.Runnable#run() + /** + * {@inheritDoc}. */ @Override public void run() { diff --git a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/jms/JmsEventSubscriber.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/jms/JmsEventSubscriber.java index 9dd58c817..94155c1a5 100644 --- a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/jms/JmsEventSubscriber.java +++ b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/jms/JmsEventSubscriber.java @@ -71,10 +71,8 @@ public class JmsEventSubscriber implements Runnable { subscriberThread.start(); } - /* - * (non-Javadoc) - * - * @see java.lang.Runnable#run() + /** + * {@inheritDoc}. */ @Override public void run() { diff --git a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/jms/TestContext.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/jms/TestContext.java index b8ea0c7fe..a44f84444 100644 --- a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/jms/TestContext.java +++ b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/jms/TestContext.java @@ -70,210 +70,210 @@ public class TestContext implements Context { } } - /* (non-Javadoc) - * @see javax.naming.Context#lookup(javax.naming.Name) + /** + * {@inheritDoc}. */ @Override public Object lookup(final Name name) throws NamingException { return null; } - /* (non-Javadoc) - * @see javax.naming.Context#lookup(java.lang.String) + /** + * {@inheritDoc}. */ @Override public Object lookup(final String name) throws NamingException { return testProperties.get(name); } - /* (non-Javadoc) - * @see javax.naming.Context#bind(javax.naming.Name, java.lang.Object) + /** + * {@inheritDoc}. */ @Override public void bind(final Name name, final Object obj) throws NamingException {} - /* (non-Javadoc) - * @see javax.naming.Context#bind(java.lang.String, java.lang.Object) + /** + * {@inheritDoc}. */ @Override public void bind(final String name, final Object obj) throws NamingException {} - /* (non-Javadoc) - * @see javax.naming.Context#rebind(javax.naming.Name, java.lang.Object) + /** + * {@inheritDoc}. */ @Override public void rebind(final Name name, final Object obj) throws NamingException {} - /* (non-Javadoc) - * @see javax.naming.Context#rebind(java.lang.String, java.lang.Object) + /** + * {@inheritDoc}. */ @Override public void rebind(final String name, final Object obj) throws NamingException {} - /* (non-Javadoc) - * @see javax.naming.Context#unbind(javax.naming.Name) + /** + * {@inheritDoc}. */ @Override public void unbind(final Name name) throws NamingException {} - /* (non-Javadoc) - * @see javax.naming.Context#unbind(java.lang.String) + /** + * {@inheritDoc}. */ @Override public void unbind(final String name) throws NamingException {} - /* (non-Javadoc) - * @see javax.naming.Context#rename(javax.naming.Name, javax.naming.Name) + /** + * {@inheritDoc}. */ @Override public void rename(final Name oldName, final Name newName) throws NamingException {} - /* (non-Javadoc) - * @see javax.naming.Context#rename(java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public void rename(final String oldName, final String newName) throws NamingException {} - /* (non-Javadoc) - * @see javax.naming.Context#list(javax.naming.Name) + /** + * {@inheritDoc}. */ @Override public NamingEnumeration<NameClassPair> list(final Name name) throws NamingException { return null; } - /* (non-Javadoc) - * @see javax.naming.Context#list(java.lang.String) + /** + * {@inheritDoc}. */ @Override public NamingEnumeration<NameClassPair> list(final String name) throws NamingException { return null; } - /* (non-Javadoc) - * @see javax.naming.Context#listBindings(javax.naming.Name) + /** + * {@inheritDoc}. */ @Override public NamingEnumeration<Binding> listBindings(final Name name) throws NamingException { return null; } - /* (non-Javadoc) - * @see javax.naming.Context#listBindings(java.lang.String) + /** + * {@inheritDoc}. */ @Override public NamingEnumeration<Binding> listBindings(final String name) throws NamingException { return null; } - /* (non-Javadoc) - * @see javax.naming.Context#destroySubcontext(javax.naming.Name) + /** + * {@inheritDoc}. */ @Override public void destroySubcontext(final Name name) throws NamingException {} - /* (non-Javadoc) - * @see javax.naming.Context#destroySubcontext(java.lang.String) + /** + * {@inheritDoc}. */ @Override public void destroySubcontext(final String name) throws NamingException {} - /* (non-Javadoc) - * @see javax.naming.Context#createSubcontext(javax.naming.Name) + /** + * {@inheritDoc}. */ @Override public Context createSubcontext(final Name name) throws NamingException { return null; } - /* (non-Javadoc) - * @see javax.naming.Context#createSubcontext(java.lang.String) + /** + * {@inheritDoc}. */ @Override public Context createSubcontext(final String name) throws NamingException { return null; } - /* (non-Javadoc) - * @see javax.naming.Context#lookupLink(javax.naming.Name) + /** + * {@inheritDoc}. */ @Override public Object lookupLink(final Name name) throws NamingException { return null; } - /* (non-Javadoc) - * @see javax.naming.Context#lookupLink(java.lang.String) + /** + * {@inheritDoc}. */ @Override public Object lookupLink(final String name) throws NamingException { return null; } - /* (non-Javadoc) - * @see javax.naming.Context#getNameParser(javax.naming.Name) + /** + * {@inheritDoc}. */ @Override public NameParser getNameParser(final Name name) throws NamingException { return null; } - /* (non-Javadoc) - * @see javax.naming.Context#getNameParser(java.lang.String) + /** + * {@inheritDoc}. */ @Override public NameParser getNameParser(final String name) throws NamingException { return null; } - /* (non-Javadoc) - * @see javax.naming.Context#composeName(javax.naming.Name, javax.naming.Name) + /** + * {@inheritDoc}. */ @Override public Name composeName(final Name name, final Name prefix) throws NamingException { return null; } - /* (non-Javadoc) - * @see javax.naming.Context#composeName(java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public String composeName(final String name, final String prefix) throws NamingException { return null; } - /* (non-Javadoc) - * @see javax.naming.Context#addToEnvironment(java.lang.String, java.lang.Object) + /** + * {@inheritDoc}. */ @Override public Object addToEnvironment(final String propName, final Object propVal) throws NamingException { return null; } - /* (non-Javadoc) - * @see javax.naming.Context#removeFromEnvironment(java.lang.String) + /** + * {@inheritDoc}. */ @Override public Object removeFromEnvironment(final String propName) throws NamingException { return null; } - /* (non-Javadoc) - * @see javax.naming.Context#getEnvironment() + /** + * {@inheritDoc}. */ @Override public Hashtable<?, ?> getEnvironment() throws NamingException { return null; } - /* (non-Javadoc) - * @see javax.naming.Context#close() + /** + * {@inheritDoc}. */ @Override public void close() throws NamingException {} - /* (non-Javadoc) - * @see javax.naming.Context#getNameInNamespace() + /** + * {@inheritDoc}. */ @Override public String getNameInNamespace() throws NamingException { diff --git a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/jms/TestInitialContextFactory.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/jms/TestInitialContextFactory.java index d04cd5791..ddd70a3b9 100644 --- a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/jms/TestInitialContextFactory.java +++ b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/jms/TestInitialContextFactory.java @@ -42,10 +42,8 @@ public class TestInitialContextFactory implements InitialContextFactory { */ public TestInitialContextFactory() throws NamingException {} - /* - * (non-Javadoc) - * - * @see javax.naming.spi.InitialContextFactory#getInitialContext(java.util.Hashtable) + /** + * {@inheritDoc}. */ @Override public Context getInitialContext(final Hashtable<?, ?> environment) throws NamingException { diff --git a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/kafka/KafkaEventProducer.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/kafka/KafkaEventProducer.java index 63da4e696..bafce8d06 100644 --- a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/kafka/KafkaEventProducer.java +++ b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/kafka/KafkaEventProducer.java @@ -68,10 +68,8 @@ public class KafkaEventProducer implements Runnable { producerThread.start(); } - /* - * (non-Javadoc) - * - * @see java.lang.Runnable#run() + /** + * {@inheritDoc}. */ @Override public void run() { diff --git a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/kafka/KafkaEventSubscriber.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/kafka/KafkaEventSubscriber.java index 54ee9ba92..8db6919f0 100644 --- a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/kafka/KafkaEventSubscriber.java +++ b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/kafka/KafkaEventSubscriber.java @@ -72,10 +72,8 @@ public class KafkaEventSubscriber implements Runnable { subscriberThread.start(); } - /* - * (non-Javadoc) - * - * @see java.lang.Runnable#run() + /** + * {@inheritDoc}. */ @Override public void run() { diff --git a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/websocket/WebSocketEventProducerClient.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/websocket/WebSocketEventProducerClient.java index 84a337362..46973290a 100644 --- a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/websocket/WebSocketEventProducerClient.java +++ b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/websocket/WebSocketEventProducerClient.java @@ -107,12 +107,8 @@ public class WebSocketEventProducerClient implements WsStringMessageListener { System.out.println(WebSocketEventProducerClient.class.getCanonicalName() + ": stopped"); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.core.infrastructure.messaging.stringmessaging.WSStringMessageListener# - * receiveString(java.lang.String) + /** + * {@inheritDoc}. */ @Override public void receiveString(final String eventString) { diff --git a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/websocket/WebSocketEventProducerServer.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/websocket/WebSocketEventProducerServer.java index 3e5ff714e..b75d99ff0 100644 --- a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/websocket/WebSocketEventProducerServer.java +++ b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/websocket/WebSocketEventProducerServer.java @@ -105,12 +105,8 @@ public class WebSocketEventProducerServer implements WsStringMessageListener { System.out.println(WebSocketEventProducerServer.class.getCanonicalName() + ": stopped"); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.core.infrastructure.messaging.stringmessaging.WSStringMessageListener# - * receiveString(java.lang.String) + /** + * {@inheritDoc}. */ @Override public void receiveString(final String eventString) { diff --git a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/websocket/WebSocketEventSubscriberClient.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/websocket/WebSocketEventSubscriberClient.java index 6477a0dc9..fab51529a 100644 --- a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/websocket/WebSocketEventSubscriberClient.java +++ b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/websocket/WebSocketEventSubscriberClient.java @@ -47,12 +47,8 @@ public class WebSocketEventSubscriberClient implements WsStringMessageListener { client.start(this); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.core.infrastructure.messaging.stringmessaging.WSStringMessageListener# - * receiveString(java.lang.String) + /** + * {@inheritDoc}. */ @Override public void receiveString(final String eventString) { diff --git a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/websocket/WebSocketEventSubscriberServer.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/websocket/WebSocketEventSubscriberServer.java index 92329236f..edd6d7961 100644 --- a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/websocket/WebSocketEventSubscriberServer.java +++ b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/websocket/WebSocketEventSubscriberServer.java @@ -49,12 +49,8 @@ public class WebSocketEventSubscriberServer implements WsStringMessageListener { WebSocketEventSubscriberServer.class.getCanonicalName() + ": port " + port + ", waiting for events"); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.core.infrastructure.messaging.stringmessaging.WSStringMessageListener# - * receiveString(java.lang.String) + /** + * {@inheritDoc}. */ @Override public void receiveString(final String eventString) { diff --git a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/engdep/EngineTestServer.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/engdep/EngineTestServer.java index 9e6ff67ca..585787c28 100644 --- a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/engdep/EngineTestServer.java +++ b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/engdep/EngineTestServer.java @@ -75,10 +75,8 @@ public class EngineTestServer implements Runnable, EngineServiceEventInterface { this.parameters = parameters; } - /* - * (non-Javadoc) - * - * @see java.lang.Runnable#run() + /** + * {@inheritDoc}. */ @Override public void run() { @@ -192,12 +190,8 @@ public class EngineTestServer implements Runnable, EngineServiceEventInterface { return starting; } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.service.engine.runtime.EngineServiceEventInterface#sendEvent(org.onap. - * policy.apex.service.engine.event.ApexEvent) + /** + * {@inheritDoc}. */ @Override public void sendEvent(final ApexEvent event) { @@ -217,12 +211,8 @@ public class EngineTestServer implements Runnable, EngineServiceEventInterface { */ private final class TestApexListener implements ApexEventListener { - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.service.engine.runtime.ApexEventListener#onApexEvent(org.onap.policy - * .apex.service.engine.event.ApexEvent) + /** + * {@inheritDoc}. */ @Override public synchronized void onApexEvent(final ApexEvent apexEvent) { diff --git a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/engine/ApexServiceModelUpdateTest.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/engine/ApexServiceModelUpdateTest.java index ff6a3a279..3ea4bde84 100644 --- a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/engine/ApexServiceModelUpdateTest.java +++ b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/engine/ApexServiceModelUpdateTest.java @@ -364,11 +364,8 @@ public class ApexServiceModelUpdateTest { */ private final class TestListener implements ApexEventListener { - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.service.engine.runtime.ApexEventListener#onApexEvent(org.onap.policy - * .apex.service.engine.event.ApexEvent) + /** + * {@inheritDoc}. */ @Override public synchronized void onApexEvent(final ApexEvent event) { diff --git a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/engine/ApexServiceTest.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/engine/ApexServiceTest.java index f8e9f2c37..34893ca5c 100644 --- a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/engine/ApexServiceTest.java +++ b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/engine/ApexServiceTest.java @@ -477,12 +477,8 @@ public class ApexServiceTest { */ private static final class TestListener implements ApexEventListener { - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.service.engine.runtime.ApexEventListener#onApexEvent(org.onap.policy - * .apex.service.engine.event.ApexEvent) + /** + * {@inheritDoc}. */ @Override public synchronized void onApexEvent(final ApexEvent event) { diff --git a/testsuites/performance/performance-benchmark-test/src/main/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventGenerator.java b/testsuites/performance/performance-benchmark-test/src/main/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventGenerator.java index a5ed37803..40bab1173 100644 --- a/testsuites/performance/performance-benchmark-test/src/main/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventGenerator.java +++ b/testsuites/performance/performance-benchmark-test/src/main/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventGenerator.java @@ -126,10 +126,8 @@ public class EventGenerator { * This class is a shutdown hook for the Apex editor command. */ private class EventGeneratorShutdownHook implements Runnable { - /* - * (non-Javadoc) - * - * @see java.lang.Runnable#run() + /** + * {@inheritDoc}. */ @Override public void run() { |