spring-projects#2158 wip

sothawo · sothawo · commit a5d0520e92d9 · 2022-05-30T21:50:12.000+02:00
diff --git a/src/main/java/org/springframework/data/elasticsearch/client/elc/ReactiveElasticsearchTemplate.java b/src/main/java/org/springframework/data/elasticsearch/client/elc/ReactiveElasticsearchTemplate.java
@@ -413,17 +413,17 @@ public Flux<? extends AggregationContainer<?>> aggregate(Query query, Class<?> e
 	// endregion
 
 	@Override
-	protected Mono<String> getVendor() {
+	public Mono<String> getVendor() {
 		return Mono.just("Elasticsearch");
 	}
 
 	@Override
-	protected Mono<String> getRuntimeLibraryVersion() {
+	public Mono<String> getRuntimeLibraryVersion() {
 		return Mono.just(Version.VERSION != null ? Version.VERSION.toString() : "null");
 	}
 
 	@Override
-	protected Mono<String> getClusterVersion() {
+	public Mono<String> getClusterVersion() {
 		return Mono.from(execute(ReactiveElasticsearchClient::info)).map(infoResponse -> infoResponse.version().number());
 	}
 
diff --git a/src/main/java/org/springframework/data/elasticsearch/client/elc/RequestConverter.java b/src/main/java/org/springframework/data/elasticsearch/client/elc/RequestConverter.java
@@ -963,7 +963,7 @@ public UpdateByQueryRequest documentUpdateByQueryRequest(UpdateQuery updateQuery
 					.pipeline(updateQuery.getPipeline()) //
 					.requestsPerSecond(
 							updateQuery.getRequestsPerSecond() != null ? updateQuery.getRequestsPerSecond().longValue() : null) //
-					.slices(slices(Long.valueOf(updateQuery.getSlices())));
+					.slices(slices(updateQuery.getSlices() != null ? Long.valueOf(updateQuery.getSlices()) : null));
 
 			if (updateQuery.getAbortOnVersionConflict() != null) {
 				ub.conflicts(updateQuery.getAbortOnVersionConflict() ? Conflicts.Abort : Conflicts.Proceed);
diff --git a/src/main/java/org/springframework/data/elasticsearch/core/AbstractReactiveElasticsearchTemplate.java b/src/main/java/org/springframework/data/elasticsearch/core/AbstractReactiveElasticsearchTemplate.java
@@ -611,15 +611,15 @@ public ElasticsearchPersistentEntity<?> getPersistentEntityFor(@Nullable Class<?
 	 * @return the vendor name of the used cluster and client library
 	 * @since 4.3
 	 */
-	abstract protected Mono<String> getVendor();
+	public abstract Mono<String> getVendor();
 
 	/**
 	 * @return the version of the used client runtime library.
 	 * @since 4.3
 	 */
-	abstract protected Mono<String> getRuntimeLibraryVersion();
+	public abstract Mono<String> getRuntimeLibraryVersion();
 
-	abstract protected Mono<String> getClusterVersion();
+	public abstract Mono<String> getClusterVersion();
 
 	/**
 	 * Value class to capture client independent information from a response to an index request.
diff --git a/src/main/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplate.java b/src/main/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplate.java
@@ -676,7 +676,7 @@ protected SearchRequest prepareSearchRequest(SearchRequest request, boolean useS
 
 	// region Helper methods
 	@Override
-	protected Mono<String> getClusterVersion() {
+	public Mono<String> getClusterVersion() {
 		try {
 			return Mono.from(execute(ReactiveElasticsearchClient::info))
 					.map(mainResponse -> mainResponse.getVersion().toString());
@@ -689,7 +689,7 @@ protected Mono<String> getClusterVersion() {
 	 * @since 4.3
 	 */
 	@Override
-	protected Mono<String> getVendor() {
+	public Mono<String> getVendor() {
 		return Mono.just("Elasticsearch");
 	}
 
@@ -698,7 +698,7 @@ protected Mono<String> getVendor() {
 	 * @since 4.3
 	 */
 	@Override
-	protected Mono<String> getRuntimeLibraryVersion() {
+	public Mono<String> getRuntimeLibraryVersion() {
 		return Mono.just(Version.CURRENT.toString());
 	}
 
diff --git a/src/main/java/org/springframework/data/elasticsearch/core/mapping/SimpleElasticsearchPersistentEntity.java b/src/main/java/org/springframework/data/elasticsearch/core/mapping/SimpleElasticsearchPersistentEntity.java
@@ -510,36 +510,37 @@ Settings toSettings() {
 				return new Settings();
 			}
 
-			Settings settings = new Settings() //
-					.append("index.number_of_shards", String.valueOf(shards))
-					.append("index.number_of_replicas", String.valueOf(replicas));
+			var index = new Settings() //
+					.append("number_of_shards", String.valueOf(shards)) //
+					.append("number_of_replicas", String.valueOf(replicas));
 
 			if (refreshIntervall != null) {
-				settings.append("index.refresh_interval", refreshIntervall);
+				index.append("refresh_interval", refreshIntervall);
 			}
 
 			if (indexStoreType != null) {
-				settings.append("index.store.type", indexStoreType);
+				index.append("store", new Settings().append("type", indexStoreType));
 			}
 
 			if (sortFields != null && sortFields.length > 0) {
-				settings.append("index.sort.field", sortFields);
+				var sort = new Settings().append("field", sortFields);
 
 				if (sortOrders != null && sortOrders.length > 0) {
-					settings.append("index.sort.order", sortOrders);
+					sort.append("order", sortOrders);
 				}
 
 				if (sortModes != null && sortModes.length > 0) {
-					settings.append("index.sort.mode", sortModes);
+					sort.append("mode", sortModes);
 				}
 
 				if (sortMissingValues != null && sortMissingValues.length > 0) {
-					settings.append("index.sort.missing", sortMissingValues);
+					sort.append("missing", sortMissingValues);
 				}
-			}
 
-			return settings; //
+				index.append("sort", sort);
+			}
 
+			return new Settings().append("index", index); //
 		}
 	}
 
diff --git a/src/test/java/org/springframework/data/elasticsearch/core/RuntimeFieldsELCIntegrationTests.java b/src/test/java/org/springframework/data/elasticsearch/core/RuntimeFieldsELCIntegrationTests.java
@@ -37,4 +37,9 @@ IndexNameProvider indexNameProvider() {
 			return new IndexNameProvider("runtime-fields-rest-template");
 		}
 	}
+
+	@Override
+	public boolean newElasticsearchClient() {
+		return true;
+	}
 }
diff --git a/src/test/java/org/springframework/data/elasticsearch/core/RuntimeFieldsIntegrationTests.java b/src/test/java/org/springframework/data/elasticsearch/core/RuntimeFieldsIntegrationTests.java
@@ -21,8 +21,10 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIf;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.annotation.Id;
+import org.springframework.data.elasticsearch.NewElasticsearchClientDevelopment;
 import org.springframework.data.elasticsearch.annotations.Document;
 import org.springframework.data.elasticsearch.annotations.Field;
 import org.springframework.data.elasticsearch.annotations.FieldType;
@@ -38,7 +40,7 @@
  * @author Peter-Josef Meisch
  */
 @SpringIntegrationTest
-public abstract class RuntimeFieldsIntegrationTests {
+public abstract class RuntimeFieldsIntegrationTests implements NewElasticsearchClientDevelopment {
 
 	@Autowired private ElasticsearchOperations operations;
 	@Autowired protected IndexNameProvider indexNameProvider;
@@ -58,6 +60,7 @@ void cleanup() {
 		operations.indexOps(IndexCoordinates.of(indexNameProvider.getPrefix() + "*")).delete();
 	}
 
+	@DisabledIf(value = "newElasticsearchClient", disabledReason = "todo #2171, ES issue 298")
 	@Test // #1971
 	@DisplayName("should use runtime-field from query in search")
 	void shouldUseRuntimeFieldFromQueryInSearch() {
diff --git a/src/test/java/org/springframework/data/elasticsearch/core/indices/ReactiveIndexOperationsIntegrationTests.java b/src/test/java/org/springframework/data/elasticsearch/core/indices/ReactiveIndexOperationsIntegrationTests.java
@@ -41,7 +41,7 @@
 import org.springframework.data.elasticsearch.annotations.FieldType;
 import org.springframework.data.elasticsearch.annotations.Mapping;
 import org.springframework.data.elasticsearch.annotations.Setting;
-import org.springframework.data.elasticsearch.core.AbstractElasticsearchTemplate;
+import org.springframework.data.elasticsearch.core.AbstractReactiveElasticsearchTemplate;
 import org.springframework.data.elasticsearch.core.ReactiveElasticsearchOperations;
 import org.springframework.data.elasticsearch.core.ReactiveIndexOperations;
 import org.springframework.data.elasticsearch.core.index.*;
@@ -61,7 +61,7 @@ public abstract class ReactiveIndexOperationsIntegrationTests implements NewElas
 	private ReactiveIndexOperations indexOperations;
 
 	boolean rhlcWithCluster8() {
-		var clusterVersion = ((AbstractElasticsearchTemplate) operations).getClusterVersion();
+		var clusterVersion = ((AbstractReactiveElasticsearchTemplate) operations).getClusterVersion().block();
 		return (oldElasticsearchClient() && clusterVersion != null && clusterVersion.startsWith("8"));
 	}
 
@@ -123,21 +123,22 @@ void shouldCreateIndexForEntity() {
 	@Test // DATAES-678
 	void shouldCreateIndexWithGivenSettings() {
 
-		org.springframework.data.elasticsearch.core.document.Document requiredSettings = org.springframework.data.elasticsearch.core.document.Document
-				.create();
-		requiredSettings.put("index.number_of_replicas", 3);
-		requiredSettings.put("index.number_of_shards", 4);
-		requiredSettings.put("index.refresh_interval", "5s");
+		var index = new Settings() //
+				.append("number_of_replicas", 3) //
+				.append("number_of_shards", 4)//
+				.append("refresh_interval", "5s");
+		var requiredSettings = new Settings().append("index", index);
 
 		indexOperations.create(requiredSettings) //
 				.as(StepVerifier::create) //
 				.expectNext(true) //
 				.verifyComplete();
 
 		indexOperations.getSettings().as(StepVerifier::create).consumeNextWith(settings -> {
-			assertThat(settings.get("index.number_of_replicas")).isEqualTo("3");
-			assertThat(settings.get("index.number_of_shards")).isEqualTo("4");
-			assertThat(settings.get("index.refresh_interval")).isEqualTo("5s");
+			var flattened = settings.flatten();
+			assertThat(flattened.get("index.number_of_replicas")).isEqualTo("3");
+			assertThat(flattened.get("index.number_of_shards")).isEqualTo("4");
+			assertThat(flattened.get("index.refresh_interval")).isEqualTo("5s");
 		}).verifyComplete();
 	}
 
diff --git a/src/test/java/org/springframework/data/elasticsearch/core/mapping/SimpleElasticsearchPersistentEntityTests.java b/src/test/java/org/springframework/data/elasticsearch/core/mapping/SimpleElasticsearchPersistentEntityTests.java
@@ -177,16 +177,29 @@ void shouldErrorIfIndexSortingParametersDoNotHaveTheSameNumberOfArguments() {
 							.isInstanceOf(IllegalArgumentException.class);
 		}
 
-		@Test // #1719
+		@Test // #1719, #2158
 		@DisplayName("should write sort parameters to Settings object")
 		void shouldWriteSortParametersToSettingsObject() throws JSONException {
 
-			String expected = "{\n" + //
-					"  \"index.sort.field\": [\"second_field\", \"first_field\"],\n" + //
-					"  \"index.sort.mode\": [\"max\", \"min\"],\n" + //
-					"  \"index.sort.order\": [\"desc\",\"asc\"],\n" + //
-					"  \"index.sort.missing\": [\"_last\",\"_first\"]\n" + //
-					"}\n"; //
+			String expected = """
+					{
+					  "index": {
+					    "sort": {
+					      "field": [
+					        "second_field",
+					        "first_field"
+					      ],
+					      "mode": [
+					        "max",
+					        "min"
+					      ],
+					      "missing": [
+					        "_last",
+					        "_first"
+					      ]
+					    }
+					  }
+					}					""";
 
 			ElasticsearchPersistentEntity<?> entity = elasticsearchConverter.get().getMappingContext()
 					.getRequiredPersistentEntity(SettingsValidSortParameterSizes.class);

Original file line number	Diff line number	Diff line change
`@@ -413,17 +413,17 @@ public Flux<? extends AggregationContainer<?>> aggregate(Query query, Class<?> e`
`413`	`413`	`// endregion`
`414`	`414`
`415`	`415`	`@Override`
`416`		`- protected Mono<String> getVendor() {`
	`416`	`+ public Mono<String> getVendor() {`
`417`	`417`	`return Mono.just("Elasticsearch");`
`418`	`418`	`}`
`419`	`419`
`420`	`420`	`@Override`
`421`		`- protected Mono<String> getRuntimeLibraryVersion() {`
	`421`	`+ public Mono<String> getRuntimeLibraryVersion() {`
`422`	`422`	`return Mono.just(Version.VERSION != null ? Version.VERSION.toString() : "null");`
`423`	`423`	`}`
`424`	`424`
`425`	`425`	`@Override`
`426`		`- protected Mono<String> getClusterVersion() {`
	`426`	`+ public Mono<String> getClusterVersion() {`
`427`	`427`	`return Mono.from(execute(ReactiveElasticsearchClient::info)).map(infoResponse -> infoResponse.version().number());`
`428`	`428`	`}`
`429`	`429`
Original file line number	Diff line number	Diff line change
`@@ -510,36 +510,37 @@ Settings toSettings() {`
`510`	`510`	`return new Settings();`
`511`	`511`	`}`
`512`	`512`
`513`		`- Settings settings = new Settings() //`
`514`		`- .append("index.number_of_shards", String.valueOf(shards))`
`515`		`- .append("index.number_of_replicas", String.valueOf(replicas));`
	`513`	`+ var index = new Settings() //`
	`514`	`+ .append("number_of_shards", String.valueOf(shards)) //`
	`515`	`+ .append("number_of_replicas", String.valueOf(replicas));`
`516`	`516`
`517`	`517`	`if (refreshIntervall != null) {`
`518`		`- settings.append("index.refresh_interval", refreshIntervall);`
	`518`	`+ index.append("refresh_interval", refreshIntervall);`
`519`	`519`	`}`
`520`	`520`
`521`	`521`	`if (indexStoreType != null) {`
`522`		`- settings.append("index.store.type", indexStoreType);`
	`522`	`+ index.append("store", new Settings().append("type", indexStoreType));`
`523`	`523`	`}`
`524`	`524`
`525`	`525`	`if (sortFields != null && sortFields.length > 0) {`
`526`		`- settings.append("index.sort.field", sortFields);`
	`526`	`+ var sort = new Settings().append("field", sortFields);`
`527`	`527`
`528`	`528`	`if (sortOrders != null && sortOrders.length > 0) {`
`529`		`- settings.append("index.sort.order", sortOrders);`
	`529`	`+ sort.append("order", sortOrders);`
`530`	`530`	`}`
`531`	`531`
`532`	`532`	`if (sortModes != null && sortModes.length > 0) {`
`533`		`- settings.append("index.sort.mode", sortModes);`
	`533`	`+ sort.append("mode", sortModes);`
`534`	`534`	`}`
`535`	`535`
`536`	`536`	`if (sortMissingValues != null && sortMissingValues.length > 0) {`
`537`		`- settings.append("index.sort.missing", sortMissingValues);`
	`537`	`+ sort.append("missing", sortMissingValues);`
`538`	`538`	`}`
`539`		`- }`
`540`	`539`
`541`		`- return settings; //`
	`540`	`+ index.append("sort", sort);`
	`541`	`+ }`
`542`	`542`
	`543`	`+ return new Settings().append("index", index); //`
`543`	`544`	`}`
`544`	`545`	`}`
`545`	`546`
Original file line number	Diff line number	Diff line change
`@@ -37,4 +37,9 @@ IndexNameProvider indexNameProvider() {`
`37`	`37`	`return new IndexNameProvider("runtime-fields-rest-template");`
`38`	`38`	`}`
`39`	`39`	`}`
	`40`	`+`
	`41`	`+ @Override`
	`42`	`+ public boolean newElasticsearchClient() {`
	`43`	`+ return true;`
	`44`	`+ }`
`40`	`45`	`}`