Update to Dropwizard 1.3.7 (#16)

dragonzone · Dec 13, 2018 · 93e0d6c · 93e0d6c
1 parent 245f947
commit 93e0d6c
Show file tree

Hide file tree

Showing 9 changed files with 86 additions and 71 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,18 +6,18 @@
     <parent>
         <groupId>zone.dragon</groupId>
         <artifactId>base-dropwizard-pom</artifactId>
-        <version>1.2.6-7d6623</version>
+        <version>1.3.10-2fe27d</version>
     </parent>
 
     <groupId>zone.dragon.dropwizard</groupId>
     <artifactId>dropwizard-hk2</artifactId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.3-SNAPSHOT</version>
 
     <name>Dropwizard :: HK2 Integration</name>
     <description>
         Adds support for Health Checks, LifeCycles, Metrics, and Tasks to be injected by HK2
     </description>
-    <url>https://code.dragon.zone/dragonzone/dropwizard-hk2</url>
+    <url>https://github.com/dragonzone/dropwizard-hk2</url>
 
     <scm>
         <connection>scm:git:http://github.com/dragonzone/dropwizard-hk2.git</connection>

diff --git a/src/main/java/zone/dragon/dropwizard/metrics/naming/filters/HttpMethodMetricNameFilter.java b/src/main/java/zone/dragon/dropwizard/metrics/naming/filters/HttpMethodMetricNameFilter.java
@@ -1,17 +1,17 @@
 package zone.dragon.dropwizard.metrics.naming.filters;
 
-import lombok.NonNull;
-import lombok.Setter;
-import zone.dragon.dropwizard.metrics.naming.MetricName;
-import zone.dragon.dropwizard.metrics.naming.MetricNameFilter;
+import java.lang.reflect.AnnotatedElement;
+import java.lang.reflect.Type;
 
 import javax.annotation.Priority;
 import javax.inject.Inject;
 import javax.inject.Provider;
 import javax.inject.Singleton;
 import javax.ws.rs.core.Request;
-import java.lang.reflect.AnnotatedElement;
-import java.lang.reflect.Type;
+
+import lombok.NonNull;
+import zone.dragon.dropwizard.metrics.naming.MetricName;
+import zone.dragon.dropwizard.metrics.naming.MetricNameFilter;
 
 import static com.google.common.base.Preconditions.checkState;
 
@@ -23,8 +23,6 @@
 public class HttpMethodMetricNameFilter extends RequestScopedMetricNameFilter {
     public static final String DEFAULT_TAG_NAME = "httpOp";
     private final String               tagName;
-    @NonNull
-    @Setter(onMethod = @__(@Inject))
     private       Provider<Request>    requestProvider;
 
     /**
@@ -55,5 +53,9 @@ public MetricName buildRequestScopedName(MetricName metricName, AnnotatedElement
         }
         return metricName.addTag(tagName, request.getMethod());
     }
+
+    public void setResourceInfoProvider(@NonNull Provider<Request> requestProvider) {
+        this.requestProvider = requestProvider;
+    }
 }
 
diff --git a/...ain/java/zone/dragon/dropwizard/metrics/naming/filters/RequestScopedMetricNameFilter.java b/...ain/java/zone/dragon/dropwizard/metrics/naming/filters/RequestScopedMetricNameFilter.java
@@ -1,32 +1,27 @@
 package zone.dragon.dropwizard.metrics.naming.filters;
 
-import lombok.NonNull;
-import lombok.Setter;
+import java.lang.reflect.AnnotatedElement;
+import java.lang.reflect.Type;
+
 import org.glassfish.hk2.api.Injectee;
 import org.glassfish.hk2.api.InstantiationData;
 import org.glassfish.hk2.api.InstantiationService;
 import org.glassfish.jersey.process.internal.RequestScope;
 import org.glassfish.jersey.process.internal.RequestScope.Instance;
 import org.glassfish.jersey.process.internal.RequestScoped;
+
+import lombok.NonNull;
 import zone.dragon.dropwizard.metrics.naming.MetricName;
 import zone.dragon.dropwizard.metrics.naming.MetricNameFilter;
 
-import javax.inject.Inject;
-import java.lang.reflect.AnnotatedElement;
-import java.lang.reflect.Type;
-
 import static com.google.common.base.Preconditions.checkState;
 
 /**
  * Filter that only runs when generating names for request-scoped metrics; Use this to avoid accessing request-scoped providers or
  * modifying metrics when outside of a request scope or the metric is being injected into a non-request-scoped object.
  */
 public abstract class RequestScopedMetricNameFilter implements MetricNameFilter {
-    @NonNull
-    @Setter(onMethod = @__(@Inject))
     private InstantiationService instantiationService;
-    @NonNull
-    @Setter(onMethod = @__(@Inject))
     private RequestScope         requestScope;
 
     @Override
@@ -51,6 +46,14 @@ public MetricName buildName(MetricName metricName, AnnotatedElement injectionSit
         return buildRequestScopedName(metricName, injectionSite, metricType);
     }
 
+    public void setResourceInfoProvider(@NonNull InstantiationService instantiationService) {
+        this.instantiationService = instantiationService;
+    }
+
+    public void setResourceInfoProvider(@NonNull RequestScope requestScope) {
+        this.requestScope = requestScope;
+    }
+
     /**
      * Updates the name or tags on a metric, or replaces them entirely
      *

diff --git a/...ain/java/zone/dragon/dropwizard/metrics/naming/filters/ResourceClassMetricNameFilter.java b/...ain/java/zone/dragon/dropwizard/metrics/naming/filters/ResourceClassMetricNameFilter.java
@@ -1,17 +1,17 @@
 package zone.dragon.dropwizard.metrics.naming.filters;
 
-import lombok.NonNull;
-import lombok.Setter;
-import zone.dragon.dropwizard.metrics.naming.MetricName;
-import zone.dragon.dropwizard.metrics.naming.MetricNameFilter;
+import java.lang.reflect.AnnotatedElement;
+import java.lang.reflect.Type;
 
 import javax.annotation.Priority;
 import javax.inject.Inject;
 import javax.inject.Provider;
 import javax.inject.Singleton;
 import javax.ws.rs.container.ResourceInfo;
-import java.lang.reflect.AnnotatedElement;
-import java.lang.reflect.Type;
+
+import lombok.NonNull;
+import zone.dragon.dropwizard.metrics.naming.MetricName;
+import zone.dragon.dropwizard.metrics.naming.MetricNameFilter;
 
 import static com.google.common.base.Preconditions.checkState;
 
@@ -23,8 +23,6 @@
 public class ResourceClassMetricNameFilter extends RequestScopedMetricNameFilter {
     public static final String DEFAULT_TAG_NAME = "resource";
     private final String                 tagName;
-    @NonNull
-    @Setter(onMethod = @__(@Inject))
     private       Provider<ResourceInfo> resourceInfoProvider;
 
     /**
@@ -56,5 +54,9 @@ public MetricName buildRequestScopedName(MetricName metricName, AnnotatedElement
         }
         return metricName.addTag(tagName, resourceInfo.getResourceClass().getSimpleName());
     }
+
+    public void setResourceInfoProvider(@NonNull Provider<ResourceInfo> resourceInfoProvider) {
+        this.resourceInfoProvider = resourceInfoProvider;
+    }
 }
 
diff --git a/...in/java/zone/dragon/dropwizard/metrics/naming/filters/ResourceMethodMetricNameFilter.java b/...in/java/zone/dragon/dropwizard/metrics/naming/filters/ResourceMethodMetricNameFilter.java
@@ -1,17 +1,17 @@
 package zone.dragon.dropwizard.metrics.naming.filters;
 
-import lombok.NonNull;
-import lombok.Setter;
-import zone.dragon.dropwizard.metrics.naming.MetricName;
-import zone.dragon.dropwizard.metrics.naming.MetricNameFilter;
+import java.lang.reflect.AnnotatedElement;
+import java.lang.reflect.Type;
 
 import javax.annotation.Priority;
 import javax.inject.Inject;
 import javax.inject.Provider;
 import javax.inject.Singleton;
 import javax.ws.rs.container.ResourceInfo;
-import java.lang.reflect.AnnotatedElement;
-import java.lang.reflect.Type;
+
+import lombok.NonNull;
+import zone.dragon.dropwizard.metrics.naming.MetricName;
+import zone.dragon.dropwizard.metrics.naming.MetricNameFilter;
 
 import static com.google.common.base.Preconditions.checkState;
 
@@ -23,8 +23,6 @@
 public class ResourceMethodMetricNameFilter extends RequestScopedMetricNameFilter {
     public static final String DEFAULT_TAG_NAME = "action";
     private final String                 tagName;
-    @NonNull
-    @Setter(onMethod = @__(@Inject))
     private       Provider<ResourceInfo> resourceInfoProvider;
 
     /**
@@ -55,5 +53,9 @@ public MetricName buildRequestScopedName(MetricName metricName, AnnotatedElement
         }
         return metricName.addTag(tagName, resourceInfo.getResourceMethod().getName());
     }
+
+    public void setResourceInfoProvider(@NonNull Provider<ResourceInfo> resourceInfoProvider) {
+        this.resourceInfoProvider = resourceInfoProvider;
+    }
 }
 
diff --git a/src/test/java/zone/dragon/dropwizard/metrics/CounterFactoryTest.java b/src/test/java/zone/dragon/dropwizard/metrics/CounterFactoryTest.java
@@ -1,28 +1,30 @@
 package zone.dragon.dropwizard.metrics;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.ws.rs.GET;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.core.MediaType;
+
+import org.glassfish.jersey.client.JerseyClientBuilder;
+import org.glassfish.jersey.client.JerseyWebTarget;
+import org.junit.ClassRule;
+import org.junit.Test;
+
 import com.codahale.metrics.Counter;
 import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.annotation.Counted;
 import com.codahale.metrics.annotation.Metric;
+
 import io.dropwizard.Application;
 import io.dropwizard.Configuration;
 import io.dropwizard.setup.Bootstrap;
 import io.dropwizard.setup.Environment;
 import io.dropwizard.testing.junit.DropwizardAppRule;
-import org.glassfish.jersey.client.JerseyClientBuilder;
-import org.glassfish.jersey.client.JerseyWebTarget;
-import org.junit.ClassRule;
-import org.junit.Test;
 import zone.dragon.dropwizard.HK2Bundle;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javax.ws.rs.GET;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.core.MediaType;
-
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class CounterFactoryTest {
@@ -89,7 +91,7 @@ public void testRelativeNamedCounterCreated() {
     public void testUnnamedCounterCreated() {
         int            result   = client.path("inc").request().get(Integer.class);
         MetricRegistry registry = RULE.getEnvironment().metrics();
-        assertThat(registry.getCounters()).containsKey("zone.dragon.dropwizard.metrics.CounterFactoryTest.CounterResource.arg0");
+        assertThat(registry.getCounters()).containsKey("zone.dragon.dropwizard.metrics.CounterFactoryTest.CounterResource.unnamedCounter");
     }
 
     @Test

diff --git a/src/test/java/zone/dragon/dropwizard/metrics/HistogramFactoryTest.java b/src/test/java/zone/dragon/dropwizard/metrics/HistogramFactoryTest.java
@@ -1,24 +1,26 @@
 package zone.dragon.dropwizard.metrics;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+import org.glassfish.jersey.client.JerseyClientBuilder;
+import org.glassfish.jersey.client.JerseyWebTarget;
+import org.junit.ClassRule;
+import org.junit.Test;
+
 import com.codahale.metrics.Histogram;
 import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.annotation.Metric;
+
 import io.dropwizard.Application;
 import io.dropwizard.Configuration;
 import io.dropwizard.setup.Bootstrap;
 import io.dropwizard.setup.Environment;
 import io.dropwizard.testing.junit.DropwizardAppRule;
-import org.glassfish.jersey.client.JerseyClientBuilder;
-import org.glassfish.jersey.client.JerseyWebTarget;
-import org.junit.ClassRule;
-import org.junit.Test;
 import zone.dragon.dropwizard.HK2Bundle;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class HistogramFactoryTest {
@@ -77,6 +79,6 @@ public void testRelativeNamedHistogramCreated() {
     public void testUnnamedHistogramCreated() {
         int            result   = client.path("inc").request().get(Integer.class);
         MetricRegistry registry = RULE.getEnvironment().metrics();
-        assertThat(registry.getHistograms()).containsKey("zone.dragon.dropwizard.metrics.HistogramFactoryTest.HistogramResource.arg0");
+        assertThat(registry.getHistograms()).containsKey("zone.dragon.dropwizard.metrics.HistogramFactoryTest.HistogramResource.unnamedHistogram");
     }
 }
diff --git a/src/test/java/zone/dragon/dropwizard/metrics/MeterFactoryTest.java b/src/test/java/zone/dragon/dropwizard/metrics/MeterFactoryTest.java
@@ -1,24 +1,26 @@
 package zone.dragon.dropwizard.metrics;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+import org.glassfish.jersey.client.JerseyClientBuilder;
+import org.glassfish.jersey.client.JerseyWebTarget;
+import org.junit.ClassRule;
+import org.junit.Test;
+
 import com.codahale.metrics.Meter;
 import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.annotation.Metric;
+
 import io.dropwizard.Application;
 import io.dropwizard.Configuration;
 import io.dropwizard.setup.Bootstrap;
 import io.dropwizard.setup.Environment;
 import io.dropwizard.testing.junit.DropwizardAppRule;
-import org.glassfish.jersey.client.JerseyClientBuilder;
-import org.glassfish.jersey.client.JerseyWebTarget;
-import org.junit.ClassRule;
-import org.junit.Test;
 import zone.dragon.dropwizard.HK2Bundle;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class MeterFactoryTest {
@@ -77,6 +79,6 @@ public void testRelativeNamedMeterCreated() {
     public void testUnnamedMeterCreated() {
         int            result   = client.path("inc").request().get(Integer.class);
         MetricRegistry registry = RULE.getEnvironment().metrics();
-        assertThat(registry.getMeters()).containsKey("zone.dragon.dropwizard.metrics.MeterFactoryTest.MeterResource.arg0");
+        assertThat(registry.getMeters()).containsKey("zone.dragon.dropwizard.metrics.MeterFactoryTest.MeterResource.unnamedMeter");
     }
 }
diff --git a/src/test/java/zone/dragon/dropwizard/metrics/TimerFactoryTest.java b/src/test/java/zone/dragon/dropwizard/metrics/TimerFactoryTest.java
@@ -88,7 +88,7 @@ public void testRelativeNamedTimerCreated() {
     public void testUnnamedTimerCreated() {
         int            result   = client.path("inc").request().get(Integer.class);
         MetricRegistry registry = RULE.getEnvironment().metrics();
-        assertThat(registry.getTimers()).containsKey("zone.dragon.dropwizard.metrics.TimerFactoryTest.TimerResource.arg0");
+        assertThat(registry.getTimers()).containsKey("zone.dragon.dropwizard.metrics.TimerFactoryTest.TimerResource.unnamedTimer");
     }
 
     @Test