Use seed 3.0.1

seedstack · Jan 13, 2017 · 318ee24 · 318ee24
1 parent d69388e
commit 318ee24
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 43 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,3 @@
+# Version 1.0.0 (2017-01-13)
+
+* [new] Initial version (copied from seed).
diff --git a/pom.xml b/pom.xml
@@ -7,21 +7,22 @@
     file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.seedstack.poms</groupId>
         <artifactId>parent-internal</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>3.0.0</version>
     </parent>
 
     <groupId>org.seedstack.addons.metrics</groupId>
     <artifactId>metrics</artifactId>
     <version>1.0.0-SNAPSHOT</version>
 
     <properties>
-        <seed.version>3.0.0-SNAPSHOT</seed.version>
+        <seed.version>3.0.1</seed.version>
         <metrics.version>3.1.2</metrics.version>
 
         <compatibility.skip>true</compatibility.skip>
@@ -65,19 +66,6 @@
                         </licenseMerges>
                     </configuration>
                 </plugin>
-                <plugin>
-                    <groupId>com.github.siom79.japicmp</groupId>
-                    <artifactId>japicmp-maven-plugin</artifactId>
-                    <configuration>
-                        <parameter>
-                            <excludes>
-                                <exclude>*.internal.*</exclude>
-                                <exclude>org.seedstack.metrics.OracleSequenceHandler</exclude>
-                                <exclude>org.seedstack.metrics.BaseJpaRepository</exclude>
-                            </excludes>
-                        </parameter>
-                    </configuration>
-                </plugin>
             </plugins>
         </pluginManagement>
     </build>

diff --git a/src/it/java/org/seedstack/metrics/fixtures/InjectedHealthCheck.java b/src/it/java/org/seedstack/metrics/fixtures/InjectedHealthCheck.java
@@ -8,13 +8,13 @@
 package org.seedstack.metrics.fixtures;
 
 import com.codahale.metrics.health.HealthCheck;
-import org.seedstack.seed.DiagnosticManager;
+import org.seedstack.seed.diagnostic.DiagnosticManager;
 
 import javax.inject.Inject;
 
 public class InjectedHealthCheck extends HealthCheck {
     @Inject
-    DiagnosticManager diagnosticManager;
+    private DiagnosticManager diagnosticManager;
 
     @Override
     protected Result check() throws Exception {

diff --git a/src/main/java/org/seedstack/metrics/internal/HealthCommand.java b/src/main/java/org/seedstack/metrics/internal/HealthCommand.java
@@ -11,9 +11,9 @@
 import com.codahale.metrics.health.HealthCheckRegistry;
 import com.google.common.collect.ImmutableMap;
 import org.fusesource.jansi.Ansi;
-import org.seedstack.seed.spi.command.CommandDefinition;
-import org.seedstack.seed.spi.command.Option;
-import org.seedstack.seed.spi.command.PrettyCommand;
+import org.seedstack.seed.command.CommandDefinition;
+import org.seedstack.seed.command.Option;
+import org.seedstack.seed.command.PrettyCommand;
 
 import javax.inject.Inject;
 import java.util.Map;

diff --git a/src/main/java/org/seedstack/metrics/internal/MetricsErrorCode.java b/src/main/java/org/seedstack/metrics/internal/MetricsErrorCode.java
@@ -7,15 +7,12 @@
  */
 package org.seedstack.metrics.internal;
 
-import org.seedstack.seed.ErrorCode;
+import org.seedstack.shed.exception.ErrorCode;
 
-/**
- * Enumerates error codes of metrics support.
- */
-public enum MetricsErrorCode implements ErrorCode {
+enum MetricsErrorCode implements ErrorCode {
     ERROR_ACCESSING_METRIC_FIELD,
-    INVALID_METRIC_TYPE,
     ERROR_EVALUATING_METRIC,
-    METRICS_REGISTRY_NOT_FOUND,
-    HEALTH_CHECK_REGISTRY_NOT_FOUND
+    HEALTH_CHECK_REGISTRY_NOT_FOUND,
+    INVALID_METRIC_TYPE,
+    METRICS_REGISTRY_NOT_FOUND
 }
diff --git a/src/main/java/org/seedstack/metrics/internal/MetricsPlugin.java b/src/main/java/org/seedstack/metrics/internal/MetricsPlugin.java
@@ -15,11 +15,11 @@
 import io.nuun.kernel.api.plugin.context.Context;
 import io.nuun.kernel.api.plugin.context.InitContext;
 import io.nuun.kernel.api.plugin.request.ClasspathScanRequest;
-import io.nuun.kernel.core.AbstractPlugin;
-import org.seedstack.seed.core.internal.CorePlugin;
-import org.seedstack.seed.core.internal.metrics.HealthcheckProvider;
-import org.seedstack.seed.core.internal.metrics.MetricsProvider;
 import org.seedstack.seed.SeedException;
+import org.seedstack.seed.core.internal.AbstractSeedPlugin;
+import org.seedstack.seed.core.internal.dependency.DependencyPlugin;
+import org.seedstack.seed.core.internal.metrics.HealthCheckProvider;
+import org.seedstack.seed.core.internal.metrics.MetricsProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -33,7 +33,7 @@
 /**
  * This plugin provides support for the Metrics monitoring library (https://dropwizard.github.io/metrics/).
  */
-public class MetricsPlugin extends AbstractPlugin {
+public class MetricsPlugin extends AbstractSeedPlugin {
     private static final Logger LOGGER = LoggerFactory.getLogger(MetricsPlugin.class);
 
     private MetricRegistry metricRegistry;
@@ -48,17 +48,23 @@ public String name() {
         return "metrics";
     }
 
+    @Override
+    public Collection<Class<?>> dependencies() {
+        return Lists.newArrayList(DependencyPlugin.class);
+    }
+
     @Override
     @SuppressWarnings("unchecked")
-    public InitState init(InitContext initContext) {
-        CorePlugin corePlugin = initContext.dependency(CorePlugin.class);
-        Optional<MetricsProvider> metricsProvider = corePlugin.getDependency(MetricsProvider.class);
+    public InitState initialize(InitContext initContext) {
+        DependencyPlugin dependency = initContext.dependency(DependencyPlugin.class);
+        Optional<MetricsProvider> metricsProvider = dependency.getDependency(MetricsProvider.class);
+        ;
         if (!metricsProvider.isPresent()) {
             throw SeedException.createNew(MetricsErrorCode.METRICS_REGISTRY_NOT_FOUND);
         }
         metricRegistry = metricsProvider.get().getMetricRegistry();
 
-        Optional<HealthcheckProvider> healthCheckProvider = corePlugin.getDependency(HealthcheckProvider.class);
+        Optional<HealthCheckProvider> healthCheckProvider = dependency.getDependency(HealthCheckProvider.class);
         if (!healthCheckProvider.isPresent()) {
             throw SeedException.createNew(MetricsErrorCode.HEALTH_CHECK_REGISTRY_NOT_FOUND);
         }
@@ -85,11 +91,6 @@ public void start(Context context) {
         }
     }
 
-    @Override
-    public Collection<Class<?>> requiredPlugins() {
-        return Lists.<Class<?>>newArrayList(CorePlugin.class);
-    }
-
     @Override
     public Collection<ClasspathScanRequest> classpathScanRequests() {
         return classpathScanRequestBuilder().subtypeOf(HealthCheck.class).build();