cleanup

Author: andrus

cayenne-crypto/src/main/java/org/apache/cayenne/crypto/reader/CryptoRowReaderFactoryDecorator.java

@@ -65,21 +65,20 @@ public RowReader<?> rowReader(RSColumn[] columns, QueryMetadata metadata, DbAdap
 
     @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) {

cayenne/src/main/java/org/apache/cayenne/access/jdbc/reader/DefaultRowReaderFactory.java

@@ -42,23 +42,23 @@ public RowReader<?> rowReader(RSColumn[] columns, QueryMetadata metadata, DbAdap
 
         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 @@ protected RowReader<?> entitySegmentReader(RSColumn[] columns, QueryMetadata met
         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) {

cayenne/src/main/java/org/apache/cayenne/access/jdbc/reader/OffsetRowReader.java

@@ -37,21 +37,21 @@ 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())
                 : new OffsetRowReader(columns, offset, entityName);
     }
 
     // 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);
     }