You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2020/09/20 15:12:25 UTC
[isis] branch master updated: ISIS-2222: fix invalid use of
@SneakyThrows and minor issues after merge
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 069565f ISIS-2222: fix invalid use of @SneakyThrows and minor issues after merge
069565f is described below
commit 069565f729c7b0016f0bc6b6310c60fab44f4398
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sun Sep 20 17:12:15 2020 +0200
ISIS-2222: fix invalid use of @SneakyThrows and minor issues after merge
---
.../isis/applib/services/wrapper/control/AsyncControl.java | 1 -
.../apache/isis/core/runtime/iactn/IsisInteractionFactory.java | 9 ---------
.../org/apache/isis/testdomain/auditing/AuditerServiceTest.java | 8 ++++----
.../isis/testdomain/commandexecution/WrapperAsyncTest.java | 4 ++--
.../apache/isis/testdomain/publishing/PublisherServiceTest.java | 8 ++++----
5 files changed, 10 insertions(+), 20 deletions(-)
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/control/AsyncControl.java b/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/control/AsyncControl.java
index fa6ab86..3c91242 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/control/AsyncControl.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/control/AsyncControl.java
@@ -25,7 +25,6 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.ForkJoinPool;
import java.util.concurrent.Future;
-import lombok.AccessLevel;
import lombok.Getter;
import lombok.NonNull;
import lombok.Setter;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/iactn/IsisInteractionFactory.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/iactn/IsisInteractionFactory.java
index 577a9c7..0ec4625 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/iactn/IsisInteractionFactory.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/iactn/IsisInteractionFactory.java
@@ -20,16 +20,9 @@
package org.apache.isis.core.runtime.iactn;
import java.util.concurrent.Callable;
-import java.util.function.Supplier;
-import javax.inject.Inject;
-
-import org.apache.isis.applib.services.inject.ServiceInjector;
-import org.apache.isis.core.runtime.session.init.InitialisationSession;
import org.apache.isis.core.security.authentication.AuthenticationSession;
-import lombok.SneakyThrows;
-
/**
* The factory of {@link IsisInteraction}s, also holding a reference to the
* current session using a thread-local.
@@ -102,14 +95,12 @@ public interface IsisInteractionFactory {
* @param <R>
* @param callable
*/
- @SneakyThrows
public <R> R callAnonymous(Callable<R> callable);
/**
* Variant of {@link #callAnonymous(Callable)} that takes a runnable.
* @param runnable
*/
- @SneakyThrows
public void runAnonymous(ThrowingRunnable runnable);
/**
diff --git a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/auditing/AuditerServiceTest.java b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/auditing/AuditerServiceTest.java
index e863494..5a27414 100644
--- a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/auditing/AuditerServiceTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/auditing/AuditerServiceTest.java
@@ -53,7 +53,7 @@ import org.apache.isis.testdomain.util.kv.KVStoreForTesting;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
import org.apache.isis.testing.integtestsupport.applib.IsisIntegrationTestAbstract;
-import static org.apache.isis.applib.services.wrapper.control.AsyncControl.control;
+import static org.apache.isis.applib.services.wrapper.control.AsyncControl.*;
import lombok.val;
@@ -135,7 +135,7 @@ class AuditerServiceTest extends IsisIntegrationTestAbstract {
kvStore.clear(AuditerServiceForTesting.class);
// when - running within its own background task
- AsyncControl<Void> control = control().withSkipRules();
+ AsyncControl<Void> control = returningVoid().withSkipRules();
wrapper.asyncWrap(book, control.with(new ExceptionHandlerAbstract() {
@Override
public Object handle(Exception ex) throws Exception {
@@ -164,9 +164,9 @@ class AuditerServiceTest extends IsisIntegrationTestAbstract {
// when - running within its own background task
assertThrows(DisabledException.class, ()->{
- wrapper.asyncWrap(book, control()).setName("Book #2");
+ wrapper.asyncWrap(book, returningVoid()).setName("Book #2");
- control().getFuture().get(1000, TimeUnit.SECONDS);
+ returningVoid().getFuture().get(1000, TimeUnit.SECONDS);
});
diff --git a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperAsyncTest.java b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperAsyncTest.java
index 01fe199..3965a5d 100644
--- a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperAsyncTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperAsyncTest.java
@@ -55,7 +55,7 @@ import org.apache.isis.testdomain.jdo.entities.JdoProduct;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
import org.apache.isis.testing.integtestsupport.applib.IsisIntegrationTestAbstract;
-import static org.apache.isis.applib.services.wrapper.control.AsyncControl.control;
+import static org.apache.isis.applib.services.wrapper.control.AsyncControl.*;
import lombok.Getter;
import lombok.val;
@@ -121,7 +121,7 @@ class WrapperAsyncTest extends IsisIntegrationTestAbstract {
assertEquals(99d, product.getPrice(), 1E-6);
// when
- val control = control(JdoProduct.class);
+ val control = returning(JdoProduct.class);
wrapper.asyncWrap(inventoryManager, control)
.updateProductPrice(product, 123d);
diff --git a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/publishing/PublisherServiceTest.java b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/publishing/PublisherServiceTest.java
index d6dca5a..0d0127e 100644
--- a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/publishing/PublisherServiceTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/publishing/PublisherServiceTest.java
@@ -54,7 +54,7 @@ import org.apache.isis.testdomain.util.kv.KVStoreForTesting;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
import org.apache.isis.testing.integtestsupport.applib.IsisIntegrationTestAbstract;
-import static org.apache.isis.applib.services.wrapper.control.AsyncControl.control;
+import static org.apache.isis.applib.services.wrapper.control.AsyncControl.*;
import lombok.val;
@@ -146,7 +146,7 @@ class PublisherServiceTest extends IsisIntegrationTestAbstract {
val latch = kvStore.latch(PublisherServiceForTesting.class);
// when - running within its own background task
- AsyncControl<Void> control = control().withSkipRules();
+ AsyncControl<Void> control = returningVoid().withSkipRules();
wrapper.asyncWrap(book, control).setName("Book #2"); // don't enforce rules for this test
control.getFuture().get(10, TimeUnit.SECONDS);
@@ -176,9 +176,9 @@ class PublisherServiceTest extends IsisIntegrationTestAbstract {
// when - running within its own background task
assertThrows(DisabledException.class, ()->{
- wrapper.asyncWrap(book, control()).setName("Book #2");
+ wrapper.asyncWrap(book, returningVoid()).setName("Book #2");
- control().getFuture().get(10, TimeUnit.SECONDS);
+ returningVoid().getFuture().get(10, TimeUnit.SECONDS);
});