You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2008/10/22 19:41:02 UTC
svn commit: r707146 - in
/myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator:
./ baseval/metadata/transformer/ baseval/strategy/
Author: gpetracek
Date: Wed Oct 22 10:41:02 2008
New Revision: 707146
URL: http://svn.apache.org/viewvc?rev=707146&view=rev
Log:
extended jpa based validation
Modified:
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/JpaMetaDataTransformer.java
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/JpaValidationStrategy.java
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/jpa_strategy_mappings.properties
Modified: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/JpaMetaDataTransformer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/JpaMetaDataTransformer.java?rev=707146&r1=707145&r2=707146&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/JpaMetaDataTransformer.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/JpaMetaDataTransformer.java Wed Oct 22 10:41:02 2008
@@ -26,6 +26,7 @@
import javax.persistence.Basic;
import javax.persistence.Column;
+import javax.persistence.Id;
import java.util.HashMap;
import java.util.Map;
import java.lang.annotation.Annotation;
@@ -59,6 +60,10 @@
results.put(CommonMetaDataKeys.REQUIRED, true);
}
}
+ else if(annotation instanceof Id)
+ {
+ results.put(CommonMetaDataKeys.REQUIRED, true);
+ }
//TODO impl. the rest!!!
return results;
}
Modified: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/JpaValidationStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/JpaValidationStrategy.java?rev=707146&r1=707145&r2=707146&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/JpaValidationStrategy.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/JpaValidationStrategy.java Wed Oct 22 10:41:02 2008
@@ -31,6 +31,7 @@
import javax.persistence.Column;
import javax.persistence.ManyToOne;
import javax.persistence.OneToOne;
+import javax.persistence.Id;
import java.lang.annotation.Annotation;
/**
@@ -57,6 +58,10 @@
{
validateBasicAnnotation((Basic) annotation, convertedObject);
}
+ else if (annotation instanceof Id)
+ {
+ checkRequiredConvertedObject(convertedObject);
+ }
else if (annotation instanceof OneToOne)
{
validateOneToOneAnnotation((OneToOne) annotation, convertedObject);
@@ -67,8 +72,7 @@
}
}
- private void validateColumnAnnotation(Column column, Object convertedObject)
- throws ValidatorException
+ private void validateColumnAnnotation(Column column, Object convertedObject) throws ValidatorException
{
if (!column.nullable())
{
@@ -89,8 +93,7 @@
}
}
- private void validateBasicAnnotation(Basic basic, Object convertedObject)
- throws ValidatorException
+ private void validateBasicAnnotation(Basic basic, Object convertedObject) throws ValidatorException
{
if (!basic.optional())
{
@@ -98,8 +101,7 @@
}
}
- private void validateOneToOneAnnotation(OneToOne oneToOne,
- Object convertedObject)
+ private void validateOneToOneAnnotation(OneToOne oneToOne, Object convertedObject)
{
if (!oneToOne.optional())
{
@@ -107,8 +109,7 @@
}
}
- private void validateManyToOneAnnotation(ManyToOne manyToOne,
- Object convertedObject)
+ private void validateManyToOneAnnotation(ManyToOne manyToOne, Object convertedObject)
{
if (!manyToOne.optional())
{
@@ -117,8 +118,7 @@
}
@ToDo(Priority.MEDIUM)
- private void checkRequiredConvertedObject(Object convertedObject)
- throws ValidatorException
+ private void checkRequiredConvertedObject(Object convertedObject) throws ValidatorException
{
if (convertedObject == null || convertedObject.equals(""))
{
Modified: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/jpa_strategy_mappings.properties
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/jpa_strategy_mappings.properties?rev=707146&r1=707145&r2=707146&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/jpa_strategy_mappings.properties (original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/jpa_strategy_mappings.properties Wed Oct 22 10:41:02 2008
@@ -17,5 +17,6 @@
javax.persistence.Column=org.apache.myfaces.extensions.validator.baseval.strategy.JpaValidationStrategy
javax.persistence.Basic=org.apache.myfaces.extensions.validator.baseval.strategy.JpaValidationStrategy
+javax.persistence.Id=org.apache.myfaces.extensions.validator.baseval.strategy.JpaValidationStrategy
javax.persistence.OneToOne=org.apache.myfaces.extensions.validator.baseval.strategy.JpaValidationStrategy
javax.persistence.ManyToOne=org.apache.myfaces.extensions.validator.baseval.strategy.JpaValidationStrategy
\ No newline at end of file