Cwikius-Spring/spring-data-elasticsearch
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-data-elasticsearch.git synced 2025-05-29 16:22:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

DATAES-247 - Support OpType in IndexQuery.

Browse Source 
Original PR: #567
This commit is contained in:
Peter-Josef Meisch 2020-12-06 08:38:58 +01:00 committed by GitHub
parent 7df6ffb5cd
commit e408067b49
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 94 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/org/springframework/data/elasticsearch/core/RequestFactory.java
View File

@ -29,6 +29,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import org.elasticsearch.action.DocWriteRequest;
import org.elasticsearch.action.admin.indices.alias.Alias;
import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequest;
import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequestBuilder;
@ -921,6 +922,16 @@ class RequestFactory {
indexRequest.routing(query.getRouting());
}
if (query.getOpType() != null) {
switch (query.getOpType()) {
case INDEX:
indexRequest.opType(DocWriteRequest.OpType.INDEX);
break;
case CREATE:
indexRequest.opType(DocWriteRequest.OpType.CREATE);
}
}
return indexRequest;
}

25
src/main/java/org/springframework/data/elasticsearch/core/query/IndexQuery.java
View File

@ -36,6 +36,7 @@ public class IndexQuery {
@Nullable private Long seqNo;
@Nullable private Long primaryTerm;
@Nullable private String routing;
@Nullable private OpType opType;
@Nullable
public String getId() {
@ -118,4 +119,28 @@ public class IndexQuery {
public void setRouting(@Nullable String routing) {
this.routing = routing;
}
/**
* @since 4.2
*/
@Nullable
public OpType getOpType() {
return opType;
}
/**
* @since 4.2
*/
public void setOpType(OpType opType) {
this.opType = opType;
}
/**
* OpType for the index operation.
*
* @since 4.2
*/
public enum OpType {
INDEX, CREATE
}
}

10
src/main/java/org/springframework/data/elasticsearch/core/query/IndexQueryBuilder.java
View File

@ -36,6 +36,7 @@ public class IndexQueryBuilder {
@Nullable private Long seqNo;
@Nullable private Long primaryTerm;
@Nullable private String routing;
@Nullable private IndexQuery.OpType opType;
public IndexQueryBuilder withId(String id) {
this.id = id;
@ -74,6 +75,14 @@ public class IndexQueryBuilder {
return this;
}
/**
* @since 4.2
*/
public IndexQueryBuilder withOpType(IndexQuery.OpType opType) {
this.opType = opType;
return this;
}
public IndexQuery build() {
IndexQuery indexQuery = new IndexQuery();
indexQuery.setId(id);
@ -84,6 +93,7 @@ public class IndexQueryBuilder {
indexQuery.setSeqNo(seqNo);
indexQuery.setPrimaryTerm(primaryTerm);
indexQuery.setRouting(routing);
indexQuery.setOpType(opType);
return indexQuery;
}
}

48
src/test/java/org/springframework/data/elasticsearch/core/RequestFactoryTests.java
View File

@ -20,10 +20,16 @@ import static org.elasticsearch.index.query.QueryBuilders.*;
import static org.mockito.Mockito.*;
import static org.skyscreamer.jsonassert.JSONAssert.*;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.IOException;
import java.util.Arrays;
import java.util.HashSet;
import org.elasticsearch.action.DocWriteRequest;
import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequest;
import org.elasticsearch.action.index.IndexAction;
import org.elasticsearch.action.index.IndexRequest;
@ -38,6 +44,7 @@ import org.elasticsearch.common.xcontent.XContentHelper;
import org.elasticsearch.common.xcontent.XContentType;
import org.json.JSONException;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
@ -59,6 +66,7 @@ import org.springframework.data.elasticsearch.core.query.Criteria;
import org.springframework.data.elasticsearch.core.query.CriteriaQuery;
import org.springframework.data.elasticsearch.core.query.GeoDistanceOrder;
import org.springframework.data.elasticsearch.core.query.IndexQuery;
import org.springframework.data.elasticsearch.core.query.IndexQueryBuilder;
import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;
import org.springframework.data.elasticsearch.core.query.Query;
import org.springframework.data.elasticsearch.core.query.SeqNoPrimaryTerm;
@ -438,10 +446,50 @@ class RequestFactoryTests {
assertEquals(expected, json, false);
}
@Test // DATAES-247
@DisplayName("should set op_type INDEX if not specified")
void shouldSetOpTypeIndexIfNotSpecifiedAndIdIsSet() {
IndexQuery indexQuery = new IndexQueryBuilder().withId("42").withObject(Person.builder().id("42").lastName("Smith"))
.build();
IndexRequest indexRequest = requestFactory.indexRequest(indexQuery, IndexCoordinates.of("optype"));
assertThat(indexRequest.opType()).isEqualTo(DocWriteRequest.OpType.INDEX);
}
@Test // DATAES-247
@DisplayName("should set op_type CREATE if specified")
void shouldSetOpTypeCreateIfSpecified() {
IndexQuery indexQuery = new IndexQueryBuilder().withOpType(IndexQuery.OpType.CREATE).withId("42")
.withObject(Person.builder().id("42").lastName("Smith")).build();
IndexRequest indexRequest = requestFactory.indexRequest(indexQuery, IndexCoordinates.of("optype"));
assertThat(indexRequest.opType()).isEqualTo(DocWriteRequest.OpType.CREATE);
}
@Test // DATAES-247
@DisplayName("should set op_type INDEX if specified")
void shouldSetOpTypeIndexIfSpecified() {
IndexQuery indexQuery = new IndexQueryBuilder().withOpType(IndexQuery.OpType.INDEX).withId("42")
.withObject(Person.builder().id("42").lastName("Smith")).build();
IndexRequest indexRequest = requestFactory.indexRequest(indexQuery, IndexCoordinates.of("optype"));
assertThat(indexRequest.opType()).isEqualTo(DocWriteRequest.OpType.INDEX);
}
private String requestToString(ToXContent request) throws IOException {
return XContentHelper.toXContent(request, XContentType.JSON, true).utf8ToString();
}
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
static class Person {
@Nullable @Id String id;
@Nullable @Field(name = "last-name") String lastName;