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/30 09:14:14 UTC
[isis] branch master updated: ISIS-2573: rename occurrences of
conversation-id to interaction-id
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
The following commit(s) were added to refs/heads/master by this push:
new a58dac0 ISIS-2573: rename occurrences of conversation-id to interaction-id
a58dac0 is described below
commit a58dac0606646d64ff80b869892876f01dedff42
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Mar 30 11:14:04 2021 +0200
ISIS-2573: rename occurrences of conversation-id to interaction-id
---
.../isis/core/interaction/scope/InteractionScope.java | 2 +-
.../core/interaction/session/InteractionTracker.java | 4 ++--
.../java/org/apache/isis/core/runtime/util/XrayUtil.java | 4 ++--
.../session/InteractionFactoryDefault.java | 16 ++++++++--------
.../transaction/TransactionServiceSpring.java | 2 +-
5 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/core/interaction/src/main/java/org/apache/isis/core/interaction/scope/InteractionScope.java b/core/interaction/src/main/java/org/apache/isis/core/interaction/scope/InteractionScope.java
index 133782c..6746274 100644
--- a/core/interaction/src/main/java/org/apache/isis/core/interaction/scope/InteractionScope.java
+++ b/core/interaction/src/main/java/org/apache/isis/core/interaction/scope/InteractionScope.java
@@ -110,7 +110,7 @@ class InteractionScope implements Scope, InteractionScopeLifecycleHandler {
@Override
public String getConversationId() {
// null by convention if not supported
- return isisInteractionTracker.getConversationId()
+ return isisInteractionTracker.getInteractionId()
.map(UUID::toString)
.orElse(null);
}
diff --git a/core/interaction/src/main/java/org/apache/isis/core/interaction/session/InteractionTracker.java b/core/interaction/src/main/java/org/apache/isis/core/interaction/session/InteractionTracker.java
index ae8bc1a..ce63677 100644
--- a/core/interaction/src/main/java/org/apache/isis/core/interaction/session/InteractionTracker.java
+++ b/core/interaction/src/main/java/org/apache/isis/core/interaction/session/InteractionTracker.java
@@ -56,8 +56,8 @@ extends InteractionContext, AuthenticationContext {
return currentAuthenticationLayer().map(AuthenticationLayer::getExecutionContext);
}
- /** @return the unique id of the current top-level request- or test-scoped Interaction*/
- Optional<UUID> getConversationId();
+ /** @return the unique id of the current request- or test-scoped {@link Interaction}*/
+ Optional<UUID> getInteractionId();
/** @return authentication-layer-stack size */
int getAuthenticationLayerCount();
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 8196ba5..4d11ddb 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
@@ -41,7 +41,7 @@ public final class XrayUtil {
* @param iaTracker
*/
public static Optional<String> currentSequenceId(final @NonNull InteractionTracker iaTracker) {
- return iaTracker.getConversationId()
+ return iaTracker.getInteractionId()
.map(XrayUtil::sequenceId);
}
@@ -72,7 +72,7 @@ public final class XrayUtil {
}
final int authStackSize = iaTracker.getAuthenticationLayerCount();
- val conversationId = iaTracker.getConversationId().orElseThrow(_Exceptions::unexpectedCodeReach);
+ val conversationId = iaTracker.getInteractionId().orElseThrow(_Exceptions::unexpectedCodeReach);
val handle = SequenceHandle.builder()
.sequenceId(XrayUtil.sequenceId(conversationId))
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/session/InteractionFactoryDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/session/InteractionFactoryDefault.java
index 11a8123..e46b9ac 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/session/InteractionFactoryDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/session/InteractionFactoryDefault.java
@@ -192,7 +192,7 @@ implements
if(log.isDebugEnabled()) {
log.debug("new authentication layer created (conversation-id={}, total-layers-on-stack={}, {})",
- conversationId.get(),
+ interactionId.get(),
authenticationStack.get().size(),
_Probe.currentThreadId());
}
@@ -214,7 +214,7 @@ implements
@Override
public void closeSessionStack() {
log.debug("about to close the authentication stack (conversation-id={}, total-layers-on-stack={}, {})",
- conversationId.get(),
+ interactionId.get(),
authenticationStack.get().size(),
_Probe.currentThreadId());
@@ -299,11 +299,11 @@ implements
// -- CONVERSATION ID
- private final ThreadLocal<UUID> conversationId = ThreadLocal.withInitial(()->null);
+ private final ThreadLocal<UUID> interactionId = ThreadLocal.withInitial(()->null);
@Override
- public Optional<UUID> getConversationId() {
- return Optional.ofNullable(conversationId.get());
+ public Optional<UUID> getInteractionId() {
+ return Optional.ofNullable(interactionId.get());
}
// -- HELPER
@@ -313,7 +313,7 @@ implements
}
private void postSessionOpened(InteractionSession session) {
- conversationId.set(session.getInteractionId());
+ interactionId.set(session.getInteractionId());
interactionScopeAwareBeans.forEach(bean->bean.beforeEnteringTransactionalBoundary(session));
txBoundaryHandler.onOpen(session);
val isSynchronizationActive = TransactionSynchronizationManager.isSynchronizationActive();
@@ -335,7 +335,7 @@ implements
log.debug("about to close authenication stack down to size {} (conversation-id={}, total-sessions-on-stack={}, {})",
downToStackSize,
- conversationId.get(),
+ interactionId.get(),
authenticationStack.get().size(),
_Probe.currentThreadId());
@@ -351,7 +351,7 @@ implements
if(downToStackSize == 0) {
// cleanup thread-local
authenticationStack.remove();
- conversationId.remove();
+ interactionId.remove();
}
}
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/transaction/TransactionServiceSpring.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/transaction/TransactionServiceSpring.java
index 07e31f8..0d420a9 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/transaction/TransactionServiceSpring.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/transaction/TransactionServiceSpring.java
@@ -198,7 +198,7 @@ implements
@Override
public Optional<TransactionId> currentTransactionId() {
- return interactionTracker.getConversationId()
+ return interactionTracker.getInteractionId()
.map(uuid->{
//XXX get current transaction's persistence context (once we support multiple contexts)
val persistenceContext = "";