From f5992a54cd73962bafc17ffb2f367cb78358fbb7 Mon Sep 17 00:00:00 2001
From: juanf <juanf@ethz.ch>
Date: Wed, 20 Sep 2023 15:26:52 +0200
Subject: [PATCH] SSDM-13961: Allow blank versions
---
.../server/xls/importer/helper/DatasetTypeImportHelper.java | 4 ++--
.../xls/importer/helper/ExperimentTypeImportHelper.java | 4 ++--
.../xls/importer/helper/PropertyAssignmentImportHelper.java | 2 +-
.../server/xls/importer/helper/PropertyTypeImportHelper.java | 4 ++--
.../server/xls/importer/helper/SampleTypeImportHelper.java | 4 ++--
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/DatasetTypeImportHelper.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/DatasetTypeImportHelper.java
index d78bbecf131..846ef1dabc3 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/DatasetTypeImportHelper.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/DatasetTypeImportHelper.java
@@ -84,7 +84,7 @@ public class DatasetTypeImportHelper extends BasicImportHelper
String version = getValueByColumnName(header, values, Attribute.Version);
String code = getValueByColumnName(header, values, Attribute.Code);
- if (version == null) {
+ if (version == null || version.isEmpty()) {
return true;
} else {
return VersionUtils.isNewVersion(version, VersionUtils.getStoredVersion(versions, ImportTypes.DATASET_TYPE.getType(), code));
@@ -96,7 +96,7 @@ public class DatasetTypeImportHelper extends BasicImportHelper
String version = getValueByColumnName(header, values, Attribute.Version);
String code = getValueByColumnName(header, values, Attribute.Code);
- if (version == null) {
+ if (version == null || version.isEmpty()) {
Integer storedVersion = VersionUtils.getStoredVersion(versions, ImportTypes.DATASET_TYPE.getType(), code);
storedVersion++;
version = storedVersion.toString();
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/ExperimentTypeImportHelper.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/ExperimentTypeImportHelper.java
index df1eb2cfc55..08c927014db 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/ExperimentTypeImportHelper.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/ExperimentTypeImportHelper.java
@@ -84,7 +84,7 @@ public class ExperimentTypeImportHelper extends BasicImportHelper
String version = getValueByColumnName(header, values, Attribute.Version);
String code = getValueByColumnName(header, values, Attribute.Code);
- if (version == null) {
+ if (version == null || version.isEmpty()) {
return true;
} else {
return VersionUtils.isNewVersion(version, VersionUtils.getStoredVersion(versions, ImportTypes.EXPERIMENT_TYPE.getType(), code));
@@ -96,7 +96,7 @@ public class ExperimentTypeImportHelper extends BasicImportHelper
String version = getValueByColumnName(header, values, Attribute.Version);
String code = getValueByColumnName(header, values, Attribute.Code);
- if (version == null) {
+ if (version == null || version.isEmpty()) {
Integer storedVersion = VersionUtils.getStoredVersion(versions, ImportTypes.EXPERIMENT_TYPE.getType(), code);
storedVersion++;
version = storedVersion.toString();
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/PropertyAssignmentImportHelper.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/PropertyAssignmentImportHelper.java
index 90edfeb46e3..e8ae70bdd73 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/PropertyAssignmentImportHelper.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/PropertyAssignmentImportHelper.java
@@ -122,7 +122,7 @@ public class PropertyAssignmentImportHelper extends BasicImportHelper
String version = getValueByColumnName(header, values, PropertyAssignmentImportHelper.Attribute.Version);
String code = getValueByColumnName(header, values, PropertyAssignmentImportHelper.Attribute.Code);
- if (version == null) {
+ if (version == null || version.isEmpty()) {
return true;
} else {
return !existingCodes.contains(code) || VersionUtils.isNewVersion(version, VersionUtils.getStoredVersion(beforeVersions, ImportTypes.PROPERTY_TYPE.getType(), code));
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/PropertyTypeImportHelper.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/PropertyTypeImportHelper.java
index f285c33cfe2..d521d9d87b1 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/PropertyTypeImportHelper.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/PropertyTypeImportHelper.java
@@ -145,7 +145,7 @@ public class PropertyTypeImportHelper extends BasicImportHelper
String version = getValueByColumnName(header, values, Attribute.Version);
String code = getValueByColumnName(header, values, Attribute.Code);
- if (version == null) {
+ if (version == null || version.isEmpty()) {
return true;
} else {
return VersionUtils.isNewVersion(version,
@@ -159,7 +159,7 @@ public class PropertyTypeImportHelper extends BasicImportHelper
String version = getValueByColumnName(header, values, Attribute.Version);
String code = getValueByColumnName(header, values, Attribute.Code);
- if (version == null) {
+ if (version == null || version.isEmpty()) {
Integer storedVersion = VersionUtils.getStoredVersion(versions, ImportTypes.PROPERTY_TYPE.getType(), code);
storedVersion++;
version = storedVersion.toString();
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/SampleTypeImportHelper.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/SampleTypeImportHelper.java
index cef78f1424f..1be39ab4e5c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/SampleTypeImportHelper.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/SampleTypeImportHelper.java
@@ -86,7 +86,7 @@ public class SampleTypeImportHelper extends BasicImportHelper
String version = getValueByColumnName(header, values, Attribute.Version);
String code = getValueByColumnName(header, values, Attribute.Code);
- if (version == null) {
+ if (version == null || version.isEmpty()) {
return true;
} else {
return VersionUtils.isNewVersion(version, VersionUtils.getStoredVersion(versions, ImportTypes.SAMPLE_TYPE.getType(), code));
@@ -98,7 +98,7 @@ public class SampleTypeImportHelper extends BasicImportHelper
String version = getValueByColumnName(header, values, Attribute.Version);
String code = getValueByColumnName(header, values, Attribute.Code);
- if (version == null) {
+ if (version == null || version.isEmpty()) {
Integer storedVersion = VersionUtils.getStoredVersion(versions, ImportTypes.SAMPLE_TYPE.getType(), code);
storedVersion++;
version = storedVersion.toString();
--
GitLab