Skip to content

Commit e0037b8

Browse files
puppylpgpuppylpg
committed
modify by suggestion
Signed-off-by: puppylpg <[email protected]>
1 parent d2b427a commit e0037b8

File tree

8 files changed

+22
-39
lines changed

8 files changed

+22
-39
lines changed

‎elasticsearch/example/src/main/java/example/springdata/elasticsearch/conference/ApplicationConfiguration.java

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
package example.springdata.elasticsearch.conference;
1717

1818
import java.time.LocalDate;
19-
import java.time.format.DateTimeFormatter;
2019
import java.util.Arrays;
2120

2221
import jakarta.annotation.PostConstruct;
@@ -37,9 +36,7 @@
3736
@SpringBootApplication
3837
class ApplicationConfiguration {
3938

40-
private final DateTimeFormatter FORMAT = DateTimeFormatter.ISO_LOCAL_DATE;
41-
42-
@Autowired ElasticsearchOperations operations;
39+
@Autowired ElasticsearchOperations operations;
4340
@Autowired ConferenceRepository repository;
4441

4542
@PreDestroy
@@ -55,16 +52,16 @@ public void insertDataSample() {
5552
// Save data sample
5653

5754
var documents = Arrays.asList(
58-
Conference.builder().date(LocalDate.parse("2014-11-06", FORMAT)).name("Spring eXchange 2014 - London")
55+
Conference.builder().date(LocalDate.of(2014, 11, 6)).name("Spring eXchange 2014 - London")
5956
.keywords(Arrays.asList("java", "spring")).location(new GeoPoint(51.500152D, -0.126236D)).build(), //
60-
Conference.builder().date(LocalDate.parse("2014-12-07", FORMAT)).name("Scala eXchange 2014 - London")
57+
Conference.builder().date(LocalDate.of(2014, 12, 7)).name("Scala eXchange 2014 - London")
6158
.keywords(Arrays.asList("scala", "play", "java")).location(new GeoPoint(51.500152D, -0.126236D)).build(), //
62-
Conference.builder().date(LocalDate.parse("2014-11-20", FORMAT)).name("Elasticsearch 2014 - Berlin")
59+
Conference.builder().date(LocalDate.of(2014, 11, 20)).name("Elasticsearch 2014 - Berlin")
6360
.keywords(Arrays.asList("java", "elasticsearch", "kibana")).location(new GeoPoint(52.5234051D, 13.4113999))
6461
.build(), //
65-
Conference.builder().date(LocalDate.parse("2014-11-12", FORMAT)).name("AWS London 2014").keywords(Arrays.asList("cloud", "aws"))
62+
Conference.builder().date(LocalDate.of(2014, 11, 12)).name("AWS London 2014").keywords(Arrays.asList("cloud", "aws"))
6663
.location(new GeoPoint(51.500152D, -0.126236D)).build(), //
67-
Conference.builder().date(LocalDate.parse("2014-10-04", FORMAT)).name("JDD14 - Cracow").keywords(Arrays.asList("java", "spring"))
64+
Conference.builder().date(LocalDate.of(2014, 10, 4)).name("JDD14 - Cracow").keywords(Arrays.asList("java", "spring"))
6865
.location(new GeoPoint(50.0646501D, 19.9449799)).build());
6966

7067
repository.saveAll(documents);

‎elasticsearch/example/src/test/java/example/springdata/elasticsearch/conference/AbstractContainerBaseTest.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
*/
1616
package example.springdata.elasticsearch.conference;
1717

18-
import java.time.format.DateTimeFormatter;
19-
2018
import org.springframework.boot.test.context.SpringBootTest;
2119
import org.springframework.context.annotation.Configuration;
2220
import org.springframework.data.elasticsearch.client.ClientConfiguration;
@@ -34,10 +32,8 @@
3432
@SpringBootTest(classes = {ApplicationConfiguration.class, AbstractContainerBaseTest.TestConfiguration.class})
3533
public class AbstractContainerBaseTest {
3634

37-
protected static final DateTimeFormatter FORMAT = DateTimeFormatter.ISO_LOCAL_DATE;
38-
3935
private static final ElasticsearchContainer CONTAINER = new ElasticsearchContainer(
40-
DockerImageName.parse("docker.elastic.co/elasticsearch/elasticsearch:8.7.0")) //
36+
DockerImageName.parse("docker.elastic.co/elasticsearch/elasticsearch:8.15.3")) //
4137
.withPassword("foobar");
4238

4339
static {

‎elasticsearch/example/src/test/java/example/springdata/elasticsearch/conference/ElasticsearchOperationsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class ElasticsearchOperationsTest extends AbstractContainerBaseTest {
4444
@Test
4545
void textSearch() {
4646

47-
var expectedDate = LocalDate.parse( "2014-10-29", FORMAT);
47+
var expectedDate = LocalDate.of(2014, 10, 29);
4848
var expectedWord = "java";
4949
var query = new CriteriaQuery(
5050
new Criteria("keywords").contains(expectedWord).and(new Criteria("date").greaterThanEqual(expectedDate)));

‎elasticsearch/example/src/test/java/example/springdata/elasticsearch/conference/ElasticsearchRepositoryTest.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,17 @@ class ElasticsearchRepositoryTest extends AbstractContainerBaseTest {
3434
@Test
3535
void textSearch() {
3636

37-
var expectedDate = LocalDate.parse("2014-10-29", FORMAT);
37+
var expectedDate = LocalDate.of(2014, 10, 29);
3838
var expectedWord = "java";
3939

4040
var result = repository.findAllByKeywordsContainsAndDateAfter(expectedWord, expectedDate);
4141

4242
assertThat(result).hasSize(3);
4343

44-
result.forEach(it -> verify(it, expectedWord, expectedDate));
44+
result.forEach(it -> {
45+
assertThat(it.getKeywords()).contains(expectedWord);
46+
assertThat(it.getDate()).isAfter(expectedDate);
47+
});
4548
}
4649

47-
private void verify(Conference it, String expectedWord, LocalDate expectedDate) {
48-
49-
assertThat(it.getKeywords()).contains(expectedWord);
50-
assertThat(it.getDate()).isAfter(expectedDate);
51-
}
5250
}

‎elasticsearch/reactive/src/main/java/example/springdata/elasticsearch/conference/ApplicationConfiguration.java

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
package example.springdata.elasticsearch.conference;
1717

1818
import java.time.LocalDate;
19-
import java.time.format.DateTimeFormatter;
2019
import java.util.Arrays;
2120

2221
import jakarta.annotation.PostConstruct;
@@ -34,9 +33,7 @@
3433
@SpringBootApplication
3534
class ApplicationConfiguration {
3635

37-
private final DateTimeFormatter FORMAT = DateTimeFormatter.ISO_LOCAL_DATE;
38-
39-
@Autowired ElasticsearchOperations operations;
36+
@Autowired ElasticsearchOperations operations;
4037
@Autowired ConferenceRepository repository;
4138

4239
@PreDestroy
@@ -52,16 +49,16 @@ public void insertDataSample() {
5249
// Save data sample
5350

5451
var documents = Arrays.asList(
55-
Conference.builder().date(LocalDate.parse("2014-11-06", FORMAT)).name("Spring eXchange 2014 - London")
52+
Conference.builder().date(LocalDate.of(2014, 11, 6)).name("Spring eXchange 2014 - London")
5653
.keywords(Arrays.asList("java", "spring")).location(new GeoPoint(51.500152D, -0.126236D)).build(), //
57-
Conference.builder().date(LocalDate.parse("2014-12-07", FORMAT)).name("Scala eXchange 2014 - London")
54+
Conference.builder().date(LocalDate.of(2014, 12, 7)).name("Scala eXchange 2014 - London")
5855
.keywords(Arrays.asList("scala", "play", "java")).location(new GeoPoint(51.500152D, -0.126236D)).build(), //
59-
Conference.builder().date(LocalDate.parse("2014-11-20", FORMAT)).name("Elasticsearch 2014 - Berlin")
56+
Conference.builder().date(LocalDate.of(2014, 11, 20)).name("Elasticsearch 2014 - Berlin")
6057
.keywords(Arrays.asList("java", "elasticsearch", "kibana")).location(new GeoPoint(52.5234051D, 13.4113999))
6158
.build(), //
62-
Conference.builder().date(LocalDate.parse("2014-11-12", FORMAT)).name("AWS London 2014").keywords(Arrays.asList("cloud", "aws"))
59+
Conference.builder().date(LocalDate.of(2014, 11, 12)).name("AWS London 2014").keywords(Arrays.asList("cloud", "aws"))
6360
.location(new GeoPoint(51.500152D, -0.126236D)).build(), //
64-
Conference.builder().date(LocalDate.parse("2014-10-04", FORMAT)).name("JDD14 - Cracow").keywords(Arrays.asList("java", "spring"))
61+
Conference.builder().date(LocalDate.of(2014, 10, 4)).name("JDD14 - Cracow").keywords(Arrays.asList("java", "spring"))
6562
.location(new GeoPoint(50.0646501D, 19.9449799)).build());
6663

6764
operations.save(documents);

‎elasticsearch/reactive/src/test/java/example/springdata/elasticsearch/conference/AbstractContainerBaseTest.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@
2424
import org.testcontainers.elasticsearch.ElasticsearchContainer;
2525
import org.testcontainers.utility.DockerImageName;
2626

27-
import java.text.SimpleDateFormat;
28-
import java.time.format.DateTimeFormatter;
29-
3027
/**
3128
* singleton container
3229
*
@@ -35,10 +32,8 @@
3532
@SpringBootTest(classes = {ApplicationConfiguration.class, AbstractContainerBaseTest.TestConfiguration.class})
3633
public class AbstractContainerBaseTest {
3734

38-
protected static final DateTimeFormatter FORMAT = DateTimeFormatter.ISO_LOCAL_DATE;
39-
4035
private static final ElasticsearchContainer CONTAINER = new ElasticsearchContainer(
41-
DockerImageName.parse("docker.elastic.co/elasticsearch/elasticsearch:8.7.0")) //
36+
DockerImageName.parse("docker.elastic.co/elasticsearch/elasticsearch:8.15.3")) //
4237
.withPassword("foobar");
4338

4439
static {

‎elasticsearch/reactive/src/test/java/example/springdata/elasticsearch/conference/ReactiveElasticsearchOperationsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class ReactiveElasticsearchOperationsTest extends AbstractContainerBaseTest {
4242
@Test
4343
void textSearch() {
4444

45-
var expectedDate = LocalDate.parse( "2014-10-29", FORMAT);
45+
var expectedDate = LocalDate.of(2014, 10, 29);
4646
var expectedWord = "java";
4747
var query = new CriteriaQuery(
4848
new Criteria("keywords").contains(expectedWord).and(new Criteria("date").greaterThanEqual(expectedDate)));

‎elasticsearch/reactive/src/test/java/example/springdata/elasticsearch/conference/ReactiveElasticsearchRepositoryTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class ReactiveElasticsearchRepositoryTest extends AbstractContainerBaseTest {
3838
@Test
3939
void textSearch() {
4040

41-
var expectedDate = LocalDate.parse("2014-10-29", FORMAT);
41+
var expectedDate = LocalDate.of(2014, 10, 29);
4242
var expectedWord = "java";
4343

4444
repository.findAllByKeywordsContainsAndDateAfter(expectedWord, expectedDate) //

0 commit comments

Comments
 (0)