X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=models-tosca%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fmodels%2Ftosca%2Fauthorative%2Fconcepts%2FToscaProperty.java;h=977d3273874105d4e11d64c05f614e2bb31830dd;hb=80311ac0dedb0868d3837029c6e4b5fcb984efb2;hp=fd8a86a0d709731d83a319a47438757dee6bc2ee;hpb=1a87ab847d70db032edc260096121c7016ee50d7;p=policy%2Fmodels.git

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 fd8a86a0d..977d32738 100644
--- 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.
@@ -24,7 +24,6 @@
 package org.onap.policy.models.tosca.authorative.concepts;
 
 import com.google.gson.annotations.SerializedName;
-import io.swagger.annotations.ApiModelProperty;
 import java.util.List;
 import java.util.Map;
 import lombok.Data;
@@ -41,26 +40,25 @@ public class ToscaProperty {
     }
 
     private String name;
-
     private String type;
 
+    @SerializedName("type_version")
     private String typeVersion;
 
     private String description;
 
-    @ApiModelProperty(name = "default")
     @SerializedName("default")
-    private String defaultValue;
+    private Object defaultValue;
 
     private boolean required = false;
-
     private Status status;
-
     private List<ToscaConstraint> constraints;
 
-    @ApiModelProperty(name = "entry_schema")
+    @SerializedName("key_schema")
+    private ToscaSchemaDefinition keySchema;
+
     @SerializedName("entry_schema")
-    private ToscaEntrySchema entrySchema;
+    private ToscaSchemaDefinition entrySchema;
 
     private Map<String, String> metadata;
 }