DATAJDBC-431 - ReadOnlyProperty now gets properly handled.

The problem was that the SqlGenerator honored the annotation but they were included as query parameters and therefore automatically added back again.

Also simplified the relevant filter in the SqlGenerator.

Author: schauder

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

@@ -323,7 +323,7 @@ private <S, T> MapSqlParameterSource getParameterSource(S instance, RelationalPe
 
 		persistentEntity.doWithProperties((PropertyHandler<RelationalPersistentProperty>) property -> {
 
-			if (skipProperty.test(property)) {
+			if (skipProperty.test(property) || !property.isWritable()) {
 				return;
 			}
 			if (property.isEntity() && !property.isEmbedded()) {

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

@@ -29,7 +29,6 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
-import org.springframework.data.annotation.ReadOnlyProperty;
 import org.springframework.data.jdbc.repository.support.SimpleJdbcRepository;
 import org.springframework.data.mapping.PersistentPropertyPath;
 import org.springframework.data.mapping.PropertyHandler;
@@ -623,7 +622,7 @@ private void initSimpleColumnName(RelationalPersistentProperty property, String
 				idColumnNames.add(columnName);
 			}
 
-			if (!property.isWritable() || property.isAnnotationPresent(ReadOnlyProperty.class)) {
+			if (!property.isWritable()) {
 				readOnlyColumnNames.add(columnName);
 			}
 		}

spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/JdbcAggregateTemplateIntegrationTests.java

@@ -21,8 +21,10 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.AbstractMap;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -41,6 +43,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.data.annotation.Id;
+import org.springframework.data.annotation.ReadOnlyProperty;
 import org.springframework.data.jdbc.core.convert.DataAccessStrategy;
 import org.springframework.data.jdbc.testing.DatabaseProfileValueSource;
 import org.springframework.data.jdbc.testing.TestConfiguration;
@@ -597,6 +600,22 @@ public void shouldDeleteChainOfMapsWithoutIds() {
 		});
 	}
 
+	@Test
+	public void readOnlyGetsLoadedButNotWritten() {
+
+		WithReadOnly entity = new WithReadOnly();
+		entity.name = "Alfred";
+		entity.readOnly = "not used";
+
+		template.save(entity);
+
+		assertThat(
+				jdbcTemplate.queryForObject("SELECT read_only FROM with_read_only", Collections.emptyMap(), String.class)).isEqualTo("from-db");
+
+
+
+	}
+
 	private static NoIdMapChain4 createNoIdMapTree() {
 
 		NoIdMapChain4 chain4 = new NoIdMapChain4();
@@ -855,6 +874,13 @@ static class NoIdMapChain4 {
 		Map<String, NoIdMapChain3> chain3 = new HashMap<>();
 	}
 
+	static class WithReadOnly {
+		@Id Long id;
+		String name;
+		@ReadOnlyProperty
+		String readOnly;
+	}
+
 	@Configuration
 	@Import(TestConfiguration.class)
 	static class Config {

spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.core/JdbcAggregateTemplateIntegrationTests-hsql.sql

@@ -292,4 +292,10 @@ CREATE TABLE NO_ID_MAP_CHAIN0
                                     NO_ID_MAP_CHAIN3_KEY,
                                     NO_ID_MAP_CHAIN2_KEY
     )
-);
+);
+
+CREATE TABLE WITH_READ_ONLY (
+    ID BIGINT GENERATED BY DEFAULT AS IDENTITY (START WITH 40) PRIMARY KEY,
+    NAME VARCHAR(200),
+    READ_ONLY VARCHAR(200) DEFAULT 'from-db'
+)