Skip to content

Commit

Permalink
Fix pattern replace by making flag optional as on api
Browse files Browse the repository at this point in the history
Signed-off-by: Grouh <spamart@lafourchette.com>
  • Loading branch information
grouh committed Mar 14, 2024
1 parent 8513615 commit d13a89c
Showing 1 changed file with 13 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@

import jakarta.json.stream.JsonGenerator;
import java.util.function.Function;
import javax.annotation.Nullable;
import org.opensearch.client.json.JsonpDeserializable;
import org.opensearch.client.json.JsonpDeserializer;
import org.opensearch.client.json.JsonpMapper;
Expand All @@ -46,6 +47,7 @@

@JsonpDeserializable
public class PatternReplaceCharFilter extends CharFilterBase implements CharFilterDefinitionVariant {
@Nullable
private final String flags;

private final String pattern;
Expand All @@ -57,7 +59,7 @@ public class PatternReplaceCharFilter extends CharFilterBase implements CharFilt
private PatternReplaceCharFilter(Builder builder) {
super(builder);

this.flags = ApiTypeHelper.requireNonNull(builder.flags, this, "flags");
this.flags = builder.flags;
this.pattern = ApiTypeHelper.requireNonNull(builder.pattern, this, "pattern");
this.replacement = ApiTypeHelper.requireNonNull(builder.replacement, this, "replacement");

Expand All @@ -76,8 +78,9 @@ public CharFilterDefinition.Kind _charFilterDefinitionKind() {
}

/**
* Required - API name: {@code flags}
* API name: {@code flags}
*/
@Nullable
public final String flags() {
return this.flags;
}
Expand All @@ -100,8 +103,11 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {

generator.write("type", "pattern_replace");
super.serializeInternal(generator, mapper);
generator.writeKey("flags");
generator.write(this.flags);

if (this.flags != null) {
generator.writeKey("flags");
generator.write(this.flags);
}

generator.writeKey("pattern");
generator.write(this.pattern);
Expand All @@ -118,16 +124,17 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
*/

public static class Builder extends CharFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<PatternReplaceCharFilter> {
@Nullable
private String flags;

private String pattern;

private String replacement;

/**
* Required - API name: {@code flags}
* API name: {@code flags}
*/
public final Builder flags(String value) {
public final Builder flags(@Nullable String value) {
this.flags = value;
return this;
}
Expand Down

0 comments on commit d13a89c

Please sign in to comment.