diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/EntityPropertiesConverter.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/EntityPropertiesConverter.java
index f3b525c6fa9e284bf17314cb1718ce5ac68d60ad..7a546cd0ba0c22043546519c49ce68d055b73780 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/EntityPropertiesConverter.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/EntityPropertiesConverter.java
@@ -85,8 +85,8 @@ public final class EntityPropertiesConverter implements IEntityPropertiesConvert
public EntityPropertiesConverter(final EntityKind entityKind, final IDAOFactory daoFactory)
{
- this(entityKind, daoFactory, new PropertyValidator(daoFactory),
- new DynamicPropertiesUpdateChecker(), new DynamicProperiesPlaceholderCreator());
+ this(entityKind, daoFactory, new PropertyValidator(), new DynamicPropertiesUpdateChecker(),
+ new DynamicProperiesPlaceholderCreator());
}
@Private
@@ -257,9 +257,7 @@ public final class EntityPropertiesConverter implements IEntityPropertiesConvert
final T entityProperty = EntityPropertyPE.createEntityProperty(entityKind);
entityProperty.setRegistrator(registrator);
entityProperty.setEntityTypePropertyType(entityTypePropertyType);
- final VocabularyTermPE vocabularyTerm = tryGetVocabularyTerm(value, propertyType);
- final MaterialPE material = tryGetMaterial(value, propertyType);
- entityProperty.setUntypedValue(value, vocabularyTerm, material);
+ setPropertyValue(entityProperty, propertyType, value);
return entityProperty;
}
@@ -397,6 +395,25 @@ public final class EntityPropertiesConverter implements IEntityPropertiesConvert
validatedValue);
}
+ public final <T extends EntityPropertyPE> void setPropertyValue(final T entityProperty,
+ final PropertyTypePE propertyType, final String validatedValue)
+ {
+ assert validatedValue != null;
+ final VocabularyTermPE vocabularyTerm = tryGetVocabularyTerm(validatedValue, propertyType);
+ final MaterialPE material = tryGetMaterial(validatedValue, propertyType);
+ entityProperty.setUntypedValue(validatedValue, vocabularyTerm, material);
+ }
+
+ public final <T extends EntityPropertyPE> void setPropertyValue(T entityProperty,
+ PropertyTypePE propertyType, EntityTypePropertyTypePE entityTypPropertyType,
+ final PersonPE registrator, String validatedValue)
+ {
+ assert validatedValue != null;
+ final VocabularyTermPE vocabularyTerm = tryGetVocabularyTerm(validatedValue, propertyType);
+ final MaterialPE material = tryGetMaterial(validatedValue, propertyType);
+ entityProperty.setUntypedValue(validatedValue, vocabularyTerm, material);
+ }
+
public <T extends EntityPropertyPE> Set<T> updateProperties(Collection<T> oldProperties,
EntityTypePE entityType, List<IEntityProperty> newProperties, PersonPE registrator,
Set<String> dynamicProperties)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IEntityPropertiesConverter.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IEntityPropertiesConverter.java
index 0ed42020c171bb227a2e568f7ebb50071cc84e98..130d0bfa8e6c9b4b60f52cd8faac2e4ebf2582b2 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IEntityPropertiesConverter.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IEntityPropertiesConverter.java
@@ -60,6 +60,12 @@ public interface IEntityPropertiesConverter
EntityTypePropertyTypePE entityTypePropertyType, final PersonPE registrator,
String validatedValue);
+ /**
+ * Modifies value of given {@link EntityPropertyPE}. Value should be already validated.
+ */
+ public <T extends EntityPropertyPE> void setPropertyValue(final T entityProperty,
+ final PropertyTypePE propertyType, final String validatedValue);
+
/** Updates Set<T> of properties. */
public <T extends EntityPropertyPE> Set<T> updateProperties(Collection<T> oldProperties,
EntityTypePE entityType, List<IEntityProperty> newProperties, PersonPE registrator,
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/PropertyValidator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/PropertyValidator.java
index 448ca42db026cc04731d33d081a2967ea9f915a0..1722c880f9dd67c1d313a1a40e060cff85a8788a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/PropertyValidator.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/PropertyValidator.java
@@ -115,20 +115,6 @@ public final class PropertyValidator implements IPropertyValueValidator
return datePatterns.toArray(ArrayUtils.EMPTY_STRING_ARRAY);
}
- public PropertyValidator()
- {
- // NOTE: controlled vocabulary validator will always fail
- }
-
- public PropertyValidator(IDAOFactory daoFactory)
- {
- assert daoFactory != null : "Unspecified DAO factory.";
-
- final IDataTypeValidator dataTypeValidator =
- dataTypeValidators.get(DataTypeCode.CONTROLLEDVOCABULARY);
- ((ControlledVocabularyValidator) dataTypeValidator).setDaoFactory(daoFactory);
- }
-
//
// IPropertyValidator
//
@@ -287,18 +273,11 @@ public final class PropertyValidator implements IPropertyValueValidator
private VocabularyPE vocabulary;
- private IDAOFactory daoFactory;
-
final void setVocabulary(final VocabularyPE vocabulary)
{
this.vocabulary = vocabulary;
}
- public void setDaoFactory(final IDAOFactory daoFactory)
- {
- this.daoFactory = daoFactory;
- }
-
//
// IDataTypeValidator
//
@@ -308,16 +287,9 @@ public final class PropertyValidator implements IPropertyValueValidator
assert value != null : "Unspecified value.";
assert vocabulary != null : "Unspecified vocabulary.";
- if (daoFactory == null)
- {
- throw UserFailureException
- .fromTemplate("Controlled vocabulary validator wasn't initialized.");
- }
-
final String upperCaseValue = value.toUpperCase();
- VocabularyTermPE termOrNull =
- daoFactory.getVocabularyDAO().tryFindVocabularyTermByCode(vocabulary,
- upperCaseValue);
+ vocabulary.tryGetVocabularyTerm(upperCaseValue);
+ VocabularyTermPE termOrNull = vocabulary.tryGetVocabularyTerm(upperCaseValue);
if (termOrNull != null)
{
return upperCaseValue;
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/PropertyValidatorTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/PropertyValidatorTest.java
index 3d38557a118556f6b631d1af65e269a798a5892f..eda85c2ca83ebef821aac0f6dabedabf1f8180bf 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/PropertyValidatorTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/PropertyValidatorTest.java
@@ -21,7 +21,6 @@ import java.util.Date;
import java.util.List;
import org.apache.commons.lang.time.DateFormatUtils;
-import org.jmock.Expectations;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
@@ -46,7 +45,7 @@ public final class PropertyValidatorTest extends AbstractBOTest
{
private final PropertyValidator createPropertyValidator()
{
- return new PropertyValidator(daoFactory);
+ return new PropertyValidator();
}
private final static PropertyTypePE createPropertyType(final DataTypeCode entityDataType)
@@ -178,9 +177,9 @@ public final class PropertyValidatorTest extends AbstractBOTest
}
}
- //
+ //
// XML property with schema
- //
+ //
@Test
public final void testValidateXMLPropertyValue()
@@ -211,8 +210,8 @@ public final class PropertyValidatorTest extends AbstractBOTest
"Provided value doesn't validate against schema of property type '%s'. "
+ "cvc-complex-type.2.4.d: "
+ "Invalid content was found starting with element 'footer'. "
- + "No child element is expected at this point.", propertyLabel), ex
- .getMessage());
+ + "No child element is expected at this point.", propertyLabel),
+ ex.getMessage());
}
}
@@ -236,17 +235,7 @@ public final class PropertyValidatorTest extends AbstractBOTest
public final void testValidateControlledVocabularyPropertyValue()
{
final PropertyTypePE propertyType = createControlledVocabularyPropertyType();
- final VocabularyPE vocabulary = propertyType.getVocabulary();
final String value = "goodValue";
- final String code = value.toUpperCase();
- final VocabularyTermPE term = createVocabularyTerm(code);
- context.checking(new Expectations()
- {
- {
- one(vocabularyDAO).tryFindVocabularyTermByCode(vocabulary, code);
- will(returnValue(term));
- }
- });
final PropertyValidator propertyValidator = createPropertyValidator();
propertyValidator.validatePropertyValue(propertyType, value);
}
@@ -255,16 +244,7 @@ public final class PropertyValidatorTest extends AbstractBOTest
public final void testValidateControlledVocabularyPropertyValueFailed()
{
PropertyTypePE propertyType = createControlledVocabularyPropertyType();
- final VocabularyPE vocabulary = propertyType.getVocabulary();
final String value = "wrongValue";
- final String code = value.toUpperCase();
- context.checking(new Expectations()
- {
- {
- one(vocabularyDAO).tryFindVocabularyTermByCode(vocabulary, code);
- will(returnValue(null));
- }
- });
final PropertyValidator propertyValidator = createPropertyValidator();
try
{