Skip to content

Commit 387c9c1

Browse files
committed
Updates
1 parent 97ac31e commit 387c9c1

File tree

100 files changed

+917
-943
lines changed

Some content is hidden

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

100 files changed

+917
-943
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,13 @@
2424

2525
import app.packed.bean.BeanIntrospector;
2626
import app.packed.bean.BeanTrigger.OnAnnotatedMethod;
27-
import app.packed.namespace.sandbox.NamespaceOperation;
2827

2928
/**
3029
*
3130
*/
3231
@Target(ElementType.METHOD)
3332
@Retention(RetentionPolicy.RUNTIME)
3433
@Documented
35-
@NamespaceOperation
3634
@OnAnnotatedMethod(introspector = CliCommandBeanIntrospector.class)
3735
public @interface CliCommand {
3836

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,4 @@ public class CliCommandMirror extends OperationMirror {
3535
public List<String> names() {
3636
return Collections.unmodifiableList(handle.names);
3737
}
38-
39-
/** {@return the namespace this command is part of.} */
40-
public CliNamespaceMirror namespace() {
41-
return handle.namespace.newNamespaceMirror();
42-
}
4338
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818
import java.util.function.Consumer;
1919

2020
import app.packed.component.ComponentRealm;
21-
import app.packed.namespace.NamespaceConfiguration;
21+
import app.packed.namespaceold.OldNamespaceConfiguration;
2222
import internal.app.packed.build.hooks.NamespaceBuildHook;
2323

2424
/**
2525
* A CLI namespace where all commands and general options are unique.
2626
*/
27-
public final class CliNamespaceConfiguration extends NamespaceConfiguration<CliExtension> {
27+
public final class CliNamespaceConfiguration extends OldNamespaceConfiguration<CliExtension> {
2828

2929
final CliNamespaceHandle handle;
3030

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

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@
2323
import app.packed.bean.BeanIntrospector;
2424
import app.packed.bean.BeanIntrospector.OnVariable;
2525
import app.packed.component.ComponentRealm;
26-
import app.packed.namespace.NamespaceHandle;
27-
import app.packed.namespace.NamespaceInstaller;
28-
import app.packed.namespace.NamespaceTemplate;
26+
import app.packed.namespaceold.NamespaceInstaller;
27+
import app.packed.namespaceold.NamespaceTemplate;
28+
import app.packed.namespaceold.OldNamespaceHandle;
2929

3030
/**
3131
* A CLI domain is a domain where all CLI commands are unique. Typically there is never more than one per application.
3232
*/
33-
final class CliNamespaceHandle extends NamespaceHandle<CliExtension, CliNamespaceConfiguration> {
33+
final class CliNamespaceHandle extends OldNamespaceHandle<CliExtension, CliNamespaceConfiguration> {
3434

3535
/** The default namespace template. */
3636
static final NamespaceTemplate<CliNamespaceHandle> TEMPLATE = NamespaceTemplate.of(CliNamespaceHandle.class, CliNamespaceHandle::new);
@@ -49,12 +49,6 @@ protected CliNamespaceConfiguration newNamespaceConfiguration(CliExtension e, Co
4949
return new CliNamespaceConfiguration(this, e, actor);
5050
}
5151

52-
/** {@inheritDoc} */
53-
@Override
54-
protected CliNamespaceMirror newNamespaceMirror() {
55-
return new CliNamespaceMirror(this);
56-
}
57-
5852
void process(CliExtension extension, CliCommand c, BeanIntrospector.OnMethod method) {
5953
CliCommandOperationHandle h = null;
6054
for (String n : c.name()) {

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,10 @@
1919

2020
import app.packed.bean.BeanIntrospector;
2121
import app.packed.bean.BeanTrigger.OnAnnotatedVariable;
22-
import app.packed.namespace.sandbox.NamespaceOperation;
2322

2423
/**
2524
*
2625
*/
27-
@NamespaceOperation
2826
@OnAnnotatedVariable(introspector = CliOptionBeanIntrospector.class)
2927
public @interface CliOption {}
3028

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,18 @@
1818
import java.util.Optional;
1919
import java.util.stream.Stream;
2020

21-
import app.packed.namespace.NamespaceMirror;
21+
import app.packed.namespaceold.OverviewMirror;
2222
import app.packed.operation.OperationMirror;
2323

2424
/**
2525
* Represents a CLI namespace where {@link CliCommandMirror commands} and global {@link CliOption options} are unique.
2626
*/
27-
public final class CliNamespaceMirror extends NamespaceMirror<CliExtension> {
27+
public final class CliOverviewMirror extends OverviewMirror<CliExtension> {
2828

2929
/** The CLI namespace handle. */
3030
private final CliNamespaceHandle handle;
3131

32-
CliNamespaceMirror(CliNamespaceHandle handle) {
33-
super(handle);
32+
CliOverviewMirror(CliNamespaceHandle handle) {
3433
this.handle = handle;
3534
}
3635

modules/packed-incubator/packed-incubator-cli/src/main/java/app/packed/cli/usage/MirrorUsage.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,25 +17,21 @@
1717

1818
import app.packed.application.ApplicationMirror;
1919
import app.packed.cli.CliCommandMirror;
20-
import app.packed.cli.CliNamespaceMirror;
21-
import app.packed.service.ServiceNamespaceMirror;
20+
import app.packed.cli.CliOverviewMirror;
2221

2322
/**
2423
*
2524
*/
2625
public class MirrorUsage {
2726

2827
public static void main(ApplicationMirror m) {
29-
CliNamespaceMirror cm = m.namespace(CliNamespaceMirror.class).get();
28+
CliOverviewMirror cm = m.overview(CliOverviewMirror.class);
3029
for (CliCommandMirror c : cm.commands().toList()) {
3130
IO.println(c);
3231
}
3332

3433
cm.commands().map(e -> e.bean().container()).distinct().toList();
3534

36-
ServiceNamespaceMirror sn = m.namespace(ServiceNamespaceMirror.class).get();
37-
38-
IO.println(sn);
3935
}
4036

4137

modules/packed-incubator/packed-incubator-cli/src/main/java/app/packed/cli/usage/Usage.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import app.packed.application.ApplicationMirror;
2020
import app.packed.assembly.BaseAssembly;
2121
import app.packed.cli.CliExtension;
22-
import app.packed.cli.CliNamespaceMirror;
22+
import app.packed.cli.CliOverviewMirror;
2323

2424
/**
2525
*
@@ -41,7 +41,7 @@ protected void build() {
4141

4242
public static void main(String[] args) {
4343
ApplicationMirror m = App.mirrorOf(new Usage());
44-
m.namespace(CliNamespaceMirror.class);
44+
m.overview(CliOverviewMirror.class);
4545
}
4646

4747
}

modules/packed-incubator/packed-incubator-concurrent/src/main/java/app/packed/concurrent/JobNamespaceConfiguration.java

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

1818
import app.packed.component.ComponentRealm;
1919
import app.packed.extension.BaseExtension;
20-
import app.packed.namespace.NamespaceConfiguration;
21-
import app.packed.namespace.NamespaceHandle;
20+
import app.packed.namespaceold.OldNamespaceConfiguration;
21+
import app.packed.namespaceold.OldNamespaceHandle;
2222
import app.packed.service.ProvidableBeanConfiguration;
2323

2424
/**
@@ -27,9 +27,9 @@
2727
// Can you have more than 1 compute in a JobNamespace
2828
// Can you have multiple lifetimes in a JobNamespace? Or only 1?
2929
// I think multiple is fine. I mean we support transient jobs which is kind of limited lifetimes
30-
public class JobNamespaceConfiguration extends NamespaceConfiguration<BaseExtension> {
30+
public class JobNamespaceConfiguration extends OldNamespaceConfiguration<BaseExtension> {
3131

32-
protected JobNamespaceConfiguration(NamespaceHandle<BaseExtension, ?> namespace, BaseExtension extension, ComponentRealm actor) {
32+
protected JobNamespaceConfiguration(OldNamespaceHandle<BaseExtension, ?> namespace, BaseExtension extension, ComponentRealm actor) {
3333
super(namespace, extension, actor);
3434
}
3535

modules/packed-incubator/packed-incubator-concurrent/src/main/java/app/packed/concurrent/JobNamespaceMirror.java

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,14 @@
1919

2020
import app.packed.component.ComponentRealm;
2121
import app.packed.extension.BaseExtension;
22-
import app.packed.namespace.NamespaceHandle;
23-
import app.packed.namespace.NamespaceMirror;
22+
import app.packed.namespaceold.OverviewMirror;
2423

2524
/**
2625
* A mirror for a job namespace. All jobs within a
2726
*
2827
* @see JobNamespaceConfiguration
2928
*/
30-
public class JobNamespaceMirror extends NamespaceMirror<BaseExtension> {
31-
32-
/**
33-
* @param handle
34-
*/
35-
public JobNamespaceMirror(NamespaceHandle<BaseExtension, ?> handle) {
36-
super(handle);
37-
}
29+
public class JobNamespaceMirror extends OverviewMirror<BaseExtension> {
3830

3931
/** {@return a stream of all jobs that have been defined in the namespace or descendant namespaces} */
4032
public Stream<DaemonJobMirror> allDaemons() {

0 commit comments

Comments
 (0)