Skip to content

Commit eecece8

Browse files
viktoriya-kutsarovaviktoriya-kutsarova
committed
fix: rework search API generics to replace unnecessary type params with String
1 parent 4078b99 commit eecece8

File tree

79 files changed

+2921
-2101
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+2921
-2101
lines changed

‎src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1627,12 +1627,12 @@ public RedisFuture<String> info(String section) {
16271627
}
16281628

16291629
@Override
1630-
public RedisFuture<String> ftCreate(String index, CreateArgs<K, V> options, List<FieldArgs<K>> fieldArgs) {
1630+
public RedisFuture<String> ftCreate(String index, CreateArgs options, List<FieldArgs> fieldArgs) {
16311631
return dispatch(searchCommandBuilder.ftCreate(index, options, fieldArgs));
16321632
}
16331633

16341634
@Override
1635-
public RedisFuture<String> ftCreate(String index, List<FieldArgs<K>> fieldArgs) {
1635+
public RedisFuture<String> ftCreate(String index, List<FieldArgs> fieldArgs) {
16361636
return dispatch(searchCommandBuilder.ftCreate(index, null, fieldArgs));
16371637
}
16381638

@@ -1652,7 +1652,7 @@ public RedisFuture<String> ftAliasdel(String alias) {
16521652
}
16531653

16541654
@Override
1655-
public RedisFuture<String> ftAlter(String index, boolean skipInitialScan, List<FieldArgs<K>> fieldArgs) {
1655+
public RedisFuture<String> ftAlter(String index, boolean skipInitialScan, List<FieldArgs> fieldArgs) {
16561656
return dispatch(searchCommandBuilder.ftAlter(index, skipInitialScan, fieldArgs));
16571657
}
16581658

@@ -1667,7 +1667,7 @@ public RedisFuture<SpellCheckResult<V>> ftSpellcheck(String index, V query) {
16671667
}
16681668

16691669
@Override
1670-
public RedisFuture<SpellCheckResult<V>> ftSpellcheck(String index, V query, SpellCheckArgs<K, V> args) {
1670+
public RedisFuture<SpellCheckResult<V>> ftSpellcheck(String index, V query, SpellCheckArgs args) {
16711671
return dispatch(searchCommandBuilder.ftSpellcheck(index, query, args));
16721672
}
16731673

@@ -1692,7 +1692,7 @@ public RedisFuture<String> ftExplain(String index, V query) {
16921692
}
16931693

16941694
@Override
1695-
public RedisFuture<String> ftExplain(String index, V query, ExplainArgs<K, V> args) {
1695+
public RedisFuture<String> ftExplain(String index, V query, ExplainArgs args) {
16961696
return dispatch(searchCommandBuilder.ftExplain(index, query, args));
16971697
}
16981698

@@ -1712,7 +1712,7 @@ public RedisFuture<String> ftSynupdate(String index, V synonymGroupId, V... term
17121712
}
17131713

17141714
@Override
1715-
public RedisFuture<String> ftSynupdate(String index, V synonymGroupId, SynUpdateArgs<K, V> args, V... terms) {
1715+
public RedisFuture<String> ftSynupdate(String index, V synonymGroupId, SynUpdateArgs args, V... terms) {
17161716
return dispatch(searchCommandBuilder.ftSynupdate(index, synonymGroupId, args, terms));
17171717
}
17181718

@@ -1722,7 +1722,7 @@ public RedisFuture<Long> ftSugadd(K key, V string, double score) {
17221722
}
17231723

17241724
@Override
1725-
public RedisFuture<Long> ftSugadd(K key, V string, double score, SugAddArgs<K, V> args) {
1725+
public RedisFuture<Long> ftSugadd(K key, V string, double score, SugAddArgs args) {
17261726
return dispatch(searchCommandBuilder.ftSugadd(key, string, score, args));
17271727
}
17281728

@@ -1737,7 +1737,7 @@ public RedisFuture<List<Suggestion<V>>> ftSugget(K key, V prefix) {
17371737
}
17381738

17391739
@Override
1740-
public RedisFuture<List<Suggestion<V>>> ftSugget(K key, V prefix, SugGetArgs<K, V> args) {
1740+
public RedisFuture<List<Suggestion<V>>> ftSugget(K key, V prefix, SugGetArgs args) {
17411741
return dispatch(searchCommandBuilder.ftSugget(key, prefix, args));
17421742
}
17431743

@@ -1747,7 +1747,7 @@ public RedisFuture<Long> ftSuglen(K key) {
17471747
}
17481748

17491749
@Override
1750-
public RedisFuture<String> ftAlter(String index, List<FieldArgs<K>> fieldArgs) {
1750+
public RedisFuture<String> ftAlter(String index, List<FieldArgs> fieldArgs) {
17511751
return dispatch(searchCommandBuilder.ftAlter(index, false, fieldArgs));
17521752
}
17531753

@@ -1762,22 +1762,22 @@ public RedisFuture<String> ftDropindex(String index) {
17621762
}
17631763

17641764
@Override
1765-
public RedisFuture<SearchReply<K, V>> ftSearch(String index, V query, SearchArgs<K, V> args) {
1765+
public RedisFuture<SearchReply<K, V>> ftSearch(String index, V query, SearchArgs<K> args) {
17661766
return dispatch(searchCommandBuilder.ftSearch(index, query, args));
17671767
}
17681768

17691769
@Override
17701770
public RedisFuture<SearchReply<K, V>> ftSearch(String index, V query) {
1771-
return dispatch(searchCommandBuilder.ftSearch(index, query, SearchArgs.<K, V> builder().build()));
1771+
return dispatch(searchCommandBuilder.ftSearch(index, query, SearchArgs.<K> builder().build()));
17721772
}
17731773

17741774
@Override
1775-
public RedisFuture<HybridReply<K, V>> ftHybrid(String index, HybridArgs<K, V> args) {
1775+
public RedisFuture<HybridReply<K, V>> ftHybrid(String index, HybridArgs args) {
17761776
return dispatch(searchCommandBuilder.ftHybrid(index, args));
17771777
}
17781778

17791779
@Override
1780-
public RedisFuture<AggregationReply<K, V>> ftAggregate(String index, V query, AggregateArgs<K, V> args) {
1780+
public RedisFuture<AggregationReply<K, V>> ftAggregate(String index, V query, AggregateArgs<K> args) {
17811781
return dispatch(searchCommandBuilder.ftAggregate(index, query, args));
17821782
}
17831783

‎src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1669,12 +1669,12 @@ public Mono<String> info(String section) {
16691669
}
16701670

16711671
@Override
1672-
public Mono<String> ftCreate(String index, CreateArgs<K, V> options, List<FieldArgs<K>> fieldArgs) {
1672+
public Mono<String> ftCreate(String index, CreateArgs options, List<FieldArgs> fieldArgs) {
16731673
return createMono(() -> searchCommandBuilder.ftCreate(index, options, fieldArgs));
16741674
}
16751675

16761676
@Override
1677-
public Mono<String> ftCreate(String index, List<FieldArgs<K>> fieldArgs) {
1677+
public Mono<String> ftCreate(String index, List<FieldArgs> fieldArgs) {
16781678
return createMono(() -> searchCommandBuilder.ftCreate(index, null, fieldArgs));
16791679
}
16801680

@@ -1694,7 +1694,7 @@ public Mono<String> ftAliasdel(String alias) {
16941694
}
16951695

16961696
@Override
1697-
public Mono<String> ftAlter(String index, boolean skipInitialScan, List<FieldArgs<K>> fieldArgs) {
1697+
public Mono<String> ftAlter(String index, boolean skipInitialScan, List<FieldArgs> fieldArgs) {
16981698
return createMono(() -> searchCommandBuilder.ftAlter(index, skipInitialScan, fieldArgs));
16991699
}
17001700

@@ -1709,7 +1709,7 @@ public Mono<SpellCheckResult<V>> ftSpellcheck(String index, V query) {
17091709
}
17101710

17111711
@Override
1712-
public Mono<SpellCheckResult<V>> ftSpellcheck(String index, V query, SpellCheckArgs<K, V> args) {
1712+
public Mono<SpellCheckResult<V>> ftSpellcheck(String index, V query, SpellCheckArgs args) {
17131713
return createMono(() -> searchCommandBuilder.ftSpellcheck(index, query, args));
17141714
}
17151715

@@ -1734,7 +1734,7 @@ public Mono<String> ftExplain(String index, V query) {
17341734
}
17351735

17361736
@Override
1737-
public Mono<String> ftExplain(String index, V query, ExplainArgs<K, V> args) {
1737+
public Mono<String> ftExplain(String index, V query, ExplainArgs args) {
17381738
return createMono(() -> searchCommandBuilder.ftExplain(index, query, args));
17391739
}
17401740

@@ -1754,7 +1754,7 @@ public Mono<String> ftSynupdate(String index, V synonymGroupId, V... terms) {
17541754
}
17551755

17561756
@Override
1757-
public Mono<String> ftSynupdate(String index, V synonymGroupId, SynUpdateArgs<K, V> args, V... terms) {
1757+
public Mono<String> ftSynupdate(String index, V synonymGroupId, SynUpdateArgs args, V... terms) {
17581758
return createMono(() -> searchCommandBuilder.ftSynupdate(index, synonymGroupId, args, terms));
17591759
}
17601760

@@ -1764,7 +1764,7 @@ public Mono<Long> ftSugadd(K key, V string, double score) {
17641764
}
17651765

17661766
@Override
1767-
public Mono<Long> ftSugadd(K key, V string, double score, SugAddArgs<K, V> args) {
1767+
public Mono<Long> ftSugadd(K key, V string, double score, SugAddArgs args) {
17681768
return createMono(() -> searchCommandBuilder.ftSugadd(key, string, score, args));
17691769
}
17701770

@@ -1779,7 +1779,7 @@ public Flux<Suggestion<V>> ftSugget(K key, V prefix) {
17791779
}
17801780

17811781
@Override
1782-
public Flux<Suggestion<V>> ftSugget(K key, V prefix, SugGetArgs<K, V> args) {
1782+
public Flux<Suggestion<V>> ftSugget(K key, V prefix, SugGetArgs args) {
17831783
return createDissolvingFlux(() -> searchCommandBuilder.ftSugget(key, prefix, args));
17841784
}
17851785

@@ -1789,7 +1789,7 @@ public Mono<Long> ftSuglen(K key) {
17891789
}
17901790

17911791
@Override
1792-
public Mono<String> ftAlter(String index, List<FieldArgs<K>> fieldArgs) {
1792+
public Mono<String> ftAlter(String index, List<FieldArgs> fieldArgs) {
17931793
return createMono(() -> searchCommandBuilder.ftAlter(index, false, fieldArgs));
17941794
}
17951795

@@ -1815,22 +1815,22 @@ public Mono<String> ftDropindex(String index) {
18151815
}
18161816

18171817
@Override
1818-
public Mono<SearchReply<K, V>> ftSearch(String index, V query, SearchArgs<K, V> args) {
1818+
public Mono<SearchReply<K, V>> ftSearch(String index, V query, SearchArgs<K> args) {
18191819
return createMono(() -> searchCommandBuilder.ftSearch(index, query, args));
18201820
}
18211821

18221822
@Override
18231823
public Mono<SearchReply<K, V>> ftSearch(String index, V query) {
1824-
return createMono(() -> searchCommandBuilder.ftSearch(index, query, SearchArgs.<K, V> builder().build()));
1824+
return createMono(() -> searchCommandBuilder.ftSearch(index, query, SearchArgs.<K> builder().build()));
18251825
}
18261826

18271827
@Override
1828-
public Mono<HybridReply<K, V>> ftHybrid(String index, HybridArgs<K, V> args) {
1828+
public Mono<HybridReply<K, V>> ftHybrid(String index, HybridArgs args) {
18291829
return createMono(() -> searchCommandBuilder.ftHybrid(index, args));
18301830
}
18311831

18321832
@Override
1833-
public Mono<AggregationReply<K, V>> ftAggregate(String index, V query, AggregateArgs<K, V> args) {
1833+
public Mono<AggregationReply<K, V>> ftAggregate(String index, V query, AggregateArgs<K> args) {
18341834
return createMono(() -> searchCommandBuilder.ftAggregate(index, query, args));
18351835
}
18361836

‎src/main/java/io/lettuce/core/RediSearchCommandBuilder.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class RediSearchCommandBuilder<K, V> extends BaseRedisCommandBuilder<K, V> {
6969
* @param fieldArgs the fieldArgs
7070
* @return the result of the create command
7171
*/
72-
public Command<K, V, String> ftCreate(String index, CreateArgs<K, V> createArgs, List<FieldArgs<K>> fieldArgs) {
72+
public Command<K, V, String> ftCreate(String index, CreateArgs createArgs, List<FieldArgs> fieldArgs) {
7373
LettuceAssert.notNull(index, "Index must not be null");
7474
notEmpty(fieldArgs.toArray());
7575

@@ -81,7 +81,7 @@ public Command<K, V, String> ftCreate(String index, CreateArgs<K, V> createArgs,
8181

8282
args.add(CommandKeyword.SCHEMA);
8383

84-
for (FieldArgs<K> arg : fieldArgs) {
84+
for (FieldArgs arg : fieldArgs) {
8585
arg.build(args);
8686
}
8787

@@ -97,7 +97,7 @@ public Command<K, V, String> ftCreate(String index, CreateArgs<K, V> createArgs,
9797
* @param searchArgs the search arguments
9898
* @return the result of the search command
9999
*/
100-
public Command<K, V, SearchReply<K, V>> ftSearch(String index, V query, SearchArgs<K, V> searchArgs) {
100+
public Command<K, V, SearchReply<K, V>> ftSearch(String index, V query, SearchArgs<K> searchArgs) {
101101
LettuceAssert.notNull(index, "Index must not be null");
102102
LettuceAssert.notNull(query, "Query must not be null");
103103

@@ -124,7 +124,7 @@ public Command<K, V, SearchReply<K, V>> ftSearch(String index, V query, SearchAr
124124
* @param hybridArgs the hybrid query arguments containing SEARCH and/or VSIM clauses
125125
* @return the command
126126
*/
127-
public Command<K, V, HybridReply<K, V>> ftHybrid(String index, HybridArgs<K, V> hybridArgs) {
127+
public Command<K, V, HybridReply<K, V>> ftHybrid(String index, HybridArgs hybridArgs) {
128128
LettuceAssert.notNull(index, "Index must not be null");
129129
LettuceAssert.notNull(hybridArgs, "HybridArgs must not be null");
130130

@@ -142,7 +142,7 @@ public Command<K, V, HybridReply<K, V>> ftHybrid(String index, HybridArgs<K, V>
142142
* @param aggregateArgs the aggregate arguments
143143
* @return the result of the aggregate command
144144
*/
145-
public Command<K, V, AggregationReply<K, V>> ftAggregate(String index, V query, AggregateArgs<K, V> aggregateArgs) {
145+
public Command<K, V, AggregationReply<K, V>> ftAggregate(String index, V query, AggregateArgs<K> aggregateArgs) {
146146
LettuceAssert.notNull(index, "Index must not be null");
147147
LettuceAssert.notNull(query, "Query must not be null");
148148

@@ -252,7 +252,7 @@ public Command<K, V, String> ftAliasdel(String alias) {
252252
* @param fieldArgs the field arguments for the new attributes to add
253253
* @return the result of the alter command
254254
*/
255-
public Command<K, V, String> ftAlter(String index, boolean skipInitialScan, List<FieldArgs<K>> fieldArgs) {
255+
public Command<K, V, String> ftAlter(String index, boolean skipInitialScan, List<FieldArgs> fieldArgs) {
256256
LettuceAssert.notNull(index, "Index must not be null");
257257
notEmpty(fieldArgs.toArray());
258258

@@ -265,7 +265,7 @@ public Command<K, V, String> ftAlter(String index, boolean skipInitialScan, List
265265
args.add(CommandKeyword.SCHEMA);
266266
args.add(CommandKeyword.ADD);
267267

268-
for (FieldArgs<K> arg : fieldArgs) {
268+
for (FieldArgs arg : fieldArgs) {
269269
arg.build(args);
270270
}
271271

@@ -307,7 +307,7 @@ public Command<K, V, SpellCheckResult<V>> ftSpellcheck(String index, V query) {
307307
* @param args the spellcheck arguments
308308
* @return the result of the spellcheck command
309309
*/
310-
public Command<K, V, SpellCheckResult<V>> ftSpellcheck(String index, V query, SpellCheckArgs<K, V> args) {
310+
public Command<K, V, SpellCheckResult<V>> ftSpellcheck(String index, V query, SpellCheckArgs args) {
311311
LettuceAssert.notNull(index, "Index must not be null");
312312
LettuceAssert.notNull(query, "Query must not be null");
313313

@@ -398,7 +398,7 @@ public Command<K, V, String> ftExplain(String index, V query) {
398398
* @param args the explain arguments
399399
* @return the execution plan as a string
400400
*/
401-
public Command<K, V, String> ftExplain(String index, V query, ExplainArgs<K, V> args) {
401+
public Command<K, V, String> ftExplain(String index, V query, ExplainArgs args) {
402402
LettuceAssert.notNull(index, "Index must not be null");
403403
LettuceAssert.notNull(query, "Query must not be null");
404404

@@ -458,7 +458,7 @@ public final Command<K, V, String> ftSynupdate(String index, V synonymGroupId, V
458458
* @return the result of the synupdate command
459459
*/
460460
@SafeVarargs
461-
public final Command<K, V, String> ftSynupdate(String index, V synonymGroupId, SynUpdateArgs<K, V> args, V... terms) {
461+
public final Command<K, V, String> ftSynupdate(String index, V synonymGroupId, SynUpdateArgs args, V... terms) {
462462
LettuceAssert.notNull(index, "Index must not be null");
463463
LettuceAssert.notNull(synonymGroupId, "Synonym group ID must not be null");
464464
LettuceAssert.notNull(terms, "Terms must not be null");
@@ -499,7 +499,7 @@ public Command<K, V, Long> ftSugadd(K key, V string, double score) {
499499
* @param args the suggestion add arguments
500500
* @return the result of the sugadd command
501501
*/
502-
public Command<K, V, Long> ftSugadd(K key, V string, double score, SugAddArgs<K, V> args) {
502+
public Command<K, V, Long> ftSugadd(K key, V string, double score, SugAddArgs args) {
503503
notNullKey(key);
504504
LettuceAssert.notNull(string, "String must not be null");
505505

@@ -547,7 +547,7 @@ public Command<K, V, List<Suggestion<V>>> ftSugget(K key, V prefix) {
547547
* @param args the suggestion get arguments
548548
* @return the result of the sugget command
549549
*/
550-
public Command<K, V, List<Suggestion<V>>> ftSugget(K key, V prefix, SugGetArgs<K, V> args) {
550+
public Command<K, V, List<Suggestion<V>>> ftSugget(K key, V prefix, SugGetArgs args) {
551551
notNullKey(key);
552552
LettuceAssert.notNull(prefix, "Prefix must not be null");
553553

0 commit comments

Comments
 (0)