SSDM-13961: XLS Importer, making version optional

server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/DatasetTypeImportHelper.java

@@ -35,7 +35,7 @@ import java.util.Map;
 public class DatasetTypeImportHelper extends BasicImportHelper
 {
     private enum Attribute implements IAttribute {
-        Version("Version", true),
+        Version("Version", false),
         Code("Code", true),
         Description("Description", true),
         ValidationScript("Validation script", true),
@@ -84,7 +84,11 @@ public class DatasetTypeImportHelper extends BasicImportHelper
         String version = getValueByColumnName(header, values, Attribute.Version);
         String code = getValueByColumnName(header, values, Attribute.Code);
 
-        return VersionUtils.isNewVersion(version, VersionUtils.getStoredVersion(versions, ImportTypes.DATASET_TYPE.getType(), code));
+        if (version == null) {
+            return true;
+        } else {
+            return VersionUtils.isNewVersion(version, VersionUtils.getStoredVersion(versions, ImportTypes.DATASET_TYPE.getType(), code));
+        }
     }
 
     @Override protected void updateVersion(Map<String, Integer> header, List<String> values)
@@ -92,6 +96,12 @@ public class DatasetTypeImportHelper extends BasicImportHelper
         String version = getValueByColumnName(header, values, Attribute.Version);
         String code = getValueByColumnName(header, values, Attribute.Code);
 
+        if (version == null) {
+            Integer storedVersion = VersionUtils.getStoredVersion(versions, ImportTypes.DATASET_TYPE.getType(), code);
+            storedVersion++;
+            version = storedVersion.toString();
+        }
+
         VersionUtils.updateVersion(version, versions, ImportTypes.DATASET_TYPE.getType(), code);
     }
 

server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/ExperimentTypeImportHelper.java

@@ -35,7 +35,7 @@ import java.util.Map;
 public class ExperimentTypeImportHelper extends BasicImportHelper
 {
     private enum Attribute implements IAttribute {
-        Version("Version", true),
+        Version("Version", false),
         Code("Code", true),
         Description("Description", true),
         ValidationScript("Validation script", true),
@@ -84,7 +84,11 @@ public class ExperimentTypeImportHelper extends BasicImportHelper
         String version = getValueByColumnName(header, values, Attribute.Version);
         String code = getValueByColumnName(header, values, Attribute.Code);
 
-        return VersionUtils.isNewVersion(version, VersionUtils.getStoredVersion(versions, ImportTypes.EXPERIMENT_TYPE.getType(), code));
+        if (version == null) {
+            return true;
+        } else {
+            return VersionUtils.isNewVersion(version, VersionUtils.getStoredVersion(versions, ImportTypes.EXPERIMENT_TYPE.getType(), code));
+        }
     }
 
     @Override protected void updateVersion(Map<String, Integer> header, List<String> values)
@@ -92,6 +96,12 @@ public class ExperimentTypeImportHelper extends BasicImportHelper
         String version = getValueByColumnName(header, values, Attribute.Version);
         String code = getValueByColumnName(header, values, Attribute.Code);
 
+        if (version == null) {
+            Integer storedVersion = VersionUtils.getStoredVersion(versions, ImportTypes.EXPERIMENT_TYPE.getType(), code);
+            storedVersion++;
+            version = storedVersion.toString();
+        }
+
         VersionUtils.updateVersion(version, versions, ImportTypes.EXPERIMENT_TYPE.getType(), code);
     }
 

server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/PropertyAssignmentImportHelper.java

@@ -55,7 +55,7 @@ public class PropertyAssignmentImportHelper extends BasicImportHelper
 {
 
     private enum Attribute implements IAttribute {
-        Version("Version", true),
+        Version("Version", false),
         Code("Code", true),
         Mandatory("Mandatory", true),
         DefaultValue("Default Value", false),
@@ -119,10 +119,14 @@ public class PropertyAssignmentImportHelper extends BasicImportHelper
 
     @Override protected boolean isNewVersion(Map<String, Integer> header, List<String> values)
     {
-        String newVersion = getValueByColumnName(header, values, PropertyAssignmentImportHelper.Attribute.Version);
+        String version = getValueByColumnName(header, values, PropertyAssignmentImportHelper.Attribute.Version);
         String code = getValueByColumnName(header, values, PropertyAssignmentImportHelper.Attribute.Code);
 
-        return !existingCodes.contains(code) || VersionUtils.isNewVersion(newVersion, VersionUtils.getStoredVersion(beforeVersions, ImportTypes.PROPERTY_TYPE.getType(), code));
+        if (version == null) {
+            return true;
+        } else {
+            return !existingCodes.contains(code) || VersionUtils.isNewVersion(version, VersionUtils.getStoredVersion(beforeVersions, ImportTypes.PROPERTY_TYPE.getType(), code));
+        }
     }
 
     @Override protected boolean isObjectExist(Map<String, Integer> header, List<String> values)

server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/PropertyTypeImportHelper.java

@@ -52,7 +52,7 @@ public class PropertyTypeImportHelper extends BasicImportHelper
 
     private enum Attribute implements IAttribute
     {
-        Version("Version", true),
+        Version("Version", false),
         Code("Code", true),
         Mandatory("Mandatory", false),
         DefaultValue("Default Value",
@@ -142,11 +142,15 @@ public class PropertyTypeImportHelper extends BasicImportHelper
     @Override
     protected boolean isNewVersion(Map<String, Integer> header, List<String> values)
     {
-        String newVersion = getValueByColumnName(header, values, Attribute.Version);
+        String version = getValueByColumnName(header, values, Attribute.Version);
         String code = getValueByColumnName(header, values, Attribute.Code);
 
-        return VersionUtils.isNewVersion(newVersion,
-                VersionUtils.getStoredVersion(versions, ImportTypes.PROPERTY_TYPE.getType(), code));
+        if (version == null) {
+            return true;
+        } else {
+            return VersionUtils.isNewVersion(version,
+                    VersionUtils.getStoredVersion(versions, ImportTypes.PROPERTY_TYPE.getType(), code));
+        }
     }
 
     @Override
@@ -155,6 +159,12 @@ public class PropertyTypeImportHelper extends BasicImportHelper
         String version = getValueByColumnName(header, values, Attribute.Version);
         String code = getValueByColumnName(header, values, Attribute.Code);
 
+        if (version == null) {
+            Integer storedVersion = VersionUtils.getStoredVersion(versions, ImportTypes.PROPERTY_TYPE.getType(), code);
+            storedVersion++;
+            version = storedVersion.toString();
+        }
+
         VersionUtils.updateVersion(version, versions, ImportTypes.PROPERTY_TYPE.getType(), code);
     }
 

server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/SampleTypeImportHelper.java

@@ -35,7 +35,7 @@ import java.util.Map;
 public class SampleTypeImportHelper extends BasicImportHelper
 {
     private enum Attribute implements IAttribute {
-        Version("Version", true),
+        Version("Version", false),
         Code("Code", true),
         Description("Description", true),
         AutoGenerateCodes("Auto generate codes", true),
@@ -86,7 +86,11 @@ public class SampleTypeImportHelper extends BasicImportHelper
         String version = getValueByColumnName(header, values, Attribute.Version);
         String code = getValueByColumnName(header, values, Attribute.Code);
 
-        return VersionUtils.isNewVersion(version, VersionUtils.getStoredVersion(versions, ImportTypes.SAMPLE_TYPE.getType(), code));
+        if (version == null) {
+            return true;
+        } else {
+            return VersionUtils.isNewVersion(version, VersionUtils.getStoredVersion(versions, ImportTypes.SAMPLE_TYPE.getType(), code));
+        }
     }
 
     @Override protected void updateVersion(Map<String, Integer> header, List<String> values)
@@ -94,6 +98,12 @@ public class SampleTypeImportHelper extends BasicImportHelper
         String version = getValueByColumnName(header, values, Attribute.Version);
         String code = getValueByColumnName(header, values, Attribute.Code);
 
+        if (version == null) {
+            Integer storedVersion = VersionUtils.getStoredVersion(versions, ImportTypes.SAMPLE_TYPE.getType(), code);
+            storedVersion++;
+            version = storedVersion.toString();
+        }
+
         VersionUtils.updateVersion(version, versions, ImportTypes.SAMPLE_TYPE.getType(), code);
     }
 

server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/VocabularyImportHelper.java

@@ -34,7 +34,7 @@ import java.util.Map;
 public class VocabularyImportHelper extends BasicImportHelper
 {
     private enum Attribute implements IAttribute {
-        Version("Version", true),
+        Version("Version", false),
         Code("Code", true),
         Description("Description", true);
 
@@ -79,7 +79,11 @@ public class VocabularyImportHelper extends BasicImportHelper
         String version = getValueByColumnName(header, values, Attribute.Version);
         String code = getValueByColumnName(header, values, Attribute.Code);
 
-        return VersionUtils.isNewVersion(version, VersionUtils.getStoredVersion(versions, ImportTypes.VOCABULARY_TYPE.getType(), code));
+        if (version == null) {
+            return true;
+        } else {
+            return VersionUtils.isNewVersion(version, VersionUtils.getStoredVersion(versions, ImportTypes.VOCABULARY_TYPE.getType(), code));
+        }
     }
 
     @Override protected void updateVersion(Map<String, Integer> header, List<String> values)
@@ -87,6 +91,12 @@ public class VocabularyImportHelper extends BasicImportHelper
         String version = getValueByColumnName(header, values, Attribute.Version);
         String code = getValueByColumnName(header, values, Attribute.Code);
 
+        if (version == null) {
+            Integer storedVersion = VersionUtils.getStoredVersion(versions, ImportTypes.VOCABULARY_TYPE.getType(), code);
+            storedVersion++;
+            version = storedVersion.toString();
+        }
+
         VersionUtils.updateVersion(version, versions, ImportTypes.VOCABULARY_TYPE.getType(), code);
     }
 

server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/VocabularyTermImportHelper.java

@@ -36,7 +36,7 @@ public class VocabularyTermImportHelper extends BasicImportHelper
     private static final String VOCABULARY_CODE_FIELD = "Code";
 
     private enum Attribute implements IAttribute {
-        Version("Version", true),
+        Version("Version", false),
         Code("Code", true),
         Label("Label", true),
         Description("Description", true);
@@ -91,8 +91,12 @@ public class VocabularyTermImportHelper extends BasicImportHelper
         String version = getValueByColumnName(header, values, Attribute.Version);
         String code = getValueByColumnName(header, values, Attribute.Code);
 
-        return VersionUtils.isNewVersion(version,
-                VersionUtils.getStoredVersion(versions, ImportTypes.VOCABULARY_TERM.getType() + "-" + vocabularyCode, code));
+        if (version == null) {
+            return true;
+        } else {
+            return VersionUtils.isNewVersion(version,
+                    VersionUtils.getStoredVersion(versions, ImportTypes.VOCABULARY_TERM.getType() + "-" + vocabularyCode, code));
+        }
     }
 
     @Override protected void updateVersion(Map<String, Integer> header, List<String> values)
@@ -100,6 +104,12 @@ public class VocabularyTermImportHelper extends BasicImportHelper
         String version = getValueByColumnName(header, values, Attribute.Version);
         String code = getValueByColumnName(header, values, Attribute.Code);
 
+        if (version == null) {
+            Integer storedVersion = VersionUtils.getStoredVersion(versions, ImportTypes.VOCABULARY_TERM.getType() + "-" + vocabularyCode, code);
+            storedVersion++;
+            version = storedVersion.toString();
+        }
+
         VersionUtils.updateVersion(version, versions, ImportTypes.VOCABULARY_TERM.getType() + "-" + vocabularyCode, code);
     }