Skip to content

Commit 37e24dc

Browse files
XtansiaXtansia
authoredFeb 20, 2025··
Fix mistake in Simple Pattern Tokenizer specification/generation (#1451)
Signed-off-by: Thomas Farr <tsfarr@amazon.com>
1 parent c4e940c commit 37e24dc

File tree

4 files changed

+252
-181
lines changed

4 files changed

+252
-181
lines changed
 

‎CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ This section is for maintaining a changelog for all breaking changes for the cli
4444
## [Unreleased 2.x]
4545
### Added
4646
- Added support for the Search Pipeline APIs ([#1442](https://github.com/opensearch-project/opensearch-java/pull/1442))
47-
- Added support for `simple_pattern` and `simple_pattern_split` tokenizers ([#1448](https://github.com/opensearch-project/opensearch-java/pull/1448))
47+
- Added support for `simple_pattern` and `simple_pattern_split` tokenizers ([#1448](https://github.com/opensearch-project/opensearch-java/pull/1448), [#1451](https://github.com/opensearch-project/opensearch-java/pull/1451))
4848
- Added support for the Search response `phase_took` field ([#1449](https://github.com/opensearch-project/opensearch-java/pull/1449))
4949

5050
### Dependencies

‎java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/SimplePatternSplitTokenizer.java

+35-1
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,11 @@
3737
package org.opensearch.client.opensearch._types.analysis;
3838

3939
import jakarta.json.stream.JsonGenerator;
40+
import java.util.Objects;
4041
import java.util.function.Function;
4142
import javax.annotation.Generated;
4243
import javax.annotation.Nonnull;
44+
import javax.annotation.Nullable;
4345
import org.opensearch.client.json.JsonpDeserializable;
4446
import org.opensearch.client.json.JsonpDeserializer;
4547
import org.opensearch.client.json.JsonpMapper;
@@ -58,10 +60,14 @@ public class SimplePatternSplitTokenizer extends TokenizerBase
5860
TokenizerDefinitionVariant,
5961
ToCopyableBuilder<SimplePatternSplitTokenizer.Builder, SimplePatternSplitTokenizer> {
6062

63+
@Nullable
64+
private final String pattern;
65+
6166
// ---------------------------------------------------------------------------------------------
6267

6368
private SimplePatternSplitTokenizer(Builder builder) {
6469
super(builder);
70+
this.pattern = builder.pattern;
6571
}
6672

6773
public static SimplePatternSplitTokenizer of(
@@ -78,9 +84,21 @@ public TokenizerDefinition.Kind _tokenizerDefinitionKind() {
7884
return TokenizerDefinition.Kind.SimplePatternSplit;
7985
}
8086

87+
/**
88+
* API name: {@code pattern}
89+
*/
90+
@Nullable
91+
public final String pattern() {
92+
return this.pattern;
93+
}
94+
8195
protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
8296
generator.write("type", "simple_pattern_split");
8397
super.serializeInternal(generator, mapper);
98+
if (this.pattern != null) {
99+
generator.writeKey("pattern");
100+
generator.write(this.pattern);
101+
}
84102
}
85103

86104
// ---------------------------------------------------------------------------------------------
@@ -102,15 +120,19 @@ public static Builder builder() {
102120
public static class Builder extends TokenizerBase.AbstractBuilder<Builder>
103121
implements
104122
CopyableBuilder<Builder, SimplePatternSplitTokenizer> {
123+
@Nullable
124+
private String pattern;
105125

106126
public Builder() {}
107127

108128
private Builder(SimplePatternSplitTokenizer o) {
109129
super(o);
130+
this.pattern = o.pattern;
110131
}
111132

112133
private Builder(Builder o) {
113134
super(o);
135+
this.pattern = o.pattern;
114136
}
115137

116138
@Override
@@ -125,6 +147,15 @@ protected Builder self() {
125147
return this;
126148
}
127149

150+
/**
151+
* API name: {@code pattern}
152+
*/
153+
@Nonnull
154+
public final Builder pattern(@Nullable String value) {
155+
this.pattern = value;
156+
return this;
157+
}
158+
128159
/**
129160
* Builds a {@link SimplePatternSplitTokenizer}.
130161
*
@@ -151,13 +182,15 @@ public SimplePatternSplitTokenizer build() {
151182

152183
protected static void setupSimplePatternSplitTokenizerDeserializer(ObjectDeserializer<SimplePatternSplitTokenizer.Builder> op) {
153184
setupTokenizerBaseDeserializer(op);
185+
op.add(Builder::pattern, JsonpDeserializer.stringDeserializer(), "pattern");
154186

155187
op.ignore("type");
156188
}
157189

158190
@Override
159191
public int hashCode() {
160192
int result = super.hashCode();
193+
result = 31 * result + Objects.hashCode(this.pattern);
161194
return result;
162195
}
163196

@@ -168,6 +201,7 @@ public boolean equals(Object o) {
168201
}
169202
if (this == o) return true;
170203
if (o == null || this.getClass() != o.getClass()) return false;
171-
return true;
204+
SimplePatternSplitTokenizer other = (SimplePatternSplitTokenizer) o;
205+
return Objects.equals(this.pattern, other.pattern);
172206
}
173207
}

‎java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/SimplePatternTokenizer.java

+35-1
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,11 @@
3737
package org.opensearch.client.opensearch._types.analysis;
3838

3939
import jakarta.json.stream.JsonGenerator;
40+
import java.util.Objects;
4041
import java.util.function.Function;
4142
import javax.annotation.Generated;
4243
import javax.annotation.Nonnull;
44+
import javax.annotation.Nullable;
4345
import org.opensearch.client.json.JsonpDeserializable;
4446
import org.opensearch.client.json.JsonpDeserializer;
4547
import org.opensearch.client.json.JsonpMapper;
@@ -58,10 +60,14 @@ public class SimplePatternTokenizer extends TokenizerBase
5860
TokenizerDefinitionVariant,
5961
ToCopyableBuilder<SimplePatternTokenizer.Builder, SimplePatternTokenizer> {
6062

63+
@Nullable
64+
private final String pattern;
65+
6166
// ---------------------------------------------------------------------------------------------
6267

6368
private SimplePatternTokenizer(Builder builder) {
6469
super(builder);
70+
this.pattern = builder.pattern;
6571
}
6672

6773
public static SimplePatternTokenizer of(Function<SimplePatternTokenizer.Builder, ObjectBuilder<SimplePatternTokenizer>> fn) {
@@ -76,9 +82,21 @@ public TokenizerDefinition.Kind _tokenizerDefinitionKind() {
7682
return TokenizerDefinition.Kind.SimplePattern;
7783
}
7884

85+
/**
86+
* API name: {@code pattern}
87+
*/
88+
@Nullable
89+
public final String pattern() {
90+
return this.pattern;
91+
}
92+
7993
protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
8094
generator.write("type", "simple_pattern");
8195
super.serializeInternal(generator, mapper);
96+
if (this.pattern != null) {
97+
generator.writeKey("pattern");
98+
generator.write(this.pattern);
99+
}
82100
}
83101

84102
// ---------------------------------------------------------------------------------------------
@@ -98,15 +116,19 @@ public static Builder builder() {
98116
* Builder for {@link SimplePatternTokenizer}.
99117
*/
100118
public static class Builder extends TokenizerBase.AbstractBuilder<Builder> implements CopyableBuilder<Builder, SimplePatternTokenizer> {
119+
@Nullable
120+
private String pattern;
101121

102122
public Builder() {}
103123

104124
private Builder(SimplePatternTokenizer o) {
105125
super(o);
126+
this.pattern = o.pattern;
106127
}
107128

108129
private Builder(Builder o) {
109130
super(o);
131+
this.pattern = o.pattern;
110132
}
111133

112134
@Override
@@ -121,6 +143,15 @@ protected Builder self() {
121143
return this;
122144
}
123145

146+
/**
147+
* API name: {@code pattern}
148+
*/
149+
@Nonnull
150+
public final Builder pattern(@Nullable String value) {
151+
this.pattern = value;
152+
return this;
153+
}
154+
124155
/**
125156
* Builds a {@link SimplePatternTokenizer}.
126157
*
@@ -147,13 +178,15 @@ public SimplePatternTokenizer build() {
147178

148179
protected static void setupSimplePatternTokenizerDeserializer(ObjectDeserializer<SimplePatternTokenizer.Builder> op) {
149180
setupTokenizerBaseDeserializer(op);
181+
op.add(Builder::pattern, JsonpDeserializer.stringDeserializer(), "pattern");
150182

151183
op.ignore("type");
152184
}
153185

154186
@Override
155187
public int hashCode() {
156188
int result = super.hashCode();
189+
result = 31 * result + Objects.hashCode(this.pattern);
157190
return result;
158191
}
159192

@@ -164,6 +197,7 @@ public boolean equals(Object o) {
164197
}
165198
if (this == o) return true;
166199
if (o == null || this.getClass() != o.getClass()) return false;
167-
return true;
200+
SimplePatternTokenizer other = (SimplePatternTokenizer) o;
201+
return Objects.equals(this.pattern, other.pattern);
168202
}
169203
}

‎java-codegen/opensearch-openapi.yaml

+181-178
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)
Please sign in to comment.