You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2021/06/09 14:10:36 UTC
[isis] 01/02: ISIS-2727: renames InteractionHandler to
InteractionService
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2727
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 4d1bf7007d83b65a0e848326dc882b4cf7975a05
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jun 9 14:50:40 2021 +0100
ISIS-2727: renames InteractionHandler to InteractionService
---
.../core/interaction/integration/IsisRequestCycle.java | 8 ++++----
.../isis/core/interaction/session/InteractionFactory.java | 2 +-
.../{InteractionHandler.java => InteractionService.java} | 2 +-
.../isis/core/runtime/context/RuntimeContextBase.java | 8 ++++----
.../command/CommandExecutorServiceDefault.java | 4 ++--
.../runtimeservices/factory/FactoryServiceDefault.java | 4 ++--
.../commandlog/jdo/entities/CommandJdo_retry.java | 4 ++--
.../viewer/vaadin/model/context/UiContextVaa.java | 4 ++--
.../vaadin/viewer/IsisModuleIncViewerVaadinViewer.java | 6 +++---
.../viewer/vaadin/viewer/IsisServletForVaadin.java | 14 +++++++-------
.../util/interaction/InteractionTestAbstract.java | 4 ++--
.../isis/security/keycloak/webmodule/KeycloakFilter.java | 6 +++---
.../security/spring/webmodule/SpringSecurityFilter.java | 6 +++---
.../fixtures/applib/services/FixturesLifecycleService.java | 4 ++--
.../integtestsupport/applib/IsisInteractionHandler.java | 4 ++--
.../isis/testing/integtestsupport/applib/_Helper.java | 4 ++--
...eContext_ensureCompatibleAcceptHeader_ContractTest.java | 6 +++---
.../webmodule/IsisRestfulObjectsInteractionFilter.java | 10 +++++-----
.../viewer/context/ResourceContext_getArg_Test.java | 6 +++---
.../ui/components/widgets/themepicker/ThemeChooser.java | 4 ++--
.../isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java | 4 ++--
.../isis/viewer/wicket/ui/panels/FormExecutorDefault.java | 4 ++--
.../viewer/integration/AuthenticatedWebSessionForIsis.java | 4 ++--
.../AuthenticatedWebSessionForIsis_Authenticate.java | 10 +++++-----
.../integration/AuthenticatedWebSessionForIsis_SignIn.java | 10 +++++-----
.../AuthenticatedWebSessionForIsis_TestAbstract.java | 8 ++++----
26 files changed, 75 insertions(+), 75 deletions(-)
diff --git a/core/interaction/src/main/java/org/apache/isis/core/interaction/integration/IsisRequestCycle.java b/core/interaction/src/main/java/org/apache/isis/core/interaction/integration/IsisRequestCycle.java
index abf2545..2b6484f 100644
--- a/core/interaction/src/main/java/org/apache/isis/core/interaction/integration/IsisRequestCycle.java
+++ b/core/interaction/src/main/java/org/apache/isis/core/interaction/integration/IsisRequestCycle.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.interaction.integration;
import org.apache.isis.applib.services.user.ImpersonatedUserHolder;
-import org.apache.isis.core.interaction.session.InteractionHandler;
+import org.apache.isis.core.interaction.session.InteractionService;
import org.apache.isis.core.security.authentication.Authentication;
import org.apache.isis.core.security.authentication.standard.SimpleAuthentication;
@@ -33,7 +33,7 @@ import lombok.val;
@RequiredArgsConstructor(staticName = "next")
public class IsisRequestCycle {
- private final InteractionHandler interactionHandler;
+ private final InteractionService interactionService;
private final ImpersonatedUserHolder impersonatedUserHolder;
// -- SUPPORTING WEB REQUEST CYCLE FOR ISIS ...
@@ -47,7 +47,7 @@ public class IsisRequestCycle {
authentication.getValidationCode()))
.orElse(authentication);
- interactionHandler.openInteraction(authenticationToUse.getInteractionContext());
+ interactionService.openInteraction(authenticationToUse.getInteractionContext());
}
public void onRequestHandlerExecuted() {
@@ -56,7 +56,7 @@ public class IsisRequestCycle {
public void onEndRequest() {
- interactionHandler.closeInteractionLayers();
+ interactionService.closeInteractionLayers();
}
diff --git a/core/interaction/src/main/java/org/apache/isis/core/interaction/session/InteractionFactory.java b/core/interaction/src/main/java/org/apache/isis/core/interaction/session/InteractionFactory.java
index 30e7f87..a535723 100644
--- a/core/interaction/src/main/java/org/apache/isis/core/interaction/session/InteractionFactory.java
+++ b/core/interaction/src/main/java/org/apache/isis/core/interaction/session/InteractionFactory.java
@@ -41,7 +41,7 @@ import lombok.NonNull;
* @since 2.0 {@index}
*/
public interface InteractionFactory
-extends AnonymousInteractionFactory, InteractionHandler {
+extends AnonymousInteractionFactory, InteractionService {
/**
* As per {@link #call(InteractionContext, Callable)}, using the {@link InteractionContext}
diff --git a/core/interaction/src/main/java/org/apache/isis/core/interaction/session/InteractionHandler.java b/core/interaction/src/main/java/org/apache/isis/core/interaction/session/InteractionService.java
similarity index 98%
rename from core/interaction/src/main/java/org/apache/isis/core/interaction/session/InteractionHandler.java
rename to core/interaction/src/main/java/org/apache/isis/core/interaction/session/InteractionService.java
index f121530..72b253a 100644
--- a/core/interaction/src/main/java/org/apache/isis/core/interaction/session/InteractionHandler.java
+++ b/core/interaction/src/main/java/org/apache/isis/core/interaction/session/InteractionService.java
@@ -8,7 +8,7 @@ import org.apache.isis.core.security.authentication.Authentication;
import lombok.NonNull;
-public interface InteractionHandler {
+public interface InteractionService {
/**
* If present, reuses the current top level {@link InteractionLayer}, otherwise creates a new
* anonymous one.
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 4f700cb..41b9c4c 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
@@ -25,7 +25,7 @@ import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.core.interaction.session.InteractionFactory;
-import org.apache.isis.core.interaction.session.InteractionHandler;
+import org.apache.isis.core.interaction.session.InteractionService;
import org.apache.isis.core.interaction.session.InteractionTracker;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.objectmanager.ObjectManager;
@@ -52,7 +52,7 @@ public abstract class RuntimeContextBase implements RuntimeContext {
@Getter(onMethod = @__(@Override)) protected final SpecificationLoader specificationLoader;
@Getter(onMethod = @__(@Override)) protected final InteractionTracker interactionTracker;
- @Getter protected final InteractionHandler interactionHandler;
+ @Getter protected final InteractionService interactionService;
@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.interactionHandler = serviceRegistry.lookupServiceElseFail(InteractionFactory.class);
+ this.interactionService = serviceRegistry.lookupServiceElseFail(InteractionFactory.class);
this.authenticationManager = serviceRegistry.lookupServiceElseFail(AuthenticationManager.class);
this.interactionTracker = serviceRegistry.lookupServiceElseFail(InteractionTracker.class);
}
@@ -90,7 +90,7 @@ public abstract class RuntimeContextBase implements RuntimeContext {
.ifPresent(authentication->{
authenticationManager.closeSession(authentication);
- interactionHandler.closeInteractionLayers();
+ interactionService.closeInteractionLayers();
});
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 3b48317..25e47e5 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
@@ -52,7 +52,7 @@ import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.functional.Result;
import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.commons.internal.exceptions._Exceptions;
-import org.apache.isis.core.interaction.session.InteractionHandler;
+import org.apache.isis.core.interaction.session.InteractionService;
import org.apache.isis.core.interaction.session.InteractionTracker;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.facets.actions.action.invocation.CommandUtil;
@@ -101,7 +101,7 @@ public class CommandExecutorServiceDefault implements CommandExecutorService {
@Inject final InteractionTracker isisInteractionTracker;
@Inject final Provider<InteractionProvider> interactionProviderProvider;
- @Inject @Getter final InteractionHandler interactionHandler;
+ @Inject @Getter final InteractionService interactionService;
@Inject @Getter final SpecificationLoader specificationLoader;
@Override
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 df1ed3f..7c0dc5a 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
@@ -40,7 +40,7 @@ import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.commons.internal.reflection._Reflect;
import org.apache.isis.core.config.environment.IsisSystemEnvironment;
-import org.apache.isis.core.interaction.session.InteractionHandler;
+import org.apache.isis.core.interaction.session.InteractionService;
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;
@@ -56,7 +56,7 @@ import lombok.val;
@Qualifier("Default")
public class FactoryServiceDefault implements FactoryService {
- @Inject InteractionHandler interactionHandler; // dependsOn
+ @Inject InteractionService interactionService; // dependsOn
@Inject private SpecificationLoader specificationLoader;
@Inject private ServiceInjector serviceInjector;
@Inject private IsisSystemEnvironment isisSystemEnvironment;
diff --git a/extensions/core/command-log/jdo/src/main/java/org/apache/isis/extensions/commandlog/jdo/entities/CommandJdo_retry.java b/extensions/core/command-log/jdo/src/main/java/org/apache/isis/extensions/commandlog/jdo/entities/CommandJdo_retry.java
index 4b8bb12..41edd6a 100644
--- a/extensions/core/command-log/jdo/src/main/java/org/apache/isis/extensions/commandlog/jdo/entities/CommandJdo_retry.java
+++ b/extensions/core/command-log/jdo/src/main/java/org/apache/isis/extensions/commandlog/jdo/entities/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.interaction.session.InteractionHandler;
+import org.apache.isis.core.interaction.session.InteractionService;
import org.apache.isis.extensions.commandlog.jdo.IsisModuleExtCommandLogJdo;
import org.apache.isis.extensions.commandlog.model.command.ReplayState;
@@ -59,7 +59,7 @@ public class CommandJdo_retry {
return commandJdo;
}
- @Inject InteractionHandler interactionHandler;
+ @Inject InteractionService interactionService;
@Inject TransactionService transactionService;
@Inject CommandExecutorService commandExecutorService;
@Inject RepositoryService repositoryService;
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 7145182..1341555 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
@@ -24,14 +24,14 @@ import java.util.function.Supplier;
import com.vaadin.flow.component.Component;
-import org.apache.isis.core.interaction.session.InteractionHandler;
+import org.apache.isis.core.interaction.session.InteractionService;
import org.apache.isis.core.metamodel.spec.ManagedObject;
public interface UiContextVaa {
//JavaFxViewerConfig getJavaFxViewerConfig();
- InteractionHandler getIsisInteractionFactory();
+ InteractionService getIsisInteractionFactory();
//ActionUiModelFactoryFx getActionUiModelFactory();
void setNewPageHandler(Consumer<Component> onNewPage);
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 9eb66a1..022e738 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.interaction.session.InteractionHandler;
+import org.apache.isis.core.interaction.session.InteractionService;
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 InteractionHandler interactionHandler;
+ @Inject private InteractionService interactionService;
/**
* Creates a {@link ServletContextInitializer} instance.
@@ -99,7 +99,7 @@ public class IsisModuleIncViewerVaadinViewer {
makeContextRelative(urlMapping.replace("*", "")));
}
val registration = new ServletRegistrationBean<SpringServlet>(
- new IsisServletForVaadin(interactionHandler, context, isRootMapping),
+ new IsisServletForVaadin(interactionService, context, isRootMapping),
urlMapping);
registration.setInitParameters(initParameters);
registration.setAsyncSupported(configurationProperties.isAsyncSupported());
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 8457156..db1b6a0 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.applib.services.iactn.Interaction;
-import org.apache.isis.core.interaction.session.InteractionHandler;
+import org.apache.isis.core.interaction.session.InteractionService;
import org.apache.isis.incubator.viewer.vaadin.ui.auth.AuthSessionStoreUtil;
import lombok.NonNull;
@@ -47,14 +47,14 @@ extends SpringServlet {
private static final long serialVersionUID = 1L;
- private final InteractionHandler interactionHandler;
+ private final InteractionService interactionService;
public IsisServletForVaadin(
- @NonNull final InteractionHandler interactionHandler,
+ @NonNull final InteractionService interactionService,
@NonNull final ApplicationContext context,
final boolean forwardingEnforced) {
super(context, forwardingEnforced);
- this.interactionHandler = interactionHandler;
+ this.interactionService = interactionService;
}
@@ -68,7 +68,7 @@ extends SpringServlet {
log.debug("new request incoming (authentication={})", authentication);
if(authentication!=null) {
- interactionHandler.runAuthenticated(authentication, ()->{
+ interactionService.runAuthenticated(authentication, ()->{
super.service(request, response);
});
} else {
@@ -79,8 +79,8 @@ extends SpringServlet {
log.debug("request was successfully serviced (authentication={})", authentication);
- if(interactionHandler.isInInteraction()) {
- interactionHandler.closeInteractionLayers();
+ if(interactionService.isInInteraction()) {
+ interactionService.closeInteractionLayers();
log.warn("after servicing current request some interactions have been closed forcefully (authentication={})", authentication);
}
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/util/interaction/InteractionTestAbstract.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/util/interaction/InteractionTestAbstract.java
index 373fa62..c2657e8 100644
--- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/util/interaction/InteractionTestAbstract.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/util/interaction/InteractionTestAbstract.java
@@ -37,7 +37,7 @@ import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.commons.internal.collections._Sets;
-import org.apache.isis.core.interaction.session.InteractionHandler;
+import org.apache.isis.core.interaction.session.InteractionService;
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;
@@ -53,7 +53,7 @@ import lombok.val;
public abstract class InteractionTestAbstract extends IsisIntegrationTestAbstract {
@Inject protected ObjectManager objectManager;
- @Inject protected InteractionHandler interactionHandler;
+ @Inject protected InteractionService interactionService;
@Inject protected WrapperFactory wrapper;
@Inject protected KVStoreForTesting kvStoreForTesting;
@Inject private javax.inject.Provider<EntityChangeTracker> entityChangeTrackerProvider;
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 d801f42..e8ff349 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.interaction.session.InteractionHandler;
+import org.apache.isis.core.interaction.session.InteractionService;
import org.apache.isis.core.security.authentication.Authentication;
import org.apache.isis.core.security.authentication.standard.SimpleAuthentication;
@@ -46,7 +46,7 @@ import lombok.val;
*/
public class KeycloakFilter implements Filter {
- @Autowired private InteractionHandler interactionHandler;
+ @Autowired private InteractionService interactionService;
@Override
public void doFilter(
@@ -69,7 +69,7 @@ public class KeycloakFilter implements Filter {
val authentication = SimpleAuthentication.of(user, subjectHeader);
authentication.setType(Authentication.Type.EXTERNAL);
- interactionHandler.runAuthenticated(
+ interactionService.runAuthenticated(
authentication,
()->{
filterChain.doFilter(servletRequest, servletResponse);
diff --git a/security/spring/src/main/java/org/apache/isis/security/spring/webmodule/SpringSecurityFilter.java b/security/spring/src/main/java/org/apache/isis/security/spring/webmodule/SpringSecurityFilter.java
index 173cb0e..0cc50eb 100644
--- a/security/spring/src/main/java/org/apache/isis/security/spring/webmodule/SpringSecurityFilter.java
+++ b/security/spring/src/main/java/org/apache/isis/security/spring/webmodule/SpringSecurityFilter.java
@@ -33,7 +33,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.context.SecurityContextHolder;
import org.apache.isis.applib.services.user.UserMemento;
-import org.apache.isis.core.interaction.session.InteractionHandler;
+import org.apache.isis.core.interaction.session.InteractionService;
import org.apache.isis.core.security.authentication.Authentication;
import org.apache.isis.core.security.authentication.standard.SimpleAuthentication;
import org.apache.isis.security.spring.authconverters.AuthenticationConverter;
@@ -47,7 +47,7 @@ import lombok.extern.log4j.Log4j2;
@Log4j2
public class SpringSecurityFilter implements Filter {
- @Autowired private InteractionHandler interactionHandler;
+ @Autowired private InteractionService interactionService;
@Override
public void doFilter(
@@ -86,7 +86,7 @@ public class SpringSecurityFilter implements Filter {
val authentication = SimpleAuthentication.validOf(userMemento);
authentication.setType(Authentication.Type.EXTERNAL);
- interactionHandler.runAuthenticated(
+ interactionService.runAuthenticated(
authentication,
()->{
filterChain.doFilter(servletRequest, servletResponse);
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 0d98961..19801ac 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
@@ -33,7 +33,7 @@ import org.apache.isis.applib.annotation.OrderPrecedence;
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.interaction.session.InteractionHandler;
+import org.apache.isis.core.interaction.session.InteractionService;
import org.apache.isis.core.metamodel.events.MetamodelEvent;
import org.apache.isis.testing.fixtures.applib.clock.clock.Clock;
import org.apache.isis.testing.fixtures.applib.clock.clock.FixtureClock;
@@ -56,7 +56,7 @@ public class FixturesLifecycleService {
@SuppressWarnings("unused")
@Inject
- private InteractionHandler interactionHandler; // depends on relationship
+ private InteractionService interactionService; // 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 bf5b655..37c3d6c 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
@@ -22,7 +22,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.interaction.session.InteractionHandler;
+import org.apache.isis.core.interaction.session.InteractionService;
/**
* @since 2.0 {@index}
@@ -38,7 +38,7 @@ public class IsisInteractionHandler implements BeforeEachCallback, AfterEachCall
@Override
public void afterEach(ExtensionContext extensionContext) throws Exception {
_Helper.getInteractionFactory(extensionContext)
- .ifPresent(InteractionHandler::closeInteractionLayers);
+ .ifPresent(InteractionService::closeInteractionLayers);
}
diff --git a/testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/_Helper.java b/testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/_Helper.java
index 85cc9f6..de4a14a 100644
--- a/testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/_Helper.java
+++ b/testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/_Helper.java
@@ -25,7 +25,7 @@ import org.junit.jupiter.api.extension.ExtensionContext;
import org.apache.isis.applib.services.exceprecog.ExceptionRecognizerService;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.core.interaction.session.InteractionFactory;
-import org.apache.isis.core.interaction.session.InteractionHandler;
+import org.apache.isis.core.interaction.session.InteractionService;
class _Helper {
@@ -38,7 +38,7 @@ class _Helper {
// -- SHORTCUTS
- static Optional<InteractionHandler> getInteractionFactory(final ExtensionContext extensionContext) {
+ static Optional<InteractionService> getInteractionFactory(final ExtensionContext extensionContext) {
return getServiceRegistry(extensionContext)
.flatMap(serviceRegistry->serviceRegistry.lookupService(InteractionFactory.class));
}
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 8e3c894..1311e74 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
@@ -39,7 +39,7 @@ import org.springframework.web.context.WebApplicationContext;
import org.apache.isis.applib.services.iactn.Interaction;
import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.core.interaction.session.InteractionHandler;
+import org.apache.isis.core.interaction.session.InteractionService;
import org.apache.isis.core.interaction.session.InteractionTracker;
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.metamodel._testing.MetaModelContext_forTesting;
@@ -65,7 +65,7 @@ public abstract class ResourceContext_ensureCompatibleAcceptHeader_ContractTest
@Mock HttpHeaders mockHttpHeaders;
@Mock HttpServletRequest mockHttpServletRequest;
@Mock ServletContext mockServletContext;
- @Mock InteractionHandler mockInteractionHandler;
+ @Mock InteractionService mockInteractionService;
@Mock Interaction mockInteraction;
@Mock Authentication mockAuthentication;
@Mock SpecificationLoader mockSpecificationLoader;
@@ -85,7 +85,7 @@ public abstract class ResourceContext_ensureCompatibleAcceptHeader_ContractTest
.authentication(mockAuthentication)
.singleton(mockAuthenticationManager)
.singleton(mockIsisInteractionTracker)
- .singleton(mockInteractionHandler)
+ .singleton(mockInteractionService)
.build();
context.checking(new Expectations() {
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 bef0460..c59ecd1 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.base._Strings;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.commons.internal.factory._InstanceUtil;
-import org.apache.isis.core.interaction.session.InteractionHandler;
+import org.apache.isis.core.interaction.session.InteractionService;
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;
@@ -157,7 +157,7 @@ public class IsisRestfulObjectsInteractionFilter implements Filter {
return Pattern.compile(".*\\." + input);
};
- @Autowired private InteractionHandler interactionHandler;
+ @Autowired private InteractionService interactionService;
@Autowired private SpecificationLoader specificationLoader;
@Autowired private TransactionService transactionService;
@@ -344,7 +344,7 @@ public class IsisRestfulObjectsInteractionFilter implements Filter {
@Override
public void doFilter(final ServletRequest request, final ServletResponse response, final FilterChain chain) throws IOException, ServletException {
- requires(interactionHandler, "isisInteractionFactory");
+ requires(interactionService, "isisInteractionFactory");
requires(specificationLoader, "specificationLoader");
ensureMetamodelIsValid(specificationLoader);
@@ -379,7 +379,7 @@ public class IsisRestfulObjectsInteractionFilter implements Filter {
authStrategy.bind(httpServletRequest, httpServletResponse, authentication);
- interactionHandler.runAuthenticated(
+ interactionService.runAuthenticated(
authentication,
()->{
@@ -406,7 +406,7 @@ public class IsisRestfulObjectsInteractionFilter implements Filter {
}
} finally {
- interactionHandler.closeInteractionLayers();
+ interactionService.closeInteractionLayers();
}
}
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 0ab4fb8..0daee94 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
@@ -32,7 +32,7 @@ import org.junit.Test;
import org.springframework.web.context.WebApplicationContext;
import org.apache.isis.commons.internal.codec._UrlDecoderUtil;
-import org.apache.isis.core.interaction.session.InteractionHandler;
+import org.apache.isis.core.interaction.session.InteractionService;
import org.apache.isis.core.interaction.session.InteractionTracker;
import org.apache.isis.core.interaction.session.IsisInteraction;
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2;
@@ -55,7 +55,7 @@ public class ResourceContext_getArg_Test {
@Mock private HttpServletRequest mockHttpServletRequest;
@Mock private ServletContext mockServletContext;
@Mock private IsisInteraction mockIsisInteraction;
- @Mock private InteractionHandler mockInteractionHandler;
+ @Mock private InteractionService mockInteractionService;
@Mock private InteractionTracker mockIsisInteractionTracker;
@Mock private AuthenticationManager mockAuthenticationManager;
@Mock private Authentication mockAuthentication;
@@ -72,7 +72,7 @@ public class ResourceContext_getArg_Test {
metaModelContext = MetaModelContext_forTesting.builder()
.specificationLoader(mockSpecificationLoader)
- .singleton(mockInteractionHandler)
+ .singleton(mockInteractionService)
.singleton(mockAuthenticationManager)
.singleton(mockIsisInteractionTracker)
// .serviceInjector(mockServiceInjector)
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 502e529..92a2be9 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.interaction.session.InteractionHandler;
+import org.apache.isis.core.interaction.session.InteractionService;
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 InteractionHandler interactionHandler;
+ @Inject @Getter private InteractionService interactionService;
}
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 514bb71..48fc657 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.interaction.session.InteractionHandler;
+import org.apache.isis.core.interaction.session.InteractionService;
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 InteractionHandler interactionHandler;
+ @Inject transient InteractionService interactionService;
@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 2457ab6..005f447 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
@@ -41,7 +41,7 @@ import org.apache.isis.applib.services.message.MessageService;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.commons.internal.collections._Sets;
import org.apache.isis.core.interaction.session.InteractionFactory;
-import org.apache.isis.core.interaction.session.InteractionHandler;
+import org.apache.isis.core.interaction.session.InteractionService;
import org.apache.isis.core.interaction.session.MessageBroker;
import org.apache.isis.core.metamodel.facets.actions.redirect.RedirectFacet;
import org.apache.isis.core.metamodel.facets.properties.renderunchanged.UnchangingFacet;
@@ -430,7 +430,7 @@ implements FormExecutor {
return getCommonContext().getSpecificationLoader();
}
- protected InteractionHandler getIsisInteractionFactory() {
+ protected InteractionService getIsisInteractionFactory() {
return getCommonContext().lookupServiceElseFail(InteractionFactory.class);
}
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 6b371b7..b1ab077 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.services.clock.ClockService;
import org.apache.isis.applib.services.session.SessionLoggingService;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.core.interaction.session.InteractionFactory;
-import org.apache.isis.core.interaction.session.InteractionHandler;
+import org.apache.isis.core.interaction.session.InteractionService;
import org.apache.isis.core.interaction.session.InteractionTracker;
import org.apache.isis.core.runtime.context.IsisAppCommonContext;
import org.apache.isis.core.runtime.context.IsisAppCommonContext.HasCommonContext;
@@ -269,7 +269,7 @@ implements BreadcrumbModelProvider, BookmarkedPagesModelProvider, HasCommonConte
return commonContext.getServiceRegistry().select(SessionLoggingService.class);
}
- protected InteractionHandler getIsisInteractionFactory() {
+ protected InteractionService getIsisInteractionFactory() {
return commonContext.lookupServiceElseFail(InteractionFactory.class);
}
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 43d4134..861d241 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
@@ -34,7 +34,7 @@ import org.apache.isis.applib.services.session.SessionLoggingService;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.applib.services.iactnlayer.ThrowingRunnable;
import org.apache.isis.core.interaction.session.InteractionFactory;
-import org.apache.isis.core.interaction.session.InteractionHandler;
+import org.apache.isis.core.interaction.session.InteractionService;
import org.apache.isis.core.interaction.session.InteractionTracker;
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.runtime.context.IsisAppCommonContext;
@@ -63,7 +63,7 @@ public class AuthenticatedWebSessionForIsis_Authenticate {
private AuthenticationManager authMgr;
@Mock protected Authenticator mockAuthenticator;
@Mock protected IsisAppCommonContext mockCommonContext;
- @Mock protected InteractionHandler mockInteractionHandler;
+ @Mock protected InteractionService mockInteractionService;
@Mock protected InteractionTracker mockInteractionTracker;
@Mock protected ServiceRegistry mockServiceRegistry;
@@ -85,7 +85,7 @@ public class AuthenticatedWebSessionForIsis_Authenticate {
will(returnValue(Can.empty()));
allowing(mockCommonContext).lookupServiceElseFail(InteractionFactory.class);
- will(returnValue(mockInteractionHandler));
+ will(returnValue(mockInteractionService));
allowing(mockCommonContext).getInteractionTracker();
will(returnValue(mockInteractionTracker));
@@ -93,10 +93,10 @@ public class AuthenticatedWebSessionForIsis_Authenticate {
allowing(mockInteractionTracker).currentAuthentication();
will(returnValue(Optional.of(new SingleUserAuthentication())));
- allowing(mockInteractionHandler)
+ allowing(mockInteractionService)
.runAuthenticated(with(new SingleUserAuthentication()), with(any(ThrowingRunnable.class)));
- allowing(mockInteractionHandler)
+ allowing(mockInteractionService)
.runAnonymous(with(any(ThrowingRunnable.class)));
// ignore
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 3b28564..7bfb8f9 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
@@ -34,7 +34,7 @@ import org.apache.isis.applib.services.session.SessionLoggingService;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.applib.services.iactnlayer.ThrowingRunnable;
import org.apache.isis.core.interaction.session.InteractionFactory;
-import org.apache.isis.core.interaction.session.InteractionHandler;
+import org.apache.isis.core.interaction.session.InteractionService;
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.runtime.context.IsisAppCommonContext;
import org.apache.isis.core.security.authentication.AuthenticationRequest;
@@ -59,7 +59,7 @@ public class AuthenticatedWebSessionForIsis_SignIn {
private AuthenticationManager authMgr;
@Mock protected Authenticator mockAuthenticator;
@Mock protected IsisAppCommonContext mockCommonContext;
- @Mock protected InteractionHandler mockInteractionHandler;
+ @Mock protected InteractionService mockInteractionService;
@Mock protected ServiceRegistry mockServiceRegistry;
protected AuthenticatedWebSessionForIsis webSession;
@@ -83,12 +83,12 @@ public class AuthenticatedWebSessionForIsis_SignIn {
will(returnValue(Can.empty()));
allowing(mockCommonContext).lookupServiceElseFail(InteractionFactory.class);
- will(returnValue(mockInteractionHandler));
+ will(returnValue(mockInteractionService));
- allowing(mockInteractionHandler)
+ allowing(mockInteractionService)
.runAuthenticated(with(new SingleUserAuthentication()), with(any(ThrowingRunnable.class)));
- allowing(mockInteractionHandler)
+ allowing(mockInteractionService)
.runAnonymous(with(any(ThrowingRunnable.class)));
// ignore
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 4cec39a..7fe41fd 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
@@ -31,7 +31,7 @@ import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.services.session.SessionLoggingService;
import org.apache.isis.applib.services.iactnlayer.ThrowingRunnable;
import org.apache.isis.core.interaction.session.InteractionFactory;
-import org.apache.isis.core.interaction.session.InteractionHandler;
+import org.apache.isis.core.interaction.session.InteractionService;
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.core.runtime.context.IsisAppCommonContext;
@@ -46,7 +46,7 @@ public abstract class AuthenticatedWebSessionForIsis_TestAbstract {
@Mock protected Request mockRequest;
@Mock protected AuthenticationManager mockAuthMgr;
@Mock protected IsisAppCommonContext mockCommonContext;
- @Mock protected InteractionHandler mockInteractionHandler;
+ @Mock protected InteractionService mockInteractionService;
@Mock protected ServiceRegistry mockServiceRegistry;
protected AuthenticatedWebSessionForIsis webSession;
@@ -61,9 +61,9 @@ public abstract class AuthenticatedWebSessionForIsis_TestAbstract {
will(returnValue(Optional.empty()));
allowing(mockCommonContext).lookupServiceElseFail(InteractionFactory.class);
- will(returnValue(mockInteractionHandler));
+ will(returnValue(mockInteractionService));
- allowing(mockInteractionHandler).runAuthenticated(new SingleUserAuthentication(), with(any(ThrowingRunnable.class)));
+ allowing(mockInteractionService).runAuthenticated(new SingleUserAuthentication(), with(any(ThrowingRunnable.class)));
// ignore
// must provide explicit expectation, since Locale is final.