Upgrade to Dropwizard 0.7.0

Author: moxie0

pom.xml

@@ -11,62 +11,78 @@
     <artifactId>BitHub</artifactId>
     <version>0.1</version>
 
+    <properties>
+        <dropwizard.version>0.7.0</dropwizard.version>
+    </properties>
+
     <dependencies>
         <dependency>
-            <groupId>com.yammer.dropwizard</groupId>
+            <groupId>io.dropwizard</groupId>
             <artifactId>dropwizard-core</artifactId>
-            <version>0.6.2</version>
+            <version>${dropwizard.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.yammer.metrics</groupId>
-            <artifactId>metrics-graphite</artifactId>
-            <version>2.2.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.yammer.dropwizard</groupId>
+            <groupId>io.dropwizard</groupId>
             <artifactId>dropwizard-auth</artifactId>
-            <version>0.6.2</version>
+            <version>${dropwizard.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.yammer.dropwizard</groupId>
+            <groupId>io.dropwizard</groupId>
             <artifactId>dropwizard-jdbi</artifactId>
-            <version>0.6.2</version>
+            <version>${dropwizard.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.yammer.dropwizard</groupId>
+            <groupId>io.dropwizard</groupId>
             <artifactId>dropwizard-client</artifactId>
-            <version>0.6.2</version>
+            <version>${dropwizard.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.yammer.dropwizard</groupId>
+            <groupId>io.dropwizard</groupId>
             <artifactId>dropwizard-migrations</artifactId>
-            <version>0.6.2</version>
+            <version>${dropwizard.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.yammer.dropwizard</groupId>
+            <groupId>io.dropwizard</groupId>
             <artifactId>dropwizard-testing</artifactId>
-            <version>0.6.2</version>
+            <version>${dropwizard.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.dropwizard</groupId>
+            <artifactId>dropwizard-metrics-graphite</artifactId>
+            <version>${dropwizard.version}</version>
         </dependency>
+        <dependency>
+            <groupId>io.dropwizard</groupId>
+            <artifactId>dropwizard-views</artifactId>
+            <version>${dropwizard.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.dropwizard</groupId>
+            <artifactId>dropwizard-servlets</artifactId>
+            <version>${dropwizard.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>com.sun.jersey</groupId>
             <artifactId>jersey-json</artifactId>
-            <version>1.17.1</version>
+            <version>1.18.1</version>
         </dependency>
+        <dependency>
+            <groupId>com.codahale.metrics</groupId>
+            <artifactId>metrics-graphite</artifactId>
+            <version>3.0.2</version>
+        </dependency>
+
         <dependency>
             <groupId>com.sun.jersey.contribs</groupId>
             <artifactId>jersey-multipart</artifactId>
-            <version>1.17.1</version>
+            <version>1.18.1</version>
         </dependency>
         <dependency>
             <groupId>commons-net</groupId>
             <artifactId>commons-net</artifactId>
             <version>3.2</version>
         </dependency>
-        <dependency>
-            <groupId>com.yammer.dropwizard</groupId>
-            <artifactId>dropwizard-views</artifactId>
-            <version>0.6.2</version>
-        </dependency>
         <dependency>
             <groupId>org.ocpsoft.prettytime</groupId>
             <artifactId>prettytime</artifactId>

src/main/java/org/whispersystems/bithub/BithubServerConfiguration.java

@@ -18,15 +18,15 @@
 package org.whispersystems.bithub;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.yammer.dropwizard.config.Configuration;
 import org.whispersystems.bithub.config.BithubConfiguration;
 import org.whispersystems.bithub.config.CoinbaseConfiguration;
 import org.whispersystems.bithub.config.GithubConfiguration;
-import org.whispersystems.bithub.config.WebhookConfiguration;
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
 
+import io.dropwizard.Configuration;
+
 public class BithubServerConfiguration extends Configuration {
 
   @Valid

src/main/java/org/whispersystems/bithub/BithubService.java

@@ -17,34 +17,36 @@
 
 package org.whispersystems.bithub;
 
-import com.yammer.dropwizard.Service;
-import com.yammer.dropwizard.auth.basic.BasicAuthProvider;
-import com.yammer.dropwizard.config.Bootstrap;
-import com.yammer.dropwizard.config.Environment;
-import com.yammer.dropwizard.views.ViewBundle;
+import org.eclipse.jetty.servlets.CrossOriginFilter;
 import org.whispersystems.bithub.auth.GithubWebhookAuthenticator;
 import org.whispersystems.bithub.client.CoinbaseClient;
 import org.whispersystems.bithub.client.GithubClient;
 import org.whispersystems.bithub.config.RepositoryConfiguration;
 import org.whispersystems.bithub.controllers.GithubController;
 import org.whispersystems.bithub.controllers.StatusController;
-import org.whispersystems.bithub.filters.CorsHeaderFilter;
 import org.whispersystems.bithub.mappers.IOExceptionMapper;
 import org.whispersystems.bithub.mappers.UnauthorizedHookExceptionMapper;
 
+import javax.servlet.DispatcherType;
 import java.math.BigDecimal;
+import java.util.EnumSet;
 import java.util.List;
 
+import io.dropwizard.Application;
+import io.dropwizard.auth.basic.BasicAuthProvider;
+import io.dropwizard.setup.Bootstrap;
+import io.dropwizard.setup.Environment;
+import io.dropwizard.views.ViewBundle;
+
 /**
  * The main entry point for the service.
  *
  * @author Moxie Marlinspike
  */
-public class BithubService extends Service<BithubServerConfiguration> {
+public class BithubService extends Application<BithubServerConfiguration> {
 
   @Override
   public void initialize(Bootstrap<BithubServerConfiguration> bootstrap) {
-    bootstrap.setName("bithub-server");
     bootstrap.addBundle(new ViewBundle());
   }
 
@@ -61,13 +63,15 @@ public void run(BithubServerConfiguration config, Environment environment)
     GithubClient                  githubClient       = new GithubClient(githubUser, githubToken);
     CoinbaseClient                coinbaseClient     = new CoinbaseClient(config.getCoinbaseConfiguration().getApiKey());
 
-    environment.addFilter(new CorsHeaderFilter(), "/v1/status/*");
-    environment.addResource(new GithubController(githubRepositories, githubClient, coinbaseClient, payoutRate));
-    environment.addResource(new StatusController(coinbaseClient, payoutRate));
-    environment.addProvider(new IOExceptionMapper());
-    environment.addProvider(new UnauthorizedHookExceptionMapper());
-    environment.addProvider(new BasicAuthProvider<>(
-      new GithubWebhookAuthenticator(githubWebhookUser, githubWebhookPwd), GithubWebhookAuthenticator.REALM));
+    environment.servlets().addFilter("CORS", CrossOriginFilter.class)
+               .addMappingForUrlPatterns(EnumSet.of(DispatcherType.REQUEST), true, "/*");
+    
+    environment.jersey().register(new GithubController(githubRepositories, githubClient, coinbaseClient, payoutRate));
+    environment.jersey().register(new StatusController(coinbaseClient, payoutRate));
+    environment.jersey().register(new IOExceptionMapper());
+    environment.jersey().register(new UnauthorizedHookExceptionMapper());
+    environment.jersey().register(new BasicAuthProvider<>(new GithubWebhookAuthenticator(githubWebhookUser, githubWebhookPwd),
+                                                          GithubWebhookAuthenticator.REALM));
   }
 
   public static void main(String[] args) throws Exception {

src/main/java/org/whispersystems/bithub/auth/GithubWebhookAuthenticator.java

@@ -1,8 +1,9 @@
 package org.whispersystems.bithub.auth;
 
 import com.google.common.base.Optional;
-import com.yammer.dropwizard.auth.Authenticator;
-import com.yammer.dropwizard.auth.basic.BasicCredentials;
+
+import io.dropwizard.auth.Authenticator;
+import io.dropwizard.auth.basic.BasicCredentials;
 
 /**
  * Accepts only one fixed username/password combination.

src/main/java/org/whispersystems/bithub/controllers/GithubController.java

@@ -17,9 +17,8 @@
 
 package org.whispersystems.bithub.controllers;
 
+import com.codahale.metrics.annotation.Timed;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.yammer.dropwizard.auth.Auth;
-import com.yammer.metrics.annotation.Timed;
 import org.apache.commons.net.util.SubnetUtils;
 import org.apache.commons.net.util.SubnetUtils.SubnetInfo;
 import org.slf4j.Logger;
@@ -52,6 +51,8 @@
 import java.util.Map;
 import java.util.Set;
 
+import io.dropwizard.auth.Auth;
+
 /**
  * Handles incoming API calls from GitHub.  These are currently only
  * PushEvent webhooks.

src/main/java/org/whispersystems/bithub/controllers/StatusController.java

@@ -17,7 +17,7 @@
 
 package org.whispersystems.bithub.controllers;
 
-import com.yammer.metrics.annotation.Timed;
+import com.codahale.metrics.annotation.Timed;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.bithub.client.CoinbaseClient;
@@ -87,12 +87,13 @@ public Response getCurrentCommitPrice(@QueryParam("format") @DefaultValue("png")
     CacheControl cacheControl = new CacheControl();
     cacheControl.setNoCache(true);
 
-    if (format.equals("json")) {
-      return Response.ok(cachedPaymentStatus.get().getEntity(), MediaType.APPLICATION_JSON_TYPE).cacheControl(cacheControl).build();
-    } else if (format.equals("png_small")) {
-      return Response.ok(cachedPaymentStatus.get().getSmallBadge(), "image/png").cacheControl(cacheControl).build();
-    } else {
-      return Response.ok(cachedPaymentStatus.get().getBadge(), "image/png").cacheControl(cacheControl).build();
+    switch (format) {
+      case "json":
+        return Response.ok(cachedPaymentStatus.get().getEntity(), MediaType.APPLICATION_JSON_TYPE).cacheControl(cacheControl).build();
+      case "png_small":
+        return Response.ok(cachedPaymentStatus.get().getSmallBadge(), "image/png").cacheControl(cacheControl).build();
+      default:
+        return Response.ok(cachedPaymentStatus.get().getBadge(), "image/png").cacheControl(cacheControl).build();
     }
   }
 

src/main/java/org/whispersystems/bithub/views/RecentTransactionsView.java

@@ -17,7 +17,6 @@
 
 package org.whispersystems.bithub.views;
 
-import com.yammer.dropwizard.views.View;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.bithub.entities.Transaction;
@@ -27,6 +26,8 @@
 import java.util.LinkedList;
 import java.util.List;
 
+import io.dropwizard.views.View;
+
 /**
  * A rendered HTML view of recent BitHub transactions.
  *