Improve configs with init methods

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,11 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,18 +198,28 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

src/integrationTest/groovy/annotated/ConfigurationRegistrationSpec.groovy

@@ -60,7 +60,6 @@ class ConfigurationRegistrationSpec extends Specification {
         when:
             Context.builder()
                     .scanPackage(ConfigEagerInit)
-                    .registerConfigurationBeans()
                     .build()
         then:
             ConfigEagerInit.initialized == true

src/main/java/com/coditory/quark/context/ConditionContext.java

@@ -10,7 +10,7 @@
 import static java.util.Objects.requireNonNull;
 import static java.util.stream.Collectors.toSet;
 
-final class ConditionContext {
+public final class ConditionContext {
     static ConditionContext from(Set<BeanHolder<?>> holders, Map<String, Object> properties) {
         Set<BeanDescriptor<?>> descriptors = holders.stream()
                 .map(BeanHolder::getDescriptor)

src/main/java/com/coditory/quark/context/Context.java

@@ -39,23 +39,23 @@ public static ContextBuilder builder() {
         return new ContextBuilder();
     }
 
-    static Context create(String name, Set<BeanHolder<?>> beanHolders, Map<String, Object> properties, EventBus eventBus) {
+    static Context create(String name, Set<BeanHolder<?>> beanHolders, Set<BeanHolder<?>> initBeanHolders, Map<String, Object> properties, EventBus eventBus) {
         eventBus.emit(new ContextEvent.ContextPreCreateEvent());
         Timer totalTimer = Timer.start();
         Map<BeanDescriptor<?>, List<BeanHolder<?>>> holders = ContextResolver.resolve(beanHolders, properties);
         Context context = new Context(name, holders, properties, eventBus);
-        context.init();
+        context.init(initBeanHolders);
         log.info("Created context in {}", totalTimer.measureAndFormat());
         eventBus.emit(new ContextEvent.ContextPostCreateEvent());
         return context;
     }
 
-    static Context createEager(String name, Set<BeanHolder<?>> beanHolders, Map<String, Object> properties, EventBus eventBus) {
+    static Context createEager(String name, Set<BeanHolder<?>> beanHolders, Set<BeanHolder<?>> initBeanHolders, Map<String, Object> properties, EventBus eventBus) {
         eventBus.emit(new ContextEvent.ContextPreCreateEvent());
         Timer totalTimer = Timer.start();
         Map<BeanDescriptor<?>, List<BeanHolder<?>>> holders = ContextResolver.resolve(beanHolders, properties);
         Context context = new Context(name, holders, properties, eventBus);
-        context.init();
+        context.init(initBeanHolders);
         holders.forEach((descriptor, creator) -> {
             if (descriptor.name() != null) {
                 context.get(descriptor.type(), descriptor.name());
@@ -101,8 +101,11 @@ public String getName() {
         return name;
     }
 
-    private void init() {
+    private void init(Set<BeanHolder<?>> initBeanHolders) {
         ResolutionContext context = new ResolutionContext(this, emptyResolutionPath());
+        initBeanHolders.stream()
+                .filter(BeanHolder::isEager)
+                .forEach(holder -> holder.get(context));
         this.holders.stream()
                 .filter(BeanHolder::isEager)
                 .forEach(holder -> holder.get(context));

src/main/java/com/coditory/quark/context/ContextBuilder.java

@@ -2,6 +2,7 @@
 
 import com.coditory.quark.context.annotations.Bean;
 import com.coditory.quark.context.annotations.Configuration;
+import com.coditory.quark.context.annotations.Init;
 import com.coditory.quark.context.events.ContextEventHandler;
 import com.coditory.quark.eventbus.DispatchExceptionHandler;
 import com.coditory.quark.eventbus.EventBus;
@@ -35,6 +36,7 @@
 public final class ContextBuilder {
     public static final String CONTEXT_EVENT_BUS_NAME = "ContextEventBus";
     private final AtomicInteger DEFAULT_NAME_COUNTER = new AtomicInteger(1);
+    private final Set<BeanHolder<?>> initBeanHolders = new LinkedHashSet<>();
     private final Set<BeanHolder<?>> beanHolders = new LinkedHashSet<>();
     private final Map<String, Object> properties = new LinkedHashMap<>();
     private final EventBusBuilder eventBusBuilder = EventBus.builder()
@@ -197,12 +199,21 @@ private <T> void addBeansFromConfiguration(Configuration configuration, Class<T>
                 : configuration.name();
         BeanHolder<T> holder = holder(descriptor(type, name), fromConstructor(type), configuration.eager());
         addBeanHolder(holder);
+        boolean hasInit = false;
+        boolean hasBean = false;
         for (Method method : type.getDeclaredMethods()) {
+            if (method.isAnnotationPresent(Init.class)) {
+                hasInit = true;
+            }
             if (method.isAnnotationPresent(Bean.class)) {
                 method.setAccessible(true);
                 addFromAnnotatedConfiguration(holder, method, method.getReturnType());
+                hasBean = true;
             }
         }
+        if (hasInit && (configuration.eager() || !hasBean)) {
+            initBeanHolders.add(holder);
+        }
     }
 
     private <T> void addFromAnnotatedConfiguration(BeanHolder<?> holder, Method method, Class<T> returnType) {
@@ -275,6 +286,7 @@ public <T> ContextBuilder add(@NotNull Class<T> type, String name, @NotNull Pred
     private <T> BeanCreator<T> wrapBeanCreator(Predicate<ConditionContext> condition, BeanCreator<T> beanCreator) {
         return new BeanCreator<>() {
             @Override
+            @NotNull
             public T create(@NotNull ResolutionContext context) {
                 return beanCreator.create(context);
             }
@@ -307,12 +319,12 @@ private void addBeanHolder(BeanHolder<?> holder) {
 
     @NotNull
     public Context buildEager() {
-        return build(() -> Context.createEager(name, beanHolders, properties, eventBus));
+        return build(() -> Context.createEager(name, beanHolders, initBeanHolders, properties, eventBus));
     }
 
     @NotNull
     public Context build() {
-        return build(() -> Context.create(name, beanHolders, properties, eventBus));
+        return build(() -> Context.create(name, beanHolders, initBeanHolders, properties, eventBus));
     }
 
     private Context build(Supplier<Context> contextCreator) {
@@ -326,10 +338,21 @@ private void initialize() {
         expectUninitialized();
         initializeName();
         scanPackages();
+        filterConfigBeanHolders();
         initializeEventBus();
         initialized = true;
     }
 
+    private void filterConfigBeanHolders() {
+        if (registerConfigurationBeans) return;
+        Set<BeanHolder<?>> configHolders = beanHolders.stream()
+                .filter(holder -> holder.getDescriptor().type().isAnnotationPresent(Configuration.class))
+                .collect(toCollection(LinkedHashSet::new));
+        EventEmitter nullEventEmitter = (event) -> {};
+        configHolders.forEach(h -> h.setEventEmitter(nullEventEmitter));
+        beanHolders.removeAll(configHolders);
+    }
+
     private void initializeName() {
         expectUninitialized();
         int counter = DEFAULT_NAME_COUNTER.incrementAndGet();
@@ -354,15 +377,6 @@ private void initializeEventBus() {
         if (registerContextEventBus) {
             add(eventBus, eventBus.getName());
         }
-        if (!registerConfigurationBeans) {
-            Set<BeanHolder<?>> configHolders = beanHolders.stream()
-                    .filter(holder -> holder.getDescriptor().type().isAnnotationPresent(Configuration.class))
-                    .collect(toCollection(LinkedHashSet::new));
-            EventEmitter nullEventEmitter = (event) -> {
-            };
-            configHolders.forEach(h -> h.setEventEmitter(nullEventEmitter));
-            beanHolders.removeAll(configHolders);
-        }
         for (BeanHolder<?> holder : beanHolders) {
             holder.setEventEmitter(eventBus);
         }