updates

Author: kaspernielsen

modules/packed-incubator/packed-incubator-cli/src/main/java/app/packed/cli/other/PackedCliApp.java

@@ -18,7 +18,6 @@
 import app.packed.application.App;
 import app.packed.application.ApplicationTemplate;
 import app.packed.application.BootstrapApp;
-import app.packed.application.BootstrapImage;
 import app.packed.assembly.Assembly;
 import app.packed.container.Wirelet;
 import app.packed.runtime.RunState;
@@ -89,9 +88,9 @@ class ServiceLocatorBootstrap {
     public static final class Image {
 
         /** The bootstrap image we are delegating to */
-        private final BootstrapImage<?> image;
+        private final BootstrapApp.Image<?> image;
 
-        private Image(BootstrapImage<?> image) {
+        private Image(BootstrapApp.Image<?> image) {
             this.image = image;
         }
 

modules/packed-incubator/packed-incubator-concurrent/src/main/java/app/packed/concurrent/job/PackedJobApp.java

@@ -20,7 +20,6 @@
 
 import app.packed.application.ApplicationTemplate;
 import app.packed.application.BootstrapApp;
-import app.packed.application.BootstrapImage;
 import app.packed.component.guest.ComponentHostContext;
 import app.packed.component.guest.FromGuest;
 import app.packed.runtime.ManagedLifecycle;
@@ -67,7 +66,7 @@ public String toString() {
     }
 
     /** Implementation of {@link app.packed.application.App.Image}. */
-    record AppImage(BootstrapImage<PackedJobApp> image) implements JobApp.Image {
+    record AppImage(BootstrapApp.Image<PackedJobApp> image) implements JobApp.Image {
 
         /** {@inheritDoc} */
         @Override

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

@@ -4,7 +4,6 @@
 
 import app.packed.application.App.Launcher;
 import app.packed.assembly.Assembly;
-import app.packed.binding.Key;
 import app.packed.container.Wirelet;
 import app.packed.runtime.RunState;
 import app.packed.runtime.StopOption;
@@ -108,14 +107,19 @@ public interface App extends AutoCloseable, ApplicationInterface {
      */
     // By default I think it is single launchable...
     // Mayb
-    static App.Image imageOf(Assembly assembly, Wirelet... wirelets) {
+    static Image imageOf(Assembly assembly, Wirelet... wirelets) {
         return new PackedApp.AppImage(PackedApp.BOOTSTRAP_APP.imageOf(assembly, wirelets));
     }
 
-    static App.Launcher launcherOf(Assembly assembly, Wirelet... wirelets) {
+    static Launcher launcherOf(Assembly assembly, Wirelet... wirelets) {
         throw new UnsupportedOperationException();
     }
 
+    static void main(String[] args) {
+        // launcher(
+        CliLaunchers.mainArgs(App.launcherOf(null), args).start();
+    }
+
     /**
      * Creates a mirror representation of the application for analysis purposes.
      *
@@ -164,23 +168,6 @@ static void run(Assembly assembly, Wirelet... wirelets) {
         PackedApp.BOOTSTRAP_APP.launch(RunState.TERMINATED, assembly, wirelets);
     }
 
-    /**
-     * Builds and starts an application, returning when it reaches the {@link RunState#RUNNING} state.
-     *
-     * @param assembly
-     *            the application's assembly
-     * @param wirelets
-     *            optional wirelets for configuration
-     * @return the running application instance
-     * @throws app.packed.build.BuildException
-     *             if the application failed to build
-     * @throws UnhandledApplicationException
-     *             if the application failed to start
-     */
-    static App start(Assembly assembly, Wirelet... wirelets) {
-        return PackedApp.BOOTSTRAP_APP.launch(RunState.RUNNING, assembly, wirelets);
-    }
-
     /**
      * Tests an application using the provided test consumer.
      *
@@ -199,6 +186,23 @@ static App start(Assembly assembly, Wirelet... wirelets) {
 //        throw new UnsupportedOperationException();
 //    }
 
+    /**
+     * Builds and starts an application, returning when it reaches the {@link RunState#RUNNING} state.
+     *
+     * @param assembly
+     *            the application's assembly
+     * @param wirelets
+     *            optional wirelets for configuration
+     * @return the running application instance
+     * @throws app.packed.build.BuildException
+     *             if the application failed to build
+     * @throws UnhandledApplicationException
+     *             if the application failed to start
+     */
+    static App start(Assembly assembly, Wirelet... wirelets) {
+        return PackedApp.BOOTSTRAP_APP.launch(RunState.RUNNING, assembly, wirelets);
+    }
+
     /**
      * Builds and verifies an application without running it.
      *
@@ -219,50 +223,9 @@ static void verify(Assembly assembly, Wirelet... wirelets) {
     /**
      * Represents a pre-built application image that can be used to launch application instances.
      */
-    interface Image extends App.Launcher {
+    interface Image extends ApplicationImage, App.Launcher {}
 
-        /**
-         * @return an application
-         * @throws IllegalStateException
-         *             the image is single usage, and has already been used.
-         */
-        // Virker ikke med Containers....
-        default ApplicationMirror mirror() {
-            throw new UnsupportedOperationException();
-        }
-
-        /**
-         * Builds an application and prints its structure to {@code System.out}.
-         *
-         * <p>
-         * This is a convenience method for debugging and analysis purposes.
-         *
-         * @param assembly
-         *            the application's assembly
-         * @param wirelets
-         *            optional wirelets for configuration
-         */
-        default void print() {
-            mirror().printer().print();
-        }
-    }
-
-    interface Launcher {
-        default <T> Launcher provide(Class<T> key, T value) {
-            return this;
-        }
-
-        default <T> Launcher provide(Key<T> key, T value) {
-            return this;
-        }
-
-        default Launcher provide(Object object) {
-            return this;
-        }
-
-        default Launcher args(String... args) {
-            return this;
-        }
+    interface Launcher extends ApplicationLauncher {
 
         // Config also
 
@@ -299,11 +262,6 @@ default Launcher ignoreAllExceptions() {
          */
         App start();
     }
-
-    static void main(String[] args) {
-        // launcher(
-        CliLaunchers.mainArgs(App.launcherOf(null), args).start();
-    }
 }
 
 // Det er jo kun images der er problemet...

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

@@ -15,6 +15,7 @@
  */
 package app.packed.application;
 
+import app.packed.application.BootstrapApp.Image;
 import app.packed.build.BuildGoal;
 import app.packed.component.ComponentHandle;
 import app.packed.component.ComponentPath;
@@ -39,7 +40,7 @@ public non-sealed class ApplicationHandle<A, C extends ApplicationConfiguration>
 
     /** An image if the application has been constructed using {@link BuildGoal#IMAGE}. */
     @Nullable
-    private final BootstrapImage<A> image;
+    private final Image<A> image;
 
     /** The lazy generated application mirror. */
     @Nullable
@@ -56,7 +57,7 @@ public ApplicationHandle(ApplicationInstaller<?> installer) {
         this.application = inst.toSetup();
 
         // Build an image if that is the target.
-        BootstrapImage<A> img = null;
+        BootstrapApp.Image<A> img = null;
         if (inst.buildProcess.goal() == BuildGoal.IMAGE) {
             img = new ImageEager<>(this);
             if (!inst.optionBuildReusableImage) {
@@ -109,8 +110,8 @@ public final C configuration() {
      *             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???
-    public final BootstrapImage<A> image() {
-        BootstrapImage<A> i = image;
+    public 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);
         }

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

@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2008 Kasper Nielsen.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package app.packed.application;
+
+/**
+ * A
+ */
+public interface ApplicationImage extends ApplicationLauncher {
+
+    /** {@return a mirror of the application} */
+    ApplicationMirror mirror();
+
+    /** {@return the name of the application} */
+    String name();
+
+    /**
+     * Prints the structure of the application to {@code System.out}.
+     * <p>
+     * This is a convenience method for debugging and analysis purposes.
+     */
+    default void print() {
+        mirror().printer().print();
+    }
+}

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

@@ -19,15 +19,13 @@
  *
  */
 // Temporary Marker interface.
-public interface ApplicationInterface {
-
-}
+public interface ApplicationInterface {}
 
 //App       (void)
 //JobApp    (Noget med et <T> result)
 //CliApp    (Noget med exit codes, default install shutdown handler)
 //TestApp
 //ServiceLocator (Unmanaged)
-  // Kan vel baade vaere App og Pod
+// Kan vel baade vaere App og Pod
 
 //DaemonApp <-- App, Job or CliApp, med restart?

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

@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2008 Kasper Nielsen.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package app.packed.application;
+
+import app.packed.binding.Key;
+
+/**
+ *
+ */
+public interface ApplicationLauncher {
+
+    default ApplicationLauncher args(String... args) {
+        throw new UnsupportedOperationException();
+    }
+
+    // Kan vi vel smide på imaged
+    default ApplicationLauncher named(String name) {
+        throw new UnsupportedOperationException();
+    }
+
+    default <T> ApplicationLauncher provide(Class<? super T> key, T value) {
+        return provide(Key.of(key), value);
+    }
+
+    <T> ApplicationLauncher provide(Key<? super T> key, T value);
+
+    @SuppressWarnings({ "unchecked", "rawtypes" })
+    default ApplicationLauncher provide(Object object) {
+        return provide((Class) object.getClass(), object);
+    }
+}