Remove Initializable iface

coditory · May 9, 2024 · 78b17d7 · 78b17d7
1 parent 5a41033
commit 78b17d7
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 46 deletions.
diff --git a/src/main/java/com/coditory/quark/context/BeanInitializer.java b/src/main/java/com/coditory/quark/context/BeanInitializer.java
@@ -17,9 +17,6 @@ private BeanInitializer() {
     }
 
     static void initializeBean(Object bean, BeanDescriptor<?> descriptor, ResolutionContext context) {
-        if (bean instanceof Initializable) {
-            initializeBean((Initializable) bean, descriptor);
-        }
         for (Method method : bean.getClass().getDeclaredMethods()) {
             if (method.isAnnotationPresent(Init.class)) {
                 method.setAccessible(true);
@@ -38,14 +35,4 @@ private static void initializeBean(Object bean, BeanDescriptor<?> descriptor, Me
         }
         log.debug("Initialized bean {} using method {} in {}", descriptor.toShortString(), simplifyMethodName(method), timer.measureAndFormat());
     }
-
-    private static void initializeBean(Initializable bean, BeanDescriptor<?> descriptor) {
-        Timer timer = Timer.start();
-        try {
-            bean.init();
-        } catch (Exception e) {
-            throw new BeanInitializationException("Could not initialize bean: " + descriptor.toShortString(), e);
-        }
-        log.debug("Initialized bean {} in {}", descriptor.toShortString(), timer.measureAndFormat());
-    }
 }
diff --git a/src/main/java/com/coditory/quark/context/BeanPostInitializer.java b/src/main/java/com/coditory/quark/context/BeanPostInitializer.java
@@ -17,9 +17,6 @@ private BeanPostInitializer() {
     }
 
     static void postInitializeBean(Object bean, BeanDescriptor<?> descriptor, ResolutionContext context) {
-        if (bean instanceof PostInitializable) {
-            postInitializeBean((PostInitializable) bean, descriptor);
-        }
         for (Method method : bean.getClass().getDeclaredMethods()) {
             if (method.isAnnotationPresent(PostInit.class)) {
                 method.setAccessible(true);
@@ -38,14 +35,4 @@ private static void postInitializeBean(Object bean, BeanDescriptor<?> descriptor
         }
         log.debug("Post initialized bean {} using method {} in {}", descriptor.toShortString(), simplifyMethodName(method), timer.measureAndFormat());
     }
-
-    private static void postInitializeBean(PostInitializable bean, BeanDescriptor<?> descriptor) {
-        Timer timer = Timer.start();
-        try {
-            bean.postInit();
-        } catch (Exception e) {
-            throw new BeanInitializationException("Could not post initialize bean: " + descriptor.toShortString(), e);
-        }
-        log.debug("Post initialized bean {} in {}", descriptor.toShortString(), timer.measureAndFormat());
-    }
 }
diff --git a/src/main/java/com/coditory/quark/context/Initializable.java b/src/main/java/com/coditory/quark/context/Initializable.java
diff --git a/src/main/java/com/coditory/quark/context/PostInitializable.java b/src/main/java/com/coditory/quark/context/PostInitializable.java
diff --git a/src/test/groovy/com/coditory/quark/context/BeanLifecycleSpec.groovy b/src/test/groovy/com/coditory/quark/context/BeanLifecycleSpec.groovy
@@ -22,7 +22,6 @@ class BeanLifecycleSpec extends Specification {
         when:
             LifecycleImplemented lifecycleImplemented = context.get(LifecycleImplemented)
         then:
-            lifecycleImplemented.initialized
             !lifecycleImplemented.finalized
     }
 
@@ -57,7 +56,6 @@ class BeanLifecycleSpec extends Specification {
             context.close()
         then:
             lifecycleAnnotated.initialized
-            lifecycleImplemented.initialized
     }
 
     def "should not initialize lazy beans that were not retrieved from the context"() {
@@ -73,7 +71,6 @@ class BeanLifecycleSpec extends Specification {
             context.close()
         then:
             !lifecycleAnnotated.initialized
-            !lifecycleImplemented.initialized
     }
 
     def "should inject dependencies to lifecycle annotated methods"() {
@@ -146,15 +143,9 @@ class BeanLifecycleSpec extends Specification {
         }
     }
 
-    static class LifecycleImplemented implements Initializable, Closeable {
-        boolean initialized = false
+    static class LifecycleImplemented implements Closeable {
         boolean finalized = false
 
-        @Override
-        void init() {
-            initialized = true
-        }
-
         @Override
         void close() {
             finalized = true