diff options
Diffstat (limited to 'services/services-engine/src')
33 files changed, 266 insertions, 606 deletions
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) { |