Skip to content

Commit 494b874

Browse files
l-trottal-trotta
committed
[codegen] update to latest spec
1 parent 4526915 commit 494b874

File tree

2 files changed

+48
-37
lines changed

2 files changed

+48
-37
lines changed

‎java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/NGramTokenizer.java

Lines changed: 31 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,11 @@ public class NGramTokenizer extends TokenizerBase implements TokenizerDefinition
6262
@Nullable
6363
private final String customTokenChars;
6464

65-
private final int maxGram;
65+
@Nullable
66+
private final Integer maxGram;
6667

67-
private final int minGram;
68+
@Nullable
69+
private final Integer minGram;
6870

6971
private final List<TokenChar> tokenChars;
7072

@@ -74,9 +76,9 @@ private NGramTokenizer(Builder builder) {
7476
super(builder);
7577

7678
this.customTokenChars = builder.customTokenChars;
77-
this.maxGram = ApiTypeHelper.requireNonNull(builder.maxGram, this, "maxGram");
78-
this.minGram = ApiTypeHelper.requireNonNull(builder.minGram, this, "minGram");
79-
this.tokenChars = ApiTypeHelper.unmodifiableRequired(builder.tokenChars, this, "tokenChars");
79+
this.maxGram = builder.maxGram;
80+
this.minGram = builder.minGram;
81+
this.tokenChars = ApiTypeHelper.unmodifiable(builder.tokenChars);
8082

8183
}
8284

@@ -101,21 +103,23 @@ public final String customTokenChars() {
101103
}
102104

103105
/**
104-
* Required - API name: {@code max_gram}
106+
* API name: {@code max_gram}
105107
*/
106-
public final int maxGram() {
108+
@Nullable
109+
public final Integer maxGram() {
107110
return this.maxGram;
108111
}
109112

110113
/**
111-
* Required - API name: {@code min_gram}
114+
* API name: {@code min_gram}
112115
*/
113-
public final int minGram() {
116+
@Nullable
117+
public final Integer minGram() {
114118
return this.minGram;
115119
}
116120

117121
/**
118-
* Required - API name: {@code token_chars}
122+
* API name: {@code token_chars}
119123
*/
120124
public final List<TokenChar> tokenChars() {
121125
return this.tokenChars;
@@ -130,12 +134,16 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
130134
generator.write(this.customTokenChars);
131135

132136
}
133-
generator.writeKey("max_gram");
134-
generator.write(this.maxGram);
137+
if (this.maxGram != null) {
138+
generator.writeKey("max_gram");
139+
generator.write(this.maxGram);
135140

136-
generator.writeKey("min_gram");
137-
generator.write(this.minGram);
141+
}
142+
if (this.minGram != null) {
143+
generator.writeKey("min_gram");
144+
generator.write(this.minGram);
138145

146+
}
139147
if (ApiTypeHelper.isDefined(this.tokenChars)) {
140148
generator.writeKey("token_chars");
141149
generator.writeStartArray();
@@ -160,10 +168,13 @@ public static class Builder extends TokenizerBase.AbstractBuilder<Builder>
160168
@Nullable
161169
private String customTokenChars;
162170

171+
@Nullable
163172
private Integer maxGram;
164173

174+
@Nullable
165175
private Integer minGram;
166176

177+
@Nullable
167178
private List<TokenChar> tokenChars;
168179

169180
/**
@@ -175,23 +186,23 @@ public final Builder customTokenChars(@Nullable String value) {
175186
}
176187

177188
/**
178-
* Required - API name: {@code max_gram}
189+
* API name: {@code max_gram}
179190
*/
180-
public final Builder maxGram(int value) {
191+
public final Builder maxGram(@Nullable Integer value) {
181192
this.maxGram = value;
182193
return this;
183194
}
184195

185196
/**
186-
* Required - API name: {@code min_gram}
197+
* API name: {@code min_gram}
187198
*/
188-
public final Builder minGram(int value) {
199+
public final Builder minGram(@Nullable Integer value) {
189200
this.minGram = value;
190201
return this;
191202
}
192203

193204
/**
194-
* Required - API name: {@code token_chars}
205+
* API name: {@code token_chars}
195206
* <p>
196207
* Adds all elements of <code>list</code> to <code>tokenChars</code>.
197208
*/
@@ -201,7 +212,7 @@ public final Builder tokenChars(List<TokenChar> list) {
201212
}
202213

203214
/**
204-
* Required - API name: {@code token_chars}
215+
* API name: {@code token_chars}
205216
* <p>
206217
* Adds one or more values to <code>tokenChars</code>.
207218
*/

‎java-client/src/main/java/co/elastic/clients/elasticsearch/doc-files/api-spec.html

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -628,7 +628,7 @@
628628
'_types.analysis.CharFilter': '_types/analysis/char_filters.ts#L28-L30',
629629
'_types.analysis.CharFilterBase': '_types/analysis/char_filters.ts#L24-L26',
630630
'_types.analysis.CharFilterDefinition': '_types/analysis/char_filters.ts#L32-L41',
631-
'_types.analysis.CharGroupTokenizer': '_types/analysis/tokenizers.ts#L55-L59',
631+
'_types.analysis.CharGroupTokenizer': '_types/analysis/tokenizers.ts#L58-L62',
632632
'_types.analysis.CommonGramsTokenFilter': '_types/analysis/token_filters.ts#L174-L180',
633633
'_types.analysis.CompoundWordTokenFilterBase': '_types/analysis/token_filters.ts#L43-L51',
634634
'_types.analysis.ConditionTokenFilter': '_types/analysis/token_filters.ts#L182-L186',
@@ -667,7 +667,7 @@
667667
'_types.analysis.KeepWordsTokenFilter': '_types/analysis/token_filters.ts#L225-L230',
668668
'_types.analysis.KeywordAnalyzer': '_types/analysis/analyzers.ts#L47-L50',
669669
'_types.analysis.KeywordMarkerTokenFilter': '_types/analysis/token_filters.ts#L232-L238',
670-
'_types.analysis.KeywordTokenizer': '_types/analysis/tokenizers.ts#L61-L64',
670+
'_types.analysis.KeywordTokenizer': '_types/analysis/tokenizers.ts#L64-L67',
671671
'_types.analysis.KuromojiAnalyzer': '_types/analysis/kuromoji-plugin.ts#L25-L29',
672672
'_types.analysis.KuromojiIterationMarkCharFilter': '_types/analysis/kuromoji-plugin.ts#L31-L35',
673673
'_types.analysis.KuromojiPartOfSpeechTokenFilter': '_types/analysis/kuromoji-plugin.ts#L37-L40',
@@ -678,26 +678,26 @@
678678
'_types.analysis.Language': '_types/analysis/languages.ts#L20-L55',
679679
'_types.analysis.LanguageAnalyzer': '_types/analysis/analyzers.ts#L52-L59',
680680
'_types.analysis.LengthTokenFilter': '_types/analysis/token_filters.ts#L244-L248',
681-
'_types.analysis.LetterTokenizer': '_types/analysis/tokenizers.ts#L66-L68',
681+
'_types.analysis.LetterTokenizer': '_types/analysis/tokenizers.ts#L69-L71',
682682
'_types.analysis.LimitTokenCountTokenFilter': '_types/analysis/token_filters.ts#L250-L254',
683683
'_types.analysis.LowercaseNormalizer': '_types/analysis/normalizers.ts#L26-L28',
684684
'_types.analysis.LowercaseTokenFilter': '_types/analysis/token_filters.ts#L256-L259',
685-
'_types.analysis.LowercaseTokenizer': '_types/analysis/tokenizers.ts#L70-L72',
685+
'_types.analysis.LowercaseTokenizer': '_types/analysis/tokenizers.ts#L73-L75',
686686
'_types.analysis.MappingCharFilter': '_types/analysis/char_filters.ts#L48-L52',
687687
'_types.analysis.MultiplexerTokenFilter': '_types/analysis/token_filters.ts#L261-L265',
688688
'_types.analysis.NGramTokenFilter': '_types/analysis/token_filters.ts#L267-L272',
689-
'_types.analysis.NGramTokenizer': '_types/analysis/tokenizers.ts#L38-L44',
689+
'_types.analysis.NGramTokenizer': '_types/analysis/tokenizers.ts#L38-L47',
690690
'_types.analysis.NoriAnalyzer': '_types/analysis/analyzers.ts#L66-L72',
691-
'_types.analysis.NoriDecompoundMode': '_types/analysis/tokenizers.ts#L74-L78',
691+
'_types.analysis.NoriDecompoundMode': '_types/analysis/tokenizers.ts#L77-L81',
692692
'_types.analysis.NoriPartOfSpeechTokenFilter': '_types/analysis/token_filters.ts#L274-L277',
693-
'_types.analysis.NoriTokenizer': '_types/analysis/tokenizers.ts#L80-L86',
693+
'_types.analysis.NoriTokenizer': '_types/analysis/tokenizers.ts#L83-L89',
694694
'_types.analysis.Normalizer': '_types/analysis/normalizers.ts#L20-L24',
695-
'_types.analysis.PathHierarchyTokenizer': '_types/analysis/tokenizers.ts#L88-L95',
695+
'_types.analysis.PathHierarchyTokenizer': '_types/analysis/tokenizers.ts#L91-L98',
696696
'_types.analysis.PatternAnalyzer': '_types/analysis/analyzers.ts#L74-L81',
697697
'_types.analysis.PatternCaptureTokenFilter': '_types/analysis/token_filters.ts#L279-L283',
698698
'_types.analysis.PatternReplaceCharFilter': '_types/analysis/char_filters.ts#L54-L59',
699699
'_types.analysis.PatternReplaceTokenFilter': '_types/analysis/token_filters.ts#L285-L291',
700-
'_types.analysis.PatternTokenizer': '_types/analysis/tokenizers.ts#L97-L102',
700+
'_types.analysis.PatternTokenizer': '_types/analysis/tokenizers.ts#L100-L105',
701701
'_types.analysis.PhoneticEncoder': '_types/analysis/phonetic-plugin.ts#L23-L36',
702702
'_types.analysis.PhoneticLanguage': '_types/analysis/phonetic-plugin.ts#L38-L51',
703703
'_types.analysis.PhoneticNameType': '_types/analysis/phonetic-plugin.ts#L53-L57',
@@ -713,28 +713,28 @@
713713
'_types.analysis.SnowballLanguage': '_types/analysis/languages.ts#L57-L80',
714714
'_types.analysis.SnowballTokenFilter': '_types/analysis/token_filters.ts#L310-L313',
715715
'_types.analysis.StandardAnalyzer': '_types/analysis/analyzers.ts#L95-L99',
716-
'_types.analysis.StandardTokenizer': '_types/analysis/tokenizers.ts#L104-L107',
716+
'_types.analysis.StandardTokenizer': '_types/analysis/tokenizers.ts#L107-L110',
717717
'_types.analysis.StemmerOverrideTokenFilter': '_types/analysis/token_filters.ts#L315-L319',
718718
'_types.analysis.StemmerTokenFilter': '_types/analysis/token_filters.ts#L321-L325',
719719
'_types.analysis.StopAnalyzer': '_types/analysis/analyzers.ts#L101-L106',
720720
'_types.analysis.StopTokenFilter': '_types/analysis/token_filters.ts#L96-L102',
721721
'_types.analysis.SynonymFormat': '_types/analysis/token_filters.ts#L104-L107',
722722
'_types.analysis.SynonymGraphTokenFilter': '_types/analysis/token_filters.ts#L109-L119',
723723
'_types.analysis.SynonymTokenFilter': '_types/analysis/token_filters.ts#L121-L131',
724-
'_types.analysis.TokenChar': '_types/analysis/tokenizers.ts#L46-L53',
724+
'_types.analysis.TokenChar': '_types/analysis/tokenizers.ts#L49-L56',
725725
'_types.analysis.TokenFilter': '_types/analysis/token_filters.ts#L345-L347',
726726
'_types.analysis.TokenFilterBase': '_types/analysis/token_filters.ts#L39-L41',
727727
'_types.analysis.TokenFilterDefinition': '_types/analysis/token_filters.ts#L349-L401',
728-
'_types.analysis.Tokenizer': '_types/analysis/tokenizers.ts#L119-L121',
728+
'_types.analysis.Tokenizer': '_types/analysis/tokenizers.ts#L122-L124',
729729
'_types.analysis.TokenizerBase': '_types/analysis/tokenizers.ts#L26-L28',
730-
'_types.analysis.TokenizerDefinition': '_types/analysis/tokenizers.ts#L123-L141',
730+
'_types.analysis.TokenizerDefinition': '_types/analysis/tokenizers.ts#L126-L144',
731731
'_types.analysis.TrimTokenFilter': '_types/analysis/token_filters.ts#L327-L329',
732732
'_types.analysis.TruncateTokenFilter': '_types/analysis/token_filters.ts#L331-L334',
733-
'_types.analysis.UaxEmailUrlTokenizer': '_types/analysis/tokenizers.ts#L109-L112',
733+
'_types.analysis.UaxEmailUrlTokenizer': '_types/analysis/tokenizers.ts#L112-L115',
734734
'_types.analysis.UniqueTokenFilter': '_types/analysis/token_filters.ts#L336-L339',
735735
'_types.analysis.UppercaseTokenFilter': '_types/analysis/token_filters.ts#L341-L343',
736736
'_types.analysis.WhitespaceAnalyzer': '_types/analysis/analyzers.ts#L108-L111',
737-
'_types.analysis.WhitespaceTokenizer': '_types/analysis/tokenizers.ts#L114-L117',
737+
'_types.analysis.WhitespaceTokenizer': '_types/analysis/tokenizers.ts#L117-L120',
738738
'_types.analysis.WordDelimiterGraphTokenFilter': '_types/analysis/token_filters.ts#L150-L167',
739739
'_types.analysis.WordDelimiterTokenFilter': '_types/analysis/token_filters.ts#L133-L148',
740740
'_types.mapping.AggregateMetricDoubleProperty': '_types/mapping/complex.ts#L61-L66',
@@ -2876,10 +2876,10 @@
28762876
if (hash.length > 1) {
28772877
hash = hash.substring(1);
28782878
}
2879-
window.location = "https://github.com/elastic/elasticsearch-specification/tree/dd79a332a784748acb9fa3a71b6f8c88295219ac/specification/" + (paths[hash] || "");
2879+
window.location = "https://github.com/elastic/elasticsearch-specification/tree/1a27080e79e765b656e881871d5d79e939970b95/specification/" + (paths[hash] || "");
28802880
</script>
28812881
</head>
28822882
<body>
2883-
Please see the <a href="https://github.com/elastic/elasticsearch-specification/tree/dd79a332a784748acb9fa3a71b6f8c88295219ac/specification/">Elasticsearch API specification</a>.
2883+
Please see the <a href="https://github.com/elastic/elasticsearch-specification/tree/1a27080e79e765b656e881871d5d79e939970b95/specification/">Elasticsearch API specification</a>.
28842884
</body>
28852885
</html>

0 commit comments

Comments
 (0)