diff options
Diffstat (limited to 'model')
46 files changed, 862 insertions, 1953 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 { diff --git a/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextAlbum.java b/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextAlbum.java index 7dddc4099..7e15003a0 100644 --- a/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextAlbum.java +++ b/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextAlbum.java @@ -163,20 +163,16 @@ public class AxContextAlbum extends AxConcept { this.itemSchema = itemSchema; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKey() + /** + * {@inheritDoc}. */ @Override public AxArtifactKey getKey() { return key; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKeys() + /** + * {@inheritDoc}. */ @Override public List<AxKey> getKeys() { @@ -252,11 +248,8 @@ public class AxContextAlbum extends AxConcept { this.itemSchema = itemSchema; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#validate(org.onap.policy.apex.model. - * basicmodel.concepts.AxValidationResult) + /** + * {@inheritDoc}. */ @Override public AxValidationResult validate(final AxValidationResult resultIn) { @@ -288,10 +281,8 @@ public class AxContextAlbum extends AxConcept { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#clean() + /** + * {@inheritDoc}. */ @Override public void clean() { @@ -300,10 +291,8 @@ public class AxContextAlbum extends AxConcept { itemSchema.clean(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { @@ -322,11 +311,8 @@ public class AxContextAlbum extends AxConcept { return builder.toString(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#copyTo(org.onap.policy.apex.model. - * basicmodel.concepts.AxConcept) + /** + * {@inheritDoc}. */ @Override public AxConcept copyTo(final AxConcept target) { @@ -344,10 +330,8 @@ public class AxContextAlbum extends AxConcept { return copy; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -360,10 +344,8 @@ public class AxContextAlbum extends AxConcept { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -391,10 +373,8 @@ public class AxContextAlbum extends AxConcept { return itemSchema.equals(other.itemSchema); } - /* - * (non-Javadoc) - * - * @see java.lang.Comparable#compareTo(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public int compareTo(final AxConcept otherObj) { diff --git a/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextAlbums.java b/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextAlbums.java index ddf363ed3..cbd923b6c 100644 --- a/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextAlbums.java +++ b/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextAlbums.java @@ -146,20 +146,16 @@ public final class AxContextAlbums extends AxConcept implements AxConceptGetter< albums = navigableAlbums; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKey() + /** + * {@inheritDoc}. */ @Override public AxArtifactKey getKey() { return key; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKeys() + /** + * {@inheritDoc}. */ @Override public List<AxKey> getKeys() { @@ -202,10 +198,8 @@ public final class AxContextAlbums extends AxConcept implements AxConceptGetter< this.albums.putAll(albumsMap); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#clean() + /** + * {@inheritDoc}. */ @Override public void clean() { @@ -216,10 +210,8 @@ public final class AxContextAlbums extends AxConcept implements AxConceptGetter< } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { @@ -236,11 +228,8 @@ public final class AxContextAlbums extends AxConcept implements AxConceptGetter< return builder.toString(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#validate(org.onap.policy.apex.model. - * basicmodel.concepts.AxValidationResult) + /** + * {@inheritDoc}. */ @Override public AxValidationResult validate(final AxValidationResult resultIn) { @@ -286,11 +275,8 @@ public final class AxContextAlbums extends AxConcept implements AxConceptGetter< } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#copyTo(org.onap.policy.apex.model. - * basicmodel.concepts.AxConcept) + /** + * {@inheritDoc}. */ @Override public AxConcept copyTo(final AxConcept target) { @@ -311,10 +297,8 @@ public final class AxContextAlbums extends AxConcept implements AxConceptGetter< return copy; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -325,10 +309,8 @@ public final class AxContextAlbums extends AxConcept implements AxConceptGetter< return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -350,10 +332,8 @@ public final class AxContextAlbums extends AxConcept implements AxConceptGetter< return albums.equals(other.albums); } - /* - * (non-Javadoc) - * - * @see java.lang.Comparable#compareTo(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public int compareTo(final AxConcept otherObj) { @@ -378,31 +358,24 @@ public final class AxContextAlbums extends AxConcept implements AxConceptGetter< return 0; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConceptGetter#get(org.onap.policy.apex. - * model.basicmodel.concepts.AxArtifactKey) + /** + * {@inheritDoc}. */ @Override public AxContextAlbum get(final AxArtifactKey conceptKey) { return new AxConceptGetterImpl<>((NavigableMap<AxArtifactKey, AxContextAlbum>) albums).get(conceptKey); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConceptGetter#get(java.lang.String) + /** + * {@inheritDoc}. */ @Override public AxContextAlbum get(final String conceptKeyName) { return new AxConceptGetterImpl<>((NavigableMap<AxArtifactKey, AxContextAlbum>) albums).get(conceptKeyName); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConceptGetter#get(java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public AxContextAlbum get(final String conceptKeyName, final String conceptKeyVersion) { @@ -410,20 +383,16 @@ public final class AxContextAlbums extends AxConcept implements AxConceptGetter< conceptKeyVersion); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConceptGetter#getAll(java.lang.String) + /** + * {@inheritDoc}. */ @Override public Set<AxContextAlbum> getAll(final String conceptKeyName) { return new AxConceptGetterImpl<>((NavigableMap<AxArtifactKey, AxContextAlbum>) albums).getAll(conceptKeyName); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConceptGetter#getAll(java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public Set<AxContextAlbum> getAll(final String conceptKeyName, final String conceptKeyVersion) { diff --git a/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextModel.java b/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextModel.java index 17980ed65..da04aad83 100644 --- a/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextModel.java +++ b/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextModel.java @@ -140,10 +140,8 @@ public class AxContextModel extends AxModel { this.albums = albums; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxModel#register() + /** + * {@inheritDoc}. */ @Override public void register() { @@ -152,10 +150,8 @@ public class AxContextModel extends AxModel { ModelService.registerModel(AxContextAlbums.class, getAlbums()); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxModel#getKeys() + /** + * {@inheritDoc}. */ @Override public List<AxKey> getKeys() { @@ -205,11 +201,8 @@ public class AxContextModel extends AxModel { this.albums = albums; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxModel#validate(org.onap.policy.apex.model. - * basicmodel.concepts.AxValidationResult) + /** + * {@inheritDoc}. */ @Override public AxValidationResult validate(final AxValidationResult resultIn) { @@ -220,10 +213,8 @@ public class AxContextModel extends AxModel { return albums.validate(result); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxModel#clean() + /** + * {@inheritDoc}. */ @Override public void clean() { @@ -232,10 +223,8 @@ public class AxContextModel extends AxModel { albums.clean(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxModel#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { @@ -251,11 +240,8 @@ public class AxContextModel extends AxModel { return builder.toString(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#copyTo(org.onap.policy.apex.model. - * basicmodel.concepts.AxConcept) + /** + * {@inheritDoc}. */ @Override public AxConcept copyTo(final AxConcept target) { @@ -272,10 +258,8 @@ public class AxContextModel extends AxModel { return copy; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxModel#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -287,10 +271,8 @@ public class AxContextModel extends AxModel { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxModel#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -315,11 +297,8 @@ public class AxContextModel extends AxModel { return albums.equals(other.albums); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxModel#compareTo(org.onap.policy.apex.model. - * basicmodel.concepts.AxConcept) + /** + * {@inheritDoc}. */ @Override public int compareTo(final AxConcept otherObj) { diff --git a/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchema.java b/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchema.java index f2e3dc3cf..17629605e 100644 --- a/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchema.java +++ b/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchema.java @@ -145,20 +145,16 @@ public class AxContextSchema extends AxConcept { this.schemaDefinition = schemaDefinition.replaceAll(WHITESPACE_REGEXP, ""); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKey() + /** + * {@inheritDoc}. */ @Override public AxArtifactKey getKey() { return key; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKeys() + /** + * {@inheritDoc}. */ @Override public List<AxKey> getKeys() { @@ -212,11 +208,8 @@ public class AxContextSchema extends AxConcept { this.schemaDefinition = schema.replaceAll(WHITESPACE_REGEXP, ""); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#validate(org.onap.policy.apex.model. - * basicmodel.concepts.AxValidationResult) + /** + * {@inheritDoc}. */ @Override public AxValidationResult validate(final AxValidationResult resultIn) { @@ -250,10 +243,8 @@ public class AxContextSchema extends AxConcept { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#clean() + /** + * {@inheritDoc}. */ @Override public void clean() { @@ -262,10 +253,8 @@ public class AxContextSchema extends AxConcept { schemaDefinition = schemaDefinition.replaceAll(WHITESPACE_REGEXP, ""); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { @@ -282,11 +271,8 @@ public class AxContextSchema extends AxConcept { return builder.toString(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#copyTo(org.onap.policy.apex.model. - * basicmodel.concepts.AxConcept) + /** + * {@inheritDoc}. */ @Override public AxConcept copyTo(final AxConcept target) { @@ -303,10 +289,8 @@ public class AxContextSchema extends AxConcept { return copy; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -318,10 +302,8 @@ public class AxContextSchema extends AxConcept { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -349,10 +331,8 @@ public class AxContextSchema extends AxConcept { return thisSchema.equals(otherSchema); } - /* - * (non-Javadoc) - * - * @see java.lang.Comparable#compareTo(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public int compareTo(final AxConcept otherObj) { diff --git a/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchemas.java b/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchemas.java index b2456bfbf..5bd0c1f5e 100644 --- a/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchemas.java +++ b/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchemas.java @@ -145,20 +145,16 @@ public class AxContextSchemas extends AxConcept implements AxConceptGetter<AxCon schemas = navigableContextSchemas; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKey() + /** + * {@inheritDoc}. */ @Override public AxArtifactKey getKey() { return key; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKeys() + /** + * {@inheritDoc}. */ @Override public List<AxKey> getKeys() { @@ -199,11 +195,8 @@ public class AxContextSchemas extends AxConcept implements AxConceptGetter<AxCon this.schemas.putAll(schemasMap); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#validate(org.onap.policy.apex.model. - * basicmodel.concepts.AxValidationResult) + /** + * {@inheritDoc}. */ @Override public AxValidationResult validate(final AxValidationResult resultIn) { @@ -245,10 +238,8 @@ public class AxContextSchemas extends AxConcept implements AxConceptGetter<AxCon return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#clean() + /** + * {@inheritDoc}. */ @Override public void clean() { @@ -259,10 +250,8 @@ public class AxContextSchemas extends AxConcept implements AxConceptGetter<AxCon } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { @@ -277,11 +266,8 @@ public class AxContextSchemas extends AxConcept implements AxConceptGetter<AxCon return builder.toString(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#copyTo(org.onap.policy.apex.model. - * basicmodel.concepts.AxConcept) + /** + * {@inheritDoc}. */ @Override public AxConcept copyTo(final AxConcept target) { @@ -303,10 +289,8 @@ public class AxContextSchemas extends AxConcept implements AxConceptGetter<AxCon return copy; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -317,10 +301,8 @@ public class AxContextSchemas extends AxConcept implements AxConceptGetter<AxCon return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -341,10 +323,8 @@ public class AxContextSchemas extends AxConcept implements AxConceptGetter<AxCon return schemas.equals(other.schemas); } - /* - * (non-Javadoc) - * - * @see java.lang.Comparable#compareTo(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public int compareTo(final AxConcept otherObj) { @@ -369,31 +349,24 @@ public class AxContextSchemas extends AxConcept implements AxConceptGetter<AxCon return 0; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.basicmodel.concepts.AxConceptGetter#get(org.onap.policy.apex.core. - * basicmodel.concepts.AxArtifactKey) + /** + * {@inheritDoc}. */ @Override public AxContextSchema get(final AxArtifactKey conceptKey) { return new AxConceptGetterImpl<>((NavigableMap<AxArtifactKey, AxContextSchema>) schemas).get(conceptKey); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.basicmodel.concepts.AxConceptGetter#get(java.lang.String) + /** + * {@inheritDoc}. */ @Override public AxContextSchema get(final String conceptKeyName) { return new AxConceptGetterImpl<>((NavigableMap<AxArtifactKey, AxContextSchema>) schemas).get(conceptKeyName); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.basicmodel.concepts.AxConceptGetter#get(java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public AxContextSchema get(final String conceptKeyName, final String conceptKeyVersion) { @@ -401,20 +374,16 @@ public class AxContextSchemas extends AxConcept implements AxConceptGetter<AxCon conceptKeyVersion); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.basicmodel.concepts.AxConceptGetter#getAll(java.lang.String) + /** + * {@inheritDoc}. */ @Override public Set<AxContextSchema> getAll(final String conceptKeyName) { return new AxConceptGetterImpl<>((NavigableMap<AxArtifactKey, AxContextSchema>) schemas).getAll(conceptKeyName); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.basicmodel.concepts.AxConceptGetter#getAll(java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public Set<AxContextSchema> getAll(final String conceptKeyName, final String conceptKeyVersion) { diff --git a/model/engine-model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineModel.java b/model/engine-model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineModel.java index 785845532..79c5d89d6 100644 --- a/model/engine-model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineModel.java +++ b/model/engine-model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineModel.java @@ -157,10 +157,8 @@ public class AxEngineModel extends AxContextModel { this.stats = stats; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.contextmodel.concepts.AxContextModel#getKeys() + /** + * {@inheritDoc}. */ @Override public List<AxKey> getKeys() { @@ -234,12 +232,8 @@ public class AxEngineModel extends AxContextModel { this.stats = stats; } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.model.contextmodel.concepts.AxContextModel#validate(org.onap.policy.apex - * .model .basicmodel.concepts.AxValidationResult) + /** + * {@inheritDoc}. */ @Override public AxValidationResult validate(final AxValidationResult resultIn) { @@ -260,10 +254,8 @@ public class AxEngineModel extends AxContextModel { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.contextmodel.concepts.AxContextModel#clean() + /** + * {@inheritDoc}. */ @Override public void clean() { @@ -271,10 +263,8 @@ public class AxEngineModel extends AxContextModel { stats.clean(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.contextmodel.concepts.AxContextModel#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { @@ -292,12 +282,8 @@ public class AxEngineModel extends AxContextModel { return builder.toString(); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.model.basicmodel.concepts.AxConcept#copyTo(org.onap.policy.apex.model. - * basicmodel.concepts.AxConcept) + /** + * {@inheritDoc}. */ @Override public AxConcept copyTo(final AxConcept targetObject) { @@ -315,10 +301,8 @@ public class AxEngineModel extends AxContextModel { return copy; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.contextmodel.concepts.AxContextModel#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -331,10 +315,8 @@ public class AxEngineModel extends AxContextModel { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.contextmodel.concepts.AxContextModel#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -363,12 +345,8 @@ public class AxEngineModel extends AxContextModel { return stats.equals(other.stats); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.model.contextmodel.concepts.AxContextModel#compareTo(org.onap.policy. - * apex.model.basicmodel.concepts.AxConcept) + /** + * {@inheritDoc}. */ @Override public int compareTo(final AxConcept otherObj) { diff --git a/model/engine-model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineStats.java b/model/engine-model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineStats.java index adda0c1f3..a66274431 100644 --- a/model/engine-model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineStats.java +++ b/model/engine-model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineStats.java @@ -152,20 +152,16 @@ public class AxEngineStats extends AxConcept { this.lastStart = lastStart; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKey() + /** + * {@inheritDoc}. */ @Override public AxReferenceKey getKey() { return key; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKeys() + /** + * {@inheritDoc}. */ @Override public List<AxKey> getKeys() { @@ -363,12 +359,8 @@ public class AxEngineStats extends AxConcept { this.setLastStart(0); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.model.basicmodel.concepts.AxConcept#validate(org.onap.policy.apex.model. - * basicmodel.concepts.AxValidationResult) + /** + * {@inheritDoc}. */ @Override public AxValidationResult validate(final AxValidationResult result) { @@ -380,20 +372,16 @@ public class AxEngineStats extends AxConcept { return key.validate(result); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#clean() + /** + * {@inheritDoc}. */ @Override public void clean() { key.clean(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { @@ -416,12 +404,8 @@ public class AxEngineStats extends AxConcept { return builder.toString(); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.model.basicmodel.concepts.AxConcept#copyTo(org.onap.policy.apex.model. - * basicmodel.concepts.AxConcept) + /** + * {@inheritDoc}. */ @Override public AxConcept copyTo(final AxConcept targetObject) { @@ -442,10 +426,8 @@ public class AxEngineStats extends AxConcept { return copy; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -461,10 +443,8 @@ public class AxEngineStats extends AxConcept { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -501,10 +481,8 @@ public class AxEngineStats extends AxConcept { return getLastStart() == other.getLastStart(); } - /* - * (non-Javadoc) - * - * @see java.lang.Comparable#compareTo(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public int compareTo(final AxConcept otherObj) { diff --git a/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEvent.java b/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEvent.java index c83b7b86a..74ba1f958 100644 --- a/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEvent.java +++ b/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEvent.java @@ -208,20 +208,16 @@ public class AxEvent extends AxConcept { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKey() + /** + * {@inheritDoc}. */ @Override public AxArtifactKey getKey() { return key; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKeys() + /** + * {@inheritDoc}. */ @Override public List<AxKey> getKeys() { @@ -332,12 +328,8 @@ public class AxEvent extends AxConcept { this.parameterMap = parameterMap; } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.model.basicmodel.concepts.AxConcept#validate(org.onap.policy.apex.model.basicmodel.concepts. - * AxValidationResult) + /** + * {@inheritDoc}. */ @Override public AxValidationResult validate(final AxValidationResult resultIn) { @@ -405,10 +397,8 @@ public class AxEvent extends AxConcept { return eventParameterEntry.getValue().validate(result); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#clean() + /** + * {@inheritDoc}. */ @Override public void clean() { @@ -418,10 +408,8 @@ public class AxEvent extends AxConcept { target = target.trim(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { @@ -442,12 +430,8 @@ public class AxEvent extends AxConcept { return builder.toString(); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.model.basicmodel.concepts.AxConcept#copyTo(org.onap.policy.apex.model.basicmodel.concepts. - * AxConcept) + /** + * {@inheritDoc}. */ @Override public AxConcept copyTo(final AxConcept targetObject) { @@ -472,10 +456,8 @@ public class AxEvent extends AxConcept { return copy; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -489,10 +471,8 @@ public class AxEvent extends AxConcept { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -523,10 +503,8 @@ public class AxEvent extends AxConcept { return parameterMap.equals(other.parameterMap); } - /* - * (non-Javadoc) - * - * @see java.lang.Comparable#compareTo(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public int compareTo(final AxConcept otherObj) { diff --git a/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEventModel.java b/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEventModel.java index 69ae01acf..6c8ce15f1 100644 --- a/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEventModel.java +++ b/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEventModel.java @@ -124,10 +124,8 @@ public class AxEventModel extends AxModel { this.events = events; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxModel#register() + /** + * {@inheritDoc}. */ @Override public void register() { @@ -136,10 +134,8 @@ public class AxEventModel extends AxModel { ModelService.registerModel(AxEvents.class, getEvents()); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxModel#getKeys() + /** + * {@inheritDoc}. */ @Override public List<AxKey> getKeys() { @@ -189,12 +185,8 @@ public class AxEventModel extends AxModel { this.events = events; } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.model.basicmodel.concepts.AxModel#validate(org.onap.policy.apex.model.basicmodel.concepts. - * AxValidationResult) + /** + * {@inheritDoc}. */ @Override public AxValidationResult validate(final AxValidationResult resultIn) { @@ -205,10 +197,8 @@ public class AxEventModel extends AxModel { return events.validate(result); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxModel#clean() + /** + * {@inheritDoc}. */ @Override public void clean() { @@ -217,10 +207,8 @@ public class AxEventModel extends AxModel { events.clean(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxModel#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { @@ -236,12 +224,8 @@ public class AxEventModel extends AxModel { return builder.toString(); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.model.basicmodel.concepts.AxConcept#copyTo(org.onap.policy.apex.model.basicmodel.concepts. - * AxConcept) + /** + * {@inheritDoc}. */ @Override public AxConcept copyTo(final AxConcept targetObject) { @@ -258,10 +242,8 @@ public class AxEventModel extends AxModel { return copy; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxModel#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -273,10 +255,8 @@ public class AxEventModel extends AxModel { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxModel#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -301,12 +281,8 @@ public class AxEventModel extends AxModel { return events.equals(other.events); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.model.basicmodel.concepts.AxModel#compareTo(org.onap.policy.apex.model.basicmodel.concepts. - * AxConcept) + /** + * {@inheritDoc}. */ @Override public int compareTo(final AxConcept otherObj) { diff --git a/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEvents.java b/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEvents.java index 4ec3af3b3..3d0d9b7f2 100644 --- a/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEvents.java +++ b/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEvents.java @@ -143,20 +143,16 @@ public class AxEvents extends AxConcept implements AxConceptGetter<AxEvent> { eventMap = navigableEventMap; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKey() + /** + * {@inheritDoc}. */ @Override public AxArtifactKey getKey() { return key; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKeys() + /** + * {@inheritDoc}. */ @Override public List<AxKey> getKeys() { @@ -199,12 +195,8 @@ public class AxEvents extends AxConcept implements AxConceptGetter<AxEvent> { this.eventMap.putAll(eventMap); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.model.basicmodel.concepts.AxConcept#validate(org.onap.policy.apex.model.basicmodel.concepts. - * AxValidationResult) + /** + * {@inheritDoc}. */ @Override public AxValidationResult validate(final AxValidationResult resultIn) { @@ -245,10 +237,8 @@ public class AxEvents extends AxConcept implements AxConceptGetter<AxEvent> { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#clean() + /** + * {@inheritDoc}. */ @Override public void clean() { @@ -259,10 +249,8 @@ public class AxEvents extends AxConcept implements AxConceptGetter<AxEvent> { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { @@ -277,12 +265,8 @@ public class AxEvents extends AxConcept implements AxConceptGetter<AxEvent> { return builder.toString(); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.model.basicmodel.concepts.AxConcept#copyTo(org.onap.policy.apex.model.basicmodel.concepts. - * AxConcept) + /** + * {@inheritDoc}. */ @Override public AxConcept copyTo(final AxConcept targetObject) { @@ -302,10 +286,8 @@ public class AxEvents extends AxConcept implements AxConceptGetter<AxEvent> { return copy; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -316,10 +298,8 @@ public class AxEvents extends AxConcept implements AxConceptGetter<AxEvent> { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -341,10 +321,8 @@ public class AxEvents extends AxConcept implements AxConceptGetter<AxEvent> { return eventMap.equals(other.eventMap); } - /* - * (non-Javadoc) - * - * @see java.lang.Comparable#compareTo(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public int compareTo(final AxConcept otherObj) { @@ -369,31 +347,24 @@ public class AxEvents extends AxConcept implements AxConceptGetter<AxEvent> { return 0; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConceptGetter#get(org.onap.policy.apex.model.basicmodel. - * concepts. AxArtifactKey) + /** + * {@inheritDoc}. */ @Override public AxEvent get(final AxArtifactKey conceptKey) { return new AxConceptGetterImpl<>((NavigableMap<AxArtifactKey, AxEvent>) eventMap).get(conceptKey); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConceptGetter#get(java.lang.String) + /** + * {@inheritDoc}. */ @Override public AxEvent get(final String conceptKeyName) { return new AxConceptGetterImpl<>((NavigableMap<AxArtifactKey, AxEvent>) eventMap).get(conceptKeyName); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConceptGetter#get(java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public AxEvent get(final String conceptKeyName, final String conceptKeyVersion) { @@ -401,20 +372,16 @@ public class AxEvents extends AxConcept implements AxConceptGetter<AxEvent> { conceptKeyVersion); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConceptGetter#getAll(java.lang.String) + /** + * {@inheritDoc}. */ @Override public Set<AxEvent> getAll(final String conceptKeyName) { return new AxConceptGetterImpl<>((NavigableMap<AxArtifactKey, AxEvent>) eventMap).getAll(conceptKeyName); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConceptGetter#getAll(java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public Set<AxEvent> getAll(final String conceptKeyName, final String conceptKeyVersion) { diff --git a/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxField.java b/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxField.java index 300f6beb5..c3f9d3329 100644 --- a/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxField.java +++ b/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxField.java @@ -189,20 +189,16 @@ public class AxField extends AxConcept { this.optional = optional; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKey() + /** + * {@inheritDoc}. */ @Override public AxReferenceKey getKey() { return key; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKeys() + /** + * {@inheritDoc}. */ @Override public List<AxKey> getKeys() { @@ -258,12 +254,8 @@ public class AxField extends AxConcept { this.optional = optional; } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.model.basicmodel.concepts.AxConcept#validate(org.onap.policy.apex.model.basicmodel.concepts. - * AxValidationResult) + /** + * {@inheritDoc}. */ @Override public AxValidationResult validate(final AxValidationResult resultIn) { @@ -283,10 +275,8 @@ public class AxField extends AxConcept { return fieldSchemaKey.validate(result); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#clean() + /** + * {@inheritDoc}. */ @Override public void clean() { @@ -294,10 +284,8 @@ public class AxField extends AxConcept { fieldSchemaKey.clean(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { @@ -314,12 +302,8 @@ public class AxField extends AxConcept { return builder.toString(); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.model.basicmodel.concepts.AxConcept#copyTo(org.onap.policy.apex.model.basicmodel.concepts. - * AxConcept) + /** + * {@inheritDoc}. */ @Override public AxConcept copyTo(final AxConcept targetObject) { @@ -335,10 +319,8 @@ public class AxField extends AxConcept { return copy; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -378,10 +360,8 @@ public class AxField extends AxConcept { return fieldSchemaKey.equals(other.fieldSchemaKey); } - /* - * (non-Javadoc) - * - * @see java.lang.Comparable#compareTo(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public int compareTo(final AxConcept otherObj) { diff --git a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/ApexApiResult.java b/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/ApexApiResult.java index 2b1dc5505..65bd84add 100644 --- a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/ApexApiResult.java +++ b/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/ApexApiResult.java @@ -280,10 +280,8 @@ public class ApexApiResult { return builder.toString(); } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { diff --git a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ApexModelImpl.java b/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ApexModelImpl.java index 6719dea99..77ded31d6 100644 --- a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ApexModelImpl.java +++ b/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ApexModelImpl.java @@ -83,10 +83,8 @@ public final class ApexModelImpl implements ApexModel { */ private ApexModelImpl() {} - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.modelapi.ApexModel#clone() + /** + * {@inheritDoc}. */ @Override public ApexModel clone() { @@ -109,11 +107,8 @@ public final class ApexModelImpl implements ApexModel { return ret; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.modelapi.ApexModel#createModel(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult createModel(final String name, final String version, final String uuid, @@ -121,11 +116,8 @@ public final class ApexModelImpl implements ApexModel { return modelFacade.createModel(name, version, uuid, description); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.modelapi.ApexModel#updateModel(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult updateModel(final String name, final String version, final String uuid, @@ -133,41 +125,32 @@ public final class ApexModelImpl implements ApexModel { return modelFacade.updateModel(name, version, uuid, description); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.modelapi.ApexEditorAPI#getModelKey() + /** + * {@inheritDoc}. */ @Override public ApexApiResult getModelKey() { return modelFacade.getModelKey(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#listModel() + /** + * {@inheritDoc}. */ @Override public ApexApiResult listModel() { return modelFacade.listModel(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#deleteModel() + /** + * {@inheritDoc}. */ @Override public ApexApiResult deleteModel() { return modelFacade.deleteModel(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#createKeyInformation(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult createKeyInformation(final String name, final String version, final String uuid, @@ -175,11 +158,8 @@ public final class ApexModelImpl implements ApexModel { return keyInformationFacade.createKeyInformation(name, version, uuid, description); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#updateKeyInformation(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult updateKeyInformation(final String name, final String version, final String uuid, @@ -187,44 +167,32 @@ public final class ApexModelImpl implements ApexModel { return keyInformationFacade.updateKeyInformation(name, version, uuid, description); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#listKeyInformation(java.lang.String, - * java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult listKeyInformation(final String name, final String version) { return keyInformationFacade.listKeyInformation(name, version); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#deleteKeyInformation(java.lang.String, - * java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult deleteKeyInformation(final String name, final String version) { return keyInformationFacade.deleteKeyInformation(name, version); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#validateKeyInformation(java.lang.String, - * java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult validateKeyInformation(final String name, final String version) { return keyInformationFacade.validateKeyInformation(name, version); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#createContextSchema(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult createContextSchema(final String name, final String version, final String schemaFlavour, @@ -233,11 +201,8 @@ public final class ApexModelImpl implements ApexModel { description); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#updateContextSchema(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult updateContextSchema(final String name, final String version, final String schemaFlavour, @@ -246,45 +211,32 @@ public final class ApexModelImpl implements ApexModel { description); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#listContextSchemas(java.lang.String, - * java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult listContextSchemas(final String name, final String version) { return contextSchemaFacade.listContextSchemas(name, version); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#deleteContextSchema(java.lang.String, - * java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult deleteContextSchema(final String name, final String version) { return contextSchemaFacade.deleteContextSchema(name, version); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#validateContextSchemas(java.lang.String, - * java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult validateContextSchemas(final String name, final String version) { return contextSchemaFacade.validateContextSchemas(name, version); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#createEvent(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, - * java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult createEvent(final String name, final String version, final String nameSpace, @@ -292,12 +244,8 @@ public final class ApexModelImpl implements ApexModel { return eventFacade.createEvent(name, version, nameSpace, source, target, uuid, description); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#updateEvent(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, - * java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult updateEvent(final String name, final String version, final String nameSpace, @@ -305,44 +253,32 @@ public final class ApexModelImpl implements ApexModel { return eventFacade.updateEvent(name, version, nameSpace, source, target, uuid, description); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#listEvent(java.lang.String, - * java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult listEvent(final String name, final String version) { return eventFacade.listEvent(name, version); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#deleteEvent(java.lang.String, - * java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult deleteEvent(final String name, final String version) { return eventFacade.deleteEvent(name, version); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#validateEvent(java.lang.String, - * java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult validateEvent(final String name, final String version) { return eventFacade.validateEvent(name, version); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.modelapi.ApexEditorAPI#createEventPar(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String, java.lang.String, boolean) + /** + * {@inheritDoc}. */ @Override public ApexApiResult createEventPar(final String name, final String version, final String parName, @@ -350,34 +286,24 @@ public final class ApexModelImpl implements ApexModel { return eventFacade.createEventPar(name, version, parName, contextSchemaName, contextSchemaVersion, optional); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#listEventPar(java.lang.String, - * java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult listEventPar(final String name, final String version, final String parName) { return eventFacade.listEventPar(name, version, parName); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#deleteEventPar(java.lang.String, - * java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult deleteEventPar(final String name, final String version, final String parName) { return eventFacade.deleteEventPar(name, version, parName); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.modelapi.ApexEditorAPI#createContextAlbum(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, - * java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override // CHECKSTYLE:OFF: checkstyle:parameterNumber @@ -390,12 +316,8 @@ public final class ApexModelImpl implements ApexModel { } // CHECKSTYLE:ON: checkstyle:parameterNumber - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.modelapi.ApexEditorAPI#updateContextAlbum(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, - * java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ // CHECKSTYLE:OFF: checkstyle:parameterNumber @Override @@ -408,44 +330,32 @@ public final class ApexModelImpl implements ApexModel { } // CHECKSTYLE:ON: checkstyle:parameterNumber - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#listContextAlbum(java.lang.String, - * java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult listContextAlbum(final String name, final String version) { return contextAlbumFacade.listContextAlbum(name, version); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#deleteContextAlbum(java.lang.String, - * java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult deleteContextAlbum(final String name, final String version) { return contextAlbumFacade.deleteContextAlbum(name, version); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#validateContextAlbum(java.lang.String, - * java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult validateContextAlbum(final String name, final String version) { return contextAlbumFacade.validateContextAlbum(name, version); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#createTask(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult createTask(final String name, final String version, final String uuid, @@ -453,11 +363,8 @@ public final class ApexModelImpl implements ApexModel { return taskFacade.createTask(name, version, uuid, description); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#updateTask(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult updateTask(final String name, final String version, final String uuid, @@ -465,43 +372,32 @@ public final class ApexModelImpl implements ApexModel { return taskFacade.updateTask(name, version, uuid, description); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#listTask(java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult listTask(final String name, final String version) { return taskFacade.listTask(name, version); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#deleteTask(java.lang.String, - * java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult deleteTask(final String name, final String version) { return taskFacade.deleteTask(name, version); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#validateTask(java.lang.String, - * java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult validateTask(final String name, final String version) { return taskFacade.validateTask(name, version); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#createTaskLogic(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult createTaskLogic(final String name, final String version, final String logicFlavour, @@ -509,11 +405,8 @@ public final class ApexModelImpl implements ApexModel { return taskFacade.createTaskLogic(name, version, logicFlavour, logic); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#updateTaskLogic(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult updateTaskLogic(final String name, final String version, final String logicFlavour, @@ -521,33 +414,24 @@ public final class ApexModelImpl implements ApexModel { return taskFacade.updateTaskLogic(name, version, logicFlavour, logic); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#listTaskLogic(java.lang.String, - * java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult listTaskLogic(final String name, final String version) { return taskFacade.listTaskLogic(name, version); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#deleteTaskLogic(java.lang.String, - * java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult deleteTaskLogic(final String name, final String version) { return taskFacade.deleteTaskLogic(name, version); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#createTaskInputField(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.boolean) + /** + * {@inheritDoc}. */ @Override public ApexApiResult createTaskInputField(final String name, final String version, final String fieldName, @@ -555,33 +439,24 @@ public final class ApexModelImpl implements ApexModel { return taskFacade.createTaskInputField(name, version, fieldName, dataTypeName, dataTypeVersion, optional); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#listTaskInputField(java.lang.String, - * java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult listTaskInputField(final String name, final String version, final String fieldName) { return taskFacade.listTaskInputField(name, version, fieldName); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#deleteTaskInputField(java.lang.String, - * java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult deleteTaskInputField(final String name, final String version, final String fieldName) { return taskFacade.deleteTaskInputField(name, version, fieldName); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#createTaskOutputField(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.boolean) + /** + * {@inheritDoc}. */ @Override public ApexApiResult createTaskOutputField(final String name, final String version, final String fieldName, @@ -589,33 +464,24 @@ public final class ApexModelImpl implements ApexModel { return taskFacade.createTaskOutputField(name, version, fieldName, dataTypeName, dataTypeVersion, optional); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#listTaskOutputField(java.lang.String, - * java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult listTaskOutputField(final String name, final String version, final String fieldName) { return taskFacade.listTaskOutputField(name, version, fieldName); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#deleteTaskOutputField(java.lang.String, - * java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult deleteTaskOutputField(final String name, final String version, final String fieldName) { return taskFacade.deleteTaskOutputField(name, version, fieldName); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#createTaskParameter(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult createTaskParameter(final String name, final String version, final String parName, @@ -623,33 +489,24 @@ public final class ApexModelImpl implements ApexModel { return taskFacade.createTaskParameter(name, version, parName, defaultValue); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#listTaskParameter(java.lang.String, - * java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult listTaskParameter(final String name, final String version, final String parName) { return taskFacade.listTaskParameter(name, version, parName); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#deleteTaskParameter(java.lang.String, - * java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult deleteTaskParameter(final String name, final String version, final String parName) { return taskFacade.deleteTaskParameter(name, version, parName); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#createTaskContextRef(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult createTaskContextRef(final String name, final String version, final String contextAlbumName, @@ -657,11 +514,8 @@ public final class ApexModelImpl implements ApexModel { return taskFacade.createTaskContextRef(name, version, contextAlbumName, contextAlbumVersion); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#listTaskContextRef(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult listTaskContextRef(final String name, final String version, final String contextAlbumName, @@ -669,11 +523,8 @@ public final class ApexModelImpl implements ApexModel { return taskFacade.listTaskContextRef(name, version, contextAlbumName, contextAlbumVersion); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#deleteTaskContextRef(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult deleteTaskContextRef(final String name, final String version, final String contextAlbumName, @@ -681,11 +532,8 @@ public final class ApexModelImpl implements ApexModel { return taskFacade.deleteTaskContextRef(name, version, contextAlbumName, contextAlbumVersion); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#createPolicy(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult createPolicy(final String name, final String version, final String template, @@ -693,11 +541,8 @@ public final class ApexModelImpl implements ApexModel { return policyFacade.createPolicy(name, version, template, firstState, uuid, description); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#updatePolicy(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult updatePolicy(final String name, final String version, final String template, @@ -705,45 +550,32 @@ public final class ApexModelImpl implements ApexModel { return policyFacade.updatePolicy(name, version, template, firstState, uuid, description); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#listPolicy(java.lang.String, - * java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult listPolicy(final String name, final String version) { return policyFacade.listPolicy(name, version); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#deletePolicy(java.lang.String, - * java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult deletePolicy(final String name, final String version) { return policyFacade.deletePolicy(name, version); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#validatePolicy(java.lang.String, - * java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult validatePolicy(final String name, final String version) { return policyFacade.validatePolicy(name, version); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#createPolicyState(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, - * java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult createPolicyState(final String name, final String version, final String stateName, @@ -753,12 +585,8 @@ public final class ApexModelImpl implements ApexModel { defaltTaskVersion); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#updatePolicyState(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, - * java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult updatePolicyState(final String name, final String version, final String stateName, @@ -768,34 +596,24 @@ public final class ApexModelImpl implements ApexModel { defaltTaskVersion); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#listPolicyState(java.lang.String, - * java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult listPolicyState(final String name, final String version, final String stateName) { return policyFacade.listPolicyState(name, version, stateName); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#deletePolicyState(java.lang.String, - * java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult deletePolicyState(final String name, final String version, final String stateName) { return policyFacade.deletePolicyState(name, version, stateName); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.auth.api.ApexEditorAPI#createPolicyStateTaskSelectionLogic(java.lang. - * String, java.lang.String, java.lang.String, java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult createPolicyStateTaskSelectionLogic(final String name, final String version, @@ -803,12 +621,8 @@ public final class ApexModelImpl implements ApexModel { return policyFacade.createPolicyStateTaskSelectionLogic(name, version, stateName, logicFlavour, logic); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.auth.api.ApexEditorAPI#updatePolicyStateTaskSelectionLogic(java.lang. - * String, java.lang.String, java.lang.String, java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult updatePolicyStateTaskSelectionLogic(final String name, final String version, @@ -816,11 +630,8 @@ public final class ApexModelImpl implements ApexModel { return policyFacade.updatePolicyStateTaskSelectionLogic(name, version, stateName, logicFlavour, logic); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#listPolicyStateTaskSelectionLogic(java.lang. - * String, java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult listPolicyStateTaskSelectionLogic(final String name, final String version, @@ -828,12 +639,8 @@ public final class ApexModelImpl implements ApexModel { return policyFacade.listPolicyStateTaskSelectionLogic(name, version, stateName); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.auth.api.ApexEditorAPI#deletePolicyStateTaskSelectionLogic(java.lang. - * String, java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult deletePolicyStateTaskSelectionLogic(final String name, final String version, @@ -841,12 +648,8 @@ public final class ApexModelImpl implements ApexModel { return policyFacade.deletePolicyStateTaskSelectionLogic(name, version, stateName); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#createPolicyStateOutput(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, - * java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult createPolicyStateOutput(final String name, final String version, final String stateName, @@ -855,11 +658,8 @@ public final class ApexModelImpl implements ApexModel { nextState); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#listPolicyStateOutput(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult listPolicyStateOutput(final String name, final String version, final String stateName, @@ -867,11 +667,8 @@ public final class ApexModelImpl implements ApexModel { return policyFacade.listPolicyStateOutput(name, version, stateName, outputName); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#deletePolicyStateOutput(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult deletePolicyStateOutput(final String name, final String version, final String stateName, @@ -879,13 +676,8 @@ public final class ApexModelImpl implements ApexModel { return policyFacade.deletePolicyStateOutput(name, version, stateName, outputName); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.core.modelapi.ApexEditorAPI#createPolicyStateFinalizerLogic(java.lang. - * String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, - * java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult createPolicyStateFinalizerLogic(final String name, final String version, @@ -894,13 +686,8 @@ public final class ApexModelImpl implements ApexModel { logic); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.core.modelapi.ApexEditorAPI#updatePolicyStateFinalizerLogic(java.lang. - * String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, - * java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult updatePolicyStateFinalizerLogic(final String name, final String version, @@ -909,12 +696,8 @@ public final class ApexModelImpl implements ApexModel { logic); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.core.modelapi.ApexEditorAPI#listPolicyStateFinalizerLogic(java.lang. - * String, java.lang.String, java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult listPolicyStateFinalizerLogic(final String name, final String version, final String stateName, @@ -922,12 +705,8 @@ public final class ApexModelImpl implements ApexModel { return policyFacade.listPolicyStateFinalizerLogic(name, version, stateName, finalizerLogicName); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.core.modelapi.ApexEditorAPI#deletePolicyStateFinalizerLogic(java.lang. - * String, java.lang.String, java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult deletePolicyStateFinalizerLogic(final String name, final String version, @@ -935,13 +714,8 @@ public final class ApexModelImpl implements ApexModel { return policyFacade.deletePolicyStateFinalizerLogic(name, version, stateName, finalizerLogicName); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.core.modelapi.ApexEditorAPI#createPolicyStateTaskRef(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, - * java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override // CHECKSTYLE:OFF: checkstyle:parameterNumber @@ -954,11 +728,8 @@ public final class ApexModelImpl implements ApexModel { } // CHECKSTYLE:ON: checkstyle:parameterNumber - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#listPolicyStateTaskRef(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult listPolicyStateTaskRef(final String name, final String version, final String stateName, @@ -966,11 +737,8 @@ public final class ApexModelImpl implements ApexModel { return policyFacade.listPolicyStateTaskRef(name, version, stateName, taskName, taskVersion); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#deletePolicyStateTaskRef(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult deletePolicyStateTaskRef(final String name, final String version, final String stateName, @@ -978,12 +746,8 @@ public final class ApexModelImpl implements ApexModel { return policyFacade.deletePolicyStateTaskRef(name, version, stateName, taskName, taskVersion); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.auth.api.ApexEditorAPI#createPolicyStateContextRef(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult createPolicyStateContextRef(final String name, final String version, final String stateName, @@ -992,11 +756,8 @@ public final class ApexModelImpl implements ApexModel { contextAlbumVersion); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexEditorAPI#listPolicyStateContextRef(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult listPolicyStateContextRef(final String name, final String version, final String stateName, @@ -1004,12 +765,8 @@ public final class ApexModelImpl implements ApexModel { return policyFacade.listPolicyStateContextRef(name, version, stateName, contextAlbumName, contextAlbumVersion); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.auth.api.ApexEditorAPI#deletePolicyStateContextRef(java.lang.String, - * java.lang.String, java.lang.String, java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult deletePolicyStateContextRef(final String name, final String version, final String stateName, @@ -1018,20 +775,16 @@ public final class ApexModelImpl implements ApexModel { contextAlbumVersion); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.modelapi.ApexModel#loadFromString(java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult loadFromString(final String modelString) { return modelHandlerFacade.loadFromString(modelString); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexModel#loadFromFile(java.lang.String) + /** + * {@inheritDoc}. */ @Override // CHECKSTYLE:OFF: checkstyle:HiddenField @@ -1041,10 +794,8 @@ public final class ApexModelImpl implements ApexModel { } // CHECKSTYLE:ON: checkstyle:HiddenField - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexModel#saveToFile(java.lang.String, boolean) + /** + * {@inheritDoc}. */ @Override public ApexApiResult saveToFile(final String saveFileName, final boolean xmlFlag) { @@ -1055,11 +806,8 @@ public final class ApexModelImpl implements ApexModel { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.modelapi.ApexModel#loadFromDatabase(java.lang.String, - * java.lang.String, org.onap.policy.apex.model.basicmodel.dao.DaoParameters) + /** + * {@inheritDoc}. */ @Override public ApexApiResult loadFromDatabase(final String modelName, final String modelVersion, @@ -1067,72 +815,56 @@ public final class ApexModelImpl implements ApexModel { return modelHandlerFacade.loadFromDatabase(modelName, modelVersion, daoParameters); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.modelapi.ApexModel#saveToDatabase(org.onap.policy.apex.model. - * basicmodel. dao.DaoParameters) + /** + * {@inheritDoc}. */ @Override public ApexApiResult saveToDatabase(final DaoParameters daoParameters) { return modelHandlerFacade.saveToDatabase(daoParameters); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexModel#readFromURL(java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult readFromUrl(final String urlString) { return modelHandlerFacade.readFromUrl(urlString); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexModel#writeToURL(java.lang.String, boolean) + /** + * {@inheritDoc}. */ @Override public ApexApiResult writeToUrl(final String urlString, final boolean xmlFlag) { return modelHandlerFacade.writeToUrl(urlString, xmlFlag); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexModel#analyse() + /** + * {@inheritDoc}. */ @Override public ApexApiResult analyse() { return modelHandlerFacade.analyse(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexModel#validate() + /** + * {@inheritDoc}. */ @Override public ApexApiResult validate() { return modelHandlerFacade.validate(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexModel#compare(java.lang.String, boolean, boolean) + /** + * {@inheritDoc}. */ @Override public ApexApiResult compare(final String otherModelFileName, final boolean diffsOnly, final boolean keysOnly) { return modelHandlerFacade.compare(otherModelFileName, diffsOnly, keysOnly); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.modelapi.ApexModel#compareWithString(java.lang.String, - * boolean, boolean) + /** + * {@inheritDoc}. */ @Override public ApexApiResult compareWithString(final String otherModelString, final boolean diffsOnly, @@ -1140,72 +872,56 @@ public final class ApexModelImpl implements ApexModel { return modelHandlerFacade.compareWithString(otherModelString, diffsOnly, keysOnly); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexModel#split(java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult split(final String targetModelFileName, final String splitOutPolicies) { return modelHandlerFacade.split(targetModelFileName, splitOutPolicies); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.modelapi.ApexModel#split(java.lang.String) + /** + * {@inheritDoc}. */ @Override public ApexApiResult split(final String splitOutPolicies) { return modelHandlerFacade.split(splitOutPolicies); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexModel#merge(java.lang.String, boolean) + /** + * {@inheritDoc}. */ @Override public ApexApiResult merge(final String mergeInModelFileName, final boolean keepOriginal) { return modelHandlerFacade.merge(mergeInModelFileName, keepOriginal); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.modelapi.ApexModel#mergeWithString(java.lang.String, boolean) + /** + * {@inheritDoc}. */ @Override public ApexApiResult mergeWithString(final String otherModelString, final boolean keepOriginal) { return modelHandlerFacade.mergeWithString(otherModelString, keepOriginal); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.auth.api.ApexModel#getModel() + /** + * {@inheritDoc}. */ @Override public AxPolicyModel getPolicyModel() { return policyModel; } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.auth.api.ApexModel#setPolicyModel(org.onap.policy.apex.core.policymodel. - * concepts.AxPolicyModel) + /** + * {@inheritDoc}. */ @Override public void setPolicyModel(final AxPolicyModel policyModel) { this.policyModel = policyModel; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.core.modelapi.ApexModel#build() + /** + * {@inheritDoc}. */ @Override public AxPolicyModel build() { diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxLogic.java b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxLogic.java index 2fed326f9..f7680a772 100644 --- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxLogic.java +++ b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxLogic.java @@ -182,20 +182,16 @@ public class AxLogic extends AxConcept { logic = logicReader.readLogic(this); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKey() + /** + * {@inheritDoc}. */ @Override public AxReferenceKey getKey() { return key; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKeys() + /** + * {@inheritDoc}. */ @Override public List<AxKey> getKeys() { @@ -249,11 +245,8 @@ public class AxLogic extends AxConcept { this.logic = logic.replaceAll(WHITESPACE_REGEXP, ""); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#validate(org.onap.policy.apex.model. - * basicmodel.concepts.AxValidationResult) + /** + * {@inheritDoc}. */ @Override public AxValidationResult validate(final AxValidationResult resultIn) { @@ -287,10 +280,8 @@ public class AxLogic extends AxConcept { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#clean() + /** + * {@inheritDoc}. */ @Override public void clean() { @@ -301,10 +292,8 @@ public class AxLogic extends AxConcept { logic = logic.replaceAll(WHITESPACE_REGEXP, ""); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { @@ -321,11 +310,8 @@ public class AxLogic extends AxConcept { return builder.toString(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#copyTo(org.onap.policy.apex.model. - * basicmodel.concepts.AxConcept) + /** + * {@inheritDoc}. */ @Override public AxConcept copyTo(final AxConcept targetObject) { @@ -342,10 +328,8 @@ public class AxLogic extends AxConcept { return copy; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -357,10 +341,8 @@ public class AxLogic extends AxConcept { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -386,10 +368,8 @@ public class AxLogic extends AxConcept { return thislogic.equals(otherlogic); } - /* - * (non-Javadoc) - * - * @see java.lang.Comparable#compareTo(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public int compareTo(final AxConcept otherObj) { diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicies.java b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicies.java index 493cf79c1..d6a7efb71 100644 --- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicies.java +++ b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicies.java @@ -145,20 +145,16 @@ public class AxPolicies extends AxConcept implements AxConceptGetter<AxPolicy> { policyMap = navigablePolicyMap; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKey() + /** + * {@inheritDoc}. */ @Override public AxArtifactKey getKey() { return key; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKeys() + /** + * {@inheritDoc}. */ @Override public List<AxKey> getKeys() { @@ -201,11 +197,8 @@ public class AxPolicies extends AxConcept implements AxConceptGetter<AxPolicy> { this.policyMap.putAll(policyMap); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#validate(org.onap.policy.apex.model. - * basicmodel.concepts.AxValidationResult) + /** + * {@inheritDoc}. */ @Override public AxValidationResult validate(final AxValidationResult resultIn) { @@ -249,10 +242,8 @@ public class AxPolicies extends AxConcept implements AxConceptGetter<AxPolicy> { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#clean() + /** + * {@inheritDoc}. */ @Override public void clean() { @@ -263,10 +254,8 @@ public class AxPolicies extends AxConcept implements AxConceptGetter<AxPolicy> { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { @@ -281,11 +270,8 @@ public class AxPolicies extends AxConcept implements AxConceptGetter<AxPolicy> { return builder.toString(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#copyTo(org.onap.policy.apex.model. - * basicmodel.concepts.AxConcept) + /** + * {@inheritDoc}. */ @Override public AxConcept copyTo(final AxConcept targetObject) { @@ -306,10 +292,8 @@ public class AxPolicies extends AxConcept implements AxConceptGetter<AxPolicy> { return copy; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -320,10 +304,8 @@ public class AxPolicies extends AxConcept implements AxConceptGetter<AxPolicy> { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -345,10 +327,8 @@ public class AxPolicies extends AxConcept implements AxConceptGetter<AxPolicy> { return policyMap.equals(other.policyMap); } - /* - * (non-Javadoc) - * - * @see java.lang.Comparable#compareTo(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public int compareTo(final AxConcept otherObj) { @@ -373,31 +353,24 @@ public class AxPolicies extends AxConcept implements AxConceptGetter<AxPolicy> { return 0; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConceptGetter#get(org.onap.policy.apex.model - * .basicmodel.concepts.AxArtifactKey) + /** + * {@inheritDoc}. */ @Override public AxPolicy get(final AxArtifactKey conceptKey) { return new AxConceptGetterImpl<>((NavigableMap<AxArtifactKey, AxPolicy>) policyMap).get(conceptKey); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConceptGetter#get(java.lang.String) + /** + * {@inheritDoc}. */ @Override public AxPolicy get(final String conceptKeyName) { return new AxConceptGetterImpl<>((NavigableMap<AxArtifactKey, AxPolicy>) policyMap).get(conceptKeyName); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConceptGetter#get(java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public AxPolicy get(final String conceptKeyName, final String conceptKeyVersion) { @@ -405,20 +378,16 @@ public class AxPolicies extends AxConcept implements AxConceptGetter<AxPolicy> { conceptKeyVersion); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConceptGetter#getAll(java.lang.String) + /** + * {@inheritDoc}. */ @Override public Set<AxPolicy> getAll(final String conceptKeyName) { return new AxConceptGetterImpl<>((NavigableMap<AxArtifactKey, AxPolicy>) policyMap).getAll(conceptKeyName); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConceptGetter#getAll(java.lang.String, java.lang.String) + /** + * {@inheritDoc}. */ @Override public Set<AxPolicy> getAll(final String conceptKeyName, final String conceptKeyVersion) { diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicy.java b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicy.java index 00db24124..8157d91d4 100644 --- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicy.java +++ b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicy.java @@ -171,20 +171,16 @@ public class AxPolicy extends AxConcept { return new AxStateTree(this, stateMap.get(firstState), null); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKey() + /** + * {@inheritDoc}. */ @Override public AxArtifactKey getKey() { return key; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKeys() + /** + * {@inheritDoc}. */ @Override public List<AxKey> getKeys() { @@ -262,11 +258,8 @@ public class AxPolicy extends AxConcept { this.firstState = firstState; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#validate(org.onap.policy.apex.model. - * basicmodel.concepts.AxValidationResult) + /** + * {@inheritDoc}. */ @Override public AxValidationResult validate(final AxValidationResult resultIn) { @@ -393,10 +386,8 @@ public class AxPolicy extends AxConcept { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#clean() + /** + * {@inheritDoc}. */ @Override public void clean() { @@ -404,10 +395,8 @@ public class AxPolicy extends AxConcept { firstState = firstState.trim(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { @@ -426,11 +415,8 @@ public class AxPolicy extends AxConcept { return builder.toString(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#copyTo(org.onap.policy.apex.model. - * basicmodel.concepts.AxConcept) + /** + * {@inheritDoc}. */ @Override public AxConcept copyTo(final AxConcept targetObject) { @@ -454,10 +440,8 @@ public class AxPolicy extends AxConcept { return copy; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -470,10 +454,8 @@ public class AxPolicy extends AxConcept { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -500,10 +482,8 @@ public class AxPolicy extends AxConcept { return firstState.equals(other.firstState); } - /* - * (non-Javadoc) - * - * @see java.lang.Comparable#compareTo(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public int compareTo(final AxConcept otherObj) { diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicyModel.java b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicyModel.java index acc2c8e04..ca7e7b335 100644 --- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicyModel.java +++ b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicyModel.java @@ -206,10 +206,8 @@ public class AxPolicyModel extends AxModel { this.policies = policies; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxModel#register() + /** + * {@inheritDoc}. */ @Override public void register() { @@ -222,10 +220,8 @@ public class AxPolicyModel extends AxModel { ModelService.registerModel(AxPolicyModel.class, this); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxModel#getKeys() + /** + * {@inheritDoc}. */ @Override public List<AxKey> getKeys() { @@ -345,12 +341,8 @@ public class AxPolicyModel extends AxModel { this.schemas = schemas; } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.model.basicmodel.concepts.AxModel#validate(org.onap.policy.apex.model. - * basicmodel.concepts.AxValidationResult) + /** + * {@inheritDoc}. */ @Override public AxValidationResult validate(final AxValidationResult resultIn) { @@ -579,10 +571,8 @@ public class AxPolicyModel extends AxModel { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxModel#clean() + /** + * {@inheritDoc}. */ @Override public void clean() { @@ -594,10 +584,8 @@ public class AxPolicyModel extends AxModel { schemas.clean(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxModel#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { @@ -619,12 +607,8 @@ public class AxPolicyModel extends AxModel { return builder.toString(); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.model.basicmodel.concepts.AxConcept#copyTo(org.onap.policy.apex.model. - * basicmodel.concepts.AxConcept) + /** + * {@inheritDoc}. */ @Override public AxConcept copyTo(final AxConcept targetObject) { @@ -644,10 +628,8 @@ public class AxPolicyModel extends AxModel { return copy; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxModel#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -662,10 +644,8 @@ public class AxPolicyModel extends AxModel { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxModel#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -699,12 +679,8 @@ public class AxPolicyModel extends AxModel { return schemas.equals(other.schemas); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.model.basicmodel.concepts.AxModel#compareTo(org.onap.policy.apex.model. - * basicmodel.concepts.AxConcept) + /** + * {@inheritDoc}. */ @Override public int compareTo(final AxConcept otherObj) { diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxState.java b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxState.java index cb5331f94..f94cb2ef4 100644 --- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxState.java +++ b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxState.java @@ -324,20 +324,16 @@ public class AxState extends AxConcept { return nextStateSet; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKey() + /** + * {@inheritDoc}. */ @Override public AxReferenceKey getKey() { return key; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKeys() + /** + * {@inheritDoc}. */ @Override public List<AxKey> getKeys() { @@ -531,11 +527,8 @@ public class AxState extends AxConcept { this.taskReferenceMap = taskReferences; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#validate(org.onap.policy.apex.model. - * basicmodel.concepts.AxValidationResult) + /** + * {@inheritDoc}. */ @Override public AxValidationResult validate(final AxValidationResult resultIn) { @@ -768,10 +761,8 @@ public class AxState extends AxConcept { return taskReference.validate(result); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#clean() + /** + * {@inheritDoc}. */ @Override public void clean() { @@ -793,10 +784,8 @@ public class AxState extends AxConcept { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { @@ -823,11 +812,8 @@ public class AxState extends AxConcept { return builder.toString(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#copyTo(org.onap.policy.apex.model. - * basicmodel.concepts.AxConcept) + /** + * {@inheritDoc}. */ @Override public AxConcept copyTo(final AxConcept targetObject) { @@ -873,10 +859,8 @@ public class AxState extends AxConcept { return copy; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -893,10 +877,8 @@ public class AxState extends AxConcept { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -936,10 +918,8 @@ public class AxState extends AxConcept { return taskReferenceMap.equals(other.taskReferenceMap); } - /* - * (non-Javadoc) - * - * @see java.lang.Comparable#compareTo(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public int compareTo(final AxConcept otherObj) { diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateOutput.java b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateOutput.java index 67ed4f16a..34c8f2f2d 100644 --- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateOutput.java +++ b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateOutput.java @@ -162,20 +162,16 @@ public class AxStateOutput extends AxConcept { this.nextState = nextState; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKey() + /** + * {@inheritDoc}. */ @Override public AxReferenceKey getKey() { return key; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKeys() + /** + * {@inheritDoc}. */ @Override public List<AxKey> getKeys() { @@ -237,11 +233,8 @@ public class AxStateOutput extends AxConcept { this.nextState = nextState; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#validate(org.onap.policy.apex.model. - * basicmodel.concepts.AxValidationResult) + /** + * {@inheritDoc}. */ @Override public AxValidationResult validate(final AxValidationResult resultIn) { @@ -266,10 +259,8 @@ public class AxStateOutput extends AxConcept { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#clean() + /** + * {@inheritDoc}. */ @Override public void clean() { @@ -278,10 +269,8 @@ public class AxStateOutput extends AxConcept { nextState.clean(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { @@ -298,11 +287,8 @@ public class AxStateOutput extends AxConcept { return builder.toString(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#copyTo(org.onap.policy.apex.model. - * basicmodel.concepts.AxConcept) + /** + * {@inheritDoc}. */ @Override public AxConcept copyTo(final AxConcept targetObject) { @@ -319,10 +305,8 @@ public class AxStateOutput extends AxConcept { return copy; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -334,10 +318,8 @@ public class AxStateOutput extends AxConcept { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -361,10 +343,8 @@ public class AxStateOutput extends AxConcept { return nextState.equals(other.nextState); } - /* - * (non-Javadoc) - * - * @see java.lang.Comparable#compareTo(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public int compareTo(final AxConcept otherObj) { diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateTaskReference.java b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateTaskReference.java index 13c21b65e..748abdbe1 100644 --- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateTaskReference.java +++ b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateTaskReference.java @@ -169,20 +169,16 @@ public class AxStateTaskReference extends AxConcept { this.output = output; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKey() + /** + * {@inheritDoc}. */ @Override public AxReferenceKey getKey() { return key; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKeys() + /** + * {@inheritDoc}. */ @Override public List<AxKey> getKeys() { @@ -244,12 +240,8 @@ public class AxStateTaskReference extends AxConcept { this.output = output; } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.model.basicmodel.concepts.AxConcept#validate(org.onap.policy.apex.model. - * basicmodel.concepts.AxValidationResult) + /** + * {@inheritDoc}. */ @Override public AxValidationResult validate(final AxValidationResult resultIn) { @@ -276,10 +268,8 @@ public class AxStateTaskReference extends AxConcept { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#clean() + /** + * {@inheritDoc}. */ @Override public void clean() { @@ -287,10 +277,8 @@ public class AxStateTaskReference extends AxConcept { output.clean(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { @@ -307,12 +295,8 @@ public class AxStateTaskReference extends AxConcept { return builder.toString(); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.model.basicmodel.concepts.AxConcept#copyTo(org.onap.policy.apex.model. - * basicmodel.concepts.AxConcept) + /** + * {@inheritDoc}. */ @Override public AxConcept copyTo(final AxConcept targetObject) { @@ -329,10 +313,8 @@ public class AxStateTaskReference extends AxConcept { return copy; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -344,10 +326,8 @@ public class AxStateTaskReference extends AxConcept { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -371,10 +351,8 @@ public class AxStateTaskReference extends AxConcept { return output.equals(other.output); } - /* - * (non-Javadoc) - * - * @see java.lang.Comparable#compareTo(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public int compareTo(final AxConcept otherObj) { diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateTree.java b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateTree.java index e68bf9613..e3120db29 100644 --- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateTree.java +++ b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateTree.java @@ -133,10 +133,8 @@ public class AxStateTree implements Comparable<AxStateTree> { return referencedStateSet; } - /* - * (non-Javadoc) - * - * @see java.lang.Comparable#compareTo(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public int compareTo(final AxStateTree otherObj) { diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTask.java b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTask.java index 7db1c7c31..31545b3f2 100644 --- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTask.java +++ b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTask.java @@ -217,20 +217,16 @@ public class AxTask extends AxConcept { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKey() + /** + * {@inheritDoc}. */ @Override public AxArtifactKey getKey() { return key; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKeys() + /** + * {@inheritDoc}. */ @Override public List<AxKey> getKeys() { @@ -438,12 +434,8 @@ public class AxTask extends AxConcept { this.taskLogic = taskLogic; } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.model.basicmodel.concepts.AxConcept#validate(org.onap.policy.apex.model. - * basicmodel.concepts.AxValidationResult) + /** + * {@inheritDoc}. */ @Override public AxValidationResult validate(final AxValidationResult resultIn) { @@ -558,10 +550,8 @@ public class AxTask extends AxConcept { return contextAlbumReference.validate(result); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#clean() + /** + * {@inheritDoc}. */ @Override public void clean() { @@ -581,10 +571,8 @@ public class AxTask extends AxConcept { taskLogic.clean(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { @@ -607,12 +595,8 @@ public class AxTask extends AxConcept { return builder.toString(); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.model.basicmodel.concepts.AxConcept#copyTo(org.onap.policy.apex.model. - * basicmodel.concepts.AxConcept) + /** + * {@inheritDoc}. */ @Override public AxConcept copyTo(final AxConcept targetObject) { @@ -653,10 +637,8 @@ public class AxTask extends AxConcept { return copy; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -671,10 +653,8 @@ public class AxTask extends AxConcept { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -708,10 +688,8 @@ public class AxTask extends AxConcept { return taskLogic.equals(other.taskLogic); } - /* - * (non-Javadoc) - * - * @see java.lang.Comparable#compareTo(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public int compareTo(final AxConcept otherObj) { diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTaskParameter.java b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTaskParameter.java index 4846c59cf..95b8ff0cf 100644 --- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTaskParameter.java +++ b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTaskParameter.java @@ -111,20 +111,16 @@ public class AxTaskParameter extends AxConcept { this.defaultValue = defaultValue.trim(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKey() + /** + * {@inheritDoc}. */ @Override public AxReferenceKey getKey() { return key; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKeys() + /** + * {@inheritDoc}. */ @Override public List<AxKey> getKeys() { @@ -160,12 +156,8 @@ public class AxTaskParameter extends AxConcept { this.defaultValue = defaultValue.trim(); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.model.basicmodel.concepts.AxConcept#validate(org.onap.policy.apex.model. - * basicmodel.concepts.AxValidationResult) + /** + * {@inheritDoc}. */ @Override public AxValidationResult validate(final AxValidationResult resultIn) { @@ -186,10 +178,8 @@ public class AxTaskParameter extends AxConcept { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#clean() + /** + * {@inheritDoc}. */ @Override public void clean() { @@ -197,10 +187,8 @@ public class AxTaskParameter extends AxConcept { defaultValue = defaultValue.trim(); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { @@ -215,12 +203,8 @@ public class AxTaskParameter extends AxConcept { return builder.toString(); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.model.basicmodel.concepts.AxConcept#copyTo(org.onap.policy.apex.model. - * basicmodel.concepts.AxConcept) + /** + * {@inheritDoc}. */ @Override public AxConcept copyTo(final AxConcept targetObject) { @@ -236,10 +220,8 @@ public class AxTaskParameter extends AxConcept { return copy; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -250,10 +232,8 @@ public class AxTaskParameter extends AxConcept { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -274,10 +254,8 @@ public class AxTaskParameter extends AxConcept { return defaultValue.equals(other.defaultValue); } - /* - * (non-Javadoc) - * - * @see java.lang.Comparable#compareTo(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public int compareTo(final AxConcept otherObj) { diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTasks.java b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTasks.java index b73b6d32b..b53159ce3 100644 --- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTasks.java +++ b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTasks.java @@ -144,20 +144,16 @@ public class AxTasks extends AxConcept implements AxConceptGetter<AxTask> { taskMap = navigableTaskMap; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKey() + /** + * {@inheritDoc}. */ @Override public AxArtifactKey getKey() { return key; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#getKeys() + /** + * {@inheritDoc}. */ @Override public List<AxKey> getKeys() { @@ -200,12 +196,8 @@ public class AxTasks extends AxConcept implements AxConceptGetter<AxTask> { this.taskMap.putAll(taskMap); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.model.basicmodel.concepts.AxConcept#validate(org.onap.policy.apex.model. - * basicmodel.concepts.AxValidationResult) + /** + * {@inheritDoc}. */ @Override public AxValidationResult validate(final AxValidationResult resultIn) { @@ -244,10 +236,8 @@ public class AxTasks extends AxConcept implements AxConceptGetter<AxTask> { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#clean() + /** + * {@inheritDoc}. */ @Override public void clean() { @@ -258,10 +248,8 @@ public class AxTasks extends AxConcept implements AxConceptGetter<AxTask> { } } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { @@ -276,12 +264,8 @@ public class AxTasks extends AxConcept implements AxConceptGetter<AxTask> { return builder.toString(); } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.model.basicmodel.concepts.AxConcept#copyTo(org.onap.policy.apex.model. - * basicmodel.concepts.AxConcept) + /** + * {@inheritDoc}. */ @Override public AxConcept copyTo(final AxConcept targetObject) { @@ -302,10 +286,8 @@ public class AxTasks extends AxConcept implements AxConceptGetter<AxTask> { return copy; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#hashCode() + /** + * {@inheritDoc}. */ @Override public int hashCode() { @@ -316,10 +298,8 @@ public class AxTasks extends AxConcept implements AxConceptGetter<AxTask> { return result; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConcept#equals(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public boolean equals(final Object obj) { @@ -341,10 +321,8 @@ public class AxTasks extends AxConcept implements AxConceptGetter<AxTask> { return taskMap.equals(other.taskMap); } - /* - * (non-Javadoc) - * - * @see java.lang.Comparable#compareTo(java.lang.Object) + /** + * {@inheritDoc}. */ @Override public int compareTo(final AxConcept otherObj) { @@ -369,32 +347,24 @@ public class AxTasks extends AxConcept implements AxConceptGetter<AxTask> { return 0; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConceptGetter#get(org.onap.policy.apex. - * model. basicmodel.concepts.AxArtifactKey) + /** + * {@inheritDoc}. */ @Override public AxTask get(final AxArtifactKey conceptKey) { return new AxConceptGetterImpl<>((NavigableMap<AxArtifactKey, AxTask>) taskMap).get(conceptKey); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConceptGetter#get(java.lang.String) + /** + * {@inheritDoc}. */ @Override public AxTask get(final String conceptKeyName) { return new AxConceptGetterImpl<>((NavigableMap<AxArtifactKey, AxTask>) taskMap).get(conceptKeyName); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConceptGetter#get(java.lang.String, - * java.lang.String) + /** + * {@inheritDoc}. */ @Override public AxTask get(final String conceptKeyName, final String conceptKeyVersion) { @@ -402,21 +372,16 @@ public class AxTasks extends AxConcept implements AxConceptGetter<AxTask> { conceptKeyVersion); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConceptGetter#getAll(java.lang.String) + /** + * {@inheritDoc}. */ @Override public Set<AxTask> getAll(final String conceptKeyName) { return new AxConceptGetterImpl<>((NavigableMap<AxArtifactKey, AxTask>) taskMap).getAll(conceptKeyName); } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.basicmodel.concepts.AxConceptGetter#getAll(java.lang.String, - * java.lang.String) + /** + * {@inheritDoc}. */ @Override public Set<AxTask> getAll(final String conceptKeyName, final String conceptKeyVersion) { diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyAnalysisResult.java b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyAnalysisResult.java index 654ab2fc5..a5fbc09a2 100644 --- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyAnalysisResult.java +++ b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyAnalysisResult.java @@ -183,10 +183,8 @@ public class PolicyAnalysisResult { return getUnusedKeySet(taskUsage); } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyLogicReader.java b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyLogicReader.java index f1bc4aece..0fed8d385 100644 --- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyLogicReader.java +++ b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyLogicReader.java @@ -46,21 +46,16 @@ public class PolicyLogicReader implements AxLogicReader { // Flag indicating if default logic should be returned private String defaultLogic; - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.policymodel.concepts.AxLogicReader#getLogicPackage() + /** + * {@inheritDoc}. */ @Override public String getLogicPackage() { return logicPackage; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.policymodel.concepts.AxLogicReader#setLogicPackage(java.lang. - * String) + /** + * {@inheritDoc}. */ @Override public AxLogicReader setLogicPackage(final String incomingLogicPackage) { @@ -68,20 +63,16 @@ public class PolicyLogicReader implements AxLogicReader { return this; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.policymodel.concepts.AxLogicReader#getDefaultLogic() + /** + * {@inheritDoc}. */ @Override public String getDefaultLogic() { return defaultLogic; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.policymodel.concepts.AxLogicReader#setDefaultLogic(boolean) + /** + * {@inheritDoc}. */ @Override public AxLogicReader setDefaultLogic(final String incomingDefaultLogic) { @@ -89,12 +80,8 @@ public class PolicyLogicReader implements AxLogicReader { return this; } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.model.policymodel.concepts.AxLogicReader#readLogic(.policymodel.concepts - * .AxLogic) + /** + * {@inheritDoc}. */ @Override public String readLogic(final AxLogic axLogic) { diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelComparer.java b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelComparer.java index 723e8b235..f3bbdcbcf 100644 --- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelComparer.java +++ b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelComparer.java @@ -216,10 +216,8 @@ public class PolicyModelComparer { return keyInfoComparisonResult; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() + /** + * {@inheritDoc}. */ @Override public String toString() { diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/DummyLogicReader.java b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/DummyLogicReader.java index 093ed483e..422f923d2 100644 --- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/DummyLogicReader.java +++ b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/DummyLogicReader.java @@ -25,54 +25,40 @@ import org.onap.policy.apex.model.policymodel.concepts.AxLogicReader; public class DummyLogicReader implements AxLogicReader { - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.policymodel.concepts.AxLogicReader#getLogicPackage() + /** + * {@inheritDoc}. */ @Override public String getLogicPackage() { return null; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.policymodel.concepts.AxLogicReader#setLogicPackage(java.lang. - * String) + /** + * {@inheritDoc}. */ @Override public AxLogicReader setLogicPackage(final String logicPackage) { return null; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.policymodel.concepts.AxLogicReader#getDefaultLogic() + /** + * {@inheritDoc}. */ @Override public String getDefaultLogic() { return null; } - /* - * (non-Javadoc) - * - * @see org.onap.policy.apex.model.policymodel.concepts.AxLogicReader#setDefaultLogic(java.lang. - * String) + /** + * {@inheritDoc}. */ @Override public AxLogicReader setDefaultLogic(final String defaultLogic) { return null; } - /* - * (non-Javadoc) - * - * @see - * org.onap.policy.apex.model.policymodel.concepts.AxLogicReader#readLogic(org.onap.policy.apex. - * model.policymodel.concepts.AxLogic) + /** + * {@inheritDoc}. */ @Override public String readLogic(final AxLogic axLogic) { diff --git a/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/DirectoryDeleteShutdownHook.java b/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/DirectoryDeleteShutdownHook.java index 5f9b8aaf8..f0fd8950f 100644 --- a/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/DirectoryDeleteShutdownHook.java +++ b/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/DirectoryDeleteShutdownHook.java @@ -40,10 +40,8 @@ final class DirectoryDeleteShutdownHook extends Thread { this.tempDir = tempDir; } - /* - * (non-Javadoc) - * - * @see java.lang.Runnable#run() + /** + * {@inheritDoc}. */ @Override public void run() { |