bval-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mben...@apache.org
Subject svn commit: r993528 - in /incubator/bval/trunk: ./ bval-jsr303/src/main/java/org/apache/bval/jsr303/ApacheFactoryContext.java bval-jsr303/src/main/java/org/apache/bval/jsr303/Jsr303MetaBeanFactory.java
Date Tue, 07 Sep 2010 20:49:12 GMT
Author: mbenson
Date: Tue Sep  7 20:49:12 2010
New Revision: 993528

URL: http://svn.apache.org/viewvc?rev=993528&view=rev
Log:
merge small tweaks from lang3 sandbox

Modified:
    incubator/bval/trunk/   (props changed)
    incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/ApacheFactoryContext.java
    incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/Jsr303MetaBeanFactory.java

Propchange: incubator/bval/trunk/
------------------------------------------------------------------------------
    svn:mergeinfo = /incubator/bval/sandbox/lang3-work:993515-993522

Modified: incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/ApacheFactoryContext.java
URL: http://svn.apache.org/viewvc/incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/ApacheFactoryContext.java?rev=993528&r1=993527&r2=993528&view=diff
==============================================================================
--- incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/ApacheFactoryContext.java
(original)
+++ incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/ApacheFactoryContext.java
Tue Sep  7 20:49:12 2010
@@ -46,7 +46,7 @@ public class ApacheFactoryContext implem
      */
     public ApacheFactoryContext(ApacheValidatorFactory factory) {
         this.factory = factory;
-        this.metaBeanFinder = buildMetaBeanManager();
+        this.metaBeanFinder = buildMetaBeanFinder();
     }
 
     /**
@@ -54,6 +54,9 @@ public class ApacheFactoryContext implem
      * 
      * @param factory
      * @param metaBeanFinder
+     * @deprecated does anyone need this?  If the default {@link ApacheFactoryContext}
+     * uses a {@link Jsr303MetaBeanFactory}, which circularly refers to its owning {@link
ApacheFactoryContext},
+     * it follows that this constructor can't be conveniently used with a {@link Jsr303MetaBeanFactory}.
      */
     protected ApacheFactoryContext(ApacheValidatorFactory factory, MetaBeanFinder metaBeanFinder)
{
         this.factory = factory;
@@ -150,7 +153,7 @@ public class ApacheFactoryContext implem
      * @return a new instance of MetaBeanManager with adequate MetaBeanFactories
      */
     @SuppressWarnings("deprecation")
-    protected MetaBeanManager buildMetaBeanManager() {
+    protected MetaBeanFinder buildMetaBeanFinder() {
         List<MetaBeanFactory> builders = new ArrayList<MetaBeanFactory>(2);
         if (Boolean.parseBoolean(factory.getProperties().get(
             ApacheValidatorConfiguration.Properties.ENABLE_INTROSPECTOR))) {

Modified: incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/Jsr303MetaBeanFactory.java
URL: http://svn.apache.org/viewvc/incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/Jsr303MetaBeanFactory.java?rev=993528&r1=993527&r2=993528&view=diff
==============================================================================
--- incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/Jsr303MetaBeanFactory.java
(original)
+++ incubator/bval/trunk/bval-jsr303/src/main/java/org/apache/bval/jsr303/Jsr303MetaBeanFactory.java
Tue Sep  7 20:49:12 2010
@@ -240,11 +240,11 @@ public class Jsr303MetaBeanFactory imple
                           meta.getAccessStrategy().getJavaType());
                 }
             }
-            Class<? extends ConstraintValidator<? extends Annotation, ?>>[] constraintClasses
=
+            Class<? extends ConstraintValidator<? extends Annotation, ?>>[] validatorClasses
=
                   findConstraintValidatorClasses(meta.getAnnotation(), null);
             applyConstraint(
                     (Annotation) meta.getAnnotation(),
-                    (Class<? extends ConstraintValidator<Annotation, ?>>[]) constraintClasses,
+                    (Class<? extends ConstraintValidator<Annotation, ?>>[]) validatorClasses,
                     metaProperty, beanClass, meta.getAccessStrategy(),
                     new AppendValidationToMeta(metaProperty == null ? metabean
                             : metaProperty));
@@ -421,10 +421,6 @@ public class Jsr303MetaBeanFactory imple
      * @throws IllegalAccessException
      * @throws InvocationTargetException
      */
-    /*
-     * @throws IllegalAccessException
-     * @throws InvocationTargetException
-     */
     protected <A extends Annotation> boolean applyConstraint(A annotation,
                                       Class<? extends ConstraintValidator<A, ?>>[]
constraintClasses,
                                       MetaProperty prop, Class<?> owner, AccessStrategy
access,



Mime
View raw message