Expose the Validator for extension.

Author: codahale

dropwizard-client/src/main/java/com/yammer/dropwizard/client/JerseyClientBuilder.java

@@ -11,6 +11,7 @@
 import com.sun.jersey.client.apache4.config.DefaultApacheHttpClient4Config;
 import com.yammer.dropwizard.config.Environment;
 import com.yammer.dropwizard.jersey.JacksonMessageBodyProvider;
+import com.yammer.dropwizard.validation.Validator;
 import org.apache.http.conn.DnsResolver;
 import org.apache.http.conn.scheme.SchemeRegistry;
 
@@ -46,6 +47,7 @@ public class JerseyClientBuilder {
     private Environment environment;
     private ObjectMapper objectMapper;
     private ExecutorService executorService;
+    private Validator validator = new Validator();
 
     /**
      * Adds the given object as a Jersey provider.
@@ -116,6 +118,7 @@ public JerseyClientBuilder using(JerseyClientConfiguration configuration) {
      */
     public JerseyClientBuilder using(Environment environment) {
         this.environment = environment;
+        this.validator = environment.getValidator();
         return this;
     }
 
@@ -141,6 +144,17 @@ public JerseyClientBuilder using(SchemeRegistry registry) {
         return this;
     }
 
+    /**
+     * Use the given {@link Validator} instance.
+     *
+     * @param validator a {@link Validator} instance
+     * @return {@code this}
+     */
+    public JerseyClientBuilder using(Validator validator) {
+        this.validator = validator;
+        return this;
+    }
+
     /**
      * Uses the given {@link ExecutorService} and {@link ObjectMapper}.
      *
@@ -197,7 +211,7 @@ private ApacheHttpClient4Handler buildHandler() {
     private ApacheHttpClient4Config buildConfig(ObjectMapper objectMapper) {
         final ApacheHttpClient4Config config = new DefaultApacheHttpClient4Config();
         config.getSingletons().addAll(singletons);
-        config.getSingletons().add(new JacksonMessageBodyProvider(objectMapper));
+        config.getSingletons().add(new JacksonMessageBodyProvider(objectMapper, validator));
         config.getClasses().addAll(providers);
         config.getFeatures().putAll(features);
         config.getProperties().putAll(properties);

dropwizard-core/src/main/java/com/yammer/dropwizard/cli/ConfiguredCommand.java

@@ -74,9 +74,7 @@ private T parseConfiguration(String filename,
                                  Class<T> configurationClass,
                                  ObjectMapperFactory objectMapperFactory) throws IOException, ConfigurationException {
         final ConfigurationFactory<T> configurationFactory =
-                ConfigurationFactory.forClass(configurationClass,
-                                              new Validator(),
-                                              objectMapperFactory);
+                ConfigurationFactory.forClass(configurationClass, new Validator(), objectMapperFactory);
         if (filename != null) {
             final File file = new File(filename);
             if (!file.exists()) {

dropwizard-core/src/main/java/com/yammer/dropwizard/cli/EnvironmentCommand.java

@@ -4,6 +4,7 @@
 import com.yammer.dropwizard.config.Bootstrap;
 import com.yammer.dropwizard.config.Configuration;
 import com.yammer.dropwizard.config.Environment;
+import com.yammer.dropwizard.validation.Validator;
 import net.sourceforge.argparse4j.inf.Namespace;
 
 /**
@@ -31,7 +32,8 @@ protected EnvironmentCommand(Service<T> service, String name, String description
     protected final void run(Bootstrap<T> bootstrap, Namespace namespace, T configuration) throws Exception {
         final Environment environment = new Environment(bootstrap.getName(),
                                                         configuration,
-                                                        bootstrap.getObjectMapperFactory().copy());
+                                                        bootstrap.getObjectMapperFactory().copy(),
+                                                        new Validator());
         bootstrap.runWithBundles(configuration, environment);
         service.run(configuration, environment);
         run(environment, namespace, configuration);

dropwizard-core/src/main/java/com/yammer/dropwizard/cli/ServerCommand.java

@@ -7,6 +7,7 @@
 import com.yammer.dropwizard.config.Environment;
 import com.yammer.dropwizard.config.ServerFactory;
 import com.yammer.dropwizard.lifecycle.ServerLifecycleListener;
+import com.yammer.dropwizard.validation.Validator;
 import net.sourceforge.argparse4j.inf.Namespace;
 import org.eclipse.jetty.server.Server;
 import org.slf4j.Logger;

dropwizard-core/src/main/java/com/yammer/dropwizard/config/Environment.java

@@ -16,6 +16,7 @@
 import com.yammer.dropwizard.lifecycle.ServerLifecycleListener;
 import com.yammer.dropwizard.tasks.GarbageCollectionTask;
 import com.yammer.dropwizard.tasks.Task;
+import com.yammer.dropwizard.validation.Validator;
 import com.yammer.metrics.core.HealthCheck;
 import org.eclipse.jetty.server.session.SessionHandler;
 import org.eclipse.jetty.servlet.FilterHolder;
@@ -66,6 +67,7 @@ public class Environment extends AbstractLifeCycle {
     private final ObjectMapperFactory objectMapperFactory;
     private SessionHandler sessionHandler;
     private ServletContainer jerseyServletContainer;
+    private Validator validator;
 
     private ServerLifecycleListener serverListener;
 
@@ -78,10 +80,12 @@ public class Environment extends AbstractLifeCycle {
      */
     public Environment(String name,
                        Configuration configuration,
-                       ObjectMapperFactory objectMapperFactory) {
+                       ObjectMapperFactory objectMapperFactory,
+                       Validator validator) {
         this.name = name;
         this.configuration = configuration;
         this.objectMapperFactory = objectMapperFactory;
+        this.validator = validator;
         this.config = new DropwizardResourceConfig(false) {
             @Override
             public void validate() {
@@ -381,9 +385,17 @@ public ScheduledExecutorService managedScheduledExecutorService(String nameForma
         return executor;
     }
 
+    public Validator getValidator() {
+        return validator;
+    }
+
+    public void setValidator(Validator validator) {
+        this.validator = checkNotNull(validator);
+    }
+
     /*
-     * Internal Accessors
-     */
+    * Internal Accessors
+    */
 
     ImmutableSet<HealthCheck> getHealthChecks() {
         return healthChecks.build();

dropwizard-core/src/main/java/com/yammer/dropwizard/jersey/JacksonMessageBodyProvider.java

@@ -30,15 +30,15 @@
  */
 @Provider
 public class JacksonMessageBodyProvider extends JacksonJaxbJsonProvider {
-    private static final Validator VALIDATOR = new Validator();
-
     /**
      * The default group array used in case any of the validate methods is called without a group.
      */
     private static final Class<?>[] DEFAULT_GROUP_ARRAY = new Class<?>[]{ Default.class };
     private final ObjectMapper mapper;
+    private final Validator validator;
 
-    public JacksonMessageBodyProvider(ObjectMapper mapper) {
+    public JacksonMessageBodyProvider(ObjectMapper mapper, Validator validator) {
+        this.validator = validator;
         this.mapper = mapper;
         setMapper(mapper);
     }
@@ -70,7 +70,7 @@ private Object validate(Annotation[] annotations, Object value) {
         final Class<?>[] classes = findValidationGroups(annotations);
 
         if (classes != null) {
-            final ImmutableList<String> errors = VALIDATOR.validate(value, classes);
+            final ImmutableList<String> errors = validator.validate(value, classes);
             if (!errors.isEmpty()) {
                 throw new InvalidEntityException("The request entity had the following errors:",
                                                  errors);

dropwizard-core/src/main/java/com/yammer/dropwizard/json/JsonBundle.java

@@ -16,6 +16,7 @@ public void initialize(Bootstrap<?> bootstrap) {
 
     @Override
     public void run(Environment environment) {
-        environment.addProvider(new JacksonMessageBodyProvider(environment.getObjectMapperFactory().build()));
+        environment.addProvider(new JacksonMessageBodyProvider(environment.getObjectMapperFactory().build(),
+                                                               environment.getValidator()));
     }
 }

dropwizard-core/src/main/java/com/yammer/dropwizard/validation/Validator.java

@@ -18,7 +18,15 @@
  * A simple façade for Hibernate Validator.
  */
 public class Validator {
-    private final ValidatorFactory factory = Validation.buildDefaultValidatorFactory();
+    private final ValidatorFactory factory;
+
+    public Validator() {
+        this(Validation.buildDefaultValidatorFactory());
+    }
+
+    public Validator(ValidatorFactory factory) {
+        this.factory = factory;
+    }
 
     /**
      * Validates the given object, and returns a list of error messages, if any. If the returned

dropwizard-core/src/test/java/com/yammer/dropwizard/config/tests/EnvironmentTest.java

@@ -3,6 +3,7 @@
 import com.yammer.dropwizard.config.Configuration;
 import com.yammer.dropwizard.config.Environment;
 import com.yammer.dropwizard.json.ObjectMapperFactory;
+import com.yammer.dropwizard.validation.Validator;
 import org.junit.Test;
 import org.slf4j.bridge.SLF4JBridgeHandler;
 
@@ -17,13 +18,18 @@ public class EnvironmentTest {
     @Test
     @SuppressWarnings("unchecked")
     public void scanPackagesHandlesEmptyArgumentList() {
-        new Environment("", mock(Configuration.class), mock(ObjectMapperFactory.class)).scanPackagesForResourcesAndProviders();
+        new Environment("",
+                        mock(Configuration.class),
+                        mock(ObjectMapperFactory.class),
+                        new Validator()).scanPackagesForResourcesAndProviders();
     }
 
     @Test(expected = NullPointerException.class)
     @SuppressWarnings("unchecked")
     public void scanPackagesThrowsNpeOnNullArgument() {
-        new Environment("", mock(Configuration.class), mock(ObjectMapperFactory.class)).scanPackagesForResourcesAndProviders(
-                (Class<?>[]) null);
+        new Environment("",
+                        mock(Configuration.class),
+                        mock(ObjectMapperFactory.class),
+                        new Validator()).scanPackagesForResourcesAndProviders((Class<?>[]) null);
     }
 }

dropwizard-core/src/test/java/com/yammer/dropwizard/jersey/tests/JacksonMessageBodyProviderTest.java

@@ -10,6 +10,7 @@
 import com.yammer.dropwizard.json.ObjectMapperFactory;
 import com.yammer.dropwizard.validation.InvalidEntityException;
 import com.yammer.dropwizard.validation.Validated;
+import com.yammer.dropwizard.validation.Validator;
 import org.junit.Test;
 
 import javax.validation.Valid;
@@ -59,7 +60,8 @@ public static interface NonIgnorable extends Ignorable {
     }
 
     private final ObjectMapper mapper = spy(new ObjectMapperFactory().build());
-    private final JacksonMessageBodyProvider provider = new JacksonMessageBodyProvider(mapper);
+    private final JacksonMessageBodyProvider provider = new JacksonMessageBodyProvider(mapper,
+                                                                                       new Validator());
 
     @Test
     public void readsDeserializableTypes() throws Exception {