Make all LifecycleManager methods public. Fix double notification of …

…LifecycleProvisionListener. Simplify dependencies.
Netflix · Jul 3, 2015 · 86e30af · 86e30af
1 parent 8ddb699
commit 86e30af
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 13 deletions.
diff --git a/governator-core/src/main/java/com/netflix/governator/LifecycleManager.java b/governator-core/src/main/java/com/netflix/governator/LifecycleManager.java
@@ -28,15 +28,16 @@ public enum State {
     }
 
     public void addListener(LifecycleListener listener) {
-        LOG.info("Adding LifecycleListener '{}'", listener.getClass().getName());
-        listeners.add(listener);
-        if (state.equals(State.Started)) {
-            LOG.info("Starting LifecycleListener '{}'", listener.getClass().getName());
-            listener.onStarted();
+        if (listeners.add(listener)) {
+            LOG.info("Adding LifecycleListener '{}' {}", listener.getClass().getName(), System.identityHashCode(listener));
+            if (state.equals(State.Started)) {
+                LOG.info("Starting LifecycleListener '{}'", listener.getClass().getName());
+                listener.onStarted();
+            }
         }
     }
 
-    void notifyStarted() {
+    public void notifyStarted() {
         if (state.compareAndSet(State.Starting, State.Started)) {
             for (LifecycleListener listener : listeners) {
                 LOG.info("Starting LifecycleListener '{}'", listener.getClass().getName());
@@ -45,15 +46,15 @@ void notifyStarted() {
         }
     }
 
-    void notifyStartFailed(Throwable t) {
+    public void notifyStartFailed(Throwable t) {
         if (state.compareAndSet(State.Starting, State.Done)) {
             for (LifecycleListener listener : listeners) {
                 listener.onStartFailed(t);
             }
         }
     }
 
-    void notifyShutdown() {
+    public void notifyShutdown() {
         if (state.compareAndSet(State.Started, State.Done)) {
             LOG.info("Shutting down LifecycleManager");
             for (LifecycleListener listener : listeners) {

diff --git a/governator-core/src/main/java/com/netflix/governator/LifecycleModule.java b/governator-core/src/main/java/com/netflix/governator/LifecycleModule.java
@@ -82,6 +82,11 @@ public static void initialize(
 
     @Singleton
     static class LifecycleProvisionListener extends DefaultLifecycleListener implements ProvisionListener {
+        @Override
+        public boolean equals(Object obj) {
+            return hashCode() == obj.hashCode();
+        }
+
         private final ConcurrentLinkedQueue<Runnable> shutdownActions = new ConcurrentLinkedQueue<Runnable>();
         private final ConcurrentMap<Class<?>, TypeLifecycleActions> cache = new ConcurrentHashMap<>();
         private Set<LifecycleFeature> features;

diff --git a/...nator-core/src/main/java/com/netflix/governator/auto/annotations/ConditionalOnModule.java b/...nator-core/src/main/java/com/netflix/governator/auto/annotations/ConditionalOnModule.java
@@ -6,12 +6,13 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import com.google.inject.Module;
 import com.netflix.governator.auto.conditions.OnModuleCondition;
 
 @Target({ElementType.TYPE})
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
 @Conditional(OnModuleCondition.class)
 public @interface ConditionalOnModule {
-    String[] value();
+    Class<? extends Module>[] value();
 }
diff --git a/governator-core/src/main/java/com/netflix/governator/auto/conditions/OnModuleCondition.java b/governator-core/src/main/java/com/netflix/governator/auto/conditions/OnModuleCondition.java
@@ -18,8 +18,8 @@ public OnModuleCondition(AutoContext context) {
 
     @Override
     public boolean check(ConditionalOnModule param) {
-        for (String module : param.value()) {
-            if (!context.hasModule(module)) {
+        for (Class<?> module : param.value()) {
+            if (!context.hasModule(module.getName())) {
                 return true;
             }
         }

diff --git a/governator-jetty/build.gradle b/governator-jetty/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'java'
 
 dependencies {
-    compile project(':governator')
+    compile project(':governator-core')
     compile 'javax.servlet:servlet-api:2.5'
     compile 'com.google.inject.extensions:guice-servlet:4.0'
     compile 'com.sun.jersey:jersey-server:1.19'

diff --git a/governator-servlet/build.gradle b/governator-servlet/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'java'
 
 dependencies {
-    compile     project(':governator')
+    compile     project(':governator-core')
     compile     'javax.servlet:servlet-api:2.5'
     compile     'com.google.inject.extensions:guice-servlet:4.0'
 }