a

a

Author: kaspernielsen

modules/packed-incubator/packed-incubator-cli/src/main/java/app/packed/cli/CliBeanIntrospector.java

@@ -15,12 +15,14 @@
  */
 package app.packed.cli;
 
+import java.lang.annotation.Annotation;
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import app.packed.bean.scanning.BeanIntrospector;
 import app.packed.bean.scanning.BeanTrigger.OnAnnotatedMethod;
 import app.packed.namespace.sandbox.NamespaceOperation;
 
@@ -31,7 +33,7 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
 @NamespaceOperation
-@OnAnnotatedMethod(introspector = CliBeanIntrospector.class)
+@OnAnnotatedMethod(introspector = CliCommandBeanIntrospector.class)
 public @interface CliCommand {
 
     /**
@@ -63,3 +65,12 @@
 //
 //    }
 }
+
+final class CliCommandBeanIntrospector extends BeanIntrospector<CliExtension> {
+
+    /** {@inheritDoc} */
+    @Override
+    public void onAnnotatedMethod(Annotation annotation, BeanIntrospector.OnMethod method) {
+        extension().ns().process(extension(), (CliCommand) annotation, method);
+    }
+}

modules/packed-incubator/packed-incubator-cli/src/main/java/app/packed/cli/CliCommand.java

@@ -27,12 +27,12 @@
 public class CliCommandConfiguration extends OperationConfiguration {
 
     /** The handle for the command. */
-    private final CliCommandHandle handle;
+    private final CliCommandOperationHandle handle;
 
     /**
      * @param handle
      */
-    CliCommandConfiguration(CliCommandHandle handle) {
+    CliCommandConfiguration(CliCommandOperationHandle handle) {
         this.handle = requireNonNull(handle);
         super(handle);
     }

modules/packed-incubator/packed-incubator-cli/src/main/java/app/packed/cli/CliCommandConfiguration.java

@@ -25,9 +25,9 @@
  */
 public class CliCommandMirror extends OperationMirror {
 
-    final CliCommandHandle handle;
+    final CliCommandOperationHandle handle;
 
-    CliCommandMirror(CliCommandHandle handle) {
+    CliCommandMirror(CliCommandOperationHandle handle) {
         super(handle);
         this.handle = handle;
     }

modules/packed-incubator/packed-incubator-cli/src/main/java/app/packed/cli/CliCommandMirror.java

@@ -26,7 +26,7 @@
 /**
  *
  */
-final class CliCommandHandle extends OperationHandle<CliCommandConfiguration> {
+final class CliCommandOperationHandle extends OperationHandle<CliCommandConfiguration> {
 
     CliCommand command;
 
@@ -37,7 +37,7 @@ final class CliCommandHandle extends OperationHandle<CliCommandConfiguration> {
     /**
      * @param installer
      */
-    CliCommandHandle(OperationInstaller installer, CliNamespaceHandle namespace) {
+    CliCommandOperationHandle(OperationInstaller installer, CliNamespaceHandle namespace) {
         super(installer);
         this.namespace = requireNonNull(namespace);
     }

…ava/app/packed/cli/CliCommandHandle.java …acked/cli/CliCommandOperationHandle.javamodules/packed-incubator/packed-incubator-cli/src/main/java/app/packed/cli/CliCommandHandle.java renamed to modules/packed-incubator/packed-incubator-cli/src/main/java/app/packed/cli/CliCommandOperationHandle.java modules/packed-incubator/packed-incubator-cli/src/main/java/app/packed/cli/CliCommandHandle.java renamed to modules/packed-incubator/packed-incubator-cli/src/main/java/app/packed/cli/CliCommandOperationHandle.java

@@ -37,7 +37,7 @@ final class CliNamespaceHandle extends NamespaceHandle<CliExtension, CliNamespac
     static final NamespaceTemplate<CliNamespaceHandle> TEMPLATE = NamespaceTemplate.of(CliNamespaceHandle.class, CliNamespaceHandle::new);
 
     /** All the commands within the namespace. */
-    final LinkedHashMap<String, CliCommandHandle> commands = new LinkedHashMap<>();
+    final LinkedHashMap<String, CliCommandOperationHandle> commands = new LinkedHashMap<>();
 
     final List<CliOptionMirror> options = new ArrayList<>();
 
@@ -57,7 +57,7 @@ protected CliNamespaceMirror newNamespaceMirror() {
     }
 
     void process(CliExtension extension, CliCommand c, BeanIntrospector.OnMethod method) {
-        CliCommandHandle h = null;
+        CliCommandOperationHandle h = null;
         for (String n : c.name()) {
             if (commands.containsKey(n)) {
                 throw new BeanInstallationException("Multiple cli commands with the same name, name = " + c.name());
@@ -66,7 +66,7 @@ void process(CliExtension extension, CliCommand c, BeanIntrospector.OnMethod met
 
         // For each name check that it doesn't exists in commands already
         if (isInApplicationLifetime(extension)) {
-            h = method.newOperation(OperationTemplate.defaults()).install(i -> new CliCommandHandle(i, this));
+            h = method.newOperation(OperationTemplate.defaults()).install(i -> new CliCommandOperationHandle(i, this));
 
             // OperationTemplate.
             // h.namespace(this)

modules/packed-incubator/packed-incubator-cli/src/main/java/app/packed/cli/CliNamespaceHandle.java

@@ -15,14 +15,24 @@
  */
 package app.packed.cli;
 
+import java.lang.annotation.Annotation;
+
+import app.packed.bean.scanning.BeanIntrospector;
 import app.packed.bean.scanning.BeanTrigger;
 import app.packed.namespace.sandbox.NamespaceOperation;
 
 /**
  *
  */
 @NamespaceOperation
-@BeanTrigger.OnAnnotatedVariable(introspector = CliBeanIntrospector.class)
-public @interface CliOption {
+@BeanTrigger.OnAnnotatedVariable(introspector = CliOptionBeanIntrospector.class)
+public @interface CliOption {}
+
+final class CliOptionBeanIntrospector extends BeanIntrospector<CliExtension> {
 
-}
+    /** {@inheritDoc} */
+    @Override
+    public void onAnnotatedVariable(Annotation annotation, OnVariable onVariable) {
+        extension().ns().process(extension(), (CliOption) annotation, onVariable);
+    }
+}

modules/packed-incubator/packed-incubator-cli/src/main/java/app/packed/cli/CliOption.java

@@ -1,10 +1,11 @@
 package app.packed.concurrent.annotations;
 
+import app.packed.bean.scanning.BeanIntrospector;
 import app.packed.bean.scanning.BeanTrigger.AutoInject;
 import app.packed.concurrent.other.ScheduledJobExtension;
 import app.packed.context.Context;
 
-@AutoInject(introspector = ScheduledJobExtension.ScheduledJobBeanIntrospector.class, requiresContext = ScheduledJobContext.class)
+@AutoInject(introspector = ScheduledJobContextBeanIntrospector.class, requiresContext = ScheduledJobContext.class)
 public interface ScheduledJobContext extends Context<ScheduledJobExtension> {
 
     void pause();
@@ -13,3 +14,7 @@ public interface ScheduledJobContext extends Context<ScheduledJobExtension> {
 
     void cancel();
 }
+
+final class ScheduledJobContextBeanIntrospector extends BeanIntrospector<ScheduledJobExtension> {
+
+}

modules/packed-incubator/packed-incubator-concurrent/src/main/java/app/packed/concurrent/annotations/ScheduledJobContext.java

@@ -26,9 +26,9 @@
 import app.packed.bean.scanning.BeanTrigger.OnAnnotatedMethod;
 import app.packed.binding.Key;
 import app.packed.concurrent.ThreadKind;
-import app.packed.concurrent.job.DaemonJob.Daemonintrospector;
-import app.packed.extension.BaseExtension;
+import internal.app.packed.bean.scanning.IntrospectorOnContextService;
 import internal.app.packed.concurrent.daemon.DaemonOperationHandle;
+import internal.app.packed.extension.BaseExtensionBeanIntrospector;
 
 /**
  * Will have a dedicated thread.
@@ -52,7 +52,7 @@
 // SupportJob
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
-@OnAnnotatedMethod(allowInvoke = true, introspector = Daemonintrospector.class)
+@OnAnnotatedMethod(allowInvoke = true, introspector = DaemonJobBeanIntrospector.class)
 public @interface DaemonJob {
 
     String startup() default "When-exactly-are we starting";
@@ -77,27 +77,23 @@
      * @see DaemonMirror#threadKind()
      */
     ThreadKind threadKind() default ThreadKind.DAEMON_THREAD;
+}
 
-    final class Daemonintrospector extends BeanIntrospector<BaseExtension> {
+final class DaemonJobBeanIntrospector extends BaseExtensionBeanIntrospector {
 
-        /** {@inheritDoc} */
-        @Override
-        public void onAnnotatedMethod(Annotation annotation, BeanIntrospector.OnMethod method) {
-            if (annotation instanceof DaemonJob daemon) {
-                DaemonOperationHandle.installFromAnnotation(this, method, daemon);
-            } else {
-                super.onAnnotatedMethod(annotation, method);
-            }
-        }
+    /** {@inheritDoc} */
+    @Override
+    public void onAnnotatedMethod(Annotation annotation, BeanIntrospector.OnMethod method) {
+        DaemonOperationHandle.installFromAnnotation(this, method, (DaemonJob) annotation);
+    }
 
-        /** {@inheritDoc} */
-        @Override
-        public void onExtensionService(Key<?> key, OnContextService service) {
-            if (service.matchNoQualifiers(DaemonJobContext.class)) {
-                service.binder().bindInvocationArgument(1);
-            } else {
-                super.onExtensionService(key, service);
-            }
+    /** {@inheritDoc} */
+    @Override
+    public void onExtensionService(Key<?> key, IntrospectorOnContextService service) {
+        if (service.matchNoQualifiers(DaemonJobContext.class)) {
+            service.binder().bindInvocationArgument(1);
+        } else {
+            super.onExtensionService(key, service);
         }
     }
 }
@@ -107,9 +103,9 @@ public void onExtensionService(Key<?> key, OnContextService service) {
 
 interface DaemonJobAction {
 
- // The one problem here is cleanup...
- // Do we want a stop method? Probably not
- static DaemonJobAction sleep(long duration, TimeUnit timeUnit) {
-     throw new UnsupportedOperationException();
- }
+    // The one problem here is cleanup...
+    // Do we want a stop method? Probably not
+    static DaemonJobAction sleep(long duration, TimeUnit timeUnit) {
+        throw new UnsupportedOperationException();
+    }
 }

modules/packed-incubator/packed-incubator-concurrent/src/main/java/app/packed/concurrent/job/DaemonJob.java

@@ -27,7 +27,7 @@
  *
  */
 // I think we need a bit understand about where we are in the shutdown process, early, vs late
-@AutoInject(introspector = DaemonJob.Daemonintrospector.class, requiresContext = DaemonJobContext.class)
+@AutoInject(introspector = DaemonJobBeanIntrospector.class, requiresContext = DaemonJobContext.class)
 public sealed interface DaemonJobContext extends Context<BaseExtension> permits DaemonSideBean {
 
     /**