Fix mistake in Simple Pattern Tokenizer specification/generation (#1451)

Signed-off-by: Thomas Farr <tsfarr@amazon.com>
opensearch-project · Feb 20, 2025 · 37e24dc · 37e24dc
1 parent c4e940c
commit 37e24dc
Show file tree

Hide file tree

Showing 4 changed files with 252 additions and 181 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -44,7 +44,7 @@ This section is for maintaining a changelog for all breaking changes for the cli
 ## [Unreleased 2.x]
 ### Added
 - Added support for the Search Pipeline APIs ([#1442](https://github.com/opensearch-project/opensearch-java/pull/1442))
-- Added support for `simple_pattern` and `simple_pattern_split` tokenizers ([#1448](https://github.com/opensearch-project/opensearch-java/pull/1448))
+- 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))
 - Added support for the Search response `phase_took` field ([#1449](https://github.com/opensearch-project/opensearch-java/pull/1449)) 
 
 ### Dependencies

diff --git a/...ed/java/org/opensearch/client/opensearch/_types/analysis/SimplePatternSplitTokenizer.java b/...ed/java/org/opensearch/client/opensearch/_types/analysis/SimplePatternSplitTokenizer.java
@@ -37,9 +37,11 @@
 package org.opensearch.client.opensearch._types.analysis;
 
 import jakarta.json.stream.JsonGenerator;
+import java.util.Objects;
 import java.util.function.Function;
 import javax.annotation.Generated;
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -58,10 +60,14 @@ public class SimplePatternSplitTokenizer extends TokenizerBase
         TokenizerDefinitionVariant,
         ToCopyableBuilder<SimplePatternSplitTokenizer.Builder, SimplePatternSplitTokenizer> {
 
+    @Nullable
+    private final String pattern;
+
     // ---------------------------------------------------------------------------------------------
 
     private SimplePatternSplitTokenizer(Builder builder) {
         super(builder);
+        this.pattern = builder.pattern;
     }
 
     public static SimplePatternSplitTokenizer of(
@@ -78,9 +84,21 @@ public TokenizerDefinition.Kind _tokenizerDefinitionKind() {
         return TokenizerDefinition.Kind.SimplePatternSplit;
     }
 
+    /**
+     * API name: {@code pattern}
+     */
+    @Nullable
+    public final String pattern() {
+        return this.pattern;
+    }
+
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
         generator.write("type", "simple_pattern_split");
         super.serializeInternal(generator, mapper);
+        if (this.pattern != null) {
+            generator.writeKey("pattern");
+            generator.write(this.pattern);
+        }
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -102,15 +120,19 @@ public static Builder builder() {
     public static class Builder extends TokenizerBase.AbstractBuilder<Builder>
         implements
             CopyableBuilder<Builder, SimplePatternSplitTokenizer> {
+        @Nullable
+        private String pattern;
 
         public Builder() {}
 
         private Builder(SimplePatternSplitTokenizer o) {
             super(o);
+            this.pattern = o.pattern;
         }
 
         private Builder(Builder o) {
             super(o);
+            this.pattern = o.pattern;
         }
 
         @Override
@@ -125,6 +147,15 @@ protected Builder self() {
             return this;
         }
 
+        /**
+         * API name: {@code pattern}
+         */
+        @Nonnull
+        public final Builder pattern(@Nullable String value) {
+            this.pattern = value;
+            return this;
+        }
+
         /**
          * Builds a {@link SimplePatternSplitTokenizer}.
          *
@@ -151,13 +182,15 @@ public SimplePatternSplitTokenizer build() {
 
     protected static void setupSimplePatternSplitTokenizerDeserializer(ObjectDeserializer<SimplePatternSplitTokenizer.Builder> op) {
         setupTokenizerBaseDeserializer(op);
+        op.add(Builder::pattern, JsonpDeserializer.stringDeserializer(), "pattern");
 
         op.ignore("type");
     }
 
     @Override
     public int hashCode() {
         int result = super.hashCode();
+        result = 31 * result + Objects.hashCode(this.pattern);
         return result;
     }
 
@@ -168,6 +201,7 @@ public boolean equals(Object o) {
         }
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
-        return true;
+        SimplePatternSplitTokenizer other = (SimplePatternSplitTokenizer) o;
+        return Objects.equals(this.pattern, other.pattern);
     }
 }
diff --git a/...nerated/java/org/opensearch/client/opensearch/_types/analysis/SimplePatternTokenizer.java b/...nerated/java/org/opensearch/client/opensearch/_types/analysis/SimplePatternTokenizer.java
@@ -37,9 +37,11 @@
 package org.opensearch.client.opensearch._types.analysis;
 
 import jakarta.json.stream.JsonGenerator;
+import java.util.Objects;
 import java.util.function.Function;
 import javax.annotation.Generated;
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -58,10 +60,14 @@ public class SimplePatternTokenizer extends TokenizerBase
         TokenizerDefinitionVariant,
         ToCopyableBuilder<SimplePatternTokenizer.Builder, SimplePatternTokenizer> {
 
+    @Nullable
+    private final String pattern;
+
     // ---------------------------------------------------------------------------------------------
 
     private SimplePatternTokenizer(Builder builder) {
         super(builder);
+        this.pattern = builder.pattern;
     }
 
     public static SimplePatternTokenizer of(Function<SimplePatternTokenizer.Builder, ObjectBuilder<SimplePatternTokenizer>> fn) {
@@ -76,9 +82,21 @@ public TokenizerDefinition.Kind _tokenizerDefinitionKind() {
         return TokenizerDefinition.Kind.SimplePattern;
     }
 
+    /**
+     * API name: {@code pattern}
+     */
+    @Nullable
+    public final String pattern() {
+        return this.pattern;
+    }
+
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
         generator.write("type", "simple_pattern");
         super.serializeInternal(generator, mapper);
+        if (this.pattern != null) {
+            generator.writeKey("pattern");
+            generator.write(this.pattern);
+        }
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -98,15 +116,19 @@ public static Builder builder() {
      * Builder for {@link SimplePatternTokenizer}.
      */
     public static class Builder extends TokenizerBase.AbstractBuilder<Builder> implements CopyableBuilder<Builder, SimplePatternTokenizer> {
+        @Nullable
+        private String pattern;
 
         public Builder() {}
 
         private Builder(SimplePatternTokenizer o) {
             super(o);
+            this.pattern = o.pattern;
         }
 
         private Builder(Builder o) {
             super(o);
+            this.pattern = o.pattern;
         }
 
         @Override
@@ -121,6 +143,15 @@ protected Builder self() {
             return this;
         }
 
+        /**
+         * API name: {@code pattern}
+         */
+        @Nonnull
+        public final Builder pattern(@Nullable String value) {
+            this.pattern = value;
+            return this;
+        }
+
         /**
          * Builds a {@link SimplePatternTokenizer}.
          *
@@ -147,13 +178,15 @@ public SimplePatternTokenizer build() {
 
     protected static void setupSimplePatternTokenizerDeserializer(ObjectDeserializer<SimplePatternTokenizer.Builder> op) {
         setupTokenizerBaseDeserializer(op);
+        op.add(Builder::pattern, JsonpDeserializer.stringDeserializer(), "pattern");
 
         op.ignore("type");
     }
 
     @Override
     public int hashCode() {
         int result = super.hashCode();
+        result = 31 * result + Objects.hashCode(this.pattern);
         return result;
     }
 
@@ -164,6 +197,7 @@ public boolean equals(Object o) {
         }
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
-        return true;
+        SimplePatternTokenizer other = (SimplePatternTokenizer) o;
+        return Objects.equals(this.pattern, other.pattern);
     }
 }