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 06:07:54 UTC
[isis] branch ISIS-2727 updated (79cb215 -> 88e39af)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch ISIS-2727
in repository https://gitbox.apache.org/repos/asf/isis.git.
from 79cb215 ISIS-2727: just renames some variables
new 0598994 ISIS-2727: moves ExecutionContext from services.iactn to services.iactnlayer
new e37c452 ISIS-2727: renames iactnlayer.ExecutionContext -> iactnlayer.InteractionContext
new 88e39af ISIS-2727: fixes javadoc is all
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../index/security/authentication/Authentication.adoc | 2 +-
.../org/apache/isis/applib/clock/VirtualClock.java | 8 ++++----
.../InteractionContext.java} | 11 ++++++-----
.../apache/isis/applib/services/sudo/SudoService.java | 16 ++++++++--------
.../applib/services/sudo/SudoServiceListener.java | 6 +++---
.../apache/isis/applib/services/user/UserService.java | 10 +++++-----
.../core/interaction/session/InteractionFactory.java | 2 +-
.../core/interaction/session/InteractionLayer.java | 4 ++--
.../core/interaction/session/InteractionTracker.java | 6 +++---
.../runtimeservices/clock/ClockServiceDefault.java | 4 ++--
.../runtimeservices/session/AnonymousSession.java | 8 ++++----
.../core/runtimeservices/sudo/SudoServiceDefault.java | 12 ++++++------
.../core/runtimeservices/user/UserServiceDefault.java | 4 ++--
.../wrapper/WrapperFactoryDefault.java | 4 ++--
.../core/security/authentication/Authentication.java | 14 +++++++-------
.../authentication/AuthenticationAbstract.java | 19 +++++++++----------
.../authentication/health/HealthAuthentication.java | 6 +++---
.../singleuser/SingleUserAuthentication.java | 6 +++---
.../authentication/standard/SimpleAuthentication.java | 8 ++++----
.../SimpleSessionEncodabilityTestAbstract.java | 14 +++++++-------
20 files changed, 82 insertions(+), 82 deletions(-)
rename api/applib/src/main/java/org/apache/isis/applib/services/{iactn/ExecutionContext.java => iactnlayer/InteractionContext.java} (87%)
[isis] 02/03: ISIS-2727: renames iactnlayer.ExecutionContext ->
iactnlayer.InteractionContext
Posted by da...@apache.org.
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 e37c452718c396898269bb0bcca3871d2696400c
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jun 9 07:06:02 2021 +0100
ISIS-2727: renames iactnlayer.ExecutionContext -> iactnlayer.InteractionContext
---
.../index/security/authentication/Authentication.adoc | 2 +-
.../org/apache/isis/applib/clock/VirtualClock.java | 4 ++--
...{ExecutionContext.java => InteractionContext.java} | 8 ++++----
.../apache/isis/applib/services/sudo/SudoService.java | 16 ++++++++--------
.../applib/services/sudo/SudoServiceListener.java | 6 +++---
.../apache/isis/applib/services/user/UserService.java | 10 +++++-----
.../core/interaction/session/InteractionLayer.java | 4 ++--
.../core/interaction/session/InteractionTracker.java | 6 +++---
.../runtimeservices/clock/ClockServiceDefault.java | 4 ++--
.../runtimeservices/session/AnonymousSession.java | 6 +++---
.../core/runtimeservices/sudo/SudoServiceDefault.java | 12 ++++++------
.../core/runtimeservices/user/UserServiceDefault.java | 4 ++--
.../wrapper/WrapperFactoryDefault.java | 4 ++--
.../core/security/authentication/Authentication.java | 14 +++++++-------
.../authentication/AuthenticationAbstract.java | 19 +++++++++----------
.../authentication/health/HealthAuthentication.java | 6 +++---
.../singleuser/SingleUserAuthentication.java | 6 +++---
.../authentication/standard/SimpleAuthentication.java | 8 ++++----
.../SimpleSessionEncodabilityTestAbstract.java | 14 +++++++-------
19 files changed, 76 insertions(+), 77 deletions(-)
diff --git a/antora/components/refguide-index/modules/core/pages/index/security/authentication/Authentication.adoc b/antora/components/refguide-index/modules/core/pages/index/security/authentication/Authentication.adoc
index 395288b..0ab2559 100644
--- a/antora/components/refguide-index/modules/core/pages/index/security/authentication/Authentication.adoc
+++ b/antora/components/refguide-index/modules/core/pages/index/security/authentication/Authentication.adoc
@@ -14,7 +14,7 @@ interface Authentication {
UserMemento getUser() // <.>
ExecutionContext getExecutionContext() // <.>
Type getType() // <.>
- Authentication withExecutionContext(ExecutionContext executionContext) // <.>
+ Authentication withExecutionContext(ExecutionContext interactionContext) // <.>
}
----
diff --git a/api/applib/src/main/java/org/apache/isis/applib/clock/VirtualClock.java b/api/applib/src/main/java/org/apache/isis/applib/clock/VirtualClock.java
index 5bfbdba..e01bf1d 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/clock/VirtualClock.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/clock/VirtualClock.java
@@ -34,7 +34,7 @@ import org.joda.time.DateTime;
import org.joda.time.DateTimeZone;
import org.apache.isis.applib.jaxb.JavaSqlXMLGregorianCalendarMarshalling;
-import org.apache.isis.applib.services.iactnlayer.ExecutionContext;
+import org.apache.isis.applib.services.iactnlayer.InteractionContext;
import org.apache.isis.applib.services.iactn.Interaction;
import lombok.NonNull;
@@ -45,7 +45,7 @@ import lombok.val;
* such that it allows an {@link Interaction}
* to run with its own simulated (or actual) time.
*
- * @see ExecutionContext
+ * @see InteractionContext
*
* @since 2.0 {@index}
*/
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/iactnlayer/ExecutionContext.java b/api/applib/src/main/java/org/apache/isis/applib/services/iactnlayer/InteractionContext.java
similarity index 91%
rename from api/applib/src/main/java/org/apache/isis/applib/services/iactnlayer/ExecutionContext.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/iactnlayer/InteractionContext.java
index dc8ea83..334d6c4 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/iactnlayer/ExecutionContext.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/iactnlayer/InteractionContext.java
@@ -40,7 +40,7 @@ import lombok.With;
*/
@Value @Builder
@RequiredArgsConstructor
-public class ExecutionContext implements Serializable {
+public class InteractionContext implements Serializable {
private static final long serialVersionUID = -220896735209733865L;
@@ -73,12 +73,12 @@ public class ExecutionContext implements Serializable {
// -- FACTORIES
/**
- * Creates a new {@link ExecutionContext} with the specified user and
+ * Creates a new {@link InteractionContext} with the specified user and
* system defaults for clock, locale and time-zone.
*/
- public static ExecutionContext ofUserWithSystemDefaults(
+ public static InteractionContext ofUserWithSystemDefaults(
final @NonNull UserMemento user) {
- return ExecutionContext.builder()
+ return InteractionContext.builder()
.user(user)
.clock(VirtualClock.system())
.locale(Locale.getDefault())
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/sudo/SudoService.java b/api/applib/src/main/java/org/apache/isis/applib/services/sudo/SudoService.java
index ece4c63..3744fa0 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/sudo/SudoService.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/sudo/SudoService.java
@@ -21,7 +21,7 @@ package org.apache.isis.applib.services.sudo;
import java.util.concurrent.Callable;
import java.util.function.UnaryOperator;
-import org.apache.isis.applib.services.iactnlayer.ExecutionContext;
+import org.apache.isis.applib.services.iactnlayer.InteractionContext;
import org.apache.isis.applib.services.user.RoleMemento;
import org.apache.isis.applib.services.user.UserService;
import org.apache.isis.commons.functional.ThrowingRunnable;
@@ -30,7 +30,7 @@ import lombok.NonNull;
/**
* Allows a block of code to be executed within an arbitrary
- * {@link ExecutionContext}, allowing the who, when and where to be temporarily
+ * {@link InteractionContext}, allowing the who, when and where to be temporarily
* switched.
*
* <p>
@@ -61,24 +61,24 @@ public interface SudoService {
/**
* Executes the supplied {@link Callable} block, within the provided
- * {@link ExecutionContext}.
+ * {@link InteractionContext}.
*
- * @param sudoMapper - maps the current {@link ExecutionContext} to the sudo one
+ * @param sudoMapper - maps the current {@link InteractionContext} to the sudo one
* @since 2.0
*/
<T> T call(
- final @NonNull UnaryOperator<ExecutionContext> sudoMapper,
+ final @NonNull UnaryOperator<InteractionContext> sudoMapper,
final @NonNull Callable<T> supplier);
/**
* Executes the supplied {@link Callable} block, within the provided
- * {@link ExecutionContext}.
+ * {@link InteractionContext}.
*
- * @param sudoMapper - maps the current {@link ExecutionContext} to the sudo one
+ * @param sudoMapper - maps the current {@link InteractionContext} to the sudo one
* @since 2.0
*/
default void run(
- final @NonNull UnaryOperator<ExecutionContext> sudoMapper,
+ final @NonNull UnaryOperator<InteractionContext> sudoMapper,
final @NonNull ThrowingRunnable runnable) {
call(sudoMapper, ThrowingRunnable.toCallable(runnable));
}
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/sudo/SudoServiceListener.java b/api/applib/src/main/java/org/apache/isis/applib/services/sudo/SudoServiceListener.java
index bf2bc0a..2d4c08e 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/sudo/SudoServiceListener.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/sudo/SudoServiceListener.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.applib.services.sudo;
-import org.apache.isis.applib.services.iactnlayer.ExecutionContext;
+import org.apache.isis.applib.services.iactnlayer.InteractionContext;
import lombok.NonNull;
@@ -39,7 +39,7 @@ public interface SudoServiceListener {
* @param before
* @param after
*/
- void beforeCall(@NonNull ExecutionContext before, @NonNull ExecutionContext after);
+ void beforeCall(@NonNull InteractionContext before, @NonNull InteractionContext after);
- void afterCall(@NonNull ExecutionContext before, @NonNull ExecutionContext after);
+ void afterCall(@NonNull InteractionContext before, @NonNull InteractionContext after);
}
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/user/UserService.java b/api/applib/src/main/java/org/apache/isis/applib/services/user/UserService.java
index 2b2c096..100126c 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/user/UserService.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/user/UserService.java
@@ -23,7 +23,7 @@ import java.util.Optional;
import javax.annotation.Nullable;
-import org.apache.isis.applib.services.iactnlayer.ExecutionContext;
+import org.apache.isis.applib.services.iactnlayer.InteractionContext;
import org.apache.isis.applib.services.sudo.SudoService;
import org.apache.isis.commons.internal.exceptions._Exceptions;
@@ -44,7 +44,7 @@ public interface UserService {
/**
* Optionally gets the details about the current user,
- * based on whether an {@link ExecutionContext} can be found with the current thread's context.
+ * based on whether an {@link InteractionContext} can be found with the current thread's context.
*/
Optional<UserMemento> currentUser();
@@ -61,16 +61,16 @@ public interface UserService {
/**
* Gets the details about the current user.
- * @throws IllegalStateException if no {@link ExecutionContext} can be found with the current thread's context.
+ * @throws IllegalStateException if no {@link InteractionContext} can be found with the current thread's context.
*/
default UserMemento currentUserElseFail() {
return currentUser()
- .orElseThrow(()->_Exceptions.illegalState("Current thread has no ExecutionContext."));
+ .orElseThrow(()->_Exceptions.illegalState("Current thread has no InteractionContext."));
}
/**
* Optionally gets the the current user's name,
- * based on whether an {@link ExecutionContext} can be found with the current thread's context.
+ * based on whether an {@link InteractionContext} can be found with the current thread's context.
*/
default Optional<String> currentUserName() {
return currentUser()
diff --git a/core/interaction/src/main/java/org/apache/isis/core/interaction/session/InteractionLayer.java b/core/interaction/src/main/java/org/apache/isis/core/interaction/session/InteractionLayer.java
index feaf879..7e8b01d 100644
--- a/core/interaction/src/main/java/org/apache/isis/core/interaction/session/InteractionLayer.java
+++ b/core/interaction/src/main/java/org/apache/isis/core/interaction/session/InteractionLayer.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.core.interaction.session;
-import org.apache.isis.applib.services.iactnlayer.ExecutionContext;
+import org.apache.isis.applib.services.iactnlayer.InteractionContext;
import org.apache.isis.core.security.authentication.Authentication;
import lombok.Getter;
@@ -49,7 +49,7 @@ public class InteractionLayer {
this.authentication = authentication;
}
- public ExecutionContext getExecutionContext() {
+ public InteractionContext getExecutionContext() {
return authentication.getExecutionContext();
}
diff --git a/core/interaction/src/main/java/org/apache/isis/core/interaction/session/InteractionTracker.java b/core/interaction/src/main/java/org/apache/isis/core/interaction/session/InteractionTracker.java
index cc01730..e9546a4 100644
--- a/core/interaction/src/main/java/org/apache/isis/core/interaction/session/InteractionTracker.java
+++ b/core/interaction/src/main/java/org/apache/isis/core/interaction/session/InteractionTracker.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.interaction.session;
import java.util.Optional;
-import org.apache.isis.applib.services.iactnlayer.ExecutionContext;
+import org.apache.isis.applib.services.iactnlayer.InteractionContext;
import org.apache.isis.applib.services.iactn.Interaction;
import org.apache.isis.applib.services.iactn.InteractionProvider;
import org.apache.isis.commons.internal.exceptions._Exceptions;
@@ -44,9 +44,9 @@ extends InteractionProvider, AuthenticationProvider {
}
/**
- * Returns the {@link ExecutionContext} wrapped by the {@link #currentInteractionLayer()} (if within an interaction layer).
+ * Returns the {@link InteractionContext} wrapped by the {@link #currentInteractionLayer()} (if within an interaction layer).
*/
- default Optional<ExecutionContext> currentExecutionContext() {
+ default Optional<InteractionContext> currentExecutionContext() {
return currentInteractionLayer().map(InteractionLayer::getExecutionContext);
}
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/clock/ClockServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/clock/ClockServiceDefault.java
index ad0c916..b9fa7bc 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/clock/ClockServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/clock/ClockServiceDefault.java
@@ -29,7 +29,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.clock.VirtualClock;
import org.apache.isis.applib.services.clock.ClockService;
-import org.apache.isis.applib.services.iactnlayer.ExecutionContext;
+import org.apache.isis.applib.services.iactnlayer.InteractionContext;
import org.apache.isis.core.interaction.session.InteractionTracker;
import lombok.RequiredArgsConstructor;
@@ -47,7 +47,7 @@ public class ClockServiceDefault implements ClockService {
@Override
public VirtualClock getClock() {
return interactionTracker.currentExecutionContext()
- .map(ExecutionContext::getClock)
+ .map(InteractionContext::getClock)
.orElseGet(VirtualClock::system);
}
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/session/AnonymousSession.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/session/AnonymousSession.java
index 1dd1b33..6216da1 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/session/AnonymousSession.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/session/AnonymousSession.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.core.runtimeservices.session;
-import org.apache.isis.applib.services.iactnlayer.ExecutionContext;
+import org.apache.isis.applib.services.iactnlayer.InteractionContext;
import org.apache.isis.applib.services.user.UserMemento;
import org.apache.isis.core.security.authentication.AuthenticationAbstract;
@@ -26,8 +26,8 @@ final class AnonymousSession extends AuthenticationAbstract {
private static final long serialVersionUID = 1L;
- private static final ExecutionContext INITIALISATION_CONTEXT =
- ExecutionContext.ofUserWithSystemDefaults(UserMemento.system());
+ private static final InteractionContext INITIALISATION_CONTEXT =
+ InteractionContext.ofUserWithSystemDefaults(UserMemento.system());
public AnonymousSession() {
super(INITIALISATION_CONTEXT, AuthenticationAbstract.DEFAULT_AUTH_VALID_CODE);
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/sudo/SudoServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/sudo/SudoServiceDefault.java
index fc16bf5..f24dff3 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/sudo/SudoServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/sudo/SudoServiceDefault.java
@@ -31,7 +31,7 @@ import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
-import org.apache.isis.applib.services.iactnlayer.ExecutionContext;
+import org.apache.isis.applib.services.iactnlayer.InteractionContext;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.services.sudo.SudoService;
import org.apache.isis.applib.services.sudo.SudoServiceListener;
@@ -69,7 +69,7 @@ public class SudoServiceDefault implements SudoService {
@Override
public <T> T call(
- final @NonNull UnaryOperator<ExecutionContext> sudoMapper,
+ final @NonNull UnaryOperator<InteractionContext> sudoMapper,
final @NonNull Callable<T> callable) {
val currentInteractionLayer = interactionTracker.currentInteractionLayerElseFail();
@@ -92,16 +92,16 @@ public class SudoServiceDefault implements SudoService {
// -- HELPER
private void beforeCall(
- final @NonNull ExecutionContext before,
- final @NonNull ExecutionContext after) {
+ final @NonNull InteractionContext before,
+ final @NonNull InteractionContext after) {
for (val sudoListener : sudoListeners) {
sudoListener.beforeCall(before, after);
}
}
private void afterCall(
- final @NonNull ExecutionContext before,
- final @NonNull ExecutionContext after) {
+ final @NonNull InteractionContext before,
+ final @NonNull InteractionContext after) {
for (val sudoListener : sudoListeners) {
sudoListener.afterCall(before, after);
}
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/user/UserServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/user/UserServiceDefault.java
index 3435dae..a09ef90 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/user/UserServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/user/UserServiceDefault.java
@@ -30,7 +30,7 @@ import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
-import org.apache.isis.applib.services.iactnlayer.ExecutionContext;
+import org.apache.isis.applib.services.iactnlayer.InteractionContext;
import org.apache.isis.applib.services.user.ImpersonatedUserHolder;
import org.apache.isis.applib.services.user.UserMemento;
import org.apache.isis.applib.services.user.UserService;
@@ -62,7 +62,7 @@ public class UserServiceDefault implements UserService {
Optional<UserMemento> optional = getImpersonatedUser();
return optional.isPresent()
? optional
- : isisInteractionTracker.currentExecutionContext().map(ExecutionContext::getUser);
+ : isisInteractionTracker.currentExecutionContext().map(InteractionContext::getUser);
}
@Override
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault.java
index a432611..39e29b0 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
@@ -47,7 +47,7 @@ import org.apache.isis.applib.services.bookmark.BookmarkService;
import org.apache.isis.applib.services.command.Command;
import org.apache.isis.applib.services.command.CommandExecutorService;
import org.apache.isis.applib.services.factory.FactoryService;
-import org.apache.isis.applib.services.iactnlayer.ExecutionContext;
+import org.apache.isis.applib.services.iactnlayer.InteractionContext;
import org.apache.isis.applib.services.iactn.InteractionProvider;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.services.metamodel.MetaModelService;
@@ -460,7 +460,7 @@ public class WrapperFactoryDefault implements WrapperFactory {
val executionContext = auth.getExecutionContext();
- val newExecutionContext = ExecutionContext.builder()
+ val newExecutionContext = InteractionContext.builder()
.clock(Optional.ofNullable(asyncControl.getClock())
.orElseGet(executionContext::getClock))
.locale(Optional.ofNullable(asyncControl.getLocale())
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/Authentication.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/Authentication.java
index b177305..4b4a564 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/Authentication.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/Authentication.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.security.authentication;
import java.io.Serializable;
-import org.apache.isis.applib.services.iactnlayer.ExecutionContext;
+import org.apache.isis.applib.services.iactnlayer.InteractionContext;
import org.apache.isis.applib.services.iactn.Interaction;
import org.apache.isis.applib.services.user.UserMemento;
@@ -29,7 +29,7 @@ import org.apache.isis.applib.services.user.UserMemento;
* An immutable, serializable value type, that holds details about a user's authentication.
*
* <p>
- * This is really little more than a thin wrapper around {@link ExecutionContext},
+ * This is really little more than a thin wrapper around {@link InteractionContext},
* surfaces a number of the security-specific attributes of that field.
* </p>
*
@@ -67,12 +67,12 @@ public interface Authentication extends Serializable {
}
/**
- * The {@link ExecutionContext} (programmatically) simulated (or actual), belonging to this session.
+ * The {@link InteractionContext} (programmatically) simulated (or actual), belonging to this session.
*
* @apiNote immutable, allows an {@link Interaction} to (logically) run with its
* own simulated (or actual) clock
*/
- ExecutionContext getExecutionContext();
+ InteractionContext getExecutionContext();
/**
* To support external security mechanisms such as keycloak, where the validity of the session is defined by
@@ -96,8 +96,8 @@ public interface Authentication extends Serializable {
// -- WITHERS
/**
- * Returns a copy with given {@code executionContext}.
- * @param executionContext
+ * Returns a copy with given {@code interactionContext}.
+ * @param interactionContext
*/
- Authentication withExecutionContext(ExecutionContext executionContext);
+ Authentication withExecutionContext(InteractionContext interactionContext);
}
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationAbstract.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationAbstract.java
index 3be6c7f..85a8d02 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationAbstract.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationAbstract.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.security.authentication;
import java.io.Serializable;
import java.util.Objects;
-import org.apache.isis.applib.services.iactnlayer.ExecutionContext;
+import org.apache.isis.applib.services.iactnlayer.InteractionContext;
import org.apache.isis.applib.util.ToString;
import org.apache.isis.core.security.authentication.standard.SimpleAuthentication;
@@ -38,7 +38,7 @@ implements Authentication, Serializable {
// -- FIELDS
@Getter(onMethod_ = {@Override})
- private final @NonNull ExecutionContext executionContext;
+ private final @NonNull InteractionContext interactionContext;
@Getter(onMethod_ = {@Override})
private final @NonNull String validationCode;
@@ -46,22 +46,21 @@ implements Authentication, Serializable {
// -- CONSTRUCTOR
protected AuthenticationAbstract(
- final @NonNull ExecutionContext executionContext,
+ final @NonNull InteractionContext interactionContext,
final @NonNull String validationCode) {
- this.executionContext = executionContext;
+ this.interactionContext = interactionContext;
this.validationCode = validationCode;
}
// -- WITHERS
/**
- * Returns a copy with given {@code executionContext}.
- * @param executionContext
+ * Returns a copy with given {@code interactionContext}.
+ * @param interactionContext
*/
- @Override
- public Authentication withExecutionContext(final @NonNull ExecutionContext executionContext) {
- return new SimpleAuthentication(executionContext, validationCode);
+ public Authentication withInteractionContext(final @NonNull InteractionContext interactionContext) {
+ return new SimpleAuthentication(interactionContext, validationCode);
}
// -- TO STRING, EQUALS, HASHCODE
@@ -96,7 +95,7 @@ implements Authentication, Serializable {
if(!Objects.equals(this.getValidationCode(), other.getValidationCode())) {
return false;
}
- if(!Objects.equals(this.getExecutionContext(), other.getExecutionContext())) {
+ if(!Objects.equals(this.getInteractionContext(), other.getInteractionContext())) {
return false;
}
return true;
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/health/HealthAuthentication.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/health/HealthAuthentication.java
index cc707f9..9eec19b 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/health/HealthAuthentication.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/health/HealthAuthentication.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.core.security.authentication.health;
-import org.apache.isis.applib.services.iactnlayer.ExecutionContext;
+import org.apache.isis.applib.services.iactnlayer.InteractionContext;
import org.apache.isis.applib.services.user.UserMemento;
import org.apache.isis.core.security.authentication.AuthenticationAbstract;
@@ -26,8 +26,8 @@ public class HealthAuthentication extends AuthenticationAbstract {
private static final long serialVersionUID = 1L;
- private static final ExecutionContext HEALTH_EXEC_CTX =
- ExecutionContext.ofUserWithSystemDefaults(
+ private static final InteractionContext HEALTH_EXEC_CTX =
+ InteractionContext.ofUserWithSystemDefaults(
UserMemento.ofNameAndRoleNames(
"__health", // user name
"__health-role") // role(s)
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/singleuser/SingleUserAuthentication.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/singleuser/SingleUserAuthentication.java
index 6702729..4e0d098 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/singleuser/SingleUserAuthentication.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/singleuser/SingleUserAuthentication.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.core.security.authentication.singleuser;
-import org.apache.isis.applib.services.iactnlayer.ExecutionContext;
+import org.apache.isis.applib.services.iactnlayer.InteractionContext;
import org.apache.isis.applib.services.user.UserMemento;
import org.apache.isis.core.security.authentication.AuthenticationAbstract;
@@ -26,8 +26,8 @@ public final class SingleUserAuthentication extends AuthenticationAbstract {
private static final long serialVersionUID = 1L;
- private static final ExecutionContext DEFAULT_SINGLE_USER_ENVIRONMENT =
- ExecutionContext.ofUserWithSystemDefaults(
+ private static final InteractionContext DEFAULT_SINGLE_USER_ENVIRONMENT =
+ InteractionContext.ofUserWithSystemDefaults(
UserMemento.ofName("prototyping"));
/**
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/SimpleAuthentication.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/SimpleAuthentication.java
index b96b51a..505270f 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/SimpleAuthentication.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/SimpleAuthentication.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.security.authentication.standard;
-import org.apache.isis.applib.services.iactnlayer.ExecutionContext;
+import org.apache.isis.applib.services.iactnlayer.InteractionContext;
import org.apache.isis.applib.services.user.UserMemento;
import org.apache.isis.core.security.authentication.AuthenticationAbstract;
@@ -37,7 +37,7 @@ extends AuthenticationAbstract {
public static SimpleAuthentication of(
final @NonNull UserMemento user,
final @NonNull String validationCode) {
- return new SimpleAuthentication(ExecutionContext.ofUserWithSystemDefaults(user), validationCode);
+ return new SimpleAuthentication(InteractionContext.ofUserWithSystemDefaults(user), validationCode);
}
public static SimpleAuthentication validOf(
@@ -48,9 +48,9 @@ extends AuthenticationAbstract {
// -- CONSTRUCTOR
public SimpleAuthentication(
- final @NonNull ExecutionContext executionContext,
+ final @NonNull InteractionContext interactionContext,
final @NonNull String validationCode) {
- super(executionContext, validationCode);
+ super(interactionContext, validationCode);
}
@Getter @Setter
diff --git a/core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityTestAbstract.java b/core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityTestAbstract.java
index 4dc6178..a4d25b3 100644
--- a/core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityTestAbstract.java
+++ b/core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityTestAbstract.java
@@ -34,13 +34,13 @@ public abstract class SimpleSessionEncodabilityTestAbstract extends Encodability
final AuthenticationAbstract original = (AuthenticationAbstract) originalEncodable;
assertThat(decoded.getUser(), is(equalTo(original.getUser()))); // redundant shortcut
-
- assertThat(decoded.getExecutionContext().getTimeZone(), is(equalTo(original.getExecutionContext().getTimeZone())));
- assertThat(decoded.getExecutionContext().getLocale(), is(equalTo(original.getExecutionContext().getLocale())));
- assertThat(decoded.getExecutionContext().getUser(), is(equalTo(original.getExecutionContext().getUser())));
- assertThat(decoded.getExecutionContext().getClock(), is(equalTo(original.getExecutionContext().getClock())));
-
- assertThat(decoded.getExecutionContext(), is(equalTo(original.getExecutionContext())));
+
+ assertThat(decoded.getInteractionContext().getTimeZone(), is(equalTo(original.getInteractionContext().getTimeZone())));
+ assertThat(decoded.getInteractionContext().getLocale(), is(equalTo(original.getInteractionContext().getLocale())));
+ assertThat(decoded.getInteractionContext().getUser(), is(equalTo(original.getInteractionContext().getUser())));
+ assertThat(decoded.getInteractionContext().getClock(), is(equalTo(original.getInteractionContext().getClock())));
+
+ assertThat(decoded.getInteractionContext(), is(equalTo(original.getInteractionContext())));
}
}
[isis] 01/03: ISIS-2727: moves ExecutionContext from services.iactn
to services.iactnlayer
Posted by da...@apache.org.
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 05989944d4c697d2187e70bf63a2116f8fc237f9
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jun 9 07:03:10 2021 +0100
ISIS-2727: moves ExecutionContext from services.iactn to services.iactnlayer
---
.../src/main/java/org/apache/isis/applib/clock/VirtualClock.java | 6 +++---
.../applib/services/{iactn => iactnlayer}/ExecutionContext.java | 3 ++-
.../main/java/org/apache/isis/applib/services/sudo/SudoService.java | 2 +-
.../org/apache/isis/applib/services/sudo/SudoServiceListener.java | 2 +-
.../main/java/org/apache/isis/applib/services/user/UserService.java | 2 +-
.../org/apache/isis/core/interaction/session/InteractionLayer.java | 2 +-
.../apache/isis/core/interaction/session/InteractionTracker.java | 2 +-
.../apache/isis/core/runtimeservices/clock/ClockServiceDefault.java | 2 +-
.../apache/isis/core/runtimeservices/session/AnonymousSession.java | 4 ++--
.../apache/isis/core/runtimeservices/sudo/SudoServiceDefault.java | 2 +-
.../apache/isis/core/runtimeservices/user/UserServiceDefault.java | 2 +-
.../isis/core/runtimeservices/wrapper/WrapperFactoryDefault.java | 2 +-
.../apache/isis/core/security/authentication/Authentication.java | 2 +-
.../isis/core/security/authentication/AuthenticationAbstract.java | 2 +-
.../core/security/authentication/health/HealthAuthentication.java | 2 +-
.../authentication/singleuser/SingleUserAuthentication.java | 2 +-
.../core/security/authentication/standard/SimpleAuthentication.java | 2 +-
17 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/api/applib/src/main/java/org/apache/isis/applib/clock/VirtualClock.java b/api/applib/src/main/java/org/apache/isis/applib/clock/VirtualClock.java
index adecb08..5bfbdba 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/clock/VirtualClock.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/clock/VirtualClock.java
@@ -34,17 +34,17 @@ import org.joda.time.DateTime;
import org.joda.time.DateTimeZone;
import org.apache.isis.applib.jaxb.JavaSqlXMLGregorianCalendarMarshalling;
-import org.apache.isis.applib.services.iactn.ExecutionContext;
+import org.apache.isis.applib.services.iactnlayer.ExecutionContext;
import org.apache.isis.applib.services.iactn.Interaction;
import lombok.NonNull;
import lombok.val;
/**
- * Works in connection with {@code org.apache.isis.core.interaction.session.InteractionFactory},
+ * Works in connection with {@code org.apache.isis.core.interaction.session.InteractionFactory},
* such that it allows an {@link Interaction}
* to run with its own simulated (or actual) time.
- *
+ *
* @see ExecutionContext
*
* @since 2.0 {@index}
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/iactn/ExecutionContext.java b/api/applib/src/main/java/org/apache/isis/applib/services/iactnlayer/ExecutionContext.java
similarity index 96%
rename from api/applib/src/main/java/org/apache/isis/applib/services/iactn/ExecutionContext.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/iactnlayer/ExecutionContext.java
index bde018c..dc8ea83 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/iactn/ExecutionContext.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/iactnlayer/ExecutionContext.java
@@ -16,13 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.services.iactn;
+package org.apache.isis.applib.services.iactnlayer;
import java.io.Serializable;
import java.util.Locale;
import java.util.TimeZone;
import org.apache.isis.applib.clock.VirtualClock;
+import org.apache.isis.applib.services.iactn.Interaction;
import org.apache.isis.applib.services.user.UserMemento;
import lombok.Builder;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/sudo/SudoService.java b/api/applib/src/main/java/org/apache/isis/applib/services/sudo/SudoService.java
index e1bedd7..ece4c63 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/sudo/SudoService.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/sudo/SudoService.java
@@ -21,7 +21,7 @@ package org.apache.isis.applib.services.sudo;
import java.util.concurrent.Callable;
import java.util.function.UnaryOperator;
-import org.apache.isis.applib.services.iactn.ExecutionContext;
+import org.apache.isis.applib.services.iactnlayer.ExecutionContext;
import org.apache.isis.applib.services.user.RoleMemento;
import org.apache.isis.applib.services.user.UserService;
import org.apache.isis.commons.functional.ThrowingRunnable;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/sudo/SudoServiceListener.java b/api/applib/src/main/java/org/apache/isis/applib/services/sudo/SudoServiceListener.java
index f3258fe..bf2bc0a 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/sudo/SudoServiceListener.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/sudo/SudoServiceListener.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.applib.services.sudo;
-import org.apache.isis.applib.services.iactn.ExecutionContext;
+import org.apache.isis.applib.services.iactnlayer.ExecutionContext;
import lombok.NonNull;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/user/UserService.java b/api/applib/src/main/java/org/apache/isis/applib/services/user/UserService.java
index 764bb12..2b2c096 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/user/UserService.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/user/UserService.java
@@ -23,7 +23,7 @@ import java.util.Optional;
import javax.annotation.Nullable;
-import org.apache.isis.applib.services.iactn.ExecutionContext;
+import org.apache.isis.applib.services.iactnlayer.ExecutionContext;
import org.apache.isis.applib.services.sudo.SudoService;
import org.apache.isis.commons.internal.exceptions._Exceptions;
diff --git a/core/interaction/src/main/java/org/apache/isis/core/interaction/session/InteractionLayer.java b/core/interaction/src/main/java/org/apache/isis/core/interaction/session/InteractionLayer.java
index 2195682..feaf879 100644
--- a/core/interaction/src/main/java/org/apache/isis/core/interaction/session/InteractionLayer.java
+++ b/core/interaction/src/main/java/org/apache/isis/core/interaction/session/InteractionLayer.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.core.interaction.session;
-import org.apache.isis.applib.services.iactn.ExecutionContext;
+import org.apache.isis.applib.services.iactnlayer.ExecutionContext;
import org.apache.isis.core.security.authentication.Authentication;
import lombok.Getter;
diff --git a/core/interaction/src/main/java/org/apache/isis/core/interaction/session/InteractionTracker.java b/core/interaction/src/main/java/org/apache/isis/core/interaction/session/InteractionTracker.java
index b43b0da..cc01730 100644
--- a/core/interaction/src/main/java/org/apache/isis/core/interaction/session/InteractionTracker.java
+++ b/core/interaction/src/main/java/org/apache/isis/core/interaction/session/InteractionTracker.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.interaction.session;
import java.util.Optional;
-import org.apache.isis.applib.services.iactn.ExecutionContext;
+import org.apache.isis.applib.services.iactnlayer.ExecutionContext;
import org.apache.isis.applib.services.iactn.Interaction;
import org.apache.isis.applib.services.iactn.InteractionProvider;
import org.apache.isis.commons.internal.exceptions._Exceptions;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/clock/ClockServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/clock/ClockServiceDefault.java
index 4d169a2..ad0c916 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/clock/ClockServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/clock/ClockServiceDefault.java
@@ -29,7 +29,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.clock.VirtualClock;
import org.apache.isis.applib.services.clock.ClockService;
-import org.apache.isis.applib.services.iactn.ExecutionContext;
+import org.apache.isis.applib.services.iactnlayer.ExecutionContext;
import org.apache.isis.core.interaction.session.InteractionTracker;
import lombok.RequiredArgsConstructor;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/session/AnonymousSession.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/session/AnonymousSession.java
index 52bcbfd..1dd1b33 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/session/AnonymousSession.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/session/AnonymousSession.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.core.runtimeservices.session;
-import org.apache.isis.applib.services.iactn.ExecutionContext;
+import org.apache.isis.applib.services.iactnlayer.ExecutionContext;
import org.apache.isis.applib.services.user.UserMemento;
import org.apache.isis.core.security.authentication.AuthenticationAbstract;
@@ -34,4 +34,4 @@ final class AnonymousSession extends AuthenticationAbstract {
}
-}
\ No newline at end of file
+}
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/sudo/SudoServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/sudo/SudoServiceDefault.java
index ae8a37f..fc16bf5 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/sudo/SudoServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/sudo/SudoServiceDefault.java
@@ -31,7 +31,7 @@ import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
-import org.apache.isis.applib.services.iactn.ExecutionContext;
+import org.apache.isis.applib.services.iactnlayer.ExecutionContext;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.services.sudo.SudoService;
import org.apache.isis.applib.services.sudo.SudoServiceListener;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/user/UserServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/user/UserServiceDefault.java
index f02be04..3435dae 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/user/UserServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/user/UserServiceDefault.java
@@ -30,7 +30,7 @@ import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
-import org.apache.isis.applib.services.iactn.ExecutionContext;
+import org.apache.isis.applib.services.iactnlayer.ExecutionContext;
import org.apache.isis.applib.services.user.ImpersonatedUserHolder;
import org.apache.isis.applib.services.user.UserMemento;
import org.apache.isis.applib.services.user.UserService;
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 5afa24a..a432611 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
@@ -47,7 +47,7 @@ import org.apache.isis.applib.services.bookmark.BookmarkService;
import org.apache.isis.applib.services.command.Command;
import org.apache.isis.applib.services.command.CommandExecutorService;
import org.apache.isis.applib.services.factory.FactoryService;
-import org.apache.isis.applib.services.iactn.ExecutionContext;
+import org.apache.isis.applib.services.iactnlayer.ExecutionContext;
import org.apache.isis.applib.services.iactn.InteractionProvider;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.services.metamodel.MetaModelService;
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/Authentication.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/Authentication.java
index b133cb1..b177305 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/Authentication.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/Authentication.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.security.authentication;
import java.io.Serializable;
-import org.apache.isis.applib.services.iactn.ExecutionContext;
+import org.apache.isis.applib.services.iactnlayer.ExecutionContext;
import org.apache.isis.applib.services.iactn.Interaction;
import org.apache.isis.applib.services.user.UserMemento;
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationAbstract.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationAbstract.java
index 796a2b7..3be6c7f 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationAbstract.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationAbstract.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.security.authentication;
import java.io.Serializable;
import java.util.Objects;
-import org.apache.isis.applib.services.iactn.ExecutionContext;
+import org.apache.isis.applib.services.iactnlayer.ExecutionContext;
import org.apache.isis.applib.util.ToString;
import org.apache.isis.core.security.authentication.standard.SimpleAuthentication;
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/health/HealthAuthentication.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/health/HealthAuthentication.java
index 89bd7f0..cc707f9 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/health/HealthAuthentication.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/health/HealthAuthentication.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.core.security.authentication.health;
-import org.apache.isis.applib.services.iactn.ExecutionContext;
+import org.apache.isis.applib.services.iactnlayer.ExecutionContext;
import org.apache.isis.applib.services.user.UserMemento;
import org.apache.isis.core.security.authentication.AuthenticationAbstract;
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/singleuser/SingleUserAuthentication.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/singleuser/SingleUserAuthentication.java
index c6e9d98..6702729 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/singleuser/SingleUserAuthentication.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/singleuser/SingleUserAuthentication.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.core.security.authentication.singleuser;
-import org.apache.isis.applib.services.iactn.ExecutionContext;
+import org.apache.isis.applib.services.iactnlayer.ExecutionContext;
import org.apache.isis.applib.services.user.UserMemento;
import org.apache.isis.core.security.authentication.AuthenticationAbstract;
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/SimpleAuthentication.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/SimpleAuthentication.java
index 588fd97..b96b51a 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/SimpleAuthentication.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/SimpleAuthentication.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.security.authentication.standard;
-import org.apache.isis.applib.services.iactn.ExecutionContext;
+import org.apache.isis.applib.services.iactnlayer.ExecutionContext;
import org.apache.isis.applib.services.user.UserMemento;
import org.apache.isis.core.security.authentication.AuthenticationAbstract;
[isis] 03/03: ISIS-2727: fixes javadoc is all
Posted by da...@apache.org.
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 88e39afb00baf35801ddb2dfbcab6648aa329398
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jun 9 07:07:36 2021 +0100
ISIS-2727: fixes javadoc is all
---
.../org/apache/isis/core/interaction/session/InteractionFactory.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 01c2480..d724e20 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
@@ -46,7 +46,7 @@ extends AnonymousInteractionFactory {
* If present, reuses the current top level {@link InteractionLayer}, otherwise creates a new
* anonymous one.
*
- * @see {@link #openInteraction(Authentication)}
+ * @see #openInteraction(Authentication)
*/
InteractionLayer openInteraction();