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 6b8402731753f849d4c792af04a60586bd947d58 Author: Andrus Adamchik <[email protected]> AuthorDate: Sat May 23 18:27:06 2026 -0400 Cleanup: Util.isNumeric is deprecated in favor of plain Java alternatives --- cayenne/src/main/java/org/apache/cayenne/util/Util.java | 2 ++ .../modeler/ui/project/editor/query/SelectPropertiesPanel.java | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) 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 272a012d8..7abb0c4c6 100644 --- a/cayenne/src/main/java/org/apache/cayenne/util/Util.java +++ b/cayenne/src/main/java/org/apache/cayenne/util/Util.java @@ -251,7 +251,9 @@ public class Util { /** * @since 4.1 + * @deprecated use {@code cs.chars().allMatch(Character::isDigit)} or equivalent */ + @Deprecated(since = "5.0", forRemoval = true) public static boolean isNumeric(CharSequence cs) { if (isEmptyString(cs)) { return false; diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/SelectPropertiesPanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/SelectPropertiesPanel.java index 5a29eb322..564164325 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/SelectPropertiesPanel.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/SelectPropertiesPanel.java @@ -38,15 +38,12 @@ import org.apache.cayenne.modeler.project.ProjectSession; import org.apache.cayenne.query.QueryCacheStrategy; import org.apache.cayenne.map.QueryDescriptor; import org.apache.cayenne.query.QueryMetadata; -import org.apache.cayenne.util.Util; import java.util.Objects; import org.apache.cayenne.validation.ValidationException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.cayenne.util.Util.isNumeric; - /** * A panel that supports editing the properties of a GenericSelectQuery. * @@ -224,6 +221,10 @@ public abstract class SelectPropertiesPanel extends JPanel { } } + private static boolean isNumeric(String s) { + return s.chars().allMatch(Character::isDigit); + } + static final class CacheStrategyRenderer extends DefaultListCellRenderer { public Component getListCellRendererComponent(
