Remove annotations in models

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

diff --git a/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaProperty.java b/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaProperty.java
index 84f798b..977d327 100644 (file)
--- a/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaProperty.java
+++ b/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaProperty.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-2020 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@ package org.onap.policy.models.tosca.authorative.concepts;
 
 import com.google.gson.annotations.SerializedName;
 import java.util.List;
+import java.util.Map;
 import lombok.Data;
 
 /**
@@ -39,22 +40,25 @@ public class ToscaProperty {
     }
 
     private String name;
-
     private String type;
 
+    @SerializedName("type_version")
     private String typeVersion;
 
     private String description;
 
     @SerializedName("default")
-    private String defaultValue;
+    private Object defaultValue;
 
     private boolean required = false;
-
     private Status status;
-
     private List<ToscaConstraint> constraints;
 
+    @SerializedName("key_schema")
+    private ToscaSchemaDefinition keySchema;
+
     @SerializedName("entry_schema")
-    private ToscaEntrySchema entrySchema;
+    private ToscaSchemaDefinition entrySchema;
+
+    private Map<String, String> metadata;
 }