summaryrefslogtreecommitdiffstats
path: root/plugins/plugins-context
diff options
context:
space:
mode:
authorliamfallon <liam.fallon@est.tech>2019-06-28 10:42:34 +0000
committerliamfallon <liam.fallon@est.tech>2019-06-28 10:42:34 +0000
commit423e98641ca7fe79a1b1bb897aa8a4b17ba5ee4d (patch)
tree9d3fd39c5e3dde70afa55d7cc2d399c14be4baf8 /plugins/plugins-context
parentd139a68e359bfaa0e1ea1038345dd28e1869aca9 (diff)
Replace non-Javadoc comments with inheritDocs
Copyright headers not changed as this review only amends comments. Issue-ID: POLICY-1791 Change-Id: Icbeb2c6e591b3b160ae102bb67aef2d407924a4d Signed-off-by: liamfallon <liam.fallon@est.tech>
Diffstat (limited to 'plugins/plugins-context')
-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
17 files changed, 106 insertions, 249 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) {