Skip to content

Commit 5392af5

Browse files
committed
WIP
1 parent 6c4b9ac commit 5392af5

File tree

4 files changed

+41
-53
lines changed

4 files changed

+41
-53
lines changed

src/test/java/org/springframework/data/elasticsearch/core/query/CriteriaQueryIntegrationTests.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,8 @@ public class CriteriaQueryIntegrationTests {
6060
static class Config {
6161
@Bean
6262
IndexNameProvider indexNameProvider() {
63-
return new IndexNameProvider("criteria-query");
63+
return new IndexNameProvider();
6464
}
65-
6665
}
6766

6867
@Autowired private ElasticsearchOperations operations;

src/test/java/org/springframework/data/elasticsearch/repositories/doubleid/DoubleIDRepositoryTests.java

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -21,22 +21,23 @@
2121
import java.util.Arrays;
2222
import java.util.Optional;
2323

24-
import org.junit.jupiter.api.AfterEach;
2524
import org.junit.jupiter.api.BeforeEach;
25+
import org.junit.jupiter.api.Order;
2626
import org.junit.jupiter.api.Test;
2727
import org.springframework.beans.factory.annotation.Autowired;
28+
import org.springframework.context.annotation.Bean;
2829
import org.springframework.context.annotation.Configuration;
2930
import org.springframework.context.annotation.Import;
3031
import org.springframework.data.annotation.Id;
3132
import org.springframework.data.annotation.Version;
3233
import org.springframework.data.elasticsearch.annotations.Document;
3334
import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
34-
import org.springframework.data.elasticsearch.core.IndexOperations;
35+
import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
3536
import org.springframework.data.elasticsearch.junit.jupiter.ElasticsearchRestTemplateConfiguration;
3637
import org.springframework.data.elasticsearch.junit.jupiter.SpringIntegrationTest;
3738
import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
3839
import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories;
39-
import org.springframework.data.elasticsearch.utils.IndexInitializer;
40+
import org.springframework.data.elasticsearch.utils.IndexNameProvider;
4041
import org.springframework.test.context.ContextConfiguration;
4142

4243
/**
@@ -53,22 +54,28 @@ public class DoubleIDRepositoryTests {
5354
@Configuration
5455
@Import({ ElasticsearchRestTemplateConfiguration.class })
5556
@EnableElasticsearchRepositories(considerNestedRepositories = true)
56-
static class Config {}
57+
static class Config {
58+
@Bean
59+
IndexNameProvider indexNameProvider() {
60+
return new IndexNameProvider();
61+
}
62+
}
5763

5864
@Autowired private DoubleIDRepository repository;
5965

6066
@Autowired ElasticsearchOperations operations;
61-
private IndexOperations indexOperations;
67+
@Autowired IndexNameProvider indexNameProvider;
6268

6369
@BeforeEach
6470
public void before() {
65-
indexOperations = operations.indexOps(DoubleIDEntity.class);
66-
IndexInitializer.init(indexOperations);
71+
indexNameProvider.increment();
72+
operations.indexOps(DoubleIDEntity.class).createWithMapping();
6773
}
6874

69-
@AfterEach
70-
public void after() {
71-
indexOperations.delete();
75+
@Test
76+
@Order(Integer.MAX_VALUE)
77+
public void cleanup() {
78+
operations.indexOps(IndexCoordinates.of("*")).delete();
7279
}
7380

7481
@Test
@@ -116,12 +123,7 @@ public void shouldSaveDocument() {
116123
assertThat(entityFromElasticSearch).isPresent();
117124
}
118125

119-
/**
120-
* @author Rizwan Idrees
121-
* @author Mohsin Husen
122-
*/
123-
124-
@Document(indexName = "test-index-double-keyed-entity")
126+
@Document(indexName = "#{@indexNameProvider.indexName()}")
125127
static class DoubleIDEntity {
126128

127129
@Id private Double id;
@@ -162,9 +164,5 @@ public void setVersion(Long version) {
162164
}
163165
}
164166

165-
/**
166-
* @author Ryan Henszey
167-
* @author Mohsin Husen
168-
*/
169167
interface DoubleIDRepository extends ElasticsearchRepository<DoubleIDEntity, Double> {}
170168
}

src/test/java/org/springframework/data/elasticsearch/repositories/setting/dynamic/DynamicSettingAndMappingEntityRepositoryTests.java

Lines changed: 18 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,11 @@
2222
import java.util.Map;
2323

2424
import org.elasticsearch.index.query.QueryBuilders;
25-
import org.junit.jupiter.api.AfterEach;
2625
import org.junit.jupiter.api.BeforeEach;
26+
import org.junit.jupiter.api.Order;
2727
import org.junit.jupiter.api.Test;
2828
import org.springframework.beans.factory.annotation.Autowired;
29+
import org.springframework.context.annotation.Bean;
2930
import org.springframework.context.annotation.Configuration;
3031
import org.springframework.context.annotation.Import;
3132
import org.springframework.data.annotation.Id;
@@ -42,7 +43,7 @@
4243
import org.springframework.data.elasticsearch.junit.jupiter.SpringIntegrationTest;
4344
import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
4445
import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories;
45-
import org.springframework.data.elasticsearch.utils.IndexInitializer;
46+
import org.springframework.data.elasticsearch.utils.IndexNameProvider;
4647
import org.springframework.test.context.ContextConfiguration;
4748

4849
/**
@@ -59,31 +60,34 @@ public class DynamicSettingAndMappingEntityRepositoryTests {
5960
@Configuration
6061
@Import({ ElasticsearchRestTemplateConfiguration.class })
6162
@EnableElasticsearchRepositories(considerNestedRepositories = true)
62-
static class Config {}
63+
static class Config {
64+
@Bean
65+
IndexNameProvider indexNameProvider() {
66+
return new IndexNameProvider();
67+
}
68+
}
6369

6470
@Autowired private ElasticsearchOperations operations;
6571
private IndexOperations indexOperations;
66-
72+
@Autowired IndexNameProvider indexNameProvider;
6773
@Autowired private DynamicSettingAndMappingEntityRepository repository;
6874

6975
@BeforeEach
7076
public void before() {
77+
indexNameProvider.increment();
7178
indexOperations = operations.indexOps(DynamicSettingAndMappingEntity.class);
72-
IndexInitializer.init(indexOperations);
79+
indexOperations.createWithMapping();
7380
}
7481

75-
@AfterEach
76-
void after() {
77-
indexOperations.delete();
82+
@Test
83+
@Order(Integer.MAX_VALUE)
84+
void cleanup() {
85+
operations.indexOps(IndexCoordinates.of("*")).delete();
7886
}
7987

8088
@Test // DATAES-64
8189
public void shouldCreateGivenDynamicSettingsForGivenIndex() {
8290

83-
// given
84-
// delete , create and apply mapping in before method
85-
86-
// then
8791
assertThat(indexOperations.exists()).isTrue();
8892
Map<String, Object> map = indexOperations.getSettings();
8993
assertThat(map.containsKey("index.number_of_replicas")).isTrue();
@@ -97,7 +101,6 @@ public void shouldCreateGivenDynamicSettingsForGivenIndex() {
97101
@Test // DATAES-64
98102
public void shouldSearchOnGivenTokenizerUsingGivenDynamicSettingsForGivenIndex() {
99103

100-
// given
101104
DynamicSettingAndMappingEntity dynamicSettingAndMappingEntity1 = new DynamicSettingAndMappingEntity();
102105
dynamicSettingAndMappingEntity1.setId(nextIdAsString());
103106
dynamicSettingAndMappingEntity1.setName("test-setting1");
@@ -112,16 +115,14 @@ public void shouldSearchOnGivenTokenizerUsingGivenDynamicSettingsForGivenIndex()
112115

113116
repository.save(dynamicSettingAndMappingEntity2);
114117

115-
// when
116118
NativeSearchQuery searchQuery = new NativeSearchQueryBuilder()
117119
.withQuery(QueryBuilders.termQuery("email", dynamicSettingAndMappingEntity1.getEmail())).build();
118120

119-
IndexCoordinates index = IndexCoordinates.of("test-index-dynamic-setting-and-mapping");
121+
IndexCoordinates index = IndexCoordinates.of(indexNameProvider.indexName());
120122
long count = operations.count(searchQuery, DynamicSettingAndMappingEntity.class, index);
121123
SearchHits<DynamicSettingAndMappingEntity> entityList = operations.search(searchQuery,
122124
DynamicSettingAndMappingEntity.class, index);
123125

124-
// then
125126
assertThat(count).isEqualTo(1L);
126127
assertThat(entityList).isNotNull().hasSize(1);
127128
assertThat(entityList.getSearchHit(0).getContent().getEmail())
@@ -131,13 +132,8 @@ public void shouldSearchOnGivenTokenizerUsingGivenDynamicSettingsForGivenIndex()
131132
@Test
132133
public void shouldGetMappingForGivenIndexAndType() {
133134

134-
// given
135-
// delete , create and apply mapping in before method
136-
137-
// when
138135
Map<String, Object> mapping = indexOperations.getMapping();
139136

140-
// then
141137
Map<String, Object> properties = (Map<String, Object>) mapping.get("properties");
142138
assertThat(mapping).isNotNull();
143139
assertThat(properties).isNotNull();
@@ -176,9 +172,6 @@ public void shouldCreateMappingWithSpecifiedMappings() {
176172
@Test // DATAES-86
177173
public void shouldCreateMappingWithUsingMappingAnnotation() {
178174

179-
// given
180-
181-
// then
182175
Map<String, Object> mapping = indexOperations.getMapping();
183176
Map<String, Object> properties = (Map<String, Object>) mapping.get("properties");
184177
assertThat(mapping).isNotNull();
@@ -188,10 +181,7 @@ public void shouldCreateMappingWithUsingMappingAnnotation() {
188181
assertThat(emailProperties.get("analyzer")).isEqualTo("emailAnalyzer");
189182
}
190183

191-
/**
192-
* @author Mohsin Husen
193-
*/
194-
@Document(indexName = "test-index-dynamic-setting-and-mapping")
184+
@Document(indexName = "#{@indexNameProvider.indexName()}")
195185
@Setting(settingPath = "/settings/test-settings.json")
196186
@Mapping(mappingPath = "/mappings/test-mappings.json")
197187
static class DynamicSettingAndMappingEntity {
@@ -225,9 +215,6 @@ public void setEmail(String email) {
225215
}
226216
}
227217

228-
/**
229-
* @author Mohsin Husen
230-
*/
231218
public interface DynamicSettingAndMappingEntityRepository
232219
extends ElasticsearchRepository<DynamicSettingAndMappingEntity, String> {}
233220

src/test/java/org/springframework/data/elasticsearch/utils/IndexNameProvider.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ public class IndexNameProvider {
2525
private int idx = -1;
2626
private String indexName;
2727

28+
public IndexNameProvider() {
29+
this("index-default");
30+
}
31+
2832
public IndexNameProvider(String prefix) {
2933
this.prefix = prefix;
3034
increment();

0 commit comments

Comments
 (0)