DATAES-464 - DefaultEntityWriter now considers read-only and transient properties.

We now register a custom Jackson module that filters read-only and transient properties for serialization.

src/test/java/org/springframework/data/elasticsearch/core/DefaultEntityMapperTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 the original author or authors.
+ * Copyright 2013-2018 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.
@@ -15,15 +15,17 @@
  */
 package org.springframework.data.elasticsearch.core;
 
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
+import static org.assertj.core.api.Assertions.*;
 
 import java.io.IOException;
 import java.util.Locale;
 
 import org.junit.Before;
 import org.junit.Test;
+import org.springframework.data.annotation.ReadOnlyProperty;
+import org.springframework.data.annotation.Transient;
 import org.springframework.data.elasticsearch.core.geo.GeoPoint;
+import org.springframework.data.elasticsearch.core.mapping.SimpleElasticsearchMappingContext;
 import org.springframework.data.elasticsearch.entities.Car;
 import org.springframework.data.elasticsearch.entities.GeoEntity;
 import org.springframework.data.geo.Point;
@@ -31,6 +33,7 @@ import org.springframework.data.geo.Point;
 /**
  * @author Artur Konczak
  * @author Mohsin Husen
+ * @author Oliver Gierke
  */
 public class DefaultEntityMapperTests {
 
@@ -41,7 +44,7 @@ public class DefaultEntityMapperTests {
 
 	@Before
 	public void init() {
-		entityMapper = new DefaultEntityMapper();
+		entityMapper = new DefaultEntityMapper(new SimpleElasticsearchMappingContext());
 	}
 
 	@Test
@@ -52,7 +55,7 @@ public class DefaultEntityMapperTests {
 		String jsonResult = entityMapper.mapToString(Car.builder().model(CAR_MODEL).name(CAR_NAME).build());
 
 		//Then
-		assertThat(jsonResult, is(JSON_STRING));
+		assertThat(jsonResult).isEqualTo(JSON_STRING);
 	}
 
 	@Test
@@ -63,15 +66,14 @@ public class DefaultEntityMapperTests {
 		Car result = entityMapper.mapToObject(JSON_STRING, Car.class);
 
 		//Then
-		assertThat(result.getName(), is(CAR_NAME));
-		assertThat(result.getModel(), is(CAR_MODEL));
+		assertThat(result.getName()).isEqualTo(CAR_NAME);
+		assertThat(result.getModel()).isEqualTo(CAR_MODEL);
 	}
 
 	@Test
 	public void shouldMapGeoPointElasticsearchNames() throws IOException {
 		//given
 		final Point point = new Point(10, 20);
-		final int radius = 10;
 		final String pointAsString = point.getX() + "," + point.getY();
 		final double[] pointAsArray = {point.getX(), point.getY()};
 		final GeoEntity geoEntity = GeoEntity.builder()
@@ -81,13 +83,43 @@ public class DefaultEntityMapperTests {
 		String jsonResult = entityMapper.mapToString(geoEntity);
 
 		//then
-		assertThat(jsonResult, containsString(pointTemplate("pointA", point)));
-		assertThat(jsonResult, containsString(pointTemplate("pointB", point)));
-		assertThat(jsonResult, containsString(String.format(Locale.ENGLISH, "\"%s\":\"%s\"", "pointC", pointAsString)));
-		assertThat(jsonResult, containsString(String.format(Locale.ENGLISH, "\"%s\":[%.1f,%.1f]", "pointD", pointAsArray[0], pointAsArray[1])));
+		assertThat(jsonResult).contains(pointTemplate("pointA", point));
+		assertThat(jsonResult).contains(pointTemplate("pointB", point));
+		assertThat(jsonResult).contains(String.format(Locale.ENGLISH, "\"%s\":\"%s\"", "pointC", pointAsString));
+		assertThat(jsonResult).contains(String.format(Locale.ENGLISH, "\"%s\":[%.1f,%.1f]", "pointD", pointAsArray[0], pointAsArray[1]));
+	}
+	
+	@Test // DATAES-464
+	public void ignoresReadOnlyProperties() throws IOException {
+		
+		// given
+		Sample sample = new Sample();
+		sample.readOnly = "readOnly";
+		sample.property = "property";
+		sample.transientProperty = "transient";
+		sample.annotatedTransientProperty = "transient";
+		
+		// when
+		String result = entityMapper.mapToString(sample);
+		
+		// then
+		assertThat(result).contains("\"property\"");
+		
+		assertThat(result).doesNotContain("readOnly");
+		assertThat(result).doesNotContain("transientProperty");
+		assertThat(result).doesNotContain("annotatedTransientProperty");
 	}
 
 	private String pointTemplate(String name, Point point) {
 		return String.format(Locale.ENGLISH, "\"%s\":{\"lat\":%.1f,\"lon\":%.1f}", name, point.getX(), point.getY());
 	}
+	
+	public static class Sample {
+		
+		
+		public @ReadOnlyProperty String readOnly;
+		public @Transient String annotatedTransientProperty;
+		public transient String transientProperty;
+		public String property;
+	}
 }