From 734c7a8b77975b8d9d415b79e2804a8b1c085928 Mon Sep 17 00:00:00 2001
From: gakin <gakin>
Date: Tue, 28 Mar 2017 12:20:03 +0000
Subject: [PATCH] SSDM-4584: OpenbisSync: Name Translation minor fix
SVN: 37987
---
.../synchronizer/translator/CustomNameTranslator.java | 1 -
.../synchronizer/translator/PrefixBasedNameTranslator.java | 3 +++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/translator/CustomNameTranslator.java b/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/translator/CustomNameTranslator.java
index 9cf1ad09281..7a96cbd22c2 100644
--- a/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/translator/CustomNameTranslator.java
+++ b/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/translator/CustomNameTranslator.java
@@ -27,7 +27,6 @@ import ch.systemsx.cisd.common.exceptions.ConfigurationFailureException;
*/
public class CustomNameTranslator implements INameTranslator
{
-
private final HashMap<String, String> spaceMappings;
public CustomNameTranslator(HashMap<String, String> spaceMappings)
diff --git a/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/translator/PrefixBasedNameTranslator.java b/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/translator/PrefixBasedNameTranslator.java
index 7c18825fc9b..bfc2ccc5646 100644
--- a/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/translator/PrefixBasedNameTranslator.java
+++ b/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/translator/PrefixBasedNameTranslator.java
@@ -16,6 +16,8 @@
package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.harvester.synchronizer.translator;
+import org.apache.commons.lang3.StringUtils;
+
/**
*
*
@@ -33,6 +35,7 @@ public class PrefixBasedNameTranslator implements INameTranslator
@Override
public String translate(String name)
{
+ assert StringUtils.isBlank(name) == false : "Prefix translation can only be done for non-null values";
return prefix + "_" + name;
}
--
GitLab