From 104febea4e3aa9db2e4e2a9f9ddcccfc657967c4 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 16 Jun 2020 15:18:27 +0200 Subject: [PATCH] #509 - Polishing. Move off deprecated API. Clean up unused gitignore files. --- elasticsearch/example/.gitignore | 13 ------------- elasticsearch/reactive/.gitignore | 13 ------------- .../ReactiveElasticsearchOperationsTest.java | 11 ++++++----- elasticsearch/rest/.gitignore | 13 ------------- 4 files changed, 6 insertions(+), 44 deletions(-) delete mode 100644 elasticsearch/example/.gitignore delete mode 100644 elasticsearch/reactive/.gitignore delete mode 100644 elasticsearch/rest/.gitignore diff --git a/elasticsearch/example/.gitignore b/elasticsearch/example/.gitignore deleted file mode 100644 index e50bef9c..00000000 --- a/elasticsearch/example/.gitignore +++ /dev/null @@ -1,13 +0,0 @@ -.project -.classpath -.springBeans -.settings/ -target/ - -#IntelliJ Stuff -.idea -*.iml - -##ignore local node data files for unit tests -/data -/.DS_Store diff --git a/elasticsearch/reactive/.gitignore b/elasticsearch/reactive/.gitignore deleted file mode 100644 index e50bef9c..00000000 --- a/elasticsearch/reactive/.gitignore +++ /dev/null @@ -1,13 +0,0 @@ -.project -.classpath -.springBeans -.settings/ -target/ - -#IntelliJ Stuff -.idea -*.iml - -##ignore local node data files for unit tests -/data -/.DS_Store diff --git a/elasticsearch/reactive/src/test/java/example/springdata/elasticsearch/conference/ReactiveElasticsearchOperationsTest.java b/elasticsearch/reactive/src/test/java/example/springdata/elasticsearch/conference/ReactiveElasticsearchOperationsTest.java index 760c23c1..fef7d5b5 100644 --- a/elasticsearch/reactive/src/test/java/example/springdata/elasticsearch/conference/ReactiveElasticsearchOperationsTest.java +++ b/elasticsearch/reactive/src/test/java/example/springdata/elasticsearch/conference/ReactiveElasticsearchOperationsTest.java @@ -26,12 +26,13 @@ import java.text.SimpleDateFormat; import org.junit.ClassRule; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.data.elasticsearch.core.ReactiveElasticsearchOperations; +import org.springframework.data.elasticsearch.core.SearchHit; import org.springframework.data.elasticsearch.core.query.Criteria; import org.springframework.data.elasticsearch.core.query.CriteriaQuery; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.junit4.SpringRunner; /** @@ -57,7 +58,7 @@ public class ReactiveElasticsearchOperationsTest { CriteriaQuery query = new CriteriaQuery( new Criteria("keywords").contains(expectedWord).and("date").greaterThanEqual(expectedDate)); - operations.find(query, Conference.class) // + operations.search(query, Conference.class) // .as(StepVerifier::create) // .consumeNextWith(it -> verify(it, expectedWord, expectedDate)) // .consumeNextWith(it -> verify(it, expectedWord, expectedDate)) // @@ -65,11 +66,11 @@ public class ReactiveElasticsearchOperationsTest { .verifyComplete(); } - void verify(Conference it, String expectedWord, String expectedDate) { + void verify(SearchHit hit, String expectedWord, String expectedDate) { - assertThat(it.getKeywords()).contains(expectedWord); + assertThat(hit.getContent().getKeywords()).contains(expectedWord); try { - assertThat(format.parse(it.getDate())).isAfter(format.parse(expectedDate)); + assertThat(format.parse(hit.getContent().getDate())).isAfter(format.parse(expectedDate)); } catch (ParseException e) { fail("o_O", e); } diff --git a/elasticsearch/rest/.gitignore b/elasticsearch/rest/.gitignore deleted file mode 100644 index e50bef9c..00000000 --- a/elasticsearch/rest/.gitignore +++ /dev/null @@ -1,13 +0,0 @@ -.project -.classpath -.springBeans -.settings/ -target/ - -#IntelliJ Stuff -.idea -*.iml - -##ignore local node data files for unit tests -/data -/.DS_Store