e

Author: kaspernielsen

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

@@ -21,7 +21,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import app.packed.bean.scanning.BeanTrigger.AnnotatedMethodBeanTrigger;
+import app.packed.bean.scanning.BeanTrigger.OnAnnotatedMethod;
 import app.packed.namespace.sandbox.NamespaceOperation;
 
 /**
@@ -31,7 +31,7 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
 @NamespaceOperation
-@AnnotatedMethodBeanTrigger(extension = CliExtension.class)
+@OnAnnotatedMethod(extension = CliExtension.class)
 public @interface CliCommand {
 
     /**w

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

@@ -29,6 +29,7 @@
 final class CliCommandHandle extends OperationHandle<CliCommandConfiguration> {
 
     CliCommand command;
+
     final List<String> names = new ArrayList<>();
 
     final CliNamespaceHandle namespace;

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

@@ -18,12 +18,12 @@
 import java.util.Collections;
 import java.util.List;
 
-import app.packed.namespace.NamespaceOperationMirror;
+import app.packed.operation.OperationMirror;
 
 /**
  * A mirror for a CLI command (operation).
  */
-public class CliCommandMirror extends NamespaceOperationMirror {
+public class CliCommandMirror extends OperationMirror {
 
     final CliCommandHandle handle;
 
@@ -37,7 +37,6 @@ public List<String> names() {
     }
 
     /** {@return the namespace this command is part of.} */
-    @Override
     public CliNamespaceMirror namespace() {
         return handle.namespace.newNamespaceMirror();
     }

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

@@ -20,9 +20,8 @@
 import java.util.function.Consumer;
 
 import app.packed.assembly.Assembly;
-import app.packed.bean.scanning.BeanIntrospector;
-import app.packed.bean.scanning.BeanElement.BeanMethod;
 import app.packed.bean.InstanceBeanConfiguration;
+import app.packed.bean.scanning.BeanIntrospector;
 import app.packed.container.ContainerBuildLocal;
 import app.packed.container.ContainerConfiguration;
 import app.packed.container.ContainerHandle;
@@ -79,11 +78,11 @@ protected BeanIntrospector newBeanIntrospector() {
 
             /** {@inheritDoc} */
             @Override
-            public void onAnnotatedMethod(BeanMethod method, Annotation hook) {
+            public void onAnnotatedMethod(Annotation hook, BeanIntrospector.OnMethod method) {
                 if (hook instanceof CliCommand c) {
                     ns().process(CliExtension.this, c, method);
                 } else {
-                    super.onAnnotatedMethod(method, hook);
+                    super.onAnnotatedMethod(hook, method);
                 }
             }
         };

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

@@ -18,7 +18,7 @@
 import java.util.LinkedHashMap;
 
 import app.packed.bean.BeanInstallationException;
-import app.packed.bean.scanning.BeanElement.BeanMethod;
+import app.packed.bean.scanning.BeanIntrospector;
 import app.packed.build.BuildActor;
 import app.packed.namespace.NamespaceHandle;
 import app.packed.namespace.NamespaceInstaller;
@@ -51,7 +51,7 @@ protected CliNamespaceConfiguration newNamespaceConfiguration(CliExtension e, Bu
         return new CliNamespaceConfiguration(this, e, actor);
     }
 
-    void process(CliExtension extension, CliCommand c, BeanMethod method) {
+    void process(CliExtension extension, CliCommand c, BeanIntrospector.OnMethod method) {
         CliCommandHandle h = null;
         // For each name check that it doesn't exists in commands already
         if (isInApplicationLifetime(extension)) {
@@ -68,7 +68,6 @@ void process(CliExtension extension, CliCommand c, BeanMethod method) {
             // EntryPoint.LaunchLifetime
         }
 
-        // I think all this is stored in CliCommandConfiguration
         h.command = c;
         if (oldCommands.putIfAbsent(c.name()[0], h) != null) {
             throw new BeanInstallationException("Multiple cli commands with the same name, name = " + c.name());

modules/packed-incubator/packed-incubator-concurrent/src/main/java/app/packed/concurrent/Daemon.java

@@ -20,14 +20,14 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import app.packed.bean.scanning.BeanTrigger.AnnotatedMethodBeanTrigger;
+import app.packed.bean.scanning.BeanTrigger.OnAnnotatedMethod;
 
 /**
  * Will have a dedicated thread.
  */
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
-@AnnotatedMethodBeanTrigger(allowInvoke = true, extension = ThreadExtension.class)
+@OnAnnotatedMethod(allowInvoke = true, extension = ThreadExtension.class)
 public @interface Daemon {
 
     // resume->Never, Always, backoff policy

modules/packed-incubator/packed-incubator-concurrent/src/main/java/app/packed/concurrent/DaemonContext.java

@@ -17,13 +17,13 @@
 
 import java.util.concurrent.TimeUnit;
 
+import app.packed.bean.scanning.BeanTrigger.OnExtensionServiceBeanTrigger;
 import app.packed.context.Context;
-import app.packed.context.ContextualServiceProvider;
 
 /**
  *
  */
-@ContextualServiceProvider(extension = ThreadExtension.class, context = DaemonContext.class)
+@OnExtensionServiceBeanTrigger(extension = ThreadExtension.class, requiresContext = DaemonContext.class)
 public interface DaemonContext extends Context<ThreadExtension> {
 
     boolean isShutdown();

modules/packed-incubator/packed-incubator-concurrent/src/main/java/app/packed/concurrent/ScheduleRecurrent.java

@@ -20,14 +20,14 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import app.packed.bean.scanning.BeanTrigger.AnnotatedMethodBeanTrigger;
+import app.packed.bean.scanning.BeanTrigger.OnAnnotatedMethod;
 
 /**
  *
  */
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
-@AnnotatedMethodBeanTrigger(allowInvoke = true, extension = ThreadExtension.class)
+@OnAnnotatedMethod(allowInvoke = true, extension = ThreadExtension.class)
 public @interface ScheduleRecurrent {
     int millies();
 }

modules/packed-incubator/packed-incubator-concurrent/src/main/java/app/packed/concurrent/SchedulingContext.java

@@ -1,12 +1,12 @@
 package app.packed.concurrent;
 
+import app.packed.bean.scanning.BeanTrigger.OnExtensionServiceBeanTrigger;
 import app.packed.context.Context;
-import app.packed.context.ContextualServiceProvider;
 
 /**
  * A context object available for scheduling.
  */
-@ContextualServiceProvider(extension = ThreadExtension.class, context = SchedulingContext.class)
+@OnExtensionServiceBeanTrigger(extension = ThreadExtension.class, requiresContext = SchedulingContext.class)
 public interface SchedulingContext extends Context<ThreadExtension> {
 
     /** {@return cancel future invocation of the scheduled operations. In progress operations will be allowed to finish} */

modules/packed-incubator/packed-incubator-concurrent/src/main/java/app/packed/concurrent/ThreadExtension.java

@@ -17,15 +17,11 @@
 
 import java.lang.annotation.Annotation;
 import java.time.Duration;
-import java.util.Set;
 import java.util.function.Consumer;
 
 import app.packed.bean.BeanConfiguration;
-import app.packed.bean.scanning.BeanElement.BeanMethod;
 import app.packed.bean.scanning.BeanIntrospector;
 import app.packed.binding.Key;
-import app.packed.binding.UnwrappedBindableVariable;
-import app.packed.context.Context;
 import app.packed.context.ContextTemplate;
 import app.packed.extension.ExtensionHandle;
 import app.packed.extension.ExtensionPoint;
@@ -101,17 +97,19 @@ protected BeanIntrospector newBeanIntrospector() {
         return new BeanIntrospector() {
 
             @Override
-            public void onContextualServiceProvision(Key<?> key, Class<?> actualHook, Set<Class<? extends Context<?>>> contexts, UnwrappedBindableVariable v) {
+            public void onExtensionService(Key<?> key, OnExtensionService service) {
+                OnVariableUnwrapped binding = service.binder();
+
                 Class<?> hook = key.rawType();
                 if (hook == SchedulingContext.class || hook == DaemonContext.class) {
-                    v.bindInvocationArgument(1);
+                    binding.bindInvocationArgument(1);
                 } else {
-                    super.onContextualServiceProvision(key, actualHook, contexts, v);
+                    super.onExtensionService(key, service);
                 }
             }
 
             @Override
-            public void onAnnotatedMethod(BeanMethod on, Annotation hook) {
+            public void onAnnotatedMethod(Annotation hook, BeanIntrospector.OnMethod on) {
                 if (hook instanceof ScheduleRecurrent schedule) {
                     // Parse the schedule
                     ScheduleImpl s = new ScheduleImpl(Duration.ofMillis(schedule.millies()));
@@ -134,7 +132,7 @@ public void onAnnotatedMethod(BeanMethod on, Annotation hook) {
                     // Configure the handle
                     h.useVirtual = daemon.useVirtual();
                 } else {
-                    super.onAnnotatedMethod(on, hook);
+                    super.onAnnotatedMethod(hook, on);
                 }
             }
         };