summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/distribution/hazelcast/HazelcastContextDistributor.java21
-rw-r--r--plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanContextDistributor.java20
-rw-r--r--plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanDistributorParameters.java6
-rw-r--r--plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanManager.java6
-rw-r--r--plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorLockFacade.java36
-rw-r--r--plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorLockManager.java27
-rw-r--r--plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorLockManagerParameters.java6
-rw-r--r--plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorReentrantReadWriteLock.java12
-rw-r--r--plugins/plugins-context/plugins-context-locking/plugins-context-locking-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/locking/hazelcast/HazelcastLock.java12
-rw-r--r--plugins/plugins-context/plugins-context-locking/plugins-context-locking-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/locking/hazelcast/HazelcastLockManager.java21
-rw-r--r--plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroArrayObjectMapper.java7
-rw-r--r--plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroBytesObjectMapper.java41
-rw-r--r--plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroDirectObjectMapper.java41
-rw-r--r--plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroEnumObjectMapper.java7
-rw-r--r--plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroNullableMapper.java44
-rw-r--r--plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroRecordObjectMapper.java7
-rw-r--r--plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroStringObjectMapper.java41
-rw-r--r--plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/src/main/java/org/onap/policy/apex/plugins/event/carrier/jms/ApexJmsConsumer.java13
-rw-r--r--plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/src/main/java/org/onap/policy/apex/plugins/event/carrier/jms/ApexJmsProducer.java40
-rw-r--r--plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/src/main/java/org/onap/policy/apex/plugins/event/carrier/jms/JmsCarrierTechnologyParameters.java6
-rw-r--r--plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/src/main/java/org/onap/policy/apex/plugins/event/carrier/kafka/ApexKafkaConsumer.java46
-rw-r--r--plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/src/main/java/org/onap/policy/apex/plugins/event/carrier/kafka/ApexKafkaProducer.java33
-rw-r--r--plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/src/main/java/org/onap/policy/apex/plugins/event/carrier/kafka/KafkaCarrierTechnologyParameters.java6
-rw-r--r--plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/src/main/java/org/onap/policy/apex/plugins/event/carrier/restclient/ApexRestClientConsumer.java44
-rw-r--r--plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/src/main/java/org/onap/policy/apex/plugins/event/carrier/restclient/ApexRestClientProducer.java40
-rw-r--r--plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/src/test/java/org/onap/policy/apex/plugins/event/carrier/restclient/SupportApexEventReceiver.java12
-rw-r--r--plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/main/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequest.java4
-rw-r--r--plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/main/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequestorConsumer.java45
-rw-r--r--plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/main/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequestorProducer.java40
-rw-r--r--plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/main/java/org/onap/policy/apex/plugins/event/carrier/restserver/ApexRestServerConsumer.java46
-rw-r--r--plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/main/java/org/onap/policy/apex/plugins/event/carrier/restserver/ApexRestServerProducer.java40
-rw-r--r--plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/main/java/org/onap/policy/apex/plugins/event/carrier/restserver/RestServerCarrierTechnologyParameters.java6
-rw-r--r--plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/test/java/org/onap/policy/apex/plugins/event/carrier/restserver/SupportApexEventReceiver.java12
-rw-r--r--plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/src/main/java/org/onap/policy/apex/plugins/event/carrier/websocket/ApexWebSocketConsumer.java46
-rw-r--r--plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/src/main/java/org/onap/policy/apex/plugins/event/carrier/websocket/ApexWebSocketProducer.java41
-rw-r--r--plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/src/main/java/org/onap/policy/apex/plugins/event/carrier/websocket/WebSocketCarrierTechnologyParameters.java6
-rw-r--r--plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/src/main/java/org/onap/policy/apex/plugins/event/protocol/jms/Apex2JmsObjectEventConverter.java13
-rw-r--r--plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/src/main/java/org/onap/policy/apex/plugins/event/protocol/jms/Apex2JmsTextEventConverter.java14
-rw-r--r--plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/main/java/org/onap/policy/apex/plugins/event/protocol/xml/Apex2XmlEventConverter.java21
-rw-r--r--plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/src/main/java/org/onap/policy/apex/plugins/event/protocol/yaml/Apex2YamlEventConverter.java20
-rw-r--r--plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/src/test/java/org/onap/policy/apex/plugins/persistence/jpa/eclipselink/entities/ArtifactKeyTestEntity.java58
-rw-r--r--plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/src/test/java/org/onap/policy/apex/plugins/persistence/jpa/eclipselink/entities/ReferenceKeyTestEntity.java58
42 files changed, 324 insertions, 741 deletions
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) {