From 980d1d3fc7fe9b5b2dde1df520f2681f65c3e2fe Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Fri, 18 Nov 2022 11:48:37 +0100 Subject: [PATCH] [jOOQ/jOOQ#14251] Refactor !anyMatch(l, x -> !t) to allMatch(l, x -> t) --- jOOQ/src/main/java/org/jooq/impl/Diff.java | 1 + jOOQ/src/main/java/org/jooq/impl/Interpreter.java | 3 ++- jOOQ/src/main/java/org/jooq/impl/Patterns.java | 2 -- jOOQ/src/main/java/org/jooq/impl/QualifiedName.java | 6 ++---- .../main/java/org/jooq/impl/QueryPartCollectionView.java | 3 ++- jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java | 1 + jOOQ/src/main/java/org/jooq/impl/SortFieldList.java | 3 ++- jOOQ/src/main/java/org/jooq/impl/XMLHandler.java | 4 ++-- 8 files changed, 12 insertions(+), 11 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/impl/Diff.java b/jOOQ/src/main/java/org/jooq/impl/Diff.java index df5cdb3e8c..a151461cd1 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Diff.java +++ b/jOOQ/src/main/java/org/jooq/impl/Diff.java @@ -54,6 +54,7 @@ import static org.jooq.impl.ConstraintType.FOREIGN_KEY; import static org.jooq.impl.ConstraintType.PRIMARY_KEY; import static org.jooq.impl.ConstraintType.UNIQUE; import static org.jooq.impl.Tools.NO_SUPPORT_TIMESTAMP_PRECISION; +import static org.jooq.impl.Tools.allMatch; import static org.jooq.impl.Tools.anyMatch; import static org.jooq.tools.StringUtils.defaultIfNull; import static org.jooq.tools.StringUtils.defaultString; diff --git a/jOOQ/src/main/java/org/jooq/impl/Interpreter.java b/jOOQ/src/main/java/org/jooq/impl/Interpreter.java index ec7ed8f144..51949eb568 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Interpreter.java +++ b/jOOQ/src/main/java/org/jooq/impl/Interpreter.java @@ -51,6 +51,7 @@ import static org.jooq.impl.DSL.schema; import static org.jooq.impl.FieldsImpl.fieldsRow0; import static org.jooq.impl.SQLDataType.BIGINT; import static org.jooq.impl.Tools.EMPTY_FIELD; +import static org.jooq.impl.Tools.allMatch; import static org.jooq.impl.Tools.anyMatch; import static org.jooq.impl.Tools.apply; import static org.jooq.impl.Tools.dataTypes; @@ -1862,7 +1863,7 @@ final class Interpreter { if (fields.size() != f.length) return false; else - return !anyMatch(fields, (x, i) -> !x.nameEquals((UnqualifiedName) f[i].getUnqualifiedName())); + return allMatch(fields, (x, i) -> x.nameEquals((UnqualifiedName) f[i].getUnqualifiedName())); } } diff --git a/jOOQ/src/main/java/org/jooq/impl/Patterns.java b/jOOQ/src/main/java/org/jooq/impl/Patterns.java index a62354f315..5bc9adfd58 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Patterns.java +++ b/jOOQ/src/main/java/org/jooq/impl/Patterns.java @@ -2507,8 +2507,6 @@ package org.jooq.impl; - - diff --git a/jOOQ/src/main/java/org/jooq/impl/QualifiedName.java b/jOOQ/src/main/java/org/jooq/impl/QualifiedName.java index 7d18c4e948..aa8c870dc6 100644 --- a/jOOQ/src/main/java/org/jooq/impl/QualifiedName.java +++ b/jOOQ/src/main/java/org/jooq/impl/QualifiedName.java @@ -40,12 +40,10 @@ package org.jooq.impl; import static org.jooq.Name.Quoted.DEFAULT; import static org.jooq.Name.Quoted.MIXED; // ... -import static org.jooq.impl.Tools.anyMatch; +import static org.jooq.impl.Tools.allMatch; import static org.jooq.impl.Tools.map; import static org.jooq.impl.Tools.stringLiteral; -import java.util.function.Supplier; - import org.jooq.Context; import org.jooq.Name; import org.jooq.tools.StringUtils; @@ -188,7 +186,7 @@ final class QualifiedName extends AbstractName { @Override public final boolean empty() { - return !anyMatch(qualifiedName, n -> !n.empty()); + return allMatch(qualifiedName, n -> n.empty()); } @Override diff --git a/jOOQ/src/main/java/org/jooq/impl/QueryPartCollectionView.java b/jOOQ/src/main/java/org/jooq/impl/QueryPartCollectionView.java index dda0245277..d1c9cbcb53 100644 --- a/jOOQ/src/main/java/org/jooq/impl/QueryPartCollectionView.java +++ b/jOOQ/src/main/java/org/jooq/impl/QueryPartCollectionView.java @@ -40,6 +40,7 @@ package org.jooq.impl; import static java.lang.Boolean.TRUE; import static org.jooq.impl.Tools.EMPTY_QUERYPART; +import static org.jooq.impl.Tools.allMatch; import static org.jooq.impl.Tools.anyMatch; import static org.jooq.impl.Tools.isRendersSeparator; import static org.jooq.impl.Tools.last; @@ -131,7 +132,7 @@ permits @Override public boolean isSimple(Context ctx) { - return !anyMatch(this, e -> !Tools.isSimple(ctx, e)); + return allMatch(this, e -> Tools.isSimple(ctx, e)); } @Override diff --git a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java index 4b84c2bc33..77715d14e6 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java @@ -189,6 +189,7 @@ import static org.jooq.impl.SQLDataType.VARCHAR; import static org.jooq.impl.SQLDataType.XML; import static org.jooq.impl.Tools.aliased; import static org.jooq.impl.Tools.aliasedFields; +import static org.jooq.impl.Tools.allMatch; import static org.jooq.impl.Tools.anyMatch; import static org.jooq.impl.Tools.autoAlias; import static org.jooq.impl.Tools.camelCase; diff --git a/jOOQ/src/main/java/org/jooq/impl/SortFieldList.java b/jOOQ/src/main/java/org/jooq/impl/SortFieldList.java index cf67fc8247..64a40d3f93 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SortFieldList.java +++ b/jOOQ/src/main/java/org/jooq/impl/SortFieldList.java @@ -39,6 +39,7 @@ package org.jooq.impl; import static org.jooq.SortOrder.DESC; +import static org.jooq.impl.Tools.allMatch; import static org.jooq.impl.Tools.anyMatch; import java.util.List; @@ -74,7 +75,7 @@ final class SortFieldList extends QueryPartList> { * all {@link SortOrder#ASC} or all {@link SortOrder#DESC}. */ final boolean uniform() { - return !anyMatch(this, f -> (f.getOrder() == DESC) != (get(0).getOrder() == DESC)); + return allMatch(this, f -> (f.getOrder() == DESC) == (get(0).getOrder() == DESC)); } /** diff --git a/jOOQ/src/main/java/org/jooq/impl/XMLHandler.java b/jOOQ/src/main/java/org/jooq/impl/XMLHandler.java index 05b8f0fcb9..f19ce4220c 100644 --- a/jOOQ/src/main/java/org/jooq/impl/XMLHandler.java +++ b/jOOQ/src/main/java/org/jooq/impl/XMLHandler.java @@ -43,7 +43,7 @@ import static org.jooq.impl.DSL.name; import static org.jooq.impl.DefaultDataType.getDataType; import static org.jooq.impl.SQLDataType.VARCHAR; import static org.jooq.impl.Tools.EMPTY_FIELD; -import static org.jooq.impl.Tools.anyMatch; +import static org.jooq.impl.Tools.allMatch; import static org.jooq.impl.Tools.fields; import static org.jooq.impl.Tools.newRecord; import static org.jooq.impl.Tools.row0; @@ -344,7 +344,7 @@ final class XMLHandler extends DefaultHandler { if (fields.size() <= 1) return false; else - return !anyMatch(fields, f -> !"value".equalsIgnoreCase(f.getName())); + return allMatch(fields, f -> "value".equalsIgnoreCase(f.getName())); } @Override