DATAES-799 - Support optimistic locking for full update scenario using seq_no + primary_term.

Make sure that usage of SeqNoPrimaryTerm together with @Version does not cause index rejections

Author: rpuch

src/main/java/org/springframework/data/elasticsearch/core/AbstractElasticsearchTemplate.java

@@ -464,11 +464,13 @@ private <T> IndexQuery getIndexQuery(T entity) {
 
 		IndexQueryBuilder builder = new IndexQueryBuilder() //
 				.withId(id) //
-				.withVersion(getEntityVersion(entity)) //
 				.withObject(entity);
 		SeqNoPrimaryTerm seqNoPrimaryTerm = getEntitySeqNoPrimaryTerm(entity);
 		if (seqNoPrimaryTerm != null) {
 			builder.withSeqNoPrimaryTerm(seqNoPrimaryTerm);
+		} else {
+			// version cannot be used together with seq_no and primary_term
+			builder.withVersion(getEntityVersion(entity));
 		}
 		return builder.build();
 	}

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

@@ -3162,6 +3162,35 @@ void shouldThrowOptimisticLockingFailureExceptionWhenConcurrentUpdateOccursOnEnt
 				.isInstanceOf(OptimisticLockingFailureException.class);
 	}
 
+	@Test // DATAES-799
+	void shouldThrowOptimisticLockingFailureExceptionWhenConcurrentUpdateOccursOnVersionedEntityWithSeqNoPrimaryTermProperty() {
+		OptimisticAndVersionedEntity original = new OptimisticAndVersionedEntity();
+		original.setMessage("It's fine");
+		OptimisticAndVersionedEntity saved = operations.save(original);
+
+		OptimisticAndVersionedEntity forEdit1 = operations.get(saved.getId(), OptimisticAndVersionedEntity.class);
+		OptimisticAndVersionedEntity forEdit2 = operations.get(saved.getId(), OptimisticAndVersionedEntity.class);
+
+		forEdit1.setMessage("It'll be ok");
+		operations.save(forEdit1);
+
+		forEdit2.setMessage("It'll be great");
+		assertThatThrownBy(() -> operations.save(forEdit2))
+				.isInstanceOf(OptimisticLockingFailureException.class);
+	}
+
+	@Test // DATAES-799
+	void shouldAllowFullReplaceOfEntityWithBothSeqNoPrimaryTermAndVersion() {
+		OptimisticAndVersionedEntity original = new OptimisticAndVersionedEntity();
+		original.setMessage("It's fine");
+		OptimisticAndVersionedEntity saved = operations.save(original);
+
+		OptimisticAndVersionedEntity forEdit = operations.get(saved.getId(), OptimisticAndVersionedEntity.class);
+
+		forEdit.setMessage("It'll be ok");
+		operations.save(forEdit);
+	}
+
 	protected RequestFactory getRequestFactory() {
 		return ((AbstractElasticsearchTemplate) operations).getRequestFactory();
 	}
@@ -3333,4 +3362,13 @@ static class OptimisticEntity {
 		private String message;
 		private SeqNoPrimaryTerm seqNoPrimaryTerm;
 	}
+
+	@Data
+	@Document(indexName = "test-index-optimistic-and-versioned-entity-template")
+	static class OptimisticAndVersionedEntity {
+		@Id private String id;
+		private String message;
+		private SeqNoPrimaryTerm seqNoPrimaryTerm;
+		@Version private Long version;
+	}
 }

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

@@ -67,7 +67,7 @@ class RequestFactoryTests {
 	@BeforeAll
 	static void setUpAll() {
 		SimpleElasticsearchMappingContext mappingContext = new SimpleElasticsearchMappingContext();
-		mappingContext.setInitialEntitySet(new HashSet<>(Arrays.asList(Person.class, EntityWithSeqNoAndPrimaryTerm.class)));
+		mappingContext.setInitialEntitySet(new HashSet<>(Arrays.asList(Person.class, EntityWithSeqNoPrimaryTerm.class)));
 		mappingContext.afterPropertiesSet();
 
 		converter = new MappingElasticsearchConverter(mappingContext, new GenericConversionService());
@@ -184,7 +184,7 @@ void shouldNotRequestSeqNoAndPrimartyTermViaSearchRequestWhenEntityClassDoesNotC
 	void shouldRequestSeqNoAndPrimartyTermViaSearchRequestWhenEntityClassContainsSeqNoPrimaryTermProperty() {
 		Query query = new NativeSearchQueryBuilder().build();
 
-		SearchRequest request = requestFactory.searchRequest(query, EntityWithSeqNoAndPrimaryTerm.class,
+		SearchRequest request = requestFactory.searchRequest(query, EntityWithSeqNoPrimaryTerm.class,
 				IndexCoordinates.of("seqNoPrimaryTerm"));
 
 		assertThat(request.source().seqNoAndPrimaryTerm()).isTrue();
@@ -205,7 +205,7 @@ static class Person {
 		@Nullable @Field(name = "current-location") GeoPoint location;
 	}
 
-	static class EntityWithSeqNoAndPrimaryTerm {
+	static class EntityWithSeqNoPrimaryTerm {
 		@Nullable private SeqNoPrimaryTerm seqNoPrimaryTerm;
 	}
 }