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
commit 0614fb994b5624470b96448f19395fab5ad54240 Merge: 9eebeff14d eb631d79e3 Author: andi-huber <[email protected]> AuthorDate: Sat May 20 10:27:04 2023 +0200 Merge remote-tracking branch 'origin/master' into spring6 .../org/apache/causeway/commons/io/FileUtils.java | 35 +++++++++++++++++----- .../value/ValueTypeGenTemplateTest.java | 10 +++++-- 2 files changed, 36 insertions(+), 9 deletions(-) diff --cc commons/src/main/java/org/apache/causeway/commons/io/FileUtils.java index 81b7c755ff,6bf87eb421..1addb1cb5a --- a/commons/src/main/java/org/apache/causeway/commons/io/FileUtils.java +++ b/commons/src/main/java/org/apache/causeway/commons/io/FileUtils.java @@@ -38,11 -39,12 +39,12 @@@ import java.util.Set import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Predicate; + import java.util.function.UnaryOperator; import org.springframework.lang.Nullable; +import org.springframework.util.function.ThrowingConsumer; +import org.springframework.util.function.ThrowingFunction; -import org.apache.causeway.commons.functional.ThrowingConsumer; -import org.apache.causeway.commons.functional.ThrowingFunction; import org.apache.causeway.commons.functional.Try; import org.apache.causeway.commons.internal.exceptions._Exceptions;
