Skip to content

Commit 85d566e

Browse files
committed
Address code review comments
Signed-off-by: Andriy Redko <drreta@gmail.com>
1 parent 89c9965 commit 85d566e

File tree

2 files changed

+29
-5
lines changed

2 files changed

+29
-5
lines changed

spring-data-opensearch/src/test/java/org/opensearch/data/client/core/index/DynamicTemplatesContextBaseTests.java

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
package org.opensearch.data.client.core.index;
1111

1212

13+
import static org.assertj.core.api.Assertions.assertThat;
14+
1315
import java.util.HashMap;
1416
import java.util.Map;
1517
import org.junit.jupiter.api.AfterEach;
@@ -24,6 +26,7 @@
2426
import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
2527
import org.springframework.data.elasticsearch.core.IndexOperations;
2628
import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
29+
import org.springframework.data.elasticsearch.core.query.Query;
2730
import org.springframework.data.elasticsearch.junit.jupiter.SpringIntegrationTest;
2831
import org.springframework.data.elasticsearch.utils.IndexNameProvider;
2932
import org.springframework.lang.Nullable;
@@ -46,14 +49,20 @@ void cleanup() {
4649
@Test
4750
void shouldCreateDynamicTemplateOne() {
4851
IndexOperations indexOperations = operations.indexOps(SampleDynamicTemplatesEntity.class);
49-
indexOperations.createWithMapping();
52+
assertThat(indexOperations.createWithMapping()).isTrue();
53+
54+
operations.save(new SampleDynamicTemplatesEntity(Map.of("John", "Smith")));
55+
assertThat(operations.search(Query.findAll(), SampleDynamicTemplatesEntity.class).get().count()).isEqualTo(1L);
5056
}
5157

5258

5359
@Test
5460
void shouldCreateDynamicTemplateTwo() {
5561
IndexOperations indexOperations = operations.indexOps(SampleDynamicTemplatesEntityTwo.class);
56-
indexOperations.createWithMapping();
62+
assertThat(indexOperations.createWithMapping()).isTrue();
63+
64+
operations.save(new SampleDynamicTemplatesEntityTwo("Other string"));
65+
assertThat(operations.search(Query.findAll(), SampleDynamicTemplatesEntityTwo.class).get().count()).isEqualTo(1L);
5766
}
5867

5968
/**
@@ -67,7 +76,15 @@ static class SampleDynamicTemplatesEntity {
6776
@Id private String id;
6877

6978
@Nullable
70-
@Field(type = FieldType.Object) private final Map<String, String> names = new HashMap<>();
79+
@Field(type = FieldType.Object) private final Map<String, String> names;
80+
81+
public SampleDynamicTemplatesEntity() {
82+
this(new HashMap<>());
83+
}
84+
85+
public SampleDynamicTemplatesEntity(final Map<String, String> names) {
86+
this.names = names;
87+
}
7188
}
7289

7390
/**
@@ -81,6 +98,13 @@ static class SampleDynamicTemplatesEntityTwo {
8198
@Id private String id;
8299

83100
@Nullable
84-
@Field(type = FieldType.Object) private final Map<String, String> names = new HashMap<>();
101+
@Field(type = FieldType.Text) private String others;
102+
103+
public SampleDynamicTemplatesEntityTwo() {
104+
}
105+
106+
public SampleDynamicTemplatesEntityTwo(final String others) {
107+
this.others = others;
108+
}
85109
}
86110
}

spring-data-opensearch/src/test/resources/mappings/test-dynamic_templates_mappings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"with_custom_analyzer": {
55
"mapping": {
66
"type": "text",
7-
"analyzer": "standard_lowercase_asciifolding"
7+
"analyzer": "standard"
88
},
99
"path_match": "names.*"
1010
}

0 commit comments

Comments
 (0)