Injecting Jersey request-scoped services

Author: vvondra

src/main/java/com/hubspot/dropwizard/guice/GuiceBundle.java

@@ -97,6 +97,7 @@ public void initialize(Bootstrap<?> bootstrap) {
         }
         modules.add(dropwizardEnvironmentModule);
         modules.add(new ServletModule());
+        modules.add(new JerseyGuiceModule(JerseyGuiceUtils.newServiceLocator()));
 
         initInjector();
         JerseyGuiceUtils.install(new ServiceLocatorGenerator() {
@@ -106,13 +107,13 @@ public ServiceLocator create(String name, ServiceLocator parent) {
                     return null;
                 }
 
-                return baseInjector.createChildInjector(new JerseyGuiceModule(name))
+                return baseInjector.createChildInjector()
                         .getInstance(ServiceLocator.class);
             }
         });
 
         if (autoConfig != null) {
-            autoConfig.initialize(bootstrap, baseInjector.createChildInjector(new JerseyGuiceModule(JerseyGuiceUtils.newServiceLocator())));
+            autoConfig.initialize(bootstrap, baseInjector.createChildInjector());
         }
     }
 
@@ -144,6 +145,6 @@ private void setEnvironment(final T configuration, final Environment environment
 
     public Injector getInjector() {
         Preconditions.checkState(baseInjector != null, "injector is only available after com.hubspot.dropwizard.guice.GuiceBundle.initialize() is called");
-        return baseInjector.createChildInjector(new JerseyGuiceModule(JerseyGuiceUtils.newServiceLocator()));
+        return baseInjector.createChildInjector();
     }
 }

src/test/java/com/hubspot/dropwizard/guice/GuiceBundleWithJerseyServicesTest.java

@@ -0,0 +1,56 @@
+package com.hubspot.dropwizard.guice;
+
+import com.google.inject.Injector;
+
+import com.codahale.metrics.MetricRegistry;
+import com.hubspot.dropwizard.guice.objects.JerseyServicesModule;
+import com.hubspot.dropwizard.guice.objects.TestModule;
+import com.squarespace.jersey2.guice.JerseyGuiceUtils;
+
+import org.junit.*;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+
+import javax.servlet.ServletException;
+
+import io.dropwizard.Configuration;
+import io.dropwizard.jackson.Jackson;
+import io.dropwizard.setup.Bootstrap;
+import io.dropwizard.setup.Environment;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+
+@RunWith(MockitoJUnitRunner.class)
+public class GuiceBundleWithJerseyServicesTest {
+
+    @Mock
+    Environment environment;
+
+    private GuiceBundle<Configuration> guiceBundle;
+
+    @After
+    public void tearDown() {
+        JerseyGuiceUtils.reset();
+    }
+
+    @Before
+    public void setUp() {
+        //given
+        environment = new Environment("test env", Jackson.newObjectMapper(), null, new MetricRegistry(), null);
+        guiceBundle = GuiceBundle.newBuilder()
+            .addModule(new JerseyServicesModule())
+            .build();
+        Bootstrap bootstrap = mock(Bootstrap.class);
+        guiceBundle.initialize(bootstrap);
+        guiceBundle.run(new Configuration(), environment);
+    }
+
+    @Test
+    public void createsInjectorWhenInit() throws ServletException {
+        //then
+        Injector injector = guiceBundle.getInjector();
+        assertThat(injector).isNotNull();
+    }
+}

src/test/java/com/hubspot/dropwizard/guice/objects/JerseyService.java

@@ -0,0 +1,16 @@
+package com.hubspot.dropwizard.guice.objects;
+
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+
+import javax.ws.rs.core.SecurityContext;
+
+public class JerseyService {
+
+    private final Provider<SecurityContext> securityContextProvider;
+
+    @Inject
+    public JerseyService(Provider<SecurityContext> securityContextProvider) {
+        this.securityContextProvider = securityContextProvider;
+    }
+}

src/test/java/com/hubspot/dropwizard/guice/objects/JerseyServicesModule.java

@@ -0,0 +1,11 @@
+package com.hubspot.dropwizard.guice.objects;
+
+import com.google.inject.AbstractModule;
+
+public class JerseyServicesModule extends AbstractModule {
+
+    @Override
+    protected void configure() {
+        bind(JerseyService.class);
+    }
+}