Updates

a

Author: kaspernielsen

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

@@ -43,6 +43,7 @@ static void run(Assembly assembly, Wirelet... wirelets) {
 
     static void run(Assembly assembly, String[] args, Wirelet... wirelets) {
         // Maybe checked run...
+       // App.launcherOf(assembly, wirelets).args(args).
         App.run(assembly, Wirelets.argList(args).andThen(wirelets));
     }
 }

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

@@ -72,7 +72,7 @@ static void verify(Class<?> resultType, Assembly assembly, Wirelet... wirelets)
 
     // Kunne vi supportere en Callable????
     // Saa kan folk submitte den til en executor...
-    interface Image<T> {
+    interface Image<T> extends Launcher<T> {
 
         // Mindfuck
         // Do we unwrap UnhandledApplicationExtension? Hmm
@@ -96,6 +96,10 @@ interface Image<T> {
 
         JobApp<T> start();
     }
+
+    interface Launcher<T> {
+
+    }
 }
 
 class TestIt extends BaseAssembly {

modules/packed-incubator/packed-incubator-concurrent/src/main/java/app/packed/concurrent/other/ScheduledJobExtension.java

@@ -75,7 +75,7 @@ public void onAnnotatedMethod(Annotation hook, BeanIntrospector.OnMethod method)
             OperationHandle<?> operation = method.newOperation(OT).install(OperationHandle::new);
 
             InstanceBeanConfiguration<SchedulingBean> bean = extension().lifetimeRoot().base().installIfAbsent(SchedulingBean.class, handle -> {
-                handle.bindServiceInstance(MethodHandle.class, operation.invokerAsMethodHandle());
+                handle.bindServiceInstance(MethodHandle.class, operation.invoker().asMethodHandle());
             });
             // bean, add scheduling +
             // Manytons dur ikke direkte

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

@@ -50,7 +50,7 @@ public final class DaemonOperationHandle extends ThreadedOperationHandle<DaemonJ
     }
 
     public DaemonRuntimeOperationConfiguration runtimeConfiguration() {
-        return new DaemonRuntimeOperationConfiguration(runtimeThreadFactory(), invokerAsMethodHandle());
+        return new DaemonRuntimeOperationConfiguration(runtimeThreadFactory(), invoker().asMethodHandle());
     }
 
     /** {@inheritDoc} */

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

@@ -19,7 +19,7 @@
 import app.packed.bean.BeanConfiguration;
 import app.packed.bean.BeanHandle;
 import app.packed.bean.BeanInstaller;
-import app.packed.bean.BeanKind;
+import app.packed.bean.BeanLifetime;
 import app.packed.bean.BeanTemplate;
 import app.packed.component.ComponentRealm;
 import app.packed.concurrent.ThreadNamespaceConfiguration;
@@ -85,7 +85,7 @@ protected void onClose() {
 
         // Install deamon manager if we have any operations.
         if (daemons.length > 0) {
-            BeanConfiguration b = new ProvidableBeanConfiguration<>(newBeanBuilderSelf(BeanKind.CONTAINER.template()).install(Bean.of(DaemonRuntimeManager.class), BeanHandle::new));
+            BeanConfiguration b = new ProvidableBeanConfiguration<>(newBeanBuilderSelf(BeanLifetime.SINGLETON.template()).install(Bean.of(DaemonRuntimeManager.class), BeanHandle::new));
             b.bindServiceInstance(DaemonRuntimeOperationConfiguration[].class, daemons);
         }
     }

modules/packed/src/main/java/app/packed/application/App-Org.md

@@ -0,0 +1,60 @@
+ApplicationHandle fungere ikke super godt
+
+XConfiguration is used for hooks... So we need 1Handle=1Configuration and we need to always construct it
+
+Vi har reelt set 3 ting.
+
+
+ApplicationConfiguration
+ApplicationHandle
+ApplicationTemplate
+ApplicationInstaller
+
+ApplicationInterface
+ApplicationImage
+ApplicationLauncher (Kun aktuelt hvis man vil launcher 1 gang, men så skal man ikke bruge Repo)
+
+Handler<AppInterface, Image, Launcher>
+Launcher
+Image
+AppInterface
+
+[ApplicationMirror] skal jo også castes
+
+
+OperationTemplate
+  OperationInstaller
+    OperationHandle
+      InvokerFactory
+        <Invoker>
+      OperationConfiguration  
+
+
+BeanTemplate      -> Extension
+ BeanInstaller     -> Extension
+  BeanHandle        -> Extension
+   InvokerFactory    -> [Creates an Image, Launcher is args]
+     <Invoker>
+   BeanConfiguration -> User
+     <BeanInstance>
+
+// Runtime
+Invoker
+
+Template->Installer->Handle -> BeanConfiguraiton
+
+
+
+ApplicationImage  -> 
+
+
+
+Vi vil gerne kunne lave 
+  A
+  XApp.Image
+  XApp.Launcher
+  
+  
+=== Fra  
+BootStrap
+RepoKid (Altid kun images)

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

@@ -4,6 +4,7 @@
 
 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;
@@ -105,14 +106,12 @@ public interface App extends AutoCloseable, ApplicationInterface {
      *            optional wirelets for configuration
      * @return an image that can be used to launch the application
      */
-    // By default I think it is single launchable...
-    // Mayb
     static Image imageOf(Assembly assembly, Wirelet... wirelets) {
         return new PackedApp.AppImage(PackedApp.BOOTSTRAP_APP.imageOf(assembly, wirelets));
     }
 
     static Launcher launcherOf(Assembly assembly, Wirelet... wirelets) {
-        throw new UnsupportedOperationException();
+        return new PackedApp.AppLauncher(PackedApp.BOOTSTRAP_APP.launcher(assembly, wirelets));
     }
 
     static void main(String[] args) {
@@ -229,6 +228,12 @@ interface Launcher extends ApplicationLauncher {
 
         // Config also
 
+
+        @Override
+        default <T> Launcher provide(Key<? super T> key, T value) {
+            return null;
+        }
+
         default Launcher alwaysRestart() {
             return this;
         }

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

@@ -24,10 +24,11 @@
 import internal.app.packed.application.PackedApplicationInstaller;
 import internal.app.packed.application.PackedBootstrapImage.ImageEager;
 import internal.app.packed.application.PackedBootstrapImage.ImageNonReusable;
+import internal.app.packed.util.accesshelper.AccessHelper;
+import internal.app.packed.util.accesshelper.ApplicationAccessHandler;
 
 /**
- * An application handle represents an installed application towards the person
- * An extendable handle for an application.
+ * An application handle represents a fully built application.
  */
 public non-sealed class ApplicationHandle<A, C extends ApplicationConfiguration> extends ComponentHandle implements ApplicationBuildLocal.Accessor {
 
@@ -65,9 +66,27 @@ public ApplicationHandle(ApplicationInstaller<?> installer) {
             }
         }
         this.image = img;
-
     }
 
+//    /**
+//     * 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???
+//    public final BootstrapApp.Image<A> newImage() {
+//        if (buildGoal() != BuildGoal.IMAGE) {
+//            throw new IllegalStateException("The application must be installed with BuildImage, was " + application.goal);
+//        }
+//        BootstrapApp.Image<A> img = null;
+//        img = new ImageEager<>(this);
+//        if (!inst.optionBuildReusableImage) {
+//            img = new ImageNonReusable<>(img);
+//        }
+//    }
+
     /** {@return the build goal that was used to build the application} */
     public final BuildGoal buildGoal() {
         return application.goal;
@@ -110,7 +129,7 @@ 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 BootstrapApp.Image<A> image() {
+    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);
@@ -173,4 +192,24 @@ protected ApplicationMirror newApplicationMirror() {
 //        // We can have removeFromRepository();
 //        return Optional.empty();
 //    }
+
+    static {
+        AccessHelper.initHandler(ApplicationAccessHandler.class, new ApplicationAccessHandler() {
+
+            @Override
+            public ApplicationHandle<?, ?> getApplicationConfigurationHandle(ApplicationConfiguration configuration) {
+                return configuration.handle();
+            }
+
+            @Override
+            public ApplicationSetup getApplicationHandleApplication(ApplicationHandle<?, ?> handle) {
+                return handle.application;
+            }
+
+            @Override
+            public ApplicationHandle<?, ?> getApplicationMirrorHandle(ApplicationMirror mirror) {
+                return mirror.handle;
+            }
+        });
+    }
 }

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

@@ -46,7 +46,7 @@
 public non-sealed class ApplicationMirror implements ComponentMirror, ApplicationBuildLocal.Accessor {
 
     /** The application's handle. */
-    private final ApplicationHandle<?, ?> handle;
+    final ApplicationHandle<?, ?> handle;
 
     /**
      * Create a new application mirror.

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

@@ -68,6 +68,23 @@ default boolean isManaged() {
      */
     ApplicationTemplate<H> withRootContainer(ContainerTemplate<?> template);
 
+    static <I> Builder<I> builder(Class<I> hostClass) {
+        throw new UnsupportedOperationException();
+    }
+
+    static <I> Builder<I> builder(Op<I> hostOp) {
+        throw new UnsupportedOperationException();
+    }
+
+    interface Builder<I> {
+
+       Builder<I> unmanaged();
+
+       ApplicationTemplate<ApplicationHandle<I, ApplicationConfiguration>> build();
+
+       <H extends ApplicationHandle<I, ?>> ApplicationTemplate<H> build(Class<? super H> handleClass,
+               Function<? super ApplicationInstaller<H>, ? extends H> handleFactory);
+    }
 //    /**
 //     * Create a new application template, that will use
 //     *