From 3e4e874aa8f0034343f2f4e364dd2d042123310e Mon Sep 17 00:00:00 2001
From: Jens Schauder <jschauder@pivotal.io>
Date: Tue, 15 Oct 2019 14:02:44 +0200
Subject: [PATCH] DATAJDBC-431 - Polishing.

Improved and corrected nullability annotations. Fixed broken Javadoc.

Original pull request: #175.
---
 .../data/jdbc/core/convert/DataAccessStrategy.java            | 1 +
 .../data/jdbc/core/convert/DefaultDataAccessStrategy.java     | 4 ++--
 .../org/springframework/data/jdbc/testing/HsqlDbOnly.java     | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/DataAccessStrategy.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/DataAccessStrategy.java
index a1319ddb5..ec004609f 100644
--- a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/DataAccessStrategy.java
+++ b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/DataAccessStrategy.java
@@ -58,6 +58,7 @@ public interface DataAccessStrategy extends RelationResolver {
 	 * @return the id generated by the database if any.
 	 * @since 1.1
 	 */
+	@Nullable
 	default <T> Object insert(T instance, Class<T> domainType, Identifier identifier) {
 		return insert(instance, domainType, identifier.toMap());
 	}
diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/DefaultDataAccessStrategy.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/DefaultDataAccessStrategy.java
index 476f1a1b4..ecef50c8f 100644
--- a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/DefaultDataAccessStrategy.java
+++ b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/DefaultDataAccessStrategy.java
@@ -313,7 +313,7 @@ public class DefaultDataAccessStrategy implements DataAccessStrategy {
 		return result;
 	}
 
-	private <S, T> MapSqlParameterSource getParameterSource(S instance, RelationalPersistentEntity<S> persistentEntity,
+	private <S, T> MapSqlParameterSource getParameterSource(@Nullable S instance, RelationalPersistentEntity<S> persistentEntity,
 			String prefix, Predicate<RelationalPersistentProperty> skipProperty) {
 
 		MapSqlParameterSource parameters = new MapSqlParameterSource();
@@ -418,7 +418,7 @@ public class DefaultDataAccessStrategy implements DataAccessStrategy {
 	}
 
 	private void addConvertedPropertyValue(MapSqlParameterSource parameterSource, RelationalPersistentProperty property,
-			Object value, String paramName) {
+			@Nullable Object value, String paramName) {
 
 		JdbcValue jdbcValue = converter.writeJdbcValue( //
 				value, //
diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/HsqlDbOnly.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/HsqlDbOnly.java
index d4ac0eed7..4990b6d14 100644
--- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/HsqlDbOnly.java
+++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/HsqlDbOnly.java
@@ -27,7 +27,7 @@ import java.lang.annotation.Target;
 /**
  * Run the annotated test only against a HsqlDb database.
  *
- * Requires the use of
+ * Requires the use of {@code @ProfileValueSourceConfiguration(DatabaseProfileValueSource.class)} on the test.
  *
  * @author Jens Schauder
  */