Spring/spring-data-examples
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Java 16 migration for Elasticsearch examples.

Browse Source 
See #606.
This commit is contained in:
Mark Paluch
2021-04-29 08:34:13 +02:00
parent ead318ce8d
commit 8c7e85366c
6 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
elasticsearch/example/src/main/java/example/springdata/elasticsearch/conference/ApplicationConfiguration.java
View File

@@ -50,7 +50,7 @@ class ApplicationConfiguration {
// Save data sample // Save data sample
List<Conference> documents = Arrays.asList( var documents = Arrays.asList(
Conference.builder().date("2014-11-06").name("Spring eXchange 2014 - London") Conference.builder().date("2014-11-06").name("Spring eXchange 2014 - London")
.keywords(Arrays.asList("java", "spring")).location(new GeoPoint(51.500152D, -0.126236D)).build(), // .keywords(Arrays.asList("java", "spring")).location(new GeoPoint(51.500152D, -0.126236D)).build(), //
Conference.builder().date("2014-12-07").name("Scala eXchange 2014 - London") Conference.builder().date("2014-12-07").name("Scala eXchange 2014 - London")

18
elasticsearch/example/src/test/java/example/springdata/elasticsearch/conference/ElasticsearchOperationsTest.java
View File

@@ -54,16 +54,16 @@ class ElasticsearchOperationsTest {
@Test @Test
void textSearch() throws ParseException { void textSearch() throws ParseException {
String expectedDate = "2014-10-29"; var expectedDate = "2014-10-29";
String expectedWord = "java"; var expectedWord = "java";
CriteriaQuery query = new CriteriaQuery( var query = new CriteriaQuery(
new Criteria("keywords").contains(expectedWord).and(new Criteria("date").greaterThanEqual(expectedDate))); new Criteria("keywords").contains(expectedWord).and(new Criteria("date").greaterThanEqual(expectedDate)));
SearchHits<Conference> result = operations.search(query, Conference.class, IndexCoordinates.of("conference-index")); var result = operations.search(query, Conference.class, IndexCoordinates.of("conference-index"));
assertThat(result).hasSize(3); assertThat(result).hasSize(3);
for (SearchHit<Conference> conference : result) { for (var conference : result) {
assertThat(conference.getContent().getKeywords()).contains(expectedWord); assertThat(conference.getContent().getKeywords()).contains(expectedWord);
assertThat(format.parse(conference.getContent().getDate())).isAfter(format.parse(expectedDate)); assertThat(format.parse(conference.getContent().getDate())).isAfter(format.parse(expectedDate));
} }
@@ -72,11 +72,11 @@ class ElasticsearchOperationsTest {
@Test @Test
void geoSpatialSearch() { void geoSpatialSearch() {
GeoPoint startLocation = new GeoPoint(50.0646501D, 19.9449799D); var startLocation = new GeoPoint(50.0646501D, 19.9449799D);
String range = "330mi"; // or 530km var range = "330mi"; // or 530km
CriteriaQuery query = new CriteriaQuery(new Criteria("location").within(startLocation, range)); var query = new CriteriaQuery(new Criteria("location").within(startLocation, range));
SearchHits<Conference> result = operations.search(query, Conference.class, IndexCoordinates.of("conference-index")); var result = operations.search(query, Conference.class, IndexCoordinates.of("conference-index"));
assertThat(result).hasSize(2); assertThat(result).hasSize(2);
} }

2
elasticsearch/reactive/src/main/java/example/springdata/elasticsearch/conference/ApplicationConfiguration.java
View File

@@ -65,7 +65,7 @@ class ApplicationConfiguration {
// just ignore it // just ignore it
} }
List<Conference> documents = Arrays.asList( var documents = Arrays.asList(
Conference.builder().date("2014-11-06").name("Spring eXchange 2014 - London") Conference.builder().date("2014-11-06").name("Spring eXchange 2014 - London")
.keywords(Arrays.asList("java", "spring")).location(new GeoPoint(51.500152D, -0.126236D)).build(), // .keywords(Arrays.asList("java", "spring")).location(new GeoPoint(51.500152D, -0.126236D)).build(), //
Conference.builder().date("2014-12-07").name("Scala eXchange 2014 - London") Conference.builder().date("2014-12-07").name("Scala eXchange 2014 - London")

6
elasticsearch/reactive/src/test/java/example/springdata/elasticsearch/conference/ReactiveElasticsearchOperationsTest.java
View File

@@ -50,9 +50,9 @@ class ReactiveElasticsearchOperationsTest {
@Test @Test
void textSearch() { void textSearch() {
String expectedDate = "2014-10-29"; var expectedDate = "2014-10-29";
String expectedWord = "java"; var expectedWord = "java";
CriteriaQuery query = new CriteriaQuery( var query = new CriteriaQuery(
new Criteria("keywords").contains(expectedWord).and("date").greaterThanEqual(expectedDate)); new Criteria("keywords").contains(expectedWord).and("date").greaterThanEqual(expectedDate));
operations.search(query, Conference.class) // operations.search(query, Conference.class) //

4
elasticsearch/reactive/src/test/java/example/springdata/elasticsearch/conference/ReactiveElasticsearchRepositoryTest.java
View File

@@ -46,8 +46,8 @@ class ReactiveElasticsearchRepositoryTest {
@Test @Test
void textSearch() { void textSearch() {
String expectedDate = "2014-10-29"; var expectedDate = "2014-10-29";
String expectedWord = "java"; var expectedWord = "java";
repository.findAllByKeywordsContainsAndDateAfter(expectedWord, expectedDate) // repository.findAllByKeywordsContainsAndDateAfter(expectedWord, expectedDate) //
.as(StepVerifier::create) // .as(StepVerifier::create) //

9
elasticsearch/util/src/main/java/example/springdata/elasticsearch/util/ElasticsearchAvailableCondition.java
View File

@@ -15,15 +15,12 @@
*/ */
package example.springdata.elasticsearch.util; package example.springdata.elasticsearch.util;
import java.util.Optional;
import org.junit.jupiter.api.extension.ConditionEvaluationResult; import org.junit.jupiter.api.extension.ConditionEvaluationResult;
import org.junit.jupiter.api.extension.ExecutionCondition; import org.junit.jupiter.api.extension.ExecutionCondition;
import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.api.extension.ExtensionContext;
import org.junit.platform.commons.support.AnnotationSupport; import org.junit.platform.commons.support.AnnotationSupport;
import org.springframework.http.HttpMethod; import org.springframework.http.HttpMethod;
import org.springframework.http.ResponseEntity;
import org.springframework.web.client.RestTemplate; import org.springframework.web.client.RestTemplate;
/** /**
@@ -37,7 +34,7 @@ class ElasticsearchAvailableCondition implements ExecutionCondition {
@Override @Override
public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext extensionContext) { public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext extensionContext) {
Optional<EnabledOnElasticsearch> annotation = AnnotationSupport.findAnnotation(extensionContext.getElement(), var annotation = AnnotationSupport.findAnnotation(extensionContext.getElement(),
EnabledOnElasticsearch.class); EnabledOnElasticsearch.class);
return annotation.map(EnabledOnElasticsearch::url) // return annotation.map(EnabledOnElasticsearch::url) //
@@ -47,10 +44,10 @@ class ElasticsearchAvailableCondition implements ExecutionCondition {
private static ConditionEvaluationResult checkServerRunning(String url) { private static ConditionEvaluationResult checkServerRunning(String url) {
RestTemplate template = new RestTemplate(); var template = new RestTemplate();
try { try {
ResponseEntity<byte[]> entity = template.exchange(url, HttpMethod.HEAD, null, byte[].class); var entity = template.exchange(url, HttpMethod.HEAD, null, byte[].class);
return ConditionEvaluationResult return ConditionEvaluationResult
.enabled("Successfully connected to Elasticsearch server: " + entity.getStatusCode()); .enabled("Successfully connected to Elasticsearch server: " + entity.getStatusCode());
} catch (RuntimeException e) { } catch (RuntimeException e) {