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>

17 files changed, 220 insertions, 488 deletions

diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxArtifactKey.java b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxArtifactKey.java
index 9b1dd6293..ad0e3fe8f 100644
--- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxArtifactKey.java
+++ b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxArtifactKey.java
@@ -122,20 +122,16 @@ public class AxArtifactKey extends AxKey {
         return new AxArtifactKey(AxKey.NULL_KEY_NAME, AxKey.NULL_KEY_VERSION);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKey()
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public AxArtifactKey getKey() {
         return this;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKeys()
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public List<AxKey> getKeys() {
@@ -144,10 +140,8 @@ public class AxArtifactKey extends AxKey {
         return keyList;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.basicmodel.concepts.AxKey#getID()
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public String getId() {
@@ -190,11 +184,8 @@ public class AxArtifactKey extends AxKey {
         this.version = Assertions.validateStringParameter(VERSION_TOKEN, version, VERSION_REGEXP);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.basicmodel.concepts.AxKey#getCompatibility(org.onap.policy.apex.model.basicmodel.
-     * concepts.AxKey)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public AxKey.Compatibility getCompatibility(final AxKey otherKey) {
@@ -226,12 +217,8 @@ public class AxArtifactKey extends AxKey {
         return Compatibility.PATCH;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.onap.policy.apex.model.basicmodel.concepts.AxKey#isCompatible(org.onap.policy.apex.model.basicmodel.concepts.
-     * AxKey)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public boolean isCompatible(final AxKey otherKey) {
@@ -245,12 +232,8 @@ public class AxArtifactKey extends AxKey {
         return !(compatibility == Compatibility.DIFFERENT || compatibility == Compatibility.MAJOR);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.onap.policy.apex.model.basicmodel.concepts.AxConcept#validate(org.onap.policy.apex.model.basicmodel.concepts.
-     * AxValidationResult)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public AxValidationResult validate(final AxValidationResult result) {
@@ -271,10 +254,8 @@ public class AxArtifactKey extends AxKey {
         return result;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#clean()
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public void clean() {
@@ -282,10 +263,8 @@ public class AxArtifactKey extends AxKey {
         version = Assertions.validateStringParameter(VERSION_TOKEN, version, VERSION_REGEXP);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#toString()
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public String toString() {
@@ -300,12 +279,8 @@ public class AxArtifactKey extends AxKey {
         return builder.toString();
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.onap.policy.apex.model.basicmodel.concepts.AxConcept#copyTo(org.onap.policy.apex.model.basicmodel.concepts.
-     * AxConcept)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public AxConcept copyTo(final AxConcept target) {
@@ -321,10 +296,8 @@ public class AxArtifactKey extends AxKey {
         return copyObject;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#hashCode()
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public int hashCode() {
@@ -335,10 +308,8 @@ public class AxArtifactKey extends AxKey {
         return result;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#equals(java.lang. Object)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public boolean equals(final Object obj) {
@@ -360,10 +331,8 @@ public class AxArtifactKey extends AxKey {
         return version.equals(other.version);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Comparable#compareTo(java.lang.Object)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public int compareTo(final AxConcept otherObj) {
diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxConcept.java b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxConcept.java
index e9aad675b..6eff2d806 100644
--- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxConcept.java
+++ b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxConcept.java
@@ -84,26 +84,20 @@ public abstract class AxConcept implements Serializable, Comparable<AxConcept> {
      */
     public abstract void clean();
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#equals(java.lang.Object)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public abstract boolean equals(Object otherObject);
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#toString()
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public abstract String toString();
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#hashCode()
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public abstract int hashCode();
diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxConceptGetterImpl.java b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxConceptGetterImpl.java
index e9c878346..34c704c7b 100644
--- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxConceptGetterImpl.java
+++ b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxConceptGetterImpl.java
@@ -47,21 +47,16 @@ public class AxConceptGetterImpl<C> implements AxConceptGetter<C> {
         this.conceptMap = conceptMap;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.core.basicmodel.concepts.AxConceptGetter#get(org.onap.policy.apex.apex.core.basicmodel.
-     * concepts.AxArtifactKey)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public C get(final AxArtifactKey conceptKey) {
         return conceptMap.get(conceptKey);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.core.basicmodel.concepts.AxConceptGetter#get(java.lang. String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public C get(final String conceptKeyName) {
@@ -89,10 +84,8 @@ public class AxConceptGetterImpl<C> implements AxConceptGetter<C> {
         return conceptMap.get(foundKey);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.core.basicmodel.concepts.AxConceptGetter#get(java.lang. String, java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public C get(final String conceptKeyName, final String conceptKeyVersion) {
@@ -105,20 +98,16 @@ public class AxConceptGetterImpl<C> implements AxConceptGetter<C> {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.core.basicmodel.concepts.AxConceptGetter#getAll(java. lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public Set<C> getAll(final String conceptKeyName) {
         return getAll(conceptKeyName, null);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.core.basicmodel.concepts.AxConceptGetter#getAll(java. lang.String, java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public Set<C> getAll(final String conceptKeyName, final String conceptKeyVersion) {
diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKey.java b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKey.java
index 5702a6577..743847358 100644
--- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKey.java
+++ b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKey.java
@@ -80,10 +80,8 @@ public abstract class AxKey extends AxConcept {
         super(copyConcept);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getID()
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public abstract String getId();
diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInfo.java b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInfo.java
index 5bcd8727e..a60c609e2 100644
--- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInfo.java
+++ b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInfo.java
@@ -123,20 +123,16 @@ public class AxKeyInfo extends AxConcept {
         this.description = description.trim();
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKey()
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public AxArtifactKey getKey() {
         return key;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKeys()
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public List<AxKey> getKeys() {
@@ -191,12 +187,8 @@ public class AxKeyInfo extends AxConcept {
         this.description = description.trim();
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.onap.policy.apex.model.basicmodel.concepts.AxConcept#validate(org.onap.policy.apex.model.basicmodel.concepts.
-     * AxValidationResult)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public AxValidationResult validate(final AxValidationResult resultIn) {
@@ -222,10 +214,8 @@ public class AxKeyInfo extends AxConcept {
         return result;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#clean()
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public void clean() {
@@ -233,10 +223,8 @@ public class AxKeyInfo extends AxConcept {
         description = description.trim();
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#toString()
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public String toString() {
@@ -253,12 +241,8 @@ public class AxKeyInfo extends AxConcept {
         return builder.toString();
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.onap.policy.apex.model.basicmodel.concepts.AxConcept#copyTo(org.onap.policy.apex.model.basicmodel.concepts.
-     * AxConcept)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public AxConcept copyTo(final AxConcept target) {
@@ -275,10 +259,8 @@ public class AxKeyInfo extends AxConcept {
         return copy;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#hashCode()
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public int hashCode() {
@@ -290,10 +272,8 @@ public class AxKeyInfo extends AxConcept {
         return result;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#equals(java.lang. Object)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public boolean equals(final Object obj) {
@@ -319,10 +299,8 @@ public class AxKeyInfo extends AxConcept {
         return thisdesc.equals(otherdesc);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Comparable#compareTo(java.lang.Object)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public int compareTo(final AxConcept otherObj) {
diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInformation.java b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInformation.java
index 2b0594591..977cfcf4f 100644
--- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInformation.java
+++ b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInformation.java
@@ -159,20 +159,16 @@ public class AxKeyInformation extends AxConcept implements AxConceptGetter<AxKey
         }
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKey()
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public AxArtifactKey getKey() {
         return key;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKeys()
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public List<AxKey> getKeys() {
@@ -212,12 +208,8 @@ public class AxKeyInformation extends AxConcept implements AxConceptGetter<AxKey
         this.keyInfoMap.putAll(keyInfoMap);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.onap.policy.apex.model.basicmodel.concepts.AxConcept#validate(org.onap.policy.apex.model.basicmodel.concepts.
-     * AxValidationResult)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public AxValidationResult validate(final AxValidationResult resultIn) {
@@ -281,10 +273,8 @@ public class AxKeyInformation extends AxConcept implements AxConceptGetter<AxKey
         return result;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#clean()
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public void clean() {
@@ -295,10 +285,8 @@ public class AxKeyInformation extends AxConcept implements AxConceptGetter<AxKey
         }
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#toString()
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public String toString() {
@@ -313,12 +301,8 @@ public class AxKeyInformation extends AxConcept implements AxConceptGetter<AxKey
         return builder.toString();
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.onap.policy.apex.model.basicmodel.concepts.AxConcept#copyTo(org.onap.policy.apex.model.basicmodel.concepts.
-     * AxConcept)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public AxConcept copyTo(final AxConcept target) {
@@ -338,10 +322,8 @@ public class AxKeyInformation extends AxConcept implements AxConceptGetter<AxKey
         return copy;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#hashCode()
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public int hashCode() {
@@ -352,10 +334,8 @@ public class AxKeyInformation extends AxConcept implements AxConceptGetter<AxKey
         return result;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#equals(java.lang. Object)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public boolean equals(final Object obj) {
@@ -377,10 +357,8 @@ public class AxKeyInformation extends AxConcept implements AxConceptGetter<AxKey
         return keyInfoMap.equals(other.keyInfoMap);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Comparable#compareTo(java.lang.Object)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public int compareTo(final AxConcept otherObj) {
@@ -405,32 +383,24 @@ public class AxKeyInformation extends AxConcept implements AxConceptGetter<AxKey
         return 0;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.onap.policy.apex.core.basicmodel.concepts.AxConceptGetter#get(org.onap.policy.apex.core.basicmodel.concepts.
-     * AxArtifactKey)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public AxKeyInfo get(final AxArtifactKey conceptKey) {
         return new AxConceptGetterImpl<>((NavigableMap<AxArtifactKey, AxKeyInfo>) keyInfoMap).get(conceptKey);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.core.basicmodel.concepts.AxConceptGetter#get(java.lang. String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public AxKeyInfo get(final String conceptKeyName) {
         return new AxConceptGetterImpl<>((NavigableMap<AxArtifactKey, AxKeyInfo>) keyInfoMap).get(conceptKeyName);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.core.basicmodel.concepts.AxConceptGetter#get(java.lang. String, java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public AxKeyInfo get(final String conceptKeyName, final String conceptKeyVersion) {
@@ -438,20 +408,16 @@ public class AxKeyInformation extends AxConcept implements AxConceptGetter<AxKey
                 conceptKeyVersion);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.core.basicmodel.concepts.AxConceptGetter#getAll(java. lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public Set<AxKeyInfo> getAll(final String conceptKeyName) {
         return new AxConceptGetterImpl<>((NavigableMap<AxArtifactKey, AxKeyInfo>) keyInfoMap).getAll(conceptKeyName);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.core.basicmodel.concepts.AxConceptGetter#getAll(java. lang.String, java.lang.String)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public Set<AxKeyInfo> getAll(final String conceptKeyName, final String conceptKeyVersion) {
diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyUse.java b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyUse.java
index b37519d41..aff688bf8 100644
--- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyUse.java
+++ b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyUse.java
@@ -65,30 +65,24 @@ public class AxKeyUse extends AxKey {
         this.usedKey = usedKey;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKey()
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public AxKey getKey() {
         return usedKey;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKeys()
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public List<AxKey> getKeys() {
         return usedKey.getKeys();
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.basicmodel.concepts.AxKey#getID()
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public String getId() {
@@ -105,35 +99,24 @@ public class AxKeyUse extends AxKey {
         this.usedKey = key;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.basicmodel.concepts.AxKey#getCompatibility(org.onap.policy.apex.model.basicmodel.
-     * concepts.AxKey)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public AxKey.Compatibility getCompatibility(final AxKey otherKey) {
         return usedKey.getCompatibility(otherKey);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.onap.policy.apex.model.basicmodel.concepts.AxKey#isCompatible(org.onap.policy.apex.model.basicmodel.concepts.
-     * AxKey)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public boolean isCompatible(final AxKey otherKey) {
         return usedKey.isCompatible(otherKey);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.onap.policy.apex.model.basicmodel.concepts.AxConcept#validate(org.onap.policy.apex.model.basicmodel.concepts.
-     * AxValidationResult)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public AxValidationResult validate(final AxValidationResult result) {
@@ -144,20 +127,16 @@ public class AxKeyUse extends AxKey {
         return usedKey.validate(result);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#clean()
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public void clean() {
         usedKey.clean();
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#toString()
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public String toString() {
@@ -170,12 +149,8 @@ public class AxKeyUse extends AxKey {
         return builder.toString();
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.onap.policy.apex.model.basicmodel.concepts.AxConcept#copyTo(org.onap.policy.apex.model.basicmodel.concepts.
-     * AxConcept)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public AxConcept copyTo(final AxConcept target) {
@@ -195,10 +170,8 @@ public class AxKeyUse extends AxKey {
         return copy;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#hashCode()
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public int hashCode() {
@@ -208,10 +181,8 @@ public class AxKeyUse extends AxKey {
         return result;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#equals(java.lang. Object)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public boolean equals(final Object obj) {
@@ -230,10 +201,8 @@ public class AxKeyUse extends AxKey {
         return usedKey.equals(other.usedKey);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Comparable#compareTo(java.lang.Object)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public int compareTo(final AxConcept otherObj) {
diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxModel.java b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxModel.java
index 1a604a3c4..03c578e21 100644
--- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxModel.java
+++ b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxModel.java
@@ -131,20 +131,16 @@ public class AxModel extends AxConcept {
         ModelService.registerModel(AxKeyInformation.class, getKeyInformation());
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKey()
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public AxArtifactKey getKey() {
         return key;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKeys()
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public List<AxKey> getKeys() {
@@ -187,12 +183,8 @@ public class AxModel extends AxConcept {
         this.keyInformation = keyInformation;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.onap.policy.apex.model.basicmodel.concepts.AxConcept#validate(org.onap.policy.apex.model.basicmodel.concepts.
-     * AxValidationResult)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public AxValidationResult validate(final AxValidationResult resultIn) {
@@ -366,10 +358,8 @@ public class AxModel extends AxConcept {
         return result;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#clean()
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public void clean() {
@@ -377,10 +367,8 @@ public class AxModel extends AxConcept {
         keyInformation.clean();
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#toString()
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public String toString() {
@@ -395,12 +383,8 @@ public class AxModel extends AxConcept {
         return builder.toString();
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.onap.policy.apex.model.basicmodel.concepts.AxConcept#copyTo(org.onap.policy.apex.model.basicmodel.concepts.
-     * AxConcept)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public AxConcept copyTo(final AxConcept target) {
@@ -416,10 +400,8 @@ public class AxModel extends AxConcept {
         return copy;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#hashCode()
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public int hashCode() {
@@ -430,10 +412,8 @@ public class AxModel extends AxConcept {
         return result;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#equals(java.lang. Object)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public boolean equals(final Object obj) {
@@ -454,10 +434,8 @@ public class AxModel extends AxConcept {
         return keyInformation.equals(other.keyInformation);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Comparable#compareTo(java.lang.Object)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public int compareTo(final AxConcept otherObj) {
diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxReferenceKey.java b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxReferenceKey.java
index 04d9e23f6..32fb76c99 100644
--- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxReferenceKey.java
+++ b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxReferenceKey.java
@@ -236,20 +236,16 @@ public class AxReferenceKey extends AxKey {
                         AxKey.NULL_KEY_NAME);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKey()
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public AxReferenceKey getKey() {
         return this;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKeys()
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public List<AxKey> getKeys() {
@@ -258,10 +254,8 @@ public class AxReferenceKey extends AxKey {
         return keyList;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.basicmodel.concepts.AxKey#getID()
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public String getId() {
@@ -392,11 +386,8 @@ public class AxReferenceKey extends AxKey {
         this.localName = Assertions.validateStringParameter(LOCAL_NAME, localName, LOCAL_NAME_REGEXP);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.basicmodel.concepts.AxKey#getCompatibility(org.onap.policy.apex.model.basicmodel.
-     * concepts.AxKey)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public AxKey.Compatibility getCompatibility(final AxKey otherKey) {
@@ -408,12 +399,8 @@ public class AxReferenceKey extends AxKey {
         return this.getParentArtifactKey().getCompatibility(otherReferenceKey.getParentArtifactKey());
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.onap.policy.apex.model.basicmodel.concepts.AxKey#isCompatible(org.onap.policy.apex.model.basicmodel.concepts.
-     * AxKey)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public boolean isCompatible(final AxKey otherKey) {
@@ -425,12 +412,8 @@ public class AxReferenceKey extends AxKey {
         return this.getParentArtifactKey().isCompatible(otherReferenceKey.getParentArtifactKey());
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.onap.policy.apex.model.basicmodel.concepts.AxConcept#validate(org.onap.policy.apex.model.basicmodel.concepts.
-     * AxValidationResult)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public AxValidationResult validate(final AxValidationResult result) {
@@ -465,10 +448,8 @@ public class AxReferenceKey extends AxKey {
         return result;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#clean()
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public void clean() {
@@ -478,10 +459,8 @@ public class AxReferenceKey extends AxKey {
         localName = Assertions.validateStringParameter(LOCAL_NAME, localName, LOCAL_NAME_REGEXP);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#toString()
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public String toString() {
@@ -500,12 +479,8 @@ public class AxReferenceKey extends AxKey {
         return builder.toString();
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.onap.policy.apex.model.basicmodel.concepts.AxConcept#copyTo(org.onap.policy.apex.model.basicmodel.concepts.
-     * AxConcept)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public AxConcept copyTo(final AxConcept target) {
@@ -523,10 +498,8 @@ public class AxReferenceKey extends AxKey {
         return copy;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#hashCode()
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public int hashCode() {
@@ -539,10 +512,8 @@ public class AxReferenceKey extends AxKey {
         return result;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#equals(java.lang. Object)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public boolean equals(final Object obj) {
@@ -572,10 +543,8 @@ public class AxReferenceKey extends AxKey {
         return localName.equals(other.localName);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Comparable#compareTo(java.lang.Object)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public int compareTo(final AxConcept otherObj) {
diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxValidationMessage.java b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxValidationMessage.java
index c98ce5178..9e245c07b 100644
--- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxValidationMessage.java
+++ b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxValidationMessage.java
@@ -94,10 +94,8 @@ public class AxValidationMessage {
         return message;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#toString()
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public String toString() {
diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxValidationResult.java b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxValidationResult.java
index dbe4c6a75..10ccb30aa 100644
--- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxValidationResult.java
+++ b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxValidationResult.java
@@ -112,10 +112,8 @@ public class AxValidationResult {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#toString()
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public String toString() {
diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/dao/DaoParameters.java b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/dao/DaoParameters.java
index cdaf64ed0..c575bd7c0 100644
--- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/dao/DaoParameters.java
+++ b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/dao/DaoParameters.java
@@ -112,10 +112,8 @@ public class DaoParameters {
         jdbcProperties.setProperty(key, value);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#toString()
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public String toString() {
diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/dao/converters/CDataConditioner.java b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/dao/converters/CDataConditioner.java
index 93c891b13..460714683 100644
--- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/dao/converters/CDataConditioner.java
+++ b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/dao/converters/CDataConditioner.java
@@ -35,40 +35,32 @@ public class CDataConditioner extends XmlAdapter<String, String> implements Attr
 
     private static final String NL = "\n";
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see javax.persistence.AttributeConverter#convertToDatabaseColumn(java.lang.Object)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public String convertToDatabaseColumn(final String raw) {
         return clean(raw);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see javax.persistence.AttributeConverter#convertToEntityAttribute(java.lang.Object)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public String convertToEntityAttribute(final String db) {
         return clean(db);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see javax.xml.bind.annotation.adapters.XmlAdapter
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public String unmarshal(final String value) throws Exception {
         return this.convertToEntityAttribute(value);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see javax.xml.bind.annotation.adapters.XmlAdapter
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public String marshal(final String value) throws Exception {
diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/dao/converters/Uuid2String.java b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/dao/converters/Uuid2String.java
index 3f7bddbd1..37943ff56 100644
--- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/dao/converters/Uuid2String.java
+++ b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/dao/converters/Uuid2String.java
@@ -34,10 +34,8 @@ import javax.xml.bind.annotation.adapters.XmlAdapter;
 @Converter
 public class Uuid2String extends XmlAdapter<String, UUID> implements AttributeConverter<UUID, String> {
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see javax.persistence.AttributeConverter#convertToDatabaseColumn(java.lang.Object)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public String convertToDatabaseColumn(final UUID uuid) {
@@ -51,30 +49,24 @@ public class Uuid2String extends XmlAdapter<String, UUID> implements AttributeCo
         return returnString;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see javax.persistence.AttributeConverter#convertToEntityAttribute(java.lang.Object)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public UUID convertToEntityAttribute(final String uuidString) {
         return UUID.fromString(uuidString);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see javax.xml.bind.annotation.adapters.XmlAdapter
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public UUID unmarshal(final String value) throws Exception {
         return this.convertToEntityAttribute(value);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see javax.xml.bind.annotation.adapters.XmlAdapter
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public String marshal(final UUID value) throws Exception {
diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/dao/impl/DefaultApexDao.java b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/dao/impl/DefaultApexDao.java
index 7945a0837..693284dd0 100644
--- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/dao/impl/DefaultApexDao.java
+++ b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/dao/impl/DefaultApexDao.java
@@ -59,11 +59,8 @@ public class DefaultApexDao implements ApexDao {
     // Entity manager for JPA
     private EntityManagerFactory emf = null;
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.onap.policy.apex.model.basicmodel.dao.ApexDao#init(org.onap.policy.apex.model.basicmodel.dao.DAOParameters)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public void init(final DaoParameters daoParameters) throws ApexException {
@@ -99,10 +96,8 @@ public class DefaultApexDao implements ApexDao {
         return emf.createEntityManager();
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.basicmodel.dao.ApexDao#close()
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public final void close() {
@@ -111,11 +106,8 @@ public class DefaultApexDao implements ApexDao {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.basicmodel.dao.ApexDao#create(org.onap.policy.apex.model.basicmodel.concepts.
-     * AxConcept)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public <T extends AxConcept> void create(final T obj) {
@@ -132,11 +124,8 @@ public class DefaultApexDao implements ApexDao {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.basicmodel.dao.ApexDao#delete(org.onap.policy.apex.model.basicmodel.concepts.
-     * AxConcept)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public <T extends AxConcept> void delete(final T obj) {
@@ -153,11 +142,8 @@ public class DefaultApexDao implements ApexDao {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.basicmodel.dao.ApexDao#delete(java.lang.Class,
-     * org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public <T extends AxConcept> void delete(final Class<T> someClass, final AxArtifactKey key) {
@@ -175,11 +161,8 @@ public class DefaultApexDao implements ApexDao {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.basicmodel.dao.ApexDao#delete(java.lang.Class,
-     * org.onap.policy.apex.model.basicmodel.concepts.AxReferenceKey)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public <T extends AxConcept> void delete(final Class<T> someClass, final AxReferenceKey key) {
@@ -198,10 +181,8 @@ public class DefaultApexDao implements ApexDao {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.basicmodel.dao.ApexDao#create(java.util.Collection)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public <T extends AxConcept> void createCollection(final Collection<T> objs) {
@@ -220,10 +201,8 @@ public class DefaultApexDao implements ApexDao {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.basicmodel.dao.ApexDao#delete(java.util.Collection)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public <T extends AxConcept> void deleteCollection(final Collection<T> objs) {
@@ -242,10 +221,8 @@ public class DefaultApexDao implements ApexDao {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.basicmodel.dao.ApexDao#deleteByArtifactKey(java.lang.Class, java.util.Collection)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public <T extends AxConcept> int deleteByArtifactKey(final Class<T> someClass,
@@ -270,11 +247,8 @@ public class DefaultApexDao implements ApexDao {
         return deletedCount;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.basicmodel.dao.ApexDao#deleteByReferenceKey(java.lang.Class,
-     * java.util.Collection)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public <T extends AxConcept> int deleteByReferenceKey(final Class<T> someClass,
@@ -298,10 +272,8 @@ public class DefaultApexDao implements ApexDao {
         return deletedCount;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.basicmodel.dao.ApexDao#deleteAll(java.lang.Class)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public <T extends AxConcept> void deleteAll(final Class<T> someClass) {
@@ -315,11 +287,8 @@ public class DefaultApexDao implements ApexDao {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.basicmodel.dao.ApexDao#get(java.lang.Class,
-     * org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public <T extends AxConcept> T get(final Class<T> someClass, final AxArtifactKey key) {
@@ -347,11 +316,8 @@ public class DefaultApexDao implements ApexDao {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.basicmodel.dao.ApexDao#get(java.lang.Class,
-     * org.onap.policy.apex.model.basicmodel.concepts.AxReferenceKey)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public <T extends AxConcept> T get(final Class<T> someClass, final AxReferenceKey key) {
@@ -378,10 +344,8 @@ public class DefaultApexDao implements ApexDao {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.basicmodel.dao.ApexDao#getAll(java.lang.Class)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public <T extends AxConcept> List<T> getAll(final Class<T> someClass) {
@@ -396,11 +360,8 @@ public class DefaultApexDao implements ApexDao {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.basicmodel.dao.ApexDao#getAll(java.lang.Class,
-     * org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public <T extends AxConcept> List<T> getAll(final Class<T> someClass, final AxArtifactKey parentKey) {
@@ -417,11 +378,8 @@ public class DefaultApexDao implements ApexDao {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.basicmodel.dao.ApexDao#getArtifact(java.lang.Class,
-     * org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public <T extends AxConcept> T getArtifact(final Class<T> someClass, final AxArtifactKey key) {
@@ -446,11 +404,8 @@ public class DefaultApexDao implements ApexDao {
         return ret.get(0);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.basicmodel.dao.ApexDao#getArtifact(java.lang.Class,
-     * org.onap.policy.apex.model.basicmodel.concepts.AxReferenceKey)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public <T extends AxConcept> T getArtifact(final Class<T> someClass, final AxReferenceKey key) {
@@ -476,11 +431,8 @@ public class DefaultApexDao implements ApexDao {
         return ret.get(0);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.basicmodel.dao.ApexDao#update(org.onap.policy.apex.model.basicmodel.concepts.
-     * AxConcept)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public <T extends AxConcept> T update(final T obj) {
@@ -497,10 +449,8 @@ public class DefaultApexDao implements ApexDao {
         return ret;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.onap.policy.apex.model.basicmodel.dao.ApexDao#size(java.lang.Class)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public <T extends AxConcept> long size(final Class<T> someClass) {
diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexSchemaGenerator.java b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexSchemaGenerator.java
index 46e30bf10..a793a60d5 100644
--- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexSchemaGenerator.java
+++ b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexSchemaGenerator.java
@@ -140,10 +140,8 @@ public class ApexSchemaGenerator {
     private class ApexSchemaOutputResolver extends SchemaOutputResolver {
         private final StringWriter stringWriter = new StringWriter();
 
-        /*
-         * (non-Javadoc)
-         *
-         * @see javax.xml.bind.SchemaOutputResolver#createOutput(java.lang.String, java.lang.String)
+        /**
+         * {@inheritDoc}.
          */
         @Override
         public Result createOutput(final String namespaceUri, final String suggestedFileName) throws IOException {
diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/xml/AxReferenceKeyAdapter.java b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/xml/AxReferenceKeyAdapter.java
index 28f0cf7af..c70e51ab2 100644
--- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/xml/AxReferenceKeyAdapter.java
+++ b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/xml/AxReferenceKeyAdapter.java
@@ -39,20 +39,16 @@ public class AxReferenceKeyAdapter extends XmlAdapter<String, AxReferenceKey> im
 
     private static final long serialVersionUID = -3480405083900107029L;
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see javax.xml.bind.annotation.adapters.XmlAdapter#marshal(java.lang.Object)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public final String marshal(final AxReferenceKey key) throws Exception {
         return key.getLocalName();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see javax.xml.bind.annotation.adapters.XmlAdapter#unmarshal(java.lang.Object)
+    /**
+     * {@inheritDoc}.
      */
     @Override
     public final AxReferenceKey unmarshal(final String key) throws Exception {