BIS-723: Renaming of the api methods - java

api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/entity/AbstractEntityPropertyHolder.java

@@ -46,14 +46,6 @@ public abstract class AbstractEntityPropertyHolder implements Serializable, IPro
     @JsonIgnore
     public abstract void setProperties(Map<String, Serializable> properties);
 
-    @Override
-    public String getPropertyAsString(String propertyName)
-    {
-        return getProperties() != null ?
-                PropertiesDeserializer.getPropertyAsString(getProperties().get(propertyName)) :
-                null;
-    }
-
     @Override
     public Serializable getProperty(String propertyName)
     {
@@ -73,7 +65,7 @@ public abstract class AbstractEntityPropertyHolder implements Serializable, IPro
     @Override
     public Long getIntegerProperty(String propertyName)
     {
-        String propertyValue = getPropertyAsString(propertyName);
+        String propertyValue = (String) getProperty(propertyName);
         return (propertyValue == null || propertyValue.trim().isEmpty()) ?
                 null :
                 Long.parseLong(propertyValue);
@@ -86,25 +78,13 @@ public abstract class AbstractEntityPropertyHolder implements Serializable, IPro
     }
 
     @Override
-    public String getVarcharProperty(String propertyName)
-    {
-        return (String) getProperty(propertyName);
-    }
-
-    @Override
-    public void setVarcharProperty(String propertyName, String propertyValue)
-    {
-        setProperty(propertyName, propertyValue);
-    }
-
-    @Override
-    public String getMultilineVarcharProperty(String propertyName)
+    public String getStringProperty(String propertyName)
     {
         return (String) getProperty(propertyName);
     }
 
     @Override
-    public void setMultilineVarcharProperty(String propertyName, String propertyValue)
+    public void setStringProperty(String propertyName, String propertyValue)
     {
         setProperty(propertyName, propertyValue);
     }
@@ -343,14 +323,14 @@ public abstract class AbstractEntityPropertyHolder implements Serializable, IPro
     }
 
     @Override
-    public List<String> getMultiValueVarcharProperty(String propertyName)
+    public List<String> getMultiValueStringProperty(String propertyName)
     {
         Serializable propertyValue = getProperty(propertyName);
         return getListOfValues(propertyValue, (x) -> (String) x);
     }
 
     @Override
-    public void setMultiValueVarcharProperty(String propertyName, List<String> propertyValues)
+    public void setMultiValueStringProperty(String propertyName, List<String> propertyValues)
     {
         if (propertyValues != null)
         {
@@ -419,26 +399,6 @@ public abstract class AbstractEntityPropertyHolder implements Serializable, IPro
                 .toArray(String[]::new));
     }
 
-    @Override
-    public List<String> getMultiValueMultilineVarcharProperty(String propertyName)
-    {
-        Serializable propertyValue = getProperty(propertyName);
-        return getListOfValues(propertyValue, (x) -> (String) x);
-    }
-
-    @Override
-    public void setMultiValueMultilineVarcharProperty(String propertyName,
-            List<String> propertyValue)
-    {
-        if (propertyValue != null)
-        {
-            setProperty(propertyName, propertyValue.toArray(String[]::new));
-        } else
-        {
-            setProperty(propertyName, null);
-        }
-    }
-
     @Override
     public List<Double> getMultiValueRealProperty(String propertyName)
     {

api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IPropertiesHolder.java

@@ -34,8 +34,6 @@ public interface IPropertiesHolder
 
     void setProperties(Map<String, Serializable> properties);
 
-    String getPropertyAsString(String propertyName);
-
     Serializable getProperty(String propertyName);
 
     void setProperty(String propertyName, Serializable propertyValue);
@@ -44,13 +42,9 @@ public interface IPropertiesHolder
 
     void setIntegerProperty(String propertyName, Long propertyValue);
 
-    String getVarcharProperty(String propertyName);
-
-    void setVarcharProperty(String propertyName, String propertyValue);
-
-    String getMultilineVarcharProperty(String propertyName);
+    String getStringProperty(String propertyName);
 
-    void setMultilineVarcharProperty(String propertyName, String propertyValue);
+    void setStringProperty(String propertyName, String propertyValue);
 
     Double getRealProperty(String propertyName);
 
@@ -106,13 +100,9 @@ public interface IPropertiesHolder
 
     void setMultiValueIntegerProperty(String propertyName, List<Long> propertyValues);
 
-    List<String> getMultiValueVarcharProperty(String propertyName);
-
-    void setMultiValueVarcharProperty(String propertyName, List<String> propertyValues);
-
-    List<String> getMultiValueMultilineVarcharProperty(String propertyName);
+    List<String> getMultiValueStringProperty(String propertyName);
 
-    void setMultiValueMultilineVarcharProperty(String propertyName, List<String> propertyValue);
+    void setMultiValueStringProperty(String propertyName, List<String> propertyValues);
 
     List<Double> getMultiValueRealProperty(String propertyName);