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/03/21 15:55:02 UTC
[isis] branch master updated: ISIS-2320: Rename IsisSessionFactory
-> IsisInteractionFactory
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new f83aa74 ISIS-2320: Rename IsisSessionFactory -> IsisInteractionFactory
f83aa74 is described below
commit f83aa74bb3cf832dece3a7ea4ef09680aabef023
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sat Mar 21 16:54:50 2020 +0100
ISIS-2320: Rename IsisSessionFactory -> IsisInteractionFactory
---
.../java/org/apache/isis/core/runtime/context/IsisContext.java | 4 ++--
.../isis/core/runtime/context/session/RuntimeContextBase.java | 6 +++---
.../{IsisSessionFactory.java => IsisInteractionFactory.java} | 2 +-
.../org/apache/isis/core/runtime/session/IsisRequestCycle.java | 2 +-
.../java/org/apache/isis/core/runtime/session/IsisSession.java | 2 +-
.../runtime/session/template/AbstractIsisSessionTemplate.java | 4 ++--
.../isis/core/runtimeservices/IsisModuleCoreRuntimeServices.java | 4 ++--
.../runtimeservices/command/CommandExecutorServiceDefault.java | 6 +++---
.../isis/core/runtimeservices/factory/FactoryServiceDefault.java | 4 ++--
...sionFactoryDefault.java => IsisInteractionFactoryDefault.java} | 6 +++---
.../isis/core/runtimeservices/wrapper/WrapperFactoryDefault.java | 4 ++--
.../wrapper/WrapperFactoryDefault_wrappedObject_Test.java | 4 ++--
.../WrapperFactoryDefault_wrappedObject_transient_Test.java | 4 ++--
.../webapp/health/HealthIndicatorUsingHealthCheckService.java | 6 +++---
.../src/main/java/demoapp/vaadin/webapp/DemoAppVaadin.java | 4 ++--
.../demo/src/main/java/demoapp/utils/DemoRequestScopedBean.java | 4 ++--
.../testdomain/transactions/TransactionScopeListenerTest.java | 4 ++--
.../extensions/secman/shiro/IsisModuleExtSecmanShiroRealm.java | 4 ++--
.../viewer/vaadin/ui/auth/VaadinAuthenticationHandler.java | 6 +++---
.../viewer/vaadin/viewer/IsisModuleIncViewerVaadinViewer.java | 4 ++--
.../isis/incubator/viewer/vaadin/viewer/IsisServletForVaadin.java | 6 +++---
.../persistence/IsisPlatformTransactionManagerForJdo.java | 6 +++---
.../apache/isis/security/keycloak/webmodule/KeycloakFilter.java | 4 ++--
.../testing/fixtures/applib/fixturescripts/FixtureScripts.java | 4 ++--
.../fixtures/applib/services/FixturesLifecycleService.java | 4 ++--
.../isis/testing/integtestsupport/applib/IsisSessionHandler.java | 8 ++++----
.../apache/isis/valuetypes/sse/ui/services/SseServiceDefault.java | 4 ++--
.../restfulobjects/viewer/resources/SwaggerSpecResource.java | 6 +++---
.../viewer/webmodule/IsisRestfulObjectsSessionFilter.java | 4 ++--
...ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java | 4 ++--
.../viewer/context/ResourceContext_getArg_Test.java | 4 ++--
.../wicket/ui/components/widgets/themepicker/ThemeChooser.java | 4 ++--
.../java/org/apache/isis/viewer/wicket/ui/pages/WebPageBase.java | 8 ++++----
.../viewer/wicket/ui/pages/accmngt/EmailAvailableValidator.java | 4 ++--
.../wicket/ui/pages/accmngt/UsernameAvailableValidator.java | 4 ++--
.../viewer/wicket/ui/pages/accmngt/register/RegisterPanel.java | 4 ++--
.../apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java | 4 ++--
.../apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java | 6 +++---
.../java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java | 8 ++++----
.../wicket/viewer/integration/AuthenticatedWebSessionForIsis.java | 6 +++---
.../isis/viewer/wicket/viewer/integration/LocalizerForIsis.java | 4 ++--
.../viewer/wicket/viewer/integration/WebRequestCycleForIsis.java | 4 ++--
.../integration/AuthenticatedWebSessionForIsis_Authenticate.java | 8 ++++----
.../viewer/integration/AuthenticatedWebSessionForIsis_SignIn.java | 8 ++++----
.../integration/AuthenticatedWebSessionForIsis_TestAbstract.java | 8 ++++----
45 files changed, 109 insertions(+), 109 deletions(-)
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/context/IsisContext.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/context/IsisContext.java
index eeb5890..abb5f94 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/context/IsisContext.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/context/IsisContext.java
@@ -26,11 +26,11 @@ import org.apache.isis.core.commons.internal.context._Context;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelInvalidException;
import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
import org.apache.isis.core.runtime.session.IsisSession;
-import org.apache.isis.core.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisInteractionFactory;
/**
* Provides static access to current context's singletons
- * {@link MetaModelInvalidException} and {@link IsisSessionFactory}.
+ * {@link MetaModelInvalidException} and {@link IsisInteractionFactory}.
*/
public interface IsisContext {
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/RuntimeContextBase.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/RuntimeContextBase.java
index 036a208..3dd34aa 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/RuntimeContextBase.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/RuntimeContextBase.java
@@ -28,7 +28,7 @@ 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.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisInteractionFactory;
import org.apache.isis.core.runtime.session.IsisSessionTracker;
import org.apache.isis.core.security.authentication.AuthenticationSessionTracker;
import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
@@ -52,7 +52,7 @@ public abstract class RuntimeContextBase implements RuntimeContext {
@Getter(onMethod = @__(@Override)) protected final SpecificationLoader specificationLoader;
@Getter(onMethod = @__(@Override)) protected final IsisSessionTracker isisSessionTracker;
- @Getter protected final IsisSessionFactory isisSessionFactory;
+ @Getter protected final IsisInteractionFactory isisSessionFactory;
@Getter protected final AuthenticationManager authenticationManager;
@Getter protected final TransactionService transactionService;
@Getter protected final Supplier<ManagedObject> homePageSupplier;
@@ -69,7 +69,7 @@ public abstract class RuntimeContextBase implements RuntimeContext {
this.objectManager = mmc.getObjectManager();
this.transactionService = mmc.getTransactionService();
this.homePageSupplier = mmc::getHomePageAdapter;
- this.isisSessionFactory = serviceRegistry.lookupServiceElseFail(IsisSessionFactory.class);
+ this.isisSessionFactory = serviceRegistry.lookupServiceElseFail(IsisInteractionFactory.class);
this.authenticationManager = serviceRegistry.lookupServiceElseFail(AuthenticationManager.class);
this.isisSessionTracker = serviceRegistry.lookupServiceElseFail(IsisSessionTracker.class);
}
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSessionFactory.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisInteractionFactory.java
similarity index 98%
rename from core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSessionFactory.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisInteractionFactory.java
index d302380..23bb6fc 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSessionFactory.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisInteractionFactory.java
@@ -43,7 +43,7 @@ import lombok.SneakyThrows;
* it can be {@link Inject}'d into other domain services.
* </p>
*/
-public interface IsisSessionFactory {
+public interface IsisInteractionFactory {
@FunctionalInterface
public interface ThrowingRunnable {
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 6ac4599..cad256f 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
@@ -34,7 +34,7 @@ public class IsisRequestCycle {
// -- SUPPORTING ISIS TRANSACTION FILTER FOR RESTFUL OBJECTS ...
- private final IsisSessionFactory isisSessionFactory;
+ private final IsisInteractionFactory isisSessionFactory;
private final TransactionTemplate transactionTemplate;
private TransactionStatus txStatus;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSession.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSession.java
index b7ac992..1120d4c 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSession.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSession.java
@@ -38,7 +38,7 @@ import lombok.NonNull;
/**
* Holds the current set of components for a specific execution context (such as on a thread).
*
- * @see IsisSessionFactory
+ * @see IsisInteractionFactory
*/
public class IsisSession extends RuntimeContextBase {
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/session/template/AbstractIsisSessionTemplate.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/template/AbstractIsisSessionTemplate.java
index 850d472..f83edf3 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/session/template/AbstractIsisSessionTemplate.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/template/AbstractIsisSessionTemplate.java
@@ -23,13 +23,13 @@ import javax.inject.Inject;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.core.runtime.session.IsisSession;
-import org.apache.isis.core.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisInteractionFactory;
import org.apache.isis.core.security.authentication.AuthenticationSession;
public abstract class AbstractIsisSessionTemplate {
@Inject protected TransactionService transactionService;
- @Inject protected IsisSessionFactory isisSessionFactory;
+ @Inject protected IsisInteractionFactory isisSessionFactory;
@Inject protected ServiceInjector serviceInjector;
/**
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 03a6ca0..0d55a64 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
@@ -50,7 +50,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.IsisSessionFactoryDefault;
+import org.apache.isis.core.runtimeservices.session.IsisInteractionFactoryDefault;
import org.apache.isis.core.runtimeservices.sudo.SudoServiceDefault;
import org.apache.isis.core.runtimeservices.urlencoding.UrlEncodingServiceWithCompression;
import org.apache.isis.core.runtimeservices.user.UserServiceDefault;
@@ -80,7 +80,7 @@ import org.apache.isis.core.runtimeservices.xmlsnapshot.XmlSnapshotServiceDefaul
FactoryServiceDefault.class,
HomePageResolverServiceDefault.class,
InteractionDtoServiceInternalDefault.class,
- IsisSessionFactoryDefault.class,
+ IsisInteractionFactoryDefault.class,
TranslationServicePo.class,
MenuBarsLoaderServiceDefault.class,
MenuBarsServiceBS3.class,
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 4eba020..d89a8e0 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,7 +64,7 @@ import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
import org.apache.isis.core.runtime.session.IsisSession;
-import org.apache.isis.core.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisInteractionFactory;
import org.apache.isis.core.runtime.session.IsisSessionTracker;
import org.apache.isis.schema.cmd.v2.ActionDto;
import org.apache.isis.schema.cmd.v2.CommandDto;
@@ -379,7 +379,7 @@ public class CommandExecutorServiceDefault implements CommandExecutorService {
// //////////////////////////////////////
- protected IsisSessionFactory getIsisSessionFactory() {
+ protected IsisInteractionFactory getIsisSessionFactory() {
return isisSessionFactory;
}
@@ -400,7 +400,7 @@ public class CommandExecutorServiceDefault implements CommandExecutorService {
@Inject ClockService clockService;
@Inject TransactionService transactionService;
@Inject SpecificationLoader specificationLoader;
- @Inject IsisSessionFactory isisSessionFactory;
+ @Inject IsisInteractionFactory isisSessionFactory;
@Inject IsisSessionTracker isisSessionTracker;
@Inject private javax.inject.Provider<InteractionContext> interactionContextProvider;
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 8c54b3d..d3460dd 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
@@ -42,7 +42,7 @@ import org.apache.isis.core.metamodel.objectmanager.ObjectManager;
import org.apache.isis.core.metamodel.objectmanager.create.ObjectCreator;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.core.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisInteractionFactory;
import static org.apache.isis.core.commons.internal.base._With.requires;
import static org.apache.isis.core.commons.internal.reflection._Reflect.Filter.paramAssignableFrom;
@@ -58,7 +58,7 @@ import lombok.val;
@Qualifier("Default")
public class FactoryServiceDefault implements FactoryService {
- @Inject IsisSessionFactory isisSessionFactory; // dependsOn
+ @Inject IsisInteractionFactory isisSessionFactory; // 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/IsisSessionFactoryDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/session/IsisInteractionFactoryDefault.java
similarity index 98%
rename from core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/session/IsisSessionFactoryDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/session/IsisInteractionFactoryDefault.java
index 39803b1..bc87a93 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/session/IsisSessionFactoryDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/session/IsisInteractionFactoryDefault.java
@@ -50,7 +50,7 @@ import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.context.session.RuntimeEventService;
import org.apache.isis.core.runtime.session.IsisSession;
-import org.apache.isis.core.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisInteractionFactory;
import org.apache.isis.core.runtime.session.IsisSessionTracker;
import org.apache.isis.core.runtime.session.init.IsisLocaleInitializer;
import org.apache.isis.core.runtime.session.init.IsisTimeZoneInitializer;
@@ -80,12 +80,12 @@ import lombok.extern.log4j.Log4j2;
*
*/
@Service
-@Named("isisRuntime.IsisSessionFactoryDefault")
+@Named("isisRuntime.IsisInteractionFactoryDefault")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
@Log4j2
-public class IsisSessionFactoryDefault implements IsisSessionFactory, IsisSessionTracker {
+public class IsisInteractionFactoryDefault implements IsisInteractionFactory, IsisSessionTracker {
@Inject private AuthenticationManager authenticationManager;
@Inject private RuntimeEventService runtimeEventService;
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 c91b102..eae4c3e 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
@@ -92,7 +92,7 @@ import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.specloader.specimpl.ObjectActionMixedIn;
import org.apache.isis.core.metamodel.specloader.specimpl.dflt.ObjectSpecificationDefault;
import org.apache.isis.core.runtime.session.IsisSession;
-import org.apache.isis.core.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisInteractionFactory;
import org.apache.isis.core.runtime.session.IsisSessionTracker;
import org.apache.isis.core.runtimeservices.wrapper.dispatchers.InteractionEventDispatcher;
import org.apache.isis.core.runtimeservices.wrapper.dispatchers.InteractionEventDispatcherTypeSafe;
@@ -127,7 +127,7 @@ public class WrapperFactoryDefault implements WrapperFactory {
@Inject private MetaModelContext metaModelContext;
@Inject private SpecificationLoader specificationLoader;
@Inject private IsisSessionTracker isisSessionTracker;
- @Inject private IsisSessionFactory isisSessionFactory;
+ @Inject private IsisInteractionFactory isisSessionFactory;
@Inject private TransactionService transactionService;
@Inject private CommandExecutorService commandExecutorService;
@Inject protected ProxyFactoryService proxyFactoryService; // protected to allow JUnit test
diff --git a/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
index b784c5c..3d44908 100644
--- a/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
+++ b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
@@ -74,7 +74,7 @@ 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.OneToOneAssociationDefault;
import org.apache.isis.core.metamodel.specloader.specimpl.dflt.ObjectSpecificationDefault;
-import org.apache.isis.core.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisInteractionFactory;
import org.apache.isis.core.runtime.session.IsisSessionTracker;
import org.apache.isis.core.runtimeservices.wrapper.dom.employees.Employee;
import org.apache.isis.core.runtimeservices.wrapper.dom.employees.EmployeeRepository;
@@ -100,7 +100,7 @@ public class WrapperFactoryDefault_wrappedObject_Test {
@Mock private CommandDtoServiceInternal mockCommandDtoServiceInternal;
@Mock private ObjectSpecification mockOnType;
@Mock private SpecificationLoader mockSpecificationLoader;
- @Mock private IsisSessionFactory mockIsisSessionFactory;
+ @Mock private IsisInteractionFactory mockIsisSessionFactory;
@Mock private IsisSessionTracker mockIsisSessionTracker;
@Mock private CommandExecutorService mockCommandExecutorService;
private AsyncControlService asyncControlService = new AsyncControlService();
diff --git a/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java
index ecb3904..afb8254 100644
--- a/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java
+++ b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java
@@ -74,7 +74,7 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
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.dflt.ObjectSpecificationDefault;
-import org.apache.isis.core.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisInteractionFactory;
import org.apache.isis.core.runtime.session.IsisSessionTracker;
import org.apache.isis.core.runtimeservices.wrapper.dom.employees.Employee;
import org.apache.isis.core.security.authentication.AuthenticationSessionTracker;
@@ -97,7 +97,7 @@ public class WrapperFactoryDefault_wrappedObject_transient_Test {
@Mock private CommandDtoServiceInternal mockCommandDtoServiceInternal;
@Mock private ObjectSpecification mockOnType;
@Mock private SpecificationLoader mockSpecificationLoader;
- @Mock private IsisSessionFactory mockIsisSessionFactory;
+ @Mock private IsisInteractionFactory mockIsisSessionFactory;
@Mock private IsisSessionTracker mockIsisSessionTracker;
@Mock private CommandExecutorService mockCommandExecutorService;
private AsyncControlService asyncControlService = new AsyncControlService();
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 5baa24e..dc951ea 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.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisInteractionFactory;
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 IsisSessionFactory isisSessionFactory;
+ private final IsisInteractionFactory isisSessionFactory;
private final Optional<HealthCheckService> healthCheckServiceIfAny;
@Inject
public HealthIndicatorUsingHealthCheckService(
- final IsisSessionFactory isisSessionFactory,
+ final IsisInteractionFactory isisSessionFactory,
final Optional<HealthCheckService> healthCheckServiceIfAny) {
this.isisSessionFactory = isisSessionFactory;
this.healthCheckServiceIfAny = healthCheckServiceIfAny;
diff --git a/examples/demo-vaadin/src/main/java/demoapp/vaadin/webapp/DemoAppVaadin.java b/examples/demo-vaadin/src/main/java/demoapp/vaadin/webapp/DemoAppVaadin.java
index e16478f..7dacf08 100644
--- a/examples/demo-vaadin/src/main/java/demoapp/vaadin/webapp/DemoAppVaadin.java
+++ b/examples/demo-vaadin/src/main/java/demoapp/vaadin/webapp/DemoAppVaadin.java
@@ -24,7 +24,7 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer
import org.springframework.context.annotation.Import;
import org.apache.isis.core.config.presets.IsisPresets;
-import org.apache.isis.core.runtimeservices.session.IsisSessionFactoryDefault;
+import org.apache.isis.core.runtimeservices.session.IsisInteractionFactoryDefault;
import org.apache.isis.incubator.viewer.vaadin.ui.auth.VaadinAuthenticationHandler;
import org.apache.isis.incubator.viewer.vaadin.viewer.IsisModuleIncViewerVaadinViewer;
import org.apache.isis.incubator.viewer.vaadin.viewer.IsisServletForVaadin;
@@ -52,7 +52,7 @@ public class DemoAppVaadin extends SpringBootServletInitializer {
*/
public static void main(String[] args) {
- IsisPresets.logging(IsisSessionFactoryDefault.class, "debug");
+ IsisPresets.logging(IsisInteractionFactoryDefault.class, "debug");
IsisPresets.logging(VaadinAuthenticationHandler.class, "debug");
IsisPresets.logging(IsisServletForVaadin.class, "debug");
diff --git a/examples/demo/src/main/java/demoapp/utils/DemoRequestScopedBean.java b/examples/demo/src/main/java/demoapp/utils/DemoRequestScopedBean.java
index 6146cbd..92d6756 100644
--- a/examples/demo/src/main/java/demoapp/utils/DemoRequestScopedBean.java
+++ b/examples/demo/src/main/java/demoapp/utils/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.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisInteractionFactory;
import lombok.extern.log4j.Log4j2;
@@ -48,7 +48,7 @@ import lombok.extern.log4j.Log4j2;
@Log4j2
public class DemoRequestScopedBean {
- @Inject private IsisSessionFactory isisSessionFactory;
+ @Inject private IsisInteractionFactory isisSessionFactory;
public DemoRequestScopedBean() {
log.info("init " + this.hashCode());
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionScopeListenerTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionScopeListenerTest.java
index 1eb0607..8d45a48 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionScopeListenerTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionScopeListenerTest.java
@@ -35,7 +35,7 @@ import org.apache.isis.applib.services.TransactionScopeListener;
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.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisInteractionFactory;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdo;
import org.apache.isis.testdomain.jdo.JdoTestDomainPersona;
@@ -58,7 +58,7 @@ class TransactionScopeListenerTest {
@Inject private FixtureScripts fixtureScripts;
@Inject private TransactionService transactionService;
@Inject private RepositoryService repository;
- @Inject private IsisSessionFactory isisSessionFactory;
+ @Inject private IsisInteractionFactory isisSessionFactory;
@Inject private KVStoreForTesting kvStoreForTesting;
/* Expectations:
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 df58905..ab28584 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
@@ -40,7 +40,7 @@ import org.springframework.transaction.support.TransactionTemplate;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.core.commons.internal.assertions._Assert;
-import org.apache.isis.core.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisInteractionFactory;
import org.apache.isis.core.security.authorization.standard.Authorizor;
import org.apache.isis.extensions.secman.api.SecurityRealm;
import org.apache.isis.extensions.secman.api.SecurityRealmCharacteristic;
@@ -57,7 +57,7 @@ import lombok.val;
public class IsisModuleExtSecmanShiroRealm extends AuthorizingRealm implements SecurityRealm {
@Inject protected ServiceInjector serviceInjector;
- @Inject protected IsisSessionFactory isisSessionFactory;
+ @Inject protected IsisInteractionFactory isisSessionFactory;
@Inject protected PlatformTransactionManager txMan;
@Getter @Setter private AuthenticatingRealm delegateAuthenticationRealm;
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 3108b81..a4c20ba 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
@@ -32,8 +32,8 @@ import com.vaadin.flow.server.VaadinSession;
import org.springframework.stereotype.Component;
-import org.apache.isis.core.runtime.session.IsisSessionFactory;
-import org.apache.isis.core.runtime.session.IsisSessionFactory.ThrowingRunnable;
+import org.apache.isis.core.runtime.session.IsisInteractionFactory;
+import org.apache.isis.core.runtime.session.IsisInteractionFactory.ThrowingRunnable;
import org.apache.isis.core.security.authentication.standard.SimpleSession;
import org.apache.isis.incubator.viewer.vaadin.ui.pages.login.VaadinLoginView;
@@ -51,7 +51,7 @@ public class VaadinAuthenticationHandler implements VaadinServiceInitListener {
private static final long serialVersionUID = 1L;
- @Inject private transient IsisSessionFactory isisSessionFactory;
+ @Inject private transient IsisInteractionFactory isisSessionFactory;
@Override
public void serviceInit(ServiceInitEvent event) {
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 8890e85..bbeb424 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.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisInteractionFactory;
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 IsisSessionFactory isisSessionFactory;
+ @Inject private IsisInteractionFactory isisSessionFactory;
/**
* 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 d9cbf28..db16af9 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.session.IsisSession;
-import org.apache.isis.core.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisInteractionFactory;
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 IsisSessionFactory isisSessionFactory;
+ private final IsisInteractionFactory isisSessionFactory;
public IsisServletForVaadin(
- @NonNull final IsisSessionFactory isisSessionFactory,
+ @NonNull final IsisInteractionFactory isisSessionFactory,
@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/persistence/IsisPlatformTransactionManagerForJdo.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPlatformTransactionManagerForJdo.java
index 900ef78..9c22222 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
@@ -43,7 +43,7 @@ import org.apache.isis.core.runtime.persistence.transaction.events.TransactionAf
import org.apache.isis.core.runtime.persistence.transaction.events.TransactionBeforeBeginEvent;
import org.apache.isis.core.runtime.persistence.transaction.events.TransactionBeforeCommitEvent;
import org.apache.isis.core.runtime.persistence.transaction.events.TransactionBeforeRollbackEvent;
-import org.apache.isis.core.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisInteractionFactory;
import org.apache.isis.core.runtime.session.IsisSessionTracker;
import org.apache.isis.core.runtime.session.init.InitialisationSession;
@@ -61,13 +61,13 @@ public class IsisPlatformTransactionManagerForJdo extends AbstractPlatformTransa
private static final long serialVersionUID = 1L;
- private final IsisSessionFactory isisSessionFactory;
+ private final IsisInteractionFactory isisSessionFactory;
private final EventBusService eventBusService;
private final IsisSessionTracker isisSessionTracker;
@Inject
public IsisPlatformTransactionManagerForJdo(
- final IsisSessionFactory isisSessionFactory,
+ final IsisInteractionFactory isisSessionFactory,
final EventBusService eventBusService,
final IsisSessionTracker isisSessionTracker) {
this.isisSessionFactory = isisSessionFactory;
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 995121c..eedefcf 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
@@ -34,7 +34,7 @@ import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
-import org.apache.isis.core.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisInteractionFactory;
import org.apache.isis.core.security.authentication.AuthenticationSession;
import org.apache.isis.core.security.authentication.standard.SimpleSession;
@@ -42,7 +42,7 @@ import lombok.val;
public class KeycloakFilter implements Filter {
- @Autowired private IsisSessionFactory isisSessionFactory;
+ @Autowired private IsisInteractionFactory isisSessionFactory;
@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 47d816a..1cc8492 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.core.commons.internal.base._Casts;
import org.apache.isis.core.commons.internal.exceptions._Exceptions;
-import org.apache.isis.core.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisInteractionFactory;
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 IsisSessionFactory isisSessionFactory;
+ @Inject private IsisInteractionFactory isisSessionFactory;
@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 83133f8..a51c173 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
@@ -42,7 +42,7 @@ import org.apache.isis.core.runtime.context.session.AppLifecycleEvent;
import org.apache.isis.core.runtime.session.template.AbstractIsisSessionTemplate;
import org.apache.isis.core.security.authentication.standard.SimpleSession;
import org.apache.isis.testing.fixtures.applib.clock.FixtureClock;
-import org.apache.isis.core.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisInteractionFactory;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
@@ -61,7 +61,7 @@ public class FixturesLifecycleService {
@SuppressWarnings("unused")
@Inject
- private IsisSessionFactory isisSessionFactory; // depends on relationship
+ private IsisInteractionFactory isisSessionFactory; // depends on relationship
@Inject
private IsisSystemEnvironment isisSystemEnvironment;
@Inject
diff --git a/testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/IsisSessionHandler.java b/testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/IsisSessionHandler.java
index 8c64225..ac86ee4 100644
--- a/testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/IsisSessionHandler.java
+++ b/testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/IsisSessionHandler.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.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisInteractionFactory;
import org.apache.isis.core.runtime.session.init.InitialisationSession;
public class IsisSessionHandler implements BeforeEachCallback, AfterEachCallback {
@@ -38,17 +38,17 @@ public class IsisSessionHandler implements BeforeEachCallback, AfterEachCallback
@Override
public void afterEach(ExtensionContext extensionContext) throws Exception {
isisSessionFactory(extensionContext)
- .ifPresent(IsisSessionFactory::closeSessionStack);
+ .ifPresent(IsisInteractionFactory::closeSessionStack);
}
// -- HELPER
- private Optional<IsisSessionFactory> isisSessionFactory(ExtensionContext extensionContext) {
+ private Optional<IsisInteractionFactory> isisSessionFactory(ExtensionContext extensionContext) {
return extensionContext.getTestInstance()
.filter(IsisIntegrationTestAbstract.class::isInstance)
.map(IsisIntegrationTestAbstract.class::cast)
.map(IsisIntegrationTestAbstract::getServiceRegistry)
- .flatMap(serviceRegistry->serviceRegistry.lookupService(IsisSessionFactory.class));
+ .flatMap(serviceRegistry->serviceRegistry.lookupService(IsisInteractionFactory.class));
}
}
diff --git a/valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/services/SseServiceDefault.java b/valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/services/SseServiceDefault.java
index 9d0018e..573d0a0 100644
--- a/valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/services/SseServiceDefault.java
+++ b/valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/services/SseServiceDefault.java
@@ -42,7 +42,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.core.runtime.persistence.transaction.IsisTransactionAspectSupport;
-import org.apache.isis.core.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisInteractionFactory;
import org.apache.isis.valuetypes.sse.applib.annotations.SseSource;
import org.apache.isis.valuetypes.sse.applib.service.SseChannel;
import org.apache.isis.valuetypes.sse.applib.service.SseService;
@@ -70,7 +70,7 @@ import lombok.extern.log4j.Log4j2;
public class SseServiceDefault implements SseService {
//@Inject private TransactionService transactionService;
- @Inject private IsisSessionFactory isisSessionFactory;
+ @Inject private IsisInteractionFactory isisSessionFactory;
private final EventStreamPool eventStreamPool = new EventStreamPool();
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 fce823b..c4fc435 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.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisInteractionFactory;
import lombok.RequiredArgsConstructor;
import lombok.val;
@@ -44,7 +44,7 @@ import lombok.val;
public class SwaggerSpecResource {
private final SwaggerService swaggerService;
- private final IsisSessionFactory isisSessionFactory;
+ private final IsisInteractionFactory isisSessionFactory;
@Context HttpHeaders httpHeaders;
@Context HttpServletRequest httpServletRequest;
@@ -52,7 +52,7 @@ public class SwaggerSpecResource {
@Inject
public SwaggerSpecResource(
final SwaggerService swaggerService,
- final IsisSessionFactory isisSessionFactory) {
+ final IsisInteractionFactory isisSessionFactory) {
this.swaggerService = swaggerService;
this.isisSessionFactory = isisSessionFactory;
}
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter.java
index db2c0a3..2ca817d 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter.java
@@ -48,7 +48,7 @@ import org.apache.isis.core.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.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisInteractionFactory;
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 IsisRestfulObjectsSessionFilter implements Filter {
return Pattern.compile(".*\\." + input);
};
- @Autowired private IsisSessionFactory isisSessionFactory;
+ @Autowired private IsisInteractionFactory isisSessionFactory;
@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_ensureCompatibleAcceptHeader_ContractTest.java b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
index e84d9de..3330041 100644
--- a/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
+++ b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
@@ -43,7 +43,7 @@ import org.apache.isis.core.metamodel.MetaModelContext_forTesting;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.session.IsisSession;
-import org.apache.isis.core.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisInteractionFactory;
import org.apache.isis.core.runtime.session.IsisSessionTracker;
import org.apache.isis.core.security.authentication.AuthenticationSession;
import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
@@ -62,7 +62,7 @@ public abstract class ResourceContext_ensureCompatibleAcceptHeader_ContractTest
@Mock HttpHeaders mockHttpHeaders;
@Mock HttpServletRequest mockHttpServletRequest;
@Mock ServletContext mockServletContext;
- @Mock IsisSessionFactory mockIsisSessionFactory;
+ @Mock IsisInteractionFactory mockIsisSessionFactory;
@Mock IsisSession mockIsisSession;
@Mock AuthenticationSession mockAuthenticationSession;
@Mock SpecificationLoader mockSpecificationLoader;
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 0da88a9..62263c4 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
@@ -39,7 +39,7 @@ import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
import org.apache.isis.core.runtime.session.IsisSession;
-import org.apache.isis.core.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisInteractionFactory;
import org.apache.isis.core.runtime.session.IsisSessionTracker;
import org.apache.isis.core.security.authentication.AuthenticationSession;
import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
@@ -56,7 +56,7 @@ public class ResourceContext_getArg_Test {
@Mock HttpServletRequest mockHttpServletRequest;
@Mock ServletContext mockServletContext;
@Mock IsisSession mockIsisSession;
- @Mock IsisSessionFactory mockIsisSessionFactory;
+ @Mock IsisInteractionFactory mockIsisSessionFactory;
@Mock IsisSessionTracker mockIsisSessionTracker;
@Mock AuthenticationManager mockAuthenticationManager;
@Mock AuthenticationSession mockAuthenticationSession;
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 12394ee..3559cad 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.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisInteractionFactory;
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 IsisSessionFactory isisSessionFactory;
+ @Inject @Getter private IsisInteractionFactory isisSessionFactory;
}
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 6385a81..cc33027 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
@@ -24,7 +24,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.core.config.viewer.wicket.WebAppContextPath;
-import org.apache.isis.core.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisInteractionFactory;
import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import org.apache.isis.viewer.wicket.model.common.CommonContextUtils;
@@ -40,7 +40,7 @@ public abstract class WebPageBase extends WebPage implements IsisWebAppCommonCon
private transient WebAppContextPath webAppContextPath;
private transient PageClassRegistry pageClassRegistry;
private transient IsisWebAppCommonContext commonContext;
- private transient IsisSessionFactory isisSessionFactory;
+ private transient IsisInteractionFactory isisSessionFactory;
protected WebPageBase(PageParameters parameters) {
super(parameters);
@@ -67,8 +67,8 @@ public abstract class WebPageBase extends WebPage implements IsisWebAppCommonCon
return pageClassRegistry = computeIfAbsent(PageClassRegistry.class, pageClassRegistry);
}
- public IsisSessionFactory getIsisSessionFactory() {
- return isisSessionFactory = computeIfAbsent(IsisSessionFactory.class, isisSessionFactory);
+ public IsisInteractionFactory getIsisSessionFactory() {
+ return isisSessionFactory = computeIfAbsent(IsisInteractionFactory.class, isisSessionFactory);
}
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 b31aa7e..1d458aa 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
@@ -22,7 +22,7 @@ import org.apache.wicket.validation.IValidatable;
import org.apache.wicket.validation.ValidationError;
import org.apache.isis.applib.services.userreg.UserRegistrationService;
-import org.apache.isis.core.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisInteractionFactory;
import org.apache.isis.viewer.wicket.ui.validation.ValidatorBase;
import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
@@ -63,7 +63,7 @@ public class EmailAvailableValidator extends ValidatorBase<String> {
.lookupServiceElseFail(UserRegistrationService.class);
val isisSessionFactory = super.getCommonContext()
- .lookupServiceElseFail(IsisSessionFactory.class);
+ .lookupServiceElseFail(IsisInteractionFactory.class);
isisSessionFactory.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 9331e1a..c887d1d 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
@@ -22,7 +22,7 @@ import org.apache.wicket.validation.IValidatable;
import org.apache.wicket.validation.ValidationError;
import org.apache.isis.applib.services.userreg.UserRegistrationService;
-import org.apache.isis.core.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisInteractionFactory;
import org.apache.isis.viewer.wicket.ui.validation.ValidatorBase;
import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
@@ -51,7 +51,7 @@ public class UsernameAvailableValidator extends ValidatorBase<String> {
.lookupServiceElseFail(UserRegistrationService.class);
val isisSessionFactory = super.getCommonContext()
- .lookupServiceElseFail(IsisSessionFactory.class);
+ .lookupServiceElseFail(IsisInteractionFactory.class);
isisSessionFactory.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 ce838bd..c65a41a 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.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisInteractionFactory;
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 IsisSessionFactory isisSessionFactory;
+ @Inject private transient IsisInteractionFactory isisSessionFactory;
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 b1b76ad..c066048 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.core.commons.collections.Can;
-import org.apache.isis.core.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisInteractionFactory;
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 IsisSessionFactory isisSessionFactory;
+ @Inject transient IsisInteractionFactory isisSessionFactory;
@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 cb2588c..018e8cb 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.persistence.session.PersistenceSession;
import org.apache.isis.core.runtime.session.IsisRequestCycle;
import org.apache.isis.core.runtime.session.IsisSession;
-import org.apache.isis.core.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisInteractionFactory;
import org.apache.isis.core.security.authentication.AuthenticationSession;
import org.apache.isis.core.security.authentication.MessageBroker;
import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
@@ -484,8 +484,8 @@ implements FormExecutor {
return getCommonContext().getSpecificationLoader();
}
- protected IsisSessionFactory getIsisSessionFactory() {
- return getCommonContext().lookupServiceElseFail(IsisSessionFactory.class);
+ protected IsisInteractionFactory getIsisSessionFactory() {
+ return getCommonContext().lookupServiceElseFail(IsisInteractionFactory.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 ecdb600..71759b4 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
@@ -31,7 +31,7 @@ import org.apache.isis.applib.services.userreg.EmailNotificationService;
import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.core.config.viewer.wicket.WebAppContextPath;
import org.apache.isis.core.metamodel.context.MetaModelContext;
-import org.apache.isis.core.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisInteractionFactory;
import org.apache.isis.core.security.authentication.MessageBroker;
import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import org.apache.isis.viewer.wicket.model.common.CommonContextUtils;
@@ -61,7 +61,7 @@ public class PanelBase<T> extends GenericPanel<T> implements IsisWebAppCommonCon
private transient ImageResourceCache imageCache;
private transient MetaModelContext metaModelContext;
private transient IsisWebAppCommonContext commonContext;
- private transient IsisSessionFactory isisSessionFactory;
+ private transient IsisInteractionFactory isisSessionFactory;
private transient TranslationService translationService;
private transient LocaleProvider localeProvider;
private transient TreeThemeProvider treeThemeProvider;
@@ -106,8 +106,8 @@ public class PanelBase<T> extends GenericPanel<T> implements IsisWebAppCommonCon
return metaModelContext = computeIfAbsent(MetaModelContext.class, metaModelContext);
}
- public IsisSessionFactory getIsisSessionFactory() {
- return isisSessionFactory = computeIfAbsent(IsisSessionFactory.class, isisSessionFactory);
+ public IsisInteractionFactory getIsisSessionFactory() {
+ return isisSessionFactory = computeIfAbsent(IsisInteractionFactory.class, isisSessionFactory);
}
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 531cbfe..514f24e 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
@@ -32,7 +32,7 @@ import org.apache.isis.applib.clock.Clock;
import org.apache.isis.applib.services.clock.ClockService;
import org.apache.isis.applib.services.session.SessionLoggingService;
import org.apache.isis.core.commons.collections.Can;
-import org.apache.isis.core.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisInteractionFactory;
import org.apache.isis.core.security.authentication.AuthenticationRequest;
import org.apache.isis.core.security.authentication.AuthenticationRequestPassword;
import org.apache.isis.core.security.authentication.AuthenticationSession;
@@ -266,8 +266,8 @@ implements BreadcrumbModelProvider, BookmarkedPagesModelProvider, IsisWebAppComm
return commonContext.getServiceRegistry().select(SessionLoggingService.class);
}
- protected IsisSessionFactory getIsisSessionFactory() {
- return commonContext.lookupServiceElseFail(IsisSessionFactory.class);
+ protected IsisInteractionFactory getIsisSessionFactory() {
+ return commonContext.lookupServiceElseFail(IsisInteractionFactory.class);
}
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 1a4825a..fa724d7 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,7 +35,7 @@ import org.apache.wicket.model.IModel;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.core.commons.internal.base._Casts;
import org.apache.isis.core.commons.internal.base._Strings;
-import org.apache.isis.core.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisInteractionFactory;
import org.apache.isis.core.runtime.session.IsisSessionTracker;
import org.apache.isis.core.runtime.session.init.InitialisationSession;
import org.apache.isis.viewer.wicket.viewer.wicketapp.IsisWicketApplication;
@@ -49,7 +49,7 @@ import lombok.val;
public class LocalizerForIsis extends Localizer {
@Inject private IsisSessionTracker isisSessionTracker;
- @Inject private IsisSessionFactory isisSessionFactory;
+ @Inject private IsisInteractionFactory isisSessionFactory;
@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 72968f9..3d8d2ff 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.session.IsisRequestCycle;
import org.apache.isis.core.runtime.session.IsisSession;
-import org.apache.isis.core.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisInteractionFactory;
import org.apache.isis.core.security.authentication.AuthenticationSession;
import org.apache.isis.core.security.authentication.MessageBroker;
import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
@@ -106,7 +106,7 @@ public class WebRequestCycleForIsis implements IRequestCycleListener {
}
val isisRequestCycle = IsisRequestCycle.next(
- commonContext.lookupServiceElseFail(IsisSessionFactory.class),
+ commonContext.lookupServiceElseFail(IsisInteractionFactory.class),
commonContext.createTransactionTemplate());
requestCycle.setMetaData(REQ_CYCLE_HANDLE_KEY, isisRequestCycle);
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 c4af99e..b95f9b1 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
@@ -39,8 +39,8 @@ import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.services.session.SessionLoggingService;
import org.apache.isis.core.commons.collections.Can;
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.core.runtime.session.IsisSessionFactory;
-import org.apache.isis.core.runtime.session.IsisSessionFactory.ThrowingRunnable;
+import org.apache.isis.core.runtime.session.IsisInteractionFactory;
+import org.apache.isis.core.runtime.session.IsisInteractionFactory.ThrowingRunnable;
import org.apache.isis.core.runtime.session.IsisSessionTracker;
import org.apache.isis.core.runtime.session.init.InitialisationSession;
import org.apache.isis.core.security.authentication.AuthenticationRequest;
@@ -63,7 +63,7 @@ public class AuthenticatedWebSessionForIsis_Authenticate {
private AuthenticationManager authMgr;
@Mock protected Authenticator mockAuthenticator;
@Mock protected IsisWebAppCommonContext mockCommonContext;
- @Mock protected IsisSessionFactory mockIsisSessionFactory;
+ @Mock protected IsisInteractionFactory mockIsisSessionFactory;
@Mock protected IsisSessionTracker mockIsisSessionTracker;
@Mock protected ServiceRegistry mockServiceRegistry;
@@ -81,7 +81,7 @@ public class AuthenticatedWebSessionForIsis_Authenticate {
allowing(mockServiceRegistry).select(SessionLoggingService.class);
will(returnValue(Can.empty()));
- allowing(mockCommonContext).lookupServiceElseFail(IsisSessionFactory.class);
+ allowing(mockCommonContext).lookupServiceElseFail(IsisInteractionFactory.class);
will(returnValue(mockIsisSessionFactory));
allowing(mockCommonContext).getIsisSessionTracker();
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 cf7d78c..9f42ae4 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
@@ -36,8 +36,8 @@ import static org.junit.Assert.assertThat;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.services.session.SessionLoggingService;
import org.apache.isis.core.commons.collections.Can;
-import org.apache.isis.core.runtime.session.IsisSessionFactory;
-import org.apache.isis.core.runtime.session.IsisSessionFactory.ThrowingRunnable;
+import org.apache.isis.core.runtime.session.IsisInteractionFactory;
+import org.apache.isis.core.runtime.session.IsisInteractionFactory.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 IsisWebAppCommonContext mockCommonContext;
- @Mock protected IsisSessionFactory mockIsisSessionFactory;
+ @Mock protected IsisInteractionFactory mockIsisSessionFactory;
@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(IsisSessionFactory.class);
+ allowing(mockCommonContext).lookupServiceElseFail(IsisInteractionFactory.class);
will(returnValue(mockIsisSessionFactory));
allowing(mockIsisSessionFactory)
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 736bc64..5190e8b 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
@@ -29,8 +29,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.session.IsisSessionFactory;
-import org.apache.isis.core.runtime.session.IsisSessionFactory.ThrowingRunnable;
+import org.apache.isis.core.runtime.session.IsisInteractionFactory;
+import org.apache.isis.core.runtime.session.IsisInteractionFactory.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 IsisWebAppCommonContext mockCommonContext;
- @Mock protected IsisSessionFactory mockIsisSessionFactory;
+ @Mock protected IsisInteractionFactory mockIsisSessionFactory;
@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(IsisSessionFactory.class);
+ allowing(mockCommonContext).lookupServiceElseFail(IsisInteractionFactory.class);
will(returnValue(mockIsisSessionFactory));
allowing(mockIsisSessionFactory).runAuthenticated(new InitialisationSession(), with(any(ThrowingRunnable.class)));