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:55 UTC
[isis] 01/03: ISIS-2727: moves ExecutionContext from services.iactn
to services.iactnlayer
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;