You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2022/10/24 14:01:13 UTC
[cayenne] branch master updated: minor code cleanup
This is an automated email from the ASF dual-hosted git repository.
ntimofeev 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 239f0614c minor code cleanup
239f0614c is described below
commit 239f0614ce192f990faa30b96c41b47105e8f14c
Author: Nikita Timofeev <st...@gmail.com>
AuthorDate: Mon Oct 24 17:01:07 2022 +0300
minor code cleanup
---
.../apache/cayenne/access/jdbc/reader/ScalarRowReader.java | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/ScalarRowReader.java b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/ScalarRowReader.java
index 01d560265..2ec0d588b 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/ScalarRowReader.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/ScalarRowReader.java
@@ -31,12 +31,12 @@ import org.apache.cayenne.util.Util;
*/
class ScalarRowReader<T> implements RowReader<T> {
- private ExtendedType converter;
- private int index;
- private int type;
+ private final ExtendedType<T> converter;
+ private final int index;
+ private final int type;
+ @SuppressWarnings("unchecked")
ScalarRowReader(RowDescriptor descriptor, ScalarResultSegment segmentMetadata) {
-
int scalarIndex = segmentMetadata.getColumnOffset();
this.converter = descriptor.getConverters()[scalarIndex];
this.type = descriptor.getColumns()[scalarIndex].getJdbcType();
@@ -44,10 +44,9 @@ class ScalarRowReader<T> implements RowReader<T> {
}
@Override
- @SuppressWarnings("unchecked")
public T readRow(ResultSet resultSet) {
try {
- return (T) converter.materializeObject(resultSet, index, type);
+ return converter.materializeObject(resultSet, index, type);
} catch (CayenneRuntimeException cex) {
// rethrow unmodified
throw cex;