From 515570f05789f76fcd641393f3e12382e9d98826 Mon Sep 17 00:00:00 2001 From: lcarlyl Date: Wed, 30 Nov 2022 16:56:42 +0300 Subject: [PATCH] fix query --- build.gradle | 2 +- src/main/java/ru/di9/jdbc/JdbcTemplateImpl.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 6186e20..e397270 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ plugins { } group 'ru.di9' -version '1.9.1' +version '1.9.2' repositories { mavenCentral() diff --git a/src/main/java/ru/di9/jdbc/JdbcTemplateImpl.java b/src/main/java/ru/di9/jdbc/JdbcTemplateImpl.java index 30a908f..afcbad7 100644 --- a/src/main/java/ru/di9/jdbc/JdbcTemplateImpl.java +++ b/src/main/java/ru/di9/jdbc/JdbcTemplateImpl.java @@ -1,6 +1,7 @@ package ru.di9.jdbc; import org.intellij.lang.annotations.Language; +import org.jetbrains.annotations.Nullable; import javax.sql.DataSource; import java.sql.*; @@ -50,13 +51,14 @@ public class JdbcTemplateImpl implements JdbcTemplate { } @Override + @Nullable public T query(@Language("GenericSQL") String sql, PreparedStatementProcessor psp, ResultSetExtractor rse) throws DataAccessException { try (Connection connection = dataSource.getConnection(); PreparedStatement preparedStatement = connection.prepareStatement(sql)) { psp.process(preparedStatement); try (ResultSet resultSet = preparedStatement.executeQuery()) { - return resultSet.next() ? rse.extractData(resultSet) : null; + return rse.extractData(resultSet); } } catch (SQLException e) { throw throwDataAccessException(sql, e);