ea

a

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.BeanTrigger.AnnotatedMethodBeanTrigger;
+import app.packed.bean.scanning.BeanTrigger.AnnotatedMethodBeanTrigger;
 import app.packed.namespace.sandbox.NamespaceOperation;
 
 /**

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

@@ -20,8 +20,8 @@
 import java.util.function.Consumer;
 
 import app.packed.assembly.Assembly;
-import app.packed.bean.BeanElement.BeanMethod;
-import app.packed.bean.BeanIntrospector;
+import app.packed.bean.scanning.BeanIntrospector;
+import app.packed.bean.scanning.BeanElement.BeanMethod;
 import app.packed.bean.InstanceBeanConfiguration;
 import app.packed.container.ContainerBuildLocal;
 import app.packed.container.ContainerConfiguration;
@@ -69,7 +69,7 @@ public <T> InstanceBeanConfiguration<T> newBean(Class<T> beanClass) {
     }
 
     CliNamespaceHandle ns() {
-        return applicationRoot().namespaceLazy(CliNamespaceHandle.TEMPLATE, "main", c -> c.install(CliNamespaceHandle::new));
+        return applicationRoot().namespaceLazy(CliNamespaceHandle.TEMPLATE, "main");
     }
 
     /** {@inheritDoc} */
@@ -79,11 +79,11 @@ protected BeanIntrospector newBeanIntrospector() {
 
             /** {@inheritDoc} */
             @Override
-            public void onAnnotatedMethod(Annotation hook, BeanMethod method) {
+            public void onAnnotatedMethod(BeanMethod method, Annotation hook) {
                 if (hook instanceof CliCommand c) {
                     ns().process(CliExtension.this, c, method);
                 } else {
-                    super.onAnnotatedMethod(hook, method);
+                    super.onAnnotatedMethod(method, hook);
                 }
             }
         };

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

@@ -18,6 +18,7 @@
 import java.util.function.Consumer;
 
 import app.packed.build.BuildActor;
+import app.packed.namespace.NamespaceBuildHook;
 import app.packed.namespace.NamespaceConfiguration;
 
 /**
@@ -40,4 +41,9 @@ public CliCommandConfiguration addCliCommand(Consumer<CliCommandContext> action)
         throw new UnsupportedOperationException();
     }
 
+    public static NamespaceBuildHook<CliNamespaceConfiguration> pushToNewApplication(boolean inheritExistingConfiguration, Consumer<? super CliNamespaceConfiguration> c) {
+        throw new UnsupportedOperationException();
+    }
+
+
 }

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

@@ -17,8 +17,8 @@
 
 import java.util.LinkedHashMap;
 
-import app.packed.bean.BeanElement.BeanMethod;
 import app.packed.bean.BeanInstallationException;
+import app.packed.bean.scanning.BeanElement.BeanMethod;
 import app.packed.build.BuildActor;
 import app.packed.namespace.NamespaceHandle;
 import app.packed.namespace.NamespaceInstaller;
@@ -31,12 +31,12 @@
 final class CliNamespaceHandle extends NamespaceHandle<CliExtension, CliNamespaceConfiguration> {
 
     /** The default namespace template. */
-    static final NamespaceTemplate TEMPLATE = NamespaceTemplate.of(CliNamespaceHandle.class, c -> {});
+    static final NamespaceTemplate<CliNamespaceHandle> TEMPLATE = NamespaceTemplate.of(CliNamespaceHandle.class, CliNamespaceHandle::new, c -> {});
 
     /** All the commands within the namespace. */
     final LinkedHashMap<String, CliCommandHandle> oldCommands = new LinkedHashMap<>();
 
-    CliNamespaceHandle(NamespaceInstaller installer) {
+    CliNamespaceHandle(NamespaceInstaller<?> installer) {
         super(installer);
     }
 

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

@@ -20,7 +20,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import app.packed.bean.BeanTrigger.AnnotatedMethodBeanTrigger;
+import app.packed.bean.scanning.BeanTrigger.AnnotatedMethodBeanTrigger;
 
 /**
  * Will have a dedicated thread.

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

@@ -16,7 +16,6 @@
 package app.packed.concurrent;
 
 import app.packed.operation.OperationInstaller;
-import internal.app.packed.concurrent.ScheduledDaemon;
 
 /** An operation handle for a daemon operation. */
 final class DaemonOperationHandle extends ThreadedOperationHandle<DaemonOperationConfiguration> {
@@ -40,8 +39,4 @@ protected DaemonOperationConfiguration newOperationConfiguration() {
     public DaemonOperationMirror newOperationMirror() {
         return new DaemonOperationMirror(this);
     }
-
-    ScheduledDaemon schedule() {
-        return new ScheduledDaemon(useVirtual, generateMethodHandle());
-    }
 }

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

@@ -20,7 +20,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import app.packed.bean.BeanTrigger.AnnotatedMethodBeanTrigger;
+import app.packed.bean.scanning.BeanTrigger.AnnotatedMethodBeanTrigger;
 
 /**
  *

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

@@ -18,7 +18,6 @@
 import app.packed.operation.OperationInstaller;
 import app.packed.util.Nullable;
 import internal.app.packed.concurrent.ScheduleImpl;
-import internal.app.packed.concurrent.ScheduledOperation;
 
 /**
  *
@@ -45,12 +44,11 @@ protected ScheduledOperationMirror newOperationMirror() {
         return new ScheduledOperationMirror(this);
     }
 
-    ScheduledOperation schedule() {
+    @Override
+    protected void onClose() {
         /// Called from a code generation thread
         if (s == null) {
             throw new IllegalStateException("Operation " + this + " was never scheduled");
         }
-        return new ScheduledOperation(s, generateMethodHandle());
     }
-
 }

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

@@ -21,8 +21,8 @@
 import java.util.function.Consumer;
 
 import app.packed.bean.BeanConfiguration;
-import app.packed.bean.BeanElement.BeanMethod;
-import app.packed.bean.BeanIntrospector;
+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;
@@ -79,16 +79,11 @@ public class ThreadExtension extends FrameworkExtension<ThreadExtension> {
     static final OperationTemplate DAEMON_OPERATION_TEMPLATE = OperationTemplate.defaults()
             .reconfigure(c -> c.inContext(DAEMON_CONTEXT_TEMPLATE).returnIgnore());
 
-    private BeanConfiguration schedulingBean;
-
     /** Creates a new thread extension. */
 
-    BeanConfiguration initSchedulingBean() {
-        BeanConfiguration b = schedulingBean;
-        if (b == null) {
-            b = schedulingBean = provide(SchedulingTaskManager.class);
-            b.bindServiceInstance(ExecutorConfiguration.class, main().scheduler);
-        }
+    BeanConfiguration newSchedulingBean() {
+        BeanConfiguration b = provide(SchedulingTaskManager.class);
+        b.bindServiceInstance(ExecutorConfiguration.class, main().scheduler);
         return b;
     }
 
@@ -118,7 +113,7 @@ public void onContextualServiceProvision(Key<?> key, Class<?> actualHook, Set<Cl
             }
 
             @Override
-            public void onAnnotatedMethod(Annotation hook, BeanMethod on) {
+            public void onAnnotatedMethod(BeanMethod on, Annotation hook) {
                 if (hook instanceof ScheduleRecurrent schedule) {
                     // Parse the schedule
                     ScheduleImpl s = new ScheduleImpl(Duration.ofMillis(schedule.millies()));
@@ -141,7 +136,7 @@ public void onAnnotatedMethod(Annotation hook, BeanMethod on) {
                     // Configure the handle
                     h.useVirtual = daemon.useVirtual();
                 } else {
-                    super.onAnnotatedMethod(hook, on);
+                    super.onAnnotatedMethod(on, hook);
                 }
             }
         };
@@ -157,7 +152,7 @@ public ThreadNamespaceConfiguration namespace() {
     }
 
     private ThreadNamespaceHandle main() {
-        return namespaceLazy(ThreadNamespaceHandle.TEMPLATE, "main", c -> c.install(ThreadNamespaceHandle::new));
+        return namespaceLazy(ThreadNamespaceHandle.TEMPLATE, "main");
     }
 
     /** {@inheritDoc} */

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

@@ -13,13 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package app.packed.lifetime;
+package app.packed.concurrent;
+
+import app.packed.namespace.bridge.NamespaceBridge;
 
 /**
  *
  */
-class LaunchMode {
 
-    // Starting, Initializing
-    // Can throw
+public class ThreadNamespaceBridge extends NamespaceBridge<ThreadExtension> {
+
 }

modules/packed/src/main/java/app/packed/lifetime/LaunchMode.java renamed to modules/packed-incubator/packed-incubator-concurrent/src/main/java/app/packed/concurrent/ThreadNamespaceBridge.java

@@ -15,8 +15,6 @@
  */
 package app.packed.concurrent;
 
-import java.util.List;
-
 import app.packed.bean.BeanConfiguration;
 import app.packed.build.BuildActor;
 import app.packed.namespace.NamespaceHandle;
@@ -32,7 +30,7 @@
 final class ThreadNamespaceHandle extends NamespaceHandle<ThreadExtension, ThreadNamespaceConfiguration> {
 
     /** The default thread namespace template. */
-    static final NamespaceTemplate TEMPLATE = NamespaceTemplate.of(ThreadNamespaceHandle.class, c -> {});
+    static final NamespaceTemplate<ThreadNamespaceHandle> TEMPLATE = NamespaceTemplate.of(ThreadNamespaceHandle.class, ThreadNamespaceHandle::new, c -> {});
 
     ExecutorConfiguration scheduler;
 
@@ -42,7 +40,7 @@ final class ThreadNamespaceHandle extends NamespaceHandle<ThreadExtension, Threa
      * @param installer
      *            the namespace installer
      */
-    protected ThreadNamespaceHandle(NamespaceInstaller installer) {
+    protected ThreadNamespaceHandle(NamespaceInstaller<?> installer) {
         super(installer);
     }
 
@@ -60,19 +58,18 @@ protected ThreadNamespaceMirror newNamespaceMirror() {
 
     @Override
     protected void onNamespaceClose() {
-        // Get all t
-        List<ScheduledOperationHandle> l = operations(ScheduledOperationHandle.class).toList();
-        List<DaemonOperationHandle> daemons = operations(DaemonOperationHandle.class).toList();
-
-        if (l.size() > 0) {
-            BeanConfiguration b = rootExtension().initSchedulingBean();
-
-            b.bindCodeGenerator(ScheduledOperation[].class,
-                    () -> operations(ScheduledOperationHandle.class).map(ScheduledOperationHandle::schedule).toArray(ScheduledOperation[]::new));
+        // Find all scheduling operations in the namespace.
+        ScheduledOperation[] so = operations(ScheduledOperationHandle.class).map(h -> new ScheduledOperation(h.s, h.methodHandle()))
+                .toArray(ScheduledOperation[]::new);
+        // Find all daemon operations in the namespace.
+        ScheduledDaemon[] sd = operations(DaemonOperationHandle.class).map(h -> new ScheduledDaemon(h.useVirtual, h.methodHandle()))
+                .toArray(ScheduledDaemon[]::new);
 
-            b.bindCodeGenerator(ScheduledDaemon[].class,
-                    () -> operations(DaemonOperationHandle.class).map(DaemonOperationHandle::schedule).toArray(ScheduledDaemon[]::new));
+        // Install a scheduling bean if we have any operations.
+        if (so.length > 0 || sd.length > 0) {
+            BeanConfiguration b = rootExtension().newSchedulingBean();
+            b.bindServiceInstance(ScheduledOperation[].class, so);
+            b.bindServiceInstance(ScheduledDaemon[].class, sd);
         }
-        System.out.println("CLosing " + daemons.size());
     }
 }

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

@@ -5,9 +5,9 @@
 import java.util.Set;
 
 import app.packed.assembly.Assembly;
-import app.packed.bean.BeanElement.BeanMethod;
-import app.packed.bean.BeanIntrospector;
 import app.packed.bean.InstanceBeanConfiguration;
+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;
@@ -63,7 +63,7 @@ protected ScheduledJobExtension(ExtensionHandle<ScheduledJobExtension> handle) {
         super(handle);
     }
 
-    private static final ContextTemplate CT = ContextTemplate.of(SchedulingContext.class, c->c.implementationClass(PackedSchedulingContext.class));
+    private static final ContextTemplate CT = ContextTemplate.of(SchedulingContext.class, c -> c.implementationClass(PackedSchedulingContext.class));
 
     private static final OperationTemplate OT = OperationTemplate.defaults().reconfigure(c -> c.inContext(CT));
 
@@ -75,13 +75,13 @@ protected BeanIntrospector newBeanIntrospector() {
 
             @SuppressWarnings("unused")
             @Override
-            public void onAnnotatedMethod(Annotation hook, BeanMethod method) {
+            public void onAnnotatedMethod(BeanMethod method, Annotation hook) {
                 Cron c = method.annotations().readRequired(Cron.class);
 
                 OperationHandle<?> operation = method.newOperation(OT).install(OperationHandle::new);
 
                 InstanceBeanConfiguration<SchedulingBean> bean = lifetimeRoot().base().installIfAbsent(SchedulingBean.class, handle -> {
-                    handle.bindCodeGenerator(MethodHandle.class, () -> operation.generateMethodHandle());
+                    handle.bindServiceInstance(MethodHandle.class, operation.methodHandle());
                 });
                 // bean, add scheduling +
                 // Manytons dur ikke direkte
@@ -93,7 +93,8 @@ public void onAnnotatedMethod(Annotation hook, BeanMethod method) {
             }
 
             @Override
-            public void onContextualServiceProvision(Key<?> key, Class<?> actualHook, Set<Class<? extends Context<?>>> contexts,UnwrappedBindableVariable binding) {
+            public void onContextualServiceProvision(Key<?> key, Class<?> actualHook, Set<Class<? extends Context<?>>> contexts,
+                    UnwrappedBindableVariable binding) {
                 Class<?> hook = key.rawType();
                 if (hook == SchedulingContext.class) {
                     binding.bindContext(SchedulingContext.class);