diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/exporter/ExportExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/exporter/ExportExecutor.java index 4731d9f7adb5320e51c7755f632a1674b52e6895..aedd446c7803e966f5317e25be49ae25732006b0 100644 --- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/exporter/ExportExecutor.java +++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/exporter/ExportExecutor.java @@ -1103,7 +1103,7 @@ public class ExportExecutor implements IExportExecutor { try { - return escapeUnsafeCharacters(entity.getVarcharProperty(NAME_PROPERTY_NAME)); + return escapeUnsafeCharacters(entity.getStringProperty(NAME_PROPERTY_NAME)); } catch (final NotFetchedException e) { return null; diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/UpdateEntityPropertyExecutorTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/UpdateEntityPropertyExecutorTest.java index 4f3e21974e671cc5dc604e00ed53b70175b0f605..1df7fc7fde28332b888aaf07854b5352c4dc4809 100644 --- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/UpdateEntityPropertyExecutorTest.java +++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/UpdateEntityPropertyExecutorTest.java @@ -145,12 +145,6 @@ public class UpdateEntityPropertyExecutorTest extends AbstractEntityPropertyExec throw new UnsupportedOperationException(); } - @Override - public String getPropertyAsString(String propertyName) - { - throw new UnsupportedOperationException(); - } - @Override public String getProperty(String propertyName) { @@ -263,25 +257,13 @@ public class UpdateEntityPropertyExecutorTest extends AbstractEntityPropertyExec } @Override - public String getVarcharProperty(String propertyName) - { - throw new UnsupportedOperationException(); - } - - @Override - public void setVarcharProperty(String propertyName, String propertyValue) - { - throw new UnsupportedOperationException(); - } - - @Override - public String getMultilineVarcharProperty(String propertyName) + public String getStringProperty(String propertyName) { throw new UnsupportedOperationException(); } @Override - public void setMultilineVarcharProperty(String propertyName, String propertyValue) + public void setStringProperty(String propertyName, String propertyValue) { throw new UnsupportedOperationException(); } @@ -385,31 +367,18 @@ public class UpdateEntityPropertyExecutorTest extends AbstractEntityPropertyExec } @Override - public List<String> getMultiValueVarcharProperty(String propertyName) + public List<String> getMultiValueStringProperty(String propertyName) { throw new UnsupportedOperationException(); } @Override - public void setMultiValueVarcharProperty(String propertyName, + public void setMultiValueStringProperty(String propertyName, List<String> propertyValues) { throw new UnsupportedOperationException(); } - @Override - public List<String> getMultiValueMultilineVarcharProperty(String propertyName) - { - throw new UnsupportedOperationException(); - } - - @Override - public void setMultiValueMultilineVarcharProperty(String propertyName, - List<String> propertyValue) - { - throw new UnsupportedOperationException(); - } - @Override public List<Double> getMultiValueRealProperty(String propertyName) {