DATAJDBC-384 - Polishing.

Update nullable annotations.

Author: christophstrobl

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/DefaultDataAccessStrategy.java

@@ -505,7 +505,7 @@ static <T> NoValuePropertyAccessor<T> instance() {
 		}
 
 		@Override
-		public void setProperty(PersistentProperty<?> property, Object value) {
+		public void setProperty(PersistentProperty<?> property, @Nullable Object value) {
 			throw new UnsupportedOperationException("Cannot set value on 'null' target object.");
 		}
 

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/mapping/package-info.java

@@ -0,0 +1,2 @@
+@org.springframework.lang.NonNullApi
+package org.springframework.data.jdbc.core.mapping;

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/mybatis/MyBatisContext.java

@@ -27,16 +27,17 @@
  * the kind of values available on invocation.
  *
  * @author Jens Schauder
+ * @author Christoph Strobl
  */
 public class MyBatisContext {
 
-	private final Object id;
-	private final Object instance;
-	private final Identifier identifier;
-	private final Class domainType;
+	private final @Nullable Object id;
+	private final @Nullable Object instance;
+	private final @Nullable Identifier identifier;
+	private final @Nullable Class domainType;
 	private final Map<String, Object> additonalValues;
 
-	public MyBatisContext(@Nullable Object id, @Nullable Object instance, Class domainType,
+	public MyBatisContext(@Nullable Object id, @Nullable Object instance, @Nullable Class domainType,
 			Map<String, Object> additonalValues) {
 
 		this.id = id;
@@ -46,7 +47,7 @@ public MyBatisContext(@Nullable Object id, @Nullable Object instance, Class doma
 		this.additonalValues = additonalValues;
 	}
 
-	public MyBatisContext(Identifier identifier, Object instance, Class<?> domainType) {
+	public MyBatisContext(Identifier identifier, @Nullable Object instance, @Nullable Class<?> domainType) {
 
 		this.id = null;
 		this.identifier = identifier;
@@ -70,6 +71,7 @@ public Object getId() {
 	 *
 	 * @return Might return {@literal null}.
 	 */
+	@Nullable
 	public Identifier getIdentifier() {
 		return identifier;
 	}

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/mybatis/MyBatisDataAccessStrategy.java

@@ -259,7 +259,8 @@ public Iterable<Object> findAllByPath(Identifier identifier,
 					new MyBatisContext(identifier, null, path.getRequiredLeafProperty().getType()));
 		} catch (PersistenceException pex) {
 
-			LOG.debug("Didn't find %s in the MyBatis session. Falling back to findAllByPath", pex);
+			LOG.debug(String.format("Didn't find %s in the MyBatis session. Falling back to findAllByPath.", statementName),
+					pex);
 
 			return DataAccessStrategy.super.findAllByPath(identifier, path);
 		}

spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/AbstractImportValidator.java

@@ -30,7 +30,7 @@ abstract class AbstractImportValidator implements Visitor {
 
 	Set<Table> requiredByWhere = new HashSet<>();
 	Set<Table> from = new HashSet<>();
-	Visitable parent;
+	@Nullable Visitable parent;
 
 	/*
 	 * (non-Javadoc)

spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/BindMarker.java

@@ -46,7 +46,6 @@ static class NamedBindMarker extends BindMarker implements Named {
 		 * (non-Javadoc)
 		 * @see org.springframework.data.relational.core.sql.Named#getName()
 		 */
-		@Nullable
 		@Override
 		public String getName() {
 			return name;

spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/DefaultDeleteBuilder.java

@@ -26,7 +26,7 @@
  */
 class DefaultDeleteBuilder implements DeleteBuilder, DeleteBuilder.DeleteWhereAndOr, DeleteBuilder.DeleteWhere {
 
-	private Table from;
+	private @Nullable Table from;
 	private @Nullable Condition where;
 
 	/*

spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/DefaultInsertBuilder.java

@@ -20,6 +20,7 @@
 import java.util.Collection;
 import java.util.List;
 
+import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
 /**
@@ -31,7 +32,7 @@
 class DefaultInsertBuilder
 		implements InsertBuilder, InsertBuilder.InsertIntoColumnsAndValuesWithBuild, InsertBuilder.InsertValuesWithBuild {
 
-	private Table into;
+	private @Nullable Table into;
 	private List<Column> columns = new ArrayList<>();
 	private List<Expression> values = new ArrayList<>();
 

spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/DefaultSelectBuilder.java

@@ -284,15 +284,15 @@ static class JoinBuilder implements SelectOn, SelectOnConditionComparison, Selec
 		private final Table table;
 		private final DefaultSelectBuilder selectBuilder;
 		private final JoinType joinType;
-		private Expression from;
-		private Expression to;
+		private @Nullable Expression from;
+		private @Nullable Expression to;
 		private @Nullable Condition condition;
 
 
 		JoinBuilder(Table table, DefaultSelectBuilder selectBuilder, JoinType joinType) {
+
 			this.table = table;
 			this.selectBuilder = selectBuilder;
-
 			this.joinType = joinType;
 		}
 

spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/DefaultUpdateBuilder.java

@@ -34,7 +34,7 @@
  */
 class DefaultUpdateBuilder implements UpdateBuilder, UpdateWhere, UpdateWhereAndOr, UpdateAssign {
 
-	private Table table;
+	private @Nullable Table table;
 	private List<Assignment> assignments = new ArrayList<>();
 	private @Nullable Condition where;