Repository: cayenne Updated Branches: refs/heads/master c93531476 -> fd8dbc6da
Cleanup Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/fd8dbc6d Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/fd8dbc6d Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/fd8dbc6d Branch: refs/heads/master Commit: fd8dbc6dace607a3df2cbb68b3a9577a895d8200 Parents: c935314 Author: Nikita Timofeev <stari...@gmail.com> Authored: Mon Sep 24 12:42:41 2018 +0300 Committer: Nikita Timofeev <stari...@gmail.com> Committed: Mon Sep 24 12:42:41 2018 +0300 ---------------------------------------------------------------------- .../apache/cayenne/access/jdbc/SQLTemplateAction.java | 7 +++---- .../org/apache/cayenne/access/jdbc/SelectAction.java | 12 ++++-------- .../access/jdbc/reader/DefaultRowReaderFactory.java | 14 ++++---------- 3 files changed, 11 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/fd8dbc6d/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/SQLTemplateAction.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/SQLTemplateAction.java b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/SQLTemplateAction.java index b90ad69..51b3934 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/SQLTemplateAction.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/SQLTemplateAction.java @@ -20,7 +20,6 @@ package org.apache.cayenne.access.jdbc; import org.apache.cayenne.CayenneException; -import org.apache.cayenne.DataRow; import org.apache.cayenne.ResultIterator; import org.apache.cayenne.access.DataNode; import org.apache.cayenne.access.OperationObserver; @@ -254,7 +253,7 @@ public class SQLTemplateAction implements SQLAction { RowDescriptorBuilder builder = configureRowDescriptorBuilder(compiled, resultSet); RowReader<?> rowReader = dataNode.rowReader(builder.getDescriptor(types), queryMetadata); - ResultIterator it = new JDBCResultIterator(statement, resultSet, rowReader); + ResultIterator<?> it = new JDBCResultIterator<>(statement, resultSet, rowReader); if (iteratedResult) { @@ -267,7 +266,7 @@ public class SQLTemplateAction implements SQLAction { }; } - it = new LimitResultIterator(it, getFetchOffset(), query.getFetchLimit()); + it = new LimitResultIterator<>(it, getFetchOffset(), query.getFetchLimit()); if (iteratedResult) { try { @@ -280,7 +279,7 @@ public class SQLTemplateAction implements SQLAction { // note that we are not closing the iterator here, relying on caller // to close the underlying ResultSet on its own... this is a hack, // maybe a cleaner flow is due here. - List<DataRow> resultRows = (List<DataRow>) it.allRows(); + List<?> resultRows = it.allRows(); dataNode.getJdbcEventLogger().logSelectCount(resultRows.size(), System.currentTimeMillis() - startTime); http://git-wip-us.apache.org/repos/asf/cayenne/blob/fd8dbc6d/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/SelectAction.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/SelectAction.java b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/SelectAction.java index 51f373b..ea632e6 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/SelectAction.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/SelectAction.java @@ -19,7 +19,6 @@ package org.apache.cayenne.access.jdbc; -import org.apache.cayenne.DataRow; import org.apache.cayenne.ResultIterator; import org.apache.cayenne.access.DataNode; import org.apache.cayenne.access.OperationObserver; @@ -36,7 +35,6 @@ import org.apache.cayenne.query.SelectQuery; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; -import java.sql.SQLException; import java.util.List; /** @@ -46,8 +44,7 @@ import java.util.List; */ public class SelectAction extends BaseSQLAction { - private static void bind(DbAdapter adapter, PreparedStatement statement, DbAttributeBinding[] bindings) - throws SQLException, Exception { + private static void bind(DbAdapter adapter, PreparedStatement statement, DbAttributeBinding[] bindings) throws Exception { for (DbAttributeBinding b : bindings) { @@ -80,9 +77,8 @@ public class SelectAction extends BaseSQLAction { this.queryMetadata = query.getMetaData(dataNode.getEntityResolver()); } - @SuppressWarnings({ "unchecked", "rawtypes", "resource" }) @Override - public void performAction(Connection connection, OperationObserver observer) throws SQLException, Exception { + public void performAction(Connection connection, OperationObserver observer) throws Exception { final long t1 = System.currentTimeMillis(); @@ -116,7 +112,7 @@ public class SelectAction extends BaseSQLAction { RowReader<?> rowReader = dataNode.rowReader(descriptor, queryMetadata, translator.getAttributeOverrides()); - ResultIterator it = new JDBCResultIterator(statement, rs, rowReader); + ResultIterator<?> it = new JDBCResultIterator<>(statement, rs, rowReader); it = forIteratedResult(it, observer, connection, t1, sql); it = forSuppressedDistinct(it, translator); it = forFetchLimit(it, translator); @@ -133,7 +129,7 @@ public class SelectAction extends BaseSQLAction { throw ex; } } else { - List<DataRow> resultRows; + List<?> resultRows; try { resultRows = it.allRows(); } finally { http://git-wip-us.apache.org/repos/asf/cayenne/blob/fd8dbc6d/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/DefaultRowReaderFactory.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/DefaultRowReaderFactory.java b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/DefaultRowReaderFactory.java index 02ba45a..36c7027 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/DefaultRowReaderFactory.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/DefaultRowReaderFactory.java @@ -70,7 +70,7 @@ public class DefaultRowReaderFactory implements RowReaderFactory { return createEntityRowReader(descriptor, queryMetadata, (EntityResultSegment) segment, postProcessorFactory); } else { - return new ScalarRowReader<Object>(descriptor, (ScalarResultSegment) segment); + return new ScalarRowReader<>(descriptor, (ScalarResultSegment) segment); } } else { CompoundRowReader reader = new CompoundRowReader(resultWidth); @@ -96,7 +96,7 @@ public class DefaultRowReaderFactory implements RowReaderFactory { EntityResultSegment resultMetadata, PostprocessorFactory postProcessorFactory) { if (queryMetadata.getPageSize() > 0) { - return new IdRowReader<Object>(descriptor, queryMetadata, resultMetadata, postProcessorFactory.get()); + return new IdRowReader<>(descriptor, queryMetadata, resultMetadata, postProcessorFactory.get()); } else if (resultMetadata.getClassDescriptor() != null && resultMetadata.getClassDescriptor().hasSubclasses()) { return new InheritanceAwareEntityRowReader(descriptor, resultMetadata, postProcessorFactory.get()); } else { @@ -108,7 +108,7 @@ public class DefaultRowReaderFactory implements RowReaderFactory { PostprocessorFactory postProcessorFactory) { if (queryMetadata.getPageSize() > 0) { - return new IdRowReader<Object>(descriptor, queryMetadata, null, postProcessorFactory.get()); + return new IdRowReader<>(descriptor, queryMetadata, null, postProcessorFactory.get()); } else if (queryMetadata.getClassDescriptor() != null && queryMetadata.getClassDescriptor().hasSubclasses()) { return new InheritanceAwareRowReader(descriptor, queryMetadata, postProcessorFactory.get()); } else { @@ -184,13 +184,7 @@ public class DefaultRowReaderFactory implements RowReaderFactory { ExtendedType converter = extendedTypes.getRegisteredType(attribute.getType()); - Collection<ColumnOverride> overrides = columnOverrides.get(entity.getName()); - - if (overrides == null) { - overrides = new ArrayList<>(3); - columnOverrides.put(entity.getName(), overrides); - } - + Collection<ColumnOverride> overrides = columnOverrides.computeIfAbsent(entity.getName(), k -> new ArrayList<>(3)); overrides.add(new ColumnOverride(index, key, converter, jdbcType)); }
