From e2261467e17ce2bb7fca2e151268135f3eb0c719 Mon Sep 17 00:00:00 2001
From: cramakri <cramakri>
Date: Tue, 9 Nov 2010 12:23:44 +0000
Subject: [PATCH] LMS-1767 Refactored the escaper.
SVN: 18603
---
.../bo/common/entity/SecondaryEntityDAO.java | 17 ++++++++---------
.../bo/datasetlister/DatasetLister.java | 6 +++---
.../bo/materiallister/MaterialLister.java | 2 +-
.../bo/samplelister/ISampleListingQuery.java | 2 +-
.../bo/samplelister/SampleListingWorker.java | 2 +-
.../shared/translator/AttachmentTranslator.java | 4 ++--
.../AuthorizationGroupTranslator.java | 2 +-
.../translator/DataSetTypeTranslator.java | 3 +--
.../shared/translator/DataStoreTranslator.java | 2 +-
.../shared/translator/DataTypeTranslator.java | 2 +-
.../translator/DatabaseInstanceTranslator.java | 2 +-
.../translator/EntityPropertyTranslator.java | 2 +-
.../shared/translator/ExperimentTranslator.java | 8 +++-----
.../translator/ExperimentTypeTranslator.java | 2 +-
.../translator/ExternalDataTranslator.java | 4 ++--
.../GridCustomExpressionTranslator.java | 2 +-
.../shared/translator/GroupTranslator.java | 2 +-
.../translator/InvalidationTranslator.java | 2 +-
.../shared/translator/MaterialTranslator.java | 2 +-
.../shared/translator/PersonTranslator.java | 3 +--
.../shared/translator/ProjectTranslator.java | 2 +-
.../translator/PropertyTypeTranslator.java | 3 +--
.../translator/VocabularyTermTranslator.java | 2 +-
23 files changed, 36 insertions(+), 42 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/entity/SecondaryEntityDAO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/entity/SecondaryEntityDAO.java
index a4867d0a88f..076af4b555a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/entity/SecondaryEntityDAO.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/entity/SecondaryEntityDAO.java
@@ -123,10 +123,10 @@ public class SecondaryEntityDAO
experimentType.setCode(record.et_code);
experiment.setExperimentType(experimentType);
- ReflectingStringEscaper.escapeShallow(space, "code");
- ReflectingStringEscaper.escapeShallow(experiment, "code", "permId");
- ReflectingStringEscaper.escapeShallow(project, "code");
- ReflectingStringEscaper.escapeShallow(experimentType, "code");
+ ReflectingStringEscaper.escapeShallow(space);
+ ReflectingStringEscaper.escapeShallow(experiment);
+ ReflectingStringEscaper.escapeShallow(project);
+ ReflectingStringEscaper.escapeShallow(experimentType);
return experiment;
}
@@ -142,8 +142,7 @@ public class SecondaryEntityDAO
registrator.setEmail(registrator.getEmail());
registrator.setFirstName(registrator.getFirstName());
registrator.setLastName(registrator.getLastName());
- return ReflectingStringEscaper.escapeShallow(registrator, "userId", "email", "firstName",
- "lastName");
+ return ReflectingStringEscaper.escapeShallow(registrator);
}
public Long getSampleTypeIdForSampleTypeCode(String sampleTypeCode)
@@ -191,7 +190,7 @@ public class SecondaryEntityDAO
sample.setDatabaseInstance(tryGetDatabaseInstance(record.g_code, databaseInstance));
sample.setPermId(record.perm_id);
sample.setIdentifier(createIdentifier(sample).toString());
- return ReflectingStringEscaper.escapeShallow(sample, "permId", "identifier");
+ return ReflectingStringEscaper.escapeShallow(sample);
}
private static SampleIdentifier createIdentifier(Sample sample)
@@ -221,7 +220,7 @@ public class SecondaryEntityDAO
Space space = new Space();
space.setCode(codeOrNull);
space.setInstance(databaseInstance);
- return ReflectingStringEscaper.escapeShallow(space, "code");
+ return ReflectingStringEscaper.escapeShallow(space);
}
}
@@ -241,6 +240,6 @@ public class SecondaryEntityDAO
SampleType sampleType = new SampleType();
sampleType.setCode(code);
sampleType.setDatabaseInstance(databaseInstance);
- return ReflectingStringEscaper.escapeShallow(sampleType, "code");
+ return ReflectingStringEscaper.escapeShallow(sampleType);
}
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetLister.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetLister.java
index 9d1db828d4c..026dfee3773 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetLister.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetLister.java
@@ -534,7 +534,7 @@ public class DatasetLister extends AbstractLister implements IDatasetLister
dataset.setRegistrator(getOrCreateRegistrator(record.pers_id_registerer));
dataset.setDataSetProperties(new ArrayList<IEntityProperty>());
- ReflectingStringEscaper.escapeShallow(dataset, "dataProducerCode", "location");
+ ReflectingStringEscaper.escapeShallow(dataset);
if (record.samp_id != null)
{
@@ -568,7 +568,7 @@ public class DatasetLister extends AbstractLister implements IDatasetLister
dataset.setPermlink(PermlinkUtilities.createPermlinkURL(baseIndexURL, EntityKind.DATA_SET,
record.code));
- ReflectingStringEscaper.escapeShallow(dataset, "code");
+ ReflectingStringEscaper.escapeShallow(dataset);
return dataset;
}
@@ -602,7 +602,7 @@ public class DatasetLister extends AbstractLister implements IDatasetLister
private static void setCode(Code<?> codeHolder, CodeRecord codeRecord)
{
codeHolder.setCode(codeRecord.code);
- ReflectingStringEscaper.escapeShallow(codeHolder, "code");
+ ReflectingStringEscaper.escapeShallow(codeHolder);
}
private static DataStore createDataStore(DataStoreRecord codeRecord)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/materiallister/MaterialLister.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/materiallister/MaterialLister.java
index d23ae742b05..61cfbfbba69 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/materiallister/MaterialLister.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/materiallister/MaterialLister.java
@@ -176,7 +176,7 @@ public class MaterialLister extends AbstractLister implements IMaterialLister
material.setProperties(new ArrayList<IEntityProperty>());
- ReflectingStringEscaper.escapeShallow(material, "code");
+ ReflectingStringEscaper.escapeShallow(material);
return material;
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/ISampleListingQuery.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/ISampleListingQuery.java
index 260cc67b8e3..243c47ebe39 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/ISampleListingQuery.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/ISampleListingQuery.java
@@ -296,7 +296,7 @@ public interface ISampleListingQuery extends TransactionQuery, IPropertyListingQ
into.setGeneratedFromHierarchyDepth(row.getInt("generated_from_depth"));
into.setShowContainer(row.getInt("part_of_depth") > 0);
- ReflectingStringEscaper.escapeShallow(into, "code");
+ ReflectingStringEscaper.escapeShallow(into);
}
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleListingWorker.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleListingWorker.java
index 50a60c9bd28..9b8cfec9636 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleListingWorker.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleListingWorker.java
@@ -617,7 +617,7 @@ final class SampleListingWorker extends AbstractLister
addRelatedContainerSampleToRequested(row.samp_id_part_of);
}
- ReflectingStringEscaper.escapeShallow(sample, "permId");
+ ReflectingStringEscaper.escapeShallow(sample);
return sample;
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/AttachmentTranslator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/AttachmentTranslator.java
index f8229905b7d..19626428369 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/AttachmentTranslator.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/AttachmentTranslator.java
@@ -59,7 +59,7 @@ public final class AttachmentTranslator
result.setRegistrator(PersonTranslator.translate(attachment.getRegistrator()));
result.setRegistrationDate(attachment.getRegistrationDate());
result.setVersion(attachment.getVersion());
- return ReflectingStringEscaper.escapeShallow(result, "fileName", "title", "description");
+ return ReflectingStringEscaper.escapeShallow(result);
}
private final static Attachment translateWithoutEscaping(final AttachmentPE attachment,
@@ -111,7 +111,7 @@ public final class AttachmentTranslator
result.setRegistrationDate(attachment.getRegistrationDate());
result.setVersion(attachment.getVersion());
result.setContent(attachment.getAttachmentContent().getValue());
- return ReflectingStringEscaper.escapeShallow(result, "fileName", "title", "description");
+ return ReflectingStringEscaper.escapeShallow(result);
}
public final static List<Attachment> translate(final Collection<AttachmentPE> attachments,
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/AuthorizationGroupTranslator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/AuthorizationGroupTranslator.java
index 2c3f5d90a2f..a6c910570c7 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/AuthorizationGroupTranslator.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/AuthorizationGroupTranslator.java
@@ -58,7 +58,7 @@ public final class AuthorizationGroupTranslator
result.setDatabaseInstance(DatabaseInstanceTranslator.translate(group.getDatabaseInstance()));
result.setRegistrationDate(group.getRegistrationDate());
result.setRegistrator(PersonTranslator.translate(group.getRegistrator()));
- return ReflectingStringEscaper.escapeShallow(result, "code", "description");
+ return ReflectingStringEscaper.escapeShallow(result);
}
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DataSetTypeTranslator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DataSetTypeTranslator.java
index 9cea6269b52..9f95943379d 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DataSetTypeTranslator.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DataSetTypeTranslator.java
@@ -56,8 +56,7 @@ public class DataSetTypeTranslator
entityTypeOrNull.getDataSetTypePropertyTypes(), result, cacheOrNull)));
result.setMainDataSetPath(entityTypeOrNull.getMainDataSetPath());
result.setMainDataSetPattern(entityTypeOrNull.getMainDataSetPattern());
- return ReflectingStringEscaper.escapeShallow(result, "code", "description",
- "mainDataSetPath", "mainDataSetPattern");
+ return ReflectingStringEscaper.escapeShallow(result);
}
public static List<DataSetType> translate(List<DataSetTypePE> dataSetTypes,
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DataStoreTranslator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DataStoreTranslator.java
index 38cabdaa635..e760d8c26b1 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DataStoreTranslator.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DataStoreTranslator.java
@@ -34,7 +34,7 @@ public class DataStoreTranslator
downloadUrl = translateDownloadUrl(downloadUrl);
dataStore.setDownloadUrl(downloadUrl);
dataStore.setCode(dataStorePE.getCode());
- return ReflectingStringEscaper.escapeShallow(dataStore, "code");
+ return ReflectingStringEscaper.escapeShallow(dataStore);
}
public static String translateDownloadUrl(String downloadUrl)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DataTypeTranslator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DataTypeTranslator.java
index 33ecaf2a835..d1b2d893179 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DataTypeTranslator.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DataTypeTranslator.java
@@ -41,7 +41,7 @@ public class DataTypeTranslator
final DataType result = new DataType();
result.setCode(dataTypePE.getCode());
result.setDescription(dataTypePE.getDescription());
- return ReflectingStringEscaper.escapeShallow(result, "code", "description");
+ return ReflectingStringEscaper.escapeShallow(result);
}
public static List<DataType> translate(List<DataTypePE> dataTypePEs)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DatabaseInstanceTranslator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DatabaseInstanceTranslator.java
index d5a78f5a868..8013780a7a6 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DatabaseInstanceTranslator.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DatabaseInstanceTranslator.java
@@ -47,7 +47,7 @@ public final class DatabaseInstanceTranslator
result.setUuid(databaseInstance.getUuid());
result.setIdentifier(IdentifierHelper.createDatabaseInstanceIdentifier(databaseInstance)
.toString());
- return ReflectingStringEscaper.escapeShallow(result, "code", "uuid", "identifier");
+ return ReflectingStringEscaper.escapeShallow(result);
}
public final static DatabaseInstance translateWithoutEscaping(
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/EntityPropertyTranslator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/EntityPropertyTranslator.java
index 6c413a3ec1e..71b76432654 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/EntityPropertyTranslator.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/EntityPropertyTranslator.java
@@ -60,7 +60,7 @@ public final class EntityPropertyTranslator
break;
default:
result.setValue(propertyPE.tryGetUntypedValue());
- ReflectingStringEscaper.escapeShallow(result, "value");
+ ReflectingStringEscaper.escapeShallow(result);
}
return result;
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/ExperimentTranslator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/ExperimentTranslator.java
index 8bcc6e8a14a..ac0786fa7cd 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/ExperimentTranslator.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/ExperimentTranslator.java
@@ -101,9 +101,7 @@ public final class ExperimentTranslator
}
}
- return ReflectingStringEscaper.escapeDeep(result, "code", "permId", "identifier",
- "description", "reason", "fileName", "title", "description", "code", "label",
- "url", "value", "uuid");
+ return ReflectingStringEscaper.escapeDeep(result);
}
public final static List<Experiment> translate(final List<ExperimentPE> experiments,
@@ -142,7 +140,7 @@ public final class ExperimentTranslator
result.setExperimentTypePropertyTypes(ExperimentTypePropertyTypeTranslator.translate(
experimentType.getExperimentTypePropertyTypes(), result, cacheOrNull));
- return ReflectingStringEscaper.escapeShallow(result, "code", "description");
+ return ReflectingStringEscaper.escapeShallow(result);
}
public final static ExperimentTypePE translate(final ExperimentType experimentType)
@@ -153,7 +151,7 @@ public final class ExperimentTranslator
result.setDatabaseInstance(DatabaseInstanceTranslator.translate(experimentType
.getDatabaseInstance()));
- return ReflectingStringEscaper.escapeShallow(result, "code", "description");
+ return ReflectingStringEscaper.escapeShallow(result);
}
public final static List<ExperimentType> translate(final List<ExperimentTypePE> experimentTypes)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/ExperimentTypeTranslator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/ExperimentTypeTranslator.java
index 24076ac1eef..75e3e1958e8 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/ExperimentTypeTranslator.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/ExperimentTypeTranslator.java
@@ -43,7 +43,7 @@ public class ExperimentTypeTranslator
experimentTypePE.getExperimentTypePropertyTypes(), result, cachedOrNull)));
result.setDatabaseInstance(DatabaseInstanceTranslator.translate(experimentTypePE
.getDatabaseInstance()));
- return ReflectingStringEscaper.escapeShallow(result, "code", "description");
+ return ReflectingStringEscaper.escapeShallow(result);
}
public static List<ExperimentType> translate(final List<ExperimentTypePE> experimentTypes,
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/ExternalDataTranslator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/ExternalDataTranslator.java
index f6babb47677..f2073864057 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/ExternalDataTranslator.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/ExternalDataTranslator.java
@@ -190,7 +190,7 @@ public class ExternalDataTranslator
sample.setProperties(EntityPropertyTranslator.translate(samplePE.getProperties(),
new HashMap<PropertyTypePE, PropertyType>()));
}
- return ReflectingStringEscaper.escapeShallow(sample, "permId", "identifier");
+ return ReflectingStringEscaper.escapeShallow(sample);
}
private static void setChildren(ExternalDataPE externalDataPE, ExternalData externalData)
@@ -216,6 +216,6 @@ public class ExternalDataTranslator
externalData.setCode(StringEscapeUtils.escapeHtml(dataPE.getCode()));
externalData.setDataSetType(DataSetTypeTranslator.translate(dataPE.getDataSetType(),
new HashMap<PropertyTypePE, PropertyType>()));
- return ReflectingStringEscaper.escapeShallow(externalData, "code");
+ return ReflectingStringEscaper.escapeShallow(externalData);
}
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/GridCustomExpressionTranslator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/GridCustomExpressionTranslator.java
index 9773512368b..d69d96c189a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/GridCustomExpressionTranslator.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/GridCustomExpressionTranslator.java
@@ -66,7 +66,7 @@ public final class GridCustomExpressionTranslator
result.setCode(original.getCode());
result.setName(original.getLabel());
- ReflectingStringEscaper.escapeShallow(result, "code", "name");
+ ReflectingStringEscaper.escapeShallow(result);
translateExpression(original, result);
return result;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/GroupTranslator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/GroupTranslator.java
index fab4a7ef302..ed1848db191 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/GroupTranslator.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/GroupTranslator.java
@@ -61,6 +61,6 @@ public final class GroupTranslator
result.setRegistrationDate(group.getRegistrationDate());
result.setRegistrator(PersonTranslator.translate(group.getRegistrator()));
result.setIdentifier(IdentifierHelper.createGroupIdentifier(group).toString());
- return ReflectingStringEscaper.escapeShallow(result, "code", "description", "identifier");
+ return ReflectingStringEscaper.escapeShallow(result);
}
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/InvalidationTranslator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/InvalidationTranslator.java
index 6bd3cbd66c9..3f243f71055 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/InvalidationTranslator.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/InvalidationTranslator.java
@@ -43,7 +43,7 @@ public final class InvalidationTranslator
newInvalidation.setReason(invalidation.getReason());
newInvalidation.setRegistrationDate(invalidation.getRegistrationDate());
newInvalidation.setRegistrator(PersonTranslator.translate(invalidation.getRegistrator()));
- return ReflectingStringEscaper.escapeShallow(newInvalidation, "reason");
+ return ReflectingStringEscaper.escapeShallow(newInvalidation);
}
public final static Invalidation translateWithoutEscaping(final InvalidationPE invalidation)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/MaterialTranslator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/MaterialTranslator.java
index 500843f2304..f8a2861a3e4 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/MaterialTranslator.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/MaterialTranslator.java
@@ -77,7 +77,7 @@ public final class MaterialTranslator
setProperties(materialPE, result);
}
- return ReflectingStringEscaper.escapeShallow(result, "code");
+ return ReflectingStringEscaper.escapeShallow(result);
}
public final static Material translateWithoutEscaping(final MaterialPE materialPE,
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/PersonTranslator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/PersonTranslator.java
index e8e247c0577..e01a28dad6b 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/PersonTranslator.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/PersonTranslator.java
@@ -75,8 +75,7 @@ public class PersonTranslator
result.setRegistrator(PersonTranslator.translate(person.getRegistrator(), false));
}
- return ReflectingStringEscaper.escapeShallow(result, "firstName", "lastName", "email",
- "userId");
+ return ReflectingStringEscaper.escapeShallow(result);
}
private final static Person translateWithoutEscaping(final PersonPE person,
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/ProjectTranslator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/ProjectTranslator.java
index 26ff3d27f7a..33e502caa79 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/ProjectTranslator.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/ProjectTranslator.java
@@ -70,7 +70,7 @@ public final class ProjectTranslator
// we don't use attachments collection directly from project
List<Attachment> attachments = DtoConverters.createUnmodifiableEmptyList();
result.setAttachments(attachments);
- return ReflectingStringEscaper.escapeShallow(result, "code", "description", "identifier");
+ return ReflectingStringEscaper.escapeShallow(result);
}
public final static Project translateWithoutEscaping(final ProjectPE project)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/PropertyTypeTranslator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/PropertyTypeTranslator.java
index 82fe645591b..9874fc21835 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/PropertyTypeTranslator.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/PropertyTypeTranslator.java
@@ -86,8 +86,7 @@ public final class PropertyTypeTranslator
result.setSchema(propertyType.getSchema());
result.setTransformation(propertyType.getTransformation());
- return ReflectingStringEscaper.escapeShallow(result, "code", "simpleCode", "label",
- "description", "schema", "transformation");
+ return ReflectingStringEscaper.escapeShallow(result);
}
public final static PropertyType translate(final PropertyTypePE propertyType,
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/VocabularyTermTranslator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/VocabularyTermTranslator.java
index a001d9419b5..275273f8354 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/VocabularyTermTranslator.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/VocabularyTermTranslator.java
@@ -51,7 +51,7 @@ public class VocabularyTermTranslator
result.setRegistrationDate(vt.getRegistrationDate());
result.setRegistrator(PersonTranslator.translate(vt.getRegistrator()));
- return ReflectingStringEscaper.escapeShallow(result, "code", "label", "description", "url");
+ return ReflectingStringEscaper.escapeShallow(result);
}
public static VocabularyTerm translateWithoutEscaping(VocabularyTermPE vt)
--
GitLab