Use IndexCoordinates instead of String indexName

Author: oni7uka

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

@@ -404,7 +404,7 @@ public ReindexRequest reindexRequest(PostReindexRequest postReindexRequest){
 		}
 		// region source build
 		final Source source = postReindexRequest.getSource();
-		reindexRequest.setSourceIndices(source.getIndexes().toArray(new String[]{}));
+		reindexRequest.setSourceIndices(source.getIndexes().getIndexNames());
 		if(source.getQuery() != null && source.getRemote() != null){
 			reindexRequest.setSourceQuery(source.getQuery());
 		}
@@ -448,7 +448,7 @@ public ReindexRequest reindexRequest(PostReindexRequest postReindexRequest){
 
 		// region dest build
 		final Dest dest = postReindexRequest.getDest();
-		reindexRequest.setDestIndex(dest.getIndex())
+		reindexRequest.setDestIndex(dest.getIndex().getIndexName())
 				.setDestRouting(dest.getRouting())
 				.setDestPipeline(dest.getPipeline());
 

src/main/java/org/springframework/data/elasticsearch/core/index/reindex/PostReindexRequest.java

@@ -2,16 +2,13 @@
 
 import org.elasticsearch.index.query.QueryBuilder;
 import org.springframework.data.elasticsearch.annotations.Document;
+import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
 import org.springframework.data.elasticsearch.core.query.IndexQuery;
 import org.springframework.data.elasticsearch.core.query.SourceFilter;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
 import java.time.Duration;
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.springframework.util.CollectionUtils.*;
 
 /**
  * Request to reindex some documents from one index to another.
@@ -110,19 +107,22 @@ public Integer getSlices() {
 		return slices;
 	}
 
-	public static PostReindexRequestBuilder builder(String sourceIndex, String destIndex) {
+	public static PostReindexRequestBuilder builder(IndexCoordinates sourceIndex, IndexCoordinates destIndex) {
 		return new PostReindexRequestBuilder(sourceIndex, destIndex);
 	}
 
 	public static class Source {
-		private final List<String> indexes = new ArrayList<>();
+		private final IndexCoordinates indexes;
 		@Nullable private QueryBuilder query;
 		@Nullable private Remote remote;
 		@Nullable private Slice slice;
 		@Nullable private Integer size;
 		@Nullable private SourceFilter sourceFilter;
 
-		public List<String> getIndexes() {
+		Source(IndexCoordinates indexes){
+			this.indexes = indexes;
+		}
+		public IndexCoordinates getIndexes() {
 			return indexes;
 		}
 
@@ -172,18 +172,18 @@ public Integer getMax() {
 
 	public static class Dest {
 
-		private final String index;
+		private final IndexCoordinates index;
 		@Nullable private String pipeline;
 		@Nullable private String routing;
 		@Nullable private Document.VersionType versionType;
 		@Nullable private IndexQuery.OpType opType;
 
-		Dest(String index) {
+		Dest(IndexCoordinates index) {
 			Assert.notNull(index, "dest index must not be null");
 			this.index = index;
 		}
 
-		public String getIndex() {
+		public IndexCoordinates getIndex() {
 			return index;
 		}
 
@@ -241,9 +241,8 @@ public static final class PostReindexRequestBuilder {
 		@Nullable private Duration scroll;
 		@Nullable private Integer slices;
 
-		public PostReindexRequestBuilder(String sourceIndex, String destIndex) {
-			this.source = new Source();
-			this.source.indexes.add(sourceIndex);
+		public PostReindexRequestBuilder(IndexCoordinates sourceIndex, IndexCoordinates destIndex) {
+			this.source = new Source(sourceIndex);
 			this.dest = new Dest(destIndex);
 		}
 
@@ -258,25 +257,6 @@ public PostReindexRequestBuilder withConflicts(String conflicts) {
 			return this;
 		}
 
-		public PostReindexRequestBuilder addSourceIndex(String sourceIndex) {
-			Assert.notNull(sourceIndex, "source index must not be null");
-			this.source.indexes.add(sourceIndex);
-			return this;
-		}
-
-		public PostReindexRequestBuilder withSourceIndexes(List<String> sourceIndexes) {
-			if (!isEmpty(sourceIndexes)) {
-				clearSourceIndexes();
-				this.source.indexes.addAll(sourceIndexes);
-			}
-			return this;
-		}
-
-		public PostReindexRequestBuilder clearSourceIndexes() {
-			this.source.indexes.clear();
-			return this;
-		}
-
 		public PostReindexRequestBuilder withSourceQuery(QueryBuilder query) {
 			this.source.query = query;
 			return this;

src/main/java/org/springframework/data/elasticsearch/core/index/reindex/PostReindexResponse.java

@@ -9,7 +9,7 @@
  * Response of reindex request.
  * (@see https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-reindex.html#docs-reindex-api-response-body)
  *
- * @author Onizuka
+ * @author Sijia Liu
  */
 public class PostReindexResponse {
 

src/main/java/org/springframework/data/elasticsearch/core/index/reindex/Remote.java

@@ -9,7 +9,7 @@
 /**
  * Remote info {@link RemoteInfo}
  *
- * @author Onizuka
+ * @author Sijia Liu
  */
 public class Remote {
 	private final String scheme;

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

@@ -3660,7 +3660,9 @@ void shouldWorkReindexForExistingIndex() {
 		String destIndexName = indexNameProvider.indexName();
 		operations.indexOps(IndexCoordinates.of(destIndexName)).create();
 
-		final PostReindexResponse reindex = operations.reindex(PostReindexRequest.builder(sourceIndexName, destIndexName).withRefresh(true).build());
+		final PostReindexRequest postReindexRequest = PostReindexRequest.builder(IndexCoordinates.of(sourceIndexName), IndexCoordinates.of(destIndexName))
+				.withRefresh(true).build();
+		final PostReindexResponse reindex = operations.reindex(postReindexRequest);
 		NativeSearchQuery searchQuery = new NativeSearchQueryBuilder().withQuery(matchAllQuery()).build();
 		assertThat(reindex.getTotal()).isEqualTo(1);
 		assertThat(operations.count(searchQuery, IndexCoordinates.of(destIndexName))).isEqualTo(1);
@@ -3672,7 +3674,9 @@ void shouldWorkSubmitReindexTask(){
 		indexNameProvider.increment();
 		String destIndexName = indexNameProvider.indexName();
 		operations.indexOps(IndexCoordinates.of(destIndexName)).create();
-		String task = operations.submitReindexTask(PostReindexRequest.builder(sourceIndexName, destIndexName).build());
+		final PostReindexRequest postReindexRequest = PostReindexRequest
+				.builder(IndexCoordinates.of(sourceIndexName), IndexCoordinates.of(destIndexName)).build();
+		String task = operations.submitReindexTask(postReindexRequest);
 		// Maybe there should be a task api to detect whether the task exists
 		assertThat(task).isNotBlank();
 	}

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

@@ -21,9 +21,7 @@
 import static org.springframework.data.elasticsearch.annotations.FieldType.*;
 import static org.springframework.data.elasticsearch.utils.IdGenerator.*;
 
-import org.elasticsearch.common.Strings;
 import org.springframework.data.elasticsearch.core.index.reindex.PostReindexRequest;
-import org.springframework.data.elasticsearch.core.index.reindex.PostReindexResponse;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
@@ -1202,7 +1200,11 @@ void shouldWorkReindexForExistingIndex() {
 		indexNameProvider.increment();
 		String destIndexName = indexNameProvider.indexName();
 		operations.indexOps(IndexCoordinates.of(destIndexName)).create();
-		operations.reindex(PostReindexRequest.builder(sourceIndexName, destIndexName).withRefresh(true).build())
+		final PostReindexRequest postReindexRequest = PostReindexRequest
+				.builder(IndexCoordinates.of(sourceIndexName), IndexCoordinates.of(destIndexName))
+				.withRefresh(true)
+				.build();
+		operations.reindex(postReindexRequest)
 				.as(StepVerifier::create)
 				.consumeNextWith(postReindexResponse -> assertThat(postReindexResponse.getTotal()).isEqualTo(1L))
 				.verifyComplete();
@@ -1219,7 +1221,10 @@ void shouldWorkSubmitReindexTask(){
 		indexNameProvider.increment();
 		String destIndexName = indexNameProvider.indexName();
 		operations.indexOps(IndexCoordinates.of(destIndexName)).create();
-		operations.submitReindexTask(PostReindexRequest.builder(sourceIndexName, destIndexName).build())
+		final PostReindexRequest postReindexRequest = PostReindexRequest
+				.builder(IndexCoordinates.of(sourceIndexName), IndexCoordinates.of(destIndexName))
+				.build();
+		operations.submitReindexTask(postReindexRequest)
 				.as(StepVerifier::create)
 				.consumeNextWith(task -> assertThat(task).isNotBlank())
 				.verifyComplete();

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

@@ -595,8 +595,8 @@ void shouldCreatePostReindexRequest() throws IOException, JSONException {
 				.withConnectTimeout(Duration.ofSeconds(30))
 				.withSocketTimeout(Duration.ofSeconds(30)).build();
 
-		PostReindexRequest postReindexRequest = PostReindexRequest.builder("source_1", "destination")
-				.addSourceIndex("source_2")
+		PostReindexRequest postReindexRequest = PostReindexRequest.builder(IndexCoordinates.of("source_1", "source_2"),
+						IndexCoordinates.of("destination"))
 				.withConflicts("proceed")
 				.withMaxDocs(10)
 				.withSourceQuery(QueryBuilders.matchAllQuery())