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:37:23 UTC
[isis] 02/02: ISIS-2727: renames InteractionContext ->
InteractionProvider
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 83fbb7ca8b31d5c8bdc992be4f812d567ebdc205
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jun 9 06:36:57 2021 +0100
ISIS-2727: renames InteractionContext -> InteractionProvider
---
...nteractionContext.java => InteractionProvider.java} | 8 ++++----
.../isis/applib/services/iactn/package-info.java | 4 ++--
.../isis/applib/services/metrics/MetricsService.java | 6 +++---
.../presets/DebugRequestScopedServices.properties | 6 +++---
.../core/interaction/session/InteractionTracker.java | 4 ++--
.../core/metamodel/consent/InteractionAdvisor.java | 2 +-
.../metamodel/services/command/CommandDtoFactory.java | 5 +++--
.../specloader/specimpl/ObjectMemberAbstract.java | 5 +++--
.../command/CommandExecutorServiceDefault.java | 4 ++--
.../interaction/InteractionDtoFactoryDefault.java | 4 ++--
.../runtimeservices/wrapper/WrapperFactoryDefault.java | 6 +++---
.../org/apache/isis/core/security/util/XrayUtil.java | 8 ++++----
.../changetracking/EntityChangeTrackerDefault.java | 4 ++--
.../isis/core/transaction/changetracking/_Xray.java | 18 +++++++++---------
.../commandlog/jdo/entities/CommandJdoRepository.java | 4 ++--
.../commandlog/jpa/entities/CommandJpaRepository.java | 4 ++--
.../bootstrapping/builtin-requestscoped.list | 4 ++--
.../bootstrapping/builtin-requestscoped.list | 4 ++--
.../isis/testdomain/conf/Configuration_headless.java | 2 +-
.../applib/IsisIntegrationTestAbstract.java | 4 ++--
20 files changed, 54 insertions(+), 52 deletions(-)
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/InteractionProvider.java
similarity index 97%
rename from api/applib/src/main/java/org/apache/isis/applib/services/iactn/InteractionContext.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/iactn/InteractionProvider.java
index 5c57416..60b438d 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/InteractionProvider.java
@@ -38,19 +38,19 @@ import org.apache.isis.commons.internal.exceptions._Exceptions;
*
* @since 1.x {@index}
*/
-public interface InteractionContext {
+public interface InteractionProvider {
/**
* Whether there is a currently active {@link Interaction} for the calling thread.
*/
boolean isInInteraction();
-
+
/**
* Optionally, the currently active {@link Interaction} for the calling thread.
*/
Optional<Interaction> currentInteraction();
-
- /**
+
+ /**
* Unique id of the current request- or test-scoped {@link Interaction}.
*/
Optional<UUID> getInteractionId();
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/iactn/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/services/iactn/package-info.java
index f0cc5eb..001ca02 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/iactn/package-info.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/iactn/package-info.java
@@ -18,7 +18,7 @@
*/
/**
- * The {@link org.apache.isis.applib.services.iactn.InteractionContext} is a request-scoped domain service that is used
+ * The {@link org.apache.isis.applib.services.iactn.InteractionProvider} is a request-scoped domain service that is used
* to obtain the current {@link org.apache.isis.applib.services.iactn.Interaction}.
* An Interaction in turn generally consists of a single top-level Execution, either to invoke an action or to edit
* a property. If that top-level action or property uses the {@link org.apache.isis.applib.services.wrapper.WrapperFactory} to invoke child actions/properties, then
@@ -26,4 +26,4 @@
*
*
*/
-package org.apache.isis.applib.services.iactn;
\ No newline at end of file
+package org.apache.isis.applib.services.iactn;
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 833fe18..d20d877 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
@@ -19,7 +19,7 @@
package org.apache.isis.applib.services.metrics;
import org.apache.isis.applib.annotation.DomainObject;
-import org.apache.isis.applib.services.iactn.InteractionContext;
+import org.apache.isis.applib.services.iactn.InteractionProvider;
import org.apache.isis.schema.ixn.v2.MemberExecutionDto;
/**
@@ -40,7 +40,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#currentInteraction()}).
+ * Is captured within {@link MemberExecutionDto#getMetrics()} (accessible from {@link InteractionProvider#currentInteraction()}).
*/
int numberEntitiesLoaded();
@@ -50,7 +50,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#currentInteraction()}.
+ * Is captured within {@link MemberExecutionDto#getMetrics()} (accessible from {@link InteractionProvider#currentInteraction()}.
*/
int numberEntitiesDirtied();
diff --git a/core/config/src/main/java/org/apache/isis/core/config/presets/DebugRequestScopedServices.properties b/core/config/src/main/java/org/apache/isis/core/config/presets/DebugRequestScopedServices.properties
index f93c3b1..1096a41 100644
--- a/core/config/src/main/java/org/apache/isis/core/config/presets/DebugRequestScopedServices.properties
+++ b/core/config/src/main/java/org/apache/isis/core/config/presets/DebugRequestScopedServices.properties
@@ -5,9 +5,9 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -17,6 +17,6 @@
# -- framework internal request scoped --
logging.level.org.apache.isis.viewer.restfulobjects.rendering.service.acceptheader.AcceptHeaderServiceForRest = DEBUG
-logging.level.org.apache.isis.applib.services.iactn.InteractionContext = DEBUG
+logging.level.org.apache.isis.applib.services.iactn.InteractionProvider = DEBUG
logging.level.org.apache.isis.applib.services.scratchpad.Scratchpad = DEBUG
logging.level.org.apache.isis.core.runtimeservices.publish.PublisherDispatchServiceDefault = DEBUG
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 4e2779c..a783490 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
@@ -22,7 +22,7 @@ import java.util.Optional;
import org.apache.isis.applib.services.iactn.ExecutionContext;
import org.apache.isis.applib.services.iactn.Interaction;
-import org.apache.isis.applib.services.iactn.InteractionContext;
+import org.apache.isis.applib.services.iactn.InteractionProvider;
import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.core.security.authentication.Authentication;
import org.apache.isis.core.security.authentication.AuthenticationContext;
@@ -32,7 +32,7 @@ import org.apache.isis.core.security.authentication.AuthenticationContext;
* @since 2.0
*/
public interface InteractionTracker
-extends InteractionContext, AuthenticationContext {
+extends InteractionProvider, AuthenticationContext {
/** @return the AuthenticationLayer that sits on top of the current
* request- or test-scoped InteractionSession's stack*/
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionAdvisor.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionAdvisor.java
index 7f49398..5d1300f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionAdvisor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionAdvisor.java
@@ -35,7 +35,7 @@ import org.apache.isis.core.metamodel.interactions.InteractionAdvisorFacet;
*/
public interface InteractionAdvisor {
- //boolean handles(InteractionContext ic);
+ //boolean handles(InteractionProvider ic);
/**
* For testing purposes only.
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/command/CommandDtoFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/command/CommandDtoFactory.java
index b2bad80..dba2432 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/command/CommandDtoFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/command/CommandDtoFactory.java
@@ -20,6 +20,7 @@ package org.apache.isis.core.metamodel.services.command;
import java.util.UUID;
+import org.apache.isis.applib.services.iactn.InteractionProvider;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.core.metamodel.interactions.InteractionHead;
import org.apache.isis.core.metamodel.spec.ManagedObject;
@@ -85,7 +86,7 @@ public interface CommandDtoFactory {
* </p>
*
* @see org.apache.isis.schema.ixn.v2.ActionInvocationDto
- * @see org.apache.isis.applib.services.iactn.InteractionContext
+ * @see InteractionProvider
* @see org.apache.isis.applib.services.iactn.Interaction
*/
void addActionArgs(
@@ -103,7 +104,7 @@ public interface CommandDtoFactory {
* </p>
*
* @see org.apache.isis.schema.ixn.v2.PropertyEditDto
- * @see org.apache.isis.applib.services.iactn.InteractionContext
+ * @see InteractionProvider
* @see org.apache.isis.applib.services.iactn.Interaction
*/
void addPropertyValue(
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 bdfa936..277e063 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
@@ -25,6 +25,7 @@ import java.util.function.Function;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.Where;
+import org.apache.isis.applib.services.iactn.InteractionProvider;
import org.apache.isis.commons.internal.assertions._Assert;
import org.apache.isis.core.metamodel.commons.StringExtensions;
import org.apache.isis.core.metamodel.consent.Consent;
@@ -298,8 +299,8 @@ implements ObjectMember, HasMetaModelContext, HasFacetHolder {
// -- Dependencies
- protected org.apache.isis.applib.services.iactn.InteractionContext getInteractionContext() {
- return getServiceRegistry().lookupServiceElseFail(org.apache.isis.applib.services.iactn.InteractionContext.class);
+ protected InteractionProvider getInteractionContext() {
+ return getServiceRegistry().lookupServiceElseFail(InteractionProvider.class);
}
protected CommandDtoFactory getCommandDtoFactory() {
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 2d241e9..271c019 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
@@ -42,7 +42,7 @@ import org.apache.isis.applib.services.command.Command;
import org.apache.isis.applib.services.command.CommandExecutorService;
import org.apache.isis.applib.services.command.CommandOutcomeHandler;
import org.apache.isis.applib.services.iactn.Execution;
-import org.apache.isis.applib.services.iactn.InteractionContext;
+import org.apache.isis.applib.services.iactn.InteractionProvider;
import org.apache.isis.applib.services.sudo.SudoService;
import org.apache.isis.applib.services.user.UserMemento;
import org.apache.isis.applib.services.xactn.TransactionService;
@@ -99,7 +99,7 @@ public class CommandExecutorServiceDefault implements CommandExecutorService {
@Inject final ClockService clockService;
@Inject final TransactionService transactionService;
@Inject final InteractionTracker isisInteractionTracker;
- @Inject final Provider<InteractionContext> interactionContextProvider;
+ @Inject final Provider<InteractionProvider> interactionContextProvider;
@Inject @Getter final InteractionFactory isisInteractionFactory;
@Inject @Getter final SpecificationLoader specificationLoader;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/interaction/InteractionDtoFactoryDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/interaction/InteractionDtoFactoryDefault.java
index 440c7fd..d24f2f9 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/interaction/InteractionDtoFactoryDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/interaction/InteractionDtoFactoryDefault.java
@@ -33,7 +33,7 @@ import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.bookmark.BookmarkService;
import org.apache.isis.applib.services.iactn.Interaction;
-import org.apache.isis.applib.services.iactn.InteractionContext;
+import org.apache.isis.applib.services.iactn.InteractionProvider;
import org.apache.isis.applib.services.user.UserService;
import org.apache.isis.applib.util.schema.CommandDtoUtils;
import org.apache.isis.applib.util.schema.InteractionDtoUtils;
@@ -72,7 +72,7 @@ public class InteractionDtoFactoryDefault implements InteractionDtoFactory {
@Inject private CommandDtoFactory commandDtoServiceInternal;
@Inject private BookmarkService bookmarkService;
- @Inject private javax.inject.Provider<InteractionContext> interactionContextProvider;
+ @Inject private javax.inject.Provider<InteractionProvider> interactionContextProvider;
@Inject private UserService userService;
@Override
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 bb154b7..33f93a0 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
@@ -48,7 +48,7 @@ import org.apache.isis.applib.services.command.Command;
import org.apache.isis.applib.services.command.CommandExecutorService;
import org.apache.isis.applib.services.factory.FactoryService;
import org.apache.isis.applib.services.iactn.ExecutionContext;
-import org.apache.isis.applib.services.iactn.InteractionContext;
+import org.apache.isis.applib.services.iactn.InteractionProvider;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.services.metamodel.MetaModelService;
import org.apache.isis.applib.services.repository.RepositoryService;
@@ -124,7 +124,7 @@ public class WrapperFactoryDefault implements WrapperFactory {
@Inject FactoryService factoryService;
@Inject MetaModelContext metaModelContext;
@Inject SpecificationLoader specificationLoader;
- @Inject Provider<InteractionContext> interactionContextProvider;
+ @Inject Provider<InteractionProvider> interactionContextProvider;
@Inject ServiceInjector serviceInjector;
@Inject _ProxyFactoryService proxyFactoryService; // protected to allow JUnit test
@Inject CommandDtoFactory commandDtoFactory;
@@ -597,7 +597,7 @@ public class WrapperFactoryDefault implements WrapperFactory {
@Inject InteractionFactory interactionFactory;
@Inject TransactionService transactionService;
@Inject CommandExecutorService commandExecutorService;
- @Inject Provider<InteractionContext> interactionContextProvider;
+ @Inject Provider<InteractionProvider> interactionContextProvider;
@Inject BookmarkService bookmarkService;
@Inject RepositoryService repositoryService;
@Inject MetaModelService metaModelService;
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 246f2a4..17d4b47 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
@@ -22,7 +22,7 @@ import java.util.Optional;
import java.util.UUID;
import java.util.function.Consumer;
-import org.apache.isis.applib.services.iactn.InteractionContext;
+import org.apache.isis.applib.services.iactn.InteractionProvider;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.internal.debug.xray.XrayModel.ThreadMemento;
import org.apache.isis.commons.internal.debug.xray.XrayUi;
@@ -41,7 +41,7 @@ public final class XrayUtil {
* Returns the sequence diagram data model's id, that is bound to the current thread and interaction.
* @param iaContext
*/
- public static Optional<String> currentSequenceId(final @NonNull InteractionContext iaContext) {
+ public static Optional<String> currentSequenceId(final @NonNull InteractionProvider iaContext) {
return iaContext.getInteractionId()
.map(XrayUtil::sequenceId);
}
@@ -65,7 +65,7 @@ public final class XrayUtil {
// -- SEQUENCE HANDLE
public static Optional<SequenceHandle> createSequenceHandle(
- final @NonNull InteractionContext iaContext,
+ final @NonNull InteractionProvider iaContext,
final @NonNull AuthenticationContext authContext,
final String ... callees) {
@@ -89,7 +89,7 @@ public final class XrayUtil {
}
// Using parameter that implements multiple interfaces, because we have no access to InteractionTracker
- public static <T extends InteractionContext & AuthenticationContext>
+ public static <T extends InteractionProvider & AuthenticationContext>
Optional<SequenceHandle> createSequenceHandle(
final @NonNull T iaTracker,
final String ... callees) {
diff --git a/core/transaction/src/main/java/org/apache/isis/core/transaction/changetracking/EntityChangeTrackerDefault.java b/core/transaction/src/main/java/org/apache/isis/core/transaction/changetracking/EntityChangeTrackerDefault.java
index ce92abc..fd58435 100644
--- a/core/transaction/src/main/java/org/apache/isis/core/transaction/changetracking/EntityChangeTrackerDefault.java
+++ b/core/transaction/src/main/java/org/apache/isis/core/transaction/changetracking/EntityChangeTrackerDefault.java
@@ -42,7 +42,7 @@ import org.apache.isis.applib.events.lifecycle.AbstractLifecycleEvent;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.eventbus.EventBusService;
import org.apache.isis.applib.services.iactn.Interaction;
-import org.apache.isis.applib.services.iactn.InteractionContext;
+import org.apache.isis.applib.services.iactn.InteractionProvider;
import org.apache.isis.applib.services.metrics.MetricsService;
import org.apache.isis.applib.services.publishing.spi.EntityChanges;
import org.apache.isis.applib.services.publishing.spi.EntityPropertyChange;
@@ -101,7 +101,7 @@ implements
@Inject private EntityPropertyChangePublisher entityPropertyChangePublisher;
@Inject private EntityChangesPublisher entityChangesPublisher;
@Inject private EventBusService eventBusService;
- @Inject private Provider<InteractionContext> interactionContextProvider;
+ @Inject private Provider<InteractionProvider> interactionContextProvider;
@Inject private Provider<AuthenticationContext> authenticationContextProvider;
diff --git a/core/transaction/src/main/java/org/apache/isis/core/transaction/changetracking/_Xray.java b/core/transaction/src/main/java/org/apache/isis/core/transaction/changetracking/_Xray.java
index 39c4d89..aaf21c9 100644
--- a/core/transaction/src/main/java/org/apache/isis/core/transaction/changetracking/_Xray.java
+++ b/core/transaction/src/main/java/org/apache/isis/core/transaction/changetracking/_Xray.java
@@ -22,7 +22,7 @@ import java.awt.Color;
import javax.inject.Provider;
-import org.apache.isis.applib.services.iactn.InteractionContext;
+import org.apache.isis.applib.services.iactn.InteractionProvider;
import org.apache.isis.commons.internal.debug.xray.XrayUi;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ManagedObjects;
@@ -35,7 +35,7 @@ final class _Xray {
public static void publish(
final EntityChangeTrackerDefault entityChangeTrackerDefault,
- final Provider<InteractionContext> iaContextProvider,
+ final Provider<InteractionProvider> iaContextProvider,
final Provider<AuthenticationContext> authContextProvider) {
if(!XrayUi.isXrayEnabled()) {
@@ -69,42 +69,42 @@ final class _Xray {
public static void enlistCreated(
final ManagedObject entity,
- final Provider<InteractionContext> iaContextProvider,
+ final Provider<InteractionProvider> iaContextProvider,
final Provider<AuthenticationContext> authContextProvider) {
addSequence("enlistCreated", entity, iaContextProvider, authContextProvider);
}
public static void enlistDeleting(
final ManagedObject entity,
- final Provider<InteractionContext> iaContextProvider,
+ final Provider<InteractionProvider> iaContextProvider,
final Provider<AuthenticationContext> authContextProvider) {
addSequence("enlistDeleting", entity, iaContextProvider, authContextProvider);
}
public static void enlistUpdating(
final ManagedObject entity,
- final Provider<InteractionContext> iaContextProvider,
+ final Provider<InteractionProvider> iaContextProvider,
final Provider<AuthenticationContext> authContextProvider) {
addSequence("enlistUpdating", entity, iaContextProvider, authContextProvider);
}
public static void recognizeLoaded(
final ManagedObject entity,
- final Provider<InteractionContext> iaContextProvider,
+ final Provider<InteractionProvider> iaContextProvider,
final Provider<AuthenticationContext> authContextProvider) {
addSequence("recognizeLoaded", entity, iaContextProvider, authContextProvider);
}
public static void recognizePersisting(
final ManagedObject entity,
- final Provider<InteractionContext> iaContextProvider,
+ final Provider<InteractionProvider> iaContextProvider,
final Provider<AuthenticationContext> authContextProvider) {
addSequence("recognizePersisting", entity, iaContextProvider, authContextProvider);
}
public static void recognizeUpdating(
final ManagedObject entity,
- final Provider<InteractionContext> iaContextProvider,
+ final Provider<InteractionProvider> iaContextProvider,
final Provider<AuthenticationContext> authContextProvider) {
addSequence("recognizeUpdating", entity, iaContextProvider, authContextProvider);
}
@@ -114,7 +114,7 @@ final class _Xray {
private static void addSequence(
final String what,
final ManagedObject entity,
- final Provider<InteractionContext> iaContextProvider,
+ final Provider<InteractionProvider> iaContextProvider,
final Provider<AuthenticationContext> authContextProvider) {
if(!XrayUi.isXrayEnabled()) {
diff --git a/extensions/core/command-log/jdo/src/main/java/org/apache/isis/extensions/commandlog/jdo/entities/CommandJdoRepository.java b/extensions/core/command-log/jdo/src/main/java/org/apache/isis/extensions/commandlog/jdo/entities/CommandJdoRepository.java
index 1de0913..19ca015 100644
--- a/extensions/core/command-log/jdo/src/main/java/org/apache/isis/extensions/commandlog/jdo/entities/CommandJdoRepository.java
+++ b/extensions/core/command-log/jdo/src/main/java/org/apache/isis/extensions/commandlog/jdo/entities/CommandJdoRepository.java
@@ -43,7 +43,7 @@ import org.apache.isis.applib.jaxb.JavaSqlXMLGregorianCalendarMarshalling;
import org.apache.isis.applib.query.Query;
import org.apache.isis.applib.query.QueryRange;
import org.apache.isis.applib.services.bookmark.Bookmark;
-import org.apache.isis.applib.services.iactn.InteractionContext;
+import org.apache.isis.applib.services.iactn.InteractionProvider;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.util.schema.CommandDtoUtils;
import org.apache.isis.extensions.commandlog.model.command.CommandModel;
@@ -72,7 +72,7 @@ import lombok.val;
public class CommandJdoRepository
implements CommandModelRepository<CommandJdo> {
- @Inject final Provider<InteractionContext> interactionContextProvider;
+ @Inject final Provider<InteractionProvider> interactionContextProvider;
@Inject final Provider<RepositoryService> repositoryServiceProvider;
@Inject final JdoSupportService jdoSupport;
diff --git a/extensions/core/command-log/jpa/src/main/java/org/apache/isis/extensions/commandlog/jpa/entities/CommandJpaRepository.java b/extensions/core/command-log/jpa/src/main/java/org/apache/isis/extensions/commandlog/jpa/entities/CommandJpaRepository.java
index 8b8df63..33299e3 100644
--- a/extensions/core/command-log/jpa/src/main/java/org/apache/isis/extensions/commandlog/jpa/entities/CommandJpaRepository.java
+++ b/extensions/core/command-log/jpa/src/main/java/org/apache/isis/extensions/commandlog/jpa/entities/CommandJpaRepository.java
@@ -43,7 +43,7 @@ import org.apache.isis.applib.jaxb.JavaSqlXMLGregorianCalendarMarshalling;
import org.apache.isis.applib.query.Query;
import org.apache.isis.applib.query.QueryRange;
import org.apache.isis.applib.services.bookmark.Bookmark;
-import org.apache.isis.applib.services.iactn.InteractionContext;
+import org.apache.isis.applib.services.iactn.InteractionProvider;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.util.schema.CommandDtoUtils;
import org.apache.isis.extensions.commandlog.model.command.CommandModel;
@@ -71,7 +71,7 @@ import lombok.val;
public class CommandJpaRepository
implements CommandModelRepository<CommandJpa> {
- @Inject final Provider<InteractionContext> interactionContextProvider;
+ @Inject final Provider<InteractionProvider> interactionContextProvider;
@Inject final Provider<RepositoryService> repositoryServiceProvider;
diff --git a/regressiontests/stable-bootstrapping/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-requestscoped.list b/regressiontests/stable-bootstrapping/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-requestscoped.list
index 11acf57..65d5252 100644
--- a/regressiontests/stable-bootstrapping/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-requestscoped.list
+++ b/regressiontests/stable-bootstrapping/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-requestscoped.list
@@ -16,10 +16,10 @@
# specific language governing permissions and limitations
# under the License.
#
-org.apache.isis.applib.services.iactn.InteractionContext
+org.apache.isis.applib.services.iactn.InteractionProvider
org.apache.isis.applib.services.queryresultscache.QueryResultsCacheInternal
org.apache.isis.applib.services.scratchpad.Scratchpad
org.apache.isis.core.runtimeservices.changes.ChangedObjectsServiceInternal
org.apache.isis.core.runtimeservices.metrics.MetricsServiceForJdo
PublisherDispatchServiceDefault
-org.apache.isis.objectstore.jdo.datanucleus.service.support.TimestampService
\ No newline at end of file
+org.apache.isis.objectstore.jdo.datanucleus.service.support.TimestampService
diff --git a/regressiontests/stable-rest/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-requestscoped.list b/regressiontests/stable-rest/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-requestscoped.list
index 11acf57..65d5252 100644
--- a/regressiontests/stable-rest/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-requestscoped.list
+++ b/regressiontests/stable-rest/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-requestscoped.list
@@ -16,10 +16,10 @@
# specific language governing permissions and limitations
# under the License.
#
-org.apache.isis.applib.services.iactn.InteractionContext
+org.apache.isis.applib.services.iactn.InteractionProvider
org.apache.isis.applib.services.queryresultscache.QueryResultsCacheInternal
org.apache.isis.applib.services.scratchpad.Scratchpad
org.apache.isis.core.runtimeservices.changes.ChangedObjectsServiceInternal
org.apache.isis.core.runtimeservices.metrics.MetricsServiceForJdo
PublisherDispatchServiceDefault
-org.apache.isis.objectstore.jdo.datanucleus.service.support.TimestampService
\ No newline at end of file
+org.apache.isis.objectstore.jdo.datanucleus.service.support.TimestampService
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 73e50e1..f88cc6d 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
@@ -63,7 +63,7 @@ public class Configuration_headless {
public static class HeadlessCommandSupport
implements InteractionScopeAware {
-// private final Provider<InteractionContext> interactionContextProvider;
+// private final Provider<InteractionProvider> interactionContextProvider;
// private final CommandDispatcher commandDispatcher;
@Override
diff --git a/testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/IsisIntegrationTestAbstract.java b/testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/IsisIntegrationTestAbstract.java
index cc42e1b..b51e303 100644
--- a/testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/IsisIntegrationTestAbstract.java
+++ b/testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/IsisIntegrationTestAbstract.java
@@ -28,7 +28,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.command.Command;
import org.apache.isis.applib.services.factory.FactoryService;
-import org.apache.isis.applib.services.iactn.InteractionContext;
+import org.apache.isis.applib.services.iactn.InteractionProvider;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.services.metamodel.MetaModelService;
import org.apache.isis.applib.services.registry.ServiceRegistry;
@@ -60,7 +60,7 @@ public abstract class IsisIntegrationTestAbstract {
public static class InteractionSupport {
@SuppressWarnings("unused")
- private final Provider<InteractionContext> interactionContextProvider;
+ private final Provider<InteractionProvider> interactionContextProvider;
}