er

Author: kaspernielsen

modules/packed/src/main/java/app/packed/application/ApplicationHandle.java

@@ -17,12 +17,13 @@
 
 import java.util.function.Supplier;
 
+import org.jspecify.annotations.Nullable;
+
 import app.packed.application.BootstrapApp.Image;
 import app.packed.build.BuildGoal;
 import app.packed.component.ComponentHandle;
 import app.packed.component.ComponentPath;
 import app.packed.component.Sidehandle;
-import org.jspecify.annotations.Nullable;
 import internal.app.packed.application.ApplicationSetup;
 import internal.app.packed.application.PackedApplicationInstaller;
 import internal.app.packed.application.PackedBootstrapImage.ImageEager;
@@ -118,26 +119,10 @@ public final C configuration() {
         return configuration.get();
     }
 
-    /**
-     * The image
-     *
-     * @return the base image for the application
-     * @throws IllegalStateException
-     *             if the application was build with {@link BuildGoal#IMAGE}.
-     */
-    // Tror jeg fjerner den her... BaseImage er kun noget man bruger ved rødder tænker jeg???
-    final BootstrapApp.Image<A> image() {
-        BootstrapApp.Image<A> i = image;
-        if (i == null) {
-            throw new IllegalStateException("The application must be installed with BuildImage, was " + application.goal);
-        }
-        return i;
-    }
-
     public final Sidehandle sidehandle() {
         Sidehandle sidehandle = application.sidehandle;
         if (sidehandle == null) {
-            throw new UnsupportedOperationException("Operation has not been attached to a sidehandle");
+            throw new UnsupportedOperationException("Application has not been attached to a sidehandle");
         }
         return sidehandle;
     }

modules/packed/src/main/java/app/packed/application/ApplicationLauncher.java

@@ -22,6 +22,15 @@
 /**
  * Launches an application.
  */
+
+// Grunden til vi ikke gider koere abstract klasse, er at metoderne alligevel skal overrides.
+// Fordi vi koere method chanining. Subclasses skal ikke returnere ApplicationLauncher men
+// Subclass
+
+
+// Vi mangler to ting vil jeg mere
+/// 1) Noget med nogle options a.la. DEBUG all
+/// 2) Noget med Configs (naar det kommer)
 public interface ApplicationLauncher {
 
     default ApplicationLauncher args(String... args) {
@@ -41,11 +50,10 @@ default <T> ApplicationLauncher provide(Class<? super T> key, T instance) {
 
     default ApplicationLauncher provide(Object instance) {
         requireNonNull(instance, "object cannot be null");
-        return provideCaptured(this, instance.getClass(), instance);
+        return provide(this, instance.getClass(), instance);
     }
 
-    private static <T> ApplicationLauncher provideCaptured(
-            ApplicationLauncher self, Class<T> type, Object instance) {
+    private static <T> ApplicationLauncher provide(ApplicationLauncher self, Class<T> type, Object instance) {
         return self.provide(type, type.cast(instance));
     }
 }

modules/packed/src/main/java/app/packed/application/BootstrapApp.java

@@ -112,7 +112,9 @@ public sealed interface BootstrapApp<I> extends ApplicationInterface permits Pac
      *             if the application threw an exception that could not be handled
      * @see App#run(Assembly, Wirelet...)
      */
-    I launch(RunState state, Assembly assembly, Wirelet... wirelets);
+    default I launch(RunState state, Assembly assembly, Wirelet... wirelets) {
+        return launcher(assembly, wirelets).launch(state);
+    }
 
     Launcher<I> launcher(Assembly assembly, Wirelet... wirelets);
 
@@ -162,33 +164,6 @@ default <E> BootstrapApp<E> map(Function<? super I, ? extends E> mapper) {
     // withExpectingResult
     BootstrapApp<I> withExpectsResult(Class<?> resultType);
 
-    /**
-     * Augment the driver with the specified wirelets, that will be processed when building or instantiating new
-     * applications.
-     * <p>
-     * For example, to : <pre> {@code
-     * BootstrapApp<App> app = ...;
-     * app = app.with(ApplicationWirelets.timeToRun(2, TimeUnit.MINUTES));
-     * }</pre>
-     *
-     * ApplicationW
-     * <p>
-     * This method will make no attempt of validating the specified wirelets.
-     *
-     * <p>
-     * Wirelets that were specified when creating the driver, or through previous invocation of this method. Will be
-     * processed before the specified wirelets.
-     *
-     * @param wirelets
-     *            the wirelets to add
-     * @return the new bootstrap app
-     */
-    // Before orAfter
-    default BootstrapApp<I> withWirelets(boolean before, Wirelet... wirelets) {
-        // Lad os ogsaa lige se med expectsResult, inde vi implementere det
-        throw new UnsupportedOperationException();
-    }
-
     static <A> BootstrapApp<A> of(LifecycleKind lifecycleKind, Bean<A> bean) {
         return PackedBootstrapApp.of(lifecycleKind, bean);
     }
@@ -243,15 +218,6 @@ default <E> Image<E> map(Function<? super A, ? extends E> mapper) {
     */
     interface Launcher<A> extends ApplicationLauncher {
 
-        /**
-         * Create a new instance of the application in the initialized state.
-         *
-         * @return
-         */
-        default A initialize() {
-            return launch(RunState.INITIALIZED);
-        }
-
         /**
          * Launches an instance of the application that this image represents in the specified state.
          * <p>
@@ -290,14 +256,6 @@ public Image<E> imageOf(Assembly assembly, Wirelet... wirelets) {
         return ba.map(mapper);
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public E launch(RunState state, Assembly assembly, Wirelet... wirelets) {
-        A result = app.launch(state, assembly, wirelets);
-        E e = mapper.apply(result);
-        return e;
-    }
-
     /** {@inheritDoc} */
     @Override
     public ApplicationMirror mirrorOf(Assembly assembly, Wirelet... wirelets) {
@@ -324,4 +282,32 @@ public void verify(Assembly assembly, Wirelet... wirelets) {
     public Launcher<E> launcher(Assembly assembly, Wirelet... wirelets) {
         throw new UnsupportedOperationException();
     }
-}
+}
+
+///**
+//* Augment the driver with the specified wirelets, that will be processed when building or instantiating new
+//* applications.
+//* <p>
+//* For example, to : <pre> {@code
+//* BootstrapApp<App> app = ...;
+//* app = app.with(ApplicationWirelets.timeToRun(2, TimeUnit.MINUTES));
+//* }</pre>
+//*
+//* ApplicationW
+//* <p>
+//* This method will make no attempt of validating the specified wirelets.
+//*
+//* <p>
+//* Wirelets that were specified when creating the driver, or through previous invocation of this method. Will be
+//* processed before the specified wirelets.
+//*
+//* @param wirelets
+//*            the wirelets to add
+//* @return the new bootstrap app
+//*/
+//// Before orAfter <---- Just this question alone makes we want to not support it
+//@Deprecated
+//default BootstrapApp<I> withWirelets(boolean before, Wirelet... wirelets) {
+//  // Lad os ogsaa lige se med expectsResult, inde vi implementere det
+//  throw new UnsupportedOperationException();
+//}

modules/packed/src/main/java/app/packed/application/PackedApp.java

@@ -86,18 +86,6 @@ public void run() {
         public App start() {
             return image.launch(RunState.RUNNING);
         }
-//
-//        /** {@inheritDoc} */
-//        @Override
-//        public void checkedRun(Wirelet... wirelets) throws UnhandledApplicationException {
-//            image.checkedLaunch(RunState.TERMINATED, wirelets);
-//        }
-//
-//        /** {@inheritDoc} */
-//        @Override
-//        public App checkedStart(Wirelet... wirelets) throws UnhandledApplicationException {
-//            return image.checkedLaunch(RunState.RUNNING, wirelets);
-//        }
 
         /** {@inheritDoc} */
         @Override
@@ -118,6 +106,7 @@ record AppLauncher(BootstrapApp.Launcher<PackedApp> launcher) implements App.Lau
         /** {@inheritDoc} */
         @Override
         public <T> AppLauncher provide(Key<? super T> key, T value) {
+            launcher.provide(key, value);
             return this;
         }
 

modules/packed/src/main/java/app/packed/application/PackedBootstrapApp.java

@@ -25,15 +25,17 @@
 import app.packed.container.Wirelet;
 import app.packed.extension.BaseExtension;
 import app.packed.lifecycle.LifecycleKind;
-import app.packed.lifecycle.RunState;
 import internal.app.packed.ValueBased;
+import internal.app.packed.application.PackedApplicationInstaller;
 import internal.app.packed.application.PackedApplicationTemplate;
 import internal.app.packed.application.PackedApplicationTemplate.ApplicationInstallingSource;
+import internal.app.packed.application.PackedBootstrapImage.ImageEager;
+import internal.app.packed.application.PackedBootstrapImage.ImageNonReusable;
+import internal.app.packed.application.PackedBootstrapLauncher;
 import internal.app.packed.bean.sidehandle.SidehandleBeanHandle;
 import internal.app.packed.extension.ExtensionSetup;
 import internal.app.packed.invoke.MethodHandleInvoker.ApplicationBaseLauncher;
 import internal.app.packed.invoke.ServiceSupport;
-import internal.app.packed.lifecycle.runtime.ApplicationLaunchContext;
 
 /** Implementation of {@link BootstrapApp}. */
 @ValueBased
@@ -44,8 +46,8 @@ final class PackedBootstrapApp<A, H extends ApplicationHandle<A, ?>> implements
     // So beans do not uses hooks from various extensions
     // Or maybe we check this somewhere. I think SidehandleBinding is the only supported annotation + Lifecycle
     // Maybe all base extension actually.
-    private static final PackedApplicationTemplate<?> BOOTSTRAP_APP_TEMPLATE =
-            PackedApplicationTemplate.of(LifecycleKind.UNMANAGED, Bean.of(PackedBootstrapApp.class));
+    private static final PackedApplicationTemplate<?> BOOTSTRAP_APP_TEMPLATE = PackedApplicationTemplate.of(LifecycleKind.UNMANAGED,
+            Bean.of(PackedBootstrapApp.class));
 
     /** The application launcher. */
     private final ApplicationBaseLauncher launcher;
@@ -67,31 +69,30 @@ private PackedBootstrapApp(PackedApplicationTemplate<H> template, ApplicationBas
     /** {@inheritDoc} */
     @Override
     public Image<A> imageOf(Assembly assembly, Wirelet... wirelets) {
-        ApplicationInstaller<H> installer = template.newInstaller(this, BuildGoal.IMAGE, launcher, wirelets);
+        PackedApplicationInstaller<H> installer = template.newInstaller(this, BuildGoal.IMAGE, launcher, wirelets);
 
         // Build the application
         H handle = installer.install(assembly);
 
-        // Returns an image for the application
-        return handle.image();
+        // Create an image for the application
+        BootstrapApp.Image<A> img = new ImageEager<>(handle);
+        if (!installer.optionBuildReusableImage) {
+            img = new ImageNonReusable<>(img);
+        }
+
+        return img;
     }
 
     /** {@inheritDoc} */
     @Override
-    public A launch(RunState state, Assembly assembly, Wirelet... wirelets) {
+    public Launcher<A> launcher(Assembly assembly, Wirelet... wirelets) {
         ApplicationInstaller<H> installer = template.newInstaller(this, BuildGoal.LAUNCH, launcher, wirelets);
 
         // Build the application
         H handle = installer.install(assembly);
 
-        // Create and return an instance of the application interface, wirelets have already been specified in the installer
-        return ApplicationLaunchContext.launch(handle, state);
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public Launcher<A> launcher(Assembly assembly, Wirelet... wirelets) {
-        return imageOf(assembly, wirelets);
+        // Returns an launcher for the application
+        return new PackedBootstrapLauncher<A>(handle);
     }
 
     /** {@inheritDoc} */

modules/packed/src/main/java/app/packed/lifecycle/runtime/ManagedLifecycle.java

@@ -110,13 +110,6 @@ public interface ManagedLifecycle {
     RunState currentState();
 
     boolean isFailed();
-    //
-//  default int entryPointId() {
-//      return -1;
-//  }
-
-    // Vs main?????
-    // Tror main er bl.a. propper det ind som et system image...
 
     /**
      * Starts and awaits the component if it has not already been started.
@@ -152,10 +145,6 @@ default ManagedLifetimeState state() {
      */
     void stop(StopOption... options);
 
-    default Optional<StopInfo> stopInfo() {
-        return Optional.empty();
-    }
-
     default CompletableFuture<Void> stopAsync(StopOption... options) {
         return stopAsync(null, new StopOption[] {});
     }
@@ -177,6 +166,10 @@ default CompletableFuture<Void> stopAsync(StopOption... options) {
     // Does not take null. use StopAsync
     <T> CompletableFuture<T> stopAsync(T result, StopOption... options);
 
+    default Optional<StopInfo> stopInfo() {
+        return Optional.empty();
+    }
+
     // Den er cool men sgu ikke super smart for forstaelsen
 //    static void run(Assembly  assembly, Wirelet... wirelets) {
 //        ApplicationRuntimeImplementation.DRIVER.launch(assembly, wirelets);

modules/packed/src/main/java/app/packed/lifecycle/runtime/StopInfo.java

@@ -100,17 +100,18 @@ private Trigger(String trigger) {
         // Session Time Out (Maa vaere SESSION_TIMEOUT)
         public static final Trigger TIMEOUT = new Trigger("Timeout");
 
-        /** An entry-point completed normally. */
-        public static final Trigger ENTRY_POINT_COMPLETED = new Trigger("Normal");
-
         public static final Trigger NORMAL = new Trigger("Normal");
 
         public static final Trigger FAILED_INTERNALLY = new Trigger("Failed");
 
-        public static final Trigger RESTARTING = new Trigger("Restarting");
+        //public static final Trigger RESTARTING = new Trigger("Restarting");
 
         public static final Trigger UNKNOWN = new Trigger("Unknown");
 
+        @Override
+        public String toString() {
+            return trigger;
+        }
 //       WAS
         // NORMAL, EXECUTION_FAILED,
 //       PERSISTING,

…/packed/lifecycle/runtime/LaunchArg.java …/java/app/packed/lifetime/LaunchArg.javamodules/packed/src/main/java/app/packed/lifecycle/runtime/LaunchArg.java renamed to modules/packed/src/main/java/app/packed/lifetime/LaunchArg.java modules/packed/src/main/java/app/packed/lifecycle/runtime/LaunchArg.java renamed to modules/packed/src/main/java/app/packed/lifetime/LaunchArg.java

@@ -13,12 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package app.packed.lifecycle.runtime;
+package app.packed.lifetime;
 
 /**
  *
  */
 // Ideen er lidt at dette er runtime Wirelet
+// Hvorfor ikke bare en Doo <--- required
 
 // Needs to be well integrated with application.properties
 public @interface LaunchArg {

modules/packed/src/main/java/app/packed/service/ServiceLocator.java

@@ -29,7 +29,6 @@
 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.AutoService;
@@ -38,6 +37,7 @@
 import app.packed.component.SidehandleBinding;
 import app.packed.container.Wirelet;
 import app.packed.extension.BaseExtension;
+import app.packed.lifecycle.LifecycleKind;
 import app.packed.lifecycle.RunState;
 import app.packed.operation.Op1;
 import internal.app.packed.lifecycle.runtime.PackedExtensionContext;
@@ -387,7 +387,7 @@ private Image(BootstrapApp.Image<ServiceLocator> image) {
 
         /** Creates a new service locator application from this image. */
         public ServiceLocator initialize() {
-            return image.initialize();
+            return image.launch(RunState.INITIALIZED);
         }
     }
 }