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:15:29 UTC
[isis] branch ISIS-2727 updated (3acf107 -> 0b8e1b2)
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 3acf107 ISIS-2727: fixes compile issue with MetaModelContext
new ffdcdf6 ISIS-2727: renames Authentication#getExecutionContext to #getInteractionContext
new 0b8e1b2 ISIS-2727: renames Authentication#getInteractionContext to #withInteractionContext
The 2 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:
.../org/apache/isis/core/interaction/session/InteractionLayer.java | 2 +-
.../apache/isis/core/runtimeservices/sudo/SudoServiceDefault.java | 2 +-
.../isis/core/runtimeservices/wrapper/WrapperFactoryDefault.java | 4 ++--
.../apache/isis/core/security/authentication/Authentication.java | 6 +++---
4 files changed, 7 insertions(+), 7 deletions(-)
[isis] 02/02: ISIS-2727: renames
Authentication#getInteractionContext to #withInteractionContext
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 0b8e1b25148688334289ba11a630226dd4b80090
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jun 9 07:12:48 2021 +0100
ISIS-2727: renames Authentication#getInteractionContext to #withInteractionContext
---
.../org/apache/isis/core/runtimeservices/sudo/SudoServiceDefault.java | 2 +-
.../apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault.java | 2 +-
.../org/apache/isis/core/security/authentication/Authentication.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
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 f24dff3..3cb2aae 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
@@ -78,7 +78,7 @@ public class SudoServiceDefault implements SudoService {
val sodoSession = currentInteractionLayer
.getAuthentication()
- .withExecutionContext(sudoExecutionContext);
+ .withInteractionContext(sudoExecutionContext);
try {
beforeCall(currentExecutionContext, sudoExecutionContext);
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 9b6ec3e..1cb080a 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
@@ -471,7 +471,7 @@ public class WrapperFactoryDefault implements WrapperFactory {
.orElseGet(executionContext::getUser))
.build();
- return auth.withExecutionContext(newExecutionContext);
+ return auth.withInteractionContext(newExecutionContext);
}
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 b8a7ce1..0408fd2 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
@@ -99,5 +99,5 @@ public interface Authentication extends Serializable {
* Returns a copy with given {@code interactionContext}.
* @param interactionContext
*/
- Authentication withExecutionContext(InteractionContext interactionContext);
+ Authentication withInteractionContext(InteractionContext interactionContext);
}
[isis] 01/02: ISIS-2727: renames Authentication#getExecutionContext
to #getInteractionContext
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 ffdcdf642989cd9a373a71e5161f55fa0b166f2d
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jun 9 07:12:11 2021 +0100
ISIS-2727: renames Authentication#getExecutionContext to #getInteractionContext
---
.../org/apache/isis/core/interaction/session/InteractionLayer.java | 2 +-
.../isis/core/runtimeservices/wrapper/WrapperFactoryDefault.java | 2 +-
.../org/apache/isis/core/security/authentication/Authentication.java | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
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 7e8b01d..d84f9ac 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
@@ -50,7 +50,7 @@ public class InteractionLayer {
}
public InteractionContext getExecutionContext() {
- return authentication.getExecutionContext();
+ return authentication.getInteractionContext();
}
}
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 39e29b0..9b6ec3e 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
@@ -458,7 +458,7 @@ public class WrapperFactoryDefault implements WrapperFactory {
private static <R> Authentication authFrom(AsyncControl<R> asyncControl, Authentication auth) {
- val executionContext = auth.getExecutionContext();
+ val executionContext = auth.getInteractionContext();
val newExecutionContext = InteractionContext.builder()
.clock(Optional.ofNullable(asyncControl.getClock())
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 4b4a564..b8a7ce1 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
@@ -63,7 +63,7 @@ public interface Authentication extends Serializable {
* own simulated (or actual) user
*/
default UserMemento getUser() {
- return getExecutionContext().getUser();
+ return getInteractionContext().getUser();
}
/**
@@ -72,7 +72,7 @@ public interface Authentication extends Serializable {
* @apiNote immutable, allows an {@link Interaction} to (logically) run with its
* own simulated (or actual) clock
*/
- InteractionContext getExecutionContext();
+ InteractionContext getInteractionContext();
/**
* To support external security mechanisms such as keycloak, where the validity of the session is defined by