Merge pull request #16 from mtakaki/mtakaki_upgrade_dw_fix_NPE

Upgrading to dropwizard 1.1.0 and fixing NPE thrown when there's a 404

README.md

@@ -25,6 +25,7 @@ These are the supported versions of dropwizard:
 | 0.9.X  | 0.0.6  |
 | 1.0.0  | 1.0.0  |
 | 1.0.5  | 1.0.5  |
+| 1.1.0  | 1.1.0  |
 
 ## Stand-alone
 

pom.xml

@@ -3,7 +3,7 @@
 
     <groupId>com.github.mtakaki</groupId>
     <artifactId>dropwizard-circuitbreaker</artifactId>
-    <version>1.0.6-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>dropwizard-circuitbreaker</name>
@@ -29,7 +29,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <dropwizard.version>1.0.5</dropwizard.version>
+        <dropwizard.version>1.1.0</dropwizard.version>
         <!-- Flaky test setting, re-run more 2 times in case of a failure -->
         <surefire.rerunFailingTestsCount>2</surefire.rerunFailingTestsCount>
     </properties>
@@ -57,7 +57,7 @@
             <groupId>io.dropwizard</groupId>
             <artifactId>dropwizard-core</artifactId>
             <version>${dropwizard.version}</version>
-            <optional>true</optional>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -78,21 +78,21 @@
         <dependency>
             <groupId>io.dropwizard.metrics</groupId>
             <artifactId>metrics-core</artifactId>
-            <version>3.1.2</version>
+            <version>3.2.2</version>
         </dependency>
 
         <!-- Avoids boilerplate code -->
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.16.10</version>
+            <version>1.16.12</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.4</version>
+            <version>3.5</version>
         </dependency>
 
         <!-- jUnit for unit testing -->
@@ -113,7 +113,7 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.5.2</version>
+            <version>3.6.1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -124,7 +124,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.5.1</version>
+                <version>3.6.1</version>
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>
@@ -160,7 +160,7 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.7.7.201606060606</version>
+                <version>0.7.8</version>
                 <executions>
                     <execution>
                         <id>prepare-agent</id>

src/main/java/com/github/mtakaki/dropwizard/circuitbreaker/jersey/CircuitBreakerApplicationEventListener.java

@@ -158,6 +158,11 @@ private void registerCircuitBreakerAnnotations(final List<ResourceMethod> resour
      *         {@code Optional.empty()} if it's not annotated.
      */
     private Optional<String> getCircuitBreakerName(final ResourceMethod resourceMethod) {
+        // Apparently resourceMethod can be null.
+        if (resourceMethod == null) {
+            return Optional.empty();
+        }
+
         try (Timer.Context context = this.requestOverheadTimer.time()) {
             final Invocable invocable = resourceMethod.getInvocable();
             Method method = invocable.getDefinitionMethod();

src/test/java/com/github/mtakaki/dropwizard/circuitbreaker/jersey/CircuitBreakerBundleInheritanceIntegrationTest.java

@@ -179,6 +179,18 @@ public void testCustomMeterCountIsIncremented() {
         assertThat(openCircuitMeter.getCount()).isEqualTo(beforeOpenCircuitCount);
     }
 
+    @Test
+    public void testInvalidURI() {
+        when(circuitBreakerManager.get().isCircuitOpen("custom")).thenReturn(false);
+
+        // An invalid URI should return 404 and not fail.
+        final Response response = client.target(
+                String.format("http://localhost:%d/wrong", this.RULE.getLocalPort()))
+                .request().get();
+
+        assertThat(response.getStatus()).isEqualTo(404);
+    }
+
     /**
      * Testing that when the circuit is open we should get 503 responses.
      */