Author: tv
Date: Thu Jul 23 14:45:33 2026
New Revision: 1936527
Log:
Fix deprecations, fix other m2e warnings.
Modified:
db/torque/trunk/torque-maven-plugin/pom.xml
db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/ColumnImpl.java
db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java
db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/sql/SqlBuilder.java
db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/util/ExceptionMapperImpl.java
db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/criteria/CriteriaTest.java
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/Platform.java
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/FieldHelper.java
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMTableAndViewTransformer.java
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SQLModelTransformer.java
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SQLTransformer.java
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/TypeMap.java
Modified: db/torque/trunk/torque-maven-plugin/pom.xml
==============================================================================
--- db/torque/trunk/torque-maven-plugin/pom.xml Thu Jul 23 14:27:47 2026
(r1936526)
+++ db/torque/trunk/torque-maven-plugin/pom.xml Thu Jul 23 14:45:33 2026
(r1936527)
@@ -61,7 +61,7 @@
<artifactId>maven-plugin-annotations</artifactId>
<version>3.13.1</version><!-- MPLUGIN-517 resolved in 3.13.0 -->
<!-- annotations are not used at runtime because
@Retention(value=CLASS), they are needed only to build the plugin -->
- <scope>provided</scope>
+ <scope>provided</scope>
</dependency>
<!--
java 11 has org.xml packages, removed xerces xercesImpl
@@ -73,25 +73,23 @@
<scope>test</scope>
</dependency>
-
<dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- <version>${log4j2.version}</version>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <version>${log4j2.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-1.2-api</artifactId>
- <version>${log4j2.version}</version>
- </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-1.2-api</artifactId>
+ </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter</artifactId>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
@@ -111,16 +109,15 @@
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
<configuration>
- <suppressionFiles>
+ <suppressionFiles>
<suppressionFile>${project.parent.basedir}/suppression-owasp-fp.xml</suppressionFile>
- </suppressionFiles>
+ </suppressionFiles>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- <version>3.15.2</version>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ </plugin>
</plugins>
</build>
Modified:
db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/ColumnImpl.java
==============================================================================
---
db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/ColumnImpl.java
Thu Jul 23 14:27:47 2026 (r1936526)
+++
db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/ColumnImpl.java
Thu Jul 23 14:45:33 2026 (r1936527)
@@ -22,6 +22,7 @@ package org.apache.torque;
import java.io.Serializable;
import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
@@ -160,7 +161,7 @@ public class ColumnImpl implements Colum
final int dotIndex = sqlExpression.lastIndexOf(DOT);
if (dotIndex == -1)
{
- if (StringUtils.contains(sqlExpression, "*"))
+ if (Strings.CS.contains(sqlExpression, "*"))
{
return;
}
@@ -301,7 +302,7 @@ public class ColumnImpl implements Colum
{
throw new IllegalArgumentException("tableName must not be blank");
}
- if (StringUtils.contains(tableName, DOT))
+ if (Strings.CS.contains(tableName, DOT))
{
int dotIndex = tableName.lastIndexOf(DOT);
this.schemaName = tableName.substring(0, dotIndex);
Modified:
db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java
==============================================================================
---
db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java
Thu Jul 23 14:27:47 2026 (r1936526)
+++
db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java
Thu Jul 23 14:45:33 2026 (r1936527)
@@ -38,6 +38,7 @@ import org.apache.commons.configuration2
import org.apache.commons.configuration2.ex.ConfigurationException;
import org.apache.commons.jcs3.JCS;
import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.torque.adapter.Adapter;
@@ -334,7 +335,7 @@ public class TorqueInstance
Database database = getOrCreateDatabase(handle);
Adapter adapter = null;
- if (StringUtils.equals(
+ if (Strings.CS.equals(
Adapter.AUTODETECT_ADAPTER,
adapterKey))
{
Modified:
db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/sql/SqlBuilder.java
==============================================================================
---
db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/sql/SqlBuilder.java
Thu Jul 23 14:27:47 2026 (r1936526)
+++
db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/sql/SqlBuilder.java
Thu Jul 23 14:45:33 2026 (r1936527)
@@ -24,8 +24,9 @@ import java.util.List;
import java.util.Map;
import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.Logger;
+import org.apache.commons.lang3.Strings;
import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.apache.torque.Column;
import org.apache.torque.ColumnImpl;
import org.apache.torque.Database;
@@ -625,7 +626,7 @@ public final class SqlBuilder
String fullTableName
= resolvedColumn.getFullTableName();
- if (!StringUtils.equals(
+ if (!Strings.CS.equals(
resolvedColumn.getTableName(),
column.getTableName()))
{
Modified:
db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/util/ExceptionMapperImpl.java
==============================================================================
---
db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/util/ExceptionMapperImpl.java
Thu Jul 23 14:27:47 2026 (r1936526)
+++
db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/util/ExceptionMapperImpl.java
Thu Jul 23 14:45:33 2026 (r1936527)
@@ -21,7 +21,7 @@ package org.apache.torque.util;
import java.sql.SQLException;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
import org.apache.torque.ConstraintViolationException;
import org.apache.torque.DeadlockException;
import org.apache.torque.TorqueException;
@@ -38,12 +38,12 @@ public class ExceptionMapperImpl extends
@Override
public TorqueException toTorqueException(final SQLException sqlException)
{
- if (StringUtils.startsWith(sqlException.getSQLState(), "23"))
+ if (Strings.CS.startsWith(sqlException.getSQLState(), "23"))
{
return new ConstraintViolationException(sqlException);
}
- if (StringUtils.equals(sqlException.getSQLState(), "40001") ||
StringUtils.equals(sqlException.getSQLState(), "40P01") ||
(StringUtils.equals(sqlException.getSQLState(), "61000")
- && sqlException.getErrorCode() == ORACLE_DEADLOCK_ERROR_CODE))
+ if (Strings.CS.equalsAny(sqlException.getSQLState(), "40001", "40P01")
+ || (Strings.CS.equals(sqlException.getSQLState(), "61000") &&
sqlException.getErrorCode() == ORACLE_DEADLOCK_ERROR_CODE))
{
// oracle
return new DeadlockException(sqlException);
Modified:
db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/criteria/CriteriaTest.java
==============================================================================
---
db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/criteria/CriteriaTest.java
Thu Jul 23 14:27:47 2026 (r1936526)
+++
db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/criteria/CriteriaTest.java
Thu Jul 23 14:45:33 2026 (r1936527)
@@ -1,8 +1,5 @@
package org.apache.torque.criteria;
-
-
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -22,12 +19,17 @@ package org.apache.torque.criteria;
* under the License.
*/
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
import java.util.List;
import java.util.Map;
-import java.util.Objects;
import org.apache.commons.lang3.SerializationUtils;
import org.apache.torque.BaseTestCase;
@@ -41,16 +43,8 @@ import org.apache.torque.map.TableMap;
import org.apache.torque.sql.OrderBy;
import org.apache.torque.sql.Query;
import org.apache.torque.sql.SqlBuilder;
-import org.apache.torque.util.CountHelper;
import org.apache.torque.util.UniqueList;
import org.apache.torque.util.functions.Count;
-
-import static org.junit.jupiter.api.Assertions.assertNotSame;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
-
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -693,7 +687,7 @@ public class CriteriaTest extends BaseTe
= result.getPreparedStatementReplacements();
assertEquals(0, preparedStatementReplacements.size());
}
-
+
@Test
public void testDistinctCount() throws TorqueException
{
@@ -701,18 +695,18 @@ public class CriteriaTest extends BaseTe
c.where(new ColumnImpl("TABLE", "COLUMN"),SqlEnum.ISNOTNULL );
c.addSelectColumn(new ColumnImpl("TABLE", "COLUMN"));
c.setDistinct();
-
+
Query result = SqlBuilder.buildQuery(c);
assertEquals(
"SELECT DISTINCT TABLE.COLUMN FROM TABLE WHERE "
+ "TABLE.COLUMN IS NOT NULL",
result.toString());
-
+
// now check distinct with count
// use case would be:
// CountHelper ch = new CountHelper();
// int count = ch.count( c ) -> sets columnName to *
-
+
/* Clear the select columns. */
c.getSelectColumns().clear();
// COUNT(DISTINCT *) would be not valid SQL, exclude if columnName = *
Modified:
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/Platform.java
==============================================================================
---
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/Platform.java
Thu Jul 23 14:27:47 2026 (r1936526)
+++
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/Platform.java
Thu Jul 23 14:45:33 2026 (r1936527)
@@ -1,11 +1,5 @@
package org.apache.torque.templates.platform;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.OffsetDateTime;
-import java.time.OffsetTime;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -25,7 +19,11 @@ import java.time.OffsetTime;
* under the License.
*/
-import java.util.Date;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.OffsetDateTime;
+import java.time.OffsetTime;
import org.apache.torque.templates.typemapping.SchemaType;
import org.apache.torque.templates.typemapping.SqlType;
Modified:
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/FieldHelper.java
==============================================================================
---
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/FieldHelper.java
Thu Jul 23 14:27:47 2026 (r1936526)
+++
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/FieldHelper.java
Thu Jul 23 14:45:33 2026 (r1936527)
@@ -1,11 +1,5 @@
package org.apache.torque.templates.transformer.om;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -25,8 +19,12 @@ import java.util.regex.Pattern;
* under the License.
*/
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.torque.generator.control.ControllerState;
import org.apache.torque.templates.TemplateOptionName;
import org.apache.torque.templates.typemapping.JavaType;
@@ -245,10 +243,10 @@ final class FieldHelper
TemplateOptionName.OM_SET_AND_SAVE_SUFFIX);
return fillerName;
}
-
+
/**
* Pluralize the field name, if matches simple pattern, else return
original.
- *
+ *
* @param fieldName
* @return the fied name, not null.
*/
Modified:
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMTableAndViewTransformer.java
==============================================================================
---
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMTableAndViewTransformer.java
Thu Jul 23 14:27:47 2026 (r1936526)
+++
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMTableAndViewTransformer.java
Thu Jul 23 14:45:33 2026 (r1936527)
@@ -38,6 +38,7 @@ import java.util.Objects;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.torque.generator.control.ControllerState;
@@ -228,7 +229,7 @@ public class OMTableAndViewTransformer e
String name = (String)
tableElement.getAttribute(TorqueSchemaAttributeName.NAME);
String unqualifiedName = name;
- if (StringUtils.contains(name, DOT))
+ if (Strings.CS.contains(name, DOT))
{
unqualifiedName = name.substring(name.indexOf(DOT) + 1);
}
@@ -645,7 +646,7 @@ public class OMTableAndViewTransformer e
GET_DEFAULT_TIMESTAMP_WITH_TIMEZONE_METHOD_NAME);
}
}
-
+
if ("java.time.OffsetTime".equals(
column.getAttribute(JavaFieldAttributeName.FIELD_TYPE)))
{
Modified:
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SQLModelTransformer.java
==============================================================================
---
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SQLModelTransformer.java
Thu Jul 23 14:27:47 2026 (r1936526)
+++
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SQLModelTransformer.java
Thu Jul 23 14:45:33 2026 (r1936527)
@@ -1,11 +1,5 @@
package org.apache.torque.templates.transformer.sql;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.OffsetDateTime;
-import java.time.OffsetTime;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -25,12 +19,17 @@ import java.time.OffsetTime;
* under the License.
*/
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.OffsetDateTime;
+import java.time.OffsetTime;
import java.util.ArrayList;
-import java.util.Date;
import java.util.Iterator;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
import org.apache.torque.generator.control.ControllerState;
import org.apache.torque.generator.source.transform.SourceTransformer;
import org.apache.torque.generator.source.transform.SourceTransformerException;
@@ -110,7 +109,7 @@ public class SQLModelTransformer impleme
throws SourceTransformerException
{
table.unqualifiedName = table.name;
- if (StringUtils.contains(table.name, "."))
+ if (Strings.CS.contains(table.name, "."))
{
table.unqualifiedName
= table.name.substring(table.name.indexOf(".") + 1);
Modified:
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SQLTransformer.java
==============================================================================
---
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SQLTransformer.java
Thu Jul 23 14:27:47 2026 (r1936526)
+++
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SQLTransformer.java
Thu Jul 23 14:45:33 2026 (r1936527)
@@ -1,11 +1,5 @@
package org.apache.torque.templates.transformer.sql;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.OffsetDateTime;
-import java.time.OffsetTime;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -25,12 +19,17 @@ import java.time.OffsetTime;
* under the License.
*/
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.OffsetDateTime;
+import java.time.OffsetTime;
import java.util.ArrayList;
-import java.util.Date;
import java.util.List;
import java.util.Objects;
import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
import org.apache.torque.generator.control.ControllerState;
import org.apache.torque.generator.source.SourceElement;
import org.apache.torque.generator.source.SourcePath;
@@ -115,7 +114,7 @@ public class SQLTransformer implements S
String tableName = (String) tableElement.getAttribute(
TorqueSchemaAttributeName.NAME);
String unqualifiedTableName = tableName;
- if (StringUtils.contains(tableName, "."))
+ if (Strings.CS.contains(tableName, "."))
{
unqualifiedTableName = tableName.substring(tableName.indexOf(".")
+ 1);
}
Modified:
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/TypeMap.java
==============================================================================
---
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/TypeMap.java
Thu Jul 23 14:27:47 2026 (r1936526)
+++
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/typemapping/TypeMap.java
Thu Jul 23 14:45:33 2026 (r1936527)
@@ -1,11 +1,5 @@
package org.apache.torque.templates.typemapping;
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.ZoneOffset;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -63,7 +57,7 @@ import java.util.Set;
* TIMESTAMP | java.time.LocalDateTime | java.time.LocalDateTime
* TIMESTAMP_WITH_TIMEZONE | java.time.OffsetDateTime |
java.time.OffsetDateTime
* TIME_WITH_TIMEZONE | java.time.OffsetTime | java.time.OffsetTime
- *
+ *
* -------------------------------------------------------
* A couple variations have been introduced to cover cases
* that may arise, but are not covered above
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
