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 13:42:14 UTC
[isis] branch ISIS-2727 updated: ISIS-2727: moves ThrowingRunnable
from commons to applib
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
The following commit(s) were added to refs/heads/ISIS-2727 by this push:
new 48dff40 ISIS-2727: moves ThrowingRunnable from commons to applib
48dff40 is described below
commit 48dff404d863171abf433053048174f0e39937e9
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jun 9 14:41:55 2021 +0100
ISIS-2727: moves ThrowingRunnable from commons to applib
---
.../isis/applib/services/sudo/SudoService.java | 2 +-
.../services/xactn/TransactionalProcessor.java | 2 +-
.../isis/applib/services/iactnlayer}/ResultTest.java | 3 +--
.../services/iactnlayer}/ThrowingRunnable.java | 4 +++-
...InteractionAwareTransactionalBoundaryHandler.java | 2 +-
.../core/interaction/session/InteractionFactory.java | 2 +-
.../session/InteractionFactoryDefault.java | 2 +-
.../manager/AnonymousInteractionFactory.java | 2 +-
.../vaadin/ui/auth/VaadinAuthenticationHandler.java | 2 +-
...oExceptionTranslationTest_usingTransactional.java | 2 +-
...aExceptionTranslationTest_usingTransactional.java | 2 +-
.../AuthenticatedWebSessionForIsis_Authenticate.java | 2 +-
.../AuthenticatedWebSessionForIsis_SignIn.java | 2 +-
.../AuthenticatedWebSessionForIsis_TestAbstract.java | 20 ++++++++++----------
14 files changed, 25 insertions(+), 24 deletions(-)
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 3744fa0..652b49c 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
@@ -24,7 +24,7 @@ import java.util.function.UnaryOperator;
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;
+import org.apache.isis.applib.services.iactnlayer.ThrowingRunnable;
import lombok.NonNull;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/xactn/TransactionalProcessor.java b/api/applib/src/main/java/org/apache/isis/applib/services/xactn/TransactionalProcessor.java
index 32b71fa..96de969 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/xactn/TransactionalProcessor.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/xactn/TransactionalProcessor.java
@@ -25,7 +25,7 @@ import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.support.DefaultTransactionDefinition;
import org.apache.isis.commons.functional.Result;
-import org.apache.isis.commons.functional.ThrowingRunnable;
+import org.apache.isis.applib.services.iactnlayer.ThrowingRunnable;
import lombok.val;
diff --git a/commons/src/test/java/org/apache/isis/commons/functions/ResultTest.java b/api/applib/src/test/java/org/apache/isis/applib/services/iactnlayer/ResultTest.java
similarity index 98%
rename from commons/src/test/java/org/apache/isis/commons/functions/ResultTest.java
rename to api/applib/src/test/java/org/apache/isis/applib/services/iactnlayer/ResultTest.java
index 94efa4c..97bad59 100644
--- a/commons/src/test/java/org/apache/isis/commons/functions/ResultTest.java
+++ b/api/applib/src/test/java/org/apache/isis/applib/services/iactnlayer/ResultTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.functions;
+package org.apache.isis.applib.services.iactnlayer;
import java.util.NoSuchElementException;
import java.util.Optional;
@@ -30,7 +30,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
import org.apache.isis.commons.functional.Result;
-import org.apache.isis.commons.functional.ThrowingRunnable;
import lombok.val;
diff --git a/commons/src/main/java/org/apache/isis/commons/functional/ThrowingRunnable.java b/commons/src/main/java/org/apache/isis/applib/services/iactnlayer/ThrowingRunnable.java
similarity index 92%
rename from commons/src/main/java/org/apache/isis/commons/functional/ThrowingRunnable.java
rename to commons/src/main/java/org/apache/isis/applib/services/iactnlayer/ThrowingRunnable.java
index 988aa21..29937fb 100644
--- a/commons/src/main/java/org/apache/isis/commons/functional/ThrowingRunnable.java
+++ b/commons/src/main/java/org/apache/isis/applib/services/iactnlayer/ThrowingRunnable.java
@@ -16,10 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.functional;
+package org.apache.isis.applib.services.iactnlayer;
import java.util.concurrent.Callable;
+import org.apache.isis.commons.functional.Result;
+
import lombok.NonNull;
@FunctionalInterface
diff --git a/core/interaction/src/main/java/org/apache/isis/core/interaction/integration/InteractionAwareTransactionalBoundaryHandler.java b/core/interaction/src/main/java/org/apache/isis/core/interaction/integration/InteractionAwareTransactionalBoundaryHandler.java
index e8afa61..164da58 100644
--- a/core/interaction/src/main/java/org/apache/isis/core/interaction/integration/InteractionAwareTransactionalBoundaryHandler.java
+++ b/core/interaction/src/main/java/org/apache/isis/core/interaction/integration/InteractionAwareTransactionalBoundaryHandler.java
@@ -35,7 +35,7 @@ import org.springframework.transaction.support.TransactionTemplate;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.functional.ThrowingRunnable;
+import org.apache.isis.applib.services.iactnlayer.ThrowingRunnable;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.debug._Probe;
import org.apache.isis.core.interaction.session.IsisInteraction;
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 fa0b6a3..1efc154 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
@@ -22,7 +22,7 @@ package org.apache.isis.core.interaction.session;
import java.util.concurrent.Callable;
import org.apache.isis.applib.services.iactnlayer.InteractionContext;
-import org.apache.isis.commons.functional.ThrowingRunnable;
+import org.apache.isis.applib.services.iactnlayer.ThrowingRunnable;
import org.apache.isis.core.security.authentication.Authentication;
import org.apache.isis.core.security.authentication.manager.AnonymousInteractionFactory;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/session/InteractionFactoryDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/session/InteractionFactoryDefault.java
index e807c7d..f48256f 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/session/InteractionFactoryDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/session/InteractionFactoryDefault.java
@@ -50,7 +50,7 @@ import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.util.schema.ChangesDtoUtils;
import org.apache.isis.applib.util.schema.CommandDtoUtils;
import org.apache.isis.applib.util.schema.InteractionDtoUtils;
-import org.apache.isis.commons.functional.ThrowingRunnable;
+import org.apache.isis.applib.services.iactnlayer.ThrowingRunnable;
import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.commons.internal.concurrent._ConcurrentContext;
import org.apache.isis.commons.internal.concurrent._ConcurrentTaskList;
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/manager/AnonymousInteractionFactory.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/manager/AnonymousInteractionFactory.java
index 0691ecb..446e7fa 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/manager/AnonymousInteractionFactory.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/manager/AnonymousInteractionFactory.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.security.authentication.manager;
import java.util.concurrent.Callable;
-import org.apache.isis.commons.functional.ThrowingRunnable;
+import org.apache.isis.applib.services.iactnlayer.ThrowingRunnable;
import lombok.NonNull;
import lombok.SneakyThrows;
diff --git a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/auth/VaadinAuthenticationHandler.java b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/auth/VaadinAuthenticationHandler.java
index 561b1f0..75adb6a 100644
--- a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/auth/VaadinAuthenticationHandler.java
+++ b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/auth/VaadinAuthenticationHandler.java
@@ -33,7 +33,7 @@ import com.vaadin.flow.theme.lumo.Lumo;
import org.springframework.stereotype.Component;
-import org.apache.isis.commons.functional.ThrowingRunnable;
+import org.apache.isis.applib.services.iactnlayer.ThrowingRunnable;
import org.apache.isis.core.interaction.session.InteractionFactory;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.security.authentication.AuthenticationRequest;
diff --git a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/isis/testdomain/persistence/jdo/JdoExceptionTranslationTest_usingTransactional.java b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/isis/testdomain/persistence/jdo/JdoExceptionTranslationTest_usingTransactional.java
index d3a499e..cfed472 100644
--- a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/isis/testdomain/persistence/jdo/JdoExceptionTranslationTest_usingTransactional.java
+++ b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/isis/testdomain/persistence/jdo/JdoExceptionTranslationTest_usingTransactional.java
@@ -42,7 +42,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
import org.apache.isis.applib.services.repository.RepositoryService;
-import org.apache.isis.commons.functional.ThrowingRunnable;
+import org.apache.isis.applib.services.iactnlayer.ThrowingRunnable;
import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.core.interaction.session.InteractionFactory;
import org.apache.isis.persistence.jdo.spring.integration.JdoTransactionManager;
diff --git a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/isis/testdomain/persistence/jpa/JpaExceptionTranslationTest_usingTransactional.java b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/isis/testdomain/persistence/jpa/JpaExceptionTranslationTest_usingTransactional.java
index ec4d9d0..32d433e 100644
--- a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/isis/testdomain/persistence/jpa/JpaExceptionTranslationTest_usingTransactional.java
+++ b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/isis/testdomain/persistence/jpa/JpaExceptionTranslationTest_usingTransactional.java
@@ -43,7 +43,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
import org.apache.isis.applib.services.repository.RepositoryService;
-import org.apache.isis.commons.functional.ThrowingRunnable;
+import org.apache.isis.applib.services.iactnlayer.ThrowingRunnable;
import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.core.interaction.session.InteractionFactory;
import org.apache.isis.testdomain.conf.Configuration_usingJpa;
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 6f40630..bb1a2a0 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
@@ -32,7 +32,7 @@ import org.junit.Test;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.services.session.SessionLoggingService;
import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.functional.ThrowingRunnable;
+import org.apache.isis.applib.services.iactnlayer.ThrowingRunnable;
import org.apache.isis.core.interaction.session.InteractionFactory;
import org.apache.isis.core.interaction.session.InteractionTracker;
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2;
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 5c2ee0f..78e0d52 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
@@ -32,7 +32,7 @@ import org.junit.Test;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.services.session.SessionLoggingService;
import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.functional.ThrowingRunnable;
+import org.apache.isis.applib.services.iactnlayer.ThrowingRunnable;
import org.apache.isis.core.interaction.session.InteractionFactory;
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.runtime.context.IsisAppCommonContext;
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 7e7d55f..b545cc9 100644
--- a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_TestAbstract.java
+++ b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_TestAbstract.java
@@ -29,7 +29,7 @@ import org.junit.Rule;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.services.session.SessionLoggingService;
-import org.apache.isis.commons.functional.ThrowingRunnable;
+import org.apache.isis.applib.services.iactnlayer.ThrowingRunnable;
import org.apache.isis.core.interaction.session.InteractionFactory;
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2.Mode;
@@ -39,15 +39,15 @@ import org.apache.isis.core.security.authentication.singleuser.SingleUserAuthent
public abstract class AuthenticatedWebSessionForIsis_TestAbstract {
- @Rule public final JUnitRuleMockery2 context =
+ @Rule public final JUnitRuleMockery2 context =
JUnitRuleMockery2.createFor(Mode.INTERFACES_AND_CLASSES);
-
+
@Mock protected Request mockRequest;
@Mock protected AuthenticationManager mockAuthMgr;
@Mock protected IsisAppCommonContext mockCommonContext;
@Mock protected InteractionFactory mockIsisInteractionFactory;
@Mock protected ServiceRegistry mockServiceRegistry;
-
+
protected AuthenticatedWebSessionForIsis webSession;
protected void setUp() throws Exception {
@@ -55,16 +55,16 @@ public abstract class AuthenticatedWebSessionForIsis_TestAbstract {
{
allowing(mockCommonContext).getServiceRegistry();
will(returnValue(mockServiceRegistry));
-
+
allowing(mockServiceRegistry).lookupService(SessionLoggingService.class);
will(returnValue(Optional.empty()));
-
+
allowing(mockCommonContext).lookupServiceElseFail(InteractionFactory.class);
will(returnValue(mockIsisInteractionFactory));
-
+
allowing(mockIsisInteractionFactory).runAuthenticated(new SingleUserAuthentication(), with(any(ThrowingRunnable.class)));
// ignore
-
+
// must provide explicit expectation, since Locale is final.
allowing(mockRequest).getLocale();
will(returnValue(Locale.getDefault()));
@@ -79,7 +79,7 @@ public abstract class AuthenticatedWebSessionForIsis_TestAbstract {
protected void setupWebSession() {
webSession = new AuthenticatedWebSessionForIsis(mockRequest) {
private static final long serialVersionUID = 1L;
-
+
{
commonContext = mockCommonContext;
}
@@ -90,6 +90,6 @@ public abstract class AuthenticatedWebSessionForIsis_TestAbstract {
}
};
}
-
+
}