From df8bedd033f4c071b4756bdb6f5f62ff76a739e6 Mon Sep 17 00:00:00 2001
From: Jens Schauder <jschauder@pivotal.io>
Date: Fri, 14 Dec 2018 12:46:17 +0100
Subject: [PATCH] DATAJDBC-290 - Applied review feedback.

Added "since" information fro new and deprecated classes.

Original pull request: #104.
---
 .../jdbc/repository/QueryMappingConfiguration.java     | 10 ++++++----
 .../data/jdbc/repository/RowMapperMap.java             |  2 +-
 .../repository/config/ConfigurableRowMapperMap.java    |  2 +-
 .../config/DefaultQueryMappingConfiguration.java       |  1 +
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/QueryMappingConfiguration.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/QueryMappingConfiguration.java
index e882eb62..8610284e 100644
--- a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/QueryMappingConfiguration.java
+++ b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/QueryMappingConfiguration.java
@@ -1,20 +1,22 @@
 package org.springframework.data.jdbc.repository;
 
-import org.springframework.jdbc.core.ResultSetExtractor;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.lang.Nullable;
 
 /**
- * Configures a {@link org.springframework.jdbc.core.RowMapper} or a {@link ResultSetExtractor} for each type to be used
- * for extracting entities of that type from a {@link java.sql.ResultSet}.
+ * Configures a {@link org.springframework.jdbc.core.RowMapper} for each type to be used for extracting entities of that
+ * type from a {@link java.sql.ResultSet}.
  *
  * @author Jens Schauder
  * @author Evgeni Dimitrov
+ * @since 1.1
  */
 public interface QueryMappingConfiguration {
 
 	@Nullable
-	<T> RowMapper<? extends T> getRowMapper(Class<T> type);
+	default <T> RowMapper<? extends T> getRowMapper(Class<T> type) {
+		return null;
+	}
 
 	/**
 	 * An immutable empty instance that will return {@literal null} for all arguments.
diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/RowMapperMap.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/RowMapperMap.java
index ebf98235..2c40eaf3 100644
--- a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/RowMapperMap.java
+++ b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/RowMapperMap.java
@@ -22,7 +22,7 @@ import org.springframework.lang.Nullable;
  * A map from a type to a {@link RowMapper} to be used for extracting that type from {@link java.sql.ResultSet}s.
  *
  * @author Jens Schauder
- * @deprecated use {@link QueryMappingConfiguration}
+ * @deprecated since 1.1 use {@link QueryMappingConfiguration}
  */
 @Deprecated
 public interface RowMapperMap extends QueryMappingConfiguration {
diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/config/ConfigurableRowMapperMap.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/config/ConfigurableRowMapperMap.java
index 0ad537c6..8e60fb9e 100644
--- a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/config/ConfigurableRowMapperMap.java
+++ b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/config/ConfigurableRowMapperMap.java
@@ -27,7 +27,7 @@ import org.springframework.util.Assert;
  * A {@link RowMapperMap} that allows for registration of {@link RowMapper}s via a fluent Api.
  *
  * @author Jens Schauder
- * @deprecated Use {@link DefaultQueryMappingConfiguration} instead.
+ * @deprecated Since 1.1 use {@link DefaultQueryMappingConfiguration} instead.
  */
 @Deprecated
 public class ConfigurableRowMapperMap implements RowMapperMap {
diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/config/DefaultQueryMappingConfiguration.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/config/DefaultQueryMappingConfiguration.java
index 438ff1ad..15ab15a2 100644
--- a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/config/DefaultQueryMappingConfiguration.java
+++ b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/config/DefaultQueryMappingConfiguration.java
@@ -15,6 +15,7 @@ import org.springframework.util.Assert;
  *
  * @author Jens Schauder
  * @author Evgeni Dimitrov
+ * @since 1.1
  */
 public class DefaultQueryMappingConfiguration implements QueryMappingConfiguration {