Support updated data types in service import

[sdc.git] / catalog-model / src / main / java / org / openecomp / sdc / be / model / DataTypeDefinition.java

diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/DataTypeDefinition.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/DataTypeDefinition.java
index c5f4cf9..f208891 100644 (file)
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/DataTypeDefinition.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/DataTypeDefinition.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,66 +17,43 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.be.model;
 
 import java.util.List;
-
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+import org.openecomp.sdc.be.dao.utils.CollectionUtils;
 import org.openecomp.sdc.be.datatypes.elements.DataTypeDataDefinition;
 
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
 public class DataTypeDefinition extends DataTypeDataDefinition {
 
-       private DataTypeDefinition derivedFrom;
-
-       private List<PropertyConstraint> constraints;
-
-       private List<PropertyDefinition> properties;
-
-       public DataTypeDefinition() {
-               super();
-       }
-
-       public DataTypeDefinition(DataTypeDataDefinition p) {
-               super(p);
-       }
-
-       public DataTypeDefinition(DataTypeDefinition pd) {
-               this.setName(pd.getName());
-               this.setDerivedFrom(pd.getDerivedFrom());
-               this.setDerivedFromName(pd.getDerivedFromName());
-               this.setUniqueId(pd.getUniqueId());
-               this.setConstraints(pd.getConstraints());
-               this.setDescription(pd.getDescription());
-       }
-
-       public List<PropertyConstraint> getConstraints() {
-               return constraints;
-       }
-
-       public void setConstraints(List<PropertyConstraint> constraints) {
-               this.constraints = constraints;
-       }
-
-       public DataTypeDefinition getDerivedFrom() {
-               return derivedFrom;
-       }
-
-       public void setDerivedFrom(DataTypeDefinition derivedFrom) {
-               this.derivedFrom = derivedFrom;
-       }
-
-       public List<PropertyDefinition> getProperties() {
-               return properties;
-       }
-
-       public void setProperties(List<PropertyDefinition> properties) {
-               this.properties = properties;
-       }
-
-       @Override
-       public String toString() {
-               return super.toString() + " DataTypeDefinition [derivedFrom=" + derivedFrom + ", constraints=" + constraints
-                               + ", properties=" + properties + "]";
-       }
-
+    private DataTypeDefinition derivedFrom;
+    private List<PropertyConstraint> constraints;
+    private List<PropertyDefinition> properties;
+
+    public DataTypeDefinition(final DataTypeDataDefinition dataTypeDataDefinition) {
+        super(dataTypeDataDefinition);
+    }
+
+    public DataTypeDefinition(final DataTypeDefinition dataTypeDefinition) {
+        super(dataTypeDefinition);
+        this.setName(dataTypeDefinition.getName());
+        this.setDerivedFrom(dataTypeDefinition.getDerivedFrom());
+        this.setDerivedFromName(dataTypeDefinition.getDerivedFromName());
+        this.setUniqueId(dataTypeDefinition.getUniqueId());
+        this.setConstraints(dataTypeDefinition.getConstraints());
+        this.setDescription(dataTypeDefinition.getDescription());
+        this.setModel(dataTypeDefinition.getModel());
+        this.setProperties(dataTypeDefinition.getProperties());
+    }
+
+    public List<PropertyConstraint> safeGetConstraints() {
+        return CollectionUtils.safeGetList(constraints);
+    }
 }