diff --git a/src/main/java/org/springframework/data/jdbc/core/EntityRowMapper.java b/src/main/java/org/springframework/data/jdbc/core/EntityRowMapper.java
index b3082529..bf57d084 100644
--- a/src/main/java/org/springframework/data/jdbc/core/EntityRowMapper.java
+++ b/src/main/java/org/springframework/data/jdbc/core/EntityRowMapper.java
@@ -51,7 +51,6 @@ class EntityRowMapper<T> implements RowMapper<T> {
 	private final JdbcEntityOperations template;
 	private final JdbcPersistentProperty idProperty;
 
-	@java.beans.ConstructorProperties({ "entity", "conversions", "context", "template" })
 	public EntityRowMapper(JdbcPersistentEntity<T> entity, ConversionService conversions, JdbcMappingContext context,
 			JdbcEntityOperations template) {
 
@@ -137,7 +136,6 @@ class EntityRowMapper<T> implements RowMapper<T> {
 		@NonNull private final ConversionService conversionService;
 		@NonNull private final String prefix;
 
-		@java.beans.ConstructorProperties({ "resultSet", "conversionService", "prefix" })
 		private ResultSetParameterValueProvider(ResultSet resultSet, ConversionService conversionService, String prefix) {
 
 			this.resultSet = resultSet;
diff --git a/src/main/java/org/springframework/data/jdbc/core/conversion/JdbcEntityWriter.java b/src/main/java/org/springframework/data/jdbc/core/conversion/JdbcEntityWriter.java
index 8f401d44..925f4de8 100644
--- a/src/main/java/org/springframework/data/jdbc/core/conversion/JdbcEntityWriter.java
+++ b/src/main/java/org/springframework/data/jdbc/core/conversion/JdbcEntityWriter.java
@@ -126,21 +126,20 @@ public class JdbcEntityWriter extends JdbcEntityWriterSupport {
 		}
 
 		Class<?> type = p.getType();
-		if (Collection.class.isAssignableFrom(type))
-			return collectionPropertyAsStream(p, propertyAccessor);
 
-		return singlePropertyAsStream(p, propertyAccessor);
+		return Collection.class.isAssignableFrom(type) //
+				? collectionPropertyAsStream(p, propertyAccessor) //
+				: singlePropertyAsStream(p, propertyAccessor);
 	}
 
 	private Stream<Object> collectionPropertyAsStream(JdbcPersistentProperty p,
 			PersistentPropertyAccessor propertyAccessor) {
 
 		Object property = propertyAccessor.getProperty(p);
-		if (property == null) {
-			return Stream.empty();
-		}
 
-		return ((Collection<Object>) property).stream();
+		return property == null //
+				? Stream.empty() //
+				: ((Collection<Object>) property).stream();
 	}
 
 	private Stream<Object> singlePropertyAsStream(JdbcPersistentProperty p, PersistentPropertyAccessor propertyAccessor) {
diff --git a/src/main/java/org/springframework/data/jdbc/support/JdbcUtil.java b/src/main/java/org/springframework/data/jdbc/support/JdbcUtil.java
index f7209fb3..c30b0b80 100644
--- a/src/main/java/org/springframework/data/jdbc/support/JdbcUtil.java
+++ b/src/main/java/org/springframework/data/jdbc/support/JdbcUtil.java
@@ -36,7 +36,7 @@ import org.springframework.jdbc.support.JdbcUtils;
 @UtilityClass
 public class JdbcUtil {
 
-	private static final Map<Class, Integer> sqlTypeMappings = new HashMap<>();
+	private static final Map<Class<?>, Integer> sqlTypeMappings = new HashMap<>();
 
 	static {
 
@@ -63,7 +63,7 @@ public class JdbcUtil {
 		sqlTypeMappings.put(Timestamp.class, Types.TIMESTAMP);
 	}
 
-	public static int sqlTypeFor(Class type) {
+	public static int sqlTypeFor(Class<?> type) {
 		return sqlTypeMappings.keySet().stream() //
 				.filter(k -> k.isAssignableFrom(type)) //
 				.findFirst() //
diff --git a/src/test/java/org/springframework/data/jdbc/core/EntityRowMapperUnitTests.java b/src/test/java/org/springframework/data/jdbc/core/EntityRowMapperUnitTests.java
index 935d5bad..22a8a463 100644
--- a/src/test/java/org/springframework/data/jdbc/core/EntityRowMapperUnitTests.java
+++ b/src/test/java/org/springframework/data/jdbc/core/EntityRowMapperUnitTests.java
@@ -19,7 +19,6 @@ import static java.util.Arrays.*;
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.Mockito.*;
 
-import lombok.Data;
 import lombok.RequiredArgsConstructor;
 
 import java.sql.ResultSet;
@@ -191,7 +190,6 @@ public class EntityRowMapperUnitTests {
 		}
 
 		private Object getObject(String column) {
-
 			return values.get(index).get(column);
 		}