You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by ah...@apache.org on 2023/09/26 11:28:58 UTC
[causeway] branch spring6 updated: fixes previous merge commit
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch spring6
in repository https://gitbox.apache.org/repos/asf/causeway.git
The following commit(s) were added to refs/heads/spring6 by this push:
new fec7030a2e fixes previous merge commit
fec7030a2e is described below
commit fec7030a2ece3dc5700630d63245903938842667
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Sep 26 13:28:52 2023 +0200
fixes previous merge commit
---
.../src/main/java/org/apache/causeway/commons/internal/base/_Lazy.java | 2 +-
.../java/org/apache/causeway/commons/internal/base/_Lazy_Simple.java | 3 ++-
.../org/apache/causeway/commons/internal/base/_Lazy_ThreadSafe.java | 3 ++-
.../org/apache/causeway/commons/internal/binding/_Observables.java | 3 ++-
4 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/commons/src/main/java/org/apache/causeway/commons/internal/base/_Lazy.java b/commons/src/main/java/org/apache/causeway/commons/internal/base/_Lazy.java
index c7e451ea7e..815b964c6a 100644
--- a/commons/src/main/java/org/apache/causeway/commons/internal/base/_Lazy.java
+++ b/commons/src/main/java/org/apache/causeway/commons/internal/base/_Lazy.java
@@ -21,7 +21,7 @@ package org.apache.causeway.commons.internal.base;
import java.util.Optional;
import java.util.function.Supplier;
-import org.apache.causeway.commons.functional.ThrowingSupplier;
+import org.springframework.util.function.ThrowingSupplier;
/**
* <h1>- internal use only -</h1>
diff --git a/commons/src/main/java/org/apache/causeway/commons/internal/base/_Lazy_Simple.java b/commons/src/main/java/org/apache/causeway/commons/internal/base/_Lazy_Simple.java
index 58b57b835f..9ea7e383fd 100644
--- a/commons/src/main/java/org/apache/causeway/commons/internal/base/_Lazy_Simple.java
+++ b/commons/src/main/java/org/apache/causeway/commons/internal/base/_Lazy_Simple.java
@@ -20,7 +20,8 @@ package org.apache.causeway.commons.internal.base;
import java.util.Optional;
-import org.apache.causeway.commons.functional.ThrowingSupplier;
+import org.springframework.util.function.ThrowingSupplier;
+
import org.apache.causeway.commons.internal.exceptions._Exceptions;
import lombok.NonNull;
diff --git a/commons/src/main/java/org/apache/causeway/commons/internal/base/_Lazy_ThreadSafe.java b/commons/src/main/java/org/apache/causeway/commons/internal/base/_Lazy_ThreadSafe.java
index 088514d923..edd2cca50f 100644
--- a/commons/src/main/java/org/apache/causeway/commons/internal/base/_Lazy_ThreadSafe.java
+++ b/commons/src/main/java/org/apache/causeway/commons/internal/base/_Lazy_ThreadSafe.java
@@ -20,7 +20,8 @@ package org.apache.causeway.commons.internal.base;
import java.util.Optional;
-import org.apache.causeway.commons.functional.ThrowingSupplier;
+import org.springframework.util.function.ThrowingSupplier;
+
import org.apache.causeway.commons.internal.exceptions._Exceptions;
import lombok.NonNull;
diff --git a/commons/src/main/java/org/apache/causeway/commons/internal/binding/_Observables.java b/commons/src/main/java/org/apache/causeway/commons/internal/binding/_Observables.java
index 016fb157a1..f70462e03d 100644
--- a/commons/src/main/java/org/apache/causeway/commons/internal/binding/_Observables.java
+++ b/commons/src/main/java/org/apache/causeway/commons/internal/binding/_Observables.java
@@ -20,7 +20,8 @@ package org.apache.causeway.commons.internal.binding;
import java.util.function.BooleanSupplier;
-import org.apache.causeway.commons.functional.ThrowingSupplier;
+import org.springframework.util.function.ThrowingSupplier;
+
import org.apache.causeway.commons.internal.base._Lazy;
/**