diff options
author | Jim Hahn <jrh3@att.com> | 2019-06-13 10:02:07 -0400 |
---|---|---|
committer | Jim Hahn <jrh3@att.com> | 2019-06-13 10:02:07 -0400 |
commit | a82505f3a3c65960d496f5aa77e5045acb7e891b (patch) | |
tree | 070502e6b9d083258ab15580914c7c27a1442aba /models-tosca | |
parent | 11534e0bf47da135064b8cc91a1f87f442ff068f (diff) |
Remove isNullVersion from identifier class
ToscaPolicyIdentifierOptVersion had an isNullVersion() method
which is not being used. Removed this version, thus eliminating
the need to include a jackson @JsonIgnore annotation.
Change-Id: I03309099a1173591736f69b82b549ebce7994169
Issue-ID: POLICY-1653
Signed-off-by: Jim Hahn <jrh3@att.com>
Diffstat (limited to 'models-tosca')
2 files changed, 0 insertions, 15 deletions
diff --git a/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaPolicyIdentifierOptVersion.java b/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaPolicyIdentifierOptVersion.java index a6aec0858..ca3684a24 100644 --- a/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaPolicyIdentifierOptVersion.java +++ b/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaPolicyIdentifierOptVersion.java @@ -20,7 +20,6 @@ package org.onap.policy.models.tosca.authorative.concepts; -import com.fasterxml.jackson.annotation.JsonIgnore; import com.google.gson.annotations.SerializedName; import lombok.Data; import lombok.NoArgsConstructor; @@ -57,16 +56,6 @@ public class ToscaPolicyIdentifierOptVersion implements Comparable<ToscaPolicyId this.version = source.getVersion(); } - /** - * Determines if the version is null/missing. - * - * @return {@code true} if the version is null/missing, {@code false} - */ - @JsonIgnore - public boolean isNullVersion() { - return (version == null); - } - @Override public int compareTo(ToscaPolicyIdentifierOptVersion other) { if (this == other) { diff --git a/models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/concepts/ToscaPolicyIdentifierOptVersionTest.java b/models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/concepts/ToscaPolicyIdentifierOptVersionTest.java index 1d393c1d5..2ec2422a9 100644 --- a/models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/concepts/ToscaPolicyIdentifierOptVersionTest.java +++ b/models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/concepts/ToscaPolicyIdentifierOptVersionTest.java @@ -22,8 +22,6 @@ package org.onap.policy.models.tosca.authorative.concepts; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; import org.junit.Test; @@ -45,12 +43,10 @@ public class ToscaPolicyIdentifierOptVersionTest extends ToscaIdentifierTestBase ToscaPolicyIdentifierOptVersion orig = new ToscaPolicyIdentifierOptVersion(NAME, null); assertEquals(NAME, orig.getName()); assertEquals(null, orig.getVersion()); - assertTrue(orig.isNullVersion()); orig = new ToscaPolicyIdentifierOptVersion(NAME, VERSION); assertEquals(NAME, orig.getName()); assertEquals(VERSION, orig.getVersion()); - assertFalse(orig.isNullVersion()); } @Test |