Skip to content

Commit af9a3de

Browse files
committed
updates
1 parent 6e28db4 commit af9a3de

File tree

171 files changed

+912
-1789
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

171 files changed

+912
-1789
lines changed

architecture/jobs/TODO.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Priorities
2+
3+
MultiApp <-- Ikke super vigtig førend vi nejler app, men stadig

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
import java.lang.annotation.Annotation;
1919

2020
import app.packed.bean.scanning.BeanIntrospector;
21-
import internal.app.packed.extension.PackedBeanIntrospector;
21+
import internal.app.packed.extension.InternalBeanIntrospector;
2222

23-
class CliBeanIntrospector extends PackedBeanIntrospector<CliExtension> {
23+
class CliBeanIntrospector extends InternalBeanIntrospector<CliExtension> {
2424

2525
/** {@inheritDoc} */
2626
@Override

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ public class CliCommandConfiguration extends OperationConfiguration {
3333
* @param handle
3434
*/
3535
CliCommandConfiguration(CliCommandHandle handle) {
36-
super(handle);
3736
this.handle = requireNonNull(handle);
37+
super(handle);
3838
}
3939

4040
// replace or add? I think replace

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ public class CliExtensionPoint extends ExtensionPoint<CliExtension> {
2525
/**
2626
* @param usesite
2727
*/
28-
protected CliExtensionPoint(ExtensionUseSite usesite) {
29-
super(usesite);
28+
protected CliExtensionPoint(ExtensionPointHandle handle) {
29+
super(handle);
3030
}
3131

3232
public CliNamespaceConfiguration namespace() {
33-
return extension().ns().configuration(extension(), context());
33+
return extension().ns().configuration(extension(), handle());
3434
}
3535
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,4 +59,4 @@ public Stream<CliOptionMirror> options() {
5959
// Filter on Namespaces
6060

6161
// Global Namespace = Global Commands + Global Operations
62-
/// Some Command namespace = Operations Applicable only for that command
62+
// Some Command namespace = Operations Applicable only for that command

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@
2525
*
2626
*/
2727
// Maybe it is just a thin wrapper for App
28+
29+
// Maybe an assembly instead of an interface????
30+
// CliAssembly / MainAssembly
31+
32+
@Deprecated
2833
public interface CliApp extends ApplicationInterface {
2934

3035
// But isn't this normally in the code???

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

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
import app.packed.application.App;
1919
import app.packed.application.ApplicationTemplate;
20-
import app.packed.application.BaseImage;
2120
import app.packed.application.BootstrapApp;
21+
import app.packed.application.BootstrapImage;
2222
import app.packed.assembly.Assembly;
2323
import app.packed.container.Wirelet;
2424
import app.packed.runtime.RunState;
@@ -89,26 +89,16 @@ class ServiceLocatorBootstrap {
8989
public static final class Image {
9090

9191
/** The bootstrap image we are delegating to */
92-
private final BaseImage<?> image;
92+
private final BootstrapImage<?> image;
9393

94-
private Image(BaseImage<?> image) {
94+
private Image(BootstrapImage<?> image) {
9595
this.image = image;
9696
}
9797

9898
/** Runs the application represented by this image. */
9999
public void run(String[] args) {
100100
image.launch(RunState.TERMINATED);
101101
}
102-
103-
/**
104-
* Runs the application represented by this image.
105-
*
106-
* @param wirelets
107-
* optional wirelets
108-
*/
109-
public void run(String[] args, Wirelet... wirelets) {
110-
image.launch(RunState.TERMINATED, wirelets);
111-
}
112102
}
113103

114104
public class Launcher {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,9 @@ interface Image<T> {
9292
//
9393
// JobApp<T> checkedStart(Wirelet... wirelets) throws UnhandledApplicationException;
9494

95-
T run(Wirelet... wirelets);
95+
T run();
9696

97-
JobApp<T> start(Wirelet... wirelets);
97+
JobApp<T> start();
9898
}
9999
}
100100

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,10 @@
1919
import java.util.concurrent.TimeUnit;
2020

2121
import app.packed.application.ApplicationTemplate;
22-
import app.packed.application.BaseImage;
2322
import app.packed.application.BootstrapApp;
23+
import app.packed.application.BootstrapImage;
2424
import app.packed.component.guest.ComponentHostContext;
2525
import app.packed.component.guest.FromGuest;
26-
import app.packed.container.Wirelet;
2726
import app.packed.runtime.ManagedLifecycle;
2827
import app.packed.runtime.RunState;
2928
import app.packed.runtime.StopOption;
@@ -68,19 +67,19 @@ public String toString() {
6867
}
6968

7069
/** Implementation of {@link app.packed.application.App.Image}. */
71-
record AppImage(BaseImage<PackedJobApp> image) implements JobApp.Image {
70+
record AppImage(BootstrapImage<PackedJobApp> image) implements JobApp.Image {
7271

7372
/** {@inheritDoc} */
7473
@Override
75-
public Object run(Wirelet... wirelets) {
76-
PackedJobApp a = image.launch(RunState.TERMINATED, wirelets);
74+
public Object run() {
75+
PackedJobApp a = image.launch(RunState.TERMINATED);
7776
return a.result();
7877
}
7978

8079
/** {@inheritDoc} */
8180
@Override
82-
public JobApp start(Wirelet... wirelets) {
83-
return image.launch(RunState.RUNNING, wirelets);
81+
public JobApp start() {
82+
return image.launch(RunState.RUNNING);
8483
}
8584

8685
// /** {@inheritDoc} */

modules/packed-incubator/packed-incubator-concurrent/src/main/java/app/packed/concurrent/job2/JobExtension.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import app.packed.concurrent.other.SchedulingContext;
2727
import app.packed.extension.ExtensionHandle;
2828
import app.packed.extension.ExtensionPoint;
29-
import app.packed.extension.ExtensionPoint.ExtensionUseSite;
29+
import app.packed.extension.ExtensionPoint.ExtensionPointHandle;
3030
import app.packed.extension.FrameworkExtension;
3131
import internal.app.packed.concurrent.ScheduleImpl;
3232
import internal.app.packed.concurrent.SchedulingTaskManager;
@@ -120,7 +120,7 @@ public void onAnnotatedMethod(Annotation hook, BeanIntrospector.OnMethod on) {
120120

121121
/** {@inheritDoc} */
122122
@Override
123-
protected ExtensionPoint<JobExtension> newExtensionPoint(ExtensionUseSite usesite) {
123+
protected ExtensionPoint<JobExtension> newExtensionPoint(ExtensionPointHandle usesite) {
124124
return new JobExtensionPoint(usesite);
125125
}
126126

0 commit comments

Comments
 (0)