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/04 09:55:15 UTC
[isis] 02/02: ISIS-2464: renaming
InteractionClosure->InteractionEnvironment
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 a51bf67b3f9f3db9b3ac1e85778922612c0688ae
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Dec 4 10:54:56 2020 +0100
ISIS-2464: renaming InteractionClosure->InteractionEnvironment
also IsisInteractionFactory->InteractionFactory
and IsisInteractionFactoryDefault->InteractionFactoryDefault
and IsisInteractionTracker->InteractionTracker
---
.../core/runtime/context/IsisAppCommonContext.java | 4 ++--
.../isis/core/runtime/context/RuntimeContext.java | 4 ++--
.../core/runtime/context/RuntimeContextBase.java | 12 ++++++------
.../core/runtime/events/RuntimeEventService.java | 4 ++--
...ctionClosure.java => InteractionEnvironment.java} | 6 +++---
...teractionFactory.java => InteractionFactory.java} | 4 ++--
.../isis/core/runtime/iactn/InteractionSession.java | 2 +-
...teractionTracker.java => InteractionTracker.java} | 8 ++++----
.../runtime/iactn/scope/IsisInteractionScope.java | 4 ++--
.../isis/core/runtime/session/IsisRequestCycle.java | 4 ++--
.../IsisModuleCoreRuntimeServices.java | 4 ++--
.../runtimeservices/clock/ClockServiceDefault.java | 4 ++--
.../command/CommandExecutorServiceDefault.java | 8 ++++----
.../executor/MemberExecutorServiceDefault.java | 4 ++--
.../factory/FactoryServiceDefault.java | 4 ++--
...ryDefault.java => InteractionFactoryDefault.java} | 20 ++++++++++----------
.../runtimeservices/sudo/SudoServiceDefault.java | 4 ++--
.../runtimeservices/user/UserServiceDefault.java | 4 ++--
.../wrapper/WrapperFactoryDefault.java | 8 ++++----
.../HealthIndicatorUsingHealthCheckService.java | 6 +++---
.../java/demoapp/dom/jee/DemoRequestScopedBean.java | 4 ++--
.../src/main/java/demoapp/javafx/DemoAppJavaFx.java | 4 ++--
.../java/demoapp/webapp/vaadin/DemoAppVaadin.java | 4 ++--
.../java/demoapp/web/linebreaker/LineBreaker.java | 4 ++--
.../commandlog/impl/jdo/CommandJdo_retry.java | 4 ++--
.../secondary/job/ReplicateAndReplayJob.java | 4 ++--
.../secman/shiro/IsisModuleExtSecmanShiroRealm.java | 4 ++--
.../viewer/javafx/model/context/UiContextFx.java | 4 ++--
.../incubator/viewer/javafx/ui/main/MainViewFx.java | 4 ++--
.../viewer/javafx/ui/main/UiActionHandlerFx.java | 4 ++--
.../viewer/javafx/ui/main/UiContextFxDefault.java | 4 ++--
.../viewer/vaadin/model/context/UiContextVaa.java | 4 ++--
.../vaadin/ui/auth/VaadinAuthenticationHandler.java | 6 +++---
.../vaadin/ui/pages/main/UiActionHandlerVaa.java | 4 ++--
.../vaadin/ui/pages/main/UiContextVaaDefault.java | 4 ++--
.../viewer/IsisModuleIncViewerVaadinViewer.java | 4 ++--
.../viewer/vaadin/viewer/IsisServletForVaadin.java | 6 +++---
.../datanucleus5/jdosupport/IsisJdoSupportDN5.java | 4 ++--
.../JdoPersistenceCapableAnnotationFacetFactory.java | 8 ++++----
.../JdoPersistenceCapableFacetAbstract.java | 6 +++---
.../JdoPersistenceCapableFacetAnnotation.java | 4 ++--
.../JdoPersistenceCapableFacetImpl.java | 4 ++--
.../IsisPlatformTransactionManagerForJdo.java | 12 ++++++------
.../datanucleus5/persistence/IsisTransactionJdo.java | 6 +++---
.../bootstrapping/JpaBootstrappingTest.java | 4 ++--
.../applayer/ApplicationLayerTestFactory.java | 4 ++--
.../testdomain/commons/InteractionTestAbstract.java | 4 ++--
.../transactions/TransactionScopeListenerTest.java | 4 ++--
.../security/keycloak/webmodule/KeycloakFilter.java | 4 ++--
.../applib/fixturescripts/FixtureScripts.java | 4 ++--
.../applib/services/FixturesLifecycleService.java | 4 ++--
.../applib/IsisInteractionHandler.java | 8 ++++----
.../sse/ui/wkt/services/SseServiceDefault.java | 4 ++--
...xt_ensureCompatibleAcceptHeader_ContractTest.java | 8 ++++----
.../resources/DomainObjectResourceServerside.java | 4 ++--
.../resources/DomainServiceResourceServerside.java | 4 ++--
.../resources/DomainTypeResourceServerside.java | 4 ++--
.../viewer/resources/HomePageResourceServerside.java | 4 ++--
.../viewer/resources/ImageResourceServerside.java | 4 ++--
.../viewer/resources/MenuBarsResourceServerside.java | 4 ++--
.../viewer/resources/ResourceAbstract.java | 6 +++---
.../viewer/resources/SwaggerSpecResource.java | 6 +++---
.../viewer/resources/UserResourceServerside.java | 4 ++--
.../viewer/resources/VersionResourceServerside.java | 4 ++--
.../IsisRestfulObjectsInteractionFilter.java | 4 ++--
.../viewer/context/ResourceContext_getArg_Test.java | 8 ++++----
.../wicket/ui/app/logout/LogoutHandlerWkt.java | 4 ++--
.../ajaxtable/PrototypingMessageProvider.java | 2 +-
.../components/widgets/themepicker/ThemeChooser.java | 4 ++--
.../isis/viewer/wicket/ui/pages/WebPageBase.java | 8 ++++----
.../ui/pages/accmngt/EmailAvailableValidator.java | 4 ++--
.../ui/pages/accmngt/UsernameAvailableValidator.java | 4 ++--
.../ui/pages/accmngt/register/RegisterPanel.java | 4 ++--
.../wicket/ui/pages/login/IsisSignInPanel.java | 4 ++--
.../viewer/wicket/ui/panels/FormExecutorDefault.java | 8 ++++----
.../isis/viewer/wicket/ui/panels/PanelBase.java | 8 ++++----
.../integration/AuthenticatedWebSessionForIsis.java | 14 +++++++-------
.../wicket/viewer/integration/LocalizerForIsis.java | 8 ++++----
.../viewer/integration/WebRequestCycleForIsis.java | 6 +++---
.../AuthenticatedWebSessionForIsis_Authenticate.java | 14 +++++++-------
.../AuthenticatedWebSessionForIsis_SignIn.java | 8 ++++----
.../AuthenticatedWebSessionForIsis_TestAbstract.java | 8 ++++----
82 files changed, 223 insertions(+), 223 deletions(-)
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/context/IsisAppCommonContext.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/context/IsisAppCommonContext.java
index 39801cd..cce7aa1 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/context/IsisAppCommonContext.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/context/IsisAppCommonContext.java
@@ -37,7 +37,7 @@ import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.context.memento.ObjectMemento;
import org.apache.isis.core.runtime.context.memento.ObjectMementoService;
-import org.apache.isis.core.runtime.iactn.IsisInteractionTracker;
+import org.apache.isis.core.runtime.iactn.InteractionTracker;
import org.apache.isis.core.security.authentication.MessageBroker;
import lombok.AccessLevel;
@@ -73,7 +73,7 @@ public class IsisAppCommonContext implements MetaModelContext.Delegating {
private final MenuBarsService menuBarsService = lookupServiceElseFail(MenuBarsService.class);
@Getter(lazy = true)
- private final IsisInteractionTracker isisInteractionTracker = lookupServiceElseFail(IsisInteractionTracker.class);
+ private final InteractionTracker interactionTracker = lookupServiceElseFail(InteractionTracker.class);
@Getter(lazy = true, value = AccessLevel.PRIVATE)
private final ObjectMementoService mementoService = lookupServiceElseFail(ObjectMementoService.class);
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/context/RuntimeContext.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/context/RuntimeContext.java
index f48147b..0b31daa 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/context/RuntimeContext.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/context/RuntimeContext.java
@@ -23,7 +23,7 @@ import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.core.runtime.iactn.IsisInteractionTracker;
+import org.apache.isis.core.runtime.iactn.InteractionTracker;
/**
* TODO [2033] this was introduced when refactoring, maybe use MetaModelContext instead if possible
@@ -35,7 +35,7 @@ public interface RuntimeContext {
MetaModelContext getMetaModelContext();
- IsisInteractionTracker getIsisInteractionTracker();
+ InteractionTracker getIsisInteractionTracker();
IsisConfiguration getConfiguration();
SpecificationLoader getSpecificationLoader();
ServiceInjector getServiceInjector();
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/context/RuntimeContextBase.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/context/RuntimeContextBase.java
index 7993bb2..da1b754 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/context/RuntimeContextBase.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/context/RuntimeContextBase.java
@@ -28,8 +28,8 @@ import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.objectmanager.ObjectManager;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
-import org.apache.isis.core.runtime.iactn.IsisInteractionTracker;
+import org.apache.isis.core.runtime.iactn.InteractionFactory;
+import org.apache.isis.core.runtime.iactn.InteractionTracker;
import org.apache.isis.core.security.authentication.AuthenticationSessionTracker;
import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
@@ -50,9 +50,9 @@ public abstract class RuntimeContextBase implements RuntimeContext {
@Getter(onMethod = @__(@Override)) protected final ServiceInjector serviceInjector;
@Getter(onMethod = @__(@Override)) protected final ServiceRegistry serviceRegistry;
@Getter(onMethod = @__(@Override)) protected final SpecificationLoader specificationLoader;
- @Getter(onMethod = @__(@Override)) protected final IsisInteractionTracker isisInteractionTracker;
+ @Getter(onMethod = @__(@Override)) protected final InteractionTracker isisInteractionTracker;
- @Getter protected final IsisInteractionFactory isisInteractionFactory;
+ @Getter protected final InteractionFactory isisInteractionFactory;
@Getter protected final AuthenticationManager authenticationManager;
@Getter protected final TransactionService transactionService;
@Getter protected final Supplier<ManagedObject> homePageSupplier;
@@ -69,9 +69,9 @@ public abstract class RuntimeContextBase implements RuntimeContext {
this.objectManager = mmc.getObjectManager();
this.transactionService = mmc.getTransactionService();
this.homePageSupplier = mmc::getHomePageAdapter;
- this.isisInteractionFactory = serviceRegistry.lookupServiceElseFail(IsisInteractionFactory.class);
+ this.isisInteractionFactory = serviceRegistry.lookupServiceElseFail(InteractionFactory.class);
this.authenticationManager = serviceRegistry.lookupServiceElseFail(AuthenticationManager.class);
- this.isisInteractionTracker = serviceRegistry.lookupServiceElseFail(IsisInteractionTracker.class);
+ this.isisInteractionTracker = serviceRegistry.lookupServiceElseFail(InteractionTracker.class);
}
// -- AUTH
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/events/RuntimeEventService.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/events/RuntimeEventService.java
index 2523c7e..f63271f 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/events/RuntimeEventService.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/events/RuntimeEventService.java
@@ -28,7 +28,7 @@ import org.apache.isis.core.runtime.events.iactn.IsisInteractionLifecycleEvent;
import org.apache.isis.core.runtime.events.persistence.PostStoreEvent;
import org.apache.isis.core.runtime.events.persistence.PreStoreEvent;
import org.apache.isis.core.runtime.iactn.InteractionSession;
-import org.apache.isis.core.runtime.iactn.IsisInteractionTracker;
+import org.apache.isis.core.runtime.iactn.InteractionTracker;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Primary;
import org.springframework.core.annotation.Order;
@@ -50,7 +50,7 @@ import lombok.val;
public class RuntimeEventService {
@Inject private EventBusService eventBusService;
- @Inject private IsisInteractionTracker interactionTracker;
+ @Inject private InteractionTracker interactionTracker;
// -- APP
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/iactn/InteractionClosure.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/iactn/InteractionEnvironment.java
similarity index 91%
rename from core/runtime/src/main/java/org/apache/isis/core/runtime/iactn/InteractionClosure.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/iactn/InteractionEnvironment.java
index 28f1bbc..5e96d3d 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/iactn/InteractionClosure.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/iactn/InteractionEnvironment.java
@@ -32,12 +32,12 @@ import lombok.NonNull;
* @since 2.0
*
*/
-public class InteractionClosure extends RuntimeContextBase {
+public class InteractionEnvironment extends RuntimeContextBase {
@Getter private final InteractionSession interactionSession;
@Getter private final AuthenticationSession authenticationSession;
- public InteractionClosure(
+ public InteractionEnvironment(
final @NonNull InteractionSession interactionSession,
final @NonNull AuthenticationSession authenticationSession) {
@@ -51,7 +51,7 @@ public class InteractionClosure extends RuntimeContextBase {
this.authenticationSession = authenticationSession;
}
- public InteractionClosure(final @NonNull InteractionSession interactionSession) {
+ public InteractionEnvironment(final @NonNull InteractionSession interactionSession) {
this(interactionSession, interactionSession.getAuthenticationSession());
}
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/iactn/IsisInteractionFactory.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/iactn/InteractionFactory.java
similarity index 96%
rename from core/runtime/src/main/java/org/apache/isis/core/runtime/iactn/IsisInteractionFactory.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/iactn/InteractionFactory.java
index 682cf48..e8ded76 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/iactn/IsisInteractionFactory.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/iactn/InteractionFactory.java
@@ -36,7 +36,7 @@ import org.apache.isis.core.security.authentication.AuthenticationSession;
* The implementation is a singleton service.
* </p>
*/
-public interface IsisInteractionFactory {
+public interface InteractionFactory {
@FunctionalInterface
public interface ThrowingRunnable {
@@ -56,7 +56,7 @@ public interface IsisInteractionFactory {
* @param authenticationSession
* @return
*/
- public InteractionClosure openInteraction(AuthenticationSession authenticationSession);
+ public InteractionEnvironment openInteraction(AuthenticationSession authenticationSession);
/**
* @return whether the calling thread is within the context of an open IsisInteractionSession
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/iactn/InteractionSession.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/iactn/InteractionSession.java
index 8003cc5..263d29c 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/iactn/InteractionSession.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/iactn/InteractionSession.java
@@ -51,7 +51,7 @@ import lombok.Setter;
* {@link org.apache.isis.applib.services.publishing.spi.ExecutionSubscriber}.
* </p>
*
- * @see IsisInteractionFactory
+ * @see InteractionFactory
*/
public class InteractionSession extends RuntimeContextBase {
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/iactn/IsisInteractionTracker.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/iactn/InteractionTracker.java
similarity index 88%
rename from core/runtime/src/main/java/org/apache/isis/core/runtime/iactn/IsisInteractionTracker.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/iactn/InteractionTracker.java
index fc38329..1c45dc3 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/iactn/IsisInteractionTracker.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/iactn/InteractionTracker.java
@@ -31,7 +31,7 @@ import org.apache.isis.core.security.authentication.MessageBroker;
* @since 2.0
*
*/
-public interface IsisInteractionTracker
+public interface InteractionTracker
extends
AuthenticationSessionTracker,
InteractionContext {
@@ -40,16 +40,16 @@ extends
/** @return the InteractionClosure that sits on top of the current
* request- or test-scoped InteractionSession*/
- Optional<InteractionClosure> currentInteractionClosure();
+ Optional<InteractionEnvironment> currentInteractionClosure();
/** @return the current request- or test-scoped InteractionSession*/
default Optional<InteractionSession> currentInteractionSession() {
- return currentInteractionClosure().map(InteractionClosure::getInteractionSession);
+ return currentInteractionClosure().map(InteractionEnvironment::getInteractionSession);
}
@Override
default Optional<AuthenticationSession> currentAuthenticationSession() {
- return currentInteractionClosure().map(InteractionClosure::getAuthenticationSession);
+ return currentInteractionClosure().map(InteractionEnvironment::getAuthenticationSession);
}
@Override
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/iactn/scope/IsisInteractionScope.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/iactn/scope/IsisInteractionScope.java
index a2d6870..f1cbf78 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/iactn/scope/IsisInteractionScope.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/iactn/scope/IsisInteractionScope.java
@@ -28,7 +28,7 @@ import org.springframework.beans.factory.config.Scope;
import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.commons.internal.debug._Probe;
import org.apache.isis.commons.internal.exceptions._Exceptions;
-import org.apache.isis.core.runtime.iactn.IsisInteractionTracker;
+import org.apache.isis.core.runtime.iactn.InteractionTracker;
import lombok.Data;
import lombok.val;
@@ -40,7 +40,7 @@ import lombok.extern.log4j.Log4j2;
@Log4j2
class IsisInteractionScope implements Scope, IsisInteractionScopeCloseListener {
- @Inject private IsisInteractionTracker isisInteractionTracker;
+ @Inject private InteractionTracker isisInteractionTracker;
@Data(staticConstructor = "of")
private static class ScopedObject {
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisRequestCycle.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisRequestCycle.java
index 0d52653..b59b5f2 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisRequestCycle.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisRequestCycle.java
@@ -23,7 +23,7 @@ import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.support.TransactionTemplate;
import org.apache.isis.commons.internal.exceptions._Exceptions;
-import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
+import org.apache.isis.core.runtime.iactn.InteractionFactory;
import org.apache.isis.core.security.authentication.AuthenticationSession;
import lombok.RequiredArgsConstructor;
@@ -38,7 +38,7 @@ public class IsisRequestCycle {
// -- SUPPORTING ISIS TRANSACTION FILTER FOR RESTFUL OBJECTS ...
- private final IsisInteractionFactory isisInteractionFactory;
+ private final InteractionFactory isisInteractionFactory;
private final TransactionTemplate transactionTemplate;
private TransactionStatus txStatus;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/IsisModuleCoreRuntimeServices.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/IsisModuleCoreRuntimeServices.java
index 5af24b2..256915d 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/IsisModuleCoreRuntimeServices.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/IsisModuleCoreRuntimeServices.java
@@ -54,7 +54,7 @@ import org.apache.isis.core.runtimeservices.queryresultscache.QueryResultsCacheD
import org.apache.isis.core.runtimeservices.repository.RepositoryServiceDefault;
import org.apache.isis.core.runtimeservices.routing.RoutingServiceDefault;
import org.apache.isis.core.runtimeservices.scratchpad.ScratchpadDefault;
-import org.apache.isis.core.runtimeservices.session.IsisInteractionFactoryDefault;
+import org.apache.isis.core.runtimeservices.session.InteractionFactoryDefault;
import org.apache.isis.core.runtimeservices.sudo.SudoServiceDefault;
import org.apache.isis.core.runtimeservices.urlencoding.UrlEncodingServiceWithCompression;
import org.apache.isis.core.runtimeservices.user.UserServiceDefault;
@@ -88,7 +88,7 @@ import org.apache.isis.core.runtimeservices.xmlsnapshot.XmlSnapshotServiceDefaul
FactoryServiceDefault.class,
HomePageResolverServiceDefault.class,
InteractionDtoServiceInternalDefault.class,
- IsisInteractionFactoryDefault.class,
+ InteractionFactoryDefault.class,
JaxbServiceDefault.class,
TranslationServicePo.class,
MemberExecutorServiceDefault.class,
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/clock/ClockServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/clock/ClockServiceDefault.java
index 39255c5..0f812aa 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/clock/ClockServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/clock/ClockServiceDefault.java
@@ -11,7 +11,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.clock.VirtualClock;
import org.apache.isis.applib.services.clock.ClockService;
-import org.apache.isis.core.runtime.iactn.IsisInteractionTracker;
+import org.apache.isis.core.runtime.iactn.InteractionTracker;
import org.apache.isis.core.security.authentication.AuthenticationSession;
import lombok.RequiredArgsConstructor;
@@ -24,7 +24,7 @@ import lombok.RequiredArgsConstructor;
@RequiredArgsConstructor(onConstructor_ = {@Inject})
public class ClockServiceDefault implements ClockService {
- private final IsisInteractionTracker interactionTracker;
+ private final InteractionTracker interactionTracker;
@Override
public VirtualClock getClock() {
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 3ab8cdd..25598e2 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
@@ -64,8 +64,8 @@ import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.specloader.specimpl.ObjectActionMixedIn;
-import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
-import org.apache.isis.core.runtime.iactn.IsisInteractionTracker;
+import org.apache.isis.core.runtime.iactn.InteractionFactory;
+import org.apache.isis.core.runtime.iactn.InteractionTracker;
import org.apache.isis.schema.cmd.v2.ActionDto;
import org.apache.isis.schema.cmd.v2.CommandDto;
import org.apache.isis.schema.cmd.v2.MemberDto;
@@ -98,10 +98,10 @@ public class CommandExecutorServiceDefault implements CommandExecutorService {
@Inject final SudoService sudoService;
@Inject final ClockService clockService;
@Inject final TransactionService transactionService;
- @Inject final IsisInteractionTracker isisInteractionTracker;
+ @Inject final InteractionTracker isisInteractionTracker;
@Inject final Provider<InteractionContext> interactionContextProvider;
- @Inject @Getter final IsisInteractionFactory isisInteractionFactory;
+ @Inject @Getter final InteractionFactory isisInteractionFactory;
@Inject @Getter final SpecificationLoader specificationLoader;
@Override
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 f9efd02..e7f2418 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
@@ -43,7 +43,7 @@ import org.apache.isis.core.metamodel.spec.ManagedObjects;
import org.apache.isis.core.metamodel.spec.ManagedObjects.UnwrapUtil;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.core.runtime.iactn.IsisInteractionTracker;
+import org.apache.isis.core.runtime.iactn.InteractionTracker;
import org.apache.isis.schema.ixn.v2.ActionInvocationDto;
import lombok.Getter;
@@ -62,7 +62,7 @@ import lombok.extern.log4j.Log4j2;
public class MemberExecutorServiceDefault
implements MemberExecutorService {
- private final @Getter IsisInteractionTracker isisInteractionTracker;
+ private final @Getter InteractionTracker isisInteractionTracker;
private final @Getter IsisConfiguration configuration;
private final @Getter ObjectManager objectManager;
private final @Getter ClockService clockService;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/factory/FactoryServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/factory/FactoryServiceDefault.java
index dac190c..7cb7ab1 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/factory/FactoryServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/factory/FactoryServiceDefault.java
@@ -44,7 +44,7 @@ import org.apache.isis.core.metamodel.facets.object.mixin.MixinFacet;
import org.apache.isis.core.metamodel.facets.object.viewmodel.ViewModelFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
+import org.apache.isis.core.runtime.iactn.InteractionFactory;
import lombok.NonNull;
import lombok.val;
@@ -56,7 +56,7 @@ import lombok.val;
@Qualifier("Default")
public class FactoryServiceDefault implements FactoryService {
- @Inject IsisInteractionFactory isisInteractionFactory; // dependsOn
+ @Inject InteractionFactory isisInteractionFactory; // dependsOn
@Inject private SpecificationLoader specificationLoader;
@Inject private ServiceInjector serviceInjector;
@Inject private IsisSystemEnvironment isisSystemEnvironment;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/session/IsisInteractionFactoryDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/session/InteractionFactoryDefault.java
similarity index 95%
rename from core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/session/IsisInteractionFactoryDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/session/InteractionFactoryDefault.java
index e7e180e..c71038d 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/session/IsisInteractionFactoryDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/session/InteractionFactoryDefault.java
@@ -52,11 +52,11 @@ import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.services.publishing.CommandPublisher;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.events.RuntimeEventService;
-import org.apache.isis.core.runtime.iactn.InteractionClosure;
+import org.apache.isis.core.runtime.iactn.InteractionEnvironment;
import org.apache.isis.core.runtime.iactn.InteractionSession;
import org.apache.isis.core.runtime.iactn.IsisInteraction;
-import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
-import org.apache.isis.core.runtime.iactn.IsisInteractionTracker;
+import org.apache.isis.core.runtime.iactn.InteractionFactory;
+import org.apache.isis.core.runtime.iactn.InteractionTracker;
import org.apache.isis.core.runtime.iactn.scope.IsisInteractionScopeBeanFactoryPostProcessor;
import org.apache.isis.core.runtime.iactn.scope.IsisInteractionScopeCloseListener;
import org.apache.isis.core.runtime.session.init.InitialisationSession;
@@ -83,13 +83,13 @@ import lombok.extern.log4j.Log4j2;
*
*/
@Service
-@Named("isisRuntime.IsisInteractionFactoryDefault")
+@Named("isisRuntime.InteractionFactoryDefault")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
@Log4j2
-public class IsisInteractionFactoryDefault
-implements IsisInteractionFactory, IsisInteractionTracker {
+public class InteractionFactoryDefault
+implements InteractionFactory, InteractionTracker {
@Inject AuthenticationManager authenticationManager;
@Inject RuntimeEventService runtimeEventService;
@@ -154,14 +154,14 @@ implements IsisInteractionFactory, IsisInteractionTracker {
}
- private final ThreadLocal<Stack<InteractionClosure>> interactionClosureStack =
+ private final ThreadLocal<Stack<InteractionEnvironment>> interactionClosureStack =
ThreadLocal.withInitial(Stack::new);
@Override
- public InteractionClosure openInteraction(final @NonNull AuthenticationSession authSessionToUse) {
+ public InteractionEnvironment openInteraction(final @NonNull AuthenticationSession authSessionToUse) {
val interactionSession = getOrCreateInteractionSession(authSessionToUse);
- val newInteractionClosure = new InteractionClosure(interactionSession, authSessionToUse);
+ val newInteractionClosure = new InteractionEnvironment(interactionSession, authSessionToUse);
interactionClosureStack.get().push(newInteractionClosure);
@@ -198,7 +198,7 @@ implements IsisInteractionFactory, IsisInteractionTracker {
}
@Override
- public Optional<InteractionClosure> currentInteractionClosure() {
+ public Optional<InteractionEnvironment> currentInteractionClosure() {
val stack = interactionClosureStack.get();
return stack.isEmpty() ? Optional.empty() : Optional.of(stack.lastElement());
}
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/sudo/SudoServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/sudo/SudoServiceDefault.java
index c8dfac5..b41f6c4 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/sudo/SudoServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/sudo/SudoServiceDefault.java
@@ -34,7 +34,7 @@ import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.services.sudo.SudoService;
import org.apache.isis.applib.services.user.UserMemento;
import org.apache.isis.commons.collections.Can;
-import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
+import org.apache.isis.core.runtime.iactn.InteractionFactory;
import org.apache.isis.core.security.authentication.standard.SimpleSession;
import lombok.NonNull;
@@ -51,7 +51,7 @@ import jakarta.annotation.PostConstruct;
@RequiredArgsConstructor(onConstructor_ = {@Inject})
public class SudoServiceDefault implements SudoService {
- private final IsisInteractionFactory interactionFactory;
+ private final InteractionFactory interactionFactory;
// -- LISTENERS
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/user/UserServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/user/UserServiceDefault.java
index 8d65f1c..729027c 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/user/UserServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/user/UserServiceDefault.java
@@ -30,7 +30,7 @@ import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.user.UserMemento;
import org.apache.isis.applib.services.user.UserService;
import org.apache.isis.commons.internal.exceptions._Exceptions;
-import org.apache.isis.core.runtime.iactn.IsisInteractionTracker;
+import org.apache.isis.core.runtime.iactn.InteractionTracker;
import org.apache.isis.core.security.authentication.AuthenticationSession;
@Service
@@ -40,7 +40,7 @@ import org.apache.isis.core.security.authentication.AuthenticationSession;
@Qualifier("Default")
public class UserServiceDefault implements UserService {
- @Inject private IsisInteractionTracker isisInteractionTracker;
+ @Inject private InteractionTracker isisInteractionTracker;
@Override
public UserMemento getUser() {
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 b459464..f6a16a2 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
@@ -93,8 +93,8 @@ import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.specloader.specimpl.ObjectActionMixedIn;
import org.apache.isis.core.runtime.iactn.InteractionSession;
-import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
-import org.apache.isis.core.runtime.iactn.IsisInteractionTracker;
+import org.apache.isis.core.runtime.iactn.InteractionFactory;
+import org.apache.isis.core.runtime.iactn.InteractionTracker;
import org.apache.isis.core.runtimeservices.wrapper.dispatchers.InteractionEventDispatcher;
import org.apache.isis.core.runtimeservices.wrapper.dispatchers.InteractionEventDispatcherTypeSafe;
import org.apache.isis.core.runtimeservices.wrapper.handlers.DomainObjectInvocationHandler;
@@ -125,7 +125,7 @@ import lombok.val;
//@Log4j2
public class WrapperFactoryDefault implements WrapperFactory {
- @Inject IsisInteractionTracker isisInteractionTracker;
+ @Inject InteractionTracker isisInteractionTracker;
@Inject FactoryService factoryService;
@Inject MetaModelContext metaModelContext;
@Inject SpecificationLoader specificationLoader;
@@ -553,7 +553,7 @@ public class WrapperFactoryDefault implements WrapperFactory {
private final Command parentCommand;
private final ServiceInjector serviceInjector;
- @Inject IsisInteractionFactory isisInteractionFactory;
+ @Inject InteractionFactory isisInteractionFactory;
@Inject TransactionService transactionService;
@Inject CommandExecutorService commandExecutorService;
@Inject Provider<InteractionContext> interactionContextProvider;
diff --git a/core/webapp/src/main/java/org/apache/isis/core/webapp/health/HealthIndicatorUsingHealthCheckService.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/health/HealthIndicatorUsingHealthCheckService.java
index 2fb4569..dfe7daa 100644
--- a/core/webapp/src/main/java/org/apache/isis/core/webapp/health/HealthIndicatorUsingHealthCheckService.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/health/HealthIndicatorUsingHealthCheckService.java
@@ -30,7 +30,7 @@ import org.springframework.boot.actuate.health.Health;
import org.springframework.stereotype.Component;
import org.apache.isis.applib.services.health.HealthCheckService;
-import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
+import org.apache.isis.core.runtime.iactn.InteractionFactory;
import org.apache.isis.core.security.authentication.health.HealthAuthSession;
import lombok.val;
@@ -39,12 +39,12 @@ import lombok.val;
@Named("isisWebapp.HealthCheckService") // this appears in the endpoint.
public class HealthIndicatorUsingHealthCheckService extends AbstractHealthIndicator {
- private final IsisInteractionFactory isisInteractionFactory;
+ private final InteractionFactory isisInteractionFactory;
private final Optional<HealthCheckService> healthCheckServiceIfAny;
@Inject
public HealthIndicatorUsingHealthCheckService(
- final IsisInteractionFactory isisInteractionFactory,
+ final InteractionFactory isisInteractionFactory,
final Optional<HealthCheckService> healthCheckServiceIfAny) {
this.isisInteractionFactory = isisInteractionFactory;
this.healthCheckServiceIfAny = healthCheckServiceIfAny;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/jee/DemoRequestScopedBean.java b/examples/demo/domain/src/main/java/demoapp/dom/jee/DemoRequestScopedBean.java
index cc87deb..dca1155 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/jee/DemoRequestScopedBean.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/jee/DemoRequestScopedBean.java
@@ -33,7 +33,7 @@ import org.springframework.web.context.WebApplicationContext;
import org.springframework.web.context.annotation.RequestScope;
import org.apache.isis.applib.annotation.OrderPrecedence;
-import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
+import org.apache.isis.core.runtime.iactn.InteractionFactory;
import lombok.extern.log4j.Log4j2;
@@ -48,7 +48,7 @@ import lombok.extern.log4j.Log4j2;
@Log4j2
public class DemoRequestScopedBean {
- @Inject private IsisInteractionFactory isisInteractionFactory;
+ @Inject private InteractionFactory isisInteractionFactory;
public DemoRequestScopedBean() {
log.info("init " + this.hashCode());
diff --git a/examples/demo/javafx/src/main/java/demoapp/javafx/DemoAppJavaFx.java b/examples/demo/javafx/src/main/java/demoapp/javafx/DemoAppJavaFx.java
index 386f82a..cf8d5ec 100644
--- a/examples/demo/javafx/src/main/java/demoapp/javafx/DemoAppJavaFx.java
+++ b/examples/demo/javafx/src/main/java/demoapp/javafx/DemoAppJavaFx.java
@@ -24,7 +24,7 @@ import org.springframework.context.annotation.Import;
import org.apache.isis.commons.internal.debug._Probe;
import org.apache.isis.core.config.presets.IsisPresets;
-import org.apache.isis.core.runtimeservices.session.IsisInteractionFactoryDefault;
+import org.apache.isis.core.runtimeservices.session.InteractionFactoryDefault;
import org.apache.isis.incubator.viewer.javafx.model.events.JavaFxViewerConfig;
import org.apache.isis.incubator.viewer.javafx.model.util._fx;
import org.apache.isis.incubator.viewer.javafx.viewer.IsisModuleIncViewerJavaFxViewer;
@@ -59,7 +59,7 @@ public class DemoAppJavaFx {
public static void main(String[] args) {
- IsisPresets.logging(IsisInteractionFactoryDefault.class, "debug");
+ IsisPresets.logging(InteractionFactoryDefault.class, "debug");
IsisPresets.logging(_Probe.class, "debug"); // enable debug entry logging
IsisPresets.prototyping(); // use prototyping mode as default, unless explicitly overridden (INCUBATING)
diff --git a/examples/demo/vaadin/src/main/java/demoapp/webapp/vaadin/DemoAppVaadin.java b/examples/demo/vaadin/src/main/java/demoapp/webapp/vaadin/DemoAppVaadin.java
index aa09a55..a9f507e 100644
--- a/examples/demo/vaadin/src/main/java/demoapp/webapp/vaadin/DemoAppVaadin.java
+++ b/examples/demo/vaadin/src/main/java/demoapp/webapp/vaadin/DemoAppVaadin.java
@@ -25,7 +25,7 @@ import org.springframework.context.annotation.Import;
import org.apache.isis.commons.internal.debug._Probe;
import org.apache.isis.core.config.presets.IsisPresets;
-import org.apache.isis.core.runtimeservices.session.IsisInteractionFactoryDefault;
+import org.apache.isis.core.runtimeservices.session.InteractionFactoryDefault;
import org.apache.isis.incubator.viewer.vaadin.viewer.IsisModuleIncViewerVaadinViewer;
import org.apache.isis.valuetypes.asciidoc.ui.vaa.IsisModuleValAsciidocUiVaa;
import org.apache.isis.valuetypes.asciidoc.ui.wkt.IsisModuleValAsciidocUiWkt;
@@ -61,7 +61,7 @@ public class DemoAppVaadin extends SpringBootServletInitializer {
*/
public static void main(String[] args) {
- IsisPresets.logging(IsisInteractionFactoryDefault.class, "debug");
+ IsisPresets.logging(InteractionFactoryDefault.class, "debug");
// IsisPresets.logging(VaadinAuthenticationHandler.class, "debug");
// IsisPresets.logging(IsisServletForVaadin.class, "debug");
IsisPresets.logging(_Probe.class, "debug"); // enable debug entry logging
diff --git a/examples/demo/web/src/main/java/demoapp/web/linebreaker/LineBreaker.java b/examples/demo/web/src/main/java/demoapp/web/linebreaker/LineBreaker.java
index 4477935..bd2e34c 100644
--- a/examples/demo/web/src/main/java/demoapp/web/linebreaker/LineBreaker.java
+++ b/examples/demo/web/src/main/java/demoapp/web/linebreaker/LineBreaker.java
@@ -24,7 +24,7 @@ import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.core.runtime.iactn.IsisInteractionTracker;
+import org.apache.isis.core.runtime.iactn.InteractionTracker;
import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2;
@@ -39,7 +39,7 @@ import lombok.extern.log4j.Log4j2;
@RequiredArgsConstructor(onConstructor_ = { @Inject })
public class LineBreaker {
- final IsisInteractionTracker isisInteractionTracker;
+ final InteractionTracker isisInteractionTracker;
@Action(semantics = SemanticsOf.SAFE)
public void shutdown() {
diff --git a/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo_retry.java b/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo_retry.java
index 84a3160..7ec81d9 100644
--- a/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo_retry.java
+++ b/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo_retry.java
@@ -29,7 +29,7 @@ import org.apache.isis.applib.services.command.CommandExecutorService;
import org.apache.isis.applib.services.metamodel.MetaModelService;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.services.xactn.TransactionService;
-import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
+import org.apache.isis.core.runtime.iactn.InteractionFactory;
import org.apache.isis.extensions.commandlog.impl.IsisModuleExtCommandLogImpl;
@Action(
@@ -57,7 +57,7 @@ public class CommandJdo_retry {
return commandJdo;
}
- @Inject IsisInteractionFactory isisInteractionFactory;
+ @Inject InteractionFactory isisInteractionFactory;
@Inject TransactionService transactionService;
@Inject CommandExecutorService commandExecutorService;
@Inject RepositoryService repositoryService;
diff --git a/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/job/ReplicateAndReplayJob.java b/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/job/ReplicateAndReplayJob.java
index ca236ba..c08f056 100644
--- a/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/job/ReplicateAndReplayJob.java
+++ b/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/job/ReplicateAndReplayJob.java
@@ -26,7 +26,7 @@ import org.quartz.JobExecutionContext;
import org.quartz.PersistJobDataAfterExecution;
import org.apache.isis.applib.services.user.UserMemento;
-import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
+import org.apache.isis.core.runtime.iactn.InteractionFactory;
import org.apache.isis.core.security.authentication.AuthenticationSession;
import org.apache.isis.core.security.authentication.standard.SimpleSession;
import org.apache.isis.extensions.commandreplay.secondary.SecondaryStatus;
@@ -61,7 +61,7 @@ public class ReplicateAndReplayJob implements Job {
}
}
- @Inject protected IsisInteractionFactory isisInteractionFactory;
+ @Inject protected InteractionFactory isisInteractionFactory;
private void exec(final JobExecutionContext quartzContext) {
val ssh = new SecondaryStatusData(quartzContext);
diff --git a/extensions/security/secman/shiro-realm/src/main/java/org/apache/isis/extensions/secman/shiro/IsisModuleExtSecmanShiroRealm.java b/extensions/security/secman/shiro-realm/src/main/java/org/apache/isis/extensions/secman/shiro/IsisModuleExtSecmanShiroRealm.java
index f983466..3d58074 100644
--- a/extensions/security/secman/shiro-realm/src/main/java/org/apache/isis/extensions/secman/shiro/IsisModuleExtSecmanShiroRealm.java
+++ b/extensions/security/secman/shiro-realm/src/main/java/org/apache/isis/extensions/secman/shiro/IsisModuleExtSecmanShiroRealm.java
@@ -43,7 +43,7 @@ import org.apache.isis.commons.internal.assertions._Assert;
import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.commons.internal.collections._Arrays;
import org.apache.isis.core.config.IsisConfiguration;
-import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
+import org.apache.isis.core.runtime.iactn.InteractionFactory;
import org.apache.isis.core.security.authorization.standard.Authorizor;
import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
import org.apache.isis.extensions.secman.api.SecurityRealm;
@@ -62,7 +62,7 @@ public class IsisModuleExtSecmanShiroRealm extends AuthorizingRealm implements S
private static final String SECMAN_ENABLE_DELEGATED_USERS = "secman.enableDelegatedUsers";
@Inject protected ServiceInjector serviceInjector;
- @Inject protected IsisInteractionFactory isisInteractionFactory;
+ @Inject protected InteractionFactory isisInteractionFactory;
@Inject protected PlatformTransactionManager txMan;
@Inject private SecurityModuleConfig configBean;
@Inject protected IsisConfiguration isisConfiguration;
diff --git a/incubator/viewers/javafx/model/src/main/java/org/apache/isis/incubator/viewer/javafx/model/context/UiContextFx.java b/incubator/viewers/javafx/model/src/main/java/org/apache/isis/incubator/viewer/javafx/model/context/UiContextFx.java
index cc9c666..3ea7297 100644
--- a/incubator/viewers/javafx/model/src/main/java/org/apache/isis/incubator/viewer/javafx/model/context/UiContextFx.java
+++ b/incubator/viewers/javafx/model/src/main/java/org/apache/isis/incubator/viewer/javafx/model/context/UiContextFx.java
@@ -23,7 +23,7 @@ import java.util.function.Function;
import java.util.function.Supplier;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
+import org.apache.isis.core.runtime.iactn.InteractionFactory;
import org.apache.isis.incubator.viewer.javafx.model.action.ActionUiModelFactoryFx;
import org.apache.isis.incubator.viewer.javafx.model.events.JavaFxViewerConfig;
import org.apache.isis.viewer.common.model.decorator.disable.DisablingDecorator;
@@ -39,7 +39,7 @@ public interface UiContextFx {
JavaFxViewerConfig getJavaFxViewerConfig();
- IsisInteractionFactory getIsisInteractionFactory();
+ InteractionFactory getIsisInteractionFactory();
ActionUiModelFactoryFx getActionUiModelFactory();
void setNewPageHandler(Consumer<Node> onNewPage);
diff --git a/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/main/MainViewFx.java b/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/main/MainViewFx.java
index 2a1cd5e..f46bd87 100644
--- a/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/main/MainViewFx.java
+++ b/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/main/MainViewFx.java
@@ -26,7 +26,7 @@ import org.apache.isis.applib.annotation.Where;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.runtime.context.IsisAppCommonContext;
-import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
+import org.apache.isis.core.runtime.iactn.InteractionFactory;
import org.apache.isis.incubator.viewer.javafx.model.context.UiContextFx;
import org.apache.isis.incubator.viewer.javafx.model.events.JavaFxViewerConfig;
import org.apache.isis.incubator.viewer.javafx.model.util._fx;
@@ -57,7 +57,7 @@ public class MainViewFx {
private final JavaFxViewerConfig viewerConfig;
private final MetaModelContext metaModelContext;
private final HeaderUiModelProvider headerUiModelProvider;
- private final IsisInteractionFactory isisInteractionFactory;
+ private final InteractionFactory isisInteractionFactory;
private final UiContextFx uiContext;
private final UiActionHandlerFx uiActionHandler;
private final UiComponentFactoryFx uiComponentFactory;
diff --git a/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/main/UiActionHandlerFx.java b/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/main/UiActionHandlerFx.java
index 07628c6..48581fc 100644
--- a/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/main/UiActionHandlerFx.java
+++ b/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/main/UiActionHandlerFx.java
@@ -26,7 +26,7 @@ import org.apache.isis.commons.collections.Can;
import org.apache.isis.core.metamodel.interactions.managed.ManagedAction;
import org.apache.isis.core.metamodel.interactions.managed.ParameterNegotiationModel;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
+import org.apache.isis.core.runtime.iactn.InteractionFactory;
import org.apache.isis.incubator.viewer.javafx.model.context.UiContextFx;
import org.apache.isis.incubator.viewer.javafx.ui.components.UiComponentFactoryFx;
import org.apache.isis.viewer.common.model.components.UiComponentFactory.ComponentRequest;
@@ -46,7 +46,7 @@ import javafx.scene.layout.GridPane;
public class UiActionHandlerFx {
private final UiContextFx uiContext;
- private final IsisInteractionFactory isisInteractionFactory;
+ private final InteractionFactory isisInteractionFactory;
private final UiComponentFactoryFx uiComponentFactory;
public void handleActionLinkClicked(ManagedAction managedAction) {
diff --git a/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/main/UiContextFxDefault.java b/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/main/UiContextFxDefault.java
index f19ca12..fd7d839 100644
--- a/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/main/UiContextFxDefault.java
+++ b/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/main/UiContextFxDefault.java
@@ -27,7 +27,7 @@ import javax.inject.Inject;
import org.springframework.stereotype.Service;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
+import org.apache.isis.core.runtime.iactn.InteractionFactory;
import org.apache.isis.incubator.viewer.javafx.model.action.ActionUiModelFactoryFx;
import org.apache.isis.incubator.viewer.javafx.model.context.UiContextFx;
import org.apache.isis.incubator.viewer.javafx.model.events.JavaFxViewerConfig;
@@ -54,7 +54,7 @@ public class UiContextFxDefault implements UiContextFx {
@Getter(onMethod_ = {@Override})
private final JavaFxViewerConfig javaFxViewerConfig;
@Getter(onMethod_ = {@Override})
- private final IsisInteractionFactory isisInteractionFactory;
+ private final InteractionFactory isisInteractionFactory;
@Getter(onMethod_ = {@Override})
private final ActionUiModelFactoryFx actionUiModelFactory = new ActionUiModelFactoryFx();
diff --git a/incubator/viewers/vaadin/model/src/main/java/org/apache/isis/incubator/viewer/vaadin/model/context/UiContextVaa.java b/incubator/viewers/vaadin/model/src/main/java/org/apache/isis/incubator/viewer/vaadin/model/context/UiContextVaa.java
index ab97959..17e0b54 100644
--- a/incubator/viewers/vaadin/model/src/main/java/org/apache/isis/incubator/viewer/vaadin/model/context/UiContextVaa.java
+++ b/incubator/viewers/vaadin/model/src/main/java/org/apache/isis/incubator/viewer/vaadin/model/context/UiContextVaa.java
@@ -25,13 +25,13 @@ import java.util.function.Supplier;
import com.vaadin.flow.component.Component;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
+import org.apache.isis.core.runtime.iactn.InteractionFactory;
public interface UiContextVaa {
//JavaFxViewerConfig getJavaFxViewerConfig();
- IsisInteractionFactory getIsisInteractionFactory();
+ InteractionFactory getIsisInteractionFactory();
//ActionUiModelFactoryFx getActionUiModelFactory();
void setNewPageHandler(Consumer<Component> onNewPage);
diff --git a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/auth/VaadinAuthenticationHandler.java b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/auth/VaadinAuthenticationHandler.java
index f07ae72..6ebed86 100644
--- a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/auth/VaadinAuthenticationHandler.java
+++ b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/auth/VaadinAuthenticationHandler.java
@@ -30,8 +30,8 @@ import com.vaadin.flow.server.VaadinServiceInitListener;
import org.springframework.stereotype.Component;
import org.apache.isis.core.metamodel.context.MetaModelContext;
-import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
-import org.apache.isis.core.runtime.iactn.IsisInteractionFactory.ThrowingRunnable;
+import org.apache.isis.core.runtime.iactn.InteractionFactory;
+import org.apache.isis.core.runtime.iactn.InteractionFactory.ThrowingRunnable;
import org.apache.isis.core.security.authentication.AuthenticationRequest;
import org.apache.isis.incubator.viewer.vaadin.ui.pages.login.VaadinLoginView;
@@ -49,7 +49,7 @@ public class VaadinAuthenticationHandler implements VaadinServiceInitListener {
private static final long serialVersionUID = 1L;
- @Inject private transient IsisInteractionFactory isisInteractionFactory;
+ @Inject private transient InteractionFactory isisInteractionFactory;
@Inject private transient MetaModelContext metaModelContext;
@Override
diff --git a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/pages/main/UiActionHandlerVaa.java b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/pages/main/UiActionHandlerVaa.java
index ca9ebd0..4623308 100644
--- a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/pages/main/UiActionHandlerVaa.java
+++ b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/pages/main/UiActionHandlerVaa.java
@@ -25,7 +25,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.core.metamodel.interactions.managed.ManagedAction;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
+import org.apache.isis.core.runtime.iactn.InteractionFactory;
import org.apache.isis.incubator.viewer.vaadin.model.context.UiContextVaa;
import org.apache.isis.incubator.viewer.vaadin.ui.components.UiComponentFactoryVaa;
import org.apache.isis.incubator.viewer.vaadin.ui.components.action.ActionDialog;
@@ -40,7 +40,7 @@ import lombok.extern.log4j.Log4j2;
public class UiActionHandlerVaa {
private final UiContextVaa uiContext;
- private final IsisInteractionFactory isisInteractionFactory;
+ private final InteractionFactory isisInteractionFactory;
private final UiComponentFactoryVaa uiComponentFactory;
public void handleActionLinkClicked(ManagedAction managedAction) {
diff --git a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/pages/main/UiContextVaaDefault.java b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/pages/main/UiContextVaaDefault.java
index 4aecf8f..56ff36d 100644
--- a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/pages/main/UiContextVaaDefault.java
+++ b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/pages/main/UiContextVaaDefault.java
@@ -29,7 +29,7 @@ import com.vaadin.flow.component.Component;
import org.springframework.stereotype.Service;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
+import org.apache.isis.core.runtime.iactn.InteractionFactory;
import org.apache.isis.incubator.viewer.vaadin.model.context.UiContextVaa;
import lombok.Getter;
@@ -46,7 +46,7 @@ public class UiContextVaaDefault implements UiContextVaa {
// @Getter(onMethod_ = {@Override})
// private final JavaFxViewerConfig javaFxViewerConfig;
@Getter(onMethod_ = {@Override})
- private final IsisInteractionFactory isisInteractionFactory;
+ private final InteractionFactory isisInteractionFactory;
// @Getter(onMethod_ = {@Override})
// private final ActionUiModelFactoryFx actionUiModelFactory = new ActionUiModelFactoryFx();
diff --git a/incubator/viewers/vaadin/viewer/src/main/java/org/apache/isis/incubator/viewer/vaadin/viewer/IsisModuleIncViewerVaadinViewer.java b/incubator/viewers/vaadin/viewer/src/main/java/org/apache/isis/incubator/viewer/vaadin/viewer/IsisModuleIncViewerVaadinViewer.java
index d945d68..1923f9d 100644
--- a/incubator/viewers/vaadin/viewer/src/main/java/org/apache/isis/incubator/viewer/vaadin/viewer/IsisModuleIncViewerVaadinViewer.java
+++ b/incubator/viewers/vaadin/viewer/src/main/java/org/apache/isis/incubator/viewer/vaadin/viewer/IsisModuleIncViewerVaadinViewer.java
@@ -41,7 +41,7 @@ import org.springframework.util.ClassUtils;
import org.springframework.web.context.WebApplicationContext;
import org.springframework.web.socket.server.standard.ServerEndpointExporter;
-import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
+import org.apache.isis.core.runtime.iactn.InteractionFactory;
import org.apache.isis.incubator.viewer.vaadin.ui.IsisModuleIncViewerVaadinUi;
import lombok.val;
@@ -71,7 +71,7 @@ public class IsisModuleIncViewerVaadinViewer {
@Inject private WebApplicationContext context;
@Inject private VaadinConfigurationProperties configurationProperties;
- @Inject private IsisInteractionFactory isisInteractionFactory;
+ @Inject private InteractionFactory isisInteractionFactory;
/**
* Creates a {@link ServletContextInitializer} instance.
diff --git a/incubator/viewers/vaadin/viewer/src/main/java/org/apache/isis/incubator/viewer/vaadin/viewer/IsisServletForVaadin.java b/incubator/viewers/vaadin/viewer/src/main/java/org/apache/isis/incubator/viewer/vaadin/viewer/IsisServletForVaadin.java
index 4225257..f4469c3 100644
--- a/incubator/viewers/vaadin/viewer/src/main/java/org/apache/isis/incubator/viewer/vaadin/viewer/IsisServletForVaadin.java
+++ b/incubator/viewers/vaadin/viewer/src/main/java/org/apache/isis/incubator/viewer/vaadin/viewer/IsisServletForVaadin.java
@@ -29,7 +29,7 @@ import com.vaadin.flow.spring.SpringServlet;
import org.springframework.context.ApplicationContext;
import org.apache.isis.core.runtime.iactn.InteractionSession;
-import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
+import org.apache.isis.core.runtime.iactn.InteractionFactory;
import org.apache.isis.incubator.viewer.vaadin.ui.auth.AuthSessionStoreUtil;
import lombok.NonNull;
@@ -47,10 +47,10 @@ extends SpringServlet {
private static final long serialVersionUID = 1L;
- private final IsisInteractionFactory isisInteractionFactory;
+ private final InteractionFactory isisInteractionFactory;
public IsisServletForVaadin(
- @NonNull final IsisInteractionFactory isisInteractionFactory,
+ @NonNull final InteractionFactory isisInteractionFactory,
@NonNull final ApplicationContext context,
final boolean forwardingEnforced) {
super(context, forwardingEnforced);
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/jdosupport/IsisJdoSupportDN5.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/jdosupport/IsisJdoSupportDN5.java
index 2203fdc..091894a 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/jdosupport/IsisJdoSupportDN5.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/jdosupport/IsisJdoSupportDN5.java
@@ -46,7 +46,7 @@ import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.core.metamodel.adapter.oid.ObjectPersistenceException;
-import org.apache.isis.core.runtime.iactn.IsisInteractionTracker;
+import org.apache.isis.core.runtime.iactn.InteractionTracker;
import org.apache.isis.persistence.jdo.applib.services.IsisJdoSupport_v3_2;
import org.apache.isis.persistence.jdo.datanucleus5.objectadapter.ObjectAdapter;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.IsisPersistenceSessionJdo;
@@ -65,7 +65,7 @@ import static org.apache.isis.commons.internal.base._NullSafe.stream;
@Qualifier("DN5")
public class IsisJdoSupportDN5 implements IsisJdoSupport_v3_2 {
- @Inject private IsisInteractionTracker isisInteractionTracker;
+ @Inject private InteractionTracker isisInteractionTracker;
@Override
public <T> T refresh(final T domainObject) {
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/JdoPersistenceCapableAnnotationFacetFactory.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/JdoPersistenceCapableAnnotationFacetFactory.java
index 02bdb43..c6fac1c 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/JdoPersistenceCapableAnnotationFacetFactory.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/JdoPersistenceCapableAnnotationFacetFactory.java
@@ -31,7 +31,7 @@ import org.apache.isis.core.metamodel.facets.Annotations;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.ObjectSpecIdFacetFactory;
import org.apache.isis.core.metamodel.facets.object.domainobject.DomainObjectAnnotationFacetFactory;
-import org.apache.isis.core.runtime.iactn.IsisInteractionTracker;
+import org.apache.isis.core.runtime.iactn.InteractionTracker;
import org.apache.isis.persistence.jdo.datanucleus5.metamodel.JdoMetamodelUtil;
import org.apache.isis.persistence.jdo.datanucleus5.metamodel.facets.object.domainobject.objectspecid.ObjectSpecIdFacetForJdoPersistenceCapableAnnotation;
@@ -96,9 +96,9 @@ implements ObjectSpecIdFacetFactory {
// -- INTERACTION TRACKER LOOKUP
- private final _Lazy<IsisInteractionTracker> isisInteractionTrackerLazy = _Lazy.threadSafe(this::lookupIsisInteractionTracker);
- private IsisInteractionTracker lookupIsisInteractionTracker() {
- return super.getMetaModelContext().getServiceRegistry().lookupServiceElseFail(IsisInteractionTracker.class);
+ private final _Lazy<InteractionTracker> isisInteractionTrackerLazy = _Lazy.threadSafe(this::lookupIsisInteractionTracker);
+ private InteractionTracker lookupIsisInteractionTracker() {
+ return super.getMetaModelContext().getServiceRegistry().lookupServiceElseFail(InteractionTracker.class);
}
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetAbstract.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetAbstract.java
index fb0a74d..ebe0dd6 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetAbstract.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetAbstract.java
@@ -27,7 +27,7 @@ import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.entity.EntityFacet;
-import org.apache.isis.core.runtime.iactn.IsisInteractionTracker;
+import org.apache.isis.core.runtime.iactn.InteractionTracker;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.IsisPersistenceSessionJdo;
@@ -42,14 +42,14 @@ implements JdoPersistenceCapableFacet {
private final String schema;
private final String table;
private final IdentityType identityType;
- private final Supplier<IsisInteractionTracker> isisInteractionTracker;
+ private final Supplier<InteractionTracker> isisInteractionTracker;
public JdoPersistenceCapableFacetAbstract(
final String schemaName,
final String tableOrTypeName,
final IdentityType identityType,
final FacetHolder holder,
- final Supplier<IsisInteractionTracker> isisInteractionTracker) {
+ final Supplier<InteractionTracker> isisInteractionTracker) {
super(JdoPersistenceCapableFacetAbstract.type(), holder, Derivation.NOT_DERIVED);
super.setFacetAliasType(EntityFacet.class);
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetAnnotation.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetAnnotation.java
index 4b25cae..a5597d4 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetAnnotation.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetAnnotation.java
@@ -23,7 +23,7 @@ import java.util.function.Supplier;
import javax.jdo.annotations.IdentityType;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.runtime.iactn.IsisInteractionTracker;
+import org.apache.isis.core.runtime.iactn.InteractionTracker;
public class JdoPersistenceCapableFacetAnnotation extends JdoPersistenceCapableFacetImpl {
@@ -33,7 +33,7 @@ public class JdoPersistenceCapableFacetAnnotation extends JdoPersistenceCapableF
final String tableOrTypeName,
final IdentityType identityType,
final FacetHolder holder,
- final Supplier<IsisInteractionTracker> isisInteractionTracker) {
+ final Supplier<InteractionTracker> isisInteractionTracker) {
super(schemaName, tableOrTypeName, identityType, holder, isisInteractionTracker);
}
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetImpl.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetImpl.java
index 6e553a8..a075523 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetImpl.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetImpl.java
@@ -33,7 +33,7 @@ import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.runtime.iactn.IsisInteractionTracker;
+import org.apache.isis.core.runtime.iactn.InteractionTracker;
import org.apache.isis.persistence.jdo.datanucleus5.metamodel.JdoMetamodelUtil;
import lombok.val;
@@ -45,7 +45,7 @@ public class JdoPersistenceCapableFacetImpl extends JdoPersistenceCapableFacetAb
final String tableOrTypeName,
final IdentityType identityType,
final FacetHolder holder,
- final Supplier<IsisInteractionTracker> isisInteractionTracker) {
+ final Supplier<InteractionTracker> isisInteractionTracker) {
super(schemaName, tableOrTypeName, identityType, holder, isisInteractionTracker);
}
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPlatformTransactionManagerForJdo.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPlatformTransactionManagerForJdo.java
index 0824d04..0fdbc8d 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPlatformTransactionManagerForJdo.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPlatformTransactionManagerForJdo.java
@@ -33,8 +33,8 @@ import org.springframework.transaction.support.DefaultTransactionStatus;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.eventbus.EventBusService;
import org.apache.isis.commons.internal.exceptions._Exceptions;
-import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
-import org.apache.isis.core.runtime.iactn.IsisInteractionTracker;
+import org.apache.isis.core.runtime.iactn.InteractionFactory;
+import org.apache.isis.core.runtime.iactn.InteractionTracker;
import org.apache.isis.core.runtime.persistence.transaction.IsisTransactionAspectSupport;
import org.apache.isis.core.runtime.persistence.transaction.IsisTransactionObject;
import org.apache.isis.core.runtime.persistence.transaction.IsisTransactionObject.IsisInteractionScopeType;
@@ -60,15 +60,15 @@ public class IsisPlatformTransactionManagerForJdo extends AbstractPlatformTransa
private static final long serialVersionUID = 1L;
- private final IsisInteractionFactory isisInteractionFactory;
+ private final InteractionFactory isisInteractionFactory;
private final EventBusService eventBusService;
- private final IsisInteractionTracker isisInteractionTracker;
+ private final InteractionTracker isisInteractionTracker;
@Inject
public IsisPlatformTransactionManagerForJdo(
- final IsisInteractionFactory isisInteractionFactory,
+ final InteractionFactory isisInteractionFactory,
final EventBusService eventBusService,
- final IsisInteractionTracker isisInteractionTracker) {
+ final InteractionTracker isisInteractionTracker) {
this.isisInteractionFactory = isisInteractionFactory;
this.eventBusService = eventBusService;
this.isisInteractionTracker = isisInteractionTracker;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionJdo.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionJdo.java
index e1afc58..ec32789 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionJdo.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionJdo.java
@@ -38,7 +38,7 @@ import org.apache.isis.commons.internal.collections._Inbox;
import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.core.metamodel.commons.ToString;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.core.runtime.iactn.IsisInteractionTracker;
+import org.apache.isis.core.runtime.iactn.InteractionTracker;
import org.apache.isis.core.runtime.persistence.transaction.IsisTransactionFlushException;
import org.apache.isis.core.runtime.persistence.transaction.IsisTransactionManagerException;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.command.CreateObjectCommand;
@@ -155,7 +155,7 @@ public class IsisTransactionJdo implements Transaction {
private final _Inbox<PersistenceCommand> persistenceCommands = new _Inbox<>();
- private final IsisInteractionTracker isisInteractionTracker;
+ private final InteractionTracker isisInteractionTracker;
private final Can<TransactionScopeListener> transactionScopeListeners;
@@ -168,7 +168,7 @@ public class IsisTransactionJdo implements Transaction {
id = TransactionId.of(interactionId, sequence);
- this.isisInteractionTracker = serviceRegistry.lookupServiceElseFail(IsisInteractionTracker.class);
+ this.isisInteractionTracker = serviceRegistry.lookupServiceElseFail(InteractionTracker.class);
this.transactionScopeListeners = serviceRegistry.select(TransactionScopeListener.class);
this.state = State.IN_PROGRESS;
diff --git a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/bootstrapping/JpaBootstrappingTest.java b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/bootstrapping/JpaBootstrappingTest.java
index a9c540c..e6535fc 100644
--- a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/bootstrapping/JpaBootstrappingTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/bootstrapping/JpaBootstrappingTest.java
@@ -45,7 +45,7 @@ import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.core.metamodel.facets.object.entity.EntityFacet;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
+import org.apache.isis.core.runtime.iactn.InteractionFactory;
import org.apache.isis.testdomain.conf.Configuration_usingJpa;
import org.apache.isis.testdomain.jpa.entities.JpaBook;
import org.apache.isis.testdomain.jpa.entities.JpaInventory;
@@ -65,7 +65,7 @@ class JpaBootstrappingTest /*extends IsisIntegrationTestAbstract*/ {
@Inject private Optional<PlatformTransactionManager> platformTransactionManager;
@Inject private RepositoryService repository;
- @Inject private IsisInteractionFactory isisInteractionFactory;
+ @Inject private InteractionFactory isisInteractionFactory;
@Inject private SpecificationLoader specLoader;
//@Inject private TransactionService transactionService;
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/applayer/ApplicationLayerTestFactory.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/applayer/ApplicationLayerTestFactory.java
index 85d067d..7e34900 100644
--- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/applayer/ApplicationLayerTestFactory.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/applayer/ApplicationLayerTestFactory.java
@@ -49,7 +49,7 @@ import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.core.metamodel.interactions.managed.PropertyInteraction;
import org.apache.isis.core.metamodel.objectmanager.ObjectManager;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
+import org.apache.isis.core.runtime.iactn.InteractionFactory;
import org.apache.isis.testdomain.jdo.JdoTestDomainPersona;
import org.apache.isis.testdomain.jdo.entities.JdoBook;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
@@ -73,7 +73,7 @@ public class ApplicationLayerTestFactory {
private final ObjectManager objectManager;
private final FixtureScripts fixtureScripts;
private final PreCommitListener preCommitListener;
- private final IsisInteractionFactory isisInteractionFactory;
+ private final InteractionFactory isisInteractionFactory;
public static enum VerificationStage {
PRE_COMMIT,
diff --git a/regressiontests/stable/src/test/java/org/apache/isis/testdomain/commons/InteractionTestAbstract.java b/regressiontests/stable/src/test/java/org/apache/isis/testdomain/commons/InteractionTestAbstract.java
index 9618516..8e2034d 100644
--- a/regressiontests/stable/src/test/java/org/apache/isis/testdomain/commons/InteractionTestAbstract.java
+++ b/regressiontests/stable/src/test/java/org/apache/isis/testdomain/commons/InteractionTestAbstract.java
@@ -41,7 +41,7 @@ import org.apache.isis.core.metamodel.interactions.managed.ActionInteraction;
import org.apache.isis.core.metamodel.interactions.managed.CollectionInteraction;
import org.apache.isis.core.metamodel.interactions.managed.PropertyInteraction;
import org.apache.isis.core.metamodel.objectmanager.ObjectManager;
-import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
+import org.apache.isis.core.runtime.iactn.InteractionFactory;
import org.apache.isis.core.runtime.persistence.changetracking.EntityChangeTrackerDefault;
import org.apache.isis.testdomain.applayer.publishing.EntityPropertyChangeSubscriberForTesting;
import org.apache.isis.testdomain.util.CollectionAssertions;
@@ -53,7 +53,7 @@ import lombok.val;
public abstract class InteractionTestAbstract extends IsisIntegrationTestAbstract {
@Inject protected ObjectManager objectManager;
- @Inject protected IsisInteractionFactory interactionFactory;
+ @Inject protected InteractionFactory interactionFactory;
@Inject protected WrapperFactory wrapper;
@Inject protected KVStoreForTesting kvStoreForTesting;
@Inject private javax.inject.Provider<EntityChangeTrackerDefault> changedObjectsServiceProvider;
diff --git a/regressiontests/stable/src/test/java/org/apache/isis/testdomain/transactions/TransactionScopeListenerTest.java b/regressiontests/stable/src/test/java/org/apache/isis/testdomain/transactions/TransactionScopeListenerTest.java
index a1344c3..ed496b0 100644
--- a/regressiontests/stable/src/test/java/org/apache/isis/testdomain/transactions/TransactionScopeListenerTest.java
+++ b/regressiontests/stable/src/test/java/org/apache/isis/testdomain/transactions/TransactionScopeListenerTest.java
@@ -30,7 +30,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.core.config.presets.IsisPresets;
-import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
+import org.apache.isis.core.runtime.iactn.InteractionFactory;
import org.apache.isis.testdomain.commons.InteractionBoundaryProbe;
import org.apache.isis.testdomain.conf.Configuration_usingJdo;
import org.apache.isis.testdomain.jdo.JdoTestDomainPersona;
@@ -52,7 +52,7 @@ class TransactionScopeListenerTest {
@Inject private FixtureScripts fixtureScripts;
@Inject private TransactionService transactionService;
@Inject private RepositoryService repository;
- @Inject private IsisInteractionFactory isisInteractionFactory;
+ @Inject private InteractionFactory isisInteractionFactory;
@Inject private KVStoreForTesting kvStoreForTesting;
/* Expectations:
diff --git a/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/KeycloakFilter.java b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/KeycloakFilter.java
index f179a82..bd224b3 100644
--- a/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/KeycloakFilter.java
+++ b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/KeycloakFilter.java
@@ -35,7 +35,7 @@ import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.apache.isis.applib.services.user.UserMemento;
-import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
+import org.apache.isis.core.runtime.iactn.InteractionFactory;
import org.apache.isis.core.security.authentication.AuthenticationSession;
import org.apache.isis.core.security.authentication.standard.SimpleSession;
@@ -43,7 +43,7 @@ import lombok.val;
public class KeycloakFilter implements Filter {
- @Autowired private IsisInteractionFactory isisInteractionFactory;
+ @Autowired private InteractionFactory isisInteractionFactory;
@Override
public void doFilter(
diff --git a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureScripts.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureScripts.java
index 8ec3a76..d18f3ed 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureScripts.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureScripts.java
@@ -52,7 +52,7 @@ import org.apache.isis.applib.services.title.TitleService;
import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.commons.internal.exceptions._Exceptions;
-import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
+import org.apache.isis.core.runtime.iactn.InteractionFactory;
import org.apache.isis.testing.fixtures.applib.api.PersonaWithBuilderScript;
import org.apache.isis.testing.fixtures.applib.events.FixturesInstalledEvent;
import org.apache.isis.testing.fixtures.applib.events.FixturesInstallingEvent;
@@ -83,7 +83,7 @@ public class FixtureScripts {
@Inject private RepositoryService repositoryService;
@Inject private TransactionService transactionService;
@Inject private ExecutionParametersService executionParametersService;
- @Inject private IsisInteractionFactory isisInteractionFactory;
+ @Inject private InteractionFactory isisInteractionFactory;
@Inject private EventBusService eventBusService;
diff --git a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/services/FixturesLifecycleService.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/services/FixturesLifecycleService.java
index 91e0a6a..a754394 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/services/FixturesLifecycleService.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/services/FixturesLifecycleService.java
@@ -34,7 +34,7 @@ import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.core.config.environment.IsisSystemEnvironment;
import org.apache.isis.core.runtime.events.app.AppLifecycleEvent;
-import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
+import org.apache.isis.core.runtime.iactn.InteractionFactory;
import org.apache.isis.testing.fixtures.applib.clock.Clock;
import org.apache.isis.testing.fixtures.applib.clock.FixtureClock;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
@@ -53,7 +53,7 @@ public class FixturesLifecycleService {
@SuppressWarnings("unused")
@Inject
- private IsisInteractionFactory isisInteractionFactory; // depends on relationship
+ private InteractionFactory isisInteractionFactory; // depends on relationship
@Inject
private IsisSystemEnvironment isisSystemEnvironment;
@Inject
diff --git a/testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/IsisInteractionHandler.java b/testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/IsisInteractionHandler.java
index 17fa8e8..c9165b1 100644
--- a/testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/IsisInteractionHandler.java
+++ b/testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/IsisInteractionHandler.java
@@ -24,7 +24,7 @@ import org.junit.jupiter.api.extension.AfterEachCallback;
import org.junit.jupiter.api.extension.BeforeEachCallback;
import org.junit.jupiter.api.extension.ExtensionContext;
-import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
+import org.apache.isis.core.runtime.iactn.InteractionFactory;
import org.apache.isis.core.runtime.session.init.InitialisationSession;
public class IsisInteractionHandler implements BeforeEachCallback, AfterEachCallback {
@@ -38,17 +38,17 @@ public class IsisInteractionHandler implements BeforeEachCallback, AfterEachCall
@Override
public void afterEach(ExtensionContext extensionContext) throws Exception {
isisInteractionFactory(extensionContext)
- .ifPresent(IsisInteractionFactory::closeSessionStack);
+ .ifPresent(InteractionFactory::closeSessionStack);
}
// -- HELPER
- private Optional<IsisInteractionFactory> isisInteractionFactory(ExtensionContext extensionContext) {
+ private Optional<InteractionFactory> isisInteractionFactory(ExtensionContext extensionContext) {
return extensionContext.getTestInstance()
.filter(IsisIntegrationTestAbstract.class::isInstance)
.map(IsisIntegrationTestAbstract.class::cast)
.map(IsisIntegrationTestAbstract::getServiceRegistry)
- .flatMap(serviceRegistry->serviceRegistry.lookupService(IsisInteractionFactory.class));
+ .flatMap(serviceRegistry->serviceRegistry.lookupService(InteractionFactory.class));
}
}
diff --git a/valuetypes/sse/ui/wicket/src/main/java/org/apache/isis/valuetypes/sse/ui/wkt/services/SseServiceDefault.java b/valuetypes/sse/ui/wicket/src/main/java/org/apache/isis/valuetypes/sse/ui/wkt/services/SseServiceDefault.java
index dfdda95..7d71bcc 100644
--- a/valuetypes/sse/ui/wicket/src/main/java/org/apache/isis/valuetypes/sse/ui/wkt/services/SseServiceDefault.java
+++ b/valuetypes/sse/ui/wicket/src/main/java/org/apache/isis/valuetypes/sse/ui/wkt/services/SseServiceDefault.java
@@ -41,7 +41,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
+import org.apache.isis.core.runtime.iactn.InteractionFactory;
import org.apache.isis.core.runtime.persistence.transaction.IsisTransactionAspectSupport;
import org.apache.isis.valuetypes.sse.applib.annotations.SseSource;
import org.apache.isis.valuetypes.sse.applib.service.SseChannel;
@@ -70,7 +70,7 @@ import lombok.extern.log4j.Log4j2;
public class SseServiceDefault implements SseService {
//@Inject private TransactionService transactionService;
- @Inject private IsisInteractionFactory isisInteractionFactory;
+ @Inject private InteractionFactory isisInteractionFactory;
private final EventStreamPool eventStreamPool = new EventStreamPool();
diff --git a/viewers/restfulobjects/testing/src/main/java/org/apache/isis/viewer/restfulobjects/testing/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java b/viewers/restfulobjects/testing/src/main/java/org/apache/isis/viewer/restfulobjects/testing/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
index 62b08ee..7da204a 100644
--- a/viewers/restfulobjects/testing/src/main/java/org/apache/isis/viewer/restfulobjects/testing/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
+++ b/viewers/restfulobjects/testing/src/main/java/org/apache/isis/viewer/restfulobjects/testing/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
@@ -43,8 +43,8 @@ import org.apache.isis.core.metamodel._testing.MetaModelContext_forTesting;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.iactn.InteractionSession;
-import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
-import org.apache.isis.core.runtime.iactn.IsisInteractionTracker;
+import org.apache.isis.core.runtime.iactn.InteractionFactory;
+import org.apache.isis.core.runtime.iactn.InteractionTracker;
import org.apache.isis.core.security.authentication.AuthenticationSession;
import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
@@ -65,12 +65,12 @@ public abstract class ResourceContext_ensureCompatibleAcceptHeader_ContractTest
@Mock HttpHeaders mockHttpHeaders;
@Mock HttpServletRequest mockHttpServletRequest;
@Mock ServletContext mockServletContext;
- @Mock IsisInteractionFactory mockIsisInteractionFactory;
+ @Mock InteractionFactory mockIsisInteractionFactory;
@Mock InteractionSession mockInteractionSession;
@Mock AuthenticationSession mockAuthenticationSession;
@Mock SpecificationLoader mockSpecificationLoader;
@Mock WebApplicationContext webApplicationContext;
- @Mock IsisInteractionTracker mockIsisInteractionTracker;
+ @Mock InteractionTracker mockIsisInteractionTracker;
@Mock AuthenticationManager mockAuthenticationManager;
MetaModelContext metaModelContext;
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainObjectResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainObjectResourceServerside.java
index 132bab2..9cc0ab0 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainObjectResourceServerside.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainObjectResourceServerside.java
@@ -62,7 +62,7 @@ import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.ManagedObjects.EntityUtil;
-import org.apache.isis.core.runtime.iactn.IsisInteractionTracker;
+import org.apache.isis.core.runtime.iactn.InteractionTracker;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.Rel;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
@@ -87,7 +87,7 @@ public class DomainObjectResourceServerside extends ResourceAbstract implements
public DomainObjectResourceServerside(
final MetaModelContext metaModelContext,
final IsisConfiguration isisConfiguration,
- final IsisInteractionTracker isisInteractionTracker) {
+ final InteractionTracker isisInteractionTracker) {
super(metaModelContext, isisConfiguration, isisInteractionTracker);
log.debug("<init>");
}
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainServiceResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainServiceResourceServerside.java
index c58f5b0..d9f8eef 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainServiceResourceServerside.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainServiceResourceServerside.java
@@ -43,7 +43,7 @@ import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.facets.object.domainservice.DomainServiceFacet;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.core.runtime.iactn.IsisInteractionTracker;
+import org.apache.isis.core.runtime.iactn.InteractionTracker;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
import org.apache.isis.viewer.restfulobjects.applib.RestfulMediaType;
@@ -70,7 +70,7 @@ public class DomainServiceResourceServerside extends ResourceAbstract implements
public DomainServiceResourceServerside(
final MetaModelContext metaModelContext,
final IsisConfiguration isisConfiguration,
- final IsisInteractionTracker isisInteractionTracker) {
+ final InteractionTracker isisInteractionTracker) {
super(metaModelContext, isisConfiguration, isisInteractionTracker);
}
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainTypeResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainTypeResourceServerside.java
index b73443a..4c4e18f 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainTypeResourceServerside.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainTypeResourceServerside.java
@@ -39,7 +39,7 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.core.runtime.iactn.IsisInteractionTracker;
+import org.apache.isis.core.runtime.iactn.InteractionTracker;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.Rel;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
@@ -81,7 +81,7 @@ public class DomainTypeResourceServerside extends ResourceAbstract implements Do
public DomainTypeResourceServerside(
final MetaModelContext metaModelContext,
final IsisConfiguration isisConfiguration,
- final IsisInteractionTracker isisInteractionTracker) {
+ final InteractionTracker isisInteractionTracker) {
super(metaModelContext, isisConfiguration, isisInteractionTracker);
}
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/HomePageResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/HomePageResourceServerside.java
index cceb665..2457479 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/HomePageResourceServerside.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/HomePageResourceServerside.java
@@ -30,7 +30,7 @@ import org.springframework.stereotype.Component;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.core.metamodel.context.MetaModelContext;
-import org.apache.isis.core.runtime.iactn.IsisInteractionTracker;
+import org.apache.isis.core.runtime.iactn.InteractionTracker;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
import org.apache.isis.viewer.restfulobjects.applib.RestfulMediaType;
@@ -51,7 +51,7 @@ public class HomePageResourceServerside extends ResourceAbstract implements Home
public HomePageResourceServerside(
final MetaModelContext metaModelContext,
final IsisConfiguration isisConfiguration,
- final IsisInteractionTracker isisInteractionTracker) {
+ final InteractionTracker isisInteractionTracker) {
super(metaModelContext, isisConfiguration, isisInteractionTracker);
}
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ImageResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ImageResourceServerside.java
index bb1b798..3bda19d 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ImageResourceServerside.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ImageResourceServerside.java
@@ -33,7 +33,7 @@ import org.apache.isis.commons.internal.base._Bytes;
import org.apache.isis.commons.internal.resources._Resources;
import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.core.metamodel.context.MetaModelContext;
-import org.apache.isis.core.runtime.iactn.IsisInteractionTracker;
+import org.apache.isis.core.runtime.iactn.InteractionTracker;
@Component
@Path("/image")
@@ -43,7 +43,7 @@ public class ImageResourceServerside extends ResourceAbstract {
public ImageResourceServerside(
final MetaModelContext metaModelContext,
final IsisConfiguration isisConfiguration,
- final IsisInteractionTracker isisInteractionTracker) {
+ final InteractionTracker isisInteractionTracker) {
super(metaModelContext, isisConfiguration, isisInteractionTracker);
}
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/MenuBarsResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/MenuBarsResourceServerside.java
index c59de7b..6a1fc83 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/MenuBarsResourceServerside.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/MenuBarsResourceServerside.java
@@ -33,7 +33,7 @@ import org.apache.isis.applib.layout.menubars.MenuBars;
import org.apache.isis.applib.services.menu.MenuBarsService;
import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.core.metamodel.context.MetaModelContext;
-import org.apache.isis.core.runtime.iactn.IsisInteractionTracker;
+import org.apache.isis.core.runtime.iactn.InteractionTracker;
import org.apache.isis.viewer.restfulobjects.applib.Rel;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
import org.apache.isis.viewer.restfulobjects.applib.RestfulMediaType;
@@ -54,7 +54,7 @@ public class MenuBarsResourceServerside extends ResourceAbstract implements Menu
public MenuBarsResourceServerside(
final MetaModelContext metaModelContext,
final IsisConfiguration isisConfiguration,
- final IsisInteractionTracker isisInteractionTracker) {
+ final InteractionTracker isisInteractionTracker) {
super(metaModelContext, isisConfiguration, isisInteractionTracker);
}
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ResourceAbstract.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ResourceAbstract.java
index f6afed0..03ab00c 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ResourceAbstract.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ResourceAbstract.java
@@ -41,7 +41,7 @@ import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.core.runtime.iactn.IsisInteractionTracker;
+import org.apache.isis.core.runtime.iactn.InteractionTracker;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
import org.apache.isis.viewer.restfulobjects.applib.RestfulResponse.HttpStatusCode;
import org.apache.isis.viewer.restfulobjects.rendering.RestfulObjectsApplicationException;
@@ -56,7 +56,7 @@ public abstract class ResourceAbstract {
protected final MetaModelContext metaModelContext;
protected final IsisConfiguration isisConfiguration;
- protected final IsisInteractionTracker isisInteractionTracker;
+ protected final InteractionTracker isisInteractionTracker;
@Context HttpHeaders httpHeaders;
@Context UriInfo uriInfo;
@@ -70,7 +70,7 @@ public abstract class ResourceAbstract {
protected ResourceAbstract(
final MetaModelContext metaModelContext,
final IsisConfiguration isisConfiguration,
- final IsisInteractionTracker isisInteractionTracker) {
+ final InteractionTracker isisInteractionTracker) {
this.metaModelContext = metaModelContext;
this.isisConfiguration = isisConfiguration;
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/SwaggerSpecResource.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/SwaggerSpecResource.java
index 1203ae5..3c8364b 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/SwaggerSpecResource.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/SwaggerSpecResource.java
@@ -34,7 +34,7 @@ import javax.ws.rs.core.MediaType;
import org.springframework.stereotype.Component;
import org.apache.isis.applib.services.swagger.SwaggerService;
-import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
+import org.apache.isis.core.runtime.iactn.InteractionFactory;
import lombok.RequiredArgsConstructor;
import lombok.val;
@@ -44,7 +44,7 @@ import lombok.val;
public class SwaggerSpecResource {
private final SwaggerService swaggerService;
- private final IsisInteractionFactory isisInteractionFactory;
+ private final InteractionFactory isisInteractionFactory;
@Context HttpHeaders httpHeaders;
@Context HttpServletRequest httpServletRequest;
@@ -52,7 +52,7 @@ public class SwaggerSpecResource {
@Inject
public SwaggerSpecResource(
final SwaggerService swaggerService,
- final IsisInteractionFactory isisInteractionFactory) {
+ final InteractionFactory isisInteractionFactory) {
this.swaggerService = swaggerService;
this.isisInteractionFactory = isisInteractionFactory;
}
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/UserResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/UserResourceServerside.java
index c6712d2..d7dab3e 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/UserResourceServerside.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/UserResourceServerside.java
@@ -31,7 +31,7 @@ import org.springframework.stereotype.Component;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.core.metamodel.context.MetaModelContext;
-import org.apache.isis.core.runtime.iactn.IsisInteractionTracker;
+import org.apache.isis.core.runtime.iactn.InteractionTracker;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
import org.apache.isis.viewer.restfulobjects.applib.RestfulMediaType;
@@ -52,7 +52,7 @@ public class UserResourceServerside extends ResourceAbstract implements UserReso
public UserResourceServerside(
final MetaModelContext metaModelContext,
final IsisConfiguration isisConfiguration,
- final IsisInteractionTracker isisInteractionTracker) {
+ final InteractionTracker isisInteractionTracker) {
super(metaModelContext, isisConfiguration, isisInteractionTracker);
}
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/VersionResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/VersionResourceServerside.java
index fd1a5dc..f2fada2 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/VersionResourceServerside.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/VersionResourceServerside.java
@@ -33,7 +33,7 @@ import org.springframework.stereotype.Component;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.core.metamodel.context.MetaModelContext;
-import org.apache.isis.core.runtime.iactn.IsisInteractionTracker;
+import org.apache.isis.core.runtime.iactn.InteractionTracker;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
import org.apache.isis.viewer.restfulobjects.applib.RestfulMediaType;
@@ -61,7 +61,7 @@ public class VersionResourceServerside extends ResourceAbstract implements Versi
public VersionResourceServerside(
final MetaModelContext metaModelContext,
final IsisConfiguration isisConfiguration,
- final IsisInteractionTracker isisInteractionTracker) {
+ final InteractionTracker isisInteractionTracker) {
super(metaModelContext, isisConfiguration, isisInteractionTracker);
}
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsInteractionFilter.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsInteractionFilter.java
index 68fb1f4..3869482 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsInteractionFilter.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsInteractionFilter.java
@@ -48,7 +48,7 @@ import org.apache.isis.commons.internal.factory._InstanceUtil;
import org.apache.isis.core.metamodel.commons.StringExtensions;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelInvalidException;
-import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
+import org.apache.isis.core.runtime.iactn.InteractionFactory;
import org.apache.isis.core.webapp.modules.templresources.TemplateResourceCachingFilter;
import org.apache.isis.viewer.restfulobjects.viewer.webmodule.auth.AuthenticationSessionStrategy;
import org.apache.isis.viewer.restfulobjects.viewer.webmodule.auth.AuthenticationSessionStrategyDefault;
@@ -156,7 +156,7 @@ public class IsisRestfulObjectsInteractionFilter implements Filter {
return Pattern.compile(".*\\." + input);
};
- @Autowired private IsisInteractionFactory isisInteractionFactory;
+ @Autowired private InteractionFactory isisInteractionFactory;
@Autowired private SpecificationLoader specificationLoader;
@Autowired private TransactionService transactionService;
diff --git a/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java
index 51126fc..090a361 100644
--- a/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java
+++ b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java
@@ -38,8 +38,8 @@ import org.apache.isis.core.metamodel._testing.MetaModelContext_forTesting;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.iactn.InteractionSession;
-import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
-import org.apache.isis.core.runtime.iactn.IsisInteractionTracker;
+import org.apache.isis.core.runtime.iactn.InteractionFactory;
+import org.apache.isis.core.runtime.iactn.InteractionTracker;
import org.apache.isis.core.security.authentication.AuthenticationSession;
import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
@@ -55,8 +55,8 @@ public class ResourceContext_getArg_Test {
@Mock private HttpServletRequest mockHttpServletRequest;
@Mock private ServletContext mockServletContext;
@Mock private InteractionSession mockIsisInteraction;
- @Mock private IsisInteractionFactory mockIsisInteractionFactory;
- @Mock private IsisInteractionTracker mockIsisInteractionTracker;
+ @Mock private InteractionFactory mockIsisInteractionFactory;
+ @Mock private InteractionTracker mockIsisInteractionTracker;
@Mock private AuthenticationManager mockAuthenticationManager;
@Mock private AuthenticationSession mockAuthenticationSession;
@Mock private SpecificationLoader mockSpecificationLoader;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/app/logout/LogoutHandlerWkt.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/app/logout/LogoutHandlerWkt.java
index 399e67d..83eea62 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/app/logout/LogoutHandlerWkt.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/app/logout/LogoutHandlerWkt.java
@@ -24,7 +24,7 @@ import org.apache.wicket.authroles.authentication.AuthenticatedWebSession;
import org.apache.wicket.request.cycle.RequestCycle;
import org.springframework.stereotype.Service;
-import org.apache.isis.core.runtime.iactn.IsisInteractionTracker;
+import org.apache.isis.core.runtime.iactn.InteractionTracker;
import org.apache.isis.core.security.authentication.logout.LogoutHandler;
import lombok.val;
@@ -32,7 +32,7 @@ import lombok.val;
@Service
public class LogoutHandlerWkt implements LogoutHandler {
- @Inject IsisInteractionTracker isisInteractionTracker;
+ @Inject InteractionTracker isisInteractionTracker;
@Override
public void logout() {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/PrototypingMessageProvider.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/PrototypingMessageProvider.java
index 784f625..9271d3e 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/PrototypingMessageProvider.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/PrototypingMessageProvider.java
@@ -59,7 +59,7 @@ class PrototypingMessageProvider {
final StringBuilder tookTimingMessage = new StringBuilder();
- commonContext().getIsisInteractionTracker().currentInteractionSession()
+ commonContext().getInteractionTracker().currentInteractionSession()
.ifPresent(interaction->{
val stopWatch = _Timing.atSystemNanos(interaction.getLifecycleStartedAtSystemNanos());
tookTimingMessage.append(String.format(Locale.US, "... took %.2f seconds", stopWatch.getSeconds()));
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java
index e5be86e..e1f462b 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java
@@ -32,7 +32,7 @@ import org.apache.wicket.util.cookies.CookieUtils;
import org.apache.wicket.util.string.Strings;
import org.apache.isis.core.config.IsisConfiguration;
-import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
+import org.apache.isis.core.runtime.iactn.InteractionFactory;
import lombok.Getter;
import lombok.val;
@@ -158,5 +158,5 @@ public class ThemeChooser extends Panel {
@Inject @Getter private IsisWicketThemeSupport themeSupport;
@Inject @Getter private IsisConfiguration configuration;
- @Inject @Getter private IsisInteractionFactory isisInteractionFactory;
+ @Inject @Getter private InteractionFactory isisInteractionFactory;
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/WebPageBase.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/WebPageBase.java
index 5f82ee6..1c75443 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/WebPageBase.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/WebPageBase.java
@@ -26,7 +26,7 @@ import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.core.config.viewer.wicket.WebAppContextPath;
import org.apache.isis.core.runtime.context.IsisAppCommonContext;
import org.apache.isis.core.runtime.context.IsisAppCommonContext.HasCommonContext;
-import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
+import org.apache.isis.core.runtime.iactn.InteractionFactory;
import org.apache.isis.viewer.wicket.model.common.CommonContextUtils;
/**
@@ -43,7 +43,7 @@ implements HasCommonContext {
private transient WebAppContextPath webAppContextPath;
private transient PageClassRegistry pageClassRegistry;
private transient IsisAppCommonContext commonContext;
- private transient IsisInteractionFactory isisInteractionFactory;
+ private transient InteractionFactory isisInteractionFactory;
protected WebPageBase(PageParameters parameters) {
super(parameters);
@@ -70,8 +70,8 @@ implements HasCommonContext {
return pageClassRegistry = computeIfAbsent(PageClassRegistry.class, pageClassRegistry);
}
- public IsisInteractionFactory getIsisInteractionFactory() {
- return isisInteractionFactory = computeIfAbsent(IsisInteractionFactory.class, isisInteractionFactory);
+ public InteractionFactory getIsisInteractionFactory() {
+ return isisInteractionFactory = computeIfAbsent(InteractionFactory.class, isisInteractionFactory);
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailAvailableValidator.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailAvailableValidator.java
index c3afbca..f108143 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailAvailableValidator.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailAvailableValidator.java
@@ -24,7 +24,7 @@ import org.apache.wicket.validation.ValidationError;
import org.apache.isis.applib.services.userreg.UserRegistrationService;
import org.apache.isis.viewer.wicket.ui.validation.ValidatorBase;
import org.apache.isis.core.runtime.context.IsisAppCommonContext;
-import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
+import org.apache.isis.core.runtime.iactn.InteractionFactory;
import lombok.val;
@@ -63,7 +63,7 @@ public class EmailAvailableValidator extends ValidatorBase<String> {
.lookupServiceElseFail(UserRegistrationService.class);
val isisInteractionFactory = super.getCommonContext()
- .lookupServiceElseFail(IsisInteractionFactory.class);
+ .lookupServiceElseFail(InteractionFactory.class);
isisInteractionFactory.runAnonymous(() -> {
String email = validatable.getValue();
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/UsernameAvailableValidator.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/UsernameAvailableValidator.java
index ae7ca45..1d35ea3 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/UsernameAvailableValidator.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/UsernameAvailableValidator.java
@@ -24,7 +24,7 @@ import org.apache.wicket.validation.ValidationError;
import org.apache.isis.applib.services.userreg.UserRegistrationService;
import org.apache.isis.viewer.wicket.ui.validation.ValidatorBase;
import org.apache.isis.core.runtime.context.IsisAppCommonContext;
-import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
+import org.apache.isis.core.runtime.iactn.InteractionFactory;
import lombok.val;
@@ -51,7 +51,7 @@ public class UsernameAvailableValidator extends ValidatorBase<String> {
.lookupServiceElseFail(UserRegistrationService.class);
val isisInteractionFactory = super.getCommonContext()
- .lookupServiceElseFail(IsisInteractionFactory.class);
+ .lookupServiceElseFail(InteractionFactory.class);
isisInteractionFactory.runAnonymous(() -> {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPanel.java
index 4b52995..d4ff283 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPanel.java
@@ -37,7 +37,7 @@ import org.apache.wicket.model.ResourceModel;
import org.apache.isis.applib.services.userreg.UserDetails;
import org.apache.isis.applib.services.userreg.UserRegistrationService;
import org.apache.isis.applib.services.xactn.TransactionService;
-import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
+import org.apache.isis.core.runtime.iactn.InteractionFactory;
import org.apache.isis.viewer.wicket.ui.components.widgets.bootstrap.FormGroup;
import org.apache.isis.viewer.wicket.ui.pages.accmngt.AccountConfirmationMap;
import org.apache.isis.viewer.wicket.ui.pages.accmngt.UsernameAvailableValidator;
@@ -115,7 +115,7 @@ public abstract class RegisterPanel extends PanelBase<UserDetails> {
@Inject private transient UserRegistrationService userRegistrationService;
@Inject private transient TransactionService transactionService;
- @Inject private transient IsisInteractionFactory isisInteractionFactory;
+ @Inject private transient InteractionFactory isisInteractionFactory;
private final String uuid;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java
index a562bae..efed69b 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java
@@ -32,7 +32,7 @@ import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.services.userreg.EmailNotificationService;
import org.apache.isis.applib.services.userreg.UserRegistrationService;
import org.apache.isis.commons.collections.Can;
-import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
+import org.apache.isis.core.runtime.iactn.InteractionFactory;
import org.apache.isis.viewer.wicket.model.models.PageType;
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
@@ -50,7 +50,7 @@ public class IsisSignInPanel extends SignInPanel {
private static final long serialVersionUID = 1L;
- @Inject transient IsisInteractionFactory isisInteractionFactory;
+ @Inject transient InteractionFactory isisInteractionFactory;
@Inject transient ServiceInjector serviceInjector;
@Inject transient ServiceRegistry serviceRegistry;
@Inject transient private PageClassRegistry pageClassRegistry;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java
index c51f225..8e08c82 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java
@@ -53,7 +53,7 @@ import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.context.IsisAppCommonContext;
import org.apache.isis.core.runtime.context.memento.ObjectMemento;
import org.apache.isis.core.runtime.events.RuntimeEventService;
-import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
+import org.apache.isis.core.runtime.iactn.InteractionFactory;
import org.apache.isis.core.security.authentication.AuthenticationSession;
import org.apache.isis.core.security.authentication.MessageBroker;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
@@ -141,7 +141,7 @@ implements FormExecutor {
// flush any queued changes; any concurrency or violation exceptions will actually be thrown here
{
val commonContext = targetEntityModel.getCommonContext();
- commonContext.getIsisInteractionTracker().currentInteractionSession()
+ commonContext.getInteractionTracker().currentInteractionSession()
.ifPresent(interaction->{
commonContext.lookupServiceElseFail(RuntimeEventService.class)
.fireInteractionFlushRequest(interaction);
@@ -473,8 +473,8 @@ implements FormExecutor {
return getCommonContext().getSpecificationLoader();
}
- protected IsisInteractionFactory getIsisInteractionFactory() {
- return getCommonContext().lookupServiceElseFail(IsisInteractionFactory.class);
+ protected InteractionFactory getIsisInteractionFactory() {
+ return getCommonContext().lookupServiceElseFail(InteractionFactory.class);
}
protected AuthenticationSession getAuthenticationSession() {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java
index 5df6923..9a082ba 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java
@@ -33,7 +33,7 @@ import org.apache.isis.core.config.viewer.wicket.WebAppContextPath;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.runtime.context.IsisAppCommonContext;
import org.apache.isis.core.runtime.context.IsisAppCommonContext.HasCommonContext;
-import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
+import org.apache.isis.core.runtime.iactn.InteractionFactory;
import org.apache.isis.core.security.authentication.MessageBroker;
import org.apache.isis.viewer.common.model.header.HeaderUiModel;
import org.apache.isis.viewer.common.model.header.HeaderUiModelProvider;
@@ -66,7 +66,7 @@ implements HasCommonContext {
private transient ImageResourceCache imageCache;
private transient MetaModelContext metaModelContext;
private transient IsisAppCommonContext commonContext;
- private transient IsisInteractionFactory isisInteractionFactory;
+ private transient InteractionFactory isisInteractionFactory;
private transient TranslationService translationService;
private transient LocaleProvider localeProvider;
private transient TreeThemeProvider treeThemeProvider;
@@ -112,8 +112,8 @@ implements HasCommonContext {
return metaModelContext = computeIfAbsent(MetaModelContext.class, metaModelContext);
}
- public IsisInteractionFactory getIsisInteractionFactory() {
- return isisInteractionFactory = computeIfAbsent(IsisInteractionFactory.class, isisInteractionFactory);
+ public InteractionFactory getIsisInteractionFactory() {
+ return isisInteractionFactory = computeIfAbsent(InteractionFactory.class, isisInteractionFactory);
}
public TranslationService getTranslationService() {
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis.java
index 9b4c143..2e50d5d 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis.java
@@ -33,8 +33,8 @@ import org.apache.isis.applib.services.session.SessionLoggingService;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.core.runtime.context.IsisAppCommonContext;
import org.apache.isis.core.runtime.context.IsisAppCommonContext.HasCommonContext;
-import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
-import org.apache.isis.core.runtime.iactn.IsisInteractionTracker;
+import org.apache.isis.core.runtime.iactn.InteractionFactory;
+import org.apache.isis.core.runtime.iactn.InteractionTracker;
import org.apache.isis.core.security.authentication.AuthenticationRequest;
import org.apache.isis.core.security.authentication.AuthenticationRequestPassword;
import org.apache.isis.core.security.authentication.AuthenticationSession;
@@ -147,7 +147,7 @@ implements BreadcrumbModelProvider, BookmarkedPagesModelProvider, HasCommonConte
public synchronized AuthenticationSession getAuthenticationSession() {
- commonContext.getIsisInteractionTracker().currentAuthenticationSession()
+ commonContext.getInteractionTracker().currentAuthenticationSession()
.ifPresent(currentAuthenticationSession->{
if (getAuthenticationManager().isSessionValid(currentAuthenticationSession)) {
@@ -272,12 +272,12 @@ implements BreadcrumbModelProvider, BookmarkedPagesModelProvider, HasCommonConte
return commonContext.getServiceRegistry().select(SessionLoggingService.class);
}
- protected IsisInteractionFactory getIsisInteractionFactory() {
- return commonContext.lookupServiceElseFail(IsisInteractionFactory.class);
+ protected InteractionFactory getIsisInteractionFactory() {
+ return commonContext.lookupServiceElseFail(InteractionFactory.class);
}
- protected IsisInteractionTracker getIsisInteractionTracker() {
- return commonContext.getIsisInteractionTracker();
+ protected InteractionTracker getIsisInteractionTracker() {
+ return commonContext.getInteractionTracker();
}
private VirtualClock virtualClock() {
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/LocalizerForIsis.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/LocalizerForIsis.java
index 8a4e76e..eb141d3 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/LocalizerForIsis.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/LocalizerForIsis.java
@@ -35,8 +35,8 @@ import org.apache.wicket.model.IModel;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
-import org.apache.isis.core.runtime.iactn.IsisInteractionTracker;
+import org.apache.isis.core.runtime.iactn.InteractionFactory;
+import org.apache.isis.core.runtime.iactn.InteractionTracker;
import org.apache.isis.core.runtime.session.init.InitialisationSession;
import org.apache.isis.viewer.wicket.viewer.wicketapp.IsisWicketApplication;
@@ -48,8 +48,8 @@ import lombok.val;
*/
public class LocalizerForIsis extends Localizer {
- @Inject private IsisInteractionTracker isisInteractionTracker;
- @Inject private IsisInteractionFactory isisInteractionFactory;
+ @Inject private InteractionTracker isisInteractionTracker;
+ @Inject private InteractionFactory isisInteractionFactory;
@Inject private TranslationService translationService;
/**
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/WebRequestCycleForIsis.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/WebRequestCycleForIsis.java
index bf98854..bbdc626 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/WebRequestCycleForIsis.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/WebRequestCycleForIsis.java
@@ -53,7 +53,7 @@ import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelInvalidException;
import org.apache.isis.core.runtime.context.IsisAppCommonContext;
import org.apache.isis.core.runtime.iactn.InteractionSession;
-import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
+import org.apache.isis.core.runtime.iactn.InteractionFactory;
import org.apache.isis.core.runtime.session.IsisRequestCycle;
import org.apache.isis.core.security.authentication.AuthenticationSession;
import org.apache.isis.core.security.authentication.MessageBroker;
@@ -106,7 +106,7 @@ public class WebRequestCycleForIsis implements IRequestCycleListener {
}
val isisRequestCycle = IsisRequestCycle.next(
- commonContext.lookupServiceElseFail(IsisInteractionFactory.class),
+ commonContext.lookupServiceElseFail(InteractionFactory.class),
commonContext.createTransactionTemplate());
requestCycle.setMetaData(REQ_CYCLE_HANDLE_KEY, isisRequestCycle);
@@ -392,7 +392,7 @@ public class WebRequestCycleForIsis implements IRequestCycleListener {
}
private boolean isInInteraction() {
- return commonContext.getIsisInteractionTracker().isInInteractionSession();
+ return commonContext.getInteractionTracker().isInInteractionSession();
}
private Optional<AuthenticationSession> getAuthenticationSession() {
diff --git a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java
index 50cca17..917c8f9 100644
--- a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java
+++ b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java
@@ -41,9 +41,9 @@ import org.apache.isis.applib.services.user.UserMemento;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.runtime.context.IsisAppCommonContext;
-import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
-import org.apache.isis.core.runtime.iactn.IsisInteractionFactory.ThrowingRunnable;
-import org.apache.isis.core.runtime.iactn.IsisInteractionTracker;
+import org.apache.isis.core.runtime.iactn.InteractionFactory;
+import org.apache.isis.core.runtime.iactn.InteractionFactory.ThrowingRunnable;
+import org.apache.isis.core.runtime.iactn.InteractionTracker;
import org.apache.isis.core.runtime.session.init.InitialisationSession;
import org.apache.isis.core.security.authentication.AuthenticationRequest;
import org.apache.isis.core.security.authentication.AuthenticationRequestPassword;
@@ -64,8 +64,8 @@ public class AuthenticatedWebSessionForIsis_Authenticate {
private AuthenticationManager authMgr;
@Mock protected Authenticator mockAuthenticator;
@Mock protected IsisAppCommonContext mockCommonContext;
- @Mock protected IsisInteractionFactory mockIsisInteractionFactory;
- @Mock protected IsisInteractionTracker mockIsisInteractionTracker;
+ @Mock protected InteractionFactory mockIsisInteractionFactory;
+ @Mock protected InteractionTracker mockIsisInteractionTracker;
@Mock protected ServiceRegistry mockServiceRegistry;
protected AuthenticatedWebSessionForIsis webSession;
@@ -82,10 +82,10 @@ public class AuthenticatedWebSessionForIsis_Authenticate {
allowing(mockServiceRegistry).select(SessionLoggingService.class);
will(returnValue(Can.empty()));
- allowing(mockCommonContext).lookupServiceElseFail(IsisInteractionFactory.class);
+ allowing(mockCommonContext).lookupServiceElseFail(InteractionFactory.class);
will(returnValue(mockIsisInteractionFactory));
- allowing(mockCommonContext).getIsisInteractionTracker();
+ allowing(mockCommonContext).getInteractionTracker();
will(returnValue(mockIsisInteractionTracker));
allowing(mockIsisInteractionTracker).currentAuthenticationSession();
diff --git a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_SignIn.java b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_SignIn.java
index cc16119..a584f74 100644
--- a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_SignIn.java
+++ b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_SignIn.java
@@ -37,8 +37,8 @@ import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.services.session.SessionLoggingService;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.core.runtime.context.IsisAppCommonContext;
-import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
-import org.apache.isis.core.runtime.iactn.IsisInteractionFactory.ThrowingRunnable;
+import org.apache.isis.core.runtime.iactn.InteractionFactory;
+import org.apache.isis.core.runtime.iactn.InteractionFactory.ThrowingRunnable;
import org.apache.isis.core.runtime.session.init.InitialisationSession;
import org.apache.isis.core.security.authentication.AuthenticationRequest;
import org.apache.isis.core.security.authentication.AuthenticationRequestPassword;
@@ -58,7 +58,7 @@ public class AuthenticatedWebSessionForIsis_SignIn {
private AuthenticationManager authMgr;
@Mock protected Authenticator mockAuthenticator;
@Mock protected IsisAppCommonContext mockCommonContext;
- @Mock protected IsisInteractionFactory mockIsisInteractionFactory;
+ @Mock protected InteractionFactory mockIsisInteractionFactory;
@Mock protected ServiceRegistry mockServiceRegistry;
protected AuthenticatedWebSessionForIsis webSession;
@@ -78,7 +78,7 @@ public class AuthenticatedWebSessionForIsis_SignIn {
allowing(mockServiceRegistry).select(SessionLoggingService.class);
will(returnValue(Can.empty()));
- allowing(mockCommonContext).lookupServiceElseFail(IsisInteractionFactory.class);
+ allowing(mockCommonContext).lookupServiceElseFail(InteractionFactory.class);
will(returnValue(mockIsisInteractionFactory));
allowing(mockIsisInteractionFactory)
diff --git a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_TestAbstract.java b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_TestAbstract.java
index ec25e01..d500ff3 100644
--- a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_TestAbstract.java
+++ b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_TestAbstract.java
@@ -30,8 +30,8 @@ import org.junit.Rule;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.services.session.SessionLoggingService;
import org.apache.isis.core.runtime.context.IsisAppCommonContext;
-import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
-import org.apache.isis.core.runtime.iactn.IsisInteractionFactory.ThrowingRunnable;
+import org.apache.isis.core.runtime.iactn.InteractionFactory;
+import org.apache.isis.core.runtime.iactn.InteractionFactory.ThrowingRunnable;
import org.apache.isis.core.runtime.session.init.InitialisationSession;
import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2;
@@ -45,7 +45,7 @@ public abstract class AuthenticatedWebSessionForIsis_TestAbstract {
@Mock protected Request mockRequest;
@Mock protected AuthenticationManager mockAuthMgr;
@Mock protected IsisAppCommonContext mockCommonContext;
- @Mock protected IsisInteractionFactory mockIsisInteractionFactory;
+ @Mock protected InteractionFactory mockIsisInteractionFactory;
@Mock protected ServiceRegistry mockServiceRegistry;
protected AuthenticatedWebSessionForIsis webSession;
@@ -59,7 +59,7 @@ public abstract class AuthenticatedWebSessionForIsis_TestAbstract {
allowing(mockServiceRegistry).lookupService(SessionLoggingService.class);
will(returnValue(Optional.empty()));
- allowing(mockCommonContext).lookupServiceElseFail(IsisInteractionFactory.class);
+ allowing(mockCommonContext).lookupServiceElseFail(InteractionFactory.class);
will(returnValue(mockIsisInteractionFactory));
allowing(mockIsisInteractionFactory).runAuthenticated(new InitialisationSession(), with(any(ThrowingRunnable.class)));