diff options
Diffstat (limited to 'model/policy-model')
15 files changed, 226 insertions, 495 deletions
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) { |