1 files changed, 51 insertions, 62 deletions
diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/enums/SchemaZipFileEnum.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/enums/SchemaZipFileEnum.java
index 6f4c602c2c..42c5290ff8 100644
--- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/enums/SchemaZipFileEnum.java
+++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/enums/SchemaZipFileEnum.java
@@ -1,68 +1,57 @@
 package org.openecomp.sdc.asdctool.enums;
 
-public enum SchemaZipFileEnum {
-	
-	DATA("data", "data-types", "dataTypes", "data_types", new String[]{}),
-	GROUPS("groups", "group-types", "groupTypes", "group_types", new String[]{"data.yml"}),
-	POLICIES("policies", "policy-types", "policyTypes","policy_types", new String[]{"data.yml"}),
-	RELATIONSHIPS("relationships","relationship-types","relationshipTypes", "relationship_types", new String[]{"capabilities.yml", "data.yml", "interfaces.yml"}),
-	ARTIFACTS("artifacts", "artifact-types", "artifactTypes", "artifact_types", new String[]{"data.yml"}),
-	CAPABILITIES("capabilities", "capability-types", "capabilityTypes", "capability_types" ,new String[]{"data.yml"}),
-	INTERFACES("interfaces", "interface-lifecycle-types", "interfaceLifecycleTypes", "interface_types", new String[]{"data.yml"});
-	
-	private String fileName;
-	private String sourceFolderName;
-	private String sourceFileName;
-	private String collectionTitle;
-	private String[] importFileList;
-
-	private SchemaZipFileEnum(String fileName, String sourceFolderName, String sourceFileName, String collectionTitle,
-			String[] importFileList) {
-		this.fileName = fileName;
-		this.sourceFolderName = sourceFolderName;
-		this.sourceFileName = sourceFileName;
-		this.collectionTitle = collectionTitle;
-		this.importFileList = importFileList;
-	}
-
-	public String getFileName() {
-		return fileName;
-	}
-
-	public void setFileName(String fileName) {
-		this.fileName = fileName;
-	}
-
-	public String getSourceFolderName() {
-		return sourceFolderName;
-	}
+import static org.openecomp.sdc.asdctool.enums.SchemaZipFileEnum.SchemaZipConstants.*;
 
-	public void setSourceFolderName(String sourceFolderName) {
-		this.sourceFolderName = sourceFolderName;
-	}
-
-	public String getSourceFileName() {
-		return sourceFileName;
-	}
-
-	public void setSourceFileName(String sourceFileName) {
-		this.sourceFileName = sourceFileName;
-	}
-
-	public String getCollectionTitle() {
-		return collectionTitle;
-	}
-
-	public void setCollectionTitle(String collectionTitle) {
-		this.collectionTitle = collectionTitle;
-	}
+public enum SchemaZipFileEnum {
 
-	public String[] getImportFileList() {
-		return importFileList;
-	}
+    DATA("data", "data-types", "dataTypes", "data_types", EMPTY_IMPORT_LIST),
+    GROUPS("groups", "group-types", "groupTypes", "group_types", DATA_IMPORT_LIST),
+    POLICIES("policies", "policy-types", "policyTypes", "policy_types", DATA_IMPORT_LIST),
+    ANNOTATIONS("annotations", "annotation-types", "annotationTypes", "annotation_types", DATA_IMPORT_LIST),
+    RELATIONSHIPS("relationships", "relationship-types", "relationshipTypes", "relationship_types", RELATIONSHIPS_TYPES_IMPORT_LIST),
+    ARTIFACTS("artifacts", "artifact-types", "artifactTypes", "artifact_types", DATA_IMPORT_LIST),
+    CAPABILITIES("capabilities", "capability-types", "capabilityTypes", "capability_types", DATA_IMPORT_LIST),
+    INTERFACES("interfaces", "interface-lifecycle-types", "interfaceLifecycleTypes", "interface_types", DATA_IMPORT_LIST);
+
+    private String fileName;
+    private String sourceFolderName;
+    private String sourceFileName;
+    private String collectionTitle;
+    private String[] importFileList;
+
+    SchemaZipFileEnum(String fileName, String sourceFolderName, String sourceFileName, String collectionTitle,
+                      String[] importFileList) {
+        this.fileName = fileName;
+        this.sourceFolderName = sourceFolderName;
+        this.sourceFileName = sourceFileName;
+        this.collectionTitle = collectionTitle;
+        this.importFileList = importFileList;
+    }
+
+    public String getFileName() {
+        return fileName;
+    }
+
+    public String getSourceFolderName() {
+        return sourceFolderName;
+    }
+
+    public String getSourceFileName() {
+        return sourceFileName;
+    }
+
+    public String getCollectionTitle() {
+        return collectionTitle;
+    }
+
+    public String[] getImportFileList() {
+        return importFileList;
+    }
+
+    static class SchemaZipConstants {
+        static final String [] EMPTY_IMPORT_LIST =  new String[]{};
+        static final String [] DATA_IMPORT_LIST =  new String[]{"data.yml"};
+        static final String [] RELATIONSHIPS_TYPES_IMPORT_LIST = new String[]{"capabilities.yml", "data.yml", "interfaces.yml"};
+    }
 
-	public void setImportFileList(String[] importFileList) {
-		this.importFileList = importFileList;
-	}
-	
 }