DATAJDBC-431 - ReadOnlyProperty now gets properly handled.

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-relational-parent</artifactId>
-	<version>1.2.0.BUILD-SNAPSHOT</version>
+	<version>1.2.0.DATAJDBC-431-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>Spring Data Relational Parent</name>

spring-data-jdbc-distribution/pom.xml

@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-relational-parent</artifactId>
-		<version>1.2.0.BUILD-SNAPSHOT</version>
+		<version>1.2.0.DATAJDBC-431-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

spring-data-jdbc/pom.xml

@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<artifactId>spring-data-jdbc</artifactId>
-	<version>1.2.0.BUILD-SNAPSHOT</version>
+	<version>1.2.0.DATAJDBC-431-SNAPSHOT</version>
 
 	<name>Spring Data JDBC</name>
 	<description>Spring Data module for JDBC repositories.</description>
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-relational-parent</artifactId>
-		<version>1.2.0.BUILD-SNAPSHOT</version>
+		<version>1.2.0.DATAJDBC-431-SNAPSHOT</version>
 	</parent>
 
 	<properties>

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());
 	}

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

@@ -313,7 +313,7 @@ public <T> boolean existsById(Object id, Class<T> domainType) {
 		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();
@@ -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()) {
@@ -418,7 +418,7 @@ private <T> MapSqlParameterSource createIdParameterSource(Object id, Class<T> do
 	}
 
 	private void addConvertedPropertyValue(MapSqlParameterSource parameterSource, RelationalPersistentProperty property,
-			Object value, String paramName) {
+			@Nullable Object value, String paramName) {
 
 		JdbcValue jdbcValue = converter.writeJdbcValue( //
 				value, //

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,8 +43,10 @@
 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.HsqlDbOnly;
 import org.springframework.data.jdbc.testing.TestConfiguration;
 import org.springframework.data.relational.core.conversion.RelationalConverter;
 import org.springframework.data.relational.core.mapping.Column;
@@ -597,6 +601,20 @@ public void shouldDeleteChainOfMapsWithoutIds() {
 		});
 	}
 
+	@Test // DATAJDBC-431
+	@HsqlDbOnly
+	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 +873,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/java/org/springframework/data/jdbc/testing/HsqlDbOnly.java

@@ -0,0 +1,40 @@
+/*
+ * Copyright 2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.jdbc.testing;
+
+import org.springframework.test.annotation.IfProfileValue;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Run the annotated test only against a HsqlDb database.
+ *
+ * Requires the use of {@code @ProfileValueSourceConfiguration(DatabaseProfileValueSource.class)} on the test.
+ *
+ * @author Jens Schauder
+ */
+@Target({ElementType.TYPE, ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Inherited
+@IfProfileValue(name = "current.database.is.not.hsqldb", value = "false")
+public @interface HsqlDbOnly {
+}

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'
+)

spring-data-relational/pom.xml

@@ -5,15 +5,15 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<artifactId>spring-data-relational</artifactId>
-	<version>1.2.0.BUILD-SNAPSHOT</version>
+	<version>1.2.0.DATAJDBC-431-SNAPSHOT</version>
 
 	<name>Spring Data Relational</name>
 	<description>Spring Data Relational support</description>
 
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-relational-parent</artifactId>
-		<version>1.2.0.BUILD-SNAPSHOT</version>
+		<version>1.2.0.DATAJDBC-431-SNAPSHOT</version>
 	</parent>
 
 	<properties>