Skip to content

Commit 520d466

Browse files
committed
restoring some DataNode removed methods as deprecated
1 parent 2f8d434 commit 520d466

1 file changed

Lines changed: 28 additions & 0 deletions

File tree

cayenne/src/main/java/org/apache/cayenne/access/DataNode.java

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121

2222
import org.apache.cayenne.CayenneRuntimeException;
2323
import org.apache.cayenne.access.dbsync.SchemaUpdateStrategy;
24+
import org.apache.cayenne.access.jdbc.ColumnDescriptor;
25+
import org.apache.cayenne.access.jdbc.RowDescriptor;
26+
import org.apache.cayenne.access.jdbc.reader.RowReader;
2427
import org.apache.cayenne.access.jdbc.reader.RowReaderFactory;
2528
import org.apache.cayenne.access.translator.batch.BatchTranslator;
2629
import org.apache.cayenne.access.translator.select.SelectTranslator;
@@ -31,9 +34,11 @@
3134
import org.apache.cayenne.log.NoopJdbcEventLogger;
3235
import org.apache.cayenne.map.DataMap;
3336
import org.apache.cayenne.map.EntityResolver;
37+
import org.apache.cayenne.map.ObjAttribute;
3438
import org.apache.cayenne.query.DeleteBatchQuery;
3539
import org.apache.cayenne.query.InsertBatchQuery;
3640
import org.apache.cayenne.query.Query;
41+
import org.apache.cayenne.query.QueryMetadata;
3742
import org.apache.cayenne.query.UpdateBatchQuery;
3843
import org.apache.cayenne.tx.BaseTransaction;
3944
import org.apache.cayenne.tx.Transaction;
@@ -313,6 +318,29 @@ public String toString() {
313318
}
314319

315320

321+
/**
322+
* Creates a {@link RowReader} using internal {@link RowReaderFactory}.
323+
*
324+
* @since 4.0
325+
* @deprecated in favor of obtaining the factory via {@link #getRowReaderFactory()} and calling it directly.
326+
*/
327+
@Deprecated(since = "5.0", forRemoval = true)
328+
public RowReader<?> rowReader(RowDescriptor descriptor, QueryMetadata queryMetadata) {
329+
return rowReaderFactory.rowReader(descriptor, queryMetadata, getAdapter());
330+
}
331+
332+
/**
333+
* Creates a {@link RowReader} using internal {@link RowReaderFactory}.
334+
*
335+
* @since 4.0
336+
* @deprecated in favor of obtaining the factory via {@link #getRowReaderFactory()} and calling it directly.
337+
*/
338+
@Deprecated(since = "5.0", forRemoval = true)
339+
public RowReader<?> rowReader(RowDescriptor descriptor, QueryMetadata queryMetadata,
340+
Map<ObjAttribute, ColumnDescriptor> attributeOverrides) {
341+
return rowReader(descriptor, queryMetadata);
342+
}
343+
316344
/**
317345
* @since 4.0
318346
*/

0 commit comments

Comments
 (0)