wer

Author: kaspernielsen

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

@@ -15,10 +15,6 @@
  */
 package app.packed.concurrent;
 
-import app.packed.component.ComponentRealm;
-import app.packed.extension.BaseExtension;
-import app.packed.namespaceold.OldNamespaceConfiguration;
-import app.packed.namespaceold.OldNamespaceHandle;
 import app.packed.service.ProvidableBeanConfiguration;
 
 /**
@@ -27,11 +23,7 @@
 // Can you have more than 1 compute in a JobNamespace
 // Can you have multiple lifetimes in a JobNamespace? Or only 1?
 // I think multiple is fine. I mean we support transient jobs which is kind of limited lifetimes
-public class JobNamespaceConfiguration extends OldNamespaceConfiguration<BaseExtension> {
-
-    protected JobNamespaceConfiguration(OldNamespaceHandle<BaseExtension, ?> namespace, BaseExtension extension, ComponentRealm actor) {
-        super(namespace, extension, actor);
-    }
+public class JobNamespaceConfiguration  {
 
 
     // Ideen er vel at man kan injected det et sted

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

@@ -27,7 +27,6 @@
 import app.packed.bean.BeanTrigger.OnAnnotatedMethod;
 import app.packed.concurrent.JobExtension;
 import app.packed.concurrent.job2.impl.ScheduledOperationHandle;
-import internal.app.packed.concurrent.ThreadNamespaceHandle;
 import internal.app.packed.concurrent.old.ScheduleImpl;
 
 /**
@@ -74,11 +73,8 @@ public void onAnnotatedMethod(Annotation hook, BeanIntrospector.OnMethod on) {
             // Parse the schedule
             ScheduleImpl s = new ScheduleImpl(Duration.ofMillis(schedule.withFixedDelay()));
 
-            // Find the namespace we are installing the operation into
-            ThreadNamespaceHandle namespace = null;// main();
-
             // Install the operation
-            ScheduledOperationHandle h = on.newOperation().install(namespace,
+            ScheduledOperationHandle h = on.newOperation().install(
                     ScheduledOperationHandle::new);
 
             // Configure the handle

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

@@ -21,7 +21,6 @@
 import app.packed.concurrent.oldscheduling.ScheduledOperationMirror;
 import app.packed.lifecycle.Initialize;
 import app.packed.operation.OperationInstaller;
-import internal.app.packed.concurrent.ThreadNamespaceHandle;
 import internal.app.packed.concurrent.ThreadedOperationHandle;
 import internal.app.packed.concurrent.old.ScheduleImpl;
 
@@ -36,8 +35,8 @@ public final class ScheduledOperationHandle extends ThreadedOperationHandle<Sche
     /**
      * @param installer
      */
-    public ScheduledOperationHandle(OperationInstaller installer, ThreadNamespaceHandle namespace) {
-        super(installer, namespace);
+    public ScheduledOperationHandle(OperationInstaller installer) {
+        super(installer);
     }
 
     @Override

modules/packed-incubator/packed-incubator-concurrent/src/main/java/internal/app/packed/concurrent/AbstractJobOperationHandle.java

@@ -32,8 +32,8 @@ public class AbstractJobOperationHandle<T extends JobConfiguration> extends Thre
 
     public ThreadKind threadKind;
 
-    protected AbstractJobOperationHandle(OperationInstaller installer, ThreadNamespaceHandle namespace) {
-        super(installer, namespace);
+    protected AbstractJobOperationHandle(OperationInstaller installer) {
+        super(installer);
     }
 
     @Override

modules/packed-incubator/packed-incubator-concurrent/src/main/java/internal/app/packed/concurrent/daemon/DaemonJobOperationHandle.java

@@ -25,15 +25,14 @@
 import app.packed.extension.BaseExtension;
 import app.packed.operation.OperationInstaller;
 import internal.app.packed.concurrent.AbstractJobOperationHandle;
-import internal.app.packed.concurrent.ThreadNamespaceHandle;
 
 /** An operation handle for a daemon operation. */
 public final class DaemonJobOperationHandle extends AbstractJobOperationHandle<DaemonJobConfiguration> {
 
     public boolean restart;
 
-    private DaemonJobOperationHandle(OperationInstaller installer, ThreadNamespaceHandle namespace) {
-        super(installer, namespace);
+    private DaemonJobOperationHandle(OperationInstaller installer) {
+        super(installer);
     }
 
     /** {@inheritDoc} */
@@ -50,14 +49,13 @@ protected DaemonJobMirror newOperationMirror() {
 
     public static void onDaemonJobAnnotation(BeanIntrospector<BaseExtension> introspector, BeanIntrospector.OnMethod method, DaemonJob annotation) {
         // Lazy install the sidehandle and runtime manager
-        SidehandleBeanConfiguration<DaemonJobSidehandle> sideBean = introspector.applicationBase().installSidebeanIfAbsent(DaemonJobSidehandle.class, SidehandleTargetKind.OPERATION, _ -> {
-            introspector.applicationBase().install(DaemonJobRuntimeManager.class).provide();
-        });
+        SidehandleBeanConfiguration<DaemonJobSidehandle> sideBean = introspector.applicationBase().installSidebeanIfAbsent(DaemonJobSidehandle.class,
+                SidehandleTargetKind.OPERATION, _ -> {
+                    introspector.applicationBase().install(DaemonJobRuntimeManager.class).provide();
+                });
 
-        ThreadNamespaceHandle namespace = ThreadNamespaceHandle.mainHandle(introspector.extensionHandle());
-
-        DaemonJobOperationHandle handle = method.newOperation().addContext(DaemonJobContext.class).attachToSidebean(sideBean).install(namespace,
-                DaemonJobOperationHandle::new);
+        DaemonJobOperationHandle handle = method.newOperation().addContext(DaemonJobContext.class).attachToSidebean(sideBean)
+                .install(DaemonJobOperationHandle::new);
         handle.threadKind = annotation.threadKind();
         handle.interruptOnStop = annotation.interruptOnStop();
     }

modules/packed-incubator/packed-incubator-concurrent/src/main/java/internal/app/packed/concurrent/daemon/JobNamespaceHandle.java

@@ -15,12 +15,6 @@
  */
 package app.packed.concurrent;
 
-import app.packed.component.ComponentRealm;
-import app.packed.extension.BaseExtension;
-import app.packed.namespaceold.OldNamespaceConfiguration;
-import app.packed.namespaceold.OldNamespaceHandle;
-import internal.app.packed.concurrent.ThreadNamespaceHandle;
-
 /**
  * A thread namespace defines policies that used for all daemons and scheduled jobs defined within the same namespace.
  */
@@ -29,17 +23,7 @@
 // Fyldt med Thread factories/pools
 // Hvad med extensions??? Vi vil gerne kunne configure deres.
 // Maaske deler vi en enkelt. Maaske har vi noget hierrakisk hvor vi nedarver settings
-public final class ThreadNamespaceConfiguration extends OldNamespaceConfiguration<BaseExtension> {
-
-    final ThreadNamespaceHandle handle;
-
-    /**
-     * @param handle
-     */
-    public ThreadNamespaceConfiguration(OldNamespaceHandle<BaseExtension, ?> handle, BaseExtension extension, ComponentRealm actor) {
-        super(handle, extension, actor);
-        this.handle = (ThreadNamespaceHandle) handle;
-    }
+public final class ThreadNamespaceConfiguration {
 
 //    public DaemonOperationConfiguration addDaemon(Consumer<DaemonContext> action) {
 //        throw new UnsupportedOperationException();

modules/packed/src/main/java/app/packed/concurrent/ThreadNamespaceConfiguration.java

@@ -12,6 +12,7 @@
 import app.packed.container.ContainerHandle;
 import app.packed.container.ContainerInstaller;
 import app.packed.container.Wirelet;
+import app.packed.extension.Extension.Props;
 import app.packed.extension.ExtensionPoint.ExtensionPointHandle;
 import app.packed.operation.Op;
 import app.packed.service.ProvidableBeanConfiguration;
@@ -20,6 +21,7 @@
 import internal.app.packed.bean.PackedBeanInstaller;
 import internal.app.packed.bean.PackedBeanInstaller.ProvidableBeanHandle;
 import internal.app.packed.container.PackedContainerInstaller;
+import internal.app.packed.extension.BaseExtensionNamespace;
 import internal.app.packed.service.util.PackedServiceLocator;
 import sandbox.app.packed.bean.BeanSynthesizer;
 
@@ -47,20 +49,26 @@
 // Service
 //// export require provide transform/rewrite??? depends on 1 or two interfaces
 
+@Props(extensionNamespace = BaseExtensionNamespace.class)
 public final class BaseExtension extends FrameworkExtension<BaseExtension> {
 
     // We use an initial value for now, because we share FromLinks and the boolean fields
     // But right now we only have a single field
     static final ContainerBuildLocal<FromLinks> FROM_LINKS = ContainerBuildLocal.of(FromLinks::new);
 
+    final BaseExtensionNamespace namespace;
+
     /**
      * All your base are belong to us.
      *
+     * @param namespace
+     *            the extension's namespace
      * @param handle
      *            the extension's handle
      */
-    BaseExtension(ExtensionHandle<BaseExtension> handle) {
+    BaseExtension(BaseExtensionNamespace namespace, ExtensionHandle<BaseExtension> handle) {
         super(handle);
+        this.namespace = namespace;
     }
 
     /**
@@ -295,18 +303,9 @@ protected void onConfigured() {
 
     /** {@return the container's main service namespace} */
     public ServiceNamespaceConfiguration services() {
-        return services("main");
-    }
-
-    public ServiceNamespaceConfiguration services(String name) {
-        // Will automatically create one with default settings
         throw new UnsupportedOperationException();
     }
 
-    protected ServiceNamespaceConfiguration services(String name, Consumer<?> newConfiguration) {
-        return services("main");
-    }
-
     // transformAllBeans() <-- includes extension beans... (Must be open)
     @SuppressWarnings("exports")
     public Runnable transformAllBeans(Consumer<? super BeanSynthesizer> transformer) {

modules/packed/src/main/java/app/packed/extension/BaseExtension.java

@@ -39,6 +39,7 @@
 import app.packed.service.ProvidableBeanConfiguration;
 import app.packed.util.TreeView;
 import internal.app.packed.container.ContainerSetup;
+import internal.app.packed.extension.BaseExtensionNamespace;
 import internal.app.packed.extension.ExtensionSetup;
 import internal.app.packed.extension.PackedExtensionHandle;
 import internal.app.packed.extension.PackedExtensionPointHandle;
@@ -123,6 +124,11 @@ public void invoke_Extension_OnAssemblyClose(Extension<?> extension) {
             public void invoke_Extension_OnNew(Extension<?> extension) {
                 extension.onNew();
             }
+
+            @Override
+            public BaseExtension create_BaseExtension(BaseExtensionNamespace namespace, ExtensionHandle<BaseExtension> handle) {
+                return new BaseExtension(namespace, handle);
+            }
         });
     }
 

modules/packed/src/main/java/app/packed/extension/Extension.java

@@ -15,23 +15,9 @@
  */
 package app.packed.lifecycle.sandbox.errorhandling;
 
-import app.packed.component.ComponentRealm;
-import app.packed.extension.BaseExtension;
-import app.packed.namespaceold.OldNamespaceConfiguration;
-import app.packed.namespaceold.OldNamespaceHandle;
-
 /**
  *
  */
-public final class ErrorHandlingNamespaceConfiguration extends OldNamespaceConfiguration<BaseExtension> {
-
-    /**
-     * @param namespace
-     * @param extension
-     * @param actor
-     */
-    protected ErrorHandlingNamespaceConfiguration(OldNamespaceHandle<BaseExtension, ?> namespace, BaseExtension extension, ComponentRealm actor) {
-        super(namespace, extension, actor);
-    }
+public final class ErrorHandlingNamespaceConfiguration  {
 
 }