Skip to content

Add elasticsearch repository test #694

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Add elasticsearch repository test #694

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d2b427a
Add elasticsearch repository test
puppylpg Jan 23, 2024
e0037b8
modify by suggestion
puppylpg Nov 17, 2024
d777264
update date
puppylpg May 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
modify by suggestion 
Signed-off-by: puppylpg <shininglhb@163.com>
  • Loading branch information
@puppylpg
puppylpg committed May 5, 2025
commit e0037b81ee06dc086082d4c2d9deb5c8da9594d3
15 changes: 6 additions & 9 deletions ...e/src/main/java/example/springdata/elasticsearch/conference/ApplicationConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
package example.springdata.elasticsearch.conference;

import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.Arrays;

import jakarta.annotation.PostConstruct;
Expand All @@ -37,9 +36,7 @@
@SpringBootApplication
class ApplicationConfiguration {

private final DateTimeFormatter FORMAT = DateTimeFormatter.ISO_LOCAL_DATE;

@Autowired ElasticsearchOperations operations;
@Autowired ElasticsearchOperations operations;
@Autowired ConferenceRepository repository;

@PreDestroy
Expand All @@ -55,16 +52,16 @@ public void insertDataSample() {
// Save data sample

var documents = Arrays.asList(
Conference.builder().date(LocalDate.parse("2014-11-06", FORMAT)).name("Spring eXchange 2014 - London")
Conference.builder().date(LocalDate.of(2014, 11, 6)).name("Spring eXchange 2014 - London")
.keywords(Arrays.asList("java", "spring")).location(new GeoPoint(51.500152D, -0.126236D)).build(), //
Conference.builder().date(LocalDate.parse("2014-12-07", FORMAT)).name("Scala eXchange 2014 - London")
Conference.builder().date(LocalDate.of(2014, 12, 7)).name("Scala eXchange 2014 - London")
.keywords(Arrays.asList("scala", "play", "java")).location(new GeoPoint(51.500152D, -0.126236D)).build(), //
Conference.builder().date(LocalDate.parse("2014-11-20", FORMAT)).name("Elasticsearch 2014 - Berlin")
Conference.builder().date(LocalDate.of(2014, 11, 20)).name("Elasticsearch 2014 - Berlin")
.keywords(Arrays.asList("java", "elasticsearch", "kibana")).location(new GeoPoint(52.5234051D, 13.4113999))
.build(), //
Conference.builder().date(LocalDate.parse("2014-11-12", FORMAT)).name("AWS London 2014").keywords(Arrays.asList("cloud", "aws"))
Conference.builder().date(LocalDate.of(2014, 11, 12)).name("AWS London 2014").keywords(Arrays.asList("cloud", "aws"))
.location(new GeoPoint(51.500152D, -0.126236D)).build(), //
Conference.builder().date(LocalDate.parse("2014-10-04", FORMAT)).name("JDD14 - Cracow").keywords(Arrays.asList("java", "spring"))
Conference.builder().date(LocalDate.of(2014, 10, 4)).name("JDD14 - Cracow").keywords(Arrays.asList("java", "spring"))
.location(new GeoPoint(50.0646501D, 19.9449799)).build());

repository.saveAll(documents);
Expand Down
6 changes: 1 addition & 5 deletions .../src/test/java/example/springdata/elasticsearch/conference/AbstractContainerBaseTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
*/
package example.springdata.elasticsearch.conference;

import java.time.format.DateTimeFormatter;

import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.elasticsearch.client.ClientConfiguration;
Expand All @@ -34,10 +32,8 @@
@SpringBootTest(classes = {ApplicationConfiguration.class, AbstractContainerBaseTest.TestConfiguration.class})
public class AbstractContainerBaseTest {

protected static final DateTimeFormatter FORMAT = DateTimeFormatter.ISO_LOCAL_DATE;

private static final ElasticsearchContainer CONTAINER = new ElasticsearchContainer(
DockerImageName.parse("docker.elastic.co/elasticsearch/elasticsearch:8.7.0")) //
DockerImageName.parse("docker.elastic.co/elasticsearch/elasticsearch:8.15.3")) //
.withPassword("foobar");

static {
Expand Down
2 changes: 1 addition & 1 deletion ...rc/test/java/example/springdata/elasticsearch/conference/ElasticsearchOperationsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class ElasticsearchOperationsTest extends AbstractContainerBaseTest {
@Test
void textSearch() {

var expectedDate = LocalDate.parse( "2014-10-29", FORMAT);
var expectedDate = LocalDate.of(2014, 10, 29);
var expectedWord = "java";
var query = new CriteriaQuery(
new Criteria("keywords").contains(expectedWord).and(new Criteria("date").greaterThanEqual(expectedDate)));
Expand Down
12 changes: 5 additions & 7 deletions ...rc/test/java/example/springdata/elasticsearch/conference/ElasticsearchRepositoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,19 +34,17 @@ class ElasticsearchRepositoryTest extends AbstractContainerBaseTest {
@Test
void textSearch() {

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

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

assertThat(result).hasSize(3);

result.forEach(it -> verify(it, expectedWord, expectedDate));
result.forEach(it -> {
assertThat(it.getKeywords()).contains(expectedWord);
assertThat(it.getDate()).isAfter(expectedDate);
});
}

private void verify(Conference it, String expectedWord, LocalDate expectedDate) {

assertThat(it.getKeywords()).contains(expectedWord);
assertThat(it.getDate()).isAfter(expectedDate);
}
}
15 changes: 6 additions & 9 deletions ...e/src/main/java/example/springdata/elasticsearch/conference/ApplicationConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
package example.springdata.elasticsearch.conference;

import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.Arrays;

import jakarta.annotation.PostConstruct;
Expand All @@ -34,9 +33,7 @@
@SpringBootApplication
class ApplicationConfiguration {

private final DateTimeFormatter FORMAT = DateTimeFormatter.ISO_LOCAL_DATE;

@Autowired ElasticsearchOperations operations;
@Autowired ElasticsearchOperations operations;
@Autowired ConferenceRepository repository;

@PreDestroy
Expand All @@ -52,16 +49,16 @@ public void insertDataSample() {
// Save data sample

var documents = Arrays.asList(
Conference.builder().date(LocalDate.parse("2014-11-06", FORMAT)).name("Spring eXchange 2014 - London")
Conference.builder().date(LocalDate.of(2014, 11, 6)).name("Spring eXchange 2014 - London")
.keywords(Arrays.asList("java", "spring")).location(new GeoPoint(51.500152D, -0.126236D)).build(), //
Conference.builder().date(LocalDate.parse("2014-12-07", FORMAT)).name("Scala eXchange 2014 - London")
Conference.builder().date(LocalDate.of(2014, 12, 7)).name("Scala eXchange 2014 - London")
.keywords(Arrays.asList("scala", "play", "java")).location(new GeoPoint(51.500152D, -0.126236D)).build(), //
Conference.builder().date(LocalDate.parse("2014-11-20", FORMAT)).name("Elasticsearch 2014 - Berlin")
Conference.builder().date(LocalDate.of(2014, 11, 20)).name("Elasticsearch 2014 - Berlin")
.keywords(Arrays.asList("java", "elasticsearch", "kibana")).location(new GeoPoint(52.5234051D, 13.4113999))
.build(), //
Conference.builder().date(LocalDate.parse("2014-11-12", FORMAT)).name("AWS London 2014").keywords(Arrays.asList("cloud", "aws"))
Conference.builder().date(LocalDate.of(2014, 11, 12)).name("AWS London 2014").keywords(Arrays.asList("cloud", "aws"))
.location(new GeoPoint(51.500152D, -0.126236D)).build(), //
Conference.builder().date(LocalDate.parse("2014-10-04", FORMAT)).name("JDD14 - Cracow").keywords(Arrays.asList("java", "spring"))
Conference.builder().date(LocalDate.of(2014, 10, 4)).name("JDD14 - Cracow").keywords(Arrays.asList("java", "spring"))
.location(new GeoPoint(50.0646501D, 19.9449799)).build());

operations.save(documents);
Expand Down
7 changes: 1 addition & 6 deletions .../src/test/java/example/springdata/elasticsearch/conference/AbstractContainerBaseTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@
import org.testcontainers.elasticsearch.ElasticsearchContainer;
import org.testcontainers.utility.DockerImageName;

import java.text.SimpleDateFormat;
import java.time.format.DateTimeFormatter;

/**
* singleton container
*
Expand All @@ -35,10 +32,8 @@
@SpringBootTest(classes = {ApplicationConfiguration.class, AbstractContainerBaseTest.TestConfiguration.class})
public class AbstractContainerBaseTest {

protected static final DateTimeFormatter FORMAT = DateTimeFormatter.ISO_LOCAL_DATE;

private static final ElasticsearchContainer CONTAINER = new ElasticsearchContainer(
DockerImageName.parse("docker.elastic.co/elasticsearch/elasticsearch:8.7.0")) //
DockerImageName.parse("docker.elastic.co/elasticsearch/elasticsearch:8.15.3")) //
.withPassword("foobar");

static {
Expand Down
2 changes: 1 addition & 1 deletion ...java/example/springdata/elasticsearch/conference/ReactiveElasticsearchOperationsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class ReactiveElasticsearchOperationsTest extends AbstractContainerBaseTest {
@Test
void textSearch() {

var expectedDate = LocalDate.parse( "2014-10-29", FORMAT);
var expectedDate = LocalDate.of(2014, 10, 29);
var expectedWord = "java";
var query = new CriteriaQuery(
new Criteria("keywords").contains(expectedWord).and(new Criteria("date").greaterThanEqual(expectedDate)));
Expand Down
2 changes: 1 addition & 1 deletion ...java/example/springdata/elasticsearch/conference/ReactiveElasticsearchRepositoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class ReactiveElasticsearchRepositoryTest extends AbstractContainerBaseTest {
@Test
void textSearch() {

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

repository.findAllByKeywordsContainsAndDateAfter(expectedWord, expectedDate) //
Expand Down