This is an automated email from the ASF dual-hosted git repository. asf-gitbox-commits pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit 405e988e82ff5480a673dfbd70191579c2e1e5c7 Author: Andrus Adamchik <[email protected]> AuthorDate: Sat May 23 18:27:06 2026 -0400 Cleanup: Util.join is deprecated in favor of plain Java alternatives --- .../org/apache/cayenne/dbsync/reverse/filters/PatternFilter.java | 7 +++---- .../org/apache/cayenne/dbsync/reverse/filters/TableFilter.java | 5 ++--- .../apache/cayenne/project/validation/DbRelationshipValidator.java | 2 +- cayenne/src/main/java/org/apache/cayenne/util/Util.java | 3 ++- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/filters/PatternFilter.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/filters/PatternFilter.java index 704c14a2f..87f44a4ae 100644 --- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/filters/PatternFilter.java +++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/filters/PatternFilter.java @@ -18,12 +18,11 @@ ****************************************************************/ package org.apache.cayenne.dbsync.reverse.filters; -import org.apache.cayenne.util.Util; - import java.util.ArrayList; import java.util.Comparator; import java.util.List; import java.util.regex.Pattern; +import java.util.stream.Collectors; /** * @since 4.0 @@ -170,13 +169,13 @@ public class PatternFilter { if (includes.isEmpty()) { // Do nothing. } else if (includes.size() > 1) { - res.append("(").append(Util.join(includes, " OR ")).append(")"); + res.append("(").append(includes.stream().map(Pattern::pattern).collect(Collectors.joining(" OR "))).append(")"); } else { res.append(includes.get(0).pattern()); } if (!excludes.isEmpty()) { - res.append(" AND NOT (").append(Util.join(includes, " OR ")).append(")"); + res.append(" AND NOT (").append(includes.stream().map(Pattern::pattern).collect(Collectors.joining(" OR "))).append(")"); } return res; diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/filters/TableFilter.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/filters/TableFilter.java index 7b7f6d80c..190f56e5d 100644 --- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/filters/TableFilter.java +++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/filters/TableFilter.java @@ -24,8 +24,7 @@ import java.util.List; import java.util.Set; import java.util.TreeSet; import java.util.regex.Pattern; - -import org.apache.cayenne.util.Util; +import java.util.stream.Collectors; /** * TableFilter contain at least one IncludeTable always. @@ -121,7 +120,7 @@ public class TableFilter { } if (!excludes.isEmpty()) { - res.append(prefix).append(" ").append(Util.join(excludes, " OR ")).append("\n"); + res.append(prefix).append(" ").append(excludes.stream().map(Pattern::pattern).collect(Collectors.joining(" OR "))).append("\n"); } return res; diff --git a/cayenne-project/src/main/java/org/apache/cayenne/project/validation/DbRelationshipValidator.java b/cayenne-project/src/main/java/org/apache/cayenne/project/validation/DbRelationshipValidator.java index 287546d0f..a56fc2fd7 100644 --- a/cayenne-project/src/main/java/org/apache/cayenne/project/validation/DbRelationshipValidator.java +++ b/cayenne-project/src/main/java/org/apache/cayenne/project/validation/DbRelationshipValidator.java @@ -190,7 +190,7 @@ class DbRelationshipValidator extends ConfigurationNodeValidator<DbRelationship> } Collections.sort(joins); - return Util.join(joins, ","); + return String.join(",", joins); } private String toString(DbRelationship relationship) { diff --git a/cayenne/src/main/java/org/apache/cayenne/util/Util.java b/cayenne/src/main/java/org/apache/cayenne/util/Util.java index 07a8be4e9..272a012d8 100644 --- a/cayenne/src/main/java/org/apache/cayenne/util/Util.java +++ b/cayenne/src/main/java/org/apache/cayenne/util/Util.java @@ -53,7 +53,6 @@ import java.io.ObjectOutputStream; import java.io.Serializable; import java.lang.reflect.Member; import java.lang.reflect.Modifier; -import java.math.BigDecimal; import java.net.URI; import java.net.URISyntaxException; import java.net.URL; @@ -135,7 +134,9 @@ public class Util { * The separator between the strings. * @return A single string of all the input strings separated by the * separator. + * @deprecated use {@link String#join(CharSequence, CharSequence...)} or {@link java.util.stream.Collectors#joining} */ + @Deprecated(since = "5.0", forRemoval = true) public static String join(Iterable<?> objects, String separator) { if (objects == null) { return "";
