svn commit: r1936821 - in db/torque/trunk: torque-generator/src/main/java/org/apache/torque/generator/qname torque-generator/src/main/java/org/apache/torque/generator/source torque-generator/src/main/java/org/apache/torque/generator/source/stream torqu...
[email protected] Mon, 03 Aug 2026 12:53:42 -0000
| Newsgroups | gmane.comp.jakarta.turbine.torque.devel |
|---|---|
| Message-ID | <178576162293.1846369.10659047309199239363@svn03-he-fi> |
Author: tv
Date: Mon Aug 3 12:53:42 2026
New Revision: 1936821
Log:
Use Java 14 instanceof statement
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/qname/Namespace.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/qname/QualifiedName.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/qname/QualifiedNameMap.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/ModelPropertyPointer.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceElementAttributePointer.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceElementNodePointer.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceElementNodePointerFactory.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/FileSourceProvider.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/model/PropertyAccess.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/groovy/GroovyOutlet.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/TorqueGenVelocity.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/VelocityOutlet.java
db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Criteria.java
db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Criterion.java
db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Join.java
db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/SqlEnum.java
db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/map/MapHelper.java
db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/map/TableMap.java
db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/oid/AbstractIdGenerator.java
db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/om/ComboKey.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/sql/objectbuilder/ObjectOrColumnPsPartBuilder.java
db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/InBuilder.java
db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/NullValueBuilder.java
db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/util/BasePeerImpl.java
db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/util/functions/AbstractFunction.java
db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/util/functions/AggregateFunction.java
db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/manager/AbstractBaseManagerTest.java
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMColumnTransformer.java
db/torque/trunk/torque-test/src/test/java/org/apache/torque/DataTest.java
db/torque/trunk/torque-test/src/test/java/org/apache/torque/ManagerTestConditional.java
db/torque/trunk/torque-test/src/test/java/org/apache/torque/datatypes/BooleanIntCharTest.java
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DeleteTest.java
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/ImplInitialisationTest.java
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/OptimisticLockingSelectForUpdateTest.java
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/OptimisticLockingSimpleSelectTest.java
db/torque/trunk/torque-test/src/test/java/org/apache/torque/map/DatabaseMapTest.java
db/torque/trunk/torque-test/src/test/java/org/apache/torque/util/ExceptionMapperTest.java
Modified: db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/qname/Namespace.java
==============================================================================
--- db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/qname/Namespace.java Mon Aug 3 12:52:58 2026 (r1936820)
+++ db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/qname/Namespace.java Mon Aug 3 12:53:42 2026 (r1936821)
@@ -238,13 +238,12 @@ public final class Namespace
@Override
public boolean equals(Object o)
{
- if (!(o instanceof Namespace))
+ if (o instanceof Namespace otherNamespace)
{
- return false;
+ return otherNamespace.namespace.equals(this.namespace);
}
- Namespace otherNamespace = (Namespace) o;
- return otherNamespace.namespace.equals(this.namespace);
+ return false;
}
/**
Modified: db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/qname/QualifiedName.java
==============================================================================
--- db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/qname/QualifiedName.java Mon Aug 3 12:52:58 2026 (r1936820)
+++ db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/qname/QualifiedName.java Mon Aug 3 12:53:42 2026 (r1936821)
@@ -1,5 +1,7 @@
package org.apache.torque.generator.qname;
+import java.util.Objects;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -20,7 +22,6 @@ package org.apache.torque.generator.qnam
*/
import org.apache.commons.lang3.StringUtils;
-import java.util.Objects;
/**
@@ -265,19 +266,17 @@ public final class QualifiedName
@Override
public boolean equals(Object o)
{
- if (!(o instanceof QualifiedName))
+ if (o instanceof QualifiedName qualifiedName)
{
- return false;
- }
-
- QualifiedName qualifiedName = (QualifiedName) o;
+ if (!qualifiedName.name.equals(name))
+ {
+ return false;
+ }
- if (!qualifiedName.name.equals(name))
- {
- return false;
+ return qualifiedName.namespace.equals(namespace);
}
- return qualifiedName.namespace.equals(namespace);
+ return false;
}
/**
Modified: db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/qname/QualifiedNameMap.java
==============================================================================
--- db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/qname/QualifiedNameMap.java Mon Aug 3 12:52:58 2026 (r1936820)
+++ db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/qname/QualifiedNameMap.java Mon Aug 3 12:53:42 2026 (r1936821)
@@ -501,14 +501,12 @@ implements Map<QualifiedName, T>, Serial
@Override
public boolean equals(Object object)
{
- if (!(object instanceof QualifiedNameMap<?>))
+ if (object instanceof QualifiedNameMap<?> other)
{
- return false;
+ return map.equals(other.map);
}
- QualifiedNameMap<?> other = (QualifiedNameMap<?>) object;
-
- return map.equals(other.map);
+ return false;
}
/**
Modified: db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/ModelPropertyPointer.java
==============================================================================
--- db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/ModelPropertyPointer.java Mon Aug 3 12:52:58 2026 (r1936820)
+++ db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/ModelPropertyPointer.java Mon Aug 3 12:53:42 2026 (r1936821)
@@ -315,11 +315,10 @@ public class ModelPropertyPointer extend
}
else
{
- if (pd instanceof IndexedPropertyDescriptor)
+ if (pd instanceof IndexedPropertyDescriptor ipd)
{
return ValueUtils.getIndexedPropertyLength(
- getBean(),
- (IndexedPropertyDescriptor) pd);
+ getBean(), ipd);
}
hint = ValueUtils.getCollectionHint(pd.getPropertyType());
}
Modified: db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceElementAttributePointer.java
==============================================================================
--- db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceElementAttributePointer.java Mon Aug 3 12:52:58 2026 (r1936820)
+++ db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceElementAttributePointer.java Mon Aug 3 12:53:42 2026 (r1936821)
@@ -122,8 +122,8 @@ public class SourceElementAttributePoint
public boolean testNode(final NodeTest nodeTest)
{
return nodeTest == null
- || nodeTest instanceof NodeTypeTest
- && ((NodeTypeTest) nodeTest).getNodeType() == Compiler.NODE_TYPE_NODE;
+ || nodeTest instanceof NodeTypeTest ntt
+ && ntt.getNodeType() == Compiler.NODE_TYPE_NODE;
}
/**
@@ -180,17 +180,16 @@ public class SourceElementAttributePoint
{
return true;
}
- if (!(object instanceof SourceElementAttributePointer))
+ if (object instanceof SourceElementAttributePointer other)
{
- return false;
- }
- final SourceElementAttributePointer other
- = (SourceElementAttributePointer) object;
- if (sourceElement != other.sourceElement)
- {
- return false;
+ if (sourceElement != other.sourceElement)
+ {
+ return false;
+ }
+ return Objects.equals(name, other.name);
}
- return Objects.equals(name, other.name);
+
+ return false;
}
@Override
Modified: db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceElementNodePointer.java
==============================================================================
--- db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceElementNodePointer.java Mon Aug 3 12:52:58 2026 (r1936820)
+++ db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceElementNodePointer.java Mon Aug 3 12:53:42 2026 (r1936821)
@@ -172,26 +172,16 @@ public class SourceElementNodePointer ex
{
return true;
}
- if (test instanceof NodeNameTest)
+ if (test instanceof NodeNameTest nodeNameTest)
{
-
- final NodeNameTest nodeNameTest = (NodeNameTest) test;
final QName testName = nodeNameTest.getNodeName();
final boolean wildcard = nodeNameTest.isWildcard();
final String testPrefix = testName.getPrefix();
- if ((wildcard && testPrefix == null) || wildcard || testName.getName().equals(sourceElement.getName()))
- {
- return true;
- }
- return false;
+ return (wildcard && testPrefix == null) || wildcard || testName.getName().equals(sourceElement.getName());
}
- if (test instanceof NodeTypeTest)
+ else if (test instanceof NodeTypeTest ntt)
{
- if (((NodeTypeTest) test).getNodeType() == Compiler.NODE_TYPE_NODE)
- {
- return true;
- }
- return false;
+ return ntt.getNodeType() == Compiler.NODE_TYPE_NODE;
}
return false;
}
Modified: db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceElementNodePointerFactory.java
==============================================================================
--- db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceElementNodePointerFactory.java Mon Aug 3 12:52:58 2026 (r1936820)
+++ db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceElementNodePointerFactory.java Mon Aug 3 12:53:42 2026 (r1936821)
@@ -44,8 +44,8 @@ public class SourceElementNodePointerFac
final Object object,
final Locale locale)
{
- return object instanceof SourceElement
- ? new SourceElementNodePointer((SourceElement) object, locale)
+ return object instanceof SourceElement se
+ ? new SourceElementNodePointer(se, locale)
: null;
}
@@ -55,8 +55,8 @@ public class SourceElementNodePointerFac
final QName name,
final Object object)
{
- return object instanceof SourceElement
- ? new SourceElementNodePointer(parent, (SourceElement) object)
+ return object instanceof SourceElement se
+ ? new SourceElementNodePointer(parent, se)
: null;
}
Modified: db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/FileSourceProvider.java
==============================================================================
--- db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/FileSourceProvider.java Mon Aug 3 12:52:58 2026 (r1936820)
+++ db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/FileSourceProvider.java Mon Aug 3 12:53:42 2026 (r1936821)
@@ -320,23 +320,19 @@ public class FileSourceProvider extends
* Only a subset of all properties are typically used for overwriting.
* No Properties which are already set are overwritten.
*
- * @param sourceProvider the source provoder to copy the settings from.
+ * @param sourceProvider the source provider to copy the settings from.
*/
@Override
public void copyNotSetSettingsFrom(SourceProvider sourceProvider)
{
- if ((sourceProvider == null) || !(sourceProvider instanceof FileSourceProvider))
+ if (sourceProvider != null && sourceProvider instanceof FileSourceProvider fileSourceProvider)
{
- return;
- }
- FileSourceProvider fileSourceProvider
- = (FileSourceProvider) sourceProvider;
- if (combineFiles == null)
- {
- log.debug("copying combineFiles property"
- + " from other source provider");
- combineFiles = fileSourceProvider.getCombineFiles();
+ if (combineFiles == null)
+ {
+ log.debug("copying combineFiles property"
+ + " from other source provider");
+ combineFiles = fileSourceProvider.getCombineFiles();
+ }
}
}
-
}
Modified: db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/model/PropertyAccess.java
==============================================================================
--- db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/model/PropertyAccess.java Mon Aug 3 12:52:58 2026 (r1936820)
+++ db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/model/PropertyAccess.java Mon Aug 3 12:53:42 2026 (r1936821)
@@ -636,13 +636,12 @@ public class PropertyAccess
public Class<?> getFirstGenericTypeArgument()
{
final Type type = getPropertyGenericType();
- if (type instanceof ParameterizedType)
+ if (type instanceof ParameterizedType pt)
{
- final Object firstType
- = ((ParameterizedType) type).getActualTypeArguments()[0];
- if (firstType instanceof Class)
+ final Object firstType = pt.getActualTypeArguments()[0];
+ if (firstType instanceof Class<?> clazz)
{
- return (Class<?>) firstType;
+ return clazz;
}
}
return null;
Modified: db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/groovy/GroovyOutlet.java
==============================================================================
--- db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/groovy/GroovyOutlet.java Mon Aug 3 12:52:58 2026 (r1936820)
+++ db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/groovy/GroovyOutlet.java Mon Aug 3 12:53:42 2026 (r1936821)
@@ -184,9 +184,8 @@ public abstract class GroovyOutlet exten
}
final Object model = controllerState.getModel();
- if (sourceAttributesInBinding && model instanceof SourceElement)
+ if (sourceAttributesInBinding && model instanceof SourceElement sourceElement)
{
- final SourceElement sourceElement = (SourceElement) model;
final Set<String> attributes = sourceElement.getAttributeNames();
for (String key : attributes)
{
Modified: db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/TorqueGenVelocity.java
==============================================================================
--- db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/TorqueGenVelocity.java Mon Aug 3 12:52:58 2026 (r1936820)
+++ db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/TorqueGenVelocity.java Mon Aug 3 12:53:42 2026 (r1936821)
@@ -118,9 +118,9 @@ public class TorqueGenVelocity
public SourceElement getSourceElement() throws SourceException
{
Object model = controllerState.getModel();
- if (model instanceof SourceElement)
+ if (model instanceof SourceElement sourceElement)
{
- return (SourceElement) model;
+ return sourceElement;
}
throw new SourceException("model is no SourceElement but is of class "
+ model.getClass().getName());
Modified: db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/VelocityOutlet.java
==============================================================================
--- db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/VelocityOutlet.java Mon Aug 3 12:52:58 2026 (r1936820)
+++ db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/VelocityOutlet.java Mon Aug 3 12:53:42 2026 (r1936821)
@@ -314,9 +314,9 @@ public class VelocityOutlet extends Temp
Object model = controllerState.getModel();
SourceElement sourceElement = null;
- if (model instanceof SourceElement)
+ if (model instanceof SourceElement se)
{
- sourceElement = (SourceElement) model;
+ sourceElement = se;
}
if (sourceAttributesInContext && sourceElement != null)
{
Modified: db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Criteria.java
==============================================================================
--- db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Criteria.java Mon Aug 3 12:52:58 2026 (r1936820)
+++ db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Criteria.java Mon Aug 3 12:53:42 2026 (r1936821)
@@ -27,6 +27,7 @@ import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
@@ -37,7 +38,6 @@ import org.apache.torque.sql.Query;
import org.apache.torque.sql.SqlBuilder;
import org.apache.torque.util.UniqueColumnList;
import org.apache.torque.util.UniqueList;
-import java.util.Objects;
/**
* Encapsulates conditions to access rows in database tables.
@@ -393,9 +393,9 @@ public class Criteria implements Seriali
{
return null;
}
- if (aliasResolved instanceof String)
+ if (aliasResolved instanceof String ar)
{
- return (String) aliasResolved;
+ return ar;
}
throw new IllegalArgumentException("The alias " + alias
+ " is not associated to a table but to an object of type "
@@ -420,9 +420,9 @@ public class Criteria implements Seriali
{
return null;
}
- if (aliasResolved instanceof Criteria)
+ if (aliasResolved instanceof Criteria c)
{
- return (Criteria) aliasResolved;
+ return c;
}
throw new IllegalArgumentException("The alias " + alias
+ " is not associated to a subselect but to an object of type "
@@ -1265,9 +1265,8 @@ public class Criteria implements Seriali
*/
public Criteria and(final Object lValue, final Object rValue)
{
- if (rValue instanceof SqlEnum)
+ if (rValue instanceof SqlEnum sqlEnum)
{
- SqlEnum sqlEnum = (SqlEnum) rValue;
if (sqlEnum.getNumberOfCompareOperands() == 1)
{
return and(lValue, null, sqlEnum);
@@ -1628,9 +1627,8 @@ public class Criteria implements Seriali
*/
public Criteria or(final Object lValue, final Object rValue)
{
- if (rValue instanceof SqlEnum)
+ if (rValue instanceof SqlEnum sqlEnum)
{
- SqlEnum sqlEnum = (SqlEnum) rValue;
if (sqlEnum.getNumberOfCompareOperands() == 1)
{
return or(lValue, null, sqlEnum);
Modified: db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Criterion.java
==============================================================================
--- db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Criterion.java Mon Aug 3 12:52:58 2026 (r1936820)
+++ db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Criterion.java Mon Aug 3 12:53:42 2026 (r1936821)
@@ -23,11 +23,11 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import java.util.Objects;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.torque.Column;
-import java.util.Objects;
/**
* Describes one or more where clause parts in the Criteria.
@@ -492,9 +492,9 @@ public class Criterion implements Serial
else
{
String lValueDisplay;
- if (lValue instanceof Column)
+ if (lValue instanceof Column lc)
{
- lValueDisplay = ((Column) lValue).getSqlExpression();
+ lValueDisplay = lc.getSqlExpression();
}
else if (lValue != null)
{
@@ -505,9 +505,9 @@ public class Criterion implements Serial
lValueDisplay = "";
}
String rValueDisplay;
- if (rValue instanceof Column)
+ if (rValue instanceof Column rc)
{
- rValueDisplay = ((Column) rValue).getSqlExpression();
+ rValueDisplay = rc.getSqlExpression();
}
else if (rValue != null)
{
Modified: db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Join.java
==============================================================================
--- db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Join.java Mon Aug 3 12:52:58 2026 (r1936820)
+++ db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Join.java Mon Aug 3 12:53:42 2026 (r1936821)
@@ -169,18 +169,17 @@ public class Join implements Serializabl
return true;
}
- if ((obj == null) || !(obj instanceof Join))
+ if (obj != null && obj instanceof Join join)
{
- return false;
+ return new EqualsBuilder()
+ .append(leftTable, join.leftTable)
+ .append(rightTable, join.rightTable)
+ .append(joinCondition, join.joinCondition)
+ .append(joinType, join.getJoinType())
+ .isEquals();
}
- Join join = (Join) obj;
- return new EqualsBuilder()
- .append(leftTable, join.leftTable)
- .append(rightTable, join.rightTable)
- .append(joinCondition, join.joinCondition)
- .append(joinType, join.getJoinType())
- .isEquals();
+ return false;
}
/**
Modified: db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/SqlEnum.java
==============================================================================
--- db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/SqlEnum.java Mon Aug 3 12:52:58 2026 (r1936820)
+++ db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/SqlEnum.java Mon Aug 3 12:53:42 2026 (r1936821)
@@ -181,20 +181,17 @@ public final class SqlEnum implements ja
@Override
public boolean equals(final Object o)
{
- if ((o == null) || !(o instanceof SqlEnum))
+ if (o != null && o instanceof SqlEnum otherEnum)
{
- return false;
+ // both null: true
+ // other null, this not null: false
+ // else compare
+ return (otherEnum.s == null)
+ ? (s == null)
+ : otherEnum.s.equals(s);
}
- SqlEnum otherEnum = (SqlEnum) o;
-
-
- // both null: true
- // other null, this not null: false
- // else compare
- return (otherEnum.s == null)
- ? (s == null)
- : otherEnum.s.equals(s);
+ return false;
}
/**
Modified: db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/map/MapHelper.java
==============================================================================
--- db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/map/MapHelper.java Mon Aug 3 12:52:58 2026 (r1936820)
+++ db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/map/MapHelper.java Mon Aug 3 12:53:42 2026 (r1936821)
@@ -93,9 +93,9 @@ public final class MapHelper
// try aliases
Map<String, ? extends Object> aliases = criteria.getAliases();
Object aliasMappedTo = aliases.get(tableName);
- if (aliasMappedTo != null && aliasMappedTo instanceof String)
+ if (aliasMappedTo != null && aliasMappedTo instanceof String amt)
{
- tableName = (String) aliasMappedTo;
+ tableName = amt;
result = databaseMap.getTable(tableName);
}
}
Modified: db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/map/TableMap.java
==============================================================================
--- db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/map/TableMap.java Mon Aug 3 12:52:58 2026 (r1936820)
+++ db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/map/TableMap.java Mon Aug 3 12:53:42 2026 (r1936821)
@@ -220,6 +220,7 @@ public class TableMap extends OptionSupp
while (it.hasNext())
{
Object theType = it.next().getType();
+ // FIXME: Probably add java.time.* types
if ((!(theType instanceof String) && !(theType instanceof Number) && !(theType instanceof java.util.Date)))
{
return true;
Modified: db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/oid/AbstractIdGenerator.java
==============================================================================
--- db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/oid/AbstractIdGenerator.java Mon Aug 3 12:52:58 2026 (r1936820)
+++ db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/oid/AbstractIdGenerator.java Mon Aug 3 12:53:42 2026 (r1936821)
@@ -187,9 +187,9 @@ public abstract class AbstractIdGenerato
final RecordMapper<T> mapper)
throws TorqueException
{
- if (isGetGeneratedKeysSupported() && keyInfo instanceof Statement)
+ if (isGetGeneratedKeysSupported() && keyInfo instanceof Statement statement)
{
- try (ResultSet generatedKeys = ((Statement) keyInfo).getGeneratedKeys())
+ try (ResultSet generatedKeys = statement.getGeneratedKeys())
{
if (generatedKeys.next())
{
Modified: db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/om/ComboKey.java
==============================================================================
--- db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/om/ComboKey.java Mon Aug 3 12:52:58 2026 (r1936820)
+++ db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/om/ComboKey.java Mon Aug 3 12:53:42 2026 (r1936821)
@@ -274,9 +274,9 @@ public class ComboKey extends ObjectKey<
}
// check against a ObjectKey. Two keys are equal, if their
// internal keys equivalent.
- else if (keyObj instanceof ComboKey)
+ else if (keyObj instanceof ComboKey ck)
{
- SimpleKey<?>[] obj = ((ComboKey) keyObj).getValue();
+ SimpleKey<?>[] obj = ck.getValue();
SimpleKey<?>[] keys2 = obj;
isEqual = key.length == keys2.length;
@@ -285,9 +285,9 @@ public class ComboKey extends ObjectKey<
isEqual &= Objects.equals(key[i], keys2[i]);
}
}
- else if (keyObj instanceof SimpleKey[])
+ else if (keyObj instanceof SimpleKey[] ska)
{
- SimpleKey<?>[] keys2 = (SimpleKey[]) keyObj;
+ SimpleKey<?>[] keys2 = ska;
isEqual = key.length == keys2.length;
for (int i = 0; i < key.length && isEqual; i++)
{
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 Mon Aug 3 12:52:58 2026 (r1936820)
+++ db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/sql/SqlBuilder.java Mon Aug 3 12:53:42 2026 (r1936821)
@@ -643,9 +643,8 @@ public final class SqlBuilder
resolvedColumn.getTableName());
if (resolvedAlias != null)
{
- if (resolvedAlias instanceof Criteria)
+ if (resolvedAlias instanceof Criteria subquery)
{
- Criteria subquery = (Criteria) resolvedAlias;
Query renderedSubquery = SqlBuilder.buildQuery(subquery);
PreparedStatementPartImpl result = new PreparedStatementPartImpl();
result.getSql().append("(")
@@ -769,9 +768,8 @@ public final class SqlBuilder
String tableName = null;
Object lValue = criterion.getLValue();
- if (lValue instanceof Column)
+ if (lValue instanceof Column column)
{
- Column column = (Column) lValue;
tableName = column.getFullTableName();
}
if (tableName == null)
Modified: db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/sql/objectbuilder/ObjectOrColumnPsPartBuilder.java
==============================================================================
--- db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/sql/objectbuilder/ObjectOrColumnPsPartBuilder.java Mon Aug 3 12:52:58 2026 (r1936820)
+++ db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/sql/objectbuilder/ObjectOrColumnPsPartBuilder.java Mon Aug 3 12:53:42 2026 (r1936821)
@@ -61,9 +61,8 @@ public class ObjectOrColumnPsPartBuilder
{
PreparedStatementPartImpl result = new PreparedStatementPartImpl();
// check column
- if (toBuildFrom instanceof Column)
+ if (toBuildFrom instanceof Column column)
{
- Column column = (Column) toBuildFrom;
if (ignoreCase)
{
result.getSql().append(adapter.ignoreCase(column.getSqlExpression()));
@@ -76,9 +75,9 @@ public class ObjectOrColumnPsPartBuilder
}
// check subselect
- if (toBuildFrom instanceof Criteria)
+ if (toBuildFrom instanceof Criteria criteria)
{
- return new PreparedStatementPartForSubselect((Criteria) toBuildFrom, query);
+ return new PreparedStatementPartForSubselect(criteria, query);
}
// plain object
@@ -91,9 +90,9 @@ public class ObjectOrColumnPsPartBuilder
return result;
}
// If rValue is an ObjectKey, take the value of that ObjectKey.
- if (toBuildFrom instanceof ObjectKey)
+ if (toBuildFrom instanceof ObjectKey ok)
{
- toBuildFrom = ((ObjectKey<?>) toBuildFrom).getValue();
+ toBuildFrom = ok.getValue();
}
// handle ignoreCase
Modified: db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/InBuilder.java
==============================================================================
--- db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/InBuilder.java Mon Aug 3 12:52:58 2026 (r1936820)
+++ db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/InBuilder.java Mon Aug 3 12:53:42 2026 (r1936821)
@@ -67,9 +67,9 @@ public class InBuilder extends AbstractW
boolean ignoreCaseApplied = false;
List<String> inClause = new ArrayList<>();
boolean nullContained = false;
- if (whereClausePart.getRValue() instanceof Iterable)
+ if (whereClausePart.getRValue() instanceof Iterable list)
{
- for (Object listValue : (Iterable<?>) whereClausePart.getRValue())
+ for (Object listValue : list)
{
if (listValue == null)
{
Modified: db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/NullValueBuilder.java
==============================================================================
--- db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/NullValueBuilder.java Mon Aug 3 12:52:58 2026 (r1936820)
+++ db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/NullValueBuilder.java Mon Aug 3 12:53:42 2026 (r1936821)
@@ -1,5 +1,7 @@
package org.apache.torque.sql.whereclausebuilder;
+import java.util.stream.Stream;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -27,8 +29,6 @@ import org.apache.torque.om.ObjectKey;
import org.apache.torque.sql.Query;
import org.apache.torque.sql.WhereClauseExpression;
-import java.util.stream.Stream;
-
/**
* Builds a PreparedStatementPart from a WhereClauseExpression which
* rhs is null and which has one of the comparison opertator =, <>, or !=,
@@ -128,8 +128,7 @@ public class NullValueBuilder extends Ab
}
Object rValue = whereClauseExpression.getRValue();
if (rValue != null
- && (!(rValue instanceof ObjectKey)
- || ((ObjectKey<?>) rValue).getValue() != null))
+ && (!(rValue instanceof ObjectKey ok) || ok.getValue() != null))
{
return false;
}
Modified: db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/util/BasePeerImpl.java
==============================================================================
--- db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/util/BasePeerImpl.java Mon Aug 3 12:52:58 2026 (r1936820)
+++ db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/util/BasePeerImpl.java Mon Aug 3 12:53:42 2026 (r1936821)
@@ -30,6 +30,7 @@ import java.sql.Types;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
@@ -38,8 +39,8 @@ import java.util.stream.StreamSupport;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.StopWatch;
-import org.apache.logging.log4j.Logger;
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;
@@ -64,7 +65,6 @@ import org.apache.torque.om.StringKey;
import org.apache.torque.om.mapper.RecordMapper;
import org.apache.torque.sql.Query;
import org.apache.torque.sql.SqlBuilder;
-import java.util.Objects;
/**
* This is the base class for all Peer classes in the system. Peer
@@ -637,10 +637,8 @@ public class BasePeerImpl<T> implements
{
IdGenerator keyGen = Torque.getDatabase(dbName).getIdGenerator(
getTableMap().getPrimaryKeyMethod());
- if (keyGen instanceof SequenceIdGenerator)
+ if (keyGen instanceof SequenceIdGenerator sequenceIdGenerator)
{
- SequenceIdGenerator sequenceIdGenerator
- = (SequenceIdGenerator) keyGen;
String idSql = sequenceIdGenerator.getIdSql(
getIdMethodInfo());
// This is a bit of a hack.
@@ -1773,102 +1771,101 @@ public class BasePeerImpl<T> implements
int i = 1 + offset;
for (Object param : replacements)
{
- if (param instanceof java.sql.Timestamp)
+ if (param instanceof java.sql.Timestamp ts)
{
- statement.setTimestamp(i, (java.sql.Timestamp) param);
+ statement.setTimestamp(i, ts);
result.add(param);
}
- else if (param instanceof java.sql.Date)
+ else if (param instanceof java.sql.Date jsd)
{
- statement.setDate(i, (java.sql.Date) param);
+ statement.setDate(i, jsd);
result.add(param);
}
- else if (param instanceof java.sql.Time)
+ else if (param instanceof java.sql.Time jst)
{
- statement.setTime(i, (java.sql.Time) param);
+ statement.setTime(i, jst);
result.add(param);
}
- else if (param instanceof java.util.Date)
+ else if (param instanceof java.util.Date jud)
{
- java.sql.Timestamp sqlDate = new java.sql.Timestamp(
- ((java.util.Date) param).getTime());
+ java.sql.Timestamp sqlDate = new java.sql.Timestamp(jud.getTime());
statement.setTimestamp(i, sqlDate);
result.add(sqlDate);
}
- else if (param instanceof java.time.LocalDate)
+ else if (param instanceof java.time.LocalDate jtld)
{
- statement.setObject(i, (java.time.LocalDate) param);
+ statement.setObject(i, jtld);
result.add(param);
}
- else if (param instanceof java.time.LocalTime)
+ else if (param instanceof java.time.LocalTime jtlt)
{
- statement.setObject(i, (java.time.LocalTime) param);
+ statement.setObject(i, jtlt);
result.add(param);
}
- else if (param instanceof java.time.LocalDateTime)
+ else if (param instanceof java.time.LocalDateTime jtldt)
{
- statement.setObject(i, (java.time.LocalDateTime) param);
+ statement.setObject(i, jtldt);
result.add(param);
}
- else if (param instanceof java.time.OffsetDateTime)
+ else if (param instanceof java.time.OffsetDateTime jtodt)
{
- statement.setObject(i, (java.time.OffsetDateTime) param);
+ statement.setObject(i, jtodt);
result.add(param);
}
- else if (param instanceof java.time.Instant)
+ else if (param instanceof java.time.Instant jti)
{
- statement.setObject(i, (java.time.Instant) param);
+ statement.setObject(i, jti);
result.add(param);
}
- else if (param instanceof java.time.OffsetTime)
+ else if (param instanceof java.time.OffsetTime jtot)
{
- statement.setObject(i, (java.time.OffsetTime) param);
+ statement.setObject(i, jtot);
result.add(param);
}
- else if (param instanceof NumberKey)
+ else if (param instanceof NumberKey nk)
{
- BigDecimal bigDecimal = ((NumberKey) param).getValue();
+ BigDecimal bigDecimal = nk.getValue();
statement.setBigDecimal(i, bigDecimal);
result.add(bigDecimal);
}
- else if (param instanceof Integer)
+ else if (param instanceof Integer integer)
{
- statement.setInt(i, ((Integer) param).intValue());
+ statement.setInt(i, integer.intValue());
result.add(param);
}
- else if (param instanceof Long)
+ else if (param instanceof Long l)
{
- statement.setLong(i, ((Long) param).longValue());
+ statement.setLong(i, l.longValue());
result.add(param);
}
- else if (param instanceof BigDecimal)
+ else if (param instanceof BigDecimal bd)
{
- statement.setBigDecimal(i, (BigDecimal) param);
+ statement.setBigDecimal(i, bd);
result.add(param);
}
- else if (param instanceof Boolean)
+ else if (param instanceof Boolean b)
{
- statement.setBoolean(i, ((Boolean) param).booleanValue());
+ statement.setBoolean(i, b.booleanValue());
result.add(param);
}
- else if (param instanceof Short)
+ else if (param instanceof Short s)
{
- statement.setShort(i, ((Short) param).shortValue());
+ statement.setShort(i, s.shortValue());
result.add(param);
}
- else if (param instanceof Byte)
+ else if (param instanceof Byte byt)
{
- statement.setByte(i, ((Byte) param).byteValue());
+ statement.setByte(i, byt.byteValue());
result.add(param);
}
- else if (param instanceof Float)
+ else if (param instanceof Float f)
{
- statement.setFloat(i, ((Float) param).floatValue());
+ statement.setFloat(i, f.floatValue());
result.add(param);
}
- else if (param instanceof Double)
+ else if (param instanceof Double d)
{
- statement.setDouble(i, ((Double) param).doubleValue());
+ statement.setDouble(i, d.doubleValue());
result.add(param);
}
else
@@ -1965,18 +1962,16 @@ public class BasePeerImpl<T> implements
final Object falseValue)
{
Object rValue = criterion.getRValue();
- if (rValue instanceof Boolean)
+ if (rValue instanceof Boolean booleanValue)
{
- Boolean booleanValue = (Boolean) rValue;
criterion.setRValue(
Boolean.TRUE.equals(booleanValue)
? trueValue
: falseValue);
}
Object lValue = criterion.getLValue();
- if (lValue instanceof Boolean)
+ if (lValue instanceof Boolean booleanValue)
{
- Boolean booleanValue = (Boolean) lValue;
criterion.setLValue(
Boolean.TRUE.equals(booleanValue)
? trueValue
Modified: db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/util/functions/AbstractFunction.java
==============================================================================
--- db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/util/functions/AbstractFunction.java Mon Aug 3 12:52:58 2026 (r1936820)
+++ db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/util/functions/AbstractFunction.java Mon Aug 3 12:53:42 2026 (r1936821)
@@ -99,9 +99,9 @@ public abstract class AbstractFunction i
{
for (Object argument : getArgumentList())
{
- if (argument instanceof Column)
+ if (argument instanceof Column column)
{
- return (Column) argument;
+ return column;
}
}
throw new IllegalStateException(
@@ -190,9 +190,8 @@ public abstract class AbstractFunction i
boolean columnFound = false;
for (Object argument : getArgumentList())
{
- if (argument instanceof Column)
+ if (argument instanceof Column column)
{
- Column column = (Column) argument;
if (columnFound
&& !Objects.equals(tableName, column.getTableName()))
{
@@ -220,9 +219,8 @@ public abstract class AbstractFunction i
boolean columnFound = false;
for (Object argument : getArgumentList())
{
- if (argument instanceof Column)
+ if (argument instanceof Column column)
{
- Column column = (Column) argument;
if (columnFound
&& !Objects.equals(schemaName, column.getSchemaName()))
{
@@ -252,9 +250,8 @@ public abstract class AbstractFunction i
boolean columnFound = false;
for (Object argument : getArgumentList())
{
- if (argument instanceof Column)
+ if (argument instanceof Column column)
{
- Column column = (Column) argument;
if (columnFound
&& !Objects.equals(
fullTableName,
Modified: db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/util/functions/AggregateFunction.java
==============================================================================
--- db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/util/functions/AggregateFunction.java Mon Aug 3 12:52:58 2026 (r1936820)
+++ db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/util/functions/AggregateFunction.java Mon Aug 3 12:53:42 2026 (r1936821)
@@ -201,19 +201,19 @@ public class AggregateFunction implement
}
else
{
- if (!(args[1] instanceof Boolean))
+ if (!(args[1] instanceof Boolean distinct))
{
throw new IllegalArgumentException(
"Second argument object is not type Boolean!");
}
- this.distinct = ((Boolean) args[1]).booleanValue();
+ this.distinct = distinct.booleanValue();
}
- if (!(args[0] instanceof Column))
+ if (!(args[0] instanceof Column column))
{
throw new IllegalArgumentException(
"First argument object is not type Column!");
}
- this.column = (Column) args[0];
+ this.column = column;
}
/**
Modified: db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/manager/AbstractBaseManagerTest.java
==============================================================================
--- db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/manager/AbstractBaseManagerTest.java Mon Aug 3 12:52:58 2026 (r1936820)
+++ db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/manager/AbstractBaseManagerTest.java Mon Aug 3 12:53:42 2026 (r1936821)
@@ -1,11 +1,5 @@
package org.apache.torque.manager;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNotSame;
-import static org.junit.jupiter.api.Assertions.assertNull;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -25,7 +19,12 @@ import static org.junit.jupiter.api.Asse
* 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.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -130,7 +129,7 @@ public class AbstractBaseManagerTest imp
{
TestPersistent test = manager.getOMInstance();
assertNotNull(test, "Instance should not be null");
- assertTrue(test instanceof TestPersistent, "Instance should be a TestPersistent");
+ assertInstanceOf(TestPersistent.class, test, "Instance should be a TestPersistent");
}
@Test
@@ -138,7 +137,7 @@ public class AbstractBaseManagerTest imp
{
TestPersistent test = manager.getOMInstance(TEST_PRIMARY_KEY);
assertNotNull( test, "Instance should not be null");
- assertTrue( test instanceof TestPersistent, "Instance should be a TestPersistent");
+ assertInstanceOf(TestPersistent.class, test, "Instance should be a TestPersistent");
assertEquals(TEST_PRIMARY_KEY, test.getPrimaryKey(), "Instance should have id 'testID'");
}
Modified: db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMColumnTransformer.java
==============================================================================
--- db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMColumnTransformer.java Mon Aug 3 12:52:58 2026 (r1936820)
+++ db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMColumnTransformer.java Mon Aug 3 12:53:42 2026 (r1936821)
@@ -604,10 +604,9 @@ public class OMColumnTransformer
if (originalValue != null)
{
- if (originalValue instanceof String)
+ if (originalValue instanceof String ov)
{
- resultSetGetter = ResultSetGetter.getByMethodName(
- (String) originalValue);
+ resultSetGetter = ResultSetGetter.getByMethodName(ov);
}
}
else
Modified: db/torque/trunk/torque-test/src/test/java/org/apache/torque/DataTest.java
==============================================================================
--- db/torque/trunk/torque-test/src/test/java/org/apache/torque/DataTest.java Mon Aug 3 12:52:58 2026 (r1936820)
+++ db/torque/trunk/torque-test/src/test/java/org/apache/torque/DataTest.java Mon Aug 3 12:53:42 2026 (r1936821)
@@ -21,6 +21,7 @@ package org.apache.torque;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
@@ -1078,8 +1079,7 @@ public class DataTest extends BaseDataba
IfcTable ifc = new IfcTable();
- assertTrue( ifc instanceof TestInterface,
- "IfcTable should be an instance of TestInterface");
+ assertInstanceOf(TestInterface.class, ifc, "IfcTable should be an instance of TestInterface");
ifc.setID(1);
ifc.setName("John Doe");
@@ -1089,37 +1089,27 @@ public class DataTest extends BaseDataba
for (IfcTable ifcTable : results)
{
- assertTrue(
- ifcTable instanceof TestInterface,
- "IfcTablePeer.doSelect should return"
+ assertInstanceOf(TestInterface.class, ifcTable, "IfcTablePeer.doSelect should return"
+ " instances of TestInterface");
}
IfcTablePeerImpl peerImpl = IfcTablePeer.getIfcTablePeerImpl();
- assertTrue(
- peerImpl instanceof TestPeerInterface,
- "IfcTablePeerImpl should be an instance of "
- + "TestPeerInterface");
+ assertInstanceOf(TestPeerInterface.class, peerImpl, "IfcTablePeerImpl should be an instance of TestPeerInterface");
LocalIfcTable localIfc = new LocalIfcTable();
- assertTrue( localIfc instanceof LocalTestInterface,
- "LocalIfcTable should be an instance of LocalTestInterface");
+ assertInstanceOf(LocalTestInterface.class, localIfc, "LocalIfcTable should be an instance of LocalTestInterface");
List<LocalIfcTable> results2 = LocalIfcTablePeer.doSelect(new Criteria());
for (LocalIfcTable readLocalIfcTable : results2)
{
- assertTrue(
- readLocalIfcTable instanceof LocalTestInterface,
- "IfcTable2Peer.doSelect should return"
+ assertInstanceOf(LocalTestInterface.class, readLocalIfcTable, "IfcTable2Peer.doSelect should return"
+ " instances of LocalTestInterface");
}
LocalIfcTablePeerImpl localPeerImpl = LocalIfcTablePeer.getLocalIfcTablePeerImpl();
- assertTrue(
- localPeerImpl instanceof LocalTestPeerInterface,
- "LocalIfcTablePeerImpl should be an instance of "
+ assertInstanceOf(LocalTestPeerInterface.class, localPeerImpl, "LocalIfcTablePeerImpl should be an instance of "
+ "LocalTestPeerInterface");
}
Modified: db/torque/trunk/torque-test/src/test/java/org/apache/torque/ManagerTestConditional.java
==============================================================================
--- db/torque/trunk/torque-test/src/test/java/org/apache/torque/ManagerTestConditional.java Mon Aug 3 12:52:58 2026 (r1936820)
+++ db/torque/trunk/torque-test/src/test/java/org/apache/torque/ManagerTestConditional.java Mon Aug 3 12:53:42 2026 (r1936821)
@@ -23,6 +23,7 @@ import static org.junit.Assert.assertEqu
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import java.util.ArrayList;
import java.util.List;
@@ -144,7 +145,7 @@ public class ManagerTestConditional exte
{
TestInterface ifc = TestInterfaceManager.getInstance();
- assertTrue("TestInterfaceManager should create instances of TestInterface", ifc instanceof TestInterface);
- assertTrue("TestInterfaceManager should also create instances of IfcTable", ifc instanceof IfcTable);
+ assertInstanceOf(TestInterface.class, ifc, "TestInterfaceManager should create instances of TestInterface");
+ assertInstanceOf(IfcTable.class, ifc, "TestInterfaceManager should also create instances of IfcTable");
}
}
Modified: db/torque/trunk/torque-test/src/test/java/org/apache/torque/datatypes/BooleanIntCharTest.java
==============================================================================
--- db/torque/trunk/torque-test/src/test/java/org/apache/torque/datatypes/BooleanIntCharTest.java Mon Aug 3 12:52:58 2026 (r1936820)
+++ db/torque/trunk/torque-test/src/test/java/org/apache/torque/datatypes/BooleanIntCharTest.java Mon Aug 3 12:53:42 2026 (r1936821)
@@ -2,6 +2,7 @@ package org.apache.torque.datatypes;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -48,7 +49,7 @@ public class BooleanIntCharTest extends
@BeforeEach
public void setUp() throws Exception
{
-
+
fillTables();
}
@@ -441,15 +442,13 @@ public class BooleanIntCharTest extends
= criteria.getTopLevelCriterion().getParts().get(0);
Object intValue = criterionInt.getRValue();
- assertTrue("The boolean value should be an instance of Integer",
- intValue instanceof Integer);
+ assertInstanceOf(Integer.class, intValue, "The boolean value should be an instance of Integer");
Criterion criterionChar
= criteria.getTopLevelCriterion().getParts().get(1);
Object charValue = criterionChar.getRValue();
- assertTrue("The boolean value should be an instance of String",
- charValue instanceof String);
+ assertInstanceOf(String.class, charValue, "The boolean value should be an instance of String");
}
/**
@@ -469,15 +468,13 @@ public class BooleanIntCharTest extends
= criteria.getTopLevelCriterion().getParts().get(0);
Object boolValue1 = criterionBool1.getRValue();
- assertTrue("The boolean value should be an instance of Boolean",
- boolValue1 instanceof Boolean);
+ assertInstanceOf(Boolean.class, boolValue1, "The boolean value should be an instance of Boolean");
Criterion criterionBool2
= criteria.getTopLevelCriterion().getParts().get(1);
Object boolValue2 = criterionBool2.getRValue();
- assertTrue("The boolean value should be an instance of Boolean",
- boolValue2 instanceof Boolean);
+ assertInstanceOf(Boolean.class, boolValue2, "The boolean value should be an instance of Boolean");
}
/**
Modified: db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DeleteTest.java
==============================================================================
--- db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DeleteTest.java Mon Aug 3 12:52:58 2026 (r1936820)
+++ db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DeleteTest.java Mon Aug 3 12:53:42 2026 (r1936821)
@@ -23,6 +23,7 @@ import static org.junit.Assert.assertEqu
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import java.math.BigDecimal;
import java.util.ArrayList;
@@ -370,7 +371,7 @@ public class DeleteTest extends BaseData
// calculate and check primary key
ObjectKey<?> primaryKey = toDelete.getPrimaryKey();
- assertTrue(primaryKey instanceof NumberKey);
+ assertInstanceOf(NumberKey.class, primaryKey);
assertEquals(new BigDecimal(preDeleteId), primaryKey.getValue());
// call delete method and check result.
@@ -417,7 +418,7 @@ public class DeleteTest extends BaseData
// calculate and check primary key
ObjectKey<?> primaryKey = toDelete.getPrimaryKey();
- assertTrue(primaryKey instanceof NumberKey);
+ assertInstanceOf(NumberKey.class, primaryKey);
assertEquals(new BigDecimal(preDeleteId), primaryKey.getValue());
// call delete method and check result.
Modified: db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/ImplInitialisationTest.java
==============================================================================
--- db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/ImplInitialisationTest.java Mon Aug 3 12:52:58 2026 (r1936820)
+++ db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/ImplInitialisationTest.java Mon Aug 3 12:53:42 2026 (r1936821)
@@ -20,7 +20,7 @@ package org.apache.torque.generated.peer
*/
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import org.apache.torque.BaseDatabaseTestCase;
import org.apache.torque.test.peer.AuthorPeer;
@@ -48,7 +48,6 @@ public class ImplInitialisationTest exte
assertEquals(
AuthorPeer.DATABASE_NAME,
authorPeerImpl.getDatabaseName());
- assertTrue(authorPeerImpl.getRecordMapper() instanceof
- AuthorRecordMapper);
+ assertInstanceOf(AuthorRecordMapper.class, authorPeerImpl.getRecordMapper());
}
}
Modified: db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/OptimisticLockingSelectForUpdateTest.java
==============================================================================
--- db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/OptimisticLockingSelectForUpdateTest.java Mon Aug 3 12:52:58 2026 (r1936820)
+++ db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/OptimisticLockingSelectForUpdateTest.java Mon Aug 3 12:53:42 2026 (r1936821)
@@ -20,7 +20,7 @@ package org.apache.torque.generated.peer
*/
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import org.apache.torque.NoRowsException;
import org.apache.torque.OptimisticLockingFailedException;
@@ -49,7 +49,7 @@ extends BaseOptimisticLockingTest<Optimi
@Override
public void assertOptimisticLockingDeleteException(TorqueException e) {
- assertTrue(e instanceof NoRowsException);
+ assertInstanceOf(NoRowsException.class, e);
assertEquals(
"The row to update does not exist in the database",
e.getMessage());
@@ -57,7 +57,7 @@ extends BaseOptimisticLockingTest<Optimi
@Override
public void assertOptimisticLockingUpdateException(TorqueException e) {
- assertTrue(e instanceof OptimisticLockingFailedException);
+ assertInstanceOf(OptimisticLockingFailedException.class, e);
assertEquals(
"The row was updated concurrently. Version in database: 1"
+ ", version in memory: 0",
Modified: db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/OptimisticLockingSimpleSelectTest.java
==============================================================================
--- db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/OptimisticLockingSimpleSelectTest.java Mon Aug 3 12:52:58 2026 (r1936820)
+++ db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/OptimisticLockingSimpleSelectTest.java Mon Aug 3 12:53:42 2026 (r1936821)
@@ -20,7 +20,7 @@ package org.apache.torque.generated.peer
*/
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import org.apache.torque.OptimisticLockingFailedException;
import org.apache.torque.TorqueException;
@@ -47,7 +47,7 @@ public class OptimisticLockingSimpleSele
@Override
public void assertOptimisticLockingDeleteException(TorqueException e) {
- assertTrue(e instanceof OptimisticLockingFailedException);
+ assertInstanceOf(OptimisticLockingFailedException.class, e);
assertEquals(
"The row to update was either updated or deleted concurrently "
+ "or does not exist at all.",
@@ -56,7 +56,7 @@ public class OptimisticLockingSimpleSele
@Override
public void assertOptimisticLockingUpdateException(TorqueException e) {
- assertTrue(e instanceof OptimisticLockingFailedException);
+ assertInstanceOf(OptimisticLockingFailedException.class, e);
assertEquals(
"The row to update was either updated or deleted concurrently "
+ "or does not exist at all.",
Modified: db/torque/trunk/torque-test/src/test/java/org/apache/torque/map/DatabaseMapTest.java
==============================================================================
--- db/torque/trunk/torque-test/src/test/java/org/apache/torque/map/DatabaseMapTest.java Mon Aug 3 12:52:58 2026 (r1936820)
+++ db/torque/trunk/torque-test/src/test/java/org/apache/torque/map/DatabaseMapTest.java Mon Aug 3 12:53:42 2026 (r1936821)
@@ -22,6 +22,7 @@ package org.apache.torque.map;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
@@ -222,7 +223,7 @@ public class DatabaseMapTest extends Bas
assertTrue( column.isAutoIncrement(), "Column isAutoIncrement attribute returned false instead of true!");
assertTrue( column.isNotNull(), "Column isNotNull attribute returned false instead of true!");
assertTrue( column.isUsePrimitive(), "Column isUsePrimitive attribute returned false instead of true!");
- assertTrue( column.getType() instanceof Integer, "Column type attribute was not Integer!");
+ assertInstanceOf(Integer.class, column.getType(), "Column type attribute was not Integer!");
column = table.getColumn("one");
// Handle torque.deprecated.uppercasePeer=true problems
Modified: db/torque/trunk/torque-test/src/test/java/org/apache/torque/util/ExceptionMapperTest.java
==============================================================================
--- db/torque/trunk/torque-test/src/test/java/org/apache/torque/util/ExceptionMapperTest.java Mon Aug 3 12:52:58 2026 (r1936820)
+++ db/torque/trunk/torque-test/src/test/java/org/apache/torque/util/ExceptionMapperTest.java Mon Aug 3 12:53:42 2026 (r1936821)
@@ -1,25 +1,6 @@
package org.apache.torque.util;
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.fail;
import java.sql.Connection;
@@ -74,7 +55,7 @@ public class ExceptionMapperTest extends
}
catch (ConstraintViolationException e)
{
- assertTrue(e.getCause() instanceof SQLException);
+ assertInstanceOf(SQLException.class, e.getCause());
}
}
@@ -102,7 +83,7 @@ public class ExceptionMapperTest extends
}
catch (ConstraintViolationException e)
{
- assertTrue(e.getCause() instanceof SQLException);
+ assertInstanceOf(SQLException.class, e.getCause());
}
}
@@ -127,7 +108,7 @@ public class ExceptionMapperTest extends
}
catch (ConstraintViolationException e)
{
- assertTrue(e.getCause() instanceof SQLException);
+ assertInstanceOf(SQLException.class, e.getCause());
}
}
@@ -154,7 +135,7 @@ public class ExceptionMapperTest extends
}
catch (ConstraintViolationException e)
{
- assertTrue(e.getCause() instanceof SQLException);
+ assertInstanceOf(SQLException.class, e.getCause());
}
}