1 files changed, 44 insertions, 71 deletions

diff --git a/openecomp-be/lib/openecomp-heat-lib/src/main/java/org/openecomp/sdc/heat/datatypes/manifest/FileData.java b/openecomp-be/lib/openecomp-heat-lib/src/main/java/org/openecomp/sdc/heat/datatypes/manifest/FileData.java
index 2bc549c058..35276b4f11 100644
--- a/openecomp-be/lib/openecomp-heat-lib/src/main/java/org/openecomp/sdc/heat/datatypes/manifest/FileData.java
+++ b/openecomp-be/lib/openecomp-heat-lib/src/main/java/org/openecomp/sdc/heat/datatypes/manifest/FileData.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.
@@ -20,15 +20,28 @@
 
 package org.openecomp.sdc.heat.datatypes.manifest;
 
-import org.apache.commons.collections4.CollectionUtils;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 import java.util.function.Predicate;
 
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+import org.apache.commons.collections4.CollectionUtils;
+
+@Data
 public class FileData {
 
     protected static final Set<Type> heatFileTypes =
-        new HashSet<>(Arrays.asList(Type.HEAT, Type.HEAT_NET, Type.HEAT_VOL));
+            new HashSet<>(Arrays.asList(Type.HEAT, Type.HEAT_NET, Type.HEAT_VOL));
+
+    @Getter(AccessLevel.NONE)
+    @Setter(AccessLevel.NONE)
     private Boolean isBase;
     private String parentFile;
     private String file;
@@ -40,8 +53,8 @@ public class FileData {
     }
 
     public static boolean isHeatFile(Type type) {
-    return heatFileTypes.contains(type);
-  }
+        return heatFileTypes.contains(type);
+    }
 
     public Boolean getBase() {
         return isBase;
@@ -51,43 +64,11 @@ public class FileData {
         isBase = base;
     }
 
-    public String getFile() {
-        return file;
-    }
-
-    public void setFile(String file) {
-        this.file = file;
-    }
-
-    public String getParentFile() {
-        return parentFile;
-    }
-
-    public void setParentFile(String parentFile) {
-    this.parentFile = parentFile;
-  }
-
-    public Type getType() {
-    return type;
-  }
-
-    public void setType(Type type) {
-    this.type = type;
-  }
-
-    public List<FileData> getData() {
-        return data;
-    }
-
-    public void setData(List<FileData> data) {
-        this.data = data;
-    }
-
     /**
-    * Add file data.
-    *
-    * @param data the data
-    */
+     * Add file data.
+     *
+     * @param data the data
+     */
     public void addFileData(FileData data) {
         if (CollectionUtils.isEmpty(this.data)) {
             this.data = new ArrayList<>();
@@ -95,40 +76,32 @@ public class FileData {
         this.data.add(data);
     }
 
+    @AllArgsConstructor
+    @Getter
     public enum Type {
-
-    HEAT("HEAT"),
-    HEAT_ENV("HEAT_ENV"),
-    HEAT_NET("HEAT_NET"),
-    HEAT_VOL("HEAT_VOL"),
-    CHEF("CHEF"),
-    PUPPET("PUPPET"),
-    SHELL("SHELL"),
-    YANG("YANG"),
-    YANG_XML("YANG_XML"),
-    BPEL("BPEL"),
-    DG_XML("DG_XML"),
-    MURANO_PKG("MURANO_PKG"),
-    VENDOR_LICENSE("VENDOR_LICENSE"),
-    VF_LICENSE("VF_LICENSE"),
-    OTHER("OTHER");
+        HEAT("HEAT"),
+        HEAT_ENV("HEAT_ENV"),
+        HEAT_NET("HEAT_NET"),
+        HEAT_VOL("HEAT_VOL"),
+        CHEF("CHEF"),
+        PUPPET("PUPPET"),
+        SHELL("SHELL"),
+        YANG("YANG"),
+        YANG_XML("YANG_XML"),
+        BPEL("BPEL"),
+        DG_XML("DG_XML"),
+        MURANO_PKG("MURANO_PKG"),
+        VENDOR_LICENSE("VENDOR_LICENSE"),
+        VF_LICENSE("VF_LICENSE"),
+        OTHER("OTHER");
 
         private String displayName;
 
-        Type(String displayName) {
-            this.displayName = displayName;
-        }
-
-        public String getDisplayName() {
-            return displayName;
-        }
-
         public static boolean isArtifact(Type fileType) {
-            return !Arrays.asList(HEAT,HEAT_ENV, HEAT_VOL).contains(fileType);
+            return !Arrays.asList(HEAT, HEAT_ENV, HEAT_VOL).contains(fileType);
         }
 
-        public static boolean canBeAssociated(Type fileType)
-        {
+        public static boolean canBeAssociated(Type fileType) {
             return HEAT_VOL == fileType;
         }
     }