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 900764c896b9cc8dca671b84c8e81ef2a4cba085 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 - multiline strings --- .../cayenne/configuration/DataSourceDescriptor.java | 17 +++++++++-------- .../main/java/org/apache/cayenne/dba/TypesMapping.java | 7 +++++-- .../cayenne/dba/sqlserver/SQLServerPkGenerator.java | 9 +++++---- .../apache/cayenne/dba/sybase/SybasePkGenerator.java | 9 ++++++--- 4 files changed, 25 insertions(+), 17 deletions(-) diff --git a/cayenne/src/main/java/org/apache/cayenne/configuration/DataSourceDescriptor.java b/cayenne/src/main/java/org/apache/cayenne/configuration/DataSourceDescriptor.java index e72ccd6e5..d35abe95e 100644 --- a/cayenne/src/main/java/org/apache/cayenne/configuration/DataSourceDescriptor.java +++ b/cayenne/src/main/java/org/apache/cayenne/configuration/DataSourceDescriptor.java @@ -121,13 +121,14 @@ public class DataSourceDescriptor implements Serializable, XMLSerializable { @Override public String toString() { - return "[" + getClass().getName() + ":" + - "\n driver: " + jdbcDriver + - "\n url: " + dataSourceUrl + - "\n user name: " + userName + - "\n password: " + "**********" + - "\n min. connections: " + minConnections + - "\n max. connections: " + maxConnections + - "\n]"; + return """ + [%s: + driver: %s + url: %s + user name: %s + password: ********** + min. connections: %d + max. connections: %d + ]""".formatted(getClass().getName(), jdbcDriver, dataSourceUrl, userName, minConnections, maxConnections); } } diff --git a/cayenne/src/main/java/org/apache/cayenne/dba/TypesMapping.java b/cayenne/src/main/java/org/apache/cayenne/dba/TypesMapping.java index d5eeaa236..82c3c5e0c 100644 --- a/cayenne/src/main/java/org/apache/cayenne/dba/TypesMapping.java +++ b/cayenne/src/main/java/org/apache/cayenne/dba/TypesMapping.java @@ -591,8 +591,11 @@ public class TypesMapping { @Override public String toString() { - return "[ TypeInfo: " + name + "\n JDBC Type: " + TypesMapping.getSqlNameByType(jdbcType) - + "\n Precision: " + precision + "\n]"; + return """ + [ TypeInfo: %s + JDBC Type: %s + Precision: %s + ]""".formatted(name, TypesMapping.getSqlNameByType(jdbcType), precision); } } diff --git a/cayenne/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerPkGenerator.java b/cayenne/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerPkGenerator.java index 6cff95937..36800e375 100644 --- a/cayenne/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerPkGenerator.java +++ b/cayenne/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerPkGenerator.java @@ -118,10 +118,11 @@ public class SQLServerPkGenerator extends OraclePkGenerator { @Override protected String selectAllSequencesQuery() { - return "SELECT seq.name" - + " FROM sys.sequences AS seq" - + " JOIN sys.schemas AS sch" - + " ON seq.schema_id = sch.schema_id"; + return """ + SELECT seq.name + FROM sys.sequences AS seq + JOIN sys.schemas AS sch + ON seq.schema_id = sch.schema_id"""; } @Override diff --git a/cayenne/src/main/java/org/apache/cayenne/dba/sybase/SybasePkGenerator.java b/cayenne/src/main/java/org/apache/cayenne/dba/sybase/SybasePkGenerator.java index f7bd8af66..91c7ed0e9 100644 --- a/cayenne/src/main/java/org/apache/cayenne/dba/sybase/SybasePkGenerator.java +++ b/cayenne/src/main/java/org/apache/cayenne/dba/sybase/SybasePkGenerator.java @@ -198,9 +198,12 @@ public class SybasePkGenerator extends JdbcPkGenerator { } private String unsafePkProcCreate() { - return " CREATE PROCEDURE auto_pk_for_table @tname VARCHAR(32), @pkbatchsize INT AS BEGIN BEGIN TRANSACTION" - + " UPDATE AUTO_PK_SUPPORT set NEXT_ID = NEXT_ID + @pkbatchsize WHERE TABLE_NAME = @tname" - + " SELECT NEXT_ID FROM AUTO_PK_SUPPORT WHERE TABLE_NAME = @tname COMMIT END"; + return """ + CREATE PROCEDURE auto_pk_for_table @tname VARCHAR(32), @pkbatchsize INT AS BEGIN + BEGIN TRANSACTION + UPDATE AUTO_PK_SUPPORT set NEXT_ID = NEXT_ID + @pkbatchsize WHERE TABLE_NAME = @tname + SELECT NEXT_ID FROM AUTO_PK_SUPPORT WHERE TABLE_NAME = @tname + COMMIT END"""; } private String safePkProcDrop() {
