Fix adaption to PersistentProperty change.

Author: sothawo

src/main/java/org/springframework/data/elasticsearch/core/convert/MappingElasticsearchConverter.java

@@ -403,7 +403,8 @@ protected <R> R readProperties(ElasticsearchPersistentEntity<?> entity, R instan
 
 			for (ElasticsearchPersistentProperty property : entity) {
 
-				if (entity.isCreatorArgument(property) || !property.isReadable() || property.isIndexedIndexNameProperty()) {
+				if (entity.isCreatorArgument(property) || !property.isReadable() || property.isSeqNoPrimaryTermProperty()
+						|| property.isIndexedIndexNameProperty()) {
 					continue;
 				}
 

src/main/java/org/springframework/data/elasticsearch/core/mapping/SimpleElasticsearchPersistentProperty.java

@@ -129,7 +129,7 @@ public boolean isWritable() {
 
 	@Override
 	public boolean isReadable() {
-        return super.isReadable() && !isAnnotationPresent(WriteOnlyProperty.class);
+		return super.isReadable() && !isAnnotationPresent(WriteOnlyProperty.class);
 	}
 
 	@Override

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

@@ -4522,6 +4522,14 @@ public ImmutableEntity(@Nullable String id, String text, @Nullable SeqNoPrimaryT
 			this.seqNoPrimaryTerm = seqNoPrimaryTerm;
 		}
 
+		public ImmutableEntity withId(@Nullable String id) {
+			return new ImmutableEntity(id, this.text, this.seqNoPrimaryTerm);
+		}
+
+		public ImmutableEntity withSeqNoPrimaryTerm(@Nullable SeqNoPrimaryTerm seqNoPrimaryTerm) {
+			return new ImmutableEntity(this.id, this.text, seqNoPrimaryTerm);
+		}
+
 		@Nullable
 		public String getId() {
 			return id;

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

@@ -18,10 +18,8 @@
 import static java.util.Collections.*;
 import static org.assertj.core.api.Assertions.*;
 import static org.springframework.data.elasticsearch.annotations.FieldType.*;
-import static org.springframework.data.elasticsearch.core.query.StringQuery.MATCH_ALL;
+import static org.springframework.data.elasticsearch.core.query.StringQuery.*;
 
-import org.assertj.core.api.InstanceOfAssertFactories;
-import org.springframework.data.elasticsearch.BulkFailureException;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
@@ -45,6 +43,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
+import org.assertj.core.api.InstanceOfAssertFactories;
 import org.json.JSONException;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
@@ -60,6 +59,7 @@
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
+import org.springframework.data.elasticsearch.BulkFailureException;
 import org.springframework.data.elasticsearch.RestStatusException;
 import org.springframework.data.elasticsearch.annotations.Document;
 import org.springframework.data.elasticsearch.annotations.Field;
@@ -1509,6 +1509,14 @@ public ImmutableEntity(@Nullable String id, String text, @Nullable SeqNoPrimaryT
 			this.seqNoPrimaryTerm = seqNoPrimaryTerm;
 		}
 
+		public ImmutableEntity withId(@Nullable String id) {
+			return new ImmutableEntity(id, this.text, this.seqNoPrimaryTerm);
+		}
+
+		public ImmutableEntity withSeqNoPrimaryTerm(@Nullable SeqNoPrimaryTerm seqNoPrimaryTerm) {
+			return new ImmutableEntity(this.id, this.text, seqNoPrimaryTerm);
+		}
+
 		public String getId() {
 			return id;
 		}

src/test/java/org/springframework/data/elasticsearch/core/mapping/SimpleElasticsearchPersistentPropertyUnitTests.java

@@ -185,14 +185,6 @@ void seqNoPrimaryTermPropertyShouldNotBeWritable() {
 		assertThat(seqNoProperty.isWritable()).isFalse();
 	}
 
-	@Test // DATAES-799
-	void seqNoPrimaryTermPropertyShouldNotBeReadable() {
-		SimpleElasticsearchPersistentEntity<?> entity = context.getRequiredPersistentEntity(SeqNoPrimaryTermProperty.class);
-		ElasticsearchPersistentProperty seqNoProperty = entity.getRequiredPersistentProperty("seqNoPrimaryTerm");
-
-		assertThat(seqNoProperty.isReadable()).isFalse();
-	}
-
 	@Test // DATAES-924
 	@DisplayName("should require pattern for custom date format")
 	void shouldRequirePatternForCustomDateFormat() {
@@ -259,12 +251,12 @@ void shouldUseValueConverterAnnotation() {
 
 		assertThat(
 				persistentEntity.getRequiredPersistentProperty("fieldWithClassBasedConverter").getPropertyValueConverter())
-						.isInstanceOf(ClassBasedValueConverter.class);
+				.isInstanceOf(ClassBasedValueConverter.class);
 		assertThat(persistentEntity.getRequiredPersistentProperty("fieldWithClassBasedDerivedFromAbstractValueConverter")
 				.getPropertyValueConverter()).isInstanceOf(ClassBasedDerivedFromAbstractValueConverter.class);
 		assertThat(
 				persistentEntity.getRequiredPersistentProperty("fieldWithEnumBasedConverter").getPropertyValueConverter())
-						.isInstanceOf(EnumBasedValueConverter.class);
+				.isInstanceOf(EnumBasedValueConverter.class);
 	}
 
 	// region entities

src/test/java/org/springframework/data/elasticsearch/immutable/ImmutableRepositoryIntegrationTests.java

@@ -30,6 +30,7 @@
 import org.springframework.data.elasticsearch.junit.jupiter.SpringIntegrationTest;
 import org.springframework.data.elasticsearch.utils.IndexNameProvider;
 import org.springframework.data.repository.CrudRepository;
+import org.springframework.lang.Nullable;
 
 /**
  * @author Young Gu
@@ -90,6 +91,10 @@ public ImmutableEntity(String name) {
 			this(null, name);
 		}
 
+		public ImmutableEntity withId(@Nullable String id) {
+			return new ImmutableEntity(id, this.name);
+		}
+
 		public String getId() {
 			return id;
 		}