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 2020/12/06 08:22:13 UTC
[isis] branch master updated: ISIS-2464: renaming
InteractionContext#getInteraction() -> currentInteraction()
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 91ff6d0 ISIS-2464: renaming InteractionContext#getInteraction() -> currentInteraction()
91ff6d0 is described below
commit 91ff6d09e5632c18329ed84e4aaf985280474d77
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sun Dec 6 09:19:03 2020 +0100
ISIS-2464: renaming InteractionContext#getInteraction() -> currentInteraction()
---
.../applib-svc/examples/services/iactn/InteractionContext.java | 4 ++--
.../apache/isis/applib/services/iactn/InteractionContext.java | 10 +++-------
.../apache/isis/applib/services/metrics/MetricsService.java | 4 ++--
.../metamodel/specloader/specimpl/ObjectMemberAbstract.java | 2 +-
.../org/apache/isis/core/runtime/iactn/InteractionTracker.java | 2 +-
.../persistence/changetracking/EntityChangeTrackerDefault.java | 2 +-
.../runtimeservices/command/CommandExecutorServiceDefault.java | 6 +++---
.../runtimeservices/executor/MemberExecutorServiceDefault.java | 2 +-
.../ixn/InteractionDtoServiceInternalDefault.java | 4 ++--
.../runtimeservices/session/InteractionFactoryDefault.java | 2 +-
.../core/runtimeservices/wrapper/WrapperFactoryDefault.java | 4 ++--
.../datanucleus5/persistence/IsisTransactionManagerJdo.java | 2 +-
12 files changed, 20 insertions(+), 24 deletions(-)
diff --git a/api/applib/src/main/adoc/modules/applib-svc/examples/services/iactn/InteractionContext.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/iactn/InteractionContext.java
index 10a58c5..98a4aa8 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/examples/services/iactn/InteractionContext.java
+++ b/api/applib/src/main/adoc/modules/applib-svc/examples/services/iactn/InteractionContext.java
@@ -41,11 +41,11 @@ public interface InteractionContext {
// -- SHORTCUTS
default Interaction getInteractionIfAny() {
- return getInteraction().orElse(null);
+ return currentInteraction().orElse(null);
}
default Interaction getInteractionElseFail() {
- return getInteraction().orElseThrow(()->_Exceptions
+ return currentInteraction().orElseThrow(()->_Exceptions
.unrecoverable("needs an InteractionSession on current thread"));
}
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/iactn/InteractionContext.java b/api/applib/src/main/java/org/apache/isis/applib/services/iactn/InteractionContext.java
index 10a58c5..96d9bce 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/iactn/InteractionContext.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/iactn/InteractionContext.java
@@ -35,17 +35,13 @@ public interface InteractionContext {
* Optionally, the currently active {@link Interaction} for the calling thread.
*/
// tag::refguide[]
- Optional<Interaction> getInteraction(); // <.>
+ Optional<Interaction> currentInteraction(); // <.>
// end::refguide[]
// -- SHORTCUTS
- default Interaction getInteractionIfAny() {
- return getInteraction().orElse(null);
- }
-
- default Interaction getInteractionElseFail() {
- return getInteraction().orElseThrow(()->_Exceptions
+ default Interaction currentInteractionElseFail() {
+ return currentInteraction().orElseThrow(()->_Exceptions
.unrecoverable("needs an InteractionSession on current thread"));
}
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/metrics/MetricsService.java b/api/applib/src/main/java/org/apache/isis/applib/services/metrics/MetricsService.java
index a6618d0..cdb128a 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/metrics/MetricsService.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/metrics/MetricsService.java
@@ -30,7 +30,7 @@ public interface MetricsService {
* <p>
* Corresponds to the number of times that <code>javax.jdo.listener.LoadLifecycleListener#postLoad(InstanceLifecycleEvent)</code> (or equivalent) is fired.
* <p>
- * Is captured within {@link MemberExecutionDto#getMetrics()} (accessible from {@link InteractionContext#getInteractionIfAny()}).
+ * Is captured within {@link MemberExecutionDto#getMetrics()} (accessible from {@link InteractionContext#currentInteraction()}).
*/
// tag::refguide[]
int numberEntitiesLoaded(); // <.>
@@ -42,7 +42,7 @@ public interface MetricsService {
* <p>
* Corresponds to the number of times that <code>javax.jdo.listener.DirtyLifecycleListener#preDirty(InstanceLifecycleEvent)</code> (or equivalent) callback is fired.
* <p>
- * Is captured within {@link MemberExecutionDto#getMetrics()} (accessible from {@link InteractionContext#getInteractionIfAny()}).
+ * Is captured within {@link MemberExecutionDto#getMetrics()} (accessible from {@link InteractionContext#currentInteraction()}.
*/
// tag::refguide[]
int numberEntitiesDirtied(); // <.>
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java
index 4e8e5f9..0f0bd8c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java
@@ -316,7 +316,7 @@ implements ObjectMember, MetaModelContext.Delegating, FacetHolder.Delegating {
final ManagedObject managedObject,
final Function<UUID, CommandDto> commandDtoFactory) {
- val command = getInteractionContext().getInteractionElseFail().getCommand();
+ val command = getInteractionContext().currentInteractionElseFail().getCommand();
_Assert.assertNotNull(command,
"No command available with current thread, "
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/iactn/InteractionTracker.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/iactn/InteractionTracker.java
index c4b777a..0e98d41 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/iactn/InteractionTracker.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/iactn/InteractionTracker.java
@@ -96,7 +96,7 @@ extends InteractionContext, AuthenticationContext {
// -- INTERACTION CONTEXT
@Override
- default Optional<Interaction> getInteraction(){
+ default Optional<Interaction> currentInteraction(){
return currentInteractionSession().map(InteractionSession::getInteraction);
}
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/changetracking/EntityChangeTrackerDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/changetracking/EntityChangeTrackerDefault.java
index 732d850..131ecc8 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/changetracking/EntityChangeTrackerDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/changetracking/EntityChangeTrackerDefault.java
@@ -215,7 +215,7 @@ implements
}
Interaction currentInteraction() {
- return interactionContextProvider.get().getInteractionElseFail();
+ return interactionContextProvider.get().currentInteractionElseFail();
}
// -- HELPER
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/CommandExecutorServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/CommandExecutorServiceDefault.java
index 2f441af..884a357 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/CommandExecutorServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/CommandExecutorServiceDefault.java
@@ -139,7 +139,7 @@ public class CommandExecutorServiceDefault implements CommandExecutorService {
final CommandDto dto,
final CommandOutcomeHandler commandUpdater) {
- val interaction = interactionContextProvider.get().getInteractionElseFail();
+ val interaction = interactionContextProvider.get().currentInteractionElseFail();
val command = interaction.getCommand();
if(command.getCommandDto() != dto) {
command.updater().setCommandDto(dto);
@@ -169,7 +169,7 @@ public class CommandExecutorServiceDefault implements CommandExecutorService {
private void copyStartedAtFromInteractionExecution(
final CommandOutcomeHandler commandOutcomeHandler) {
- val interaction = interactionContextProvider.get().getInteractionElseFail();
+ val interaction = interactionContextProvider.get().currentInteractionElseFail();
val currentExecution = interaction.getCurrentExecution();
val startedAt = currentExecution != null
@@ -271,7 +271,7 @@ public class CommandExecutorServiceDefault implements CommandExecutorService {
// there was an exception when performing the action invocation/property
// edit. We therefore need to guard that case.
//
- val interaction = interactionContextProvider.get().getInteractionElseFail();
+ val interaction = interactionContextProvider.get().currentInteractionElseFail();
final Interaction.Execution<?, ?> priorExecution = interaction.getPriorExecution();
if(priorExecution != null) {
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/executor/MemberExecutorServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/executor/MemberExecutorServiceDefault.java
index e7f2418..b6ce255 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/executor/MemberExecutorServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/executor/MemberExecutorServiceDefault.java
@@ -74,7 +74,7 @@ implements MemberExecutorService {
@Override
public Optional<InternalInteraction> getInteraction() {
- return isisInteractionTracker.getInteraction()
+ return isisInteractionTracker.currentInteraction()
.map(InternalInteraction.class::cast);
}
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/ixn/InteractionDtoServiceInternalDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/ixn/InteractionDtoServiceInternalDefault.java
index 8d50941..b56b31b 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/ixn/InteractionDtoServiceInternalDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/ixn/InteractionDtoServiceInternalDefault.java
@@ -75,7 +75,7 @@ public class InteractionDtoServiceInternalDefault implements InteractionDtoServi
_Assert.assertEquals(objectAction.getParameterCount(), argumentAdapters.size(),
"action's parameter count and provided argument count must match");
- final Interaction interaction = interactionContextProvider.get().getInteractionElseFail();
+ final Interaction interaction = interactionContextProvider.get().currentInteractionElseFail();
final int nextEventSequence = interaction.next(Interaction.Sequence.INTERACTION.id());
final Bookmark targetBookmark = targetAdapter.getRootOid()
@@ -120,7 +120,7 @@ public class InteractionDtoServiceInternalDefault implements InteractionDtoServi
final ManagedObject targetAdapter,
final ManagedObject newValueAdapterIfAny) {
- final Interaction interaction = interactionContextProvider.get().getInteractionElseFail();
+ final Interaction interaction = interactionContextProvider.get().currentInteractionElseFail();
final int nextEventSequence = interaction.next(Interaction.Sequence.INTERACTION.id());
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 4dd98ba..9309d98 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
@@ -308,7 +308,7 @@ implements InteractionFactory, InteractionTracker {
}
private IsisInteraction getInternalInteractionElseFail() {
- val interaction = getInteractionElseFail();
+ val interaction = currentInteractionElseFail();
if(interaction instanceof IsisInteraction) {
return (IsisInteraction) interaction;
}
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault.java
index 4f5b3fd..3e2aeca 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault.java
@@ -328,7 +328,7 @@ public class WrapperFactoryDefault implements WrapperFactory {
val interactionLayer = currentInteractionLayer();
val asyncAuth = authFrom(asyncControl, interactionLayer.getAuthentication());
- val command = interactionContextProvider.get().getInteractionElseFail().getCommand();
+ val command = interactionContextProvider.get().currentInteractionElseFail().getCommand();
val commandUniqueId = command.getUniqueId();
val targetAdapter = memberAndTarget.getTarget();
@@ -575,7 +575,7 @@ public class WrapperFactoryDefault implements WrapperFactory {
serviceInjector.injectServicesInto(this);
return isisInteractionFactory.callAuthenticated(authentication, () -> {
- val childCommand = interactionContextProvider.get().getInteractionElseFail().getCommand();
+ val childCommand = interactionContextProvider.get().currentInteractionElseFail().getCommand();
childCommand.updater().setParent(parentCommand);
return transactionService.executeWithinTransaction(() -> {
val bookmark = commandExecutorService.executeCommand(commandDto, CommandOutcomeHandler.NULL);
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionManagerJdo.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionManagerJdo.java
index e73bd07..a001443 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionManagerJdo.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionManagerJdo.java
@@ -77,7 +77,7 @@ class IsisTransactionManagerJdo {
} else {
- val interaction = interactionContextProvider.get().getInteractionElseFail();
+ val interaction = interactionContextProvider.get().currentInteractionElseFail();
val command = interaction.getCommand();
val transactionId = command.getUniqueId();