Skip to content

Commit 662d71a

Browse files
committed
Updates
1 parent c3a7ff8 commit 662d71a

22 files changed

Lines changed: 132 additions & 223 deletions

File tree

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,11 @@
3131
*/
3232
public class CliExtensionNamespace extends ExtensionNamespace<CliExtensionNamespace, CliExtension> {
3333

34-
3534
/** All the commands within the namespace. */
3635
final LinkedHashMap<String, CliCommandOperationHandle> commands = new LinkedHashMap<>();
3736

3837
final List<CliOptionMirror> options = new ArrayList<>();
3938

40-
4139
void process(CliExtension extension, CliCommand c, BeanIntrospector.OnMethod method) {
4240
CliCommandOperationHandle h = null;
4341
for (String n : c.name()) {

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

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

21+
import app.packed.namespace.OverviewHandle;
2122
import app.packed.namespace.OverviewMirror;
2223
import app.packed.operation.OperationMirror;
2324

@@ -26,12 +27,16 @@
2627
*/
2728
public final class CliOverviewMirror extends OverviewMirror<CliExtension> {
2829

30+
/**
31+
* @param overviewHandle
32+
*/
33+
protected CliOverviewMirror(OverviewHandle<CliExtension> overviewHandle) {
34+
super(overviewHandle);
35+
}
36+
2937
/** The CLI namespace handle. */
30-
private final CliExtensionNamespace handle;
38+
private CliExtensionNamespace handle;
3139

32-
CliOverviewMirror(CliExtensionNamespace handle) {
33-
this.handle = handle;
34-
}
3540

3641
public Optional<CliCommandMirror> command(String name) {
3742
return Optional.ofNullable(handle.commands.get(name)).map(h -> (CliCommandMirror) h.mirror());

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public DaemonJobConfiguration restart(boolean restart) {
5858

5959
// onProperty("blabla", DaemonJobConfiguration::restart);
6060
// onProperty("blabla", (v, j)->j.interruptOnStop(true));
61-
public DaemonJobConfiguration onProperty(String value, BiConsumer<String, ? super DaemonJobConfiguration> consumer) {
61+
DaemonJobConfiguration onProperty(String value, BiConsumer<String, ? super DaemonJobConfiguration> consumer) {
6262
return this;
6363
}
6464

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

Lines changed: 0 additions & 97 deletions
This file was deleted.

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

Lines changed: 0 additions & 20 deletions
This file was deleted.

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,4 @@ public abstract class JobMirror extends OperationMirror {
3333
protected JobMirror(OperationHandle<?> handle) {
3434
super(handle);
3535
}
36-
37-
/** { @return the thread namespace this daemon is a part of} */
38-
public JobNamespaceMirror namespace() {
39-
throw new UnsupportedOperationException();
40-
// return (JobNamespaceMirror) handle.namespace.mirror();
41-
}
4236
}

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

Lines changed: 0 additions & 49 deletions
This file was deleted.

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,22 @@
1919

2020
import app.packed.component.ComponentRealm;
2121
import app.packed.extension.BaseExtension;
22+
import app.packed.namespace.OverviewHandle;
2223
import app.packed.namespace.OverviewMirror;
2324

2425
/**
2526
* A mirror for a job namespace. All jobs within a
2627
*
2728
* @see JobNamespaceConfiguration
2829
*/
29-
public class JobNamespaceMirror extends OverviewMirror<BaseExtension> {
30+
public final class JobOverviewMirror extends OverviewMirror<BaseExtension> {
31+
32+
/**
33+
* @param overviewHandle
34+
*/
35+
public JobOverviewMirror(OverviewHandle<BaseExtension> overviewHandle) {
36+
super(overviewHandle);
37+
}
3038

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

modules/packed-incubator/packed-incubator-concurrent/src/main/java/app/packed/concurrent/annotations/ScheduleJob.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525

2626
import app.packed.bean.BeanIntrospector;
2727
import app.packed.bean.BeanTrigger.OnAnnotatedMethod;
28-
import app.packed.concurrent.JobExtension;
2928
import app.packed.concurrent.job2.impl.ScheduledOperationHandle;
29+
import app.packed.extension.BaseExtension;
3030
import internal.app.packed.concurrent.old.ScheduleImpl;
3131

3232
/**
@@ -65,7 +65,7 @@
6565
TimeUnit timeUnit() default TimeUnit.MILLISECONDS;
6666
}
6767

68-
final class JobExtensionBeanIntrospector extends BeanIntrospector<JobExtension> {
68+
final class JobExtensionBeanIntrospector extends BeanIntrospector<BaseExtension> {
6969

7070
@Override
7171
public void onAnnotatedMethod(Annotation hook, BeanIntrospector.OnMethod on) {

modules/packed-incubator/packed-incubator-concurrent/src/main/java/app/packed/concurrent/oldscheduling/SchedulingContext.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
import app.packed.bean.BeanIntrospector;
44
import app.packed.bean.BeanTrigger.AutoService;
55
import app.packed.binding.Key;
6-
import app.packed.concurrent.JobExtension;
76
import app.packed.context.Context;
7+
import app.packed.extension.BaseExtension;
88

99
/**
1010
* A context object available for scheduling.
1111
*/
1212
@AutoService(introspector = SchedulingContextBeanIntrospector.class, requiresContext = SchedulingContext.class)
13-
public interface SchedulingContext extends Context<JobExtension> {
13+
public interface SchedulingContext extends Context<BaseExtension> {
1414

1515
/** {@return cancel future invocation of the scheduled operations. In progress operations will be allowed to finish} */
1616
void cancel();
@@ -22,7 +22,7 @@ public interface SchedulingContext extends Context<JobExtension> {
2222

2323
void resume();
2424
}
25-
final class SchedulingContextBeanIntrospector extends BeanIntrospector<JobExtension> {
25+
final class SchedulingContextBeanIntrospector extends BeanIntrospector<BaseExtension> {
2626

2727
@Override
2828
public void onAutoService(Key<?> key, OnAutoService service) {

0 commit comments

Comments
 (0)