This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
The following commit(s) were added to refs/heads/master by this push:
new 8d7cbfd9a cleanup
8d7cbfd9a is described below
commit 8d7cbfd9ad5543de93782a0fa63f0a3fe310ee6a
Author: Andrus Adamchik <[email protected]>
AuthorDate: Sun Jun 28 17:48:32 2026 -0400
cleanup
---
.../reader/CryptoRowReaderFactoryDecorator.java | 15 +++++++--------
.../access/jdbc/reader/DefaultRowReaderFactory.java | 19 ++++++++-----------
.../cayenne/access/jdbc/reader/OffsetRowReader.java | 8 ++++----
3 files changed, 19 insertions(+), 23 deletions(-)
diff --git
a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/reader/CryptoRowReaderFactoryDecorator.java
b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/reader/CryptoRowReaderFactoryDecorator.java
index 29777c5d3..17c47a769 100644
---
a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/reader/CryptoRowReaderFactoryDecorator.java
+++
b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/reader/CryptoRowReaderFactoryDecorator.java
@@ -65,21 +65,20 @@ public class CryptoRowReaderFactoryDecorator extends
DefaultRowReaderFactory {
@Override
protected RowReader<?> scalarSegmentReader(RSColumn[] columns,
QueryMetadata metadata, ScalarResultSegment segment) {
- RowReader<?> scalarRowReader = super.scalarSegmentReader(columns,
metadata, segment);
- return new
DecoratedScalarRowReader(columns[segment.getColumnOffset()], scalarRowReader);
+ RowReader<?> reader = super.scalarSegmentReader(columns, metadata,
segment);
+ return new
DecoratedScalarRowReader(columns[segment.getColumnOffset()], reader);
}
@Override
protected RowReader<?> entitySegmentReader(RSColumn[] columns,
QueryMetadata metadata, EntityResultSegment segment) {
- RowReader<?> entityRowReader = super.entitySegmentReader(columns,
metadata, segment);
- return new DecoratedEntityRowReader(columns, entityRowReader, segment);
+ RowReader<?> reader = super.entitySegmentReader(columns, metadata,
segment);
+ return new DecoratedEntityRowReader(columns, reader, segment);
}
@Override
- protected RowReader<?> fullRowReader(RSColumn[] columns, QueryMetadata
metadata) {
- RowReader<?> fullRowReader = super
- .fullRowReader(columns, metadata);
- return new DecoratedFullRowReader(columns, fullRowReader);
+ protected RowReader<?> noSegmentReader(RSColumn[] columns, QueryMetadata
metadata) {
+ RowReader<?> reader = super.noSegmentReader(columns, metadata);
+ return new DecoratedFullRowReader(columns, reader);
}
protected RSColumn[] encryptedColumns(RSColumn[] columns, ExtendedTypeMap
typeMap) {
diff --git
a/cayenne/src/main/java/org/apache/cayenne/access/jdbc/reader/DefaultRowReaderFactory.java
b/cayenne/src/main/java/org/apache/cayenne/access/jdbc/reader/DefaultRowReaderFactory.java
index 159a65c91..0296ea5bc 100644
---
a/cayenne/src/main/java/org/apache/cayenne/access/jdbc/reader/DefaultRowReaderFactory.java
+++
b/cayenne/src/main/java/org/apache/cayenne/access/jdbc/reader/DefaultRowReaderFactory.java
@@ -42,23 +42,23 @@ public class DefaultRowReaderFactory implements
RowReaderFactory {
List<Object> segments = metadata.getResultSetMapping();
if (segments == null || segments.isEmpty()) {
- return fullRowReader(columns, metadata);
+ return noSegmentReader(columns, metadata);
}
if (metadata.isSingleResultSetMapping()) {
- return segmentRowReader(segments.getFirst(), columns, metadata);
+ return segmentReader(segments.getFirst(), columns, metadata);
}
int w = segments.size();
RowReader<?>[] readers = new RowReader[w];
for (int i = 0; i < w; i++) {
- readers[i] = segmentRowReader(segments.get(i), columns, metadata);
+ readers[i] = segmentReader(segments.get(i), columns, metadata);
}
return new CompoundRowReader(readers);
}
- private RowReader<?> segmentRowReader(Object segment, RSColumn[] columns,
QueryMetadata metadata) {
+ private RowReader<?> segmentReader(Object segment, RSColumn[] columns,
QueryMetadata metadata) {
return switch (segment) {
case EntityResultSegment ers -> entitySegmentReader(columns,
metadata, ers);
case EmbeddableResultSegment ers ->
embeddableSegmentReader(columns, ers);
@@ -131,13 +131,10 @@ public class DefaultRowReaderFactory implements
RowReaderFactory {
return OffsetRowReader.of(relabeled, startIndex,
segment.getClassDescriptor());
}
- protected RowReader<?> fullRowReader(RSColumn[] columns, QueryMetadata
metadata) {
-
- if (metadata.getPageSize() > 0) {
- return idReader(columns, metadata, null);
- }
-
- return FullRowReader.of(columns, metadata);
+ protected RowReader<?> noSegmentReader(RSColumn[] columns, QueryMetadata
metadata) {
+ return metadata.getPageSize() > 0
+ ? idReader(columns, metadata, null)
+ : FullRowReader.of(columns, metadata);
}
private RowReader<?> idReader(RSColumn[] columns, QueryMetadata metadata,
EntityResultSegment segment) {
diff --git
a/cayenne/src/main/java/org/apache/cayenne/access/jdbc/reader/OffsetRowReader.java
b/cayenne/src/main/java/org/apache/cayenne/access/jdbc/reader/OffsetRowReader.java
index 2a8d73fe2..cc35bcdfc 100644
---
a/cayenne/src/main/java/org/apache/cayenne/access/jdbc/reader/OffsetRowReader.java
+++
b/cayenne/src/main/java/org/apache/cayenne/access/jdbc/reader/OffsetRowReader.java
@@ -37,8 +37,8 @@ class OffsetRowReader implements RowReader<DataRow> {
private final int offset;
private final int mapCapacity;
- // possible inherotance
- static RowReader<DataRow> of(RSColumn[] columns, int offset,
ClassDescriptor cd) {
+ // possible inheritance
+ static OffsetRowReader of(RSColumn[] columns, int offset, ClassDescriptor
cd) {
String entityName = cd != null ? cd.getEntity().getName() : null;
return cd != null && cd.hasSubclasses()
? new InheritanceAwareOffsetRowReader(columns, offset,
entityName, cd.getEntityInheritanceTree())
@@ -46,12 +46,12 @@ class OffsetRowReader implements RowReader<DataRow> {
}
// fixed entity name, no inheritance
- static RowReader<DataRow> of(RSColumn[] columns, int offset, String
entityName) {
+ static OffsetRowReader of(RSColumn[] columns, int offset, String
entityName) {
return new OffsetRowReader(columns, offset, entityName);
}
// no entity name, no inheritance
- static RowReader<DataRow> of(RSColumn[] columns, int offset) {
+ static OffsetRowReader of(RSColumn[] columns, int offset) {
return new OffsetRowReader(columns, offset, null);
}
