This is an automated email from the ASF dual-hosted git repository. asf-gitbox-commits pushed a commit to branch CAY-2935 in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit 61e520532d96674145103bb31055bab5efc2cc73 Author: Andrus Adamchik <[email protected]> AuthorDate: Thu May 7 13:31:40 2026 -0400 CAY-2935 Upgrade Cayenne 5.0 to Java 21 syntax upgrade - List.of(..) --- .../apache/cayenne/project/upgrade/handlers/UpgradeHandler_V11.java | 3 +-- .../org/apache/cayenne/project/validation/NameValidationHelper.java | 6 +++--- .../org/apache/cayenne/configuration/xml/SAXNestedTagHandler.java | 6 ++---- .../src/main/java/org/apache/cayenne/dba/mysql/MySQLAdapter.java | 5 ++--- .../src/main/java/org/apache/cayenne/dba/oracle/OracleAdapter.java | 3 +-- .../org/apache/cayenne/dba/postgres/PostgreSQLTreeProcessor.java | 6 ++---- .../main/java/org/apache/cayenne/dba/postgres/PostgresAdapter.java | 3 +-- .../java/org/apache/cayenne/dba/sqlserver/SQLServerAdapter.java | 5 ++--- cayenne/src/main/java/org/apache/cayenne/exp/parser/Evaluator.java | 3 +-- cayenne/src/main/java/org/apache/cayenne/query/QueryChain.java | 4 ++-- .../main/java/org/apache/cayenne/runtime/CayenneRuntimeBuilder.java | 3 +-- 11 files changed, 18 insertions(+), 29 deletions(-) diff --git a/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V11.java b/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V11.java index 6e95a685a..e6f280aea 100644 --- a/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V11.java +++ b/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V11.java @@ -36,7 +36,6 @@ import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.NoSuchFileException; import java.nio.file.Paths; -import java.util.Arrays; import java.util.List; /** @@ -52,7 +51,7 @@ public class UpgradeHandler_V11 implements UpgradeHandler { private static final Logger logger = LoggerFactory.getLogger(UpgradeHandler_V11.class); - private static final List<String> defaultTemplatePaths = Arrays.asList( + private static final List<String> defaultTemplatePaths = List.of( "templates/v4_1/singleclass.vm", "templates/v4_1/superclass.vm", "templates/v4_1/subclass.vm", diff --git a/cayenne-project/src/main/java/org/apache/cayenne/project/validation/NameValidationHelper.java b/cayenne-project/src/main/java/org/apache/cayenne/project/validation/NameValidationHelper.java index 5b411d2d5..596efa8b3 100644 --- a/cayenne-project/src/main/java/org/apache/cayenne/project/validation/NameValidationHelper.java +++ b/cayenne-project/src/main/java/org/apache/cayenne/project/validation/NameValidationHelper.java @@ -19,8 +19,8 @@ package org.apache.cayenne.project.validation; -import java.util.Arrays; import java.util.Collection; +import java.util.List; import java.util.StringTokenizer; /** @@ -30,7 +30,7 @@ import java.util.StringTokenizer; */ public class NameValidationHelper { - static final Collection<String> RESERVED_JAVA_KEYWORDS = Arrays.asList( + static final Collection<String> RESERVED_JAVA_KEYWORDS = List.of( "abstract", "assert", "default", @@ -88,7 +88,7 @@ public class NameValidationHelper { // a property is considered invalid if there is a getter or a setter for it in // java.lang.Object or PersistentObject - static final Collection<String> INVALID_JAVA_PROPERTIES = Arrays.asList( + static final Collection<String> INVALID_JAVA_PROPERTIES = List.of( "class", "committedSnapshot", "currentSnapshot", diff --git a/cayenne/src/main/java/org/apache/cayenne/configuration/xml/SAXNestedTagHandler.java b/cayenne/src/main/java/org/apache/cayenne/configuration/xml/SAXNestedTagHandler.java index 5b9740d56..c26751653 100644 --- a/cayenne/src/main/java/org/apache/cayenne/configuration/xml/SAXNestedTagHandler.java +++ b/cayenne/src/main/java/org/apache/cayenne/configuration/xml/SAXNestedTagHandler.java @@ -18,8 +18,6 @@ ****************************************************************/ package org.apache.cayenne.configuration.xml; -import java.util.Arrays; -import java.util.Collections; import java.util.List; import java.util.Objects; @@ -82,8 +80,8 @@ public class SAXNestedTagHandler extends DefaultHandler { protected String unexpectedTagMessage(String tagFound, String... tagsExpected) { List<String> expected = tagsExpected != null - ? Arrays.asList(tagsExpected) - : Collections.emptyList(); + ? List.of(tagsExpected) + : List.of(); return String.format("tag <%s> is unexpected at [%d,%d]. The following tags are allowed here: %s", tagFound, diff --git a/cayenne/src/main/java/org/apache/cayenne/dba/mysql/MySQLAdapter.java b/cayenne/src/main/java/org/apache/cayenne/dba/mysql/MySQLAdapter.java index 3aec4a1bd..391589391 100644 --- a/cayenne/src/main/java/org/apache/cayenne/dba/mysql/MySQLAdapter.java +++ b/cayenne/src/main/java/org/apache/cayenne/dba/mysql/MySQLAdapter.java @@ -52,7 +52,6 @@ import java.sql.PreparedStatement; import java.sql.SQLException; import java.sql.Types; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.Comparator; import java.util.Iterator; @@ -81,7 +80,7 @@ import java.util.List; public class MySQLAdapter extends JdbcAdapter { static final String DEFAULT_STORAGE_ENGINE = "InnoDB"; - static final List<String> SYSTEM_CATALOGS = Arrays.asList("sys", "information_schema", "mysql", "performance_schema"); + static final List<String> SYSTEM_CATALOGS = List.of("sys", "information_schema", "mysql", "performance_schema"); protected String storageEngine; @@ -136,7 +135,7 @@ public class MySQLAdapter extends JdbcAdapter { QuotingStrategy context = getQuotingStrategy(); buf.append(context.quotedFullyQualifiedName(table)); - return Arrays.asList("SET FOREIGN_KEY_CHECKS=0", "DROP TABLE IF EXISTS " + buf.toString() + " CASCADE", + return List.of("SET FOREIGN_KEY_CHECKS=0", "DROP TABLE IF EXISTS " + buf.toString() + " CASCADE", "SET FOREIGN_KEY_CHECKS=1"); } diff --git a/cayenne/src/main/java/org/apache/cayenne/dba/oracle/OracleAdapter.java b/cayenne/src/main/java/org/apache/cayenne/dba/oracle/OracleAdapter.java index 501e7daf8..adb684e60 100644 --- a/cayenne/src/main/java/org/apache/cayenne/dba/oracle/OracleAdapter.java +++ b/cayenne/src/main/java/org/apache/cayenne/dba/oracle/OracleAdapter.java @@ -25,7 +25,6 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Types; -import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.List; @@ -84,7 +83,7 @@ public class OracleAdapter extends JdbcAdapter { protected static boolean supportsOracleLOB; - private List<String> SYSTEM_SCHEMAS = Arrays.asList( + private List<String> SYSTEM_SCHEMAS = List.of( "ANONYMOUS", "APPQOSSYS", "AUDSYS", "CTXSYS", "DBSFWUSER", "DBSNMP", "DIP", "DVF", "GGSYS", "DVSYS", "GSMADMIN_INTERNAL", "GSMCATUSER", "GSMUSER", "LBACSYS", "MDDATA", "MDSYS", "OJVMSYS", diff --git a/cayenne/src/main/java/org/apache/cayenne/dba/postgres/PostgreSQLTreeProcessor.java b/cayenne/src/main/java/org/apache/cayenne/dba/postgres/PostgreSQLTreeProcessor.java index b49d6648e..f92732f7c 100644 --- a/cayenne/src/main/java/org/apache/cayenne/dba/postgres/PostgreSQLTreeProcessor.java +++ b/cayenne/src/main/java/org/apache/cayenne/dba/postgres/PostgreSQLTreeProcessor.java @@ -19,8 +19,6 @@ package org.apache.cayenne.dba.postgres; -import java.util.Arrays; -import java.util.HashSet; import java.util.Optional; import java.util.Set; @@ -45,9 +43,9 @@ import org.apache.cayenne.value.Wkt; */ public class PostgreSQLTreeProcessor extends TypeAwareSQLTreeProcessor { - private static final Set<String> EXTRACT_FUNCTION_NAMES = new HashSet<>(Arrays.asList( + private static final Set<String> EXTRACT_FUNCTION_NAMES = Set.of( "DAY_OF_MONTH", "DAY", "MONTH", "HOUR", "WEEK", "YEAR", "DAY_OF_WEEK", "DAY_OF_YEAR", "MINUTE", "SECOND" - )); + ); public PostgreSQLTreeProcessor() { registerProcessor(NodeType.LIMIT_OFFSET, (ChildProcessor<LimitOffsetNode>)this::onLimitOffsetNode); diff --git a/cayenne/src/main/java/org/apache/cayenne/dba/postgres/PostgresAdapter.java b/cayenne/src/main/java/org/apache/cayenne/dba/postgres/PostgresAdapter.java index df67c1d45..eac2d8f4a 100644 --- a/cayenne/src/main/java/org/apache/cayenne/dba/postgres/PostgresAdapter.java +++ b/cayenne/src/main/java/org/apache/cayenne/dba/postgres/PostgresAdapter.java @@ -22,7 +22,6 @@ package org.apache.cayenne.dba.postgres; import java.sql.PreparedStatement; import java.sql.SQLException; import java.sql.Types; -import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.Iterator; @@ -67,7 +66,7 @@ public class PostgresAdapter extends JdbcAdapter { public static final String BYTEA = "bytea"; - private List<String> SYSTEM_SCHEMAS = Arrays.asList("information_schema", "pg_catalog"); + private List<String> SYSTEM_SCHEMAS = List.of("information_schema", "pg_catalog"); public PostgresAdapter(@Inject RuntimeProperties runtimeProperties, @Inject(Constants.DEFAULT_TYPES_LIST) List<ExtendedType> defaultExtendedTypes, diff --git a/cayenne/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerAdapter.java b/cayenne/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerAdapter.java index 9b532f560..a06dbf053 100644 --- a/cayenne/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerAdapter.java +++ b/cayenne/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerAdapter.java @@ -19,7 +19,6 @@ package org.apache.cayenne.dba.sqlserver; -import java.util.Arrays; import java.util.Collection; import java.util.Iterator; import java.util.List; @@ -91,13 +90,13 @@ public class SQLServerAdapter extends SybaseAdapter { */ private Integer version; - private final List<String> SYSTEM_SCHEMAS = Arrays.asList( + private final List<String> SYSTEM_SCHEMAS = List.of( "db_accessadmin", "db_backupoperator", "db_datareader", "db_datawriter", "db_ddladmin", "db_denydatareader", "db_denydatawriter", "sys", "db_owner", "db_securityadmin", "INFORMATION_SCHEMA" ); - private final List<String> SYSTEM_CATALOGS = Arrays.asList("model", "msdb", "tempdb"); + private final List<String> SYSTEM_CATALOGS = List.of("model", "msdb", "tempdb"); public SQLServerAdapter(@Inject RuntimeProperties runtimeProperties, @Inject(Constants.DEFAULT_TYPES_LIST) List<ExtendedType> defaultExtendedTypes, diff --git a/cayenne/src/main/java/org/apache/cayenne/exp/parser/Evaluator.java b/cayenne/src/main/java/org/apache/cayenne/exp/parser/Evaluator.java index 64a0d0da6..6cd79f62b 100644 --- a/cayenne/src/main/java/org/apache/cayenne/exp/parser/Evaluator.java +++ b/cayenne/src/main/java/org/apache/cayenne/exp/parser/Evaluator.java @@ -20,7 +20,6 @@ package org.apache.cayenne.exp.parser; import java.math.BigDecimal; import java.math.BigInteger; -import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -176,7 +175,7 @@ abstract class Evaluator { return equalNumbers((Number)lhs, rhs); } - private final List WHOLE_NUMBER_CLASSES = Arrays.asList(Byte.class, Short.class, Integer.class, AtomicInteger.class, Long.class, AtomicLong.class, BigInteger.class); + private final List WHOLE_NUMBER_CLASSES = List.of(Byte.class, Short.class, Integer.class, AtomicInteger.class, Long.class, AtomicLong.class, BigInteger.class); /** * Returns the widest primitive wrapper class given the two operands, used in preparation for diff --git a/cayenne/src/main/java/org/apache/cayenne/query/QueryChain.java b/cayenne/src/main/java/org/apache/cayenne/query/QueryChain.java index d448159c3..37fd17dc5 100644 --- a/cayenne/src/main/java/org/apache/cayenne/query/QueryChain.java +++ b/cayenne/src/main/java/org/apache/cayenne/query/QueryChain.java @@ -24,8 +24,8 @@ import org.apache.cayenne.map.DataMap; import org.apache.cayenne.map.EntityResolver; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; +import java.util.List; /** * A Query decorator for a collection of other queries. Note that QueryChain will always @@ -49,7 +49,7 @@ public class QueryChain implements Query { */ public QueryChain(Query[] queries) { if (queries != null && queries.length > 0) { - this.chain = new ArrayList<>(Arrays.asList(queries)); + this.chain = new ArrayList<>(List.of(queries)); } } diff --git a/cayenne/src/main/java/org/apache/cayenne/runtime/CayenneRuntimeBuilder.java b/cayenne/src/main/java/org/apache/cayenne/runtime/CayenneRuntimeBuilder.java index b807b216e..3e8618dc4 100644 --- a/cayenne/src/main/java/org/apache/cayenne/runtime/CayenneRuntimeBuilder.java +++ b/cayenne/src/main/java/org/apache/cayenne/runtime/CayenneRuntimeBuilder.java @@ -29,7 +29,6 @@ import org.apache.cayenne.di.spi.ModuleLoader; import javax.sql.DataSource; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.LinkedHashSet; @@ -161,7 +160,7 @@ public class CayenneRuntimeBuilder { public CayenneRuntimeBuilder addConfigs(String... configurationLocations) { if (configurationLocations != null) { - configs.addAll(Arrays.asList(configurationLocations)); + configs.addAll(List.of(configurationLocations)); } return this; }
