qwe

Author: kaspernielsen

TODO.txt

@@ -14,4 +14,12 @@ Cleanup bindings
 Figure out how binding-handles work 
 
 
------ app.packed.namespace -----
+----- app.packed.namespace -----
+
+
+
+
+---- Modules
+packed-base
+packed-base-devtools   <---- Testing
+packed-base-devops     <---- What went wrong, Observability

modules/packed-incubator/packed-incubator-cli/src/main/java/app/packed/cli/CliCommand.java

@@ -31,12 +31,12 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
 @NamespaceOperation
-@OnAnnotatedMethod(extension = CliExtension.class)
+@OnAnnotatedMethod(introspector = CliExtension.MyI.class)
 public @interface CliCommand {
 
-    /**w
-     * The name(s) of the command. If no name is specified. The name of the annotated method is used. Method names starting
-     * with underscores will automaticalOsly be renamed to hyphens.
+    /**
+     * w The name(s) of the command. If no name is specified. The name of the annotated method is used. Method names
+     * starting with underscores will automaticalOsly be renamed to hyphens.
      *
      * @return the name(s) of the command
      */

modules/packed-incubator/packed-incubator-cli/src/main/java/app/packed/cli/CliExtension.java

@@ -34,6 +34,9 @@
 /**
  * An extension that
  */
+
+// Det er faktisk kun CliCommand der stjaeler execution
+// CliOption er ikke noget problem
 public class CliExtension extends FrameworkExtension<CliExtension> {
 
     /**
@@ -71,21 +74,17 @@ CliNamespaceHandle ns() {
         return applicationRoot().namespaceLazy(CliNamespaceHandle.TEMPLATE, "main");
     }
 
-    /** {@inheritDoc} */
-    @Override
-    protected BeanIntrospector newBeanIntrospector() {
-        return new BeanIntrospector() {
-
-            /** {@inheritDoc} */
-            @Override
-            public void onAnnotatedMethod(Annotation hook, BeanIntrospector.OnMethod method) {
-                if (hook instanceof CliCommand c) {
-                    ns().process(CliExtension.this, c, method);
-                } else {
-                    super.onAnnotatedMethod(hook, method);
-                }
+    static class MyI extends BeanIntrospector<CliExtension> {
+
+        /** {@inheritDoc} */
+        @Override
+        public void onAnnotatedMethod(Annotation hook, BeanIntrospector.OnMethod method) {
+            if (hook instanceof CliCommand c) {
+                extension().ns().process(extension(), c, method);
+            } else {
+                super.onAnnotatedMethod(hook, method);
             }
-        };
+        }
     }
 
     public CliNamespaceConfiguration namespace() {
@@ -113,9 +112,9 @@ public ContainerConfiguration newContainer(Wirelet... wirelets) {
     }
 
     @Override
-    protected void onApplicationClose() {
+    protected void onClose() {
         System.out.println("Have commands for " + ns().oldCommands.keySet());
 
-        super.onApplicationClose();
+        super.onClose();
     }
 }

modules/packed-incubator/packed-incubator-cli/src/main/java/app/packed/cli/CliNamespaceConfiguration.java

@@ -17,7 +17,7 @@
 
 import java.util.function.Consumer;
 
-import app.packed.build.BuildActor;
+import app.packed.component.ComponentRealm;
 import app.packed.namespace.NamespaceBuildHook;
 import app.packed.namespace.NamespaceConfiguration;
 
@@ -28,7 +28,7 @@ public final class CliNamespaceConfiguration extends NamespaceConfiguration<CliE
 
     final CliNamespaceHandle handle;
 
-    public CliNamespaceConfiguration(CliNamespaceHandle o, CliExtension cli, BuildActor actor) {
+    public CliNamespaceConfiguration(CliNamespaceHandle o, CliExtension cli, ComponentRealm actor) {
         super(o, cli, actor);
         this.handle = o;
     }

modules/packed-incubator/packed-incubator-cli/src/main/java/app/packed/cli/CliNamespaceHandle.java

@@ -19,7 +19,7 @@
 
 import app.packed.bean.BeanInstallationException;
 import app.packed.bean.scanning.BeanIntrospector;
-import app.packed.build.BuildActor;
+import app.packed.component.ComponentRealm;
 import app.packed.namespace.NamespaceHandle;
 import app.packed.namespace.NamespaceInstaller;
 import app.packed.namespace.NamespaceTemplate;
@@ -47,7 +47,7 @@ protected CliNamespaceMirror newNamespaceMirror() {
     }
 
     @Override
-    protected CliNamespaceConfiguration newNamespaceConfiguration(CliExtension e, BuildActor actor) {
+    protected CliNamespaceConfiguration newNamespaceConfiguration(CliExtension e, ComponentRealm actor) {
         return new CliNamespaceConfiguration(this, e, actor);
     }
 

modules/packed-incubator/packed-incubator-cli/src/main/java/app/packed/cli/CliNamespaceMirror.java

@@ -18,6 +18,7 @@
 import java.util.stream.Stream;
 
 import app.packed.namespace.NamespaceMirror;
+import app.packed.operation.OperationMirror;
 
 /**
  * Represents a CLI namespace where {@link CliCommandMirror commands} and global {@link CliOption options} are unique.
@@ -33,8 +34,9 @@ public final class CliNamespaceMirror extends NamespaceMirror<CliExtension> {
     }
 
     /** {@return all commands within the namespace.} */
-    public Stream<CliCommandMirror> commands() {
-        return operations(CliCommandMirror.class);
+    // Hmm this includes operations owned by extensions
+    public OperationMirror.OfStream<CliCommandMirror> commands() {
+        return operations().ofType(CliCommandMirror.class);
     }
 
     /** {@return all commands within the namespace.} */

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

@@ -16,99 +16,28 @@
 package app.packed.cli.other;
 
 import app.packed.application.App;
-import app.packed.application.ApplicationTemplate;
-import app.packed.application.BaseImage;
-import app.packed.application.BootstrapApp;
 import app.packed.assembly.Assembly;
 import app.packed.container.Wirelet;
 import app.packed.container.Wirelets;
-import app.packed.runtime.RunState;
 
 /**
  *
  */
-//Like App but calls system exit and prints stack
-//traces to system.err
+// Maybe it is just a thin wrapper for App
+public interface CliApp {
 
-// CliApp er maaske i virkeligheden mere noget der har praecist mest 1 entrypoint.
+    // But isn't this normally in the code???
+    // Maybe a StopOption?
+    // ObjectToInt(ApplicationException->int errorCode)
 
-// Er ikke noedvendigvis managed. Eller det kan den jo ligesaa godt eftersom vi ikke
-// har start/stop. Alt koere indefor en operation
 
-public final class CliApp {
-
-    /** Nope. */
-    private CliApp() {}
-
-    public static void run(Assembly assembly, String[] args, Wirelet... wirelets) {
-        App.run(assembly);
-    }
-
-    public static void run(Assembly assembly, Wirelet... wirelets) {
-        App.run(assembly);
-    }
-
-    public static void mirrorOf(Assembly assembly, String[] args, Wirelet... wirelets) {
-        bootstrap().mirrorOf(assembly, Wirelets.argList(args).andThen(wirelets));
-    }
-
-    public static int runWithExitCode(Assembly assembly, String[] args) {
-        App.run(assembly);
-        return 0;
-    }
-
-    public static void verify(Assembly assembly, String[] args) {
-        bootstrap().verify(assembly);
+    static void run(Assembly assembly, Wirelet... wirelets) {
+        // Maybe checked run...
+        App.run(assembly, wirelets);
     }
 
-    /**
-     * Returns the bootstrap app. If interfaces allowed non-public fields we would have stored it in a field instead of this
-     * method.
-     */
-    private static BootstrapApp<Void> bootstrap() {
-        class ServiceLocatorBootstrap {
-            private static final BootstrapApp<Void> APP = BootstrapApp.of(ApplicationTemplate.ofManaged(Void.class));
-        }
-        return ServiceLocatorBootstrap.APP;
-    }
-//
-//    public static final class Result {
-//
-//    }
-
-    /** An application image for App. */
-    public static final class Image {
-
-        /** The bootstrap image we are delegating to */
-        private final BaseImage<?> image;
-
-        private Image(BaseImage<?> image) {
-            this.image = image;
-        }
-
-        /** Runs the application represented by this image. */
-        public void run() {
-            image.launch(RunState.TERMINATED);
-        }
-
-        /**
-         * Runs the application represented by this image.
-         *
-         * @param wirelets
-         *            optional wirelets
-         */
-        public void run(Wirelet... wirelets) {
-            image.launch(RunState.TERMINATED, wirelets);
-        }
-    }
-
-    public class Launcher {
-        // Tror faktisk vi er chatty som default
-        // Sgu da ikke hvis vi er en CLI. Det vil jeg da vaere ret traet af.
-        // CliApp.launcher().silent().run();
-        Launcher silent() {
-            return this;
-        }
+    static void run(Assembly assembly, String[] args, Wirelet... wirelets) {
+        // Maybe checked run...
+        App.run(assembly, Wirelets.argList(args).andThen(wirelets));
     }
 }
-

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

@@ -0,0 +1,123 @@
+/*
+ * 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.cli.other;
+
+import app.packed.application.App;
+import app.packed.application.ApplicationTemplate;
+import app.packed.application.BaseImage;
+import app.packed.application.BootstrapApp;
+import app.packed.assembly.Assembly;
+import app.packed.container.Wirelet;
+import app.packed.runtime.RunState;
+
+/**
+ *
+ */
+//Like App but calls system exit and prints stack
+//traces to system.err
+
+// CliApp er maaske i virkeligheden mere noget der har praecist mest 1 entrypoint.
+
+// Er ikke noedvendigvis managed. Eller det kan den jo ligesaa godt eftersom vi ikke
+// har start/stop. Alt koere indefor en operation
+
+// CliApp
+//// Always takes String[] (Why cli otherwise?) when launching (Not mirrors ect)
+//// Calls system exit on failure
+//// Install a shutdown hook if managed.
+
+// Vs App
+//// I don't it is Closable. Actually I think it may only have static methods?
+/////// Or maybe return a (manual) cliApp with system. and system.exit();
+//// I think these are two main differences
+
+public final class PackedCliApp {
+
+    /** Nope. */
+    private PackedCliApp() {}
+
+    public static void run(Assembly assembly, String[] args, Wirelet... wirelets) {
+        App.run(assembly);
+    }
+//
+//    public static void run(Assembly assembly, Wirelet... wirelets) {
+//        App.run(assembly);
+//    }
+
+    public static void mirrorOf(Assembly assembly, Wirelet... wirelets) {
+        bootstrap().mirrorOf(assembly, wirelets);
+    }
+
+    public static int runNoSystemExit(Assembly assembly, String[] args) {
+        App.run(assembly);
+        return 0;
+    }
+
+    public static void verify(Assembly assembly) {
+        bootstrap().verify(assembly);
+    }
+
+    /**
+     * Returns the bootstrap app. If interfaces allowed non-public fields we would have stored it in a field instead of this
+     * method.
+     */
+    private static BootstrapApp<Void> bootstrap() {
+        class ServiceLocatorBootstrap {
+            private static final BootstrapApp<Void> APP = BootstrapApp.of(ApplicationTemplate.ofManaged(Void.class));
+        }
+        return ServiceLocatorBootstrap.APP;
+    }
+//
+//    public static final class Result {
+//
+//    }
+
+    /** An application image for App. */
+    public static final class Image {
+
+        /** The bootstrap image we are delegating to */
+        private final BaseImage<?> image;
+
+        private Image(BaseImage<?> image) {
+            this.image = image;
+        }
+
+        /** Runs the application represented by this image. */
+        public void run(String[] args) {
+            image.launch(RunState.TERMINATED);
+        }
+
+        /**
+         * Runs the application represented by this image.
+         *
+         * @param wirelets
+         *            optional wirelets
+         */
+        public void run(String[] args, Wirelet... wirelets) {
+            image.launch(RunState.TERMINATED, wirelets);
+        }
+    }
+
+    public class Launcher {
+        // Tror faktisk vi er chatty som default
+        // Sgu da ikke hvis vi er en CLI. Det vil jeg da vaere ret traet af.
+        // CliApp.launcher().silent().run();
+        Launcher silent() {
+            return this;
+        }
+    }
+}
+