JAMES-1868 DropWizardFactory should not be Configurable, otherwise Sp…

…ring fails
apache · Nov 30, 2016 · 7bcc620 · 7bcc620
1 parent 6c9c5e6
commit 7bcc620
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 10 deletions.
diff --git a/...e/guice-common/src/main/java/org/apache/james/modules/server/DropWizardMetricsModule.java b/...e/guice-common/src/main/java/org/apache/james/modules/server/DropWizardMetricsModule.java
@@ -50,25 +50,39 @@ protected void configure() {
     public static class DropWizardConfigurationPerformer implements ConfigurationPerformer {
         public static final HierarchicalConfiguration NO_CONFIGURATION = null;
 
-        private final DropWizardMetricFactory metricFactory;
+        private final DropWizardInitializer dropWizardInitializer;
 
         @Inject
-        public DropWizardConfigurationPerformer(DropWizardMetricFactory metricFactory) {
-            this.metricFactory = metricFactory;
+        public DropWizardConfigurationPerformer(DropWizardInitializer dropWizardInitializer) {
+            this.dropWizardInitializer = dropWizardInitializer;
         }
 
         @Override
         public void initModule() {
             try {
-                metricFactory.configure(NO_CONFIGURATION);
+                dropWizardInitializer.configure(NO_CONFIGURATION);
             } catch (ConfigurationException e) {
                 throw Throwables.propagate(e);
             }
         }
 
         @Override
         public List<Class<? extends Configurable>> forClasses() {
-            return ImmutableList.of(DropWizardMetricFactory.class);
+            return ImmutableList.of(DropWizardInitializer.class);
+        }
+    }
+
+    public static class DropWizardInitializer implements Configurable {
+        private final DropWizardMetricFactory dropWizardMetricFactory;
+
+        @Inject
+        public DropWizardInitializer(DropWizardMetricFactory dropWizardMetricFactory) {
+            this.dropWizardMetricFactory = dropWizardMetricFactory;
+        }
+
+        @Override
+        public void configure(HierarchicalConfiguration config) throws ConfigurationException {
+            dropWizardMetricFactory.start();
         }
     }
 

diff --git a/...dropwizard/src/main/java/org/apache/james/metrics/dropwizard/DropWizardMetricFactory.java b/...dropwizard/src/main/java/org/apache/james/metrics/dropwizard/DropWizardMetricFactory.java
@@ -22,15 +22,13 @@
 import javax.annotation.PreDestroy;
 
 import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.james.lifecycle.api.Configurable;
 import org.apache.james.metrics.api.Metric;
 import org.apache.james.metrics.api.MetricFactory;
 
 import com.codahale.metrics.JmxReporter;
 import com.codahale.metrics.MetricRegistry;
 
-public class DropWizardMetricFactory implements MetricFactory, Configurable {
+public class DropWizardMetricFactory implements MetricFactory {
 
     private final MetricRegistry metricRegistry;
     private final JmxReporter jmxReporter;
@@ -46,8 +44,7 @@ public Metric generate(String name) {
         return new DropWizardMetric(metricRegistry.counter(name));
     }
 
-    @Override
-    public void configure(HierarchicalConfiguration config) throws ConfigurationException {
+    public void start() throws ConfigurationException {
         jmxReporter.start();
     }