Migrate to dropwizard 2.0.0

gradle.properties

@@ -1,4 +1,4 @@
 hk2bundleVersion=develop-SNAPSHOT
-dropwizardVersion=1.3.5
-hk2Version=2.5.0-b32
+dropwizardVersion=2.0.0
+hk2Version=2.6.1
 junitVersion=4.12

src/main/java/net/winterly/dropwizard/hk2bundle/HK2Bundle.java

@@ -7,6 +7,7 @@
 import com.codahale.metrics.health.HealthCheckRegistry;
 import io.dropwizard.Application;
 import io.dropwizard.Bundle;
+import io.dropwizard.Configuration;
 import io.dropwizard.ConfiguredBundle;
 import io.dropwizard.cli.Command;
 import io.dropwizard.lifecycle.Managed;
@@ -25,7 +26,7 @@
 
 import static org.glassfish.hk2.utilities.ServiceLocatorUtilities.*;
 
-public class HK2Bundle implements Bundle {
+public class HK2Bundle implements ConfiguredBundle<Configuration> {
 
     /**
      * Used to generate unique incremental IDs for ServiceLocator name
@@ -60,7 +61,7 @@ public void initialize(Bootstrap<?> bootstrap) {
     }
 
     @Override
-    public void run(Environment environment) {
+    public void run(Configuration configuration, Environment environment) throws Exception {
         addOneConstant(serviceLocator, environment);
         addOneConstant(serviceLocator, environment.jersey());
         addOneConstant(serviceLocator, environment.admin());

src/main/java/net/winterly/dropwizard/hk2bundle/jdbi/JDBIBinder.java

@@ -3,6 +3,7 @@
 import io.dropwizard.Configuration;
 import io.dropwizard.db.DatabaseConfiguration;
 import org.glassfish.hk2.api.Factory;
+import org.glassfish.hk2.api.TypeLiteral;
 import org.glassfish.hk2.utilities.binding.AbstractBinder;
 import org.jdbi.v3.core.Jdbi;
 
@@ -22,7 +23,7 @@ public class JDBIBinder<T extends Configuration> extends AbstractBinder {
     private Class<? extends Factory<Jdbi>> dbiFactory = JDBIFactory.class;
     private Class<? extends Factory<Object>> sqlObjectFactory = SqlObjectFactory.class;
 
-    private DatabaseConfiguration databaseConfiguration;
+    private DatabaseConfiguration<T> databaseConfiguration;
     private HashSet<Class<?>> sqlInterfaces = new HashSet<>();
 
     /**
@@ -69,7 +70,7 @@ public JDBIBinder<T> register(Class<?>... interfaces) {
 
     @Override
     protected void configure() {
-        bind(databaseConfiguration).to(DatabaseConfiguration.class);
+        bind(databaseConfiguration).to(new TypeLiteral<DatabaseConfiguration<Configuration>>() {});
 
         addActiveFactoryDescriptor(dbiFactory);
         addActiveFactoryDescriptor(HandleFactory.class);

src/main/java/net/winterly/dropwizard/hk2bundle/spi/DropwizardBinder.java

@@ -32,13 +32,13 @@ public <T extends Bundle> ScopedBindingBuilder<T> bundle(T bundle) {
                 .to(Bundle.class);
     }
 
-    public <T extends ConfiguredBundle> ScopedBindingBuilder<T> configuredBundle(Class<T> configuredBundle) {
+    public <T extends ConfiguredBundle<?>> ScopedBindingBuilder<T> configuredBundle(Class<T> configuredBundle) {
         return bindAsContract(configuredBundle)
                 .to(ConfiguredBundle.class)
                 .in(Singleton.class);
     }
 
-    public <T extends ConfiguredBundle> ScopedBindingBuilder<T> configuredBundle(T configuredBundle) {
+    public <T extends ConfiguredBundle<?>> ScopedBindingBuilder<T> configuredBundle(T configuredBundle) {
         return bind(configuredBundle)
                 .to(ConfiguredBundle.class);
     }

src/main/java/net/winterly/dropwizard/hk2bundle/validation/InjectValidatorBundle.java

@@ -1,6 +1,8 @@
 package net.winterly.dropwizard.hk2bundle.validation;
 
 import io.dropwizard.Bundle;
+import io.dropwizard.Configuration;
+import io.dropwizard.ConfiguredBundle;
 import io.dropwizard.jersey.validation.Validators;
 import io.dropwizard.setup.Bootstrap;
 import io.dropwizard.setup.Environment;
@@ -12,7 +14,7 @@
 import javax.validation.ValidatorFactory;
 import javax.ws.rs.container.ResourceContext;
 
-public class InjectValidatorBundle implements Bundle {
+public class InjectValidatorBundle implements ConfiguredBundle<Configuration> {
 
     private ConstraintValidatorFactory validatorFactory = new ConstraintValidatorFactoryImpl();
 
@@ -26,7 +28,7 @@ public void initialize(Bootstrap<?> bootstrap) {
     }
 
     @Override
-    public void run(Environment environment) {
+    public void run(Configuration configuration, Environment environment) {
         GetLocatorFeature getLocatorFeature = new GetLocatorFeature(serviceLocator -> {
             ResourceContext resourceContext = serviceLocator.getService(ResourceContext.class);
             validatorFactory = resourceContext.getResource(InjectingConstraintValidatorFactory.class);