very good! :) -Simo
http://people.apache.org/~simonetripodi/ http://simonetripodi.livejournal.com/ http://twitter.com/simonetripodi http://www.99soft.org/ On Thu, Feb 14, 2013 at 6:25 PM, <[email protected]> wrote: > Author: ash2k > Date: Thu Feb 14 17:25:14 2013 > New Revision: 1446277 > > URL: http://svn.apache.org/r1446277 > Log: > @trivial prefer JSR 330 annotations to Guice analogs, no functional > modifications > > Modified: > > incubator/onami/sandbox/validation/src/main/java/org/apache/onami/validation/Validate.java > > incubator/onami/sandbox/validation/src/main/java/org/apache/onami/validation/ValidationModule.java > > Modified: > incubator/onami/sandbox/validation/src/main/java/org/apache/onami/validation/Validate.java > URL: > http://svn.apache.org/viewvc/incubator/onami/sandbox/validation/src/main/java/org/apache/onami/validation/Validate.java?rev=1446277&r1=1446276&r2=1446277&view=diff > ============================================================================== > --- > incubator/onami/sandbox/validation/src/main/java/org/apache/onami/validation/Validate.java > (original) > +++ > incubator/onami/sandbox/validation/src/main/java/org/apache/onami/validation/Validate.java > Thu Feb 14 17:25:14 2013 > @@ -24,14 +24,13 @@ import java.lang.annotation.Retention; > import java.lang.annotation.RetentionPolicy; > import java.lang.annotation.Target; > > +import javax.inject.Qualifier; > import javax.validation.ConstraintViolationException; > > -import com.google.inject.BindingAnnotation; > - > /** > * Marker for methods which arguments have to be validated. > */ > -@BindingAnnotation > +@Qualifier > @Retention( RetentionPolicy.RUNTIME ) > @Target( { ElementType.METHOD } ) > public @interface Validate > > Modified: > incubator/onami/sandbox/validation/src/main/java/org/apache/onami/validation/ValidationModule.java > URL: > http://svn.apache.org/viewvc/incubator/onami/sandbox/validation/src/main/java/org/apache/onami/validation/ValidationModule.java?rev=1446277&r1=1446276&r2=1446277&view=diff > ============================================================================== > --- > incubator/onami/sandbox/validation/src/main/java/org/apache/onami/validation/ValidationModule.java > (original) > +++ > incubator/onami/sandbox/validation/src/main/java/org/apache/onami/validation/ValidationModule.java > Thu Feb 14 17:25:14 2013 > @@ -19,10 +19,10 @@ package org.apache.onami.validation; > * under the License. > */ > > -import static com.google.inject.Scopes.SINGLETON; > import static com.google.inject.matcher.Matchers.annotatedWith; > import static com.google.inject.matcher.Matchers.any; > > +import javax.inject.Singleton; > import javax.validation.ConstraintValidatorFactory; > import javax.validation.MessageInterpolator; > import javax.validation.TraversableResolver; > @@ -56,12 +56,12 @@ public final class ValidationModule > protected void configure() > { > // apache bval bootstrap > - bind( MessageInterpolator.class ).to( > DefaultMessageInterpolator.class ).in( SINGLETON ); > - bind( TraversableResolver.class ).to( > DefaultTraversableResolver.class ).in( SINGLETON ); > + bind( MessageInterpolator.class ).to( > DefaultMessageInterpolator.class ).in( Singleton.class ); > + bind( TraversableResolver.class ).to( > DefaultTraversableResolver.class ).in( Singleton.class ); > bind( ConstraintValidatorFactory.class ).to( > GuiceAwareConstraintValidatorFactory.class ); > - bind( new TypeLiteral<ValidationProvider<?>>(){} ).to( > ApacheValidationProvider.class ).in( SINGLETON ); > - bind( ConfigurationState.class ).toProvider( > ConfigurationStateProvider.class ).in( SINGLETON ); > - bind( ValidatorFactory.class ).toProvider( > ValidatorFactoryProvider.class ).in( SINGLETON ); > + bind( new TypeLiteral<ValidationProvider<?>>(){} ).to( > ApacheValidationProvider.class ).in( Singleton.class ); > + bind( ConfigurationState.class ).toProvider( > ConfigurationStateProvider.class ).in( Singleton.class ); > + bind( ValidatorFactory.class ).toProvider( > ValidatorFactoryProvider.class ).in( Singleton.class ); > bind( Validator.class ).toProvider( ValidatorProvider.class ); > > // AOP stuff > >
