This is an automated email from the ASF dual-hosted git repository. asf-gitbox-commits pushed a commit to branch past-M2 in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit 9aa53ba741b6c53b9940f58816809ed787330d80 Author: Andrus Adamchik <[email protected]> AuthorDate: Sun May 31 14:20:38 2026 -0400 restoring some DataNode removed methods as deprecated --- .../java/org/apache/cayenne/access/DataNode.java | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/cayenne/src/main/java/org/apache/cayenne/access/DataNode.java b/cayenne/src/main/java/org/apache/cayenne/access/DataNode.java index 739140ed5..f1287c41b 100644 --- a/cayenne/src/main/java/org/apache/cayenne/access/DataNode.java +++ b/cayenne/src/main/java/org/apache/cayenne/access/DataNode.java @@ -21,6 +21,9 @@ package org.apache.cayenne.access; import org.apache.cayenne.CayenneRuntimeException; import org.apache.cayenne.access.dbsync.SchemaUpdateStrategy; +import org.apache.cayenne.access.jdbc.ColumnDescriptor; +import org.apache.cayenne.access.jdbc.RowDescriptor; +import org.apache.cayenne.access.jdbc.reader.RowReader; import org.apache.cayenne.access.jdbc.reader.RowReaderFactory; import org.apache.cayenne.access.translator.batch.BatchTranslator; import org.apache.cayenne.access.translator.select.SelectTranslator; @@ -31,9 +34,11 @@ import org.apache.cayenne.log.JdbcEventLogger; import org.apache.cayenne.log.NoopJdbcEventLogger; import org.apache.cayenne.map.DataMap; import org.apache.cayenne.map.EntityResolver; +import org.apache.cayenne.map.ObjAttribute; import org.apache.cayenne.query.DeleteBatchQuery; import org.apache.cayenne.query.InsertBatchQuery; import org.apache.cayenne.query.Query; +import org.apache.cayenne.query.QueryMetadata; import org.apache.cayenne.query.UpdateBatchQuery; import org.apache.cayenne.tx.BaseTransaction; import org.apache.cayenne.tx.Transaction; @@ -313,6 +318,29 @@ public class DataNode { } + /** + * Creates a {@link RowReader} using internal {@link RowReaderFactory}. + * + * @since 4.0 + * @deprecated in favor of obtaining the factory via {@link #getRowReaderFactory()} and calling it directly. + */ + @Deprecated(since = "5.0", forRemoval = true) + public RowReader<?> rowReader(RowDescriptor descriptor, QueryMetadata queryMetadata) { + return rowReaderFactory.rowReader(descriptor, queryMetadata, getAdapter()); + } + + /** + * Creates a {@link RowReader} using internal {@link RowReaderFactory}. + * + * @since 4.0 + * @deprecated in favor of obtaining the factory via {@link #getRowReaderFactory()} and calling it directly. + */ + @Deprecated(since = "5.0", forRemoval = true) + public RowReader<?> rowReader(RowDescriptor descriptor, QueryMetadata queryMetadata, + Map<ObjAttribute, ColumnDescriptor> attributeOverrides) { + return rowReader(descriptor, queryMetadata); + } + /** * @since 4.0 */
