1 files changed, 22 insertions, 128 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-api/src/main/java/org/openecomp/sdc/generator/datatypes/tosca/VspModelInfo.java b/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-api/src/main/java/org/openecomp/sdc/generator/datatypes/tosca/VspModelInfo.java
index 1eb1b32073..05f43ce76b 100644
--- a/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-api/src/main/java/org/openecomp/sdc/generator/datatypes/tosca/VspModelInfo.java
+++ b/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-api/src/main/java/org/openecomp/sdc/generator/datatypes/tosca/VspModelInfo.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.
@@ -22,136 +22,30 @@
 
 package org.openecomp.sdc.generator.datatypes.tosca;
 
-import org.openecomp.sdc.vendorsoftwareproduct.types.composition.Nic;
-
 import java.util.List;
 import java.util.Map;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+import org.openecomp.sdc.vendorsoftwareproduct.types.composition.Nic;
 
+@Getter
+@Setter
+@ToString
+@EqualsAndHashCode
+@NoArgsConstructor
 public class VspModelInfo {
-  private String releaseVendor;
-  //Map of component id and name
-  private Map<String, String> components;
-  //Map of part number and deployment flavor model
-  private Map<String, DeploymentFlavorModel> allowedFlavors;
-  //Map of component id and images
-  private Map<String, List<MultiFlavorVfcImage>> multiFlavorVfcImages;
-  //Map of component and ports (NICs)
-  private Map<String, List<Nic>> nics;
-
-  public String getReleaseVendor() {
-    return releaseVendor;
-  }
-
-  public void setReleaseVendor(String releaseVendor) {
-    this.releaseVendor = releaseVendor;
-  }
-
-  public Map<String, String> getComponents() {
-    return components;
-  }
-
-  public void setComponents(Map<String, String> components) {
-    this.components = components;
-  }
-
-  public Map<String, DeploymentFlavorModel> getAllowedFlavors() {
-    return allowedFlavors;
-  }
-
-  public void setAllowedFlavors(Map<String, DeploymentFlavorModel> allowedFlavors) {
-    this.allowedFlavors = allowedFlavors;
-  }
-
-  public Map<String, List<MultiFlavorVfcImage>> getMultiFlavorVfcImages() {
-    return multiFlavorVfcImages;
-  }
-
-  public void setMultiFlavorVfcImages(Map<String, List<MultiFlavorVfcImage>> multiFlavorVfcImages) {
-    this.multiFlavorVfcImages = multiFlavorVfcImages;
-  }
-
-  public Map<String, List<Nic>> getNics() {
-    return nics;
-  }
-
-  public void setNics(Map<String, List<Nic>> nics) {
-    this.nics = nics;
-  }
-
-  @Override
-  public int hashCode() {
-    int result = releaseVendor != null ? releaseVendor.hashCode() : 0;
-    result = 31 * result + (components != null ? components.hashCode() : 0);
-    result = 31 * result + (allowedFlavors != null ? allowedFlavors.hashCode() : 0);
-    result = 31 * result + (multiFlavorVfcImages != null ? multiFlavorVfcImages.hashCode() : 0);
-    result = 31 * result + (nics != null ? nics.hashCode() : 0);
-    return result;
-  }
-
-  @Override
-  public String toString() {
-    return "VspModelInfo{"
-       + "releaseVendor='" + releaseVendor + '\''
-       + ", components=" + components
-       + ", allowedFlavors=" + allowedFlavors
-       + ", multiFlavorVfcImages=" + multiFlavorVfcImages
-       + ", nics=" + nics
-       + '}';
-  }
-
-  @Override
-  public boolean equals(Object obj) {
-    if (this == obj) {
-      return true;
-    }
-    if (obj == null || getClass() != obj.getClass()) {
-      return false;
-    }
-    VspModelInfo other = (VspModelInfo) obj;
 
-      if (this.releaseVendor == null) {
-        if (other.releaseVendor != null) {
-          return false;
-        }
-      } else if (!releaseVendor.equals(other.releaseVendor)) {
-        return false;
-      }
-      if (this.components == null) {
-        if (other.components != null) {
-          return false;
-        }
-      } else if (!components.equals(other.components)) {
-        return false;
-      }
-      if (this.allowedFlavors == null) {
-        if (other.allowedFlavors != null) {
-          return false;
-        }
-      } else if (!allowedFlavors.equals(other.allowedFlavors)) {
-        return false;
-      }
-      if (this.multiFlavorVfcImages == null) {
-        if (other.multiFlavorVfcImages != null) {
-          return false;
-        }
-      } else if (!multiFlavorVfcImages.equals(other.multiFlavorVfcImages)) {
-        return false;
-      }
-      if (this.multiFlavorVfcImages == null) {
-        if (other.multiFlavorVfcImages != null) {
-          return false;
-        }
-      } else if (!multiFlavorVfcImages.equals(other.multiFlavorVfcImages)) {
-        return false;
-      }
-      if (this.nics == null) {
-        if (other.nics != null) {
-          return false;
-        }
-      } else if (!nics.equals(other.nics)) {
-        return false;
-      }
+    private String releaseVendor;
+    //Map of component id and name
+    private Map<String, String> components;
+    //Map of part number and deployment flavor model
+    private Map<String, DeploymentFlavorModel> allowedFlavors;
+    //Map of component id and images
+    private Map<String, List<MultiFlavorVfcImage>> multiFlavorVfcImages;
+    //Map of component and ports (NICs)
+    private Map<String, List<Nic>> nics;
 
-    return true;
-  }
 }