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/08/05 13:20:46 UTC
[isis] branch ISIS-2756 updated: ISIS-2756: fixes compile issues
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2756
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/ISIS-2756 by this push:
new f8e0b15 ISIS-2756: fixes compile issues
f8e0b15 is described below
commit f8e0b159f4f5d1f24dc611f16b6e6fb99cc6764a
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Aug 5 14:19:44 2021 +0100
ISIS-2756: fixes compile issues
also for some reason IJ is not yet recognising source=11 correctly, so reverting to earlier syntax for now...
---
.../isis/testdomain/publishing/PublishingTestFactoryAbstract.java | 2 +-
.../java/org/apache/isis/testdomain/util/kv/KVStoreForTesting.java | 4 ++--
.../isis/testing/fakedata/applib/services/FakeDataServiceTest.java | 4 +---
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/publishing/PublishingTestFactoryAbstract.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/publishing/PublishingTestFactoryAbstract.java
index 6c85e90..380b1bc 100644
--- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/publishing/PublishingTestFactoryAbstract.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/publishing/PublishingTestFactoryAbstract.java
@@ -220,7 +220,7 @@ public abstract class PublishingTestFactoryAbstract {
final Runnable given,
final BiConsumer<ChangeScenario, VerificationStage> verifier) {
- var dynamicTests = Can.<DynamicTest>empty();
+ Can<DynamicTest> dynamicTests = Can.<DynamicTest>empty();
if(includeProgrammatic) {
dynamicTests = dynamicTests
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/util/kv/KVStoreForTesting.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/util/kv/KVStoreForTesting.java
index 20a00d0..a802e1d 100644
--- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/util/kv/KVStoreForTesting.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/util/kv/KVStoreForTesting.java
@@ -79,7 +79,7 @@ public class KVStoreForTesting {
public void append(final Object caller, final String keyStr, final Object value) {
val canRef = get(caller, keyStr);
- if(canRef.isEmpty()) {
+ if(! canRef.isPresent()) {
put(caller, keyStr, Can.ofSingleton(value));
} else {
@SuppressWarnings("unchecked")
@@ -91,7 +91,7 @@ public class KVStoreForTesting {
@SuppressWarnings("unchecked")
public Can<Object> getAll(final Class<?> callerType, final String keyStr) {
val canRef = get(callerType, keyStr);
- return canRef.isEmpty()
+ return ! canRef.isPresent()
? Can.empty()
: ((Can<Object>)canRef.get());
}
diff --git a/testing/fakedata/applib/src/test/java/org/apache/isis/testing/fakedata/applib/services/FakeDataServiceTest.java b/testing/fakedata/applib/src/test/java/org/apache/isis/testing/fakedata/applib/services/FakeDataServiceTest.java
index a66520d..03bc2fb 100644
--- a/testing/fakedata/applib/src/test/java/org/apache/isis/testing/fakedata/applib/services/FakeDataServiceTest.java
+++ b/testing/fakedata/applib/src/test/java/org/apache/isis/testing/fakedata/applib/services/FakeDataServiceTest.java
@@ -64,9 +64,7 @@ public class FakeDataServiceTest {
@Before
public void setUp() throws Exception {
- fakeDataService = new FakeDataService();
- fakeDataService.repositoryService = mockRepositoryService;
- fakeDataService.clockService = mockClockService;
+ fakeDataService = new FakeDataService(mockClockService, mockRepositoryService);
fakeDataService.init();
final VirtualClock virtualClock = VirtualClock.frozenAt(Instant.now());