Updates

kaspernielsen · kaspernielsen · commit 44f29124ee89 · 2026-01-11T07:01:45.000+01:00
diff --git a/modules/packed-incubator/packed-incubator-cli/src/main/java/app/packed/cli/other/PackedCliApp.java b/modules/packed-incubator/packed-incubator-cli/src/main/java/app/packed/cli/other/PackedCliApp.java
@@ -18,6 +18,7 @@
 import app.packed.application.App;
 import app.packed.application.BootstrapApp;
 import app.packed.assembly.Assembly;
+import app.packed.lifecycle.LifecycleKind;
 import app.packed.bean.Bean;
 import app.packed.container.Wirelet;
 import app.packed.lifecycle.RunState;
@@ -75,7 +76,7 @@ public static void verify(Assembly assembly) {
      */
     private static BootstrapApp<Void> bootstrap() {
         class ServiceLocatorBootstrap {
-            private static final BootstrapApp<Void> APP = BootstrapApp.ofManaged(Bean.of(Void.class));
+            private static final BootstrapApp<Void> APP = BootstrapApp.of(LifecycleKind.MANAGED, Bean.of(Void.class));
         }
         return ServiceLocatorBootstrap.APP;
     }
diff --git a/modules/packed-incubator/packed-incubator-concurrent/src/main/java/app/packed/concurrent/job/app/PackedJobApp.java b/modules/packed-incubator/packed-incubator-concurrent/src/main/java/app/packed/concurrent/job/app/PackedJobApp.java
@@ -22,6 +22,7 @@
 
 import app.packed.application.BootstrapApp;
 import app.packed.bean.Bean;
+import app.packed.lifecycle.LifecycleKind;
 import app.packed.component.SidehandleBinding;
 import app.packed.component.SidehandleContext;
 import app.packed.lifecycle.RunState;
@@ -37,7 +38,7 @@
 final class PackedJobApp implements JobApp {
 
     /** The bootstrap app for this application. */
-    public static final BootstrapApp<PackedJobApp> BOOTSTRAP_APP = BootstrapApp.ofManaged(Bean.of(PackedJobApp.class));
+    public static final BootstrapApp<PackedJobApp> BOOTSTRAP_APP = BootstrapApp.of(LifecycleKind.MANAGED, Bean.of(PackedJobApp.class));
 
     /** Manages the lifecycle of the app. */
     private final ManagedLifecycle lifecycle;
diff --git a/modules/packed-module-tests/src/main/java/app/packed/moduletests/isopen/NewApp.java b/modules/packed-module-tests/src/main/java/app/packed/moduletests/isopen/NewApp.java
@@ -19,6 +19,7 @@
 
 import app.packed.application.BootstrapApp;
 import app.packed.bean.Bean;
+import app.packed.lifecycle.LifecycleKind;
 import app.packed.component.SidehandleBinding;
 import app.packed.component.SidehandleContext;
 import app.packed.lifecycle.runtime.ManagedLifecycle;
@@ -31,12 +32,12 @@ static final class PackedApp {
 
         /** The bootstrap app for this application. */
         // Hmm, read of constructor, think we need module expose to packed, should probably be in the docs somewhere
-        public static final BootstrapApp<PackedApp> BOOTSTRAP_APP = BootstrapApp.ofManaged(Bean.of(PackedApp.class));
+        public static final BootstrapApp<PackedApp> BOOTSTRAP_APP = BootstrapApp.of(LifecycleKind.MANAGED, Bean.of(PackedApp.class));
 
         PackedApp(@SidehandleBinding(FROM_CONTEXT) ManagedLifecycle lc, SidehandleContext context) {
         }
     }
     public static void main(String[] args) {
-        BootstrapApp.ofManaged(Bean.of(PackedApp.class));
+        BootstrapApp.of(LifecycleKind.MANAGED, Bean.of(PackedApp.class));
     }
 }
diff --git a/modules/packed-module-tests/src/main/java/app/packed/moduletests/notopen/NewApp.java b/modules/packed-module-tests/src/main/java/app/packed/moduletests/notopen/NewApp.java
@@ -17,6 +17,7 @@
 
 import app.packed.application.BootstrapApp;
 import app.packed.bean.Bean;
+import app.packed.lifecycle.LifecycleKind;
 
 /**
  *
@@ -25,6 +26,6 @@ public class NewApp {
     static final class PackedApp {}
 
     public static void main(String[] args) {
-        BootstrapApp.ofManaged(Bean.of(PackedApp.class));
+        BootstrapApp.of(LifecycleKind.MANAGED, Bean.of(PackedApp.class));
     }
 }
diff --git a/modules/packed/src/main/java/app/packed/application/BootstrapApp.java b/modules/packed/src/main/java/app/packed/application/BootstrapApp.java
@@ -190,28 +190,15 @@ default BootstrapApp<I> withWirelets(boolean before, Wirelet... wirelets) {
         throw new UnsupportedOperationException();
     }
 
-    static <A> BootstrapApp<A> of(Bean<A> bean, LifecycleKind lifecycleKind) {
-       //TODO_CLAUDE implement this method
-        // And remove and replace usage of the two deprecated methods below
-//        NONE should throw IllegalArgumentException
-
-    }
-    /**
-     * Creates a new {@link BootstrapApp} from the specified application template.
-     *
-     * @param template
-     *            the application template to create the bootstrap app from
-     * @return the new bootstrap app.
-     */
-    // Alternativt tage en MethodHandles.lookup
-    @Deprecated
-    static <A> BootstrapApp<A> ofManaged(Bean<A> bean) {
-        return PackedBootstrapApp.of(new PackedApplicationTemplate.Builder<>(bean).build());
-    }
-
-    @Deprecated
-    static <A, H extends ApplicationHandle<A, ?>> BootstrapApp<A> ofUnmanaged(Bean<A> bean) {
-        return PackedBootstrapApp.of(new PackedApplicationTemplate.Builder<>(bean).unmanaged().build());
+    static <A> BootstrapApp<A> of(LifecycleKind lifecycleKind, Bean<A> bean) {
+        requireNonNull(bean, "bean is null");
+        requireNonNull(lifecycleKind, "lifecycleKind is null");
+        PackedApplicationTemplate.Builder<A> builder = new PackedApplicationTemplate.Builder<>(bean);
+        return switch (lifecycleKind) {
+            case NONE -> throw new IllegalArgumentException("LifecycleKind.NONE is not supported for BootstrapApp");
+            case UNMANAGED -> PackedBootstrapApp.of(builder.unmanaged().build());
+            case MANAGED -> PackedBootstrapApp.of(builder.build());
+        };
     }
 
     /**
diff --git a/modules/packed/src/main/java/app/packed/application/PackedApp.java b/modules/packed/src/main/java/app/packed/application/PackedApp.java
@@ -21,6 +21,7 @@
 
 import app.packed.bean.Bean;
 import app.packed.binding.Key;
+import app.packed.lifecycle.LifecycleKind;
 import app.packed.component.SidehandleBinding;
 import app.packed.component.SidehandleContext;
 import app.packed.lifecycle.RunState;
@@ -33,7 +34,7 @@
 final class PackedApp implements App {
 
     /** The bootstrap app for this application. */
-    public static final BootstrapApp<PackedApp> BOOTSTRAP_APP = BootstrapApp.ofManaged(Bean.of(PackedApp.class));
+    public static final BootstrapApp<PackedApp> BOOTSTRAP_APP = BootstrapApp.of(LifecycleKind.MANAGED, Bean.of(PackedApp.class));
 
     /** Manages the lifecycle of the app. */
     private final ManagedLifecycle lifecycle;
diff --git a/modules/packed/src/main/java/app/packed/service/ServiceLocator.java b/modules/packed/src/main/java/app/packed/service/ServiceLocator.java
@@ -29,6 +29,7 @@
 import app.packed.application.ApplicationMirror;
 import app.packed.application.BootstrapApp;
 import app.packed.assembly.Assembly;
+import app.packed.lifecycle.LifecycleKind;
 import app.packed.bean.Bean;
 import app.packed.bean.BeanIntrospector;
 import app.packed.bean.BeanTrigger.AutoInject;
@@ -320,7 +321,7 @@ private static BootstrapApp<ServiceLocator> bootstrap() {
         // ServiceLocatorBootstrap because we cannot have private static fields on interfaces
         class ServiceLocatorBootstrap {
             private static final BootstrapApp<ServiceLocator> APP = BootstrapApp
-                    .ofUnmanaged(Bean.<ServiceLocator>of(new Op1<@SidehandleBinding(FROM_CONTEXT) ServiceLocator, ServiceLocator>(e -> e) {}));
+                    .of(LifecycleKind.UNMANAGED, Bean.<ServiceLocator>of(new Op1<@SidehandleBinding(FROM_CONTEXT) ServiceLocator, ServiceLocator>(e -> e) {}));
         }
         return ServiceLocatorBootstrap.APP;
     }
diff --git a/modules/packed/src/main/java/internal/app/packed/application/AaaTest.java b/modules/packed/src/main/java/internal/app/packed/application/AaaTest.java
@@ -23,6 +23,7 @@
 import app.packed.application.ApplicationMirror;
 import app.packed.application.BootstrapApp;
 import app.packed.assembly.BaseAssembly;
+import app.packed.lifecycle.LifecycleKind;
 import app.packed.bean.Bean;
 import app.packed.component.SidehandleBinding;
 import app.packed.component.SidehandleContext;
@@ -76,7 +77,7 @@ public void onstop() throws InterruptedException {
     static final class AApp implements App {
 
         /** The bootstrap app for this application. */
-        public static final BootstrapApp<AApp> BOOTSTRAP_APP = BootstrapApp.ofManaged(Bean.of(AApp.class));
+        public static final BootstrapApp<AApp> BOOTSTRAP_APP = BootstrapApp.of(LifecycleKind.MANAGED, Bean.of(AApp.class));
 
         /** Manages the lifecycle of the app. */
         private final ManagedLifecycle lifecycle;
diff --git a/modules/packed/src/main/java/internal/app/packed/service/ServiceComposerLocator.java b/modules/packed/src/main/java/internal/app/packed/service/ServiceComposerLocator.java
@@ -19,6 +19,7 @@
 
 import app.packed.application.BootstrapApp;
 import app.packed.assembly.AbstractComposer;
+import app.packed.lifecycle.LifecycleKind;
 import app.packed.assembly.AbstractComposer.ComposableAssembly;
 import app.packed.assembly.AbstractComposer.ComposerAction;
 import app.packed.assembly.Assembly;
@@ -43,7 +44,7 @@ public class ServiceComposerLocator {
     private static BootstrapApp<ServiceLocator> bootstrap() {
         class ServiceLocatorBootstrap {
             private static final BootstrapApp<ServiceLocator> APP = BootstrapApp
-                    .ofUnmanaged(Bean.<ServiceLocator>of(new Op1<@SidehandleBinding(FROM_CONTEXT) ServiceLocator, ServiceLocator>(e -> e) {}));
+                    .of(LifecycleKind.UNMANAGED, Bean.<ServiceLocator>of(new Op1<@SidehandleBinding(FROM_CONTEXT) ServiceLocator, ServiceLocator>(e -> e) {}));
         }
         return ServiceLocatorBootstrap.APP;
     }
diff --git a/modules/packed/src/main/java/sandbox/application/Te.java b/modules/packed/src/main/java/sandbox/application/Te.java
@@ -20,6 +20,7 @@
 import app.packed.application.ApplicationMirror;
 import app.packed.application.BootstrapApp;
 import app.packed.bean.Bean;
+import app.packed.lifecycle.LifecycleKind;
 import app.packed.component.SidehandleBinding;
 
 /**
@@ -54,7 +55,7 @@
 public final class Te {
 
     /** The bootstrap app. */
-    private static final BootstrapApp<Holder> BOOTSTRAP = BootstrapApp.ofManaged(Bean.of(Holder.class));
+    private static final BootstrapApp<Holder> BOOTSTRAP = BootstrapApp.of(LifecycleKind.MANAGED, Bean.of(Holder.class));
 
     public static void main(String[] args) {
         BOOTSTRAP.getClass();
diff --git a/modules/packed/src/main/java/sandbox/program/ProgramX.java b/modules/packed/src/main/java/sandbox/program/ProgramX.java
@@ -20,6 +20,7 @@
 import app.packed.application.ApplicationMirror;
 import app.packed.application.BootstrapApp;
 import app.packed.assembly.Assembly;
+import app.packed.lifecycle.LifecycleKind;
 import app.packed.bean.Bean;
 import app.packed.binding.Key;
 import app.packed.component.SidehandleBinding;
@@ -164,7 +165,7 @@ record ProgramImplementationX(@SidehandleBinding(FROM_CONTEXT) String name, @Sid
 
     /** An driver for creating App instances. */
 
-    static final BootstrapApp<ProgramImplementationX> DRIVER = BootstrapApp.ofManaged(Bean.of(ProgramImplementationX.class));
+    static final BootstrapApp<ProgramImplementationX> DRIVER = BootstrapApp.of(LifecycleKind.MANAGED, Bean.of(ProgramImplementationX.class));
 
     /** {@inheritDoc} */
     @Override
diff --git a/modules/packed/src/main/java/sandbox/program/ProgramY.java b/modules/packed/src/main/java/sandbox/program/ProgramY.java
@@ -22,6 +22,7 @@
 import app.packed.application.ApplicationMirror;
 import app.packed.application.BootstrapApp;
 import app.packed.assembly.Assembly;
+import app.packed.lifecycle.LifecycleKind;
 import app.packed.bean.Bean;
 import app.packed.binding.Key;
 import app.packed.component.OldContainerTemplateLink;
@@ -169,7 +170,7 @@ record ProgramImplementation(@SidehandleBinding(FROM_CONTEXT) String name, @Side
     static OldContainerTemplateLink EL = OldContainerTemplateLink.of(MethodHandles.lookup(), Ele.MyE.class, "doo").provideExpose(Long.class).build();
 
     /** An driver for creating App instances. */
-    static final BootstrapApp<ProgramImplementation> DRIVER = BootstrapApp.ofManaged(Bean.of(ProgramImplementation.class));
+    static final BootstrapApp<ProgramImplementation> DRIVER = BootstrapApp.of(LifecycleKind.MANAGED, Bean.of(ProgramImplementation.class));
 //
 //            BootstrapApp.of(ProgramImplementation.class, c -> {
 //        c.managedLifetime();
diff --git a/modules/packed/src/test/java/tck/AppAppTest.java b/modules/packed/src/test/java/tck/AppAppTest.java
@@ -17,14 +17,15 @@
 
 import app.packed.application.BootstrapApp;
 import app.packed.bean.Bean;
+import app.packed.lifecycle.LifecycleKind;
 
 /**
  *
  */
 public abstract class AppAppTest extends AbstractBootstrapedAppTest<Void> {
 
     /** The bootstrap app we are testing. */
-    private static final BootstrapApp<Void> APP = BootstrapApp.ofManaged(Bean.of());
+    private static final BootstrapApp<Void> APP = BootstrapApp.of(LifecycleKind.MANAGED, Bean.of());
 
     public AppAppTest() {
         super(APP);
diff --git a/modules/packed/src/test/java/tck/ServiceLocatorAppTest.java b/modules/packed/src/test/java/tck/ServiceLocatorAppTest.java
@@ -19,6 +19,7 @@
 
 import app.packed.application.BootstrapApp;
 import app.packed.bean.Bean;
+import app.packed.lifecycle.LifecycleKind;
 import app.packed.component.SidehandleBinding;
 import app.packed.operation.Op1;
 import app.packed.service.ServiceLocator;
@@ -29,7 +30,7 @@
 public class ServiceLocatorAppTest extends AbstractBootstrapedAppTest<ServiceLocator> {
 
     private static final BootstrapApp<ServiceLocator> APP = BootstrapApp
-            .ofUnmanaged(Bean.<ServiceLocator>of(new Op1<@SidehandleBinding(FROM_CONTEXT) ServiceLocator, ServiceLocator>(e -> e) {}));
+            .of(LifecycleKind.UNMANAGED, Bean.<ServiceLocator>of(new Op1<@SidehandleBinding(FROM_CONTEXT) ServiceLocator, ServiceLocator>(e -> e) {}));
 
     public ServiceLocatorAppTest() {
         super(APP);
diff --git a/modules/packed/src/test/java/tck/application/ApplicationMirrorTest.java b/modules/packed/src/test/java/tck/application/ApplicationMirrorTest.java
@@ -26,6 +26,7 @@
 import app.packed.application.ApplicationMirror;
 import app.packed.application.BootstrapApp;
 import app.packed.bean.Bean;
+import app.packed.lifecycle.LifecycleKind;
 import app.packed.extension.BaseExtension;
 import app.packed.extension.BaseExtensionMirror;
 import tck.AppAppTest;
@@ -73,7 +74,7 @@ public void test() {
     @Disabled
     public void specializeApplicationMirror() {
         // Test default application mirror type
-        BootstrapApp<Void> ba = BootstrapApp.ofManaged(Bean.of(Void.class));
+        BootstrapApp<Void> ba = BootstrapApp.of(LifecycleKind.MANAGED, Bean.of(Void.class));
         assertThat(ba.mirrorOf(new HelloWorldAssembly())).isExactlyInstanceOf(ApplicationMirror.class);
 
         // Specialize application mirror type
@@ -83,7 +84,7 @@ public MyAppMirror(ApplicationHandle<?, ?> handle) {
             }
         }
         // specializeMirror(MyAppMirror::new).
-        ba = BootstrapApp.ofManaged(Bean.of(Void.class));
+        ba = BootstrapApp.of(LifecycleKind.MANAGED, Bean.of(Void.class));
         assertThat(ba.mirrorOf(new HelloWorldAssembly())).isExactlyInstanceOf(MyAppMirror.class);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`
`20`	`20`	`import app.packed.application.BootstrapApp;`
`21`	`21`	`import app.packed.bean.Bean;`
	`22`	`+import app.packed.lifecycle.LifecycleKind;`
`22`	`23`	`import app.packed.component.SidehandleBinding;`
`23`	`24`	`import app.packed.component.SidehandleContext;`
`24`	`25`	`import app.packed.lifecycle.runtime.ManagedLifecycle;`
`@@ -31,12 +32,12 @@ static final class PackedApp {`
`31`	`32`
`32`	`33`	`/** The bootstrap app for this application. */`
`33`	`34`	`// Hmm, read of constructor, think we need module expose to packed, should probably be in the docs somewhere`
`34`		`- public static final BootstrapApp<PackedApp> BOOTSTRAP_APP = BootstrapApp.ofManaged(Bean.of(PackedApp.class));`
	`35`	`+ public static final BootstrapApp<PackedApp> BOOTSTRAP_APP = BootstrapApp.of(LifecycleKind.MANAGED, Bean.of(PackedApp.class));`
`35`	`36`
`36`	`37`	`PackedApp(@SidehandleBinding(FROM_CONTEXT) ManagedLifecycle lc, SidehandleContext context) {`
`37`	`38`	`}`
`38`	`39`	`}`
`39`	`40`	`public static void main(String[] args) {`
`40`		`- BootstrapApp.ofManaged(Bean.of(PackedApp.class));`
	`41`	`+ BootstrapApp.of(LifecycleKind.MANAGED, Bean.of(PackedApp.class));`
`41`	`42`	`}`
`42`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`
`18`	`18`	`import app.packed.application.BootstrapApp;`
`19`	`19`	`import app.packed.bean.Bean;`
	`20`	`+import app.packed.lifecycle.LifecycleKind;`
`20`	`21`
`21`	`22`	`/**`
`22`	`23`	`*`
`@@ -25,6 +26,6 @@ public class NewApp {`
`25`	`26`	`static final class PackedApp {}`
`26`	`27`
`27`	`28`	`public static void main(String[] args) {`
`28`		`- BootstrapApp.ofManaged(Bean.of(PackedApp.class));`
	`29`	`+ BootstrapApp.of(LifecycleKind.MANAGED, Bean.of(PackedApp.class));`
`29`	`30`	`}`
`30`	`31`	`}`