Skip to content

Commit cf02680

Browse files
youssef3wiyoussef3wi
committed
Polishing.
Signed-off-by: Youssef Aouichaoui <[email protected]>
1 parent a594580 commit cf02680

File tree

7 files changed

+39
-40
lines changed

7 files changed

+39
-40
lines changed

‎src/main/java/org/springframework/data/elasticsearch/client/elc/IndicesTemplate.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
import org.springframework.data.elasticsearch.core.index.GetTemplateRequest;
4848
import org.springframework.data.elasticsearch.core.index.PutIndexTemplateRequest;
4949
import org.springframework.data.elasticsearch.core.index.PutTemplateRequest;
50-
import org.springframework.data.elasticsearch.core.mapping.AliasCoordinates;
50+
import org.springframework.data.elasticsearch.core.mapping.Alias;
5151
import org.springframework.data.elasticsearch.core.mapping.CreateIndexSettings;
5252
import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
5353
import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
@@ -140,7 +140,7 @@ public boolean createWithMapping() {
140140

141141
protected boolean doCreate(IndexCoordinates indexCoordinates, Map<String, Object> settings,
142142
@Nullable Document mapping) {
143-
Set<AliasCoordinates> aliases = (boundClass != null) ? getAliasesFor(boundClass) : new HashSet<>();
143+
Set<Alias> aliases = (boundClass != null) ? getAliasesFor(boundClass) : new HashSet<>();
144144
CreateIndexSettings indexSettings = CreateIndexSettings.builder()
145145
.withIndexCoordinates(indexCoordinates)
146146
.withAliases(aliases)
@@ -458,11 +458,11 @@ public IndexCoordinates getIndexCoordinatesFor(Class<?> clazz) {
458458
}
459459

460460
/**
461-
* Get the {@link AliasCoordinates} of the provided class.
461+
* Get the {@link Alias} of the provided class.
462462
*
463463
* @param clazz provided class that can be used to extract aliases.
464464
*/
465-
public Set<AliasCoordinates> getAliasesFor(Class<?> clazz) {
465+
public Set<Alias> getAliasesFor(Class<?> clazz) {
466466
return getRequiredPersistentEntity(clazz).getAliases();
467467
}
468468
// endregion

‎src/main/java/org/springframework/data/elasticsearch/client/elc/ReactiveIndicesTemplate.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import co.elastic.clients.elasticsearch.indices.*;
2222
import co.elastic.clients.transport.ElasticsearchTransport;
2323
import co.elastic.clients.transport.endpoints.BooleanResponse;
24-
import org.springframework.data.elasticsearch.core.mapping.AliasCoordinates;
24+
import org.springframework.data.elasticsearch.core.mapping.Alias;
2525
import org.springframework.data.elasticsearch.core.mapping.CreateIndexSettings;
2626
import reactor.core.publisher.Flux;
2727
import reactor.core.publisher.Mono;
@@ -133,7 +133,7 @@ public Mono<Boolean> createWithMapping() {
133133

134134
private Mono<Boolean> doCreate(IndexCoordinates indexCoordinates, Map<String, Object> settings,
135135
@Nullable Document mapping) {
136-
Set<AliasCoordinates> aliases = (boundClass != null) ? getAliasesFor(boundClass) : new HashSet<>();
136+
Set<Alias> aliases = (boundClass != null) ? getAliasesFor(boundClass) : new HashSet<>();
137137
CreateIndexSettings indexSettings = CreateIndexSettings.builder()
138138
.withIndexCoordinates(indexCoordinates)
139139
.withAliases(aliases)
@@ -446,11 +446,11 @@ private IndexCoordinates getIndexCoordinatesFor(Class<?> clazz) {
446446
}
447447

448448
/**
449-
* Get the {@link AliasCoordinates} of the provided class.
449+
* Get the {@link Alias} of the provided class.
450450
*
451451
* @param clazz provided class that can be used to extract aliases.
452452
*/
453-
private Set<AliasCoordinates> getAliasesFor(Class<?> clazz) {
453+
private Set<Alias> getAliasesFor(Class<?> clazz) {
454454
return elasticsearchConverter.getMappingContext().getRequiredPersistentEntity(clazz).getAliases();
455455
}
456456

‎src/main/java/org/springframework/data/elasticsearch/client/elc/RequestConverter.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
import org.springframework.data.elasticsearch.core.index.GetTemplateRequest;
8989
import org.springframework.data.elasticsearch.core.index.PutIndexTemplateRequest;
9090
import org.springframework.data.elasticsearch.core.index.PutTemplateRequest;
91-
import org.springframework.data.elasticsearch.core.mapping.AliasCoordinates;
91+
import org.springframework.data.elasticsearch.core.mapping.Alias;
9292
import org.springframework.data.elasticsearch.core.mapping.CreateIndexSettings;
9393
import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
9494
import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentProperty;
@@ -172,7 +172,7 @@ public co.elastic.clients.elasticsearch.cluster.PutComponentTemplateRequest clus
172172
}));
173173
}
174174

175-
private Alias.Builder buildAlias(AliasActionParameters parameters, Alias.Builder aliasBuilder) {
175+
private co.elastic.clients.elasticsearch.indices.Alias.Builder buildAlias(AliasActionParameters parameters, co.elastic.clients.elasticsearch.indices.Alias.Builder aliasBuilder) {
176176

177177
if (parameters.getRouting() != null) {
178178
aliasBuilder.routing(parameters.getRouting());
@@ -237,16 +237,16 @@ public ExistsRequest indicesExistsRequest(IndexCoordinates indexCoordinates) {
237237
}
238238

239239
public CreateIndexRequest indicesCreateRequest(CreateIndexSettings indexSettings) {
240-
Map<String, Alias> aliases = new HashMap<>();
241-
for (AliasCoordinates aliasCoordinates : indexSettings.getAliasCoordinates()) {
242-
Alias alias = Alias.of(ab -> ab.filter(getQuery(aliasCoordinates.getFilter(), null))
243-
.routing(aliasCoordinates.getRouting())
244-
.indexRouting(aliasCoordinates.getIndexRouting())
245-
.searchRouting(aliasCoordinates.getSearchRouting())
246-
.isHidden(aliasCoordinates.getHidden())
247-
.isWriteIndex(aliasCoordinates.getWriteIndex())
240+
Map<String, co.elastic.clients.elasticsearch.indices.Alias> aliases = new HashMap<>();
241+
for (Alias alias : indexSettings.getAliases()) {
242+
co.elastic.clients.elasticsearch.indices.Alias esAlias = co.elastic.clients.elasticsearch.indices.Alias.of(ab -> ab.filter(getQuery(alias.getFilter(), null))
243+
.routing(alias.getRouting())
244+
.indexRouting(alias.getIndexRouting())
245+
.searchRouting(alias.getSearchRouting())
246+
.isHidden(alias.getHidden())
247+
.isWriteIndex(alias.getWriteIndex())
248248
);
249-
aliases.put(aliasCoordinates.getAlias(), alias);
249+
aliases.put(alias.getAlias(), esAlias);
250250
}
251251

252252
// note: the new client does not support the index.storeType anymore

‎src/main/java/org/springframework/data/elasticsearch/core/mapping/AliasCoordinates.java renamed to ‎src/main/java/org/springframework/data/elasticsearch/core/mapping/Alias.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
* @author Youssef Aouichaoui
2828
* @since 5.3
2929
*/
30-
public class AliasCoordinates {
30+
public class Alias {
3131
/**
3232
* Alias name for the index.
3333
*/
@@ -71,7 +71,7 @@ public class AliasCoordinates {
7171
@Nullable
7272
private final Boolean isWriteIndex;
7373

74-
private AliasCoordinates(Builder builder) {
74+
private Alias(Builder builder) {
7575
this.alias = builder.alias;
7676

7777
this.filter = builder.filter;
@@ -125,7 +125,7 @@ public static Builder builder(String alias) {
125125
@Override
126126
public boolean equals(Object o) {
127127
if (this == o) return true;
128-
if (!(o instanceof AliasCoordinates that)) return false;
128+
if (!(o instanceof Alias that)) return false;
129129

130130
return Objects.equals(alias, that.alias) && Objects.equals(filter, that.filter)
131131
&& Objects.equals(indexRouting, that.indexRouting)
@@ -225,8 +225,8 @@ public Builder withWriteIndex(@Nullable Boolean writeIndex) {
225225
return this;
226226
}
227227

228-
public AliasCoordinates build() {
229-
return new AliasCoordinates(this);
228+
public Alias build() {
229+
return new Alias(this);
230230
}
231231
}
232232
}

‎src/main/java/org/springframework/data/elasticsearch/core/mapping/CreateIndexSettings.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
*/
3232
public class CreateIndexSettings {
3333
private final IndexCoordinates indexCoordinates;
34-
private final Set<AliasCoordinates> aliasCoordinates;
34+
private final Set<Alias> aliases;
3535

3636
private final Map<String, Object> settings;
3737

@@ -40,7 +40,7 @@ public class CreateIndexSettings {
4040

4141
private CreateIndexSettings(Builder builder) {
4242
this.indexCoordinates = builder.indexCoordinates;
43-
this.aliasCoordinates = builder.aliasCoordinates;
43+
this.aliases = builder.aliases;
4444

4545
this.settings = builder.settings;
4646
this.mapping = builder.mapping;
@@ -54,8 +54,8 @@ public IndexCoordinates getIndexCoordinates() {
5454
return indexCoordinates;
5555
}
5656

57-
public AliasCoordinates[] getAliasCoordinates() {
58-
return aliasCoordinates.toArray(AliasCoordinates[]::new);
57+
public Alias[] getAliases() {
58+
return aliases.toArray(Alias[]::new);
5959
}
6060

6161
public Map<String, Object> getSettings() {
@@ -69,7 +69,7 @@ public Document getMapping() {
6969

7070
public static class Builder {
7171
private IndexCoordinates indexCoordinates;
72-
private Set<AliasCoordinates> aliasCoordinates = new HashSet<>();
72+
private Set<Alias> aliases = new HashSet<>();
7373

7474
private Map<String, Object> settings;
7575

@@ -83,16 +83,16 @@ public Builder withIndexCoordinates(IndexCoordinates indexCoordinates) {
8383
return this;
8484
}
8585

86-
public Builder withAliasCoordinates(AliasCoordinates aliasCoordinates) {
87-
Assert.notNull(aliasCoordinates, "aliasCoordinates must not be null");
88-
this.aliasCoordinates.add(aliasCoordinates);
86+
public Builder withAlias(Alias alias) {
87+
Assert.notNull(alias, "alias must not be null");
88+
this.aliases.add(alias);
8989

9090
return this;
9191
}
9292

93-
public Builder withAliases(Set<AliasCoordinates> aliases) {
93+
public Builder withAliases(Set<Alias> aliases) {
9494
Assert.notNull(aliases, "aliases must not be null");
95-
this.aliasCoordinates.addAll(aliases);
95+
this.aliases.addAll(aliases);
9696

9797
return this;
9898
}

‎src/main/java/org/springframework/data/elasticsearch/core/mapping/ElasticsearchPersistentEntity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
public interface ElasticsearchPersistentEntity<T> extends PersistentEntity<T, ElasticsearchPersistentProperty> {
4444

4545
IndexCoordinates getIndexCoordinates();
46-
Set<AliasCoordinates> getAliases();
46+
Set<Alias> getAliases();
4747

4848
short getShards();
4949

‎src/main/java/org/springframework/data/elasticsearch/core/mapping/SimpleElasticsearchPersistentEntity.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import org.apache.commons.logging.LogFactory;
2626
import org.springframework.core.annotation.AnnotatedElementUtils;
2727
import org.springframework.dao.InvalidDataAccessApiUsageException;
28-
import org.springframework.data.elasticsearch.annotations.Alias;
2928
import org.springframework.data.elasticsearch.annotations.Document;
3029
import org.springframework.data.elasticsearch.annotations.Dynamic;
3130
import org.springframework.data.elasticsearch.annotations.Field;
@@ -144,11 +143,11 @@ public IndexCoordinates getIndexCoordinates() {
144143
}
145144

146145
@Override
147-
public Set<AliasCoordinates> getAliases() {
148-
final Set<AliasCoordinates> aliases = new HashSet<>();
146+
public Set<Alias> getAliases() {
147+
final Set<Alias> aliases = new HashSet<>();
149148

150149
if (document != null) {
151-
for (Alias alias : document.aliases()) {
150+
for (org.springframework.data.elasticsearch.annotations.Alias alias : document.aliases()) {
152151
if (alias.value().isEmpty()) {
153152
continue;
154153
}
@@ -159,7 +158,7 @@ public Set<AliasCoordinates> getAliases() {
159158
}
160159

161160
aliases.add(
162-
AliasCoordinates.builder(alias.value())
161+
Alias.builder(alias.value())
163162
.withFilter(query)
164163
.withIndexRouting(alias.indexRouting())
165164
.withSearchRouting(alias.searchRouting())

0 commit comments

Comments
 (0)