You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2021/06/09 05:56:55 UTC
[isis] 05/05: ISIS-2727: just renames some variables
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2727
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 79cb215f5f2437d6e3340ddf0d27ae53ba191b37
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jun 9 06:56:07 2021 +0100
ISIS-2727: just renames some variables
---
.../java/org/apache/isis/core/security/util/XrayUtil.java | 14 +++++++-------
.../isis/testdomain/conf/Configuration_headless.java | 4 ++--
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/core/security/src/main/java/org/apache/isis/core/security/util/XrayUtil.java b/core/security/src/main/java/org/apache/isis/core/security/util/XrayUtil.java
index 18bb58b..0dd56ab 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/util/XrayUtil.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/util/XrayUtil.java
@@ -39,10 +39,10 @@ public final class XrayUtil {
/**
* Returns the sequence diagram data model's id, that is bound to the current thread and interaction.
- * @param iaContext
+ * @param interactionProvider
*/
- public static Optional<String> currentSequenceId(final @NonNull InteractionProvider iaContext) {
- return iaContext.getInteractionId()
+ public static Optional<String> currentSequenceId(final @NonNull InteractionProvider interactionProvider) {
+ return interactionProvider.getInteractionId()
.map(XrayUtil::sequenceId);
}
@@ -65,16 +65,16 @@ public final class XrayUtil {
// -- SEQUENCE HANDLE
public static Optional<SequenceHandle> createSequenceHandle(
- final @NonNull InteractionProvider iaContext,
+ final @NonNull InteractionProvider interactionProvider,
final @NonNull AuthenticationProvider authenticationProvider,
final String ... callees) {
- if(!iaContext.isInInteraction()) {
+ if(!interactionProvider.isInInteraction()) {
return Optional.empty();
}
- final int authStackSize = iaContext.getInteractionLayerCount();
- val interactionId = iaContext.getInteractionId().orElseThrow(_Exceptions::unexpectedCodeReach);
+ final int authStackSize = interactionProvider.getInteractionLayerCount();
+ val interactionId = interactionProvider.getInteractionId().orElseThrow(_Exceptions::unexpectedCodeReach);
val handle = SequenceHandle.builder()
.sequenceId(XrayUtil.sequenceId(interactionId))
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/conf/Configuration_headless.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/conf/Configuration_headless.java
index bea7bc3..2355bc1 100644
--- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/conf/Configuration_headless.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/conf/Configuration_headless.java
@@ -76,13 +76,13 @@ public class Configuration_headless {
public void setupCommandCreateIfMissing() {
-// val interactionContext = interactionContextProvider.get();
+// val interactionProvider = interactionProviderProvider.get();
// @SuppressWarnings("unused")
// final Interaction interaction = Optional.ofNullable(interactionContext.getInteraction())
// .orElseGet(()->{
// val newCommand = new Command();
// val newInteraction = new Interaction(newCommand);
-// interactionContext.setInteraction(newInteraction);
+// interactionProvider.setInteraction(newInteraction);
// return newInteraction;
// });
}