Changed identifiers to concept identifiers

[policy/models.git] / models-tosca / src / main / java / org / onap / policy / models / tosca / authorative / concepts / ToscaPolicy.java

diff --git a/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaPolicy.java b/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaPolicy.java
index 284e39c..491b478 100644 (file)
--- a/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaPolicy.java
+++ b/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaPolicy.java
@@ -3,7 +3,7 @@
  * ONAP Policy Model
  * ================================================================================
  * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2019-2021 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,8 @@
 
 package org.onap.policy.models.tosca.authorative.concepts;
 
+import com.google.gson.annotations.SerializedName;
+import io.swagger.annotations.ApiModelProperty;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -41,9 +43,11 @@ import lombok.ToString;
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @ToString(callSuper = true)
-public class ToscaPolicy extends ToscaEntity implements Comparable<ToscaPolicy> {
+public class ToscaPolicy extends ToscaEntity {
     private String type;
 
+    @ApiModelProperty(name = "type_version")
+    @SerializedName("type_version")
     private String typeVersion;
 
     private Map<String, Object> properties;
@@ -72,8 +76,8 @@ public class ToscaPolicy extends ToscaEntity implements Comparable<ToscaPolicy>
      *
      * @return this policy's identifier
      */
-    public ToscaPolicyIdentifier getIdentifier() {
-        return new ToscaPolicyIdentifier(getName(), getVersion());
+    public ToscaConceptIdentifier getIdentifier() {
+        return new ToscaConceptIdentifier(getName(), getVersion());
     }
 
     /**
@@ -81,12 +85,7 @@ public class ToscaPolicy extends ToscaEntity implements Comparable<ToscaPolicy>
      *
      * @return this policy's type identifier
      */
-    public ToscaPolicyTypeIdentifier getTypeIdentifier() {
-        return new ToscaPolicyTypeIdentifier(getType(), getTypeVersion());
-    }
-
-    @Override
-    public int compareTo(final ToscaPolicy other) {
-        return compareNameVersion(this, other);
+    public ToscaConceptIdentifier getTypeIdentifier() {
+        return new ToscaConceptIdentifier(getType(), getTypeVersion());
     }
 }