Polishing

Author: mipo256

Diff for: spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/IdGeneratingEntityCallback.java

@@ -56,14 +56,14 @@ public Object onBeforeSave(Object aggregate, MutableAggregateChange<Object> aggr
 			return aggregate;
 		}
 
-		RelationalPersistentProperty property = entity.getRequiredIdProperty();
+		RelationalPersistentProperty idProperty = entity.getRequiredIdProperty();
 		PersistentPropertyAccessor<Object> accessor = entity.getPropertyAccessor(aggregate);
 
-		if (!entity.isNew(aggregate) || delegate.hasValue(property, accessor) || !property.hasSequence()) {
+		if (!entity.isNew(aggregate) || delegate.hasValue(idProperty, accessor) || !idProperty.hasSequence()) {
 			return aggregate;
 		}
 
-		delegate.generateSequenceValue(property, accessor);
+		delegate.generateSequenceValue(idProperty, accessor);
 
 		return accessor.getBean();
 	}

Diff for: spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/convert/MappingR2dbcConverter.java

@@ -186,11 +186,11 @@ private void writeInternal(Object source, OutboundRow sink, Class<?> userClass)
 		RelationalPersistentEntity<?> entity = getRequiredPersistentEntity(userClass);
 		PersistentPropertyAccessor<?> propertyAccessor = entity.getPropertyAccessor(source);
 
-		writeProperties(sink, entity, propertyAccessor, entity.isNew(source));
+		writeProperties(sink, entity, propertyAccessor);
 	}
 
 	private void writeProperties(OutboundRow sink, RelationalPersistentEntity<?> entity,
-			PersistentPropertyAccessor<?> accessor, boolean isNew) {
+			PersistentPropertyAccessor<?> accessor) {
 
 		for (RelationalPersistentProperty property : entity) {
 
@@ -213,24 +213,22 @@ private void writeProperties(OutboundRow sink, RelationalPersistentEntity<?> ent
 			}
 
 			if (getConversions().isSimpleType(value.getClass())) {
-				writeSimpleInternal(sink, value, isNew, property);
+				writeSimpleInternal(sink, value, property);
 			} else {
-				writePropertyInternal(sink, value, isNew, property);
+				writePropertyInternal(sink, value, property);
 			}
 		}
 	}
 
-	private void writeSimpleInternal(OutboundRow sink, Object value, boolean isNew,
-			RelationalPersistentProperty property) {
+	private void writeSimpleInternal(OutboundRow sink, Object value, RelationalPersistentProperty property) {
 
 		Object result = getPotentiallyConvertedSimpleWrite(value);
 
 		sink.put(property.getColumnName(),
 				Parameter.fromOrEmpty(result, getPotentiallyConvertedSimpleNullType(property.getType())));
 	}
 
-	private void writePropertyInternal(OutboundRow sink, Object value, boolean isNew,
-			RelationalPersistentProperty property) {
+	private void writePropertyInternal(OutboundRow sink, Object value, RelationalPersistentProperty property) {
 
 		TypeInformation<?> valueType = TypeInformation.of(value.getClass());
 
@@ -239,7 +237,7 @@ private void writePropertyInternal(OutboundRow sink, Object value, boolean isNew
 			if (valueType.getActualType() != null && valueType.getRequiredActualType().isCollectionLike()) {
 
 				// pass-thru nested collections
-				writeSimpleInternal(sink, value, isNew, property);
+				writeSimpleInternal(sink, value, property);
 				return;
 			}
 
@@ -310,7 +308,6 @@ private Class<?> getPotentiallyConvertedSimpleNullType(Class<?> type) {
 
 		if (customTarget.isPresent()) {
 			return customTarget.get();
-
 		}
 
 		if (type.isEnum()) {

Diff for: spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/core/R2dbcEntityTemplate.java

@@ -521,15 +521,15 @@ private void potentiallyRemoveId(RelationalPersistentEntity<?> persistentEntity,
 			return;
 		}
 
-		SqlIdentifier columnName = idProperty.getColumnName();
-		Parameter parameter = outboundRow.get(columnName);
+		SqlIdentifier idColumnName = idProperty.getColumnName();
+		Parameter parameter = outboundRow.get(idColumnName);
 
-		if (shouldSkipIdValue(parameter, idProperty)) {
-			outboundRow.remove(columnName);
+		if (shouldSkipIdValue(parameter)) {
+			outboundRow.remove(idColumnName);
 		}
 	}
 
-	private boolean shouldSkipIdValue(@Nullable Parameter value, RelationalPersistentProperty property) {
+	private boolean shouldSkipIdValue(@Nullable Parameter value) {
 
 		if (value == null || value.getValue() == null) {
 			return true;

Diff for: spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/query/UpdateMapper.java

@@ -83,7 +83,7 @@ public BoundAssignments getMappedObject(BindMarkers markers, Update update, Tabl
 	 * @param entity related {@link RelationalPersistentEntity}, can be {@literal null}.
 	 * @return the mapped {@link BoundAssignments}.
 	 */
-	public BoundAssignments getMappedObject(BindMarkers markers, Map<SqlIdentifier, ? extends Object> assignments,
+	public BoundAssignments getMappedObject(BindMarkers markers, Map<SqlIdentifier, ?> assignments,
 			Table table, @Nullable RelationalPersistentEntity<?> entity) {
 
 		Assert.notNull(markers, "BindMarkers must not be null");

Diff for: spring-data-relational/src/main/java/org/springframework/data/relational/core/dialect/PostgresDialect.java

@@ -57,6 +57,7 @@ public class PostgresDialect extends AbstractDialect {
 
 	private IdentifierProcessing identifierProcessing = IdentifierProcessing.create(Quoting.ANSI,
 			LetterCasing.LOWER_CASE);
+
 	private IdGeneration idGeneration = new IdGeneration() {
 
 		@Override