Changed identifiers to concept identifiers

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

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/ToscaConceptIdentifierOptVersion.java
similarity index 70%
rename from models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaPolicyIdentifierOptVersion.java
rename to models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaConceptIdentifierOptVersion.java
index 29bff91..c23c04f 100644 (file)
--- 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/ToscaConceptIdentifierOptVersion.java
@@ -3,7 +3,7 @@
  * ONAP Policy Models
  * ================================================================================
  * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2020 Nordix Foundation.
+ * Modifications Copyright (C) 2020-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.
@@ -21,47 +21,40 @@
 
 package org.onap.policy.models.tosca.authorative.concepts;
 
-import com.google.gson.annotations.SerializedName;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.NonNull;
 import org.apache.commons.lang3.ObjectUtils;
 
 /**
- * Policy identifier with an optional version; only the "name" is required.
+ * Concept identifier with an optional version; only the "name" is required.
  */
 @Data
 @NoArgsConstructor
-public class ToscaPolicyIdentifierOptVersion implements Comparable<ToscaPolicyIdentifierOptVersion> {
+public class ToscaConceptIdentifierOptVersion implements Comparable<ToscaConceptIdentifierOptVersion> {
 
     @NonNull
-    @ApiModelProperty(name = "policy-id")
-    @SerializedName("policy-id")
     private String name;
 
-    @ApiModelProperty(name = "policy-version")
-    @SerializedName("policy-version")
     private String version;
 
-
-    public ToscaPolicyIdentifierOptVersion(@NonNull String name, String version) {
+    public ToscaConceptIdentifierOptVersion(@NonNull String name, String version) {
         this.name = name;
         this.version = version;
     }
 
-    public ToscaPolicyIdentifierOptVersion(ToscaPolicyIdentifierOptVersion source) {
+    public ToscaConceptIdentifierOptVersion(ToscaConceptIdentifierOptVersion source) {
         this.name = source.name;
         this.version = source.version;
     }
 
-    public ToscaPolicyIdentifierOptVersion(ToscaPolicyIdentifier source) {
+    public ToscaConceptIdentifierOptVersion(ToscaConceptIdentifier source) {
         this.name = source.getName();
         this.version = source.getVersion();
     }
 
     @Override
-    public int compareTo(ToscaPolicyIdentifierOptVersion other) {
+    public int compareTo(ToscaConceptIdentifierOptVersion other) {
         if (this == other) {
             return 0;
         }