You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/03/26 15:03:24 UTC
[isis] 01/02: ISIS-2573: xray: simplify util
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 963e9d84ac6b1b22ef939d6ba371979d950c2941
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Mar 26 15:40:57 2021 +0100
ISIS-2573: xray: simplify util
---
.../main/java/org/apache/isis/core/runtime/util/XrayUtil.java | 8 ++++----
.../org/apache/isis/core/runtimeservices/executor/_Xray.java | 6 ++----
.../java/org/apache/isis/core/runtimeservices/publish/_Xray.java | 9 +++------
3 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/util/XrayUtil.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/util/XrayUtil.java
index 4b543c8..8196ba5 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/util/XrayUtil.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/util/XrayUtil.java
@@ -23,9 +23,9 @@ import java.util.UUID;
import java.util.function.Consumer;
import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal.debug.xray.XrayUi;
-import org.apache.isis.commons.internal.debug.xray.XrayDataModel.Sequence;
import org.apache.isis.commons.internal.debug.xray.XrayModel.ThreadMemento;
+import org.apache.isis.commons.internal.debug.xray.XrayUi;
+import org.apache.isis.commons.internal.debug.xray.sequence.SequenceDiagram;
import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.core.interaction.session.InteractionTracker;
@@ -91,10 +91,10 @@ public final class XrayUtil {
final @NonNull String caller;
final @NonNull Can<String> callees;
- public void submit(Consumer<Sequence> onSequenceEntry) {
+ public void submit(Consumer<SequenceDiagram> onSubmission) {
XrayUi.updateModel(model->{
model.lookupSequence(getSequenceId())
- .ifPresent(onSequenceEntry);
+ .ifPresent(sequence->onSubmission.accept(sequence.getData()));
});
}
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/executor/_Xray.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/executor/_Xray.java
index b95dbaa..1f680cb 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/executor/_Xray.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/executor/_Xray.java
@@ -92,8 +92,7 @@ final class _Xray {
val handleIfAny = XrayUtil.createSequenceHandle(iaTracker, "executor", participantLabel);
handleIfAny.ifPresent(handle->{
- handle.submit(sequence->{
- val sequenceData = sequence.getData();
+ handle.submit(sequenceData->{
sequenceData.alias("executor", "Member-\nExecutorService-\n(Default)");
@@ -118,8 +117,7 @@ final class _Xray {
return; // x-ray is not enabled
}
- handle.submit(sequence->{
- val sequenceData = sequence.getData();
+ handle.submit(sequenceData->{
val callee1 = handle.getCallees().getFirstOrFail();
val callee2 = handle.getCallees().getLastOrFail();
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/publish/_Xray.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/publish/_Xray.java
index b2f2ce4..6899c55 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/publish/_Xray.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/publish/_Xray.java
@@ -54,8 +54,7 @@ final class _Xray {
val handleIfAny = XrayUtil.createSequenceHandle(iaTracker, "cmd-publisher");
handleIfAny.ifPresent(handle->{
- handle.submit(sequence->{
- val sequenceData = sequence.getData();
+ handle.submit(sequenceData->{
sequenceData.alias("cmd-publisher", "Command-\nPublisher-\n(Default)");
@@ -89,8 +88,7 @@ final class _Xray {
val handleIfAny = XrayUtil.createSequenceHandle(iaTracker, "exec-publisher");
handleIfAny.ifPresent(handle->{
- handle.submit(sequence->{
- val sequenceData = sequence.getData();
+ handle.submit(sequenceData->{
sequenceData.alias("exec-publisher", "Execution-\nPublisher-\n(Default)");
@@ -113,8 +111,7 @@ final class _Xray {
return; // x-ray is not enabled
}
- handle.submit(sequence->{
- val sequenceData = sequence.getData();
+ handle.submit(sequenceData->{
val callee = handle.getCallees().getFirstOrFail();
sequenceData.exit(callee, handle.getCaller());
sequenceData.deactivate(callee);