diff --git a/UPGRADING.md b/UPGRADING.md
index c14f4e0821..d764e68eaf 100644
--- a/UPGRADING.md
+++ b/UPGRADING.md
@@ -57,4 +57,20 @@ After:
 - Removed the `Runtime` variant from the `DynamicMapping` enum as it is not supported by OpenSearch.
 
 ### TypeMapping
-- Removed the `runtime` field, getter and builder methods from `TypeMapping` as it is not supported by OpenSearch.
\ No newline at end of file
+- Removed the `runtime` field, getter and builder methods from `TypeMapping` as it is not supported by OpenSearch.
+
+### InlineScript
+- The `lang` property now accepts a `ScriptLanguage` enum instead of a `String`.
+
+### IcuCollationDecomposition enum variants
+- The `IcuCollationDecomposition.Identical` variant has been corrected to be `IcuCollationDecomposition.Canonical`.
+
+### IcuCollationTokenFilter property name casing
+- The following fields, getters and builder methods on `IcuCollationTokenFilter` have had their casing corrected:
+  - `casefirst` -> `caseFirst`
+  - `caselevel` -> `caseLevel`
+  - `hiraganaquaternarymode` -> `hiraganaQuaternaryMode`
+  - `variabletop` -> `variableTop`
+
+### TokenFilterDefinition
+- The `smartcn_stop` Builder method has been renamed to `smartcnStop`.
\ No newline at end of file
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/_types/BuiltinScriptLanguage.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/BuiltinScriptLanguage.java
new file mode 100644
index 0000000000..1efa80f968
--- /dev/null
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/BuiltinScriptLanguage.java
@@ -0,0 +1,69 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
+
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/*
+ * Modifications Copyright OpenSearch Contributors. See
+ * GitHub history for details.
+ */
+
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
+package org.opensearch.client.opensearch._types;
+
+import javax.annotation.Generated;
+import org.opensearch.client.json.JsonEnum;
+import org.opensearch.client.json.JsonpDeserializable;
+
+// typedef: _types.BuiltinScriptLanguage
+
+@JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
+public enum BuiltinScriptLanguage implements JsonEnum {
+    Expression("expression"),
+
+    Java("java"),
+
+    Mustache("mustache"),
+
+    Painless("painless");
+
+    private final String jsonValue;
+
+    BuiltinScriptLanguage(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
+
+    public String jsonValue() {
+        return this.jsonValue;
+    }
+
+    public static final JsonEnum.Deserializer<BuiltinScriptLanguage> _DESERIALIZER = new JsonEnum.Deserializer<>(
+        BuiltinScriptLanguage.values()
+    );
+}
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/InlineScript.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/InlineScript.java
similarity index 71%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/InlineScript.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/InlineScript.java
index be2177029b..fd2cde01a6 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/InlineScript.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/InlineScript.java
@@ -30,11 +30,18 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types;
 
 import jakarta.json.stream.JsonGenerator;
 import java.util.Map;
+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;
@@ -47,26 +54,28 @@
 // typedef: _types.InlineScript
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class InlineScript extends ScriptBase {
+
     @Nullable
-    private final String lang;
+    private final ScriptLanguage lang;
 
+    @Nonnull
     private final Map<String, String> options;
 
+    @Nonnull
     private final String source;
 
     // ---------------------------------------------------------------------------------------------
 
     private InlineScript(Builder builder) {
         super(builder);
-
         this.lang = builder.lang;
         this.options = ApiTypeHelper.unmodifiable(builder.options);
         this.source = ApiTypeHelper.requireNonNull(builder.source, this, "source");
-
     }
 
-    public static InlineScript of(Function<Builder, ObjectBuilder<InlineScript>> fn) {
+    public static InlineScript of(Function<InlineScript.Builder, ObjectBuilder<InlineScript>> fn) {
         return fn.apply(new Builder()).build();
     }
 
@@ -74,46 +83,48 @@ public static InlineScript of(Function<Builder, ObjectBuilder<InlineScript>> fn)
      * API name: {@code lang}
      */
     @Nullable
-    public final String lang() {
+    public final ScriptLanguage lang() {
         return this.lang;
     }
 
     /**
      * API name: {@code options}
      */
+    @Nonnull
     public final Map<String, String> options() {
         return this.options;
     }
 
     /**
-     * Required - API name: {@code source}
+     * Required - The script source.
+     * <p>
+     * API name: {@code source}
+     * </p>
      */
+    @Nonnull
     public final String source() {
         return this.source;
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         super.serializeInternal(generator, mapper);
         if (this.lang != null) {
             generator.writeKey("lang");
-            generator.write(this.lang);
-
+            this.lang.serialize(generator, mapper);
         }
+
         if (ApiTypeHelper.isDefined(this.options)) {
             generator.writeKey("options");
             generator.writeStartObject();
             for (Map.Entry<String, String> item0 : this.options.entrySet()) {
                 generator.writeKey(item0.getKey());
                 generator.write(item0.getValue());
-
             }
             generator.writeEnd();
-
         }
+
         generator.writeKey("source");
         generator.write(this.source);
-
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -121,28 +132,34 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     /**
      * Builder for {@link InlineScript}.
      */
-
     public static class Builder extends ScriptBase.AbstractBuilder<Builder> implements ObjectBuilder<InlineScript> {
         @Nullable
-        private String lang;
-
+        private ScriptLanguage lang;
         @Nullable
         private Map<String, String> options;
-
         private String source;
 
         /**
          * API name: {@code lang}
          */
-        public final Builder lang(@Nullable String value) {
+        public final Builder lang(@Nullable ScriptLanguage value) {
             this.lang = value;
             return this;
         }
 
+        /**
+         * API name: {@code lang}
+         */
+        public final Builder lang(Function<ScriptLanguage.Builder, ObjectBuilder<ScriptLanguage>> fn) {
+            return lang(fn.apply(new ScriptLanguage.Builder()).build());
+        }
+
         /**
          * API name: {@code options}
+         *
          * <p>
-         * Adds all entries of <code>map</code> to <code>options</code>.
+         * Adds all elements of <code>map</code> to <code>options</code>.
+         * </p>
          */
         public final Builder options(Map<String, String> map) {
             this.options = _mapPutAll(this.options, map);
@@ -151,8 +168,10 @@ public final Builder options(Map<String, String> map) {
 
         /**
          * API name: {@code options}
+         *
          * <p>
          * Adds an entry to <code>options</code>.
+         * </p>
          */
         public final Builder options(String key, String value) {
             this.options = _mapPut(this.options, key, value);
@@ -160,7 +179,10 @@ public final Builder options(String key, String value) {
         }
 
         /**
-         * Required - API name: {@code source}
+         * Required - The script source.
+         * <p>
+         * API name: {@code source}
+         * </p>
          */
         public final Builder source(String value) {
             this.source = value;
@@ -175,8 +197,7 @@ protected Builder self() {
         /**
          * Builds a {@link InlineScript}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public InlineScript build() {
             _checkSingleUse();
@@ -196,13 +217,31 @@ public InlineScript build() {
     );
 
     protected static void setupInlineScriptDeserializer(ObjectDeserializer<InlineScript.Builder> op) {
-        ScriptBase.setupScriptBaseDeserializer(op);
-        op.add(Builder::lang, JsonpDeserializer.stringDeserializer(), "lang");
+        setupScriptBaseDeserializer(op);
+        op.add(Builder::lang, ScriptLanguage._DESERIALIZER, "lang");
         op.add(Builder::options, JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.stringDeserializer()), "options");
         op.add(Builder::source, JsonpDeserializer.stringDeserializer(), "source");
 
         op.shortcutProperty("source");
+    }
 
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + Objects.hashCode(this.lang);
+        result = 31 * result + Objects.hashCode(this.options);
+        result = 31 * result + this.source.hashCode();
+        return result;
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        InlineScript other = (InlineScript) o;
+        return Objects.equals(this.lang, other.lang) && Objects.equals(this.options, other.options) && this.source.equals(other.source);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/Script.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/Script.java
similarity index 79%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/Script.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/Script.java
index 6f969b8f5a..811438381d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/Script.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/Script.java
@@ -30,14 +30,21 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types;
 
 import jakarta.json.stream.JsonGenerator;
+import java.util.Objects;
 import java.util.function.Function;
+import javax.annotation.Generated;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
+import org.opensearch.client.json.PlainJsonSerializable;
 import org.opensearch.client.json.UnionDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
@@ -48,12 +55,14 @@
 // typedef: _types.Script
 
 @JsonpDeserializable
-public class Script implements TaggedUnion<Script.Kind, Object>, JsonpSerializable {
-
+@Generated("org.opensearch.client.codegen.CodeGenerator")
+public class Script implements TaggedUnion<Script.Kind, Object>, PlainJsonSerializable {
+    /**
+     * {@link Script} variant kinds.
+     */
     public enum Kind {
         Inline,
         Stored
-
     }
 
     private final Kind _kind;
@@ -75,13 +84,11 @@ private Script(Kind kind, Object value) {
     }
 
     private Script(Builder builder) {
-
         this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
         this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
-
     }
 
-    public static Script of(Function<Builder, ObjectBuilder<Script>> fn) {
+    public static Script of(Function<Script.Builder, ObjectBuilder<Script>> fn) {
         return fn.apply(new Builder()).build();
     }
 
@@ -95,8 +102,7 @@ public boolean isInline() {
     /**
      * Get the {@code inline} variant value.
      *
-     * @throws IllegalStateException
-     *             if the current variant is not of the {@code inline} kind.
+     * @throws IllegalStateException if the current variant is not the {@code inline} kind.
      */
     public InlineScript inline() {
         return TaggedUnionUtils.get(this, Kind.Inline);
@@ -112,8 +118,7 @@ public boolean isStored() {
     /**
      * Get the {@code stored} variant value.
      *
-     * @throws IllegalStateException
-     *             if the current variant is not of the {@code stored} kind.
+     * @throws IllegalStateException if the current variant is not the {@code stored} kind.
      */
     public StoredScriptId stored() {
         return TaggedUnionUtils.get(this, Kind.Stored);
@@ -124,7 +129,6 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
         if (_value instanceof JsonpSerializable) {
             ((JsonpSerializable) _value).serialize(generator, mapper);
         }
-
     }
 
     public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Script> {
@@ -151,11 +155,11 @@ public ObjectBuilder<Script> stored(Function<StoredScriptId.Builder, ObjectBuild
             return this.stored(fn.apply(new StoredScriptId.Builder()).build());
         }
 
+        @Override
         public Script build() {
             _checkSingleUse();
             return new Script(this);
         }
-
     }
 
     private static JsonpDeserializer<Script> buildScriptDeserializer() {
@@ -165,4 +169,20 @@ private static JsonpDeserializer<Script> buildScriptDeserializer() {
     }
 
     public static final JsonpDeserializer<Script> _DESERIALIZER = JsonpDeserializer.lazy(Script::buildScriptDeserializer);
+
+    @Override
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + Objects.hashCode(this._kind);
+        result = 31 * result + Objects.hashCode(this._value);
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        Script other = (Script) o;
+        return Objects.equals(this._kind, other._kind) && Objects.equals(this._value, other._value);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/ScriptBase.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/ScriptBase.java
similarity index 71%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/ScriptBase.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/ScriptBase.java
index b035508712..787f086689 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/ScriptBase.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/ScriptBase.java
@@ -30,10 +30,17 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types;
 
 import jakarta.json.stream.JsonGenerator;
 import java.util.Map;
+import java.util.Objects;
+import javax.annotation.Generated;
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -45,20 +52,26 @@
 
 // typedef: _types.ScriptBase
 
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public abstract class ScriptBase implements PlainJsonSerializable {
+
+    @Nonnull
     private final Map<String, JsonData> params;
 
     // ---------------------------------------------------------------------------------------------
 
     protected ScriptBase(AbstractBuilder<?> builder) {
-
         this.params = ApiTypeHelper.unmodifiable(builder.params);
-
     }
 
     /**
+     * Specifies any named parameters that are passed into the script as variables. Use parameters instead of hard-coded values to decrease
+     * compilation time.
+     * <p>
      * API name: {@code params}
+     * </p>
      */
+    @Nonnull
     public final Map<String, JsonData> params() {
         return this.params;
     }
@@ -66,6 +79,7 @@ public final Map<String, JsonData> params() {
     /**
      * Serialize this object to JSON.
      */
+    @Override
     public void serialize(JsonGenerator generator, JsonpMapper mapper) {
         generator.writeStartObject();
         serializeInternal(generator, mapper);
@@ -73,29 +87,33 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         if (ApiTypeHelper.isDefined(this.params)) {
             generator.writeKey("params");
             generator.writeStartObject();
             for (Map.Entry<String, JsonData> item0 : this.params.entrySet()) {
                 generator.writeKey(item0.getKey());
                 item0.getValue().serialize(generator, mapper);
-
             }
             generator.writeEnd();
-
         }
-
     }
 
+    // ---------------------------------------------------------------------------------------------
+
     protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
         @Nullable
         private Map<String, JsonData> params;
 
         /**
+         * Specifies any named parameters that are passed into the script as variables. Use parameters instead of hard-coded values to
+         * decrease compilation time.
+         * <p>
          * API name: {@code params}
+         * </p>
+         *
          * <p>
-         * Adds all entries of <code>map</code> to <code>params</code>.
+         * Adds all elements of <code>map</code> to <code>params</code>.
+         * </p>
          */
         public final BuilderT params(Map<String, JsonData> map) {
             this.params = _mapPutAll(this.params, map);
@@ -103,9 +121,15 @@ public final BuilderT params(Map<String, JsonData> map) {
         }
 
         /**
+         * Specifies any named parameters that are passed into the script as variables. Use parameters instead of hard-coded values to
+         * decrease compilation time.
+         * <p>
          * API name: {@code params}
+         * </p>
+         *
          * <p>
          * Adds an entry to <code>params</code>.
+         * </p>
          */
         public final BuilderT params(String key, JsonData value) {
             this.params = _mapPut(this.params, key, value);
@@ -113,14 +137,26 @@ public final BuilderT params(String key, JsonData value) {
         }
 
         protected abstract BuilderT self();
-
     }
 
     // ---------------------------------------------------------------------------------------------
-    protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupScriptBaseDeserializer(ObjectDeserializer<BuilderT> op) {
 
+    protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupScriptBaseDeserializer(ObjectDeserializer<BuilderT> op) {
         op.add(AbstractBuilder::params, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "params");
+    }
 
+    @Override
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + Objects.hashCode(this.params);
+        return result;
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        ScriptBase other = (ScriptBase) o;
+        return Objects.equals(this.params, other.params);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/ScriptBuilders.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/ScriptBuilders.java
similarity index 85%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/ScriptBuilders.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/ScriptBuilders.java
index 4908e13b45..66e0b03d2c 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/ScriptBuilders.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/ScriptBuilders.java
@@ -30,11 +30,18 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types;
 
+import javax.annotation.Generated;
+
 /**
  * Builders for {@link Script} variants.
  */
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class ScriptBuilders {
     private ScriptBuilders() {}
 
@@ -46,11 +53,9 @@ public static InlineScript.Builder inline() {
     }
 
     /**
-     * Creates a builder for the {@link StoredScriptId stored} {@code Script}
-     * variant.
+     * Creates a builder for the {@link StoredScriptId stored} {@code Script} variant.
      */
     public static StoredScriptId.Builder stored() {
         return new StoredScriptId.Builder();
     }
-
 }
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/_types/ScriptLanguage.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/ScriptLanguage.java
new file mode 100644
index 0000000000..115e7e4c8b
--- /dev/null
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/ScriptLanguage.java
@@ -0,0 +1,200 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
+
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/*
+ * Modifications Copyright OpenSearch Contributors. See
+ * GitHub history for details.
+ */
+
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
+package org.opensearch.client.opensearch._types;
+
+import jakarta.json.stream.JsonGenerator;
+import java.util.Objects;
+import java.util.function.Function;
+import javax.annotation.Generated;
+import org.opensearch.client.json.JsonpDeserializable;
+import org.opensearch.client.json.JsonpDeserializer;
+import org.opensearch.client.json.JsonpMapper;
+import org.opensearch.client.json.JsonpSerializable;
+import org.opensearch.client.json.PlainJsonSerializable;
+import org.opensearch.client.json.UnionDeserializer;
+import org.opensearch.client.util.ApiTypeHelper;
+import org.opensearch.client.util.ObjectBuilder;
+import org.opensearch.client.util.ObjectBuilderBase;
+import org.opensearch.client.util.TaggedUnion;
+import org.opensearch.client.util.TaggedUnionUtils;
+
+// typedef: _types.ScriptLanguage
+
+@JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
+public class ScriptLanguage implements TaggedUnion<ScriptLanguage.Kind, Object>, PlainJsonSerializable {
+    /**
+     * {@link ScriptLanguage} variant kinds.
+     */
+    public enum Kind {
+        Builtin,
+        Custom
+    }
+
+    private final Kind _kind;
+    private final Object _value;
+
+    @Override
+    public final Kind _kind() {
+        return _kind;
+    }
+
+    @Override
+    public final Object _get() {
+        return _value;
+    }
+
+    private ScriptLanguage(Kind kind, Object value) {
+        this._kind = kind;
+        this._value = value;
+    }
+
+    private ScriptLanguage(Builder builder) {
+        this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
+    }
+
+    public static ScriptLanguage of(Function<ScriptLanguage.Builder, ObjectBuilder<ScriptLanguage>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    public String _toJsonString() {
+        switch (_kind) {
+            case Builtin:
+                return this.builtin().jsonValue();
+            case Custom:
+                return this.custom();
+            default:
+                throw new IllegalStateException("Unknown kind " + _kind);
+        }
+    }
+
+    /**
+     * Is this variant instance of kind {@code builtin}?
+     */
+    public boolean isBuiltin() {
+        return _kind == Kind.Builtin;
+    }
+
+    /**
+     * Get the {@code builtin} variant value.
+     *
+     * @throws IllegalStateException if the current variant is not the {@code builtin} kind.
+     */
+    public BuiltinScriptLanguage builtin() {
+        return TaggedUnionUtils.get(this, Kind.Builtin);
+    }
+
+    /**
+     * Is this variant instance of kind {@code custom}?
+     */
+    public boolean isCustom() {
+        return _kind == Kind.Custom;
+    }
+
+    /**
+     * Get the {@code custom} variant value.
+     *
+     * @throws IllegalStateException if the current variant is not the {@code custom} kind.
+     */
+    public String custom() {
+        return TaggedUnionUtils.get(this, Kind.Custom);
+    }
+
+    @Override
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        if (_value instanceof JsonpSerializable) {
+            ((JsonpSerializable) _value).serialize(generator, mapper);
+        } else {
+            switch (_kind) {
+                case Custom:
+                    generator.write(((String) this._value));
+                    break;
+            }
+        }
+    }
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ScriptLanguage> {
+        private Kind _kind;
+        private Object _value;
+
+        public ObjectBuilder<ScriptLanguage> builtin(BuiltinScriptLanguage v) {
+            this._kind = Kind.Builtin;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<ScriptLanguage> custom(String v) {
+            this._kind = Kind.Custom;
+            this._value = v;
+            return this;
+        }
+
+        @Override
+        public ScriptLanguage build() {
+            _checkSingleUse();
+            return new ScriptLanguage(this);
+        }
+    }
+
+    private static JsonpDeserializer<ScriptLanguage> buildScriptLanguageDeserializer() {
+        return new UnionDeserializer.Builder<ScriptLanguage, Kind, Object>(ScriptLanguage::new, true).addMember(
+            Kind.Builtin,
+            BuiltinScriptLanguage._DESERIALIZER
+        ).addMember(Kind.Custom, JsonpDeserializer.stringDeserializer()).build();
+    }
+
+    public static final JsonpDeserializer<ScriptLanguage> _DESERIALIZER = JsonpDeserializer.lazy(
+        ScriptLanguage::buildScriptLanguageDeserializer
+    );
+
+    @Override
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + Objects.hashCode(this._kind);
+        result = 31 * result + Objects.hashCode(this._value);
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        ScriptLanguage other = (ScriptLanguage) o;
+        return Objects.equals(this._kind, other._kind) && Objects.equals(this._value, other._value);
+    }
+}
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/StoredScriptId.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/StoredScriptId.java
similarity index 78%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/StoredScriptId.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/StoredScriptId.java
index f61b3a6016..db738df71b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/StoredScriptId.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/StoredScriptId.java
@@ -30,10 +30,16 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types;
 
 import jakarta.json.stream.JsonGenerator;
 import java.util.function.Function;
+import javax.annotation.Generated;
+import javax.annotation.Nonnull;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -45,35 +51,35 @@
 // typedef: _types.StoredScriptId
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class StoredScriptId extends ScriptBase {
+
+    @Nonnull
     private final String id;
 
     // ---------------------------------------------------------------------------------------------
 
     private StoredScriptId(Builder builder) {
         super(builder);
-
         this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
-
     }
 
-    public static StoredScriptId of(Function<Builder, ObjectBuilder<StoredScriptId>> fn) {
+    public static StoredScriptId of(Function<StoredScriptId.Builder, ObjectBuilder<StoredScriptId>> fn) {
         return fn.apply(new Builder()).build();
     }
 
     /**
      * Required - API name: {@code id}
      */
+    @Nonnull
     public final String id() {
         return this.id;
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         super.serializeInternal(generator, mapper);
         generator.writeKey("id");
         generator.write(this.id);
-
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -81,7 +87,6 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     /**
      * Builder for {@link StoredScriptId}.
      */
-
     public static class Builder extends ScriptBase.AbstractBuilder<Builder> implements ObjectBuilder<StoredScriptId> {
         private String id;
 
@@ -101,8 +106,7 @@ protected Builder self() {
         /**
          * Builds a {@link StoredScriptId}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public StoredScriptId build() {
             _checkSingleUse();
@@ -122,9 +126,25 @@ public StoredScriptId build() {
     );
 
     protected static void setupStoredScriptIdDeserializer(ObjectDeserializer<StoredScriptId.Builder> op) {
-        ScriptBase.setupScriptBaseDeserializer(op);
+        setupScriptBaseDeserializer(op);
         op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "id");
+    }
 
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + this.id.hashCode();
+        return result;
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        StoredScriptId other = (StoredScriptId) o;
+        return this.id.equals(other.id);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/AsciiFoldingTokenFilter.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/AsciiFoldingTokenFilter.java
similarity index 69%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/AsciiFoldingTokenFilter.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/AsciiFoldingTokenFilter.java
index 674a4c953a..66e859ba78 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/AsciiFoldingTokenFilter.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/AsciiFoldingTokenFilter.java
@@ -30,39 +30,46 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 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.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
-import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 
 // typedef: _types.analysis.AsciiFoldingTokenFilter
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class AsciiFoldingTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
-    private final boolean preserveOriginal;
+
+    @Nullable
+    private final Boolean preserveOriginal;
 
     // ---------------------------------------------------------------------------------------------
 
     private AsciiFoldingTokenFilter(Builder builder) {
         super(builder);
-
-        this.preserveOriginal = ApiTypeHelper.requireNonNull(builder.preserveOriginal, this, "preserveOriginal");
-
+        this.preserveOriginal = builder.preserveOriginal;
     }
 
-    public static AsciiFoldingTokenFilter of(Function<Builder, ObjectBuilder<AsciiFoldingTokenFilter>> fn) {
+    public static AsciiFoldingTokenFilter of(Function<AsciiFoldingTokenFilter.Builder, ObjectBuilder<AsciiFoldingTokenFilter>> fn) {
         return fn.apply(new Builder()).build();
     }
 
     /**
-     * TokenFilterDefinition variant kind.
+     * {@link TokenFilterDefinition} variant kind.
      */
     @Override
     public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
@@ -70,19 +77,20 @@ public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
     }
 
     /**
-     * Required - API name: {@code preserve_original}
+     * API name: {@code preserve_original}
      */
-    public final boolean preserveOriginal() {
+    @Nullable
+    public final Boolean preserveOriginal() {
         return this.preserveOriginal;
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         generator.write("type", "asciifolding");
         super.serializeInternal(generator, mapper);
-        generator.writeKey("preserve_original");
-        generator.write(this.preserveOriginal);
-
+        if (this.preserveOriginal != null) {
+            generator.writeKey("preserve_original");
+            generator.write(this.preserveOriginal);
+        }
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -90,14 +98,14 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     /**
      * Builder for {@link AsciiFoldingTokenFilter}.
      */
-
     public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<AsciiFoldingTokenFilter> {
+        @Nullable
         private Boolean preserveOriginal;
 
         /**
-         * Required - API name: {@code preserve_original}
+         * API name: {@code preserve_original}
          */
-        public final Builder preserveOriginal(boolean value) {
+        public final Builder preserveOriginal(@Nullable Boolean value) {
             this.preserveOriginal = value;
             return this;
         }
@@ -110,8 +118,7 @@ protected Builder self() {
         /**
          * Builds a {@link AsciiFoldingTokenFilter}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public AsciiFoldingTokenFilter build() {
             _checkSingleUse();
@@ -131,10 +138,27 @@ public AsciiFoldingTokenFilter build() {
     );
 
     protected static void setupAsciiFoldingTokenFilterDeserializer(ObjectDeserializer<AsciiFoldingTokenFilter.Builder> op) {
-        TokenFilterBase.setupTokenFilterBaseDeserializer(op);
+        setupTokenFilterBaseDeserializer(op);
         op.add(Builder::preserveOriginal, JsonpDeserializer.booleanDeserializer(), "preserve_original");
 
         op.ignore("type");
     }
 
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + Objects.hashCode(this.preserveOriginal);
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        AsciiFoldingTokenFilter other = (AsciiFoldingTokenFilter) o;
+        return Objects.equals(this.preserveOriginal, other.preserveOriginal);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/CommonGramsTokenFilter.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/CommonGramsTokenFilter.java
similarity index 81%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/CommonGramsTokenFilter.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/CommonGramsTokenFilter.java
index 1eac5b33ce..959f5e873f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/CommonGramsTokenFilter.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/CommonGramsTokenFilter.java
@@ -30,11 +30,18 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.analysis;
 
 import jakarta.json.stream.JsonGenerator;
 import java.util.List;
+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;
@@ -47,7 +54,10 @@
 // typedef: _types.analysis.CommonGramsTokenFilter
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class CommonGramsTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
+
+    @Nonnull
     private final List<String> commonWords;
 
     @Nullable
@@ -63,20 +73,18 @@ public class CommonGramsTokenFilter extends TokenFilterBase implements TokenFilt
 
     private CommonGramsTokenFilter(Builder builder) {
         super(builder);
-
         this.commonWords = ApiTypeHelper.unmodifiable(builder.commonWords);
         this.commonWordsPath = builder.commonWordsPath;
         this.ignoreCase = builder.ignoreCase;
         this.queryMode = builder.queryMode;
-
     }
 
-    public static CommonGramsTokenFilter of(Function<Builder, ObjectBuilder<CommonGramsTokenFilter>> fn) {
+    public static CommonGramsTokenFilter of(Function<CommonGramsTokenFilter.Builder, ObjectBuilder<CommonGramsTokenFilter>> fn) {
         return fn.apply(new Builder()).build();
     }
 
     /**
-     * TokenFilterDefinition variant kind.
+     * {@link TokenFilterDefinition} variant kind.
      */
     @Override
     public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
@@ -86,6 +94,7 @@ public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
     /**
      * API name: {@code common_words}
      */
+    @Nonnull
     public final List<String> commonWords() {
         return this.commonWords;
     }
@@ -115,7 +124,6 @@ public final Boolean queryMode() {
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         generator.write("type", "common_grams");
         super.serializeInternal(generator, mapper);
         if (ApiTypeHelper.isDefined(this.commonWords)) {
@@ -123,27 +131,24 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
             generator.writeStartArray();
             for (String item0 : this.commonWords) {
                 generator.write(item0);
-
             }
             generator.writeEnd();
-
         }
+
         if (this.commonWordsPath != null) {
             generator.writeKey("common_words_path");
             generator.write(this.commonWordsPath);
-
         }
+
         if (this.ignoreCase != null) {
             generator.writeKey("ignore_case");
             generator.write(this.ignoreCase);
-
         }
+
         if (this.queryMode != null) {
             generator.writeKey("query_mode");
             generator.write(this.queryMode);
-
         }
-
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -151,24 +156,22 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     /**
      * Builder for {@link CommonGramsTokenFilter}.
      */
-
     public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<CommonGramsTokenFilter> {
         @Nullable
         private List<String> commonWords;
-
         @Nullable
         private String commonWordsPath;
-
         @Nullable
         private Boolean ignoreCase;
-
         @Nullable
         private Boolean queryMode;
 
         /**
          * API name: {@code common_words}
+         *
          * <p>
          * Adds all elements of <code>list</code> to <code>commonWords</code>.
+         * </p>
          */
         public final Builder commonWords(List<String> list) {
             this.commonWords = _listAddAll(this.commonWords, list);
@@ -177,8 +180,10 @@ public final Builder commonWords(List<String> list) {
 
         /**
          * API name: {@code common_words}
+         *
          * <p>
          * Adds one or more values to <code>commonWords</code>.
+         * </p>
          */
         public final Builder commonWords(String value, String... values) {
             this.commonWords = _listAdd(this.commonWords, value, values);
@@ -217,8 +222,7 @@ protected Builder self() {
         /**
          * Builds a {@link CommonGramsTokenFilter}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public CommonGramsTokenFilter build() {
             _checkSingleUse();
@@ -238,7 +242,7 @@ public CommonGramsTokenFilter build() {
     );
 
     protected static void setupCommonGramsTokenFilterDeserializer(ObjectDeserializer<CommonGramsTokenFilter.Builder> op) {
-        TokenFilterBase.setupTokenFilterBaseDeserializer(op);
+        setupTokenFilterBaseDeserializer(op);
         op.add(Builder::commonWords, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "common_words");
         op.add(Builder::commonWordsPath, JsonpDeserializer.stringDeserializer(), "common_words_path");
         op.add(Builder::ignoreCase, JsonpDeserializer.booleanDeserializer(), "ignore_case");
@@ -247,4 +251,27 @@ protected static void setupCommonGramsTokenFilterDeserializer(ObjectDeserializer
         op.ignore("type");
     }
 
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + Objects.hashCode(this.commonWords);
+        result = 31 * result + Objects.hashCode(this.commonWordsPath);
+        result = 31 * result + Objects.hashCode(this.ignoreCase);
+        result = 31 * result + Objects.hashCode(this.queryMode);
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        CommonGramsTokenFilter other = (CommonGramsTokenFilter) o;
+        return Objects.equals(this.commonWords, other.commonWords)
+            && Objects.equals(this.commonWordsPath, other.commonWordsPath)
+            && Objects.equals(this.ignoreCase, other.ignoreCase)
+            && Objects.equals(this.queryMode, other.queryMode);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/CompoundWordTokenFilterBase.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/CompoundWordTokenFilterBase.java
similarity index 81%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/CompoundWordTokenFilterBase.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/CompoundWordTokenFilterBase.java
index 16be6f05a3..1a93cfbb5c 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/CompoundWordTokenFilterBase.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/CompoundWordTokenFilterBase.java
@@ -30,10 +30,17 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.analysis;
 
 import jakarta.json.stream.JsonGenerator;
 import java.util.List;
+import java.util.Objects;
+import javax.annotation.Generated;
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -42,7 +49,9 @@
 
 // typedef: _types.analysis.CompoundWordTokenFilterBase
 
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public abstract class CompoundWordTokenFilterBase extends TokenFilterBase {
+
     @Nullable
     private final String hyphenationPatternsPath;
 
@@ -58,6 +67,7 @@ public abstract class CompoundWordTokenFilterBase extends TokenFilterBase {
     @Nullable
     private final Boolean onlyLongestMatch;
 
+    @Nonnull
     private final List<String> wordList;
 
     @Nullable
@@ -67,7 +77,6 @@ public abstract class CompoundWordTokenFilterBase extends TokenFilterBase {
 
     protected CompoundWordTokenFilterBase(AbstractBuilder<?> builder) {
         super(builder);
-
         this.hyphenationPatternsPath = builder.hyphenationPatternsPath;
         this.maxSubwordSize = builder.maxSubwordSize;
         this.minSubwordSize = builder.minSubwordSize;
@@ -75,7 +84,6 @@ protected CompoundWordTokenFilterBase(AbstractBuilder<?> builder) {
         this.onlyLongestMatch = builder.onlyLongestMatch;
         this.wordList = ApiTypeHelper.unmodifiable(builder.wordList);
         this.wordListPath = builder.wordListPath;
-
     }
 
     /**
@@ -121,6 +129,7 @@ public final Boolean onlyLongestMatch() {
     /**
      * API name: {@code word_list}
      */
+    @Nonnull
     public final List<String> wordList() {
         return this.wordList;
     }
@@ -134,71 +143,63 @@ public final String wordListPath() {
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         super.serializeInternal(generator, mapper);
         if (this.hyphenationPatternsPath != null) {
             generator.writeKey("hyphenation_patterns_path");
             generator.write(this.hyphenationPatternsPath);
-
         }
+
         if (this.maxSubwordSize != null) {
             generator.writeKey("max_subword_size");
             generator.write(this.maxSubwordSize);
-
         }
+
         if (this.minSubwordSize != null) {
             generator.writeKey("min_subword_size");
             generator.write(this.minSubwordSize);
-
         }
+
         if (this.minWordSize != null) {
             generator.writeKey("min_word_size");
             generator.write(this.minWordSize);
-
         }
+
         if (this.onlyLongestMatch != null) {
             generator.writeKey("only_longest_match");
             generator.write(this.onlyLongestMatch);
-
         }
+
         if (ApiTypeHelper.isDefined(this.wordList)) {
             generator.writeKey("word_list");
             generator.writeStartArray();
             for (String item0 : this.wordList) {
                 generator.write(item0);
-
             }
             generator.writeEnd();
-
         }
+
         if (this.wordListPath != null) {
             generator.writeKey("word_list_path");
             generator.write(this.wordListPath);
-
         }
-
     }
 
+    // ---------------------------------------------------------------------------------------------
+
     protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends TokenFilterBase.AbstractBuilder<
         BuilderT> {
         @Nullable
         private String hyphenationPatternsPath;
-
         @Nullable
         private Integer maxSubwordSize;
-
         @Nullable
         private Integer minSubwordSize;
-
         @Nullable
         private Integer minWordSize;
-
         @Nullable
         private Boolean onlyLongestMatch;
-
         @Nullable
         private List<String> wordList;
-
         @Nullable
         private String wordListPath;
 
@@ -244,8 +245,10 @@ public final BuilderT onlyLongestMatch(@Nullable Boolean value) {
 
         /**
          * API name: {@code word_list}
+         *
          * <p>
          * Adds all elements of <code>list</code> to <code>wordList</code>.
+         * </p>
          */
         public final BuilderT wordList(List<String> list) {
             this.wordList = _listAddAll(this.wordList, list);
@@ -254,8 +257,10 @@ public final BuilderT wordList(List<String> list) {
 
         /**
          * API name: {@code word_list}
+         *
          * <p>
          * Adds one or more values to <code>wordList</code>.
+         * </p>
          */
         public final BuilderT wordList(String value, String... values) {
             this.wordList = _listAdd(this.wordList, value, values);
@@ -273,10 +278,11 @@ public final BuilderT wordListPath(@Nullable String value) {
     }
 
     // ---------------------------------------------------------------------------------------------
+
     protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupCompoundWordTokenFilterBaseDeserializer(
         ObjectDeserializer<BuilderT> op
     ) {
-        TokenFilterBase.setupTokenFilterBaseDeserializer(op);
+        setupTokenFilterBaseDeserializer(op);
         op.add(AbstractBuilder::hyphenationPatternsPath, JsonpDeserializer.stringDeserializer(), "hyphenation_patterns_path");
         op.add(AbstractBuilder::maxSubwordSize, JsonpDeserializer.integerDeserializer(), "max_subword_size");
         op.add(AbstractBuilder::minSubwordSize, JsonpDeserializer.integerDeserializer(), "min_subword_size");
@@ -284,7 +290,35 @@ protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupCompound
         op.add(AbstractBuilder::onlyLongestMatch, JsonpDeserializer.booleanDeserializer(), "only_longest_match");
         op.add(AbstractBuilder::wordList, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "word_list");
         op.add(AbstractBuilder::wordListPath, JsonpDeserializer.stringDeserializer(), "word_list_path");
+    }
 
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + Objects.hashCode(this.hyphenationPatternsPath);
+        result = 31 * result + Objects.hashCode(this.maxSubwordSize);
+        result = 31 * result + Objects.hashCode(this.minSubwordSize);
+        result = 31 * result + Objects.hashCode(this.minWordSize);
+        result = 31 * result + Objects.hashCode(this.onlyLongestMatch);
+        result = 31 * result + Objects.hashCode(this.wordList);
+        result = 31 * result + Objects.hashCode(this.wordListPath);
+        return result;
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        CompoundWordTokenFilterBase other = (CompoundWordTokenFilterBase) o;
+        return Objects.equals(this.hyphenationPatternsPath, other.hyphenationPatternsPath)
+            && Objects.equals(this.maxSubwordSize, other.maxSubwordSize)
+            && Objects.equals(this.minSubwordSize, other.minSubwordSize)
+            && Objects.equals(this.minWordSize, other.minWordSize)
+            && Objects.equals(this.onlyLongestMatch, other.onlyLongestMatch)
+            && Objects.equals(this.wordList, other.wordList)
+            && Objects.equals(this.wordListPath, other.wordListPath);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/ConditionTokenFilter.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/ConditionTokenFilter.java
similarity index 77%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/ConditionTokenFilter.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/ConditionTokenFilter.java
index 0f282f8a17..32f27f48a3 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/ConditionTokenFilter.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/ConditionTokenFilter.java
@@ -30,11 +30,17 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.analysis;
 
 import jakarta.json.stream.JsonGenerator;
 import java.util.List;
 import java.util.function.Function;
+import javax.annotation.Generated;
+import javax.annotation.Nonnull;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -47,27 +53,29 @@
 // typedef: _types.analysis.ConditionTokenFilter
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class ConditionTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
+
+    @Nonnull
     private final List<String> filter;
 
+    @Nonnull
     private final Script script;
 
     // ---------------------------------------------------------------------------------------------
 
     private ConditionTokenFilter(Builder builder) {
         super(builder);
-
         this.filter = ApiTypeHelper.unmodifiableRequired(builder.filter, this, "filter");
         this.script = ApiTypeHelper.requireNonNull(builder.script, this, "script");
-
     }
 
-    public static ConditionTokenFilter of(Function<Builder, ObjectBuilder<ConditionTokenFilter>> fn) {
+    public static ConditionTokenFilter of(Function<ConditionTokenFilter.Builder, ObjectBuilder<ConditionTokenFilter>> fn) {
         return fn.apply(new Builder()).build();
     }
 
     /**
-     * TokenFilterDefinition variant kind.
+     * {@link TokenFilterDefinition} variant kind.
      */
     @Override
     public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
@@ -77,6 +85,7 @@ public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
     /**
      * Required - API name: {@code filter}
      */
+    @Nonnull
     public final List<String> filter() {
         return this.filter;
     }
@@ -84,27 +93,23 @@ public final List<String> filter() {
     /**
      * Required - API name: {@code script}
      */
+    @Nonnull
     public final Script script() {
         return this.script;
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         generator.write("type", "condition");
         super.serializeInternal(generator, mapper);
-        if (ApiTypeHelper.isDefined(this.filter)) {
-            generator.writeKey("filter");
-            generator.writeStartArray();
-            for (String item0 : this.filter) {
-                generator.write(item0);
-
-            }
-            generator.writeEnd();
-
+        generator.writeKey("filter");
+        generator.writeStartArray();
+        for (String item0 : this.filter) {
+            generator.write(item0);
         }
+        generator.writeEnd();
+
         generator.writeKey("script");
         this.script.serialize(generator, mapper);
-
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -112,16 +117,16 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     /**
      * Builder for {@link ConditionTokenFilter}.
      */
-
     public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<ConditionTokenFilter> {
         private List<String> filter;
-
         private Script script;
 
         /**
          * Required - API name: {@code filter}
+         *
          * <p>
          * Adds all elements of <code>list</code> to <code>filter</code>.
+         * </p>
          */
         public final Builder filter(List<String> list) {
             this.filter = _listAddAll(this.filter, list);
@@ -130,8 +135,10 @@ public final Builder filter(List<String> list) {
 
         /**
          * Required - API name: {@code filter}
+         *
          * <p>
          * Adds one or more values to <code>filter</code>.
+         * </p>
          */
         public final Builder filter(String value, String... values) {
             this.filter = _listAdd(this.filter, value, values);
@@ -150,7 +157,7 @@ public final Builder script(Script value) {
          * Required - API name: {@code script}
          */
         public final Builder script(Function<Script.Builder, ObjectBuilder<Script>> fn) {
-            return this.script(fn.apply(new Script.Builder()).build());
+            return script(fn.apply(new Script.Builder()).build());
         }
 
         @Override
@@ -161,8 +168,7 @@ protected Builder self() {
         /**
          * Builds a {@link ConditionTokenFilter}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public ConditionTokenFilter build() {
             _checkSingleUse();
@@ -182,11 +188,29 @@ public ConditionTokenFilter build() {
     );
 
     protected static void setupConditionTokenFilterDeserializer(ObjectDeserializer<ConditionTokenFilter.Builder> op) {
-        TokenFilterBase.setupTokenFilterBaseDeserializer(op);
+        setupTokenFilterBaseDeserializer(op);
         op.add(Builder::filter, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "filter");
         op.add(Builder::script, Script._DESERIALIZER, "script");
 
         op.ignore("type");
     }
 
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + this.filter.hashCode();
+        result = 31 * result + this.script.hashCode();
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        ConditionTokenFilter other = (ConditionTokenFilter) o;
+        return this.filter.equals(other.filter) && this.script.equals(other.script);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/DelimitedPayloadEncoding.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/DelimitedPayloadEncoding.java
similarity index 84%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/DelimitedPayloadEncoding.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/DelimitedPayloadEncoding.java
index 545fe0e141..7ed03ff5ad 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/DelimitedPayloadEncoding.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/DelimitedPayloadEncoding.java
@@ -30,20 +30,26 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.analysis;
 
+import javax.annotation.Generated;
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
+// typedef: _types.analysis.DelimitedPayloadEncoding
+
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public enum DelimitedPayloadEncoding implements JsonEnum {
-    Int("int"),
-
     Float("float"),
 
     Identity("identity"),
 
-    ;
+    Int("int");
 
     private final String jsonValue;
 
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/DelimitedPayloadTokenFilter.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/DelimitedPayloadTokenFilter.java
similarity index 68%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/DelimitedPayloadTokenFilter.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/DelimitedPayloadTokenFilter.java
index 7f33d4cea0..6528fb0fbb 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/DelimitedPayloadTokenFilter.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/DelimitedPayloadTokenFilter.java
@@ -30,42 +30,52 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 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.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
-import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 
 // typedef: _types.analysis.DelimitedPayloadTokenFilter
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class DelimitedPayloadTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
+
+    @Nullable
     private final String delimiter;
 
+    @Nullable
     private final DelimitedPayloadEncoding encoding;
 
     // ---------------------------------------------------------------------------------------------
 
     private DelimitedPayloadTokenFilter(Builder builder) {
         super(builder);
-
-        this.delimiter = ApiTypeHelper.requireNonNull(builder.delimiter, this, "delimiter");
-        this.encoding = ApiTypeHelper.requireNonNull(builder.encoding, this, "encoding");
-
+        this.delimiter = builder.delimiter;
+        this.encoding = builder.encoding;
     }
 
-    public static DelimitedPayloadTokenFilter of(Function<Builder, ObjectBuilder<DelimitedPayloadTokenFilter>> fn) {
+    public static DelimitedPayloadTokenFilter of(
+        Function<DelimitedPayloadTokenFilter.Builder, ObjectBuilder<DelimitedPayloadTokenFilter>> fn
+    ) {
         return fn.apply(new Builder()).build();
     }
 
     /**
-     * TokenFilterDefinition variant kind.
+     * {@link TokenFilterDefinition} variant kind.
      */
     @Override
     public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
@@ -73,29 +83,33 @@ public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
     }
 
     /**
-     * Required - API name: {@code delimiter}
+     * API name: {@code delimiter}
      */
+    @Nullable
     public final String delimiter() {
         return this.delimiter;
     }
 
     /**
-     * Required - API name: {@code encoding}
+     * API name: {@code encoding}
      */
+    @Nullable
     public final DelimitedPayloadEncoding encoding() {
         return this.encoding;
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         generator.write("type", "delimited_payload");
         super.serializeInternal(generator, mapper);
-        generator.writeKey("delimiter");
-        generator.write(this.delimiter);
-
-        generator.writeKey("encoding");
-        this.encoding.serialize(generator, mapper);
+        if (this.delimiter != null) {
+            generator.writeKey("delimiter");
+            generator.write(this.delimiter);
+        }
 
+        if (this.encoding != null) {
+            generator.writeKey("encoding");
+            this.encoding.serialize(generator, mapper);
+        }
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -103,24 +117,24 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     /**
      * Builder for {@link DelimitedPayloadTokenFilter}.
      */
-
     public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<DelimitedPayloadTokenFilter> {
+        @Nullable
         private String delimiter;
-
+        @Nullable
         private DelimitedPayloadEncoding encoding;
 
         /**
-         * Required - API name: {@code delimiter}
+         * API name: {@code delimiter}
          */
-        public final Builder delimiter(String value) {
+        public final Builder delimiter(@Nullable String value) {
             this.delimiter = value;
             return this;
         }
 
         /**
-         * Required - API name: {@code encoding}
+         * API name: {@code encoding}
          */
-        public final Builder encoding(DelimitedPayloadEncoding value) {
+        public final Builder encoding(@Nullable DelimitedPayloadEncoding value) {
             this.encoding = value;
             return this;
         }
@@ -133,8 +147,7 @@ protected Builder self() {
         /**
          * Builds a {@link DelimitedPayloadTokenFilter}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public DelimitedPayloadTokenFilter build() {
             _checkSingleUse();
@@ -161,4 +174,22 @@ protected static void setupDelimitedPayloadTokenFilterDeserializer(ObjectDeseria
         op.ignore("type");
     }
 
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + Objects.hashCode(this.delimiter);
+        result = 31 * result + Objects.hashCode(this.encoding);
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        DelimitedPayloadTokenFilter other = (DelimitedPayloadTokenFilter) o;
+        return Objects.equals(this.delimiter, other.delimiter) && Objects.equals(this.encoding, other.encoding);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/DictionaryDecompounderTokenFilter.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/DictionaryDecompounderTokenFilter.java
similarity index 80%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/DictionaryDecompounderTokenFilter.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/DictionaryDecompounderTokenFilter.java
index 763ea7c919..ac742a25d1 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/DictionaryDecompounderTokenFilter.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/DictionaryDecompounderTokenFilter.java
@@ -30,10 +30,15 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.analysis;
 
 import jakarta.json.stream.JsonGenerator;
 import java.util.function.Function;
+import javax.annotation.Generated;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -44,20 +49,23 @@
 // typedef: _types.analysis.DictionaryDecompounderTokenFilter
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class DictionaryDecompounderTokenFilter extends CompoundWordTokenFilterBase implements TokenFilterDefinitionVariant {
+
     // ---------------------------------------------------------------------------------------------
 
     private DictionaryDecompounderTokenFilter(Builder builder) {
         super(builder);
-
     }
 
-    public static DictionaryDecompounderTokenFilter of(Function<Builder, ObjectBuilder<DictionaryDecompounderTokenFilter>> fn) {
+    public static DictionaryDecompounderTokenFilter of(
+        Function<DictionaryDecompounderTokenFilter.Builder, ObjectBuilder<DictionaryDecompounderTokenFilter>> fn
+    ) {
         return fn.apply(new Builder()).build();
     }
 
     /**
-     * TokenFilterDefinition variant kind.
+     * {@link TokenFilterDefinition} variant kind.
      */
     @Override
     public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
@@ -65,10 +73,8 @@ public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         generator.write("type", "dictionary_decompounder");
         super.serializeInternal(generator, mapper);
-
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -76,10 +82,10 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     /**
      * Builder for {@link DictionaryDecompounderTokenFilter}.
      */
-
     public static class Builder extends CompoundWordTokenFilterBase.AbstractBuilder<Builder>
         implements
             ObjectBuilder<DictionaryDecompounderTokenFilter> {
+
         @Override
         protected Builder self() {
             return this;
@@ -88,8 +94,7 @@ protected Builder self() {
         /**
          * Builds a {@link DictionaryDecompounderTokenFilter}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public DictionaryDecompounderTokenFilter build() {
             _checkSingleUse();
@@ -116,4 +121,19 @@ protected static void setupDictionaryDecompounderTokenFilterDeserializer(
         op.ignore("type");
     }
 
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        return true;
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/EdgeNGramSide.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/EdgeNGramSide.java
similarity index 83%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/EdgeNGramSide.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/EdgeNGramSide.java
index 893f6d4f12..53f6e27da9 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/EdgeNGramSide.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/EdgeNGramSide.java
@@ -30,18 +30,24 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.analysis;
 
+import javax.annotation.Generated;
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
+// typedef: _types.analysis.EdgeNGramSide
+
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public enum EdgeNGramSide implements JsonEnum {
-    Front("front"),
-
     Back("back"),
 
-    ;
+    Front("front");
 
     private final String jsonValue;
 
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/EdgeNGramTokenFilter.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/EdgeNGramTokenFilter.java
similarity index 70%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/EdgeNGramTokenFilter.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/EdgeNGramTokenFilter.java
index 1a81208441..8d375f817a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/EdgeNGramTokenFilter.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/EdgeNGramTokenFilter.java
@@ -30,51 +30,58 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 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.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
-import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 
 // typedef: _types.analysis.EdgeNGramTokenFilter
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class EdgeNGramTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
-    private final int maxGram;
 
-    private final int minGram;
+    @Nullable
+    private final Integer maxGram;
 
     @Nullable
-    private final EdgeNGramSide side;
+    private final Integer minGram;
 
     @Nullable
     private final Boolean preserveOriginal;
 
+    @Nullable
+    private final EdgeNGramSide side;
+
     // ---------------------------------------------------------------------------------------------
 
     private EdgeNGramTokenFilter(Builder builder) {
         super(builder);
-
-        this.maxGram = ApiTypeHelper.requireNonNull(builder.maxGram, this, "maxGram");
-        this.minGram = ApiTypeHelper.requireNonNull(builder.minGram, this, "minGram");
-        this.side = builder.side;
+        this.maxGram = builder.maxGram;
+        this.minGram = builder.minGram;
         this.preserveOriginal = builder.preserveOriginal;
-
+        this.side = builder.side;
     }
 
-    public static EdgeNGramTokenFilter of(Function<Builder, ObjectBuilder<EdgeNGramTokenFilter>> fn) {
+    public static EdgeNGramTokenFilter of(Function<EdgeNGramTokenFilter.Builder, ObjectBuilder<EdgeNGramTokenFilter>> fn) {
         return fn.apply(new Builder()).build();
     }
 
     /**
-     * TokenFilterDefinition variant kind.
+     * {@link TokenFilterDefinition} variant kind.
      */
     @Override
     public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
@@ -82,55 +89,59 @@ public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
     }
 
     /**
-     * Required - API name: {@code max_gram}
+     * API name: {@code max_gram}
      */
-    public final int maxGram() {
+    @Nullable
+    public final Integer maxGram() {
         return this.maxGram;
     }
 
     /**
-     * Required - API name: {@code min_gram}
+     * API name: {@code min_gram}
      */
-    public final int minGram() {
+    @Nullable
+    public final Integer minGram() {
         return this.minGram;
     }
 
     /**
-     * API name: {@code side}
+     * API name: {@code preserve_original}
      */
     @Nullable
-    public final EdgeNGramSide side() {
-        return this.side;
+    public final Boolean preserveOriginal() {
+        return this.preserveOriginal;
     }
 
     /**
-     * API name: {@code preserve_original}
+     * API name: {@code side}
      */
     @Nullable
-    public final Boolean preserveOriginal() {
-        return this.preserveOriginal;
+    public final EdgeNGramSide side() {
+        return this.side;
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         generator.write("type", "edge_ngram");
         super.serializeInternal(generator, mapper);
-        generator.writeKey("max_gram");
-        generator.write(this.maxGram);
-
-        generator.writeKey("min_gram");
-        generator.write(this.minGram);
+        if (this.maxGram != null) {
+            generator.writeKey("max_gram");
+            generator.write(this.maxGram);
+        }
 
-        if (this.side != null) {
-            generator.writeKey("side");
-            this.side.serialize(generator, mapper);
+        if (this.minGram != null) {
+            generator.writeKey("min_gram");
+            generator.write(this.minGram);
         }
+
         if (this.preserveOriginal != null) {
             generator.writeKey("preserve_original");
             generator.write(this.preserveOriginal);
-
         }
 
+        if (this.side != null) {
+            generator.writeKey("side");
+            this.side.serialize(generator, mapper);
+        }
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -138,47 +149,45 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     /**
      * Builder for {@link EdgeNGramTokenFilter}.
      */
-
     public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<EdgeNGramTokenFilter> {
+        @Nullable
         private Integer maxGram;
-
-        private Integer minGram;
-
         @Nullable
-        private EdgeNGramSide side;
-
+        private Integer minGram;
         @Nullable
         private Boolean preserveOriginal;
+        @Nullable
+        private EdgeNGramSide side;
 
         /**
-         * Required - API name: {@code max_gram}
+         * API name: {@code max_gram}
          */
-        public final Builder maxGram(int value) {
+        public final Builder maxGram(@Nullable Integer value) {
             this.maxGram = value;
             return this;
         }
 
         /**
-         * Required - API name: {@code min_gram}
+         * API name: {@code min_gram}
          */
-        public final Builder minGram(int value) {
+        public final Builder minGram(@Nullable Integer value) {
             this.minGram = value;
             return this;
         }
 
         /**
-         * API name: {@code side}
+         * API name: {@code preserve_original}
          */
-        public final Builder side(@Nullable EdgeNGramSide value) {
-            this.side = value;
+        public final Builder preserveOriginal(@Nullable Boolean value) {
+            this.preserveOriginal = value;
             return this;
         }
 
         /**
-         * API name: {@code preserve_original}
+         * API name: {@code side}
          */
-        public final Builder preserveOriginal(@Nullable Boolean value) {
-            this.preserveOriginal = value;
+        public final Builder side(@Nullable EdgeNGramSide value) {
+            this.side = value;
             return this;
         }
 
@@ -190,8 +199,7 @@ protected Builder self() {
         /**
          * Builds a {@link EdgeNGramTokenFilter}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public EdgeNGramTokenFilter build() {
             _checkSingleUse();
@@ -214,10 +222,33 @@ protected static void setupEdgeNGramTokenFilterDeserializer(ObjectDeserializer<E
         setupTokenFilterBaseDeserializer(op);
         op.add(Builder::maxGram, JsonpDeserializer.integerDeserializer(), "max_gram");
         op.add(Builder::minGram, JsonpDeserializer.integerDeserializer(), "min_gram");
-        op.add(Builder::side, EdgeNGramSide._DESERIALIZER, "side");
         op.add(Builder::preserveOriginal, JsonpDeserializer.booleanDeserializer(), "preserve_original");
+        op.add(Builder::side, EdgeNGramSide._DESERIALIZER, "side");
 
         op.ignore("type");
     }
 
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + Objects.hashCode(this.maxGram);
+        result = 31 * result + Objects.hashCode(this.minGram);
+        result = 31 * result + Objects.hashCode(this.preserveOriginal);
+        result = 31 * result + Objects.hashCode(this.side);
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        EdgeNGramTokenFilter other = (EdgeNGramTokenFilter) o;
+        return Objects.equals(this.maxGram, other.maxGram)
+            && Objects.equals(this.minGram, other.minGram)
+            && Objects.equals(this.preserveOriginal, other.preserveOriginal)
+            && Objects.equals(this.side, other.side);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/ElisionTokenFilter.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/ElisionTokenFilter.java
similarity index 63%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/ElisionTokenFilter.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/ElisionTokenFilter.java
index 01e27ae8e5..161210982e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/ElisionTokenFilter.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/ElisionTokenFilter.java
@@ -30,11 +30,19 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.analysis;
 
 import jakarta.json.stream.JsonGenerator;
 import java.util.List;
+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;
@@ -46,27 +54,33 @@
 // typedef: _types.analysis.ElisionTokenFilter
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class ElisionTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
+
+    @Nonnull
     private final List<String> articles;
 
-    private final boolean articlesCase;
+    @Nullable
+    private final Boolean articlesCase;
+
+    @Nullable
+    private final String articlesPath;
 
     // ---------------------------------------------------------------------------------------------
 
     private ElisionTokenFilter(Builder builder) {
         super(builder);
-
-        this.articles = ApiTypeHelper.unmodifiableRequired(builder.articles, this, "articles");
-        this.articlesCase = ApiTypeHelper.requireNonNull(builder.articlesCase, this, "articlesCase");
-
+        this.articles = ApiTypeHelper.unmodifiable(builder.articles);
+        this.articlesCase = builder.articlesCase;
+        this.articlesPath = builder.articlesPath;
     }
 
-    public static ElisionTokenFilter of(Function<Builder, ObjectBuilder<ElisionTokenFilter>> fn) {
+    public static ElisionTokenFilter of(Function<ElisionTokenFilter.Builder, ObjectBuilder<ElisionTokenFilter>> fn) {
         return fn.apply(new Builder()).build();
     }
 
     /**
-     * TokenFilterDefinition variant kind.
+     * {@link TokenFilterDefinition} variant kind.
      */
     @Override
     public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
@@ -74,21 +88,30 @@ public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
     }
 
     /**
-     * Required - API name: {@code articles}
+     * API name: {@code articles}
      */
+    @Nonnull
     public final List<String> articles() {
         return this.articles;
     }
 
     /**
-     * Required - API name: {@code articles_case}
+     * API name: {@code articles_case}
      */
-    public final boolean articlesCase() {
+    @Nullable
+    public final Boolean articlesCase() {
         return this.articlesCase;
     }
 
-    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    /**
+     * API name: {@code articles_path}
+     */
+    @Nullable
+    public final String articlesPath() {
+        return this.articlesPath;
+    }
 
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
         generator.write("type", "elision");
         super.serializeInternal(generator, mapper);
         if (ApiTypeHelper.isDefined(this.articles)) {
@@ -96,14 +119,19 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
             generator.writeStartArray();
             for (String item0 : this.articles) {
                 generator.write(item0);
-
             }
             generator.writeEnd();
+        }
 
+        if (this.articlesCase != null) {
+            generator.writeKey("articles_case");
+            generator.write(this.articlesCase);
         }
-        generator.writeKey("articles_case");
-        generator.write(this.articlesCase);
 
+        if (this.articlesPath != null) {
+            generator.writeKey("articles_path");
+            generator.write(this.articlesPath);
+        }
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -111,16 +139,20 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     /**
      * Builder for {@link ElisionTokenFilter}.
      */
-
     public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<ElisionTokenFilter> {
+        @Nullable
         private List<String> articles;
-
+        @Nullable
         private Boolean articlesCase;
+        @Nullable
+        private String articlesPath;
 
         /**
-         * Required - API name: {@code articles}
+         * API name: {@code articles}
+         *
          * <p>
          * Adds all elements of <code>list</code> to <code>articles</code>.
+         * </p>
          */
         public final Builder articles(List<String> list) {
             this.articles = _listAddAll(this.articles, list);
@@ -128,9 +160,11 @@ public final Builder articles(List<String> list) {
         }
 
         /**
-         * Required - API name: {@code articles}
+         * API name: {@code articles}
+         *
          * <p>
          * Adds one or more values to <code>articles</code>.
+         * </p>
          */
         public final Builder articles(String value, String... values) {
             this.articles = _listAdd(this.articles, value, values);
@@ -138,13 +172,21 @@ public final Builder articles(String value, String... values) {
         }
 
         /**
-         * Required - API name: {@code articles_case}
+         * API name: {@code articles_case}
          */
-        public final Builder articlesCase(boolean value) {
+        public final Builder articlesCase(@Nullable Boolean value) {
             this.articlesCase = value;
             return this;
         }
 
+        /**
+         * API name: {@code articles_path}
+         */
+        public final Builder articlesPath(@Nullable String value) {
+            this.articlesPath = value;
+            return this;
+        }
+
         @Override
         protected Builder self() {
             return this;
@@ -153,8 +195,7 @@ protected Builder self() {
         /**
          * Builds a {@link ElisionTokenFilter}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public ElisionTokenFilter build() {
             _checkSingleUse();
@@ -177,8 +218,30 @@ protected static void setupElisionTokenFilterDeserializer(ObjectDeserializer<Eli
         setupTokenFilterBaseDeserializer(op);
         op.add(Builder::articles, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "articles");
         op.add(Builder::articlesCase, JsonpDeserializer.booleanDeserializer(), "articles_case");
+        op.add(Builder::articlesPath, JsonpDeserializer.stringDeserializer(), "articles_path");
 
         op.ignore("type");
     }
 
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + Objects.hashCode(this.articles);
+        result = 31 * result + Objects.hashCode(this.articlesCase);
+        result = 31 * result + Objects.hashCode(this.articlesPath);
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        ElisionTokenFilter other = (ElisionTokenFilter) o;
+        return Objects.equals(this.articles, other.articles)
+            && Objects.equals(this.articlesCase, other.articlesCase)
+            && Objects.equals(this.articlesPath, other.articlesPath);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/FingerprintTokenFilter.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/FingerprintTokenFilter.java
similarity index 66%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/FingerprintTokenFilter.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/FingerprintTokenFilter.java
index 424ef79821..47608314cb 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/FingerprintTokenFilter.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/FingerprintTokenFilter.java
@@ -30,42 +30,50 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 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.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
-import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 
 // typedef: _types.analysis.FingerprintTokenFilter
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class FingerprintTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
-    private final int maxOutputSize;
 
+    @Nullable
+    private final Integer maxOutputSize;
+
+    @Nullable
     private final String separator;
 
     // ---------------------------------------------------------------------------------------------
 
     private FingerprintTokenFilter(Builder builder) {
         super(builder);
-
-        this.maxOutputSize = ApiTypeHelper.requireNonNull(builder.maxOutputSize, this, "maxOutputSize");
-        this.separator = ApiTypeHelper.requireNonNull(builder.separator, this, "separator");
-
+        this.maxOutputSize = builder.maxOutputSize;
+        this.separator = builder.separator;
     }
 
-    public static FingerprintTokenFilter of(Function<Builder, ObjectBuilder<FingerprintTokenFilter>> fn) {
+    public static FingerprintTokenFilter of(Function<FingerprintTokenFilter.Builder, ObjectBuilder<FingerprintTokenFilter>> fn) {
         return fn.apply(new Builder()).build();
     }
 
     /**
-     * TokenFilterDefinition variant kind.
+     * {@link TokenFilterDefinition} variant kind.
      */
     @Override
     public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
@@ -73,29 +81,33 @@ public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
     }
 
     /**
-     * Required - API name: {@code max_output_size}
+     * API name: {@code max_output_size}
      */
-    public final int maxOutputSize() {
+    @Nullable
+    public final Integer maxOutputSize() {
         return this.maxOutputSize;
     }
 
     /**
-     * Required - API name: {@code separator}
+     * API name: {@code separator}
      */
+    @Nullable
     public final String separator() {
         return this.separator;
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         generator.write("type", "fingerprint");
         super.serializeInternal(generator, mapper);
-        generator.writeKey("max_output_size");
-        generator.write(this.maxOutputSize);
-
-        generator.writeKey("separator");
-        generator.write(this.separator);
+        if (this.maxOutputSize != null) {
+            generator.writeKey("max_output_size");
+            generator.write(this.maxOutputSize);
+        }
 
+        if (this.separator != null) {
+            generator.writeKey("separator");
+            generator.write(this.separator);
+        }
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -103,24 +115,24 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     /**
      * Builder for {@link FingerprintTokenFilter}.
      */
-
     public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<FingerprintTokenFilter> {
+        @Nullable
         private Integer maxOutputSize;
-
+        @Nullable
         private String separator;
 
         /**
-         * Required - API name: {@code max_output_size}
+         * API name: {@code max_output_size}
          */
-        public final Builder maxOutputSize(int value) {
+        public final Builder maxOutputSize(@Nullable Integer value) {
             this.maxOutputSize = value;
             return this;
         }
 
         /**
-         * Required - API name: {@code separator}
+         * API name: {@code separator}
          */
-        public final Builder separator(String value) {
+        public final Builder separator(@Nullable String value) {
             this.separator = value;
             return this;
         }
@@ -133,8 +145,7 @@ protected Builder self() {
         /**
          * Builds a {@link FingerprintTokenFilter}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public FingerprintTokenFilter build() {
             _checkSingleUse();
@@ -161,4 +172,22 @@ protected static void setupFingerprintTokenFilterDeserializer(ObjectDeserializer
         op.ignore("type");
     }
 
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + Objects.hashCode(this.maxOutputSize);
+        result = 31 * result + Objects.hashCode(this.separator);
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        FingerprintTokenFilter other = (FingerprintTokenFilter) o;
+        return Objects.equals(this.maxOutputSize, other.maxOutputSize) && Objects.equals(this.separator, other.separator);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/HunspellTokenFilter.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/HunspellTokenFilter.java
similarity index 64%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/HunspellTokenFilter.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/HunspellTokenFilter.java
index 4f6330bb30..8854583339 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/HunspellTokenFilter.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/HunspellTokenFilter.java
@@ -30,10 +30,18 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 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;
@@ -45,33 +53,37 @@
 // typedef: _types.analysis.HunspellTokenFilter
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class HunspellTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
-    private final boolean dedup;
 
+    @Nullable
+    private final Boolean dedup;
+
+    @Nullable
     private final String dictionary;
 
+    @Nonnull
     private final String locale;
 
-    private final boolean longestOnly;
+    @Nullable
+    private final Boolean longestOnly;
 
     // ---------------------------------------------------------------------------------------------
 
     private HunspellTokenFilter(Builder builder) {
         super(builder);
-
-        this.dedup = ApiTypeHelper.requireNonNull(builder.dedup, this, "dedup");
-        this.dictionary = ApiTypeHelper.requireNonNull(builder.dictionary, this, "dictionary");
+        this.dedup = builder.dedup;
+        this.dictionary = builder.dictionary;
         this.locale = ApiTypeHelper.requireNonNull(builder.locale, this, "locale");
-        this.longestOnly = ApiTypeHelper.requireNonNull(builder.longestOnly, this, "longestOnly");
-
+        this.longestOnly = builder.longestOnly;
     }
 
-    public static HunspellTokenFilter of(Function<Builder, ObjectBuilder<HunspellTokenFilter>> fn) {
+    public static HunspellTokenFilter of(Function<HunspellTokenFilter.Builder, ObjectBuilder<HunspellTokenFilter>> fn) {
         return fn.apply(new Builder()).build();
     }
 
     /**
-     * TokenFilterDefinition variant kind.
+     * {@link TokenFilterDefinition} variant kind.
      */
     @Override
     public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
@@ -79,15 +91,17 @@ public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
     }
 
     /**
-     * Required - API name: {@code dedup}
+     * API name: {@code dedup}
      */
-    public final boolean dedup() {
+    @Nullable
+    public final Boolean dedup() {
         return this.dedup;
     }
 
     /**
-     * Required - API name: {@code dictionary}
+     * API name: {@code dictionary}
      */
+    @Nullable
     public final String dictionary() {
         return this.dictionary;
     }
@@ -95,33 +109,39 @@ public final String dictionary() {
     /**
      * Required - API name: {@code locale}
      */
+    @Nonnull
     public final String locale() {
         return this.locale;
     }
 
     /**
-     * Required - API name: {@code longest_only}
+     * API name: {@code longest_only}
      */
-    public final boolean longestOnly() {
+    @Nullable
+    public final Boolean longestOnly() {
         return this.longestOnly;
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         generator.write("type", "hunspell");
         super.serializeInternal(generator, mapper);
-        generator.writeKey("dedup");
-        generator.write(this.dedup);
+        if (this.dedup != null) {
+            generator.writeKey("dedup");
+            generator.write(this.dedup);
+        }
 
-        generator.writeKey("dictionary");
-        generator.write(this.dictionary);
+        if (this.dictionary != null) {
+            generator.writeKey("dictionary");
+            generator.write(this.dictionary);
+        }
 
         generator.writeKey("locale");
         generator.write(this.locale);
 
-        generator.writeKey("longest_only");
-        generator.write(this.longestOnly);
-
+        if (this.longestOnly != null) {
+            generator.writeKey("longest_only");
+            generator.write(this.longestOnly);
+        }
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -129,28 +149,27 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     /**
      * Builder for {@link HunspellTokenFilter}.
      */
-
     public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<HunspellTokenFilter> {
+        @Nullable
         private Boolean dedup;
-
+        @Nullable
         private String dictionary;
-
         private String locale;
-
+        @Nullable
         private Boolean longestOnly;
 
         /**
-         * Required - API name: {@code dedup}
+         * API name: {@code dedup}
          */
-        public final Builder dedup(boolean value) {
+        public final Builder dedup(@Nullable Boolean value) {
             this.dedup = value;
             return this;
         }
 
         /**
-         * Required - API name: {@code dictionary}
+         * API name: {@code dictionary}
          */
-        public final Builder dictionary(String value) {
+        public final Builder dictionary(@Nullable String value) {
             this.dictionary = value;
             return this;
         }
@@ -164,9 +183,9 @@ public final Builder locale(String value) {
         }
 
         /**
-         * Required - API name: {@code longest_only}
+         * API name: {@code longest_only}
          */
-        public final Builder longestOnly(boolean value) {
+        public final Builder longestOnly(@Nullable Boolean value) {
             this.longestOnly = value;
             return this;
         }
@@ -179,8 +198,7 @@ protected Builder self() {
         /**
          * Builds a {@link HunspellTokenFilter}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public HunspellTokenFilter build() {
             _checkSingleUse();
@@ -209,4 +227,27 @@ protected static void setupHunspellTokenFilterDeserializer(ObjectDeserializer<Hu
         op.ignore("type");
     }
 
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + Objects.hashCode(this.dedup);
+        result = 31 * result + Objects.hashCode(this.dictionary);
+        result = 31 * result + this.locale.hashCode();
+        result = 31 * result + Objects.hashCode(this.longestOnly);
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        HunspellTokenFilter other = (HunspellTokenFilter) o;
+        return Objects.equals(this.dedup, other.dedup)
+            && Objects.equals(this.dictionary, other.dictionary)
+            && this.locale.equals(other.locale)
+            && Objects.equals(this.longestOnly, other.longestOnly);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/HyphenationDecompounderTokenFilter.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/HyphenationDecompounderTokenFilter.java
similarity index 80%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/HyphenationDecompounderTokenFilter.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/HyphenationDecompounderTokenFilter.java
index 4b996643aa..5089977b5c 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/HyphenationDecompounderTokenFilter.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/HyphenationDecompounderTokenFilter.java
@@ -30,10 +30,15 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.analysis;
 
 import jakarta.json.stream.JsonGenerator;
 import java.util.function.Function;
+import javax.annotation.Generated;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -44,20 +49,23 @@
 // typedef: _types.analysis.HyphenationDecompounderTokenFilter
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class HyphenationDecompounderTokenFilter extends CompoundWordTokenFilterBase implements TokenFilterDefinitionVariant {
+
     // ---------------------------------------------------------------------------------------------
 
     private HyphenationDecompounderTokenFilter(Builder builder) {
         super(builder);
-
     }
 
-    public static HyphenationDecompounderTokenFilter of(Function<Builder, ObjectBuilder<HyphenationDecompounderTokenFilter>> fn) {
+    public static HyphenationDecompounderTokenFilter of(
+        Function<HyphenationDecompounderTokenFilter.Builder, ObjectBuilder<HyphenationDecompounderTokenFilter>> fn
+    ) {
         return fn.apply(new Builder()).build();
     }
 
     /**
-     * TokenFilterDefinition variant kind.
+     * {@link TokenFilterDefinition} variant kind.
      */
     @Override
     public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
@@ -65,10 +73,8 @@ public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         generator.write("type", "hyphenation_decompounder");
         super.serializeInternal(generator, mapper);
-
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -76,10 +82,10 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     /**
      * Builder for {@link HyphenationDecompounderTokenFilter}.
      */
-
     public static class Builder extends CompoundWordTokenFilterBase.AbstractBuilder<Builder>
         implements
             ObjectBuilder<HyphenationDecompounderTokenFilter> {
+
         @Override
         protected Builder self() {
             return this;
@@ -88,8 +94,7 @@ protected Builder self() {
         /**
          * Builds a {@link HyphenationDecompounderTokenFilter}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public HyphenationDecompounderTokenFilter build() {
             _checkSingleUse();
@@ -116,4 +121,19 @@ protected static void setupHyphenationDecompounderTokenFilterDeserializer(
         op.ignore("type");
     }
 
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        return true;
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuCollationAlternate.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/IcuCollationAlternate.java
similarity index 83%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuCollationAlternate.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/IcuCollationAlternate.java
index 21f8aa37a8..6adf9af17d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuCollationAlternate.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/IcuCollationAlternate.java
@@ -30,18 +30,24 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.analysis;
 
+import javax.annotation.Generated;
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
+// typedef: _types.analysis.IcuCollationAlternate
+
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public enum IcuCollationAlternate implements JsonEnum {
-    Shifted("shifted"),
-
     NonIgnorable("non-ignorable"),
 
-    ;
+    Shifted("shifted");
 
     private final String jsonValue;
 
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuCollationCaseFirst.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/IcuCollationCaseFirst.java
similarity index 83%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuCollationCaseFirst.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/IcuCollationCaseFirst.java
index ed01016a18..02775c9aa7 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuCollationCaseFirst.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/IcuCollationCaseFirst.java
@@ -30,18 +30,24 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.analysis;
 
+import javax.annotation.Generated;
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
+// typedef: _types.analysis.IcuCollationCaseFirst
+
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public enum IcuCollationCaseFirst implements JsonEnum {
     Lower("lower"),
 
-    Upper("upper"),
-
-    ;
+    Upper("upper");
 
     private final String jsonValue;
 
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuCollationDecomposition.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/IcuCollationDecomposition.java
similarity index 82%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuCollationDecomposition.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/IcuCollationDecomposition.java
index a6b5e0cfc4..44395d6ea4 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuCollationDecomposition.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/IcuCollationDecomposition.java
@@ -30,18 +30,24 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.analysis;
 
+import javax.annotation.Generated;
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
+// typedef: _types.analysis.IcuCollationDecomposition
+
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public enum IcuCollationDecomposition implements JsonEnum {
-    No("no"),
-
-    Identical("identical"),
+    Canonical("canonical"),
 
-    ;
+    No("no");
 
     private final String jsonValue;
 
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuCollationStrength.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/IcuCollationStrength.java
similarity index 84%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuCollationStrength.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/IcuCollationStrength.java
index bca73489cd..c9e6e1b61b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuCollationStrength.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/IcuCollationStrength.java
@@ -30,24 +30,30 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.analysis;
 
+import javax.annotation.Generated;
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
+// typedef: _types.analysis.IcuCollationStrength
+
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public enum IcuCollationStrength implements JsonEnum {
-    Primary("primary"),
-
-    Secondary("secondary"),
+    Identical("identical"),
 
-    Tertiary("tertiary"),
+    Primary("primary"),
 
     Quaternary("quaternary"),
 
-    Identical("identical"),
+    Secondary("secondary"),
 
-    ;
+    Tertiary("tertiary");
 
     private final String jsonValue;
 
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/IcuCollationTokenFilter.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/IcuCollationTokenFilter.java
new file mode 100644
index 0000000000..f9a1668f35
--- /dev/null
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/IcuCollationTokenFilter.java
@@ -0,0 +1,494 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
+
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/*
+ * Modifications Copyright OpenSearch Contributors. See
+ * GitHub history for details.
+ */
+
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
+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.Nullable;
+import org.opensearch.client.json.JsonpDeserializable;
+import org.opensearch.client.json.JsonpDeserializer;
+import org.opensearch.client.json.JsonpMapper;
+import org.opensearch.client.json.ObjectBuilderDeserializer;
+import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.util.ObjectBuilder;
+
+// typedef: _types.analysis.IcuCollationTokenFilter
+
+@JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
+public class IcuCollationTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
+
+    @Nullable
+    private final IcuCollationAlternate alternate;
+
+    @Nullable
+    private final IcuCollationCaseFirst caseFirst;
+
+    @Nullable
+    private final Boolean caseLevel;
+
+    @Nullable
+    private final String country;
+
+    @Nullable
+    private final IcuCollationDecomposition decomposition;
+
+    @Nullable
+    private final Boolean hiraganaQuaternaryMode;
+
+    @Nullable
+    private final String language;
+
+    @Nullable
+    private final Boolean numeric;
+
+    @Nullable
+    private final String rules;
+
+    @Nullable
+    private final IcuCollationStrength strength;
+
+    @Nullable
+    private final String variableTop;
+
+    @Nullable
+    private final String variant;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private IcuCollationTokenFilter(Builder builder) {
+        super(builder);
+        this.alternate = builder.alternate;
+        this.caseFirst = builder.caseFirst;
+        this.caseLevel = builder.caseLevel;
+        this.country = builder.country;
+        this.decomposition = builder.decomposition;
+        this.hiraganaQuaternaryMode = builder.hiraganaQuaternaryMode;
+        this.language = builder.language;
+        this.numeric = builder.numeric;
+        this.rules = builder.rules;
+        this.strength = builder.strength;
+        this.variableTop = builder.variableTop;
+        this.variant = builder.variant;
+    }
+
+    public static IcuCollationTokenFilter of(Function<IcuCollationTokenFilter.Builder, ObjectBuilder<IcuCollationTokenFilter>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * {@link TokenFilterDefinition} variant kind.
+     */
+    @Override
+    public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
+        return TokenFilterDefinition.Kind.IcuCollation;
+    }
+
+    /**
+     * API name: {@code alternate}
+     */
+    @Nullable
+    public final IcuCollationAlternate alternate() {
+        return this.alternate;
+    }
+
+    /**
+     * API name: {@code caseFirst}
+     */
+    @Nullable
+    public final IcuCollationCaseFirst caseFirst() {
+        return this.caseFirst;
+    }
+
+    /**
+     * API name: {@code caseLevel}
+     */
+    @Nullable
+    public final Boolean caseLevel() {
+        return this.caseLevel;
+    }
+
+    /**
+     * API name: {@code country}
+     */
+    @Nullable
+    public final String country() {
+        return this.country;
+    }
+
+    /**
+     * API name: {@code decomposition}
+     */
+    @Nullable
+    public final IcuCollationDecomposition decomposition() {
+        return this.decomposition;
+    }
+
+    /**
+     * API name: {@code hiraganaQuaternaryMode}
+     */
+    @Nullable
+    public final Boolean hiraganaQuaternaryMode() {
+        return this.hiraganaQuaternaryMode;
+    }
+
+    /**
+     * API name: {@code language}
+     */
+    @Nullable
+    public final String language() {
+        return this.language;
+    }
+
+    /**
+     * API name: {@code numeric}
+     */
+    @Nullable
+    public final Boolean numeric() {
+        return this.numeric;
+    }
+
+    /**
+     * API name: {@code rules}
+     */
+    @Nullable
+    public final String rules() {
+        return this.rules;
+    }
+
+    /**
+     * API name: {@code strength}
+     */
+    @Nullable
+    public final IcuCollationStrength strength() {
+        return this.strength;
+    }
+
+    /**
+     * API name: {@code variableTop}
+     */
+    @Nullable
+    public final String variableTop() {
+        return this.variableTop;
+    }
+
+    /**
+     * API name: {@code variant}
+     */
+    @Nullable
+    public final String variant() {
+        return this.variant;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+        generator.write("type", "icu_collation");
+        super.serializeInternal(generator, mapper);
+        if (this.alternate != null) {
+            generator.writeKey("alternate");
+            this.alternate.serialize(generator, mapper);
+        }
+
+        if (this.caseFirst != null) {
+            generator.writeKey("caseFirst");
+            this.caseFirst.serialize(generator, mapper);
+        }
+
+        if (this.caseLevel != null) {
+            generator.writeKey("caseLevel");
+            generator.write(this.caseLevel);
+        }
+
+        if (this.country != null) {
+            generator.writeKey("country");
+            generator.write(this.country);
+        }
+
+        if (this.decomposition != null) {
+            generator.writeKey("decomposition");
+            this.decomposition.serialize(generator, mapper);
+        }
+
+        if (this.hiraganaQuaternaryMode != null) {
+            generator.writeKey("hiraganaQuaternaryMode");
+            generator.write(this.hiraganaQuaternaryMode);
+        }
+
+        if (this.language != null) {
+            generator.writeKey("language");
+            generator.write(this.language);
+        }
+
+        if (this.numeric != null) {
+            generator.writeKey("numeric");
+            generator.write(this.numeric);
+        }
+
+        if (this.rules != null) {
+            generator.writeKey("rules");
+            generator.write(this.rules);
+        }
+
+        if (this.strength != null) {
+            generator.writeKey("strength");
+            this.strength.serialize(generator, mapper);
+        }
+
+        if (this.variableTop != null) {
+            generator.writeKey("variableTop");
+            generator.write(this.variableTop);
+        }
+
+        if (this.variant != null) {
+            generator.writeKey("variant");
+            generator.write(this.variant);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link IcuCollationTokenFilter}.
+     */
+    public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<IcuCollationTokenFilter> {
+        @Nullable
+        private IcuCollationAlternate alternate;
+        @Nullable
+        private IcuCollationCaseFirst caseFirst;
+        @Nullable
+        private Boolean caseLevel;
+        @Nullable
+        private String country;
+        @Nullable
+        private IcuCollationDecomposition decomposition;
+        @Nullable
+        private Boolean hiraganaQuaternaryMode;
+        @Nullable
+        private String language;
+        @Nullable
+        private Boolean numeric;
+        @Nullable
+        private String rules;
+        @Nullable
+        private IcuCollationStrength strength;
+        @Nullable
+        private String variableTop;
+        @Nullable
+        private String variant;
+
+        /**
+         * API name: {@code alternate}
+         */
+        public final Builder alternate(@Nullable IcuCollationAlternate value) {
+            this.alternate = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code caseFirst}
+         */
+        public final Builder caseFirst(@Nullable IcuCollationCaseFirst value) {
+            this.caseFirst = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code caseLevel}
+         */
+        public final Builder caseLevel(@Nullable Boolean value) {
+            this.caseLevel = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code country}
+         */
+        public final Builder country(@Nullable String value) {
+            this.country = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code decomposition}
+         */
+        public final Builder decomposition(@Nullable IcuCollationDecomposition value) {
+            this.decomposition = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code hiraganaQuaternaryMode}
+         */
+        public final Builder hiraganaQuaternaryMode(@Nullable Boolean value) {
+            this.hiraganaQuaternaryMode = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code language}
+         */
+        public final Builder language(@Nullable String value) {
+            this.language = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code numeric}
+         */
+        public final Builder numeric(@Nullable Boolean value) {
+            this.numeric = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code rules}
+         */
+        public final Builder rules(@Nullable String value) {
+            this.rules = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code strength}
+         */
+        public final Builder strength(@Nullable IcuCollationStrength value) {
+            this.strength = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code variableTop}
+         */
+        public final Builder variableTop(@Nullable String value) {
+            this.variableTop = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code variant}
+         */
+        public final Builder variant(@Nullable String value) {
+            this.variant = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link IcuCollationTokenFilter}.
+         *
+         * @throws NullPointerException if some of the required fields are null.
+         */
+        public IcuCollationTokenFilter build() {
+            _checkSingleUse();
+
+            return new IcuCollationTokenFilter(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link IcuCollationTokenFilter}
+     */
+    public static final JsonpDeserializer<IcuCollationTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        IcuCollationTokenFilter::setupIcuCollationTokenFilterDeserializer
+    );
+
+    protected static void setupIcuCollationTokenFilterDeserializer(ObjectDeserializer<IcuCollationTokenFilter.Builder> op) {
+        setupTokenFilterBaseDeserializer(op);
+        op.add(Builder::alternate, IcuCollationAlternate._DESERIALIZER, "alternate");
+        op.add(Builder::caseFirst, IcuCollationCaseFirst._DESERIALIZER, "caseFirst");
+        op.add(Builder::caseLevel, JsonpDeserializer.booleanDeserializer(), "caseLevel");
+        op.add(Builder::country, JsonpDeserializer.stringDeserializer(), "country");
+        op.add(Builder::decomposition, IcuCollationDecomposition._DESERIALIZER, "decomposition");
+        op.add(Builder::hiraganaQuaternaryMode, JsonpDeserializer.booleanDeserializer(), "hiraganaQuaternaryMode");
+        op.add(Builder::language, JsonpDeserializer.stringDeserializer(), "language");
+        op.add(Builder::numeric, JsonpDeserializer.booleanDeserializer(), "numeric");
+        op.add(Builder::rules, JsonpDeserializer.stringDeserializer(), "rules");
+        op.add(Builder::strength, IcuCollationStrength._DESERIALIZER, "strength");
+        op.add(Builder::variableTop, JsonpDeserializer.stringDeserializer(), "variableTop");
+        op.add(Builder::variant, JsonpDeserializer.stringDeserializer(), "variant");
+
+        op.ignore("type");
+    }
+
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + Objects.hashCode(this.alternate);
+        result = 31 * result + Objects.hashCode(this.caseFirst);
+        result = 31 * result + Objects.hashCode(this.caseLevel);
+        result = 31 * result + Objects.hashCode(this.country);
+        result = 31 * result + Objects.hashCode(this.decomposition);
+        result = 31 * result + Objects.hashCode(this.hiraganaQuaternaryMode);
+        result = 31 * result + Objects.hashCode(this.language);
+        result = 31 * result + Objects.hashCode(this.numeric);
+        result = 31 * result + Objects.hashCode(this.rules);
+        result = 31 * result + Objects.hashCode(this.strength);
+        result = 31 * result + Objects.hashCode(this.variableTop);
+        result = 31 * result + Objects.hashCode(this.variant);
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        IcuCollationTokenFilter other = (IcuCollationTokenFilter) o;
+        return Objects.equals(this.alternate, other.alternate)
+            && Objects.equals(this.caseFirst, other.caseFirst)
+            && Objects.equals(this.caseLevel, other.caseLevel)
+            && Objects.equals(this.country, other.country)
+            && Objects.equals(this.decomposition, other.decomposition)
+            && Objects.equals(this.hiraganaQuaternaryMode, other.hiraganaQuaternaryMode)
+            && Objects.equals(this.language, other.language)
+            && Objects.equals(this.numeric, other.numeric)
+            && Objects.equals(this.rules, other.rules)
+            && Objects.equals(this.strength, other.strength)
+            && Objects.equals(this.variableTop, other.variableTop)
+            && Objects.equals(this.variant, other.variant);
+    }
+}
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuFoldingTokenFilter.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/IcuFoldingTokenFilter.java
similarity index 78%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuFoldingTokenFilter.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/IcuFoldingTokenFilter.java
index 92bf1cb336..e68308484a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuFoldingTokenFilter.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/IcuFoldingTokenFilter.java
@@ -30,10 +30,16 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.analysis;
 
 import jakarta.json.stream.JsonGenerator;
 import java.util.function.Function;
+import javax.annotation.Generated;
+import javax.annotation.Nonnull;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -45,24 +51,25 @@
 // typedef: _types.analysis.IcuFoldingTokenFilter
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class IcuFoldingTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
+
+    @Nonnull
     private final String unicodeSetFilter;
 
     // ---------------------------------------------------------------------------------------------
 
     private IcuFoldingTokenFilter(Builder builder) {
         super(builder);
-
         this.unicodeSetFilter = ApiTypeHelper.requireNonNull(builder.unicodeSetFilter, this, "unicodeSetFilter");
-
     }
 
-    public static IcuFoldingTokenFilter of(Function<Builder, ObjectBuilder<IcuFoldingTokenFilter>> fn) {
+    public static IcuFoldingTokenFilter of(Function<IcuFoldingTokenFilter.Builder, ObjectBuilder<IcuFoldingTokenFilter>> fn) {
         return fn.apply(new Builder()).build();
     }
 
     /**
-     * TokenFilterDefinition variant kind.
+     * {@link TokenFilterDefinition} variant kind.
      */
     @Override
     public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
@@ -72,17 +79,16 @@ public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
     /**
      * Required - API name: {@code unicode_set_filter}
      */
+    @Nonnull
     public final String unicodeSetFilter() {
         return this.unicodeSetFilter;
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         generator.write("type", "icu_folding");
         super.serializeInternal(generator, mapper);
         generator.writeKey("unicode_set_filter");
         generator.write(this.unicodeSetFilter);
-
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -90,7 +96,6 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     /**
      * Builder for {@link IcuFoldingTokenFilter}.
      */
-
     public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<IcuFoldingTokenFilter> {
         private String unicodeSetFilter;
 
@@ -110,8 +115,7 @@ protected Builder self() {
         /**
          * Builds a {@link IcuFoldingTokenFilter}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public IcuFoldingTokenFilter build() {
             _checkSingleUse();
@@ -131,10 +135,27 @@ public IcuFoldingTokenFilter build() {
     );
 
     protected static void setupIcuFoldingTokenFilterDeserializer(ObjectDeserializer<IcuFoldingTokenFilter.Builder> op) {
-        TokenFilterBase.setupTokenFilterBaseDeserializer(op);
+        setupTokenFilterBaseDeserializer(op);
         op.add(Builder::unicodeSetFilter, JsonpDeserializer.stringDeserializer(), "unicode_set_filter");
 
         op.ignore("type");
     }
 
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + this.unicodeSetFilter.hashCode();
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        IcuFoldingTokenFilter other = (IcuFoldingTokenFilter) o;
+        return this.unicodeSetFilter.equals(other.unicodeSetFilter);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuNormalizationTokenFilter.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/IcuNormalizationTokenFilter.java
similarity index 78%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuNormalizationTokenFilter.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/IcuNormalizationTokenFilter.java
index 89ecf236dc..c9efd56902 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuNormalizationTokenFilter.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/IcuNormalizationTokenFilter.java
@@ -30,10 +30,16 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.analysis;
 
 import jakarta.json.stream.JsonGenerator;
 import java.util.function.Function;
+import javax.annotation.Generated;
+import javax.annotation.Nonnull;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -45,24 +51,27 @@
 // typedef: _types.analysis.IcuNormalizationTokenFilter
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class IcuNormalizationTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
+
+    @Nonnull
     private final IcuNormalizationType name;
 
     // ---------------------------------------------------------------------------------------------
 
     private IcuNormalizationTokenFilter(Builder builder) {
         super(builder);
-
         this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
-
     }
 
-    public static IcuNormalizationTokenFilter of(Function<Builder, ObjectBuilder<IcuNormalizationTokenFilter>> fn) {
+    public static IcuNormalizationTokenFilter of(
+        Function<IcuNormalizationTokenFilter.Builder, ObjectBuilder<IcuNormalizationTokenFilter>> fn
+    ) {
         return fn.apply(new Builder()).build();
     }
 
     /**
-     * TokenFilterDefinition variant kind.
+     * {@link TokenFilterDefinition} variant kind.
      */
     @Override
     public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
@@ -72,17 +81,16 @@ public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
     /**
      * Required - API name: {@code name}
      */
+    @Nonnull
     public final IcuNormalizationType name() {
         return this.name;
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         generator.write("type", "icu_normalizer");
         super.serializeInternal(generator, mapper);
         generator.writeKey("name");
         this.name.serialize(generator, mapper);
-
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -90,7 +98,6 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     /**
      * Builder for {@link IcuNormalizationTokenFilter}.
      */
-
     public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<IcuNormalizationTokenFilter> {
         private IcuNormalizationType name;
 
@@ -110,8 +117,7 @@ protected Builder self() {
         /**
          * Builds a {@link IcuNormalizationTokenFilter}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public IcuNormalizationTokenFilter build() {
             _checkSingleUse();
@@ -131,10 +137,27 @@ public IcuNormalizationTokenFilter build() {
     );
 
     protected static void setupIcuNormalizationTokenFilterDeserializer(ObjectDeserializer<IcuNormalizationTokenFilter.Builder> op) {
-        TokenFilterBase.setupTokenFilterBaseDeserializer(op);
+        setupTokenFilterBaseDeserializer(op);
         op.add(Builder::name, IcuNormalizationType._DESERIALIZER, "name");
 
         op.ignore("type");
     }
 
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + this.name.hashCode();
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        IcuNormalizationTokenFilter other = (IcuNormalizationTokenFilter) o;
+        return this.name.equals(other.name);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuNormalizationType.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/IcuNormalizationType.java
similarity index 83%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuNormalizationType.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/IcuNormalizationType.java
index 71d6b496f8..22b7cc7e00 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuNormalizationType.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/IcuNormalizationType.java
@@ -30,20 +30,26 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.analysis;
 
+import javax.annotation.Generated;
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
+// typedef: _types.analysis.IcuNormalizationType
+
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public enum IcuNormalizationType implements JsonEnum {
     Nfc("nfc"),
 
     Nfkc("nfkc"),
 
-    NfkcCf("nfkc_cf"),
-
-    ;
+    NfkcCf("nfkc_cf");
 
     private final String jsonValue;
 
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuTokenizer.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/IcuTokenizer.java
similarity index 77%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuTokenizer.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/IcuTokenizer.java
index 17bdf812f4..898277aa83 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuTokenizer.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/IcuTokenizer.java
@@ -30,10 +30,16 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.analysis;
 
 import jakarta.json.stream.JsonGenerator;
 import java.util.function.Function;
+import javax.annotation.Generated;
+import javax.annotation.Nonnull;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -45,52 +51,52 @@
 // typedef: _types.analysis.IcuTokenizer
 
 @JsonpDeserializable
-public class IcuTokenizer extends TokenizerBase implements TokenizerDefinitionVariant, TokenFilterDefinitionVariant {
+@Generated("org.opensearch.client.codegen.CodeGenerator")
+public class IcuTokenizer extends TokenizerBase implements TokenFilterDefinitionVariant, TokenizerDefinitionVariant {
+
+    @Nonnull
     private final String ruleFiles;
 
     // ---------------------------------------------------------------------------------------------
 
     private IcuTokenizer(Builder builder) {
         super(builder);
-
         this.ruleFiles = ApiTypeHelper.requireNonNull(builder.ruleFiles, this, "ruleFiles");
-
     }
 
-    public static IcuTokenizer of(Function<Builder, ObjectBuilder<IcuTokenizer>> fn) {
+    public static IcuTokenizer of(Function<IcuTokenizer.Builder, ObjectBuilder<IcuTokenizer>> fn) {
         return fn.apply(new Builder()).build();
     }
 
     /**
-     * TokenizerDefinition variant kind.
+     * {@link TokenFilterDefinition} variant kind.
      */
     @Override
-    public TokenizerDefinition.Kind _tokenizerDefinitionKind() {
-        return TokenizerDefinition.Kind.IcuTokenizer;
+    public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
+        return TokenFilterDefinition.Kind.IcuTokenizer;
     }
 
     /**
-     * TokenFilterDefinition variant kind.
+     * {@link TokenizerDefinition} variant kind.
      */
     @Override
-    public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
-        return TokenFilterDefinition.Kind.IcuTokenizer;
+    public TokenizerDefinition.Kind _tokenizerDefinitionKind() {
+        return TokenizerDefinition.Kind.IcuTokenizer;
     }
 
     /**
      * Required - API name: {@code rule_files}
      */
+    @Nonnull
     public final String ruleFiles() {
         return this.ruleFiles;
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         generator.write("type", "icu_tokenizer");
         super.serializeInternal(generator, mapper);
         generator.writeKey("rule_files");
         generator.write(this.ruleFiles);
-
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -98,7 +104,6 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     /**
      * Builder for {@link IcuTokenizer}.
      */
-
     public static class Builder extends TokenizerBase.AbstractBuilder<Builder> implements ObjectBuilder<IcuTokenizer> {
         private String ruleFiles;
 
@@ -118,8 +123,7 @@ protected Builder self() {
         /**
          * Builds a {@link IcuTokenizer}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public IcuTokenizer build() {
             _checkSingleUse();
@@ -139,10 +143,27 @@ public IcuTokenizer build() {
     );
 
     protected static void setupIcuTokenizerDeserializer(ObjectDeserializer<IcuTokenizer.Builder> op) {
-        TokenizerBase.setupTokenizerBaseDeserializer(op);
+        setupTokenizerBaseDeserializer(op);
         op.add(Builder::ruleFiles, JsonpDeserializer.stringDeserializer(), "rule_files");
 
         op.ignore("type");
     }
 
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + this.ruleFiles.hashCode();
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        IcuTokenizer other = (IcuTokenizer) o;
+        return this.ruleFiles.equals(other.ruleFiles);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuTransformDirection.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/IcuTransformDirection.java
similarity index 83%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuTransformDirection.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/IcuTransformDirection.java
index 3b61b8b04d..aeebac5692 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuTransformDirection.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/IcuTransformDirection.java
@@ -30,18 +30,24 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.analysis;
 
+import javax.annotation.Generated;
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
+// typedef: _types.analysis.IcuTransformDirection
+
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public enum IcuTransformDirection implements JsonEnum {
     Forward("forward"),
 
-    Reverse("reverse"),
-
-    ;
+    Reverse("reverse");
 
     private final String jsonValue;
 
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuTransformTokenFilter.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/IcuTransformTokenFilter.java
similarity index 73%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuTransformTokenFilter.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/IcuTransformTokenFilter.java
index 903a044ba0..3c935972c7 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuTransformTokenFilter.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/IcuTransformTokenFilter.java
@@ -30,10 +30,18 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 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;
@@ -45,27 +53,29 @@
 // typedef: _types.analysis.IcuTransformTokenFilter
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class IcuTransformTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
+
+    @Nullable
     private final IcuTransformDirection dir;
 
+    @Nonnull
     private final String id;
 
     // ---------------------------------------------------------------------------------------------
 
     private IcuTransformTokenFilter(Builder builder) {
         super(builder);
-
-        this.dir = ApiTypeHelper.requireNonNull(builder.dir, this, "dir");
+        this.dir = builder.dir;
         this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
-
     }
 
-    public static IcuTransformTokenFilter of(Function<Builder, ObjectBuilder<IcuTransformTokenFilter>> fn) {
+    public static IcuTransformTokenFilter of(Function<IcuTransformTokenFilter.Builder, ObjectBuilder<IcuTransformTokenFilter>> fn) {
         return fn.apply(new Builder()).build();
     }
 
     /**
-     * TokenFilterDefinition variant kind.
+     * {@link TokenFilterDefinition} variant kind.
      */
     @Override
     public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
@@ -73,8 +83,9 @@ public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
     }
 
     /**
-     * Required - API name: {@code dir}
+     * API name: {@code dir}
      */
+    @Nullable
     public final IcuTransformDirection dir() {
         return this.dir;
     }
@@ -82,19 +93,21 @@ public final IcuTransformDirection dir() {
     /**
      * Required - API name: {@code id}
      */
+    @Nonnull
     public final String id() {
         return this.id;
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         generator.write("type", "icu_transform");
         super.serializeInternal(generator, mapper);
-        generator.writeKey("dir");
-        this.dir.serialize(generator, mapper);
+        if (this.dir != null) {
+            generator.writeKey("dir");
+            this.dir.serialize(generator, mapper);
+        }
+
         generator.writeKey("id");
         generator.write(this.id);
-
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -102,16 +115,15 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     /**
      * Builder for {@link IcuTransformTokenFilter}.
      */
-
     public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<IcuTransformTokenFilter> {
+        @Nullable
         private IcuTransformDirection dir;
-
         private String id;
 
         /**
-         * Required - API name: {@code dir}
+         * API name: {@code dir}
          */
-        public final Builder dir(IcuTransformDirection value) {
+        public final Builder dir(@Nullable IcuTransformDirection value) {
             this.dir = value;
             return this;
         }
@@ -132,8 +144,7 @@ protected Builder self() {
         /**
          * Builds a {@link IcuTransformTokenFilter}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public IcuTransformTokenFilter build() {
             _checkSingleUse();
@@ -153,11 +164,29 @@ public IcuTransformTokenFilter build() {
     );
 
     protected static void setupIcuTransformTokenFilterDeserializer(ObjectDeserializer<IcuTransformTokenFilter.Builder> op) {
-        TokenFilterBase.setupTokenFilterBaseDeserializer(op);
+        setupTokenFilterBaseDeserializer(op);
         op.add(Builder::dir, IcuTransformDirection._DESERIALIZER, "dir");
         op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "id");
 
         op.ignore("type");
     }
 
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + Objects.hashCode(this.dir);
+        result = 31 * result + this.id.hashCode();
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        IcuTransformTokenFilter other = (IcuTransformTokenFilter) o;
+        return Objects.equals(this.dir, other.dir) && this.id.equals(other.id);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KStemTokenFilter.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/KStemTokenFilter.java
similarity index 78%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KStemTokenFilter.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/KStemTokenFilter.java
index e9a792bd33..cd5c56a267 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KStemTokenFilter.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/KStemTokenFilter.java
@@ -30,10 +30,15 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.analysis;
 
 import jakarta.json.stream.JsonGenerator;
 import java.util.function.Function;
+import javax.annotation.Generated;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -44,20 +49,21 @@
 // typedef: _types.analysis.KStemTokenFilter
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class KStemTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
+
     // ---------------------------------------------------------------------------------------------
 
     private KStemTokenFilter(Builder builder) {
         super(builder);
-
     }
 
-    public static KStemTokenFilter of(Function<Builder, ObjectBuilder<KStemTokenFilter>> fn) {
+    public static KStemTokenFilter of(Function<KStemTokenFilter.Builder, ObjectBuilder<KStemTokenFilter>> fn) {
         return fn.apply(new Builder()).build();
     }
 
     /**
-     * TokenFilterDefinition variant kind.
+     * {@link TokenFilterDefinition} variant kind.
      */
     @Override
     public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
@@ -65,10 +71,8 @@ public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         generator.write("type", "kstem");
         super.serializeInternal(generator, mapper);
-
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -76,8 +80,8 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     /**
      * Builder for {@link KStemTokenFilter}.
      */
-
     public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<KStemTokenFilter> {
+
         @Override
         protected Builder self() {
             return this;
@@ -86,8 +90,7 @@ protected Builder self() {
         /**
          * Builds a {@link KStemTokenFilter}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public KStemTokenFilter build() {
             _checkSingleUse();
@@ -107,9 +110,24 @@ public KStemTokenFilter build() {
     );
 
     protected static void setupKStemTokenFilterDeserializer(ObjectDeserializer<KStemTokenFilter.Builder> op) {
-        TokenFilterBase.setupTokenFilterBaseDeserializer(op);
+        setupTokenFilterBaseDeserializer(op);
 
         op.ignore("type");
     }
 
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        return true;
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KeepTypesMode.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/KeepTypesMode.java
similarity index 83%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KeepTypesMode.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/KeepTypesMode.java
index 29f5447d1d..b49f30cf9c 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KeepTypesMode.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/KeepTypesMode.java
@@ -30,18 +30,24 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.analysis;
 
+import javax.annotation.Generated;
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
+// typedef: _types.analysis.KeepTypesMode
+
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public enum KeepTypesMode implements JsonEnum {
-    Include("include"),
-
     Exclude("exclude"),
 
-    ;
+    Include("include");
 
     private final String jsonValue;
 
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KeepTypesTokenFilter.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/KeepTypesTokenFilter.java
similarity index 80%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KeepTypesTokenFilter.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/KeepTypesTokenFilter.java
index 5f9518e586..eefb1202ac 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KeepTypesTokenFilter.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/KeepTypesTokenFilter.java
@@ -30,11 +30,18 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.analysis;
 
 import jakarta.json.stream.JsonGenerator;
 import java.util.List;
+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;
@@ -47,28 +54,29 @@
 // typedef: _types.analysis.KeepTypesTokenFilter
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class KeepTypesTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
+
     @Nullable
     private final KeepTypesMode mode;
 
+    @Nonnull
     private final List<String> types;
 
     // ---------------------------------------------------------------------------------------------
 
     private KeepTypesTokenFilter(Builder builder) {
         super(builder);
-
         this.mode = builder.mode;
         this.types = ApiTypeHelper.unmodifiable(builder.types);
-
     }
 
-    public static KeepTypesTokenFilter of(Function<Builder, ObjectBuilder<KeepTypesTokenFilter>> fn) {
+    public static KeepTypesTokenFilter of(Function<KeepTypesTokenFilter.Builder, ObjectBuilder<KeepTypesTokenFilter>> fn) {
         return fn.apply(new Builder()).build();
     }
 
     /**
-     * TokenFilterDefinition variant kind.
+     * {@link TokenFilterDefinition} variant kind.
      */
     @Override
     public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
@@ -86,29 +94,27 @@ public final KeepTypesMode mode() {
     /**
      * API name: {@code types}
      */
+    @Nonnull
     public final List<String> types() {
         return this.types;
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         generator.write("type", "keep_types");
         super.serializeInternal(generator, mapper);
         if (this.mode != null) {
             generator.writeKey("mode");
             this.mode.serialize(generator, mapper);
         }
+
         if (ApiTypeHelper.isDefined(this.types)) {
             generator.writeKey("types");
             generator.writeStartArray();
             for (String item0 : this.types) {
                 generator.write(item0);
-
             }
             generator.writeEnd();
-
         }
-
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -116,11 +122,9 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     /**
      * Builder for {@link KeepTypesTokenFilter}.
      */
-
     public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<KeepTypesTokenFilter> {
         @Nullable
         private KeepTypesMode mode;
-
         @Nullable
         private List<String> types;
 
@@ -134,8 +138,10 @@ public final Builder mode(@Nullable KeepTypesMode value) {
 
         /**
          * API name: {@code types}
+         *
          * <p>
          * Adds all elements of <code>list</code> to <code>types</code>.
+         * </p>
          */
         public final Builder types(List<String> list) {
             this.types = _listAddAll(this.types, list);
@@ -144,8 +150,10 @@ public final Builder types(List<String> list) {
 
         /**
          * API name: {@code types}
+         *
          * <p>
          * Adds one or more values to <code>types</code>.
+         * </p>
          */
         public final Builder types(String value, String... values) {
             this.types = _listAdd(this.types, value, values);
@@ -160,8 +168,7 @@ protected Builder self() {
         /**
          * Builds a {@link KeepTypesTokenFilter}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public KeepTypesTokenFilter build() {
             _checkSingleUse();
@@ -181,11 +188,29 @@ public KeepTypesTokenFilter build() {
     );
 
     protected static void setupKeepTypesTokenFilterDeserializer(ObjectDeserializer<KeepTypesTokenFilter.Builder> op) {
-        TokenFilterBase.setupTokenFilterBaseDeserializer(op);
+        setupTokenFilterBaseDeserializer(op);
         op.add(Builder::mode, KeepTypesMode._DESERIALIZER, "mode");
         op.add(Builder::types, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "types");
 
         op.ignore("type");
     }
 
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + Objects.hashCode(this.mode);
+        result = 31 * result + Objects.hashCode(this.types);
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        KeepTypesTokenFilter other = (KeepTypesTokenFilter) o;
+        return Objects.equals(this.mode, other.mode) && Objects.equals(this.types, other.types);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KeepWordsTokenFilter.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/KeepWordsTokenFilter.java
similarity index 81%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KeepWordsTokenFilter.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/KeepWordsTokenFilter.java
index 0448d71475..1afdc8719f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KeepWordsTokenFilter.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/KeepWordsTokenFilter.java
@@ -30,11 +30,18 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.analysis;
 
 import jakarta.json.stream.JsonGenerator;
 import java.util.List;
+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;
@@ -47,7 +54,10 @@
 // typedef: _types.analysis.KeepWordsTokenFilter
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class KeepWordsTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
+
+    @Nonnull
     private final List<String> keepWords;
 
     @Nullable
@@ -60,19 +70,17 @@ public class KeepWordsTokenFilter extends TokenFilterBase implements TokenFilter
 
     private KeepWordsTokenFilter(Builder builder) {
         super(builder);
-
         this.keepWords = ApiTypeHelper.unmodifiable(builder.keepWords);
         this.keepWordsCase = builder.keepWordsCase;
         this.keepWordsPath = builder.keepWordsPath;
-
     }
 
-    public static KeepWordsTokenFilter of(Function<Builder, ObjectBuilder<KeepWordsTokenFilter>> fn) {
+    public static KeepWordsTokenFilter of(Function<KeepWordsTokenFilter.Builder, ObjectBuilder<KeepWordsTokenFilter>> fn) {
         return fn.apply(new Builder()).build();
     }
 
     /**
-     * TokenFilterDefinition variant kind.
+     * {@link TokenFilterDefinition} variant kind.
      */
     @Override
     public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
@@ -82,6 +90,7 @@ public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
     /**
      * API name: {@code keep_words}
      */
+    @Nonnull
     public final List<String> keepWords() {
         return this.keepWords;
     }
@@ -103,7 +112,6 @@ public final String keepWordsPath() {
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         generator.write("type", "keep");
         super.serializeInternal(generator, mapper);
         if (ApiTypeHelper.isDefined(this.keepWords)) {
@@ -111,22 +119,19 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
             generator.writeStartArray();
             for (String item0 : this.keepWords) {
                 generator.write(item0);
-
             }
             generator.writeEnd();
-
         }
+
         if (this.keepWordsCase != null) {
             generator.writeKey("keep_words_case");
             generator.write(this.keepWordsCase);
-
         }
+
         if (this.keepWordsPath != null) {
             generator.writeKey("keep_words_path");
             generator.write(this.keepWordsPath);
-
         }
-
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -134,21 +139,20 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     /**
      * Builder for {@link KeepWordsTokenFilter}.
      */
-
     public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<KeepWordsTokenFilter> {
         @Nullable
         private List<String> keepWords;
-
         @Nullable
         private Boolean keepWordsCase;
-
         @Nullable
         private String keepWordsPath;
 
         /**
          * API name: {@code keep_words}
+         *
          * <p>
          * Adds all elements of <code>list</code> to <code>keepWords</code>.
+         * </p>
          */
         public final Builder keepWords(List<String> list) {
             this.keepWords = _listAddAll(this.keepWords, list);
@@ -157,8 +161,10 @@ public final Builder keepWords(List<String> list) {
 
         /**
          * API name: {@code keep_words}
+         *
          * <p>
          * Adds one or more values to <code>keepWords</code>.
+         * </p>
          */
         public final Builder keepWords(String value, String... values) {
             this.keepWords = _listAdd(this.keepWords, value, values);
@@ -189,8 +195,7 @@ protected Builder self() {
         /**
          * Builds a {@link KeepWordsTokenFilter}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public KeepWordsTokenFilter build() {
             _checkSingleUse();
@@ -218,4 +223,25 @@ protected static void setupKeepWordsTokenFilterDeserializer(ObjectDeserializer<K
         op.ignore("type");
     }
 
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + Objects.hashCode(this.keepWords);
+        result = 31 * result + Objects.hashCode(this.keepWordsCase);
+        result = 31 * result + Objects.hashCode(this.keepWordsPath);
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        KeepWordsTokenFilter other = (KeepWordsTokenFilter) o;
+        return Objects.equals(this.keepWords, other.keepWords)
+            && Objects.equals(this.keepWordsCase, other.keepWordsCase)
+            && Objects.equals(this.keepWordsPath, other.keepWordsPath);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KeywordMarkerTokenFilter.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/KeywordMarkerTokenFilter.java
similarity index 81%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KeywordMarkerTokenFilter.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/KeywordMarkerTokenFilter.java
index 81028c91de..4fcffb2126 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KeywordMarkerTokenFilter.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/KeywordMarkerTokenFilter.java
@@ -30,11 +30,18 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.analysis;
 
 import jakarta.json.stream.JsonGenerator;
 import java.util.List;
+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;
@@ -47,10 +54,13 @@
 // typedef: _types.analysis.KeywordMarkerTokenFilter
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class KeywordMarkerTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
+
     @Nullable
     private final Boolean ignoreCase;
 
+    @Nonnull
     private final List<String> keywords;
 
     @Nullable
@@ -63,20 +73,18 @@ public class KeywordMarkerTokenFilter extends TokenFilterBase implements TokenFi
 
     private KeywordMarkerTokenFilter(Builder builder) {
         super(builder);
-
         this.ignoreCase = builder.ignoreCase;
         this.keywords = ApiTypeHelper.unmodifiable(builder.keywords);
         this.keywordsPath = builder.keywordsPath;
         this.keywordsPattern = builder.keywordsPattern;
-
     }
 
-    public static KeywordMarkerTokenFilter of(Function<Builder, ObjectBuilder<KeywordMarkerTokenFilter>> fn) {
+    public static KeywordMarkerTokenFilter of(Function<KeywordMarkerTokenFilter.Builder, ObjectBuilder<KeywordMarkerTokenFilter>> fn) {
         return fn.apply(new Builder()).build();
     }
 
     /**
-     * TokenFilterDefinition variant kind.
+     * {@link TokenFilterDefinition} variant kind.
      */
     @Override
     public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
@@ -94,6 +102,7 @@ public final Boolean ignoreCase() {
     /**
      * API name: {@code keywords}
      */
+    @Nonnull
     public final List<String> keywords() {
         return this.keywords;
     }
@@ -115,35 +124,31 @@ public final String keywordsPattern() {
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         generator.write("type", "keyword_marker");
         super.serializeInternal(generator, mapper);
         if (this.ignoreCase != null) {
             generator.writeKey("ignore_case");
             generator.write(this.ignoreCase);
-
         }
+
         if (ApiTypeHelper.isDefined(this.keywords)) {
             generator.writeKey("keywords");
             generator.writeStartArray();
             for (String item0 : this.keywords) {
                 generator.write(item0);
-
             }
             generator.writeEnd();
-
         }
+
         if (this.keywordsPath != null) {
             generator.writeKey("keywords_path");
             generator.write(this.keywordsPath);
-
         }
+
         if (this.keywordsPattern != null) {
             generator.writeKey("keywords_pattern");
             generator.write(this.keywordsPattern);
-
         }
-
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -151,17 +156,13 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     /**
      * Builder for {@link KeywordMarkerTokenFilter}.
      */
-
     public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<KeywordMarkerTokenFilter> {
         @Nullable
         private Boolean ignoreCase;
-
         @Nullable
         private List<String> keywords;
-
         @Nullable
         private String keywordsPath;
-
         @Nullable
         private String keywordsPattern;
 
@@ -175,8 +176,10 @@ public final Builder ignoreCase(@Nullable Boolean value) {
 
         /**
          * API name: {@code keywords}
+         *
          * <p>
          * Adds all elements of <code>list</code> to <code>keywords</code>.
+         * </p>
          */
         public final Builder keywords(List<String> list) {
             this.keywords = _listAddAll(this.keywords, list);
@@ -185,8 +188,10 @@ public final Builder keywords(List<String> list) {
 
         /**
          * API name: {@code keywords}
+         *
          * <p>
          * Adds one or more values to <code>keywords</code>.
+         * </p>
          */
         public final Builder keywords(String value, String... values) {
             this.keywords = _listAdd(this.keywords, value, values);
@@ -217,8 +222,7 @@ protected Builder self() {
         /**
          * Builds a {@link KeywordMarkerTokenFilter}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public KeywordMarkerTokenFilter build() {
             _checkSingleUse();
@@ -247,4 +251,27 @@ protected static void setupKeywordMarkerTokenFilterDeserializer(ObjectDeserializ
         op.ignore("type");
     }
 
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + Objects.hashCode(this.ignoreCase);
+        result = 31 * result + Objects.hashCode(this.keywords);
+        result = 31 * result + Objects.hashCode(this.keywordsPath);
+        result = 31 * result + Objects.hashCode(this.keywordsPattern);
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        KeywordMarkerTokenFilter other = (KeywordMarkerTokenFilter) o;
+        return Objects.equals(this.ignoreCase, other.ignoreCase)
+            && Objects.equals(this.keywords, other.keywords)
+            && Objects.equals(this.keywordsPath, other.keywordsPath)
+            && Objects.equals(this.keywordsPattern, other.keywordsPattern);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KuromojiPartOfSpeechTokenFilter.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/KuromojiPartOfSpeechTokenFilter.java
similarity index 76%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KuromojiPartOfSpeechTokenFilter.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/KuromojiPartOfSpeechTokenFilter.java
index dfa552c057..44422e4ae2 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KuromojiPartOfSpeechTokenFilter.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/KuromojiPartOfSpeechTokenFilter.java
@@ -30,11 +30,17 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.analysis;
 
 import jakarta.json.stream.JsonGenerator;
 import java.util.List;
 import java.util.function.Function;
+import javax.annotation.Generated;
+import javax.annotation.Nonnull;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -46,24 +52,27 @@
 // typedef: _types.analysis.KuromojiPartOfSpeechTokenFilter
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class KuromojiPartOfSpeechTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
+
+    @Nonnull
     private final List<String> stoptags;
 
     // ---------------------------------------------------------------------------------------------
 
     private KuromojiPartOfSpeechTokenFilter(Builder builder) {
         super(builder);
-
         this.stoptags = ApiTypeHelper.unmodifiableRequired(builder.stoptags, this, "stoptags");
-
     }
 
-    public static KuromojiPartOfSpeechTokenFilter of(Function<Builder, ObjectBuilder<KuromojiPartOfSpeechTokenFilter>> fn) {
+    public static KuromojiPartOfSpeechTokenFilter of(
+        Function<KuromojiPartOfSpeechTokenFilter.Builder, ObjectBuilder<KuromojiPartOfSpeechTokenFilter>> fn
+    ) {
         return fn.apply(new Builder()).build();
     }
 
     /**
-     * TokenFilterDefinition variant kind.
+     * {@link TokenFilterDefinition} variant kind.
      */
     @Override
     public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
@@ -73,25 +82,20 @@ public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
     /**
      * Required - API name: {@code stoptags}
      */
+    @Nonnull
     public final List<String> stoptags() {
         return this.stoptags;
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         generator.write("type", "kuromoji_part_of_speech");
         super.serializeInternal(generator, mapper);
-        if (ApiTypeHelper.isDefined(this.stoptags)) {
-            generator.writeKey("stoptags");
-            generator.writeStartArray();
-            for (String item0 : this.stoptags) {
-                generator.write(item0);
-
-            }
-            generator.writeEnd();
-
+        generator.writeKey("stoptags");
+        generator.writeStartArray();
+        for (String item0 : this.stoptags) {
+            generator.write(item0);
         }
-
+        generator.writeEnd();
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -99,14 +103,15 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     /**
      * Builder for {@link KuromojiPartOfSpeechTokenFilter}.
      */
-
     public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<KuromojiPartOfSpeechTokenFilter> {
         private List<String> stoptags;
 
         /**
          * Required - API name: {@code stoptags}
+         *
          * <p>
          * Adds all elements of <code>list</code> to <code>stoptags</code>.
+         * </p>
          */
         public final Builder stoptags(List<String> list) {
             this.stoptags = _listAddAll(this.stoptags, list);
@@ -115,8 +120,10 @@ public final Builder stoptags(List<String> list) {
 
         /**
          * Required - API name: {@code stoptags}
+         *
          * <p>
          * Adds one or more values to <code>stoptags</code>.
+         * </p>
          */
         public final Builder stoptags(String value, String... values) {
             this.stoptags = _listAdd(this.stoptags, value, values);
@@ -131,8 +138,7 @@ protected Builder self() {
         /**
          * Builds a {@link KuromojiPartOfSpeechTokenFilter}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public KuromojiPartOfSpeechTokenFilter build() {
             _checkSingleUse();
@@ -152,10 +158,27 @@ public KuromojiPartOfSpeechTokenFilter build() {
     );
 
     protected static void setupKuromojiPartOfSpeechTokenFilterDeserializer(ObjectDeserializer<KuromojiPartOfSpeechTokenFilter.Builder> op) {
-        TokenFilterBase.setupTokenFilterBaseDeserializer(op);
+        setupTokenFilterBaseDeserializer(op);
         op.add(Builder::stoptags, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "stoptags");
 
         op.ignore("type");
     }
 
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + this.stoptags.hashCode();
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        KuromojiPartOfSpeechTokenFilter other = (KuromojiPartOfSpeechTokenFilter) o;
+        return this.stoptags.equals(other.stoptags);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KuromojiReadingFormTokenFilter.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/KuromojiReadingFormTokenFilter.java
similarity index 80%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KuromojiReadingFormTokenFilter.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/KuromojiReadingFormTokenFilter.java
index 5b8758b120..1a9f994572 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KuromojiReadingFormTokenFilter.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/KuromojiReadingFormTokenFilter.java
@@ -30,10 +30,15 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.analysis;
 
 import jakarta.json.stream.JsonGenerator;
 import java.util.function.Function;
+import javax.annotation.Generated;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -45,24 +50,26 @@
 // typedef: _types.analysis.KuromojiReadingFormTokenFilter
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class KuromojiReadingFormTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
+
     private final boolean useRomaji;
 
     // ---------------------------------------------------------------------------------------------
 
     private KuromojiReadingFormTokenFilter(Builder builder) {
         super(builder);
-
         this.useRomaji = ApiTypeHelper.requireNonNull(builder.useRomaji, this, "useRomaji");
-
     }
 
-    public static KuromojiReadingFormTokenFilter of(Function<Builder, ObjectBuilder<KuromojiReadingFormTokenFilter>> fn) {
+    public static KuromojiReadingFormTokenFilter of(
+        Function<KuromojiReadingFormTokenFilter.Builder, ObjectBuilder<KuromojiReadingFormTokenFilter>> fn
+    ) {
         return fn.apply(new Builder()).build();
     }
 
     /**
-     * TokenFilterDefinition variant kind.
+     * {@link TokenFilterDefinition} variant kind.
      */
     @Override
     public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
@@ -77,12 +84,10 @@ public final boolean useRomaji() {
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         generator.write("type", "kuromoji_readingform");
         super.serializeInternal(generator, mapper);
         generator.writeKey("use_romaji");
         generator.write(this.useRomaji);
-
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -90,7 +95,6 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     /**
      * Builder for {@link KuromojiReadingFormTokenFilter}.
      */
-
     public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<KuromojiReadingFormTokenFilter> {
         private Boolean useRomaji;
 
@@ -110,8 +114,7 @@ protected Builder self() {
         /**
          * Builds a {@link KuromojiReadingFormTokenFilter}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public KuromojiReadingFormTokenFilter build() {
             _checkSingleUse();
@@ -137,4 +140,21 @@ protected static void setupKuromojiReadingFormTokenFilterDeserializer(ObjectDese
         op.ignore("type");
     }
 
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + Boolean.hashCode(this.useRomaji);
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        KuromojiReadingFormTokenFilter other = (KuromojiReadingFormTokenFilter) o;
+        return this.useRomaji == other.useRomaji;
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KuromojiStemmerTokenFilter.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/KuromojiStemmerTokenFilter.java
similarity index 80%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KuromojiStemmerTokenFilter.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/KuromojiStemmerTokenFilter.java
index 4d8165a28b..f81d218c35 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KuromojiStemmerTokenFilter.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/KuromojiStemmerTokenFilter.java
@@ -30,10 +30,15 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.analysis;
 
 import jakarta.json.stream.JsonGenerator;
 import java.util.function.Function;
+import javax.annotation.Generated;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -45,24 +50,26 @@
 // typedef: _types.analysis.KuromojiStemmerTokenFilter
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class KuromojiStemmerTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
+
     private final int minimumLength;
 
     // ---------------------------------------------------------------------------------------------
 
     private KuromojiStemmerTokenFilter(Builder builder) {
         super(builder);
-
         this.minimumLength = ApiTypeHelper.requireNonNull(builder.minimumLength, this, "minimumLength");
-
     }
 
-    public static KuromojiStemmerTokenFilter of(Function<Builder, ObjectBuilder<KuromojiStemmerTokenFilter>> fn) {
+    public static KuromojiStemmerTokenFilter of(
+        Function<KuromojiStemmerTokenFilter.Builder, ObjectBuilder<KuromojiStemmerTokenFilter>> fn
+    ) {
         return fn.apply(new Builder()).build();
     }
 
     /**
-     * TokenFilterDefinition variant kind.
+     * {@link TokenFilterDefinition} variant kind.
      */
     @Override
     public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
@@ -77,12 +84,10 @@ public final int minimumLength() {
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         generator.write("type", "kuromoji_stemmer");
         super.serializeInternal(generator, mapper);
         generator.writeKey("minimum_length");
         generator.write(this.minimumLength);
-
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -90,7 +95,6 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     /**
      * Builder for {@link KuromojiStemmerTokenFilter}.
      */
-
     public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<KuromojiStemmerTokenFilter> {
         private Integer minimumLength;
 
@@ -110,8 +114,7 @@ protected Builder self() {
         /**
          * Builds a {@link KuromojiStemmerTokenFilter}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public KuromojiStemmerTokenFilter build() {
             _checkSingleUse();
@@ -137,4 +140,21 @@ protected static void setupKuromojiStemmerTokenFilterDeserializer(ObjectDeserial
         op.ignore("type");
     }
 
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + Integer.hashCode(this.minimumLength);
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        KuromojiStemmerTokenFilter other = (KuromojiStemmerTokenFilter) o;
+        return this.minimumLength == other.minimumLength;
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/LengthTokenFilter.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/LengthTokenFilter.java
similarity index 67%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/LengthTokenFilter.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/LengthTokenFilter.java
index 8715876bad..afe5457655 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/LengthTokenFilter.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/LengthTokenFilter.java
@@ -30,42 +30,50 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 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.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
-import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 
 // typedef: _types.analysis.LengthTokenFilter
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class LengthTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
-    private final int max;
 
-    private final int min;
+    @Nullable
+    private final Integer max;
+
+    @Nullable
+    private final Integer min;
 
     // ---------------------------------------------------------------------------------------------
 
     private LengthTokenFilter(Builder builder) {
         super(builder);
-
-        this.max = ApiTypeHelper.requireNonNull(builder.max, this, "max");
-        this.min = ApiTypeHelper.requireNonNull(builder.min, this, "min");
-
+        this.max = builder.max;
+        this.min = builder.min;
     }
 
-    public static LengthTokenFilter of(Function<Builder, ObjectBuilder<LengthTokenFilter>> fn) {
+    public static LengthTokenFilter of(Function<LengthTokenFilter.Builder, ObjectBuilder<LengthTokenFilter>> fn) {
         return fn.apply(new Builder()).build();
     }
 
     /**
-     * TokenFilterDefinition variant kind.
+     * {@link TokenFilterDefinition} variant kind.
      */
     @Override
     public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
@@ -73,29 +81,33 @@ public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
     }
 
     /**
-     * Required - API name: {@code max}
+     * API name: {@code max}
      */
-    public final int max() {
+    @Nullable
+    public final Integer max() {
         return this.max;
     }
 
     /**
-     * Required - API name: {@code min}
+     * API name: {@code min}
      */
-    public final int min() {
+    @Nullable
+    public final Integer min() {
         return this.min;
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         generator.write("type", "length");
         super.serializeInternal(generator, mapper);
-        generator.writeKey("max");
-        generator.write(this.max);
-
-        generator.writeKey("min");
-        generator.write(this.min);
+        if (this.max != null) {
+            generator.writeKey("max");
+            generator.write(this.max);
+        }
 
+        if (this.min != null) {
+            generator.writeKey("min");
+            generator.write(this.min);
+        }
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -103,24 +115,24 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     /**
      * Builder for {@link LengthTokenFilter}.
      */
-
     public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<LengthTokenFilter> {
+        @Nullable
         private Integer max;
-
+        @Nullable
         private Integer min;
 
         /**
-         * Required - API name: {@code max}
+         * API name: {@code max}
          */
-        public final Builder max(int value) {
+        public final Builder max(@Nullable Integer value) {
             this.max = value;
             return this;
         }
 
         /**
-         * Required - API name: {@code min}
+         * API name: {@code min}
          */
-        public final Builder min(int value) {
+        public final Builder min(@Nullable Integer value) {
             this.min = value;
             return this;
         }
@@ -133,8 +145,7 @@ protected Builder self() {
         /**
          * Builds a {@link LengthTokenFilter}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public LengthTokenFilter build() {
             _checkSingleUse();
@@ -161,4 +172,22 @@ protected static void setupLengthTokenFilterDeserializer(ObjectDeserializer<Leng
         op.ignore("type");
     }
 
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + Objects.hashCode(this.max);
+        result = 31 * result + Objects.hashCode(this.min);
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        LengthTokenFilter other = (LengthTokenFilter) o;
+        return Objects.equals(this.max, other.max) && Objects.equals(this.min, other.min);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/LimitTokenCountTokenFilter.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/LimitTokenCountTokenFilter.java
similarity index 64%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/LimitTokenCountTokenFilter.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/LimitTokenCountTokenFilter.java
index 381663fe28..5017b0f792 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/LimitTokenCountTokenFilter.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/LimitTokenCountTokenFilter.java
@@ -30,42 +30,52 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 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.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
-import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 
 // typedef: _types.analysis.LimitTokenCountTokenFilter
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class LimitTokenCountTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
-    private final boolean consumeAllTokens;
 
-    private final int maxTokenCount;
+    @Nullable
+    private final Boolean consumeAllTokens;
+
+    @Nullable
+    private final Integer maxTokenCount;
 
     // ---------------------------------------------------------------------------------------------
 
     private LimitTokenCountTokenFilter(Builder builder) {
         super(builder);
-
-        this.consumeAllTokens = ApiTypeHelper.requireNonNull(builder.consumeAllTokens, this, "consumeAllTokens");
-        this.maxTokenCount = ApiTypeHelper.requireNonNull(builder.maxTokenCount, this, "maxTokenCount");
-
+        this.consumeAllTokens = builder.consumeAllTokens;
+        this.maxTokenCount = builder.maxTokenCount;
     }
 
-    public static LimitTokenCountTokenFilter of(Function<Builder, ObjectBuilder<LimitTokenCountTokenFilter>> fn) {
+    public static LimitTokenCountTokenFilter of(
+        Function<LimitTokenCountTokenFilter.Builder, ObjectBuilder<LimitTokenCountTokenFilter>> fn
+    ) {
         return fn.apply(new Builder()).build();
     }
 
     /**
-     * TokenFilterDefinition variant kind.
+     * {@link TokenFilterDefinition} variant kind.
      */
     @Override
     public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
@@ -73,29 +83,33 @@ public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
     }
 
     /**
-     * Required - API name: {@code consume_all_tokens}
+     * API name: {@code consume_all_tokens}
      */
-    public final boolean consumeAllTokens() {
+    @Nullable
+    public final Boolean consumeAllTokens() {
         return this.consumeAllTokens;
     }
 
     /**
-     * Required - API name: {@code max_token_count}
+     * API name: {@code max_token_count}
      */
-    public final int maxTokenCount() {
+    @Nullable
+    public final Integer maxTokenCount() {
         return this.maxTokenCount;
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         generator.write("type", "limit");
         super.serializeInternal(generator, mapper);
-        generator.writeKey("consume_all_tokens");
-        generator.write(this.consumeAllTokens);
-
-        generator.writeKey("max_token_count");
-        generator.write(this.maxTokenCount);
+        if (this.consumeAllTokens != null) {
+            generator.writeKey("consume_all_tokens");
+            generator.write(this.consumeAllTokens);
+        }
 
+        if (this.maxTokenCount != null) {
+            generator.writeKey("max_token_count");
+            generator.write(this.maxTokenCount);
+        }
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -103,24 +117,24 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     /**
      * Builder for {@link LimitTokenCountTokenFilter}.
      */
-
     public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<LimitTokenCountTokenFilter> {
+        @Nullable
         private Boolean consumeAllTokens;
-
+        @Nullable
         private Integer maxTokenCount;
 
         /**
-         * Required - API name: {@code consume_all_tokens}
+         * API name: {@code consume_all_tokens}
          */
-        public final Builder consumeAllTokens(boolean value) {
+        public final Builder consumeAllTokens(@Nullable Boolean value) {
             this.consumeAllTokens = value;
             return this;
         }
 
         /**
-         * Required - API name: {@code max_token_count}
+         * API name: {@code max_token_count}
          */
-        public final Builder maxTokenCount(int value) {
+        public final Builder maxTokenCount(@Nullable Integer value) {
             this.maxTokenCount = value;
             return this;
         }
@@ -133,8 +147,7 @@ protected Builder self() {
         /**
          * Builds a {@link LimitTokenCountTokenFilter}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public LimitTokenCountTokenFilter build() {
             _checkSingleUse();
@@ -161,4 +174,22 @@ protected static void setupLimitTokenCountTokenFilterDeserializer(ObjectDeserial
         op.ignore("type");
     }
 
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + Objects.hashCode(this.consumeAllTokens);
+        result = 31 * result + Objects.hashCode(this.maxTokenCount);
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        LimitTokenCountTokenFilter other = (LimitTokenCountTokenFilter) o;
+        return Objects.equals(this.consumeAllTokens, other.consumeAllTokens) && Objects.equals(this.maxTokenCount, other.maxTokenCount);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/LowercaseTokenFilter.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/LowercaseTokenFilter.java
similarity index 79%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/LowercaseTokenFilter.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/LowercaseTokenFilter.java
index de2f1d898e..325d4a5d4b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/LowercaseTokenFilter.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/LowercaseTokenFilter.java
@@ -30,10 +30,16 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 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.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -45,7 +51,9 @@
 // typedef: _types.analysis.LowercaseTokenFilter
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class LowercaseTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
+
     @Nullable
     private final String language;
 
@@ -53,17 +61,15 @@ public class LowercaseTokenFilter extends TokenFilterBase implements TokenFilter
 
     private LowercaseTokenFilter(Builder builder) {
         super(builder);
-
         this.language = builder.language;
-
     }
 
-    public static LowercaseTokenFilter of(Function<Builder, ObjectBuilder<LowercaseTokenFilter>> fn) {
+    public static LowercaseTokenFilter of(Function<LowercaseTokenFilter.Builder, ObjectBuilder<LowercaseTokenFilter>> fn) {
         return fn.apply(new Builder()).build();
     }
 
     /**
-     * TokenFilterDefinition variant kind.
+     * {@link TokenFilterDefinition} variant kind.
      */
     @Override
     public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
@@ -79,15 +85,12 @@ public final String language() {
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         generator.write("type", "lowercase");
         super.serializeInternal(generator, mapper);
         if (this.language != null) {
             generator.writeKey("language");
             generator.write(this.language);
-
         }
-
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -95,7 +98,6 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     /**
      * Builder for {@link LowercaseTokenFilter}.
      */
-
     public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<LowercaseTokenFilter> {
         @Nullable
         private String language;
@@ -116,8 +118,7 @@ protected Builder self() {
         /**
          * Builds a {@link LowercaseTokenFilter}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public LowercaseTokenFilter build() {
             _checkSingleUse();
@@ -143,4 +144,21 @@ protected static void setupLowercaseTokenFilterDeserializer(ObjectDeserializer<L
         op.ignore("type");
     }
 
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + Objects.hashCode(this.language);
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        LowercaseTokenFilter other = (LowercaseTokenFilter) o;
+        return Objects.equals(this.language, other.language);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/MultiplexerTokenFilter.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/MultiplexerTokenFilter.java
similarity index 70%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/MultiplexerTokenFilter.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/MultiplexerTokenFilter.java
index 179aa01d61..cbd921ee3e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/MultiplexerTokenFilter.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/MultiplexerTokenFilter.java
@@ -30,11 +30,19 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.analysis;
 
 import jakarta.json.stream.JsonGenerator;
 import java.util.List;
+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;
@@ -46,27 +54,29 @@
 // typedef: _types.analysis.MultiplexerTokenFilter
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class MultiplexerTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
+
+    @Nonnull
     private final List<String> filters;
 
-    private final boolean preserveOriginal;
+    @Nullable
+    private final Boolean preserveOriginal;
 
     // ---------------------------------------------------------------------------------------------
 
     private MultiplexerTokenFilter(Builder builder) {
         super(builder);
-
         this.filters = ApiTypeHelper.unmodifiableRequired(builder.filters, this, "filters");
-        this.preserveOriginal = ApiTypeHelper.requireNonNull(builder.preserveOriginal, this, "preserveOriginal");
-
+        this.preserveOriginal = builder.preserveOriginal;
     }
 
-    public static MultiplexerTokenFilter of(Function<Builder, ObjectBuilder<MultiplexerTokenFilter>> fn) {
+    public static MultiplexerTokenFilter of(Function<MultiplexerTokenFilter.Builder, ObjectBuilder<MultiplexerTokenFilter>> fn) {
         return fn.apply(new Builder()).build();
     }
 
     /**
-     * TokenFilterDefinition variant kind.
+     * {@link TokenFilterDefinition} variant kind.
      */
     @Override
     public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
@@ -76,34 +86,33 @@ public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
     /**
      * Required - API name: {@code filters}
      */
+    @Nonnull
     public final List<String> filters() {
         return this.filters;
     }
 
     /**
-     * Required - API name: {@code preserve_original}
+     * API name: {@code preserve_original}
      */
-    public final boolean preserveOriginal() {
+    @Nullable
+    public final Boolean preserveOriginal() {
         return this.preserveOriginal;
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         generator.write("type", "multiplexer");
         super.serializeInternal(generator, mapper);
-        if (ApiTypeHelper.isDefined(this.filters)) {
-            generator.writeKey("filters");
-            generator.writeStartArray();
-            for (String item0 : this.filters) {
-                generator.write(item0);
-
-            }
-            generator.writeEnd();
-
+        generator.writeKey("filters");
+        generator.writeStartArray();
+        for (String item0 : this.filters) {
+            generator.write(item0);
         }
-        generator.writeKey("preserve_original");
-        generator.write(this.preserveOriginal);
+        generator.writeEnd();
 
+        if (this.preserveOriginal != null) {
+            generator.writeKey("preserve_original");
+            generator.write(this.preserveOriginal);
+        }
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -111,16 +120,17 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     /**
      * Builder for {@link MultiplexerTokenFilter}.
      */
-
     public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<MultiplexerTokenFilter> {
         private List<String> filters;
-
+        @Nullable
         private Boolean preserveOriginal;
 
         /**
          * Required - API name: {@code filters}
+         *
          * <p>
          * Adds all elements of <code>list</code> to <code>filters</code>.
+         * </p>
          */
         public final Builder filters(List<String> list) {
             this.filters = _listAddAll(this.filters, list);
@@ -129,8 +139,10 @@ public final Builder filters(List<String> list) {
 
         /**
          * Required - API name: {@code filters}
+         *
          * <p>
          * Adds one or more values to <code>filters</code>.
+         * </p>
          */
         public final Builder filters(String value, String... values) {
             this.filters = _listAdd(this.filters, value, values);
@@ -138,9 +150,9 @@ public final Builder filters(String value, String... values) {
         }
 
         /**
-         * Required - API name: {@code preserve_original}
+         * API name: {@code preserve_original}
          */
-        public final Builder preserveOriginal(boolean value) {
+        public final Builder preserveOriginal(@Nullable Boolean value) {
             this.preserveOriginal = value;
             return this;
         }
@@ -153,8 +165,7 @@ protected Builder self() {
         /**
          * Builds a {@link MultiplexerTokenFilter}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public MultiplexerTokenFilter build() {
             _checkSingleUse();
@@ -174,11 +185,29 @@ public MultiplexerTokenFilter build() {
     );
 
     protected static void setupMultiplexerTokenFilterDeserializer(ObjectDeserializer<MultiplexerTokenFilter.Builder> op) {
-        TokenFilterBase.setupTokenFilterBaseDeserializer(op);
+        setupTokenFilterBaseDeserializer(op);
         op.add(Builder::filters, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "filters");
         op.add(Builder::preserveOriginal, JsonpDeserializer.booleanDeserializer(), "preserve_original");
 
         op.ignore("type");
     }
 
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + this.filters.hashCode();
+        result = 31 * result + Objects.hashCode(this.preserveOriginal);
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        MultiplexerTokenFilter other = (MultiplexerTokenFilter) o;
+        return this.filters.equals(other.filters) && Objects.equals(this.preserveOriginal, other.preserveOriginal);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/NGramTokenFilter.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/NGramTokenFilter.java
similarity index 80%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/NGramTokenFilter.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/NGramTokenFilter.java
index b03bdf579f..7fda3bcb2f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/NGramTokenFilter.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/NGramTokenFilter.java
@@ -30,10 +30,16 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 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.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -45,7 +51,9 @@
 // typedef: _types.analysis.NGramTokenFilter
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class NGramTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
+
     @Nullable
     private final Integer maxGram;
 
@@ -59,19 +67,17 @@ public class NGramTokenFilter extends TokenFilterBase implements TokenFilterDefi
 
     private NGramTokenFilter(Builder builder) {
         super(builder);
-
         this.maxGram = builder.maxGram;
         this.minGram = builder.minGram;
         this.preserveOriginal = builder.preserveOriginal;
-
     }
 
-    public static NGramTokenFilter of(Function<Builder, ObjectBuilder<NGramTokenFilter>> fn) {
+    public static NGramTokenFilter of(Function<NGramTokenFilter.Builder, ObjectBuilder<NGramTokenFilter>> fn) {
         return fn.apply(new Builder()).build();
     }
 
     /**
-     * TokenFilterDefinition variant kind.
+     * {@link TokenFilterDefinition} variant kind.
      */
     @Override
     public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
@@ -103,25 +109,22 @@ public final Boolean preserveOriginal() {
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         generator.write("type", "ngram");
         super.serializeInternal(generator, mapper);
         if (this.maxGram != null) {
             generator.writeKey("max_gram");
             generator.write(this.maxGram);
-
         }
+
         if (this.minGram != null) {
             generator.writeKey("min_gram");
             generator.write(this.minGram);
-
         }
+
         if (this.preserveOriginal != null) {
             generator.writeKey("preserve_original");
             generator.write(this.preserveOriginal);
-
         }
-
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -129,14 +132,11 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     /**
      * Builder for {@link NGramTokenFilter}.
      */
-
     public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<NGramTokenFilter> {
         @Nullable
         private Integer maxGram;
-
         @Nullable
         private Integer minGram;
-
         @Nullable
         private Boolean preserveOriginal;
 
@@ -172,8 +172,7 @@ protected Builder self() {
         /**
          * Builds a {@link NGramTokenFilter}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public NGramTokenFilter build() {
             _checkSingleUse();
@@ -193,7 +192,7 @@ public NGramTokenFilter build() {
     );
 
     protected static void setupNGramTokenFilterDeserializer(ObjectDeserializer<NGramTokenFilter.Builder> op) {
-        TokenFilterBase.setupTokenFilterBaseDeserializer(op);
+        setupTokenFilterBaseDeserializer(op);
         op.add(Builder::maxGram, JsonpDeserializer.integerDeserializer(), "max_gram");
         op.add(Builder::minGram, JsonpDeserializer.integerDeserializer(), "min_gram");
         op.add(Builder::preserveOriginal, JsonpDeserializer.booleanDeserializer(), "preserve_original");
@@ -201,4 +200,25 @@ protected static void setupNGramTokenFilterDeserializer(ObjectDeserializer<NGram
         op.ignore("type");
     }
 
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + Objects.hashCode(this.maxGram);
+        result = 31 * result + Objects.hashCode(this.minGram);
+        result = 31 * result + Objects.hashCode(this.preserveOriginal);
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        NGramTokenFilter other = (NGramTokenFilter) o;
+        return Objects.equals(this.maxGram, other.maxGram)
+            && Objects.equals(this.minGram, other.minGram)
+            && Objects.equals(this.preserveOriginal, other.preserveOriginal);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/NoriPartOfSpeechTokenFilter.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/NoriPartOfSpeechTokenFilter.java
similarity index 76%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/NoriPartOfSpeechTokenFilter.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/NoriPartOfSpeechTokenFilter.java
index 88db943e03..c131f932f1 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/NoriPartOfSpeechTokenFilter.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/NoriPartOfSpeechTokenFilter.java
@@ -30,11 +30,19 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.analysis;
 
 import jakarta.json.stream.JsonGenerator;
 import java.util.List;
+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;
@@ -46,24 +54,27 @@
 // typedef: _types.analysis.NoriPartOfSpeechTokenFilter
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class NoriPartOfSpeechTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
+
+    @Nonnull
     private final List<String> stoptags;
 
     // ---------------------------------------------------------------------------------------------
 
     private NoriPartOfSpeechTokenFilter(Builder builder) {
         super(builder);
-
-        this.stoptags = ApiTypeHelper.unmodifiableRequired(builder.stoptags, this, "stoptags");
-
+        this.stoptags = ApiTypeHelper.unmodifiable(builder.stoptags);
     }
 
-    public static NoriPartOfSpeechTokenFilter of(Function<Builder, ObjectBuilder<NoriPartOfSpeechTokenFilter>> fn) {
+    public static NoriPartOfSpeechTokenFilter of(
+        Function<NoriPartOfSpeechTokenFilter.Builder, ObjectBuilder<NoriPartOfSpeechTokenFilter>> fn
+    ) {
         return fn.apply(new Builder()).build();
     }
 
     /**
-     * TokenFilterDefinition variant kind.
+     * {@link TokenFilterDefinition} variant kind.
      */
     @Override
     public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
@@ -71,14 +82,14 @@ public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
     }
 
     /**
-     * Required - API name: {@code stoptags}
+     * API name: {@code stoptags}
      */
+    @Nonnull
     public final List<String> stoptags() {
         return this.stoptags;
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         generator.write("type", "nori_part_of_speech");
         super.serializeInternal(generator, mapper);
         if (ApiTypeHelper.isDefined(this.stoptags)) {
@@ -86,12 +97,9 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
             generator.writeStartArray();
             for (String item0 : this.stoptags) {
                 generator.write(item0);
-
             }
             generator.writeEnd();
-
         }
-
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -99,14 +107,16 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     /**
      * Builder for {@link NoriPartOfSpeechTokenFilter}.
      */
-
     public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<NoriPartOfSpeechTokenFilter> {
+        @Nullable
         private List<String> stoptags;
 
         /**
-         * Required - API name: {@code stoptags}
+         * API name: {@code stoptags}
+         *
          * <p>
          * Adds all elements of <code>list</code> to <code>stoptags</code>.
+         * </p>
          */
         public final Builder stoptags(List<String> list) {
             this.stoptags = _listAddAll(this.stoptags, list);
@@ -114,9 +124,11 @@ public final Builder stoptags(List<String> list) {
         }
 
         /**
-         * Required - API name: {@code stoptags}
+         * API name: {@code stoptags}
+         *
          * <p>
          * Adds one or more values to <code>stoptags</code>.
+         * </p>
          */
         public final Builder stoptags(String value, String... values) {
             this.stoptags = _listAdd(this.stoptags, value, values);
@@ -131,8 +143,7 @@ protected Builder self() {
         /**
          * Builds a {@link NoriPartOfSpeechTokenFilter}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public NoriPartOfSpeechTokenFilter build() {
             _checkSingleUse();
@@ -152,10 +163,27 @@ public NoriPartOfSpeechTokenFilter build() {
     );
 
     protected static void setupNoriPartOfSpeechTokenFilterDeserializer(ObjectDeserializer<NoriPartOfSpeechTokenFilter.Builder> op) {
-        TokenFilterBase.setupTokenFilterBaseDeserializer(op);
+        setupTokenFilterBaseDeserializer(op);
         op.add(Builder::stoptags, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "stoptags");
 
         op.ignore("type");
     }
 
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + Objects.hashCode(this.stoptags);
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        NoriPartOfSpeechTokenFilter other = (NoriPartOfSpeechTokenFilter) o;
+        return Objects.equals(this.stoptags, other.stoptags);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PatternCaptureTokenFilter.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/PatternCaptureTokenFilter.java
similarity index 70%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PatternCaptureTokenFilter.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/PatternCaptureTokenFilter.java
index 6f02fca0e8..69c3fc7166 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PatternCaptureTokenFilter.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/PatternCaptureTokenFilter.java
@@ -30,11 +30,19 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.analysis;
 
 import jakarta.json.stream.JsonGenerator;
 import java.util.List;
+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;
@@ -46,27 +54,29 @@
 // typedef: _types.analysis.PatternCaptureTokenFilter
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class PatternCaptureTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
+
+    @Nonnull
     private final List<String> patterns;
 
-    private final boolean preserveOriginal;
+    @Nullable
+    private final Boolean preserveOriginal;
 
     // ---------------------------------------------------------------------------------------------
 
     private PatternCaptureTokenFilter(Builder builder) {
         super(builder);
-
         this.patterns = ApiTypeHelper.unmodifiableRequired(builder.patterns, this, "patterns");
-        this.preserveOriginal = ApiTypeHelper.requireNonNull(builder.preserveOriginal, this, "preserveOriginal");
-
+        this.preserveOriginal = builder.preserveOriginal;
     }
 
-    public static PatternCaptureTokenFilter of(Function<Builder, ObjectBuilder<PatternCaptureTokenFilter>> fn) {
+    public static PatternCaptureTokenFilter of(Function<PatternCaptureTokenFilter.Builder, ObjectBuilder<PatternCaptureTokenFilter>> fn) {
         return fn.apply(new Builder()).build();
     }
 
     /**
-     * TokenFilterDefinition variant kind.
+     * {@link TokenFilterDefinition} variant kind.
      */
     @Override
     public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
@@ -76,34 +86,33 @@ public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
     /**
      * Required - API name: {@code patterns}
      */
+    @Nonnull
     public final List<String> patterns() {
         return this.patterns;
     }
 
     /**
-     * Required - API name: {@code preserve_original}
+     * API name: {@code preserve_original}
      */
-    public final boolean preserveOriginal() {
+    @Nullable
+    public final Boolean preserveOriginal() {
         return this.preserveOriginal;
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         generator.write("type", "pattern_capture");
         super.serializeInternal(generator, mapper);
-        if (ApiTypeHelper.isDefined(this.patterns)) {
-            generator.writeKey("patterns");
-            generator.writeStartArray();
-            for (String item0 : this.patterns) {
-                generator.write(item0);
-
-            }
-            generator.writeEnd();
-
+        generator.writeKey("patterns");
+        generator.writeStartArray();
+        for (String item0 : this.patterns) {
+            generator.write(item0);
         }
-        generator.writeKey("preserve_original");
-        generator.write(this.preserveOriginal);
+        generator.writeEnd();
 
+        if (this.preserveOriginal != null) {
+            generator.writeKey("preserve_original");
+            generator.write(this.preserveOriginal);
+        }
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -111,16 +120,17 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     /**
      * Builder for {@link PatternCaptureTokenFilter}.
      */
-
     public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<PatternCaptureTokenFilter> {
         private List<String> patterns;
-
+        @Nullable
         private Boolean preserveOriginal;
 
         /**
          * Required - API name: {@code patterns}
+         *
          * <p>
          * Adds all elements of <code>list</code> to <code>patterns</code>.
+         * </p>
          */
         public final Builder patterns(List<String> list) {
             this.patterns = _listAddAll(this.patterns, list);
@@ -129,8 +139,10 @@ public final Builder patterns(List<String> list) {
 
         /**
          * Required - API name: {@code patterns}
+         *
          * <p>
          * Adds one or more values to <code>patterns</code>.
+         * </p>
          */
         public final Builder patterns(String value, String... values) {
             this.patterns = _listAdd(this.patterns, value, values);
@@ -138,9 +150,9 @@ public final Builder patterns(String value, String... values) {
         }
 
         /**
-         * Required - API name: {@code preserve_original}
+         * API name: {@code preserve_original}
          */
-        public final Builder preserveOriginal(boolean value) {
+        public final Builder preserveOriginal(@Nullable Boolean value) {
             this.preserveOriginal = value;
             return this;
         }
@@ -153,8 +165,7 @@ protected Builder self() {
         /**
          * Builds a {@link PatternCaptureTokenFilter}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public PatternCaptureTokenFilter build() {
             _checkSingleUse();
@@ -174,11 +185,29 @@ public PatternCaptureTokenFilter build() {
     );
 
     protected static void setupPatternCaptureTokenFilterDeserializer(ObjectDeserializer<PatternCaptureTokenFilter.Builder> op) {
-        TokenFilterBase.setupTokenFilterBaseDeserializer(op);
+        setupTokenFilterBaseDeserializer(op);
         op.add(Builder::patterns, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "patterns");
         op.add(Builder::preserveOriginal, JsonpDeserializer.booleanDeserializer(), "preserve_original");
 
         op.ignore("type");
     }
 
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + this.patterns.hashCode();
+        result = 31 * result + Objects.hashCode(this.preserveOriginal);
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        PatternCaptureTokenFilter other = (PatternCaptureTokenFilter) o;
+        return this.patterns.equals(other.patterns) && Objects.equals(this.preserveOriginal, other.preserveOriginal);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PatternReplaceTokenFilter.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/PatternReplaceTokenFilter.java
similarity index 63%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PatternReplaceTokenFilter.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/PatternReplaceTokenFilter.java
index 9bf3754197..0780ef2591 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PatternReplaceTokenFilter.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/PatternReplaceTokenFilter.java
@@ -30,10 +30,18 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 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;
@@ -45,30 +53,37 @@
 // typedef: _types.analysis.PatternReplaceTokenFilter
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class PatternReplaceTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
+
+    @Nullable
+    private final Boolean all;
+
+    @Nullable
     private final String flags;
 
+    @Nonnull
     private final String pattern;
 
+    @Nullable
     private final String replacement;
 
     // ---------------------------------------------------------------------------------------------
 
     private PatternReplaceTokenFilter(Builder builder) {
         super(builder);
-
-        this.flags = ApiTypeHelper.requireNonNull(builder.flags, this, "flags");
+        this.all = builder.all;
+        this.flags = builder.flags;
         this.pattern = ApiTypeHelper.requireNonNull(builder.pattern, this, "pattern");
-        this.replacement = ApiTypeHelper.requireNonNull(builder.replacement, this, "replacement");
-
+        this.replacement = builder.replacement;
     }
 
-    public static PatternReplaceTokenFilter of(Function<Builder, ObjectBuilder<PatternReplaceTokenFilter>> fn) {
+    public static PatternReplaceTokenFilter of(Function<PatternReplaceTokenFilter.Builder, ObjectBuilder<PatternReplaceTokenFilter>> fn) {
         return fn.apply(new Builder()).build();
     }
 
     /**
-     * TokenFilterDefinition variant kind.
+     * {@link TokenFilterDefinition} variant kind.
      */
     @Override
     public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
@@ -76,8 +91,17 @@ public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
     }
 
     /**
-     * Required - API name: {@code flags}
+     * API name: {@code all}
      */
+    @Nullable
+    public final Boolean all() {
+        return this.all;
+    }
+
+    /**
+     * API name: {@code flags}
+     */
+    @Nullable
     public final String flags() {
         return this.flags;
     }
@@ -85,30 +109,39 @@ public final String flags() {
     /**
      * Required - API name: {@code pattern}
      */
+    @Nonnull
     public final String pattern() {
         return this.pattern;
     }
 
     /**
-     * Required - API name: {@code replacement}
+     * API name: {@code replacement}
      */
+    @Nullable
     public final String replacement() {
         return this.replacement;
     }
 
     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.all != null) {
+            generator.writeKey("all");
+            generator.write(this.all);
+        }
+
+        if (this.flags != null) {
+            generator.writeKey("flags");
+            generator.write(this.flags);
+        }
 
         generator.writeKey("pattern");
         generator.write(this.pattern);
 
-        generator.writeKey("replacement");
-        generator.write(this.replacement);
-
+        if (this.replacement != null) {
+            generator.writeKey("replacement");
+            generator.write(this.replacement);
+        }
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -116,18 +149,27 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     /**
      * Builder for {@link PatternReplaceTokenFilter}.
      */
-
     public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<PatternReplaceTokenFilter> {
+        @Nullable
+        private Boolean all;
+        @Nullable
         private String flags;
-
         private String pattern;
-
+        @Nullable
         private String replacement;
 
         /**
-         * Required - API name: {@code flags}
+         * API name: {@code all}
+         */
+        public final Builder all(@Nullable Boolean value) {
+            this.all = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code flags}
          */
-        public final Builder flags(String value) {
+        public final Builder flags(@Nullable String value) {
             this.flags = value;
             return this;
         }
@@ -141,9 +183,9 @@ public final Builder pattern(String value) {
         }
 
         /**
-         * Required - API name: {@code replacement}
+         * API name: {@code replacement}
          */
-        public final Builder replacement(String value) {
+        public final Builder replacement(@Nullable String value) {
             this.replacement = value;
             return this;
         }
@@ -156,8 +198,7 @@ protected Builder self() {
         /**
          * Builds a {@link PatternReplaceTokenFilter}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public PatternReplaceTokenFilter build() {
             _checkSingleUse();
@@ -178,6 +219,7 @@ public PatternReplaceTokenFilter build() {
 
     protected static void setupPatternReplaceTokenFilterDeserializer(ObjectDeserializer<PatternReplaceTokenFilter.Builder> op) {
         setupTokenFilterBaseDeserializer(op);
+        op.add(Builder::all, JsonpDeserializer.booleanDeserializer(), "all");
         op.add(Builder::flags, JsonpDeserializer.stringDeserializer(), "flags");
         op.add(Builder::pattern, JsonpDeserializer.stringDeserializer(), "pattern");
         op.add(Builder::replacement, JsonpDeserializer.stringDeserializer(), "replacement");
@@ -185,4 +227,27 @@ protected static void setupPatternReplaceTokenFilterDeserializer(ObjectDeseriali
         op.ignore("type");
     }
 
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + Objects.hashCode(this.all);
+        result = 31 * result + Objects.hashCode(this.flags);
+        result = 31 * result + this.pattern.hashCode();
+        result = 31 * result + Objects.hashCode(this.replacement);
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        PatternReplaceTokenFilter other = (PatternReplaceTokenFilter) o;
+        return Objects.equals(this.all, other.all)
+            && Objects.equals(this.flags, other.flags)
+            && this.pattern.equals(other.pattern)
+            && Objects.equals(this.replacement, other.replacement);
+    }
 }
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/PersianStemTokenFilter.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/PersianStemTokenFilter.java
new file mode 100644
index 0000000000..f2f88716e2
--- /dev/null
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/PersianStemTokenFilter.java
@@ -0,0 +1,133 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
+
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/*
+ * Modifications Copyright OpenSearch Contributors. See
+ * GitHub history for details.
+ */
+
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
+package org.opensearch.client.opensearch._types.analysis;
+
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Generated;
+import org.opensearch.client.json.JsonpDeserializable;
+import org.opensearch.client.json.JsonpDeserializer;
+import org.opensearch.client.json.JsonpMapper;
+import org.opensearch.client.json.ObjectBuilderDeserializer;
+import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.util.ObjectBuilder;
+
+// typedef: _types.analysis.PersianStemTokenFilter
+
+@JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
+public class PersianStemTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
+
+    // ---------------------------------------------------------------------------------------------
+
+    private PersianStemTokenFilter(Builder builder) {
+        super(builder);
+    }
+
+    public static PersianStemTokenFilter of(Function<PersianStemTokenFilter.Builder, ObjectBuilder<PersianStemTokenFilter>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * {@link TokenFilterDefinition} variant kind.
+     */
+    @Override
+    public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
+        return TokenFilterDefinition.Kind.PersianStem;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+        generator.write("type", "persian_stem");
+        super.serializeInternal(generator, mapper);
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link PersianStemTokenFilter}.
+     */
+    public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<PersianStemTokenFilter> {
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link PersianStemTokenFilter}.
+         *
+         * @throws NullPointerException if some of the required fields are null.
+         */
+        public PersianStemTokenFilter build() {
+            _checkSingleUse();
+
+            return new PersianStemTokenFilter(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link PersianStemTokenFilter}
+     */
+    public static final JsonpDeserializer<PersianStemTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        PersianStemTokenFilter::setupPersianStemTokenFilterDeserializer
+    );
+
+    protected static void setupPersianStemTokenFilterDeserializer(ObjectDeserializer<PersianStemTokenFilter.Builder> op) {
+        setupTokenFilterBaseDeserializer(op);
+
+        op.ignore("type");
+    }
+
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        return true;
+    }
+}
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PhoneticEncoder.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/PhoneticEncoder.java
similarity index 86%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PhoneticEncoder.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/PhoneticEncoder.java
index 87ff80c95a..eb32b81547 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PhoneticEncoder.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/PhoneticEncoder.java
@@ -30,20 +30,22 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.analysis;
 
+import javax.annotation.Generated;
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
+// typedef: _types.analysis.PhoneticEncoder
+
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public enum PhoneticEncoder implements JsonEnum {
-    Metaphone("metaphone"),
-
-    DoubleMetaphone("double_metaphone"),
-
-    Soundex("soundex"),
-
-    RefinedSoundex("refined_soundex"),
+    BeiderMorse("beider_morse"),
 
     Caverphone1("caverphone1"),
 
@@ -51,17 +53,21 @@ public enum PhoneticEncoder implements JsonEnum {
 
     Cologne("cologne"),
 
-    Nysiis("nysiis"),
+    DaitchMokotoff("daitch_mokotoff"),
 
-    Koelnerphonetik("koelnerphonetik"),
+    DoubleMetaphone("double_metaphone"),
 
     Haasephonetik("haasephonetik"),
 
-    BeiderMorse("beider_morse"),
+    Koelnerphonetik("koelnerphonetik"),
 
-    DaitchMokotoff("daitch_mokotoff"),
+    Metaphone("metaphone"),
+
+    Nysiis("nysiis"),
+
+    RefinedSoundex("refined_soundex"),
 
-    ;
+    Soundex("soundex");
 
     private final String jsonValue;
 
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PhoneticLanguage.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/PhoneticLanguage.java
similarity index 85%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PhoneticLanguage.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/PhoneticLanguage.java
index 1f910ab781..a02c242e84 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PhoneticLanguage.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/PhoneticLanguage.java
@@ -30,12 +30,20 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.analysis;
 
+import javax.annotation.Generated;
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
+// typedef: _types.analysis.PhoneticLanguage
+
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public enum PhoneticLanguage implements JsonEnum {
     Any("any"),
 
@@ -59,9 +67,7 @@ public enum PhoneticLanguage implements JsonEnum {
 
     Russian("russian"),
 
-    Spanish("spanish"),
-
-    ;
+    Spanish("spanish");
 
     private final String jsonValue;
 
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PhoneticNameType.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/PhoneticNameType.java
similarity index 83%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PhoneticNameType.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/PhoneticNameType.java
index e5aafbf73d..02be105256 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PhoneticNameType.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/PhoneticNameType.java
@@ -30,20 +30,26 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.analysis;
 
+import javax.annotation.Generated;
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
+// typedef: _types.analysis.PhoneticNameType
+
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public enum PhoneticNameType implements JsonEnum {
-    Generic("generic"),
-
     Ashkenazi("ashkenazi"),
 
-    Sephardic("sephardic"),
+    Generic("generic"),
 
-    ;
+    Sephardic("sephardic");
 
     private final String jsonValue;
 
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PhoneticRuleType.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/PhoneticRuleType.java
similarity index 83%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PhoneticRuleType.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/PhoneticRuleType.java
index ead1a82194..13cf6ee2cc 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PhoneticRuleType.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/PhoneticRuleType.java
@@ -30,18 +30,24 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.analysis;
 
+import javax.annotation.Generated;
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
+// typedef: _types.analysis.PhoneticRuleType
+
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public enum PhoneticRuleType implements JsonEnum {
     Approx("approx"),
 
-    Exact("exact"),
-
-    ;
+    Exact("exact");
 
     private final String jsonValue;
 
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PhoneticTokenFilter.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/PhoneticTokenFilter.java
similarity index 80%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PhoneticTokenFilter.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/PhoneticTokenFilter.java
index 558ba93330..519c699292 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PhoneticTokenFilter.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/PhoneticTokenFilter.java
@@ -30,11 +30,18 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.analysis;
 
 import jakarta.json.stream.JsonGenerator;
 import java.util.List;
+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;
@@ -47,41 +54,45 @@
 // typedef: _types.analysis.PhoneticTokenFilter
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class PhoneticTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
+
+    @Nonnull
     private final PhoneticEncoder encoder;
 
+    @Nonnull
     private final List<PhoneticLanguage> languageset;
 
     @Nullable
     private final Integer maxCodeLen;
 
+    @Nonnull
     private final PhoneticNameType nameType;
 
     @Nullable
     private final Boolean replace;
 
+    @Nonnull
     private final PhoneticRuleType ruleType;
 
     // ---------------------------------------------------------------------------------------------
 
     private PhoneticTokenFilter(Builder builder) {
         super(builder);
-
         this.encoder = ApiTypeHelper.requireNonNull(builder.encoder, this, "encoder");
         this.languageset = ApiTypeHelper.unmodifiableRequired(builder.languageset, this, "languageset");
         this.maxCodeLen = builder.maxCodeLen;
         this.nameType = ApiTypeHelper.requireNonNull(builder.nameType, this, "nameType");
         this.replace = builder.replace;
         this.ruleType = ApiTypeHelper.requireNonNull(builder.ruleType, this, "ruleType");
-
     }
 
-    public static PhoneticTokenFilter of(Function<Builder, ObjectBuilder<PhoneticTokenFilter>> fn) {
+    public static PhoneticTokenFilter of(Function<PhoneticTokenFilter.Builder, ObjectBuilder<PhoneticTokenFilter>> fn) {
         return fn.apply(new Builder()).build();
     }
 
     /**
-     * TokenFilterDefinition variant kind.
+     * {@link TokenFilterDefinition} variant kind.
      */
     @Override
     public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
@@ -91,6 +102,7 @@ public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
     /**
      * Required - API name: {@code encoder}
      */
+    @Nonnull
     public final PhoneticEncoder encoder() {
         return this.encoder;
     }
@@ -98,6 +110,7 @@ public final PhoneticEncoder encoder() {
     /**
      * Required - API name: {@code languageset}
      */
+    @Nonnull
     public final List<PhoneticLanguage> languageset() {
         return this.languageset;
     }
@@ -113,6 +126,7 @@ public final Integer maxCodeLen() {
     /**
      * Required - API name: {@code name_type}
      */
+    @Nonnull
     public final PhoneticNameType nameType() {
         return this.nameType;
     }
@@ -128,40 +142,39 @@ public final Boolean replace() {
     /**
      * Required - API name: {@code rule_type}
      */
+    @Nonnull
     public final PhoneticRuleType ruleType() {
         return this.ruleType;
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         generator.write("type", "phonetic");
         super.serializeInternal(generator, mapper);
         generator.writeKey("encoder");
         this.encoder.serialize(generator, mapper);
-        if (ApiTypeHelper.isDefined(this.languageset)) {
-            generator.writeKey("languageset");
-            generator.writeStartArray();
-            for (PhoneticLanguage item0 : this.languageset) {
-                item0.serialize(generator, mapper);
-            }
-            generator.writeEnd();
 
+        generator.writeKey("languageset");
+        generator.writeStartArray();
+        for (PhoneticLanguage item0 : this.languageset) {
+            item0.serialize(generator, mapper);
         }
+        generator.writeEnd();
+
         if (this.maxCodeLen != null) {
             generator.writeKey("max_code_len");
             generator.write(this.maxCodeLen);
-
         }
+
         generator.writeKey("name_type");
         this.nameType.serialize(generator, mapper);
+
         if (this.replace != null) {
             generator.writeKey("replace");
             generator.write(this.replace);
-
         }
+
         generator.writeKey("rule_type");
         this.ruleType.serialize(generator, mapper);
-
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -169,20 +182,14 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     /**
      * Builder for {@link PhoneticTokenFilter}.
      */
-
     public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<PhoneticTokenFilter> {
         private PhoneticEncoder encoder;
-
         private List<PhoneticLanguage> languageset;
-
         @Nullable
         private Integer maxCodeLen;
-
         private PhoneticNameType nameType;
-
         @Nullable
         private Boolean replace;
-
         private PhoneticRuleType ruleType;
 
         /**
@@ -195,8 +202,10 @@ public final Builder encoder(PhoneticEncoder value) {
 
         /**
          * Required - API name: {@code languageset}
+         *
          * <p>
          * Adds all elements of <code>list</code> to <code>languageset</code>.
+         * </p>
          */
         public final Builder languageset(List<PhoneticLanguage> list) {
             this.languageset = _listAddAll(this.languageset, list);
@@ -205,8 +214,10 @@ public final Builder languageset(List<PhoneticLanguage> list) {
 
         /**
          * Required - API name: {@code languageset}
+         *
          * <p>
          * Adds one or more values to <code>languageset</code>.
+         * </p>
          */
         public final Builder languageset(PhoneticLanguage value, PhoneticLanguage... values) {
             this.languageset = _listAdd(this.languageset, value, values);
@@ -253,8 +264,7 @@ protected Builder self() {
         /**
          * Builds a {@link PhoneticTokenFilter}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public PhoneticTokenFilter build() {
             _checkSingleUse();
@@ -285,4 +295,31 @@ protected static void setupPhoneticTokenFilterDeserializer(ObjectDeserializer<Ph
         op.ignore("type");
     }
 
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + this.encoder.hashCode();
+        result = 31 * result + this.languageset.hashCode();
+        result = 31 * result + Objects.hashCode(this.maxCodeLen);
+        result = 31 * result + this.nameType.hashCode();
+        result = 31 * result + Objects.hashCode(this.replace);
+        result = 31 * result + this.ruleType.hashCode();
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        PhoneticTokenFilter other = (PhoneticTokenFilter) o;
+        return this.encoder.equals(other.encoder)
+            && this.languageset.equals(other.languageset)
+            && Objects.equals(this.maxCodeLen, other.maxCodeLen)
+            && this.nameType.equals(other.nameType)
+            && Objects.equals(this.replace, other.replace)
+            && this.ruleType.equals(other.ruleType);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PorterStemTokenFilter.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/PorterStemTokenFilter.java
similarity index 80%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PorterStemTokenFilter.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/PorterStemTokenFilter.java
index 8a5a986ba8..af15e3a9c1 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PorterStemTokenFilter.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/PorterStemTokenFilter.java
@@ -30,10 +30,15 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.analysis;
 
 import jakarta.json.stream.JsonGenerator;
 import java.util.function.Function;
+import javax.annotation.Generated;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -44,20 +49,21 @@
 // typedef: _types.analysis.PorterStemTokenFilter
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class PorterStemTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
+
     // ---------------------------------------------------------------------------------------------
 
     private PorterStemTokenFilter(Builder builder) {
         super(builder);
-
     }
 
-    public static PorterStemTokenFilter of(Function<Builder, ObjectBuilder<PorterStemTokenFilter>> fn) {
+    public static PorterStemTokenFilter of(Function<PorterStemTokenFilter.Builder, ObjectBuilder<PorterStemTokenFilter>> fn) {
         return fn.apply(new Builder()).build();
     }
 
     /**
-     * TokenFilterDefinition variant kind.
+     * {@link TokenFilterDefinition} variant kind.
      */
     @Override
     public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
@@ -65,10 +71,8 @@ public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         generator.write("type", "porter_stem");
         super.serializeInternal(generator, mapper);
-
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -76,8 +80,8 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     /**
      * Builder for {@link PorterStemTokenFilter}.
      */
-
     public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<PorterStemTokenFilter> {
+
         @Override
         protected Builder self() {
             return this;
@@ -86,8 +90,7 @@ protected Builder self() {
         /**
          * Builds a {@link PorterStemTokenFilter}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public PorterStemTokenFilter build() {
             _checkSingleUse();
@@ -112,4 +115,19 @@ protected static void setupPorterStemTokenFilterDeserializer(ObjectDeserializer<
         op.ignore("type");
     }
 
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        return true;
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PredicateTokenFilter.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/PredicateTokenFilter.java
similarity index 78%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PredicateTokenFilter.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/PredicateTokenFilter.java
index de4983ce4a..beee708ec0 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PredicateTokenFilter.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/PredicateTokenFilter.java
@@ -30,10 +30,16 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.analysis;
 
 import jakarta.json.stream.JsonGenerator;
 import java.util.function.Function;
+import javax.annotation.Generated;
+import javax.annotation.Nonnull;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -46,24 +52,25 @@
 // typedef: _types.analysis.PredicateTokenFilter
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class PredicateTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
+
+    @Nonnull
     private final Script script;
 
     // ---------------------------------------------------------------------------------------------
 
     private PredicateTokenFilter(Builder builder) {
         super(builder);
-
         this.script = ApiTypeHelper.requireNonNull(builder.script, this, "script");
-
     }
 
-    public static PredicateTokenFilter of(Function<Builder, ObjectBuilder<PredicateTokenFilter>> fn) {
+    public static PredicateTokenFilter of(Function<PredicateTokenFilter.Builder, ObjectBuilder<PredicateTokenFilter>> fn) {
         return fn.apply(new Builder()).build();
     }
 
     /**
-     * TokenFilterDefinition variant kind.
+     * {@link TokenFilterDefinition} variant kind.
      */
     @Override
     public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
@@ -73,17 +80,16 @@ public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
     /**
      * Required - API name: {@code script}
      */
+    @Nonnull
     public final Script script() {
         return this.script;
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         generator.write("type", "predicate_token_filter");
         super.serializeInternal(generator, mapper);
         generator.writeKey("script");
         this.script.serialize(generator, mapper);
-
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -91,7 +97,6 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     /**
      * Builder for {@link PredicateTokenFilter}.
      */
-
     public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<PredicateTokenFilter> {
         private Script script;
 
@@ -107,7 +112,7 @@ public final Builder script(Script value) {
          * Required - API name: {@code script}
          */
         public final Builder script(Function<Script.Builder, ObjectBuilder<Script>> fn) {
-            return this.script(fn.apply(new Script.Builder()).build());
+            return script(fn.apply(new Script.Builder()).build());
         }
 
         @Override
@@ -118,8 +123,7 @@ protected Builder self() {
         /**
          * Builds a {@link PredicateTokenFilter}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public PredicateTokenFilter build() {
             _checkSingleUse();
@@ -139,10 +143,27 @@ public PredicateTokenFilter build() {
     );
 
     protected static void setupPredicateTokenFilterDeserializer(ObjectDeserializer<PredicateTokenFilter.Builder> op) {
-        TokenFilterBase.setupTokenFilterBaseDeserializer(op);
+        setupTokenFilterBaseDeserializer(op);
         op.add(Builder::script, Script._DESERIALIZER, "script");
 
         op.ignore("type");
     }
 
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + this.script.hashCode();
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        PredicateTokenFilter other = (PredicateTokenFilter) o;
+        return this.script.equals(other.script);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/RemoveDuplicatesTokenFilter.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/RemoveDuplicatesTokenFilter.java
similarity index 78%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/RemoveDuplicatesTokenFilter.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/RemoveDuplicatesTokenFilter.java
index a4578d99d9..128d9eea89 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/RemoveDuplicatesTokenFilter.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/RemoveDuplicatesTokenFilter.java
@@ -30,10 +30,15 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.analysis;
 
 import jakarta.json.stream.JsonGenerator;
 import java.util.function.Function;
+import javax.annotation.Generated;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -44,20 +49,23 @@
 // typedef: _types.analysis.RemoveDuplicatesTokenFilter
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class RemoveDuplicatesTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
+
     // ---------------------------------------------------------------------------------------------
 
     private RemoveDuplicatesTokenFilter(Builder builder) {
         super(builder);
-
     }
 
-    public static RemoveDuplicatesTokenFilter of(Function<Builder, ObjectBuilder<RemoveDuplicatesTokenFilter>> fn) {
+    public static RemoveDuplicatesTokenFilter of(
+        Function<RemoveDuplicatesTokenFilter.Builder, ObjectBuilder<RemoveDuplicatesTokenFilter>> fn
+    ) {
         return fn.apply(new Builder()).build();
     }
 
     /**
-     * TokenFilterDefinition variant kind.
+     * {@link TokenFilterDefinition} variant kind.
      */
     @Override
     public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
@@ -65,10 +73,8 @@ public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         generator.write("type", "remove_duplicates");
         super.serializeInternal(generator, mapper);
-
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -76,8 +82,8 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     /**
      * Builder for {@link RemoveDuplicatesTokenFilter}.
      */
-
     public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<RemoveDuplicatesTokenFilter> {
+
         @Override
         protected Builder self() {
             return this;
@@ -86,8 +92,7 @@ protected Builder self() {
         /**
          * Builds a {@link RemoveDuplicatesTokenFilter}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public RemoveDuplicatesTokenFilter build() {
             _checkSingleUse();
@@ -107,9 +112,24 @@ public RemoveDuplicatesTokenFilter build() {
     );
 
     protected static void setupRemoveDuplicatesTokenFilterDeserializer(ObjectDeserializer<RemoveDuplicatesTokenFilter.Builder> op) {
-        TokenFilterBase.setupTokenFilterBaseDeserializer(op);
+        setupTokenFilterBaseDeserializer(op);
 
         op.ignore("type");
     }
 
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        return true;
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/ReverseTokenFilter.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/ReverseTokenFilter.java
similarity index 80%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/ReverseTokenFilter.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/ReverseTokenFilter.java
index 2d2948ee83..da9f6fdbad 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/ReverseTokenFilter.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/ReverseTokenFilter.java
@@ -30,10 +30,15 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.analysis;
 
 import jakarta.json.stream.JsonGenerator;
 import java.util.function.Function;
+import javax.annotation.Generated;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -44,20 +49,21 @@
 // typedef: _types.analysis.ReverseTokenFilter
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class ReverseTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
+
     // ---------------------------------------------------------------------------------------------
 
     private ReverseTokenFilter(Builder builder) {
         super(builder);
-
     }
 
-    public static ReverseTokenFilter of(Function<Builder, ObjectBuilder<ReverseTokenFilter>> fn) {
+    public static ReverseTokenFilter of(Function<ReverseTokenFilter.Builder, ObjectBuilder<ReverseTokenFilter>> fn) {
         return fn.apply(new Builder()).build();
     }
 
     /**
-     * TokenFilterDefinition variant kind.
+     * {@link TokenFilterDefinition} variant kind.
      */
     @Override
     public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
@@ -65,10 +71,8 @@ public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         generator.write("type", "reverse");
         super.serializeInternal(generator, mapper);
-
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -76,8 +80,8 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     /**
      * Builder for {@link ReverseTokenFilter}.
      */
-
     public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<ReverseTokenFilter> {
+
         @Override
         protected Builder self() {
             return this;
@@ -86,8 +90,7 @@ protected Builder self() {
         /**
          * Builds a {@link ReverseTokenFilter}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public ReverseTokenFilter build() {
             _checkSingleUse();
@@ -112,4 +115,19 @@ protected static void setupReverseTokenFilterDeserializer(ObjectDeserializer<Rev
         op.ignore("type");
     }
 
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        return true;
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/ShingleTokenFilter.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/ShingleTokenFilter.java
similarity index 82%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/ShingleTokenFilter.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/ShingleTokenFilter.java
index 7222faf2d6..9c06217e98 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/ShingleTokenFilter.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/ShingleTokenFilter.java
@@ -30,10 +30,16 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 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.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -45,7 +51,9 @@
 // typedef: _types.analysis.ShingleTokenFilter
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class ShingleTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
+
     @Nullable
     private final String fillerToken;
 
@@ -68,22 +76,20 @@ public class ShingleTokenFilter extends TokenFilterBase implements TokenFilterDe
 
     private ShingleTokenFilter(Builder builder) {
         super(builder);
-
         this.fillerToken = builder.fillerToken;
         this.maxShingleSize = builder.maxShingleSize;
         this.minShingleSize = builder.minShingleSize;
         this.outputUnigrams = builder.outputUnigrams;
         this.outputUnigramsIfNoShingles = builder.outputUnigramsIfNoShingles;
         this.tokenSeparator = builder.tokenSeparator;
-
     }
 
-    public static ShingleTokenFilter of(Function<Builder, ObjectBuilder<ShingleTokenFilter>> fn) {
+    public static ShingleTokenFilter of(Function<ShingleTokenFilter.Builder, ObjectBuilder<ShingleTokenFilter>> fn) {
         return fn.apply(new Builder()).build();
     }
 
     /**
-     * TokenFilterDefinition variant kind.
+     * {@link TokenFilterDefinition} variant kind.
      */
     @Override
     public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
@@ -139,40 +145,37 @@ public final String tokenSeparator() {
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         generator.write("type", "shingle");
         super.serializeInternal(generator, mapper);
         if (this.fillerToken != null) {
             generator.writeKey("filler_token");
             generator.write(this.fillerToken);
-
         }
+
         if (this.maxShingleSize != null) {
             generator.writeKey("max_shingle_size");
             generator.write(this.maxShingleSize);
-
         }
+
         if (this.minShingleSize != null) {
             generator.writeKey("min_shingle_size");
             generator.write(this.minShingleSize);
-
         }
+
         if (this.outputUnigrams != null) {
             generator.writeKey("output_unigrams");
             generator.write(this.outputUnigrams);
-
         }
+
         if (this.outputUnigramsIfNoShingles != null) {
             generator.writeKey("output_unigrams_if_no_shingles");
             generator.write(this.outputUnigramsIfNoShingles);
-
         }
+
         if (this.tokenSeparator != null) {
             generator.writeKey("token_separator");
             generator.write(this.tokenSeparator);
-
         }
-
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -180,23 +183,17 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     /**
      * Builder for {@link ShingleTokenFilter}.
      */
-
     public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<ShingleTokenFilter> {
         @Nullable
         private String fillerToken;
-
         @Nullable
         private String maxShingleSize;
-
         @Nullable
         private String minShingleSize;
-
         @Nullable
         private Boolean outputUnigrams;
-
         @Nullable
         private Boolean outputUnigramsIfNoShingles;
-
         @Nullable
         private String tokenSeparator;
 
@@ -256,8 +253,7 @@ protected Builder self() {
         /**
          * Builds a {@link ShingleTokenFilter}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public ShingleTokenFilter build() {
             _checkSingleUse();
@@ -288,4 +284,31 @@ protected static void setupShingleTokenFilterDeserializer(ObjectDeserializer<Shi
         op.ignore("type");
     }
 
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + Objects.hashCode(this.fillerToken);
+        result = 31 * result + Objects.hashCode(this.maxShingleSize);
+        result = 31 * result + Objects.hashCode(this.minShingleSize);
+        result = 31 * result + Objects.hashCode(this.outputUnigrams);
+        result = 31 * result + Objects.hashCode(this.outputUnigramsIfNoShingles);
+        result = 31 * result + Objects.hashCode(this.tokenSeparator);
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        ShingleTokenFilter other = (ShingleTokenFilter) o;
+        return Objects.equals(this.fillerToken, other.fillerToken)
+            && Objects.equals(this.maxShingleSize, other.maxShingleSize)
+            && Objects.equals(this.minShingleSize, other.minShingleSize)
+            && Objects.equals(this.outputUnigrams, other.outputUnigrams)
+            && Objects.equals(this.outputUnigramsIfNoShingles, other.outputUnigramsIfNoShingles)
+            && Objects.equals(this.tokenSeparator, other.tokenSeparator);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/SmartcnStopTokenFilter.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/SmartcnStopTokenFilter.java
similarity index 68%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/SmartcnStopTokenFilter.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/SmartcnStopTokenFilter.java
index 07bd9860d2..7cf0ea770d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/SmartcnStopTokenFilter.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/SmartcnStopTokenFilter.java
@@ -6,10 +6,15 @@
  * compatible open source license.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.analysis;
 
 import jakarta.json.stream.JsonGenerator;
 import java.util.function.Function;
+import javax.annotation.Generated;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -17,23 +22,24 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 
-// typedef: _types.analysis.ReverseTokenFilter
+// typedef: _types.analysis.SmartcnStopTokenFilter
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class SmartcnStopTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
+
     // ---------------------------------------------------------------------------------------------
 
     private SmartcnStopTokenFilter(Builder builder) {
         super(builder);
-
     }
 
-    public static SmartcnStopTokenFilter of(Function<Builder, ObjectBuilder<SmartcnStopTokenFilter>> fn) {
+    public static SmartcnStopTokenFilter of(Function<SmartcnStopTokenFilter.Builder, ObjectBuilder<SmartcnStopTokenFilter>> fn) {
         return fn.apply(new Builder()).build();
     }
 
     /**
-     * TokenFilterDefinition variant kind.
+     * {@link TokenFilterDefinition} variant kind.
      */
     @Override
     public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
@@ -41,10 +47,8 @@ public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-        generator.write("type", TokenFilterDefinition.Kind.SmartcnStop.jsonValue());
+        generator.write("type", "smartcn_stop");
         super.serializeInternal(generator, mapper);
-
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -52,8 +56,8 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     /**
      * Builder for {@link SmartcnStopTokenFilter}.
      */
+    public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<SmartcnStopTokenFilter> {
 
-    public static class Builder extends AbstractBuilder<Builder> implements ObjectBuilder<SmartcnStopTokenFilter> {
         @Override
         protected Builder self() {
             return this;
@@ -62,8 +66,7 @@ protected Builder self() {
         /**
          * Builds a {@link SmartcnStopTokenFilter}.
          *
-         * @throws NullPointerException
-         *             if some required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public SmartcnStopTokenFilter build() {
             _checkSingleUse();
@@ -88,4 +91,19 @@ protected static void setupSmartcnStopTokenFilterDeserializer(ObjectDeserializer
         op.ignore("type");
     }
 
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        return true;
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/SnowballLanguage.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/SnowballLanguage.java
similarity index 86%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/SnowballLanguage.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/SnowballLanguage.java
index ed15871ce2..8a81e7299e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/SnowballLanguage.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/SnowballLanguage.java
@@ -30,12 +30,20 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.analysis;
 
+import javax.annotation.Generated;
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
+// typedef: _types.analysis.SnowballLanguage
+
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public enum SnowballLanguage implements JsonEnum {
     Armenian("Armenian"),
 
@@ -79,9 +87,7 @@ public enum SnowballLanguage implements JsonEnum {
 
     Swedish("Swedish"),
 
-    Turkish("Turkish"),
-
-    ;
+    Turkish("Turkish");
 
     private final String jsonValue;
 
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/SnowballTokenFilter.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/SnowballTokenFilter.java
similarity index 78%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/SnowballTokenFilter.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/SnowballTokenFilter.java
index ad245b1c82..a542790fec 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/SnowballTokenFilter.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/SnowballTokenFilter.java
@@ -30,10 +30,16 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.analysis;
 
 import jakarta.json.stream.JsonGenerator;
 import java.util.function.Function;
+import javax.annotation.Generated;
+import javax.annotation.Nonnull;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -45,24 +51,25 @@
 // typedef: _types.analysis.SnowballTokenFilter
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class SnowballTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
+
+    @Nonnull
     private final SnowballLanguage language;
 
     // ---------------------------------------------------------------------------------------------
 
     private SnowballTokenFilter(Builder builder) {
         super(builder);
-
         this.language = ApiTypeHelper.requireNonNull(builder.language, this, "language");
-
     }
 
-    public static SnowballTokenFilter of(Function<Builder, ObjectBuilder<SnowballTokenFilter>> fn) {
+    public static SnowballTokenFilter of(Function<SnowballTokenFilter.Builder, ObjectBuilder<SnowballTokenFilter>> fn) {
         return fn.apply(new Builder()).build();
     }
 
     /**
-     * TokenFilterDefinition variant kind.
+     * {@link TokenFilterDefinition} variant kind.
      */
     @Override
     public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
@@ -72,17 +79,16 @@ public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
     /**
      * Required - API name: {@code language}
      */
+    @Nonnull
     public final SnowballLanguage language() {
         return this.language;
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         generator.write("type", "snowball");
         super.serializeInternal(generator, mapper);
         generator.writeKey("language");
         this.language.serialize(generator, mapper);
-
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -90,7 +96,6 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     /**
      * Builder for {@link SnowballTokenFilter}.
      */
-
     public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<SnowballTokenFilter> {
         private SnowballLanguage language;
 
@@ -110,8 +115,7 @@ protected Builder self() {
         /**
          * Builds a {@link SnowballTokenFilter}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public SnowballTokenFilter build() {
             _checkSingleUse();
@@ -131,10 +135,27 @@ public SnowballTokenFilter build() {
     );
 
     protected static void setupSnowballTokenFilterDeserializer(ObjectDeserializer<SnowballTokenFilter.Builder> op) {
-        TokenFilterBase.setupTokenFilterBaseDeserializer(op);
+        setupTokenFilterBaseDeserializer(op);
         op.add(Builder::language, SnowballLanguage._DESERIALIZER, "language");
 
         op.ignore("type");
     }
 
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + this.language.hashCode();
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        SnowballTokenFilter other = (SnowballTokenFilter) o;
+        return this.language.equals(other.language);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/StemmerOverrideTokenFilter.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/StemmerOverrideTokenFilter.java
similarity index 81%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/StemmerOverrideTokenFilter.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/StemmerOverrideTokenFilter.java
index b48e6d91ef..9040f3d20c 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/StemmerOverrideTokenFilter.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/StemmerOverrideTokenFilter.java
@@ -30,11 +30,18 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.analysis;
 
 import jakarta.json.stream.JsonGenerator;
 import java.util.List;
+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;
@@ -47,7 +54,10 @@
 // typedef: _types.analysis.StemmerOverrideTokenFilter
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class StemmerOverrideTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
+
+    @Nonnull
     private final List<String> rules;
 
     @Nullable
@@ -57,18 +67,18 @@ public class StemmerOverrideTokenFilter extends TokenFilterBase implements Token
 
     private StemmerOverrideTokenFilter(Builder builder) {
         super(builder);
-
         this.rules = ApiTypeHelper.unmodifiable(builder.rules);
         this.rulesPath = builder.rulesPath;
-
     }
 
-    public static StemmerOverrideTokenFilter of(Function<Builder, ObjectBuilder<StemmerOverrideTokenFilter>> fn) {
+    public static StemmerOverrideTokenFilter of(
+        Function<StemmerOverrideTokenFilter.Builder, ObjectBuilder<StemmerOverrideTokenFilter>> fn
+    ) {
         return fn.apply(new Builder()).build();
     }
 
     /**
-     * TokenFilterDefinition variant kind.
+     * {@link TokenFilterDefinition} variant kind.
      */
     @Override
     public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
@@ -78,6 +88,7 @@ public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
     /**
      * API name: {@code rules}
      */
+    @Nonnull
     public final List<String> rules() {
         return this.rules;
     }
@@ -91,7 +102,6 @@ public final String rulesPath() {
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         generator.write("type", "stemmer_override");
         super.serializeInternal(generator, mapper);
         if (ApiTypeHelper.isDefined(this.rules)) {
@@ -99,17 +109,14 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
             generator.writeStartArray();
             for (String item0 : this.rules) {
                 generator.write(item0);
-
             }
             generator.writeEnd();
-
         }
+
         if (this.rulesPath != null) {
             generator.writeKey("rules_path");
             generator.write(this.rulesPath);
-
         }
-
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -117,18 +124,18 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     /**
      * Builder for {@link StemmerOverrideTokenFilter}.
      */
-
     public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<StemmerOverrideTokenFilter> {
         @Nullable
         private List<String> rules;
-
         @Nullable
         private String rulesPath;
 
         /**
          * API name: {@code rules}
+         *
          * <p>
          * Adds all elements of <code>list</code> to <code>rules</code>.
+         * </p>
          */
         public final Builder rules(List<String> list) {
             this.rules = _listAddAll(this.rules, list);
@@ -137,8 +144,10 @@ public final Builder rules(List<String> list) {
 
         /**
          * API name: {@code rules}
+         *
          * <p>
          * Adds one or more values to <code>rules</code>.
+         * </p>
          */
         public final Builder rules(String value, String... values) {
             this.rules = _listAdd(this.rules, value, values);
@@ -161,8 +170,7 @@ protected Builder self() {
         /**
          * Builds a {@link StemmerOverrideTokenFilter}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public StemmerOverrideTokenFilter build() {
             _checkSingleUse();
@@ -189,4 +197,22 @@ protected static void setupStemmerOverrideTokenFilterDeserializer(ObjectDeserial
         op.ignore("type");
     }
 
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + Objects.hashCode(this.rules);
+        result = 31 * result + Objects.hashCode(this.rulesPath);
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        StemmerOverrideTokenFilter other = (StemmerOverrideTokenFilter) o;
+        return Objects.equals(this.rules, other.rules) && Objects.equals(this.rulesPath, other.rulesPath);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/StemmerTokenFilter.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/StemmerTokenFilter.java
similarity index 71%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/StemmerTokenFilter.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/StemmerTokenFilter.java
index d07fa7940b..9a6ce6531b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/StemmerTokenFilter.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/StemmerTokenFilter.java
@@ -30,39 +30,46 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 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.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
-import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 
 // typedef: _types.analysis.StemmerTokenFilter
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class StemmerTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
+
+    @Nullable
     private final String language;
 
     // ---------------------------------------------------------------------------------------------
 
     private StemmerTokenFilter(Builder builder) {
         super(builder);
-
-        this.language = ApiTypeHelper.requireNonNull(builder.language, this, "language");
-
+        this.language = builder.language;
     }
 
-    public static StemmerTokenFilter of(Function<Builder, ObjectBuilder<StemmerTokenFilter>> fn) {
+    public static StemmerTokenFilter of(Function<StemmerTokenFilter.Builder, ObjectBuilder<StemmerTokenFilter>> fn) {
         return fn.apply(new Builder()).build();
     }
 
     /**
-     * TokenFilterDefinition variant kind.
+     * {@link TokenFilterDefinition} variant kind.
      */
     @Override
     public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
@@ -70,19 +77,20 @@ public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
     }
 
     /**
-     * Required - API name: {@code language}
+     * API name: {@code language}
      */
+    @Nullable
     public final String language() {
         return this.language;
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         generator.write("type", "stemmer");
         super.serializeInternal(generator, mapper);
-        generator.writeKey("language");
-        generator.write(this.language);
-
+        if (this.language != null) {
+            generator.writeKey("language");
+            generator.write(this.language);
+        }
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -90,14 +98,14 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     /**
      * Builder for {@link StemmerTokenFilter}.
      */
-
     public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<StemmerTokenFilter> {
+        @Nullable
         private String language;
 
         /**
-         * Required - API name: {@code language}
+         * API name: {@code language}
          */
-        public final Builder language(String value) {
+        public final Builder language(@Nullable String value) {
             this.language = value;
             return this;
         }
@@ -110,8 +118,7 @@ protected Builder self() {
         /**
          * Builds a {@link StemmerTokenFilter}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public StemmerTokenFilter build() {
             _checkSingleUse();
@@ -131,10 +138,27 @@ public StemmerTokenFilter build() {
     );
 
     protected static void setupStemmerTokenFilterDeserializer(ObjectDeserializer<StemmerTokenFilter.Builder> op) {
-        TokenFilterBase.setupTokenFilterBaseDeserializer(op);
+        setupTokenFilterBaseDeserializer(op);
         op.add(Builder::language, JsonpDeserializer.stringDeserializer(), "language");
 
         op.ignore("type");
     }
 
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + Objects.hashCode(this.language);
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        StemmerTokenFilter other = (StemmerTokenFilter) o;
+        return Objects.equals(this.language, other.language);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/StopTokenFilter.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/StopTokenFilter.java
similarity index 79%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/StopTokenFilter.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/StopTokenFilter.java
index 5a0dd858ce..2d0bcaa35d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/StopTokenFilter.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/StopTokenFilter.java
@@ -30,11 +30,18 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.analysis;
 
 import jakarta.json.stream.JsonGenerator;
 import java.util.List;
+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;
@@ -47,13 +54,16 @@
 // typedef: _types.analysis.StopTokenFilter
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class StopTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
+
     @Nullable
     private final Boolean ignoreCase;
 
     @Nullable
     private final Boolean removeTrailing;
 
+    @Nonnull
     private final List<String> stopwords;
 
     @Nullable
@@ -63,20 +73,18 @@ public class StopTokenFilter extends TokenFilterBase implements TokenFilterDefin
 
     private StopTokenFilter(Builder builder) {
         super(builder);
-
         this.ignoreCase = builder.ignoreCase;
         this.removeTrailing = builder.removeTrailing;
-        this.stopwords = ApiTypeHelper.unmodifiableRequired(builder.stopwords, this, "stopwords");
+        this.stopwords = ApiTypeHelper.unmodifiable(builder.stopwords);
         this.stopwordsPath = builder.stopwordsPath;
-
     }
 
-    public static StopTokenFilter of(Function<Builder, ObjectBuilder<StopTokenFilter>> fn) {
+    public static StopTokenFilter of(Function<StopTokenFilter.Builder, ObjectBuilder<StopTokenFilter>> fn) {
         return fn.apply(new Builder()).build();
     }
 
     /**
-     * TokenFilterDefinition variant kind.
+     * {@link TokenFilterDefinition} variant kind.
      */
     @Override
     public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
@@ -100,8 +108,9 @@ public final Boolean removeTrailing() {
     }
 
     /**
-     * Required - API name: {@code stopwords}
+     * API name: {@code stopwords}
      */
+    @Nonnull
     public final List<String> stopwords() {
         return this.stopwords;
     }
@@ -115,35 +124,31 @@ public final String stopwordsPath() {
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         generator.write("type", "stop");
         super.serializeInternal(generator, mapper);
         if (this.ignoreCase != null) {
             generator.writeKey("ignore_case");
             generator.write(this.ignoreCase);
-
         }
+
         if (this.removeTrailing != null) {
             generator.writeKey("remove_trailing");
             generator.write(this.removeTrailing);
-
         }
+
         if (ApiTypeHelper.isDefined(this.stopwords)) {
             generator.writeKey("stopwords");
             generator.writeStartArray();
             for (String item0 : this.stopwords) {
                 generator.write(item0);
-
             }
             generator.writeEnd();
-
         }
+
         if (this.stopwordsPath != null) {
             generator.writeKey("stopwords_path");
             generator.write(this.stopwordsPath);
-
         }
-
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -151,16 +156,13 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     /**
      * Builder for {@link StopTokenFilter}.
      */
-
     public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<StopTokenFilter> {
         @Nullable
         private Boolean ignoreCase;
-
         @Nullable
         private Boolean removeTrailing;
-
+        @Nullable
         private List<String> stopwords;
-
         @Nullable
         private String stopwordsPath;
 
@@ -181,9 +183,11 @@ public final Builder removeTrailing(@Nullable Boolean value) {
         }
 
         /**
-         * Required - API name: {@code stopwords}
+         * API name: {@code stopwords}
+         *
          * <p>
          * Adds all elements of <code>list</code> to <code>stopwords</code>.
+         * </p>
          */
         public final Builder stopwords(List<String> list) {
             this.stopwords = _listAddAll(this.stopwords, list);
@@ -191,9 +195,11 @@ public final Builder stopwords(List<String> list) {
         }
 
         /**
-         * Required - API name: {@code stopwords}
+         * API name: {@code stopwords}
+         *
          * <p>
          * Adds one or more values to <code>stopwords</code>.
+         * </p>
          */
         public final Builder stopwords(String value, String... values) {
             this.stopwords = _listAdd(this.stopwords, value, values);
@@ -216,8 +222,7 @@ protected Builder self() {
         /**
          * Builds a {@link StopTokenFilter}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public StopTokenFilter build() {
             _checkSingleUse();
@@ -246,4 +251,27 @@ protected static void setupStopTokenFilterDeserializer(ObjectDeserializer<StopTo
         op.ignore("type");
     }
 
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + Objects.hashCode(this.ignoreCase);
+        result = 31 * result + Objects.hashCode(this.removeTrailing);
+        result = 31 * result + Objects.hashCode(this.stopwords);
+        result = 31 * result + Objects.hashCode(this.stopwordsPath);
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        StopTokenFilter other = (StopTokenFilter) o;
+        return Objects.equals(this.ignoreCase, other.ignoreCase)
+            && Objects.equals(this.removeTrailing, other.removeTrailing)
+            && Objects.equals(this.stopwords, other.stopwords)
+            && Objects.equals(this.stopwordsPath, other.stopwordsPath);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/SynonymFormat.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/SynonymFormat.java
similarity index 83%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/SynonymFormat.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/SynonymFormat.java
index f8f13184cc..e9abe36977 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/SynonymFormat.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/SynonymFormat.java
@@ -30,18 +30,24 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.analysis;
 
+import javax.annotation.Generated;
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
+// typedef: _types.analysis.SynonymFormat
+
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public enum SynonymFormat implements JsonEnum {
     Solr("solr"),
 
-    Wordnet("wordnet"),
-
-    ;
+    Wordnet("wordnet");
 
     private final String jsonValue;
 
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/SynonymGraphTokenFilter.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/SynonymGraphTokenFilter.java
similarity index 82%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/SynonymGraphTokenFilter.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/SynonymGraphTokenFilter.java
index 9ae8fb60fd..b4a9178828 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/SynonymGraphTokenFilter.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/SynonymGraphTokenFilter.java
@@ -30,11 +30,18 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.analysis;
 
 import jakarta.json.stream.JsonGenerator;
 import java.util.List;
+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;
@@ -47,7 +54,9 @@
 // typedef: _types.analysis.SynonymGraphTokenFilter
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class SynonymGraphTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
+
     @Nullable
     private final Boolean expand;
 
@@ -57,6 +66,7 @@ public class SynonymGraphTokenFilter extends TokenFilterBase implements TokenFil
     @Nullable
     private final Boolean lenient;
 
+    @Nonnull
     private final List<String> synonyms;
 
     @Nullable
@@ -72,7 +82,6 @@ public class SynonymGraphTokenFilter extends TokenFilterBase implements TokenFil
 
     private SynonymGraphTokenFilter(Builder builder) {
         super(builder);
-
         this.expand = builder.expand;
         this.format = builder.format;
         this.lenient = builder.lenient;
@@ -80,15 +89,14 @@ private SynonymGraphTokenFilter(Builder builder) {
         this.synonymsPath = builder.synonymsPath;
         this.tokenizer = builder.tokenizer;
         this.updateable = builder.updateable;
-
     }
 
-    public static SynonymGraphTokenFilter of(Function<Builder, ObjectBuilder<SynonymGraphTokenFilter>> fn) {
+    public static SynonymGraphTokenFilter of(Function<SynonymGraphTokenFilter.Builder, ObjectBuilder<SynonymGraphTokenFilter>> fn) {
         return fn.apply(new Builder()).build();
     }
 
     /**
-     * TokenFilterDefinition variant kind.
+     * {@link TokenFilterDefinition} variant kind.
      */
     @Override
     public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
@@ -122,6 +130,7 @@ public final Boolean lenient() {
     /**
      * API name: {@code synonyms}
      */
+    @Nonnull
     public final List<String> synonyms() {
         return this.synonyms;
     }
@@ -151,49 +160,46 @@ public final Boolean updateable() {
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         generator.write("type", "synonym_graph");
         super.serializeInternal(generator, mapper);
         if (this.expand != null) {
             generator.writeKey("expand");
             generator.write(this.expand);
-
         }
+
         if (this.format != null) {
             generator.writeKey("format");
             this.format.serialize(generator, mapper);
         }
+
         if (this.lenient != null) {
             generator.writeKey("lenient");
             generator.write(this.lenient);
-
         }
+
         if (ApiTypeHelper.isDefined(this.synonyms)) {
             generator.writeKey("synonyms");
             generator.writeStartArray();
             for (String item0 : this.synonyms) {
                 generator.write(item0);
-
             }
             generator.writeEnd();
-
         }
+
         if (this.synonymsPath != null) {
             generator.writeKey("synonyms_path");
             generator.write(this.synonymsPath);
-
         }
+
         if (this.tokenizer != null) {
             generator.writeKey("tokenizer");
             generator.write(this.tokenizer);
-
         }
+
         if (this.updateable != null) {
             generator.writeKey("updateable");
             generator.write(this.updateable);
-
         }
-
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -201,26 +207,19 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     /**
      * Builder for {@link SynonymGraphTokenFilter}.
      */
-
     public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<SynonymGraphTokenFilter> {
         @Nullable
         private Boolean expand;
-
         @Nullable
         private SynonymFormat format;
-
         @Nullable
         private Boolean lenient;
-
         @Nullable
         private List<String> synonyms;
-
         @Nullable
         private String synonymsPath;
-
         @Nullable
         private String tokenizer;
-
         @Nullable
         private Boolean updateable;
 
@@ -250,8 +249,10 @@ public final Builder lenient(@Nullable Boolean value) {
 
         /**
          * API name: {@code synonyms}
+         *
          * <p>
          * Adds all elements of <code>list</code> to <code>synonyms</code>.
+         * </p>
          */
         public final Builder synonyms(List<String> list) {
             this.synonyms = _listAddAll(this.synonyms, list);
@@ -260,8 +261,10 @@ public final Builder synonyms(List<String> list) {
 
         /**
          * API name: {@code synonyms}
+         *
          * <p>
          * Adds one or more values to <code>synonyms</code>.
+         * </p>
          */
         public final Builder synonyms(String value, String... values) {
             this.synonyms = _listAdd(this.synonyms, value, values);
@@ -300,8 +303,7 @@ protected Builder self() {
         /**
          * Builds a {@link SynonymGraphTokenFilter}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public SynonymGraphTokenFilter build() {
             _checkSingleUse();
@@ -333,4 +335,33 @@ protected static void setupSynonymGraphTokenFilterDeserializer(ObjectDeserialize
         op.ignore("type");
     }
 
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + Objects.hashCode(this.expand);
+        result = 31 * result + Objects.hashCode(this.format);
+        result = 31 * result + Objects.hashCode(this.lenient);
+        result = 31 * result + Objects.hashCode(this.synonyms);
+        result = 31 * result + Objects.hashCode(this.synonymsPath);
+        result = 31 * result + Objects.hashCode(this.tokenizer);
+        result = 31 * result + Objects.hashCode(this.updateable);
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        SynonymGraphTokenFilter other = (SynonymGraphTokenFilter) o;
+        return Objects.equals(this.expand, other.expand)
+            && Objects.equals(this.format, other.format)
+            && Objects.equals(this.lenient, other.lenient)
+            && Objects.equals(this.synonyms, other.synonyms)
+            && Objects.equals(this.synonymsPath, other.synonymsPath)
+            && Objects.equals(this.tokenizer, other.tokenizer)
+            && Objects.equals(this.updateable, other.updateable);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/SynonymTokenFilter.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/SynonymTokenFilter.java
similarity index 82%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/SynonymTokenFilter.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/SynonymTokenFilter.java
index 055e7f92de..1780bb63ec 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/SynonymTokenFilter.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/SynonymTokenFilter.java
@@ -30,11 +30,18 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.analysis;
 
 import jakarta.json.stream.JsonGenerator;
 import java.util.List;
+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;
@@ -47,7 +54,9 @@
 // typedef: _types.analysis.SynonymTokenFilter
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class SynonymTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
+
     @Nullable
     private final Boolean expand;
 
@@ -57,6 +66,7 @@ public class SynonymTokenFilter extends TokenFilterBase implements TokenFilterDe
     @Nullable
     private final Boolean lenient;
 
+    @Nonnull
     private final List<String> synonyms;
 
     @Nullable
@@ -72,7 +82,6 @@ public class SynonymTokenFilter extends TokenFilterBase implements TokenFilterDe
 
     private SynonymTokenFilter(Builder builder) {
         super(builder);
-
         this.expand = builder.expand;
         this.format = builder.format;
         this.lenient = builder.lenient;
@@ -80,15 +89,14 @@ private SynonymTokenFilter(Builder builder) {
         this.synonymsPath = builder.synonymsPath;
         this.tokenizer = builder.tokenizer;
         this.updateable = builder.updateable;
-
     }
 
-    public static SynonymTokenFilter of(Function<Builder, ObjectBuilder<SynonymTokenFilter>> fn) {
+    public static SynonymTokenFilter of(Function<SynonymTokenFilter.Builder, ObjectBuilder<SynonymTokenFilter>> fn) {
         return fn.apply(new Builder()).build();
     }
 
     /**
-     * TokenFilterDefinition variant kind.
+     * {@link TokenFilterDefinition} variant kind.
      */
     @Override
     public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
@@ -122,6 +130,7 @@ public final Boolean lenient() {
     /**
      * API name: {@code synonyms}
      */
+    @Nonnull
     public final List<String> synonyms() {
         return this.synonyms;
     }
@@ -151,49 +160,46 @@ public final Boolean updateable() {
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         generator.write("type", "synonym");
         super.serializeInternal(generator, mapper);
         if (this.expand != null) {
             generator.writeKey("expand");
             generator.write(this.expand);
-
         }
+
         if (this.format != null) {
             generator.writeKey("format");
             this.format.serialize(generator, mapper);
         }
+
         if (this.lenient != null) {
             generator.writeKey("lenient");
             generator.write(this.lenient);
-
         }
+
         if (ApiTypeHelper.isDefined(this.synonyms)) {
             generator.writeKey("synonyms");
             generator.writeStartArray();
             for (String item0 : this.synonyms) {
                 generator.write(item0);
-
             }
             generator.writeEnd();
-
         }
+
         if (this.synonymsPath != null) {
             generator.writeKey("synonyms_path");
             generator.write(this.synonymsPath);
-
         }
+
         if (this.tokenizer != null) {
             generator.writeKey("tokenizer");
             generator.write(this.tokenizer);
-
         }
+
         if (this.updateable != null) {
             generator.writeKey("updateable");
             generator.write(this.updateable);
-
         }
-
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -201,26 +207,19 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     /**
      * Builder for {@link SynonymTokenFilter}.
      */
-
     public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<SynonymTokenFilter> {
         @Nullable
         private Boolean expand;
-
         @Nullable
         private SynonymFormat format;
-
         @Nullable
         private Boolean lenient;
-
         @Nullable
         private List<String> synonyms;
-
         @Nullable
         private String synonymsPath;
-
         @Nullable
         private String tokenizer;
-
         @Nullable
         private Boolean updateable;
 
@@ -250,8 +249,10 @@ public final Builder lenient(@Nullable Boolean value) {
 
         /**
          * API name: {@code synonyms}
+         *
          * <p>
          * Adds all elements of <code>list</code> to <code>synonyms</code>.
+         * </p>
          */
         public final Builder synonyms(List<String> list) {
             this.synonyms = _listAddAll(this.synonyms, list);
@@ -260,8 +261,10 @@ public final Builder synonyms(List<String> list) {
 
         /**
          * API name: {@code synonyms}
+         *
          * <p>
          * Adds one or more values to <code>synonyms</code>.
+         * </p>
          */
         public final Builder synonyms(String value, String... values) {
             this.synonyms = _listAdd(this.synonyms, value, values);
@@ -300,8 +303,7 @@ protected Builder self() {
         /**
          * Builds a {@link SynonymTokenFilter}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public SynonymTokenFilter build() {
             _checkSingleUse();
@@ -321,7 +323,7 @@ public SynonymTokenFilter build() {
     );
 
     protected static void setupSynonymTokenFilterDeserializer(ObjectDeserializer<SynonymTokenFilter.Builder> op) {
-        TokenFilterBase.setupTokenFilterBaseDeserializer(op);
+        setupTokenFilterBaseDeserializer(op);
         op.add(Builder::expand, JsonpDeserializer.booleanDeserializer(), "expand");
         op.add(Builder::format, SynonymFormat._DESERIALIZER, "format");
         op.add(Builder::lenient, JsonpDeserializer.booleanDeserializer(), "lenient");
@@ -333,4 +335,33 @@ protected static void setupSynonymTokenFilterDeserializer(ObjectDeserializer<Syn
         op.ignore("type");
     }
 
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + Objects.hashCode(this.expand);
+        result = 31 * result + Objects.hashCode(this.format);
+        result = 31 * result + Objects.hashCode(this.lenient);
+        result = 31 * result + Objects.hashCode(this.synonyms);
+        result = 31 * result + Objects.hashCode(this.synonymsPath);
+        result = 31 * result + Objects.hashCode(this.tokenizer);
+        result = 31 * result + Objects.hashCode(this.updateable);
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        SynonymTokenFilter other = (SynonymTokenFilter) o;
+        return Objects.equals(this.expand, other.expand)
+            && Objects.equals(this.format, other.format)
+            && Objects.equals(this.lenient, other.lenient)
+            && Objects.equals(this.synonyms, other.synonyms)
+            && Objects.equals(this.synonymsPath, other.synonymsPath)
+            && Objects.equals(this.tokenizer, other.tokenizer)
+            && Objects.equals(this.updateable, other.updateable);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenFilter.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/TokenFilter.java
similarity index 79%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenFilter.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/TokenFilter.java
index 9edbc9ab2b..663e5b602f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenFilter.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/TokenFilter.java
@@ -30,14 +30,21 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 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 org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
+import org.opensearch.client.json.PlainJsonSerializable;
 import org.opensearch.client.json.UnionDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
@@ -48,12 +55,14 @@
 // typedef: _types.analysis.TokenFilter
 
 @JsonpDeserializable
-public class TokenFilter implements TaggedUnion<TokenFilter.Kind, Object>, JsonpSerializable {
-
+@Generated("org.opensearch.client.codegen.CodeGenerator")
+public class TokenFilter implements TaggedUnion<TokenFilter.Kind, Object>, PlainJsonSerializable {
+    /**
+     * {@link TokenFilter} variant kinds.
+     */
     public enum Kind {
         Definition,
         Name
-
     }
 
     private final Kind _kind;
@@ -75,13 +84,11 @@ private TokenFilter(Kind kind, Object value) {
     }
 
     private TokenFilter(Builder builder) {
-
         this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
         this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
-
     }
 
-    public static TokenFilter of(Function<Builder, ObjectBuilder<TokenFilter>> fn) {
+    public static TokenFilter of(Function<TokenFilter.Builder, ObjectBuilder<TokenFilter>> fn) {
         return fn.apply(new Builder()).build();
     }
 
@@ -95,8 +102,7 @@ public boolean isDefinition() {
     /**
      * Get the {@code definition} variant value.
      *
-     * @throws IllegalStateException
-     *             if the current variant is not of the {@code definition} kind.
+     * @throws IllegalStateException if the current variant is not the {@code definition} kind.
      */
     public TokenFilterDefinition definition() {
         return TaggedUnionUtils.get(this, Kind.Definition);
@@ -112,8 +118,7 @@ public boolean isName() {
     /**
      * Get the {@code name} variant value.
      *
-     * @throws IllegalStateException
-     *             if the current variant is not of the {@code name} kind.
+     * @throws IllegalStateException if the current variant is not the {@code name} kind.
      */
     public String name() {
         return TaggedUnionUtils.get(this, Kind.Name);
@@ -127,11 +132,9 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
             switch (_kind) {
                 case Name:
                     generator.write(((String) this._value));
-
                     break;
             }
         }
-
     }
 
     public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TokenFilter> {
@@ -154,11 +157,11 @@ public ObjectBuilder<TokenFilter> name(String v) {
             return this;
         }
 
+        @Override
         public TokenFilter build() {
             _checkSingleUse();
             return new TokenFilter(this);
         }
-
     }
 
     private static JsonpDeserializer<TokenFilter> buildTokenFilterDeserializer() {
@@ -169,4 +172,20 @@ private static JsonpDeserializer<TokenFilter> buildTokenFilterDeserializer() {
     }
 
     public static final JsonpDeserializer<TokenFilter> _DESERIALIZER = JsonpDeserializer.lazy(TokenFilter::buildTokenFilterDeserializer);
+
+    @Override
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + Objects.hashCode(this._kind);
+        result = 31 * result + Objects.hashCode(this._value);
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        TokenFilter other = (TokenFilter) o;
+        return Objects.equals(this._kind, other._kind) && Objects.equals(this._value, other._value);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenFilterBase.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/TokenFilterBase.java
similarity index 79%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenFilterBase.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/TokenFilterBase.java
index 6775723c07..28ae11023f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenFilterBase.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/TokenFilterBase.java
@@ -30,9 +30,15 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.analysis;
 
 import jakarta.json.stream.JsonGenerator;
+import java.util.Objects;
+import javax.annotation.Generated;
 import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -42,16 +48,16 @@
 
 // typedef: _types.analysis.TokenFilterBase
 
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public abstract class TokenFilterBase implements PlainJsonSerializable {
+
     @Nullable
     private final String version;
 
     // ---------------------------------------------------------------------------------------------
 
     protected TokenFilterBase(AbstractBuilder<?> builder) {
-
         this.version = builder.version;
-
     }
 
     /**
@@ -65,6 +71,7 @@ public final String version() {
     /**
      * Serialize this object to JSON.
      */
+    @Override
     public void serialize(JsonGenerator generator, JsonpMapper mapper) {
         generator.writeStartObject();
         serializeInternal(generator, mapper);
@@ -72,15 +79,14 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         if (this.version != null) {
             generator.writeKey("version");
             generator.write(this.version);
-
         }
-
     }
 
+    // ---------------------------------------------------------------------------------------------
+
     protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
         @Nullable
         private String version;
@@ -94,14 +100,26 @@ public final BuilderT version(@Nullable String value) {
         }
 
         protected abstract BuilderT self();
-
     }
 
     // ---------------------------------------------------------------------------------------------
-    protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupTokenFilterBaseDeserializer(ObjectDeserializer<BuilderT> op) {
 
+    protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupTokenFilterBaseDeserializer(ObjectDeserializer<BuilderT> op) {
         op.add(AbstractBuilder::version, JsonpDeserializer.stringDeserializer(), "version");
+    }
 
+    @Override
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + Objects.hashCode(this.version);
+        return result;
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        TokenFilterBase other = (TokenFilterBase) o;
+        return Objects.equals(this.version, other.version);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenFilterBuilders.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/TokenFilterBuilders.java
similarity index 79%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenFilterBuilders.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/TokenFilterBuilders.java
index 86b60160cd..8485ff4214 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenFilterBuilders.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/TokenFilterBuilders.java
@@ -30,24 +30,30 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.analysis;
 
+import javax.annotation.Generated;
+
 /**
+ * <p>
  * Builders for {@link TokenFilter} variants.
+ * </p>
  * <p>
- * Variants <code>name</code> are not available here as they don't have a
- * dedicated class. Use {@link TokenFilter}'s builder for these.
- *
+ * Variants <code>name</code> are not available here as they don't have a dedicated class. Use {@link TokenFilter}'s builder for these.
+ * </p>
  */
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class TokenFilterBuilders {
     private TokenFilterBuilders() {}
 
     /**
-     * Creates a builder for the {@link TokenFilterDefinition definition}
-     * {@code TokenFilter} variant.
+     * Creates a builder for the {@link TokenFilterDefinition definition} {@code TokenFilter} variant.
      */
     public static TokenFilterDefinition.Builder definition() {
         return new TokenFilterDefinition.Builder();
     }
-
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenFilterDefinition.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/TokenFilterDefinition.java
similarity index 86%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenFilterDefinition.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/TokenFilterDefinition.java
index 3eb564c476..369faf8b85 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenFilterDefinition.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/TokenFilterDefinition.java
@@ -30,17 +30,23 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 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 org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
-import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.json.PlainJsonSerializable;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
@@ -50,115 +56,62 @@
 // typedef: _types.analysis.TokenFilterDefinition
 
 @JsonpDeserializable
-public class TokenFilterDefinition implements TaggedUnion<TokenFilterDefinition.Kind, TokenFilterDefinitionVariant>, JsonpSerializable {
-
-    /**
-     * {@link TokenFilterDefinition} variant kinds.
-     */
+@Generated("org.opensearch.client.codegen.CodeGenerator")
+public class TokenFilterDefinition implements TaggedUnion<TokenFilterDefinition.Kind, TokenFilterDefinitionVariant>, PlainJsonSerializable {
     /**
      * {@link TokenFilterDefinition} variant kinds.
      */
-
     public enum Kind implements JsonEnum {
         Asciifolding("asciifolding"),
-
         CommonGrams("common_grams"),
-
         Condition("condition"),
-
         DelimitedPayload("delimited_payload"),
-
         DictionaryDecompounder("dictionary_decompounder"),
-
         EdgeNgram("edge_ngram"),
-
         Elision("elision"),
-
         Fingerprint("fingerprint"),
-
         Hunspell("hunspell"),
-
         HyphenationDecompounder("hyphenation_decompounder"),
-
         IcuCollation("icu_collation"),
-
         IcuFolding("icu_folding"),
-
         IcuNormalizer("icu_normalizer"),
-
         IcuTokenizer("icu_tokenizer"),
-
         IcuTransform("icu_transform"),
-
-        Kstem("kstem"),
-
-        KeepTypes("keep_types"),
-
         Keep("keep"),
-
+        KeepTypes("keep_types"),
         KeywordMarker("keyword_marker"),
-
+        Kstem("kstem"),
         KuromojiPartOfSpeech("kuromoji_part_of_speech"),
-
         KuromojiReadingform("kuromoji_readingform"),
-
         KuromojiStemmer("kuromoji_stemmer"),
-
         Length("length"),
-
         Limit("limit"),
-
         Lowercase("lowercase"),
-
         Multiplexer("multiplexer"),
-
         Ngram("ngram"),
-
         NoriPartOfSpeech("nori_part_of_speech"),
-
         PatternCapture("pattern_capture"),
-
         PatternReplace("pattern_replace"),
-
+        PersianStem("persian_stem"),
         Phonetic("phonetic"),
-
         PorterStem("porter_stem"),
-
         PredicateTokenFilter("predicate_token_filter"),
-
         RemoveDuplicates("remove_duplicates"),
-
         Reverse("reverse"),
-
         Shingle("shingle"),
-
+        SmartcnStop("smartcn_stop"),
         Snowball("snowball"),
-
-        StemmerOverride("stemmer_override"),
-
         Stemmer("stemmer"),
-
+        StemmerOverride("stemmer_override"),
         Stop("stop"),
-
-        SynonymGraph("synonym_graph"),
-
         Synonym("synonym"),
-
+        SynonymGraph("synonym_graph"),
         Trim("trim"),
-
         Truncate("truncate"),
-
         Unique("unique"),
-
         Uppercase("uppercase"),
-
-        WordDelimiterGraph("word_delimiter_graph"),
-
         WordDelimiter("word_delimiter"),
-
-        SmartcnStop("smartcn_stop"),
-
-        ;
+        WordDelimiterGraph("word_delimiter_graph");
 
         private final String jsonValue;
 
@@ -166,10 +119,10 @@ public enum Kind implements JsonEnum {
             this.jsonValue = jsonValue;
         }
 
+        @Override
         public String jsonValue() {
-            return this.jsonValue;
+            return jsonValue;
         }
-
     }
 
     private final Kind _kind;
@@ -186,20 +139,16 @@ public final TokenFilterDefinitionVariant _get() {
     }
 
     public TokenFilterDefinition(TokenFilterDefinitionVariant value) {
-
         this._kind = ApiTypeHelper.requireNonNull(value._tokenFilterDefinitionKind(), this, "<variant kind>");
         this._value = ApiTypeHelper.requireNonNull(value, this, "<variant value>");
-
     }
 
     private TokenFilterDefinition(Builder builder) {
-
         this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
         this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
-
     }
 
-    public static TokenFilterDefinition of(Function<Builder, ObjectBuilder<TokenFilterDefinition>> fn) {
+    public static TokenFilterDefinition of(Function<TokenFilterDefinition.Builder, ObjectBuilder<TokenFilterDefinition>> fn) {
         return fn.apply(new Builder()).build();
     }
 
@@ -213,8 +162,7 @@ public boolean isAsciifolding() {
     /**
      * Get the {@code asciifolding} variant value.
      *
-     * @throws IllegalStateException
-     *             if the current variant is not of the {@code asciifolding} kind.
+     * @throws IllegalStateException if the current variant is not the {@code asciifolding} kind.
      */
     public AsciiFoldingTokenFilter asciifolding() {
         return TaggedUnionUtils.get(this, Kind.Asciifolding);
@@ -230,8 +178,7 @@ public boolean isCommonGrams() {
     /**
      * Get the {@code common_grams} variant value.
      *
-     * @throws IllegalStateException
-     *             if the current variant is not of the {@code common_grams} kind.
+     * @throws IllegalStateException if the current variant is not the {@code common_grams} kind.
      */
     public CommonGramsTokenFilter commonGrams() {
         return TaggedUnionUtils.get(this, Kind.CommonGrams);
@@ -247,8 +194,7 @@ public boolean isCondition() {
     /**
      * Get the {@code condition} variant value.
      *
-     * @throws IllegalStateException
-     *             if the current variant is not of the {@code condition} kind.
+     * @throws IllegalStateException if the current variant is not the {@code condition} kind.
      */
     public ConditionTokenFilter condition() {
         return TaggedUnionUtils.get(this, Kind.Condition);
@@ -264,9 +210,7 @@ public boolean isDelimitedPayload() {
     /**
      * Get the {@code delimited_payload} variant value.
      *
-     * @throws IllegalStateException
-     *             if the current variant is not of the {@code delimited_payload}
-     *             kind.
+     * @throws IllegalStateException if the current variant is not the {@code delimited_payload} kind.
      */
     public DelimitedPayloadTokenFilter delimitedPayload() {
         return TaggedUnionUtils.get(this, Kind.DelimitedPayload);
@@ -282,9 +226,7 @@ public boolean isDictionaryDecompounder() {
     /**
      * Get the {@code dictionary_decompounder} variant value.
      *
-     * @throws IllegalStateException
-     *             if the current variant is not of the
-     *             {@code dictionary_decompounder} kind.
+     * @throws IllegalStateException if the current variant is not the {@code dictionary_decompounder} kind.
      */
     public DictionaryDecompounderTokenFilter dictionaryDecompounder() {
         return TaggedUnionUtils.get(this, Kind.DictionaryDecompounder);
@@ -300,8 +242,7 @@ public boolean isEdgeNgram() {
     /**
      * Get the {@code edge_ngram} variant value.
      *
-     * @throws IllegalStateException
-     *             if the current variant is not of the {@code edge_ngram} kind.
+     * @throws IllegalStateException if the current variant is not the {@code edge_ngram} kind.
      */
     public EdgeNGramTokenFilter edgeNgram() {
         return TaggedUnionUtils.get(this, Kind.EdgeNgram);
@@ -317,8 +258,7 @@ public boolean isElision() {
     /**
      * Get the {@code elision} variant value.
      *
-     * @throws IllegalStateException
-     *             if the current variant is not of the {@code elision} kind.
+     * @throws IllegalStateException if the current variant is not the {@code elision} kind.
      */
     public ElisionTokenFilter elision() {
         return TaggedUnionUtils.get(this, Kind.Elision);
@@ -334,8 +274,7 @@ public boolean isFingerprint() {
     /**
      * Get the {@code fingerprint} variant value.
      *
-     * @throws IllegalStateException
-     *             if the current variant is not of the {@code fingerprint} kind.
+     * @throws IllegalStateException if the current variant is not the {@code fingerprint} kind.
      */
     public FingerprintTokenFilter fingerprint() {
         return TaggedUnionUtils.get(this, Kind.Fingerprint);
@@ -351,8 +290,7 @@ public boolean isHunspell() {
     /**
      * Get the {@code hunspell} variant value.
      *
-     * @throws IllegalStateException
-     *             if the current variant is not of the {@code hunspell} kind.
+     * @throws IllegalStateException if the current variant is not the {@code hunspell} kind.
      */
     public HunspellTokenFilter hunspell() {
         return TaggedUnionUtils.get(this, Kind.Hunspell);
@@ -368,9 +306,7 @@ public boolean isHyphenationDecompounder() {
     /**
      * Get the {@code hyphenation_decompounder} variant value.
      *
-     * @throws IllegalStateException
-     *             if the current variant is not of the
-     *             {@code hyphenation_decompounder} kind.
+     * @throws IllegalStateException if the current variant is not the {@code hyphenation_decompounder} kind.
      */
     public HyphenationDecompounderTokenFilter hyphenationDecompounder() {
         return TaggedUnionUtils.get(this, Kind.HyphenationDecompounder);
@@ -386,8 +322,7 @@ public boolean isIcuCollation() {
     /**
      * Get the {@code icu_collation} variant value.
      *
-     * @throws IllegalStateException
-     *             if the current variant is not of the {@code icu_collation} kind.
+     * @throws IllegalStateException if the current variant is not the {@code icu_collation} kind.
      */
     public IcuCollationTokenFilter icuCollation() {
         return TaggedUnionUtils.get(this, Kind.IcuCollation);
@@ -403,8 +338,7 @@ public boolean isIcuFolding() {
     /**
      * Get the {@code icu_folding} variant value.
      *
-     * @throws IllegalStateException
-     *             if the current variant is not of the {@code icu_folding} kind.
+     * @throws IllegalStateException if the current variant is not the {@code icu_folding} kind.
      */
     public IcuFoldingTokenFilter icuFolding() {
         return TaggedUnionUtils.get(this, Kind.IcuFolding);
@@ -420,8 +354,7 @@ public boolean isIcuNormalizer() {
     /**
      * Get the {@code icu_normalizer} variant value.
      *
-     * @throws IllegalStateException
-     *             if the current variant is not of the {@code icu_normalizer} kind.
+     * @throws IllegalStateException if the current variant is not the {@code icu_normalizer} kind.
      */
     public IcuNormalizationTokenFilter icuNormalizer() {
         return TaggedUnionUtils.get(this, Kind.IcuNormalizer);
@@ -437,8 +370,7 @@ public boolean isIcuTokenizer() {
     /**
      * Get the {@code icu_tokenizer} variant value.
      *
-     * @throws IllegalStateException
-     *             if the current variant is not of the {@code icu_tokenizer} kind.
+     * @throws IllegalStateException if the current variant is not the {@code icu_tokenizer} kind.
      */
     public IcuTokenizer icuTokenizer() {
         return TaggedUnionUtils.get(this, Kind.IcuTokenizer);
@@ -454,28 +386,26 @@ public boolean isIcuTransform() {
     /**
      * Get the {@code icu_transform} variant value.
      *
-     * @throws IllegalStateException
-     *             if the current variant is not of the {@code icu_transform} kind.
+     * @throws IllegalStateException if the current variant is not the {@code icu_transform} kind.
      */
     public IcuTransformTokenFilter icuTransform() {
         return TaggedUnionUtils.get(this, Kind.IcuTransform);
     }
 
     /**
-     * Is this variant instance of kind {@code kstem}?
+     * Is this variant instance of kind {@code keep}?
      */
-    public boolean isKstem() {
-        return _kind == Kind.Kstem;
+    public boolean isKeep() {
+        return _kind == Kind.Keep;
     }
 
     /**
-     * Get the {@code kstem} variant value.
+     * Get the {@code keep} variant value.
      *
-     * @throws IllegalStateException
-     *             if the current variant is not of the {@code kstem} kind.
+     * @throws IllegalStateException if the current variant is not the {@code keep} kind.
      */
-    public KStemTokenFilter kstem() {
-        return TaggedUnionUtils.get(this, Kind.Kstem);
+    public KeepWordsTokenFilter keep() {
+        return TaggedUnionUtils.get(this, Kind.Keep);
     }
 
     /**
@@ -488,45 +418,42 @@ public boolean isKeepTypes() {
     /**
      * Get the {@code keep_types} variant value.
      *
-     * @throws IllegalStateException
-     *             if the current variant is not of the {@code keep_types} kind.
+     * @throws IllegalStateException if the current variant is not the {@code keep_types} kind.
      */
     public KeepTypesTokenFilter keepTypes() {
         return TaggedUnionUtils.get(this, Kind.KeepTypes);
     }
 
     /**
-     * Is this variant instance of kind {@code keep}?
+     * Is this variant instance of kind {@code keyword_marker}?
      */
-    public boolean isKeep() {
-        return _kind == Kind.Keep;
+    public boolean isKeywordMarker() {
+        return _kind == Kind.KeywordMarker;
     }
 
     /**
-     * Get the {@code keep} variant value.
+     * Get the {@code keyword_marker} variant value.
      *
-     * @throws IllegalStateException
-     *             if the current variant is not of the {@code keep} kind.
+     * @throws IllegalStateException if the current variant is not the {@code keyword_marker} kind.
      */
-    public KeepWordsTokenFilter keep() {
-        return TaggedUnionUtils.get(this, Kind.Keep);
+    public KeywordMarkerTokenFilter keywordMarker() {
+        return TaggedUnionUtils.get(this, Kind.KeywordMarker);
     }
 
     /**
-     * Is this variant instance of kind {@code keyword_marker}?
+     * Is this variant instance of kind {@code kstem}?
      */
-    public boolean isKeywordMarker() {
-        return _kind == Kind.KeywordMarker;
+    public boolean isKstem() {
+        return _kind == Kind.Kstem;
     }
 
     /**
-     * Get the {@code keyword_marker} variant value.
+     * Get the {@code kstem} variant value.
      *
-     * @throws IllegalStateException
-     *             if the current variant is not of the {@code keyword_marker} kind.
+     * @throws IllegalStateException if the current variant is not the {@code kstem} kind.
      */
-    public KeywordMarkerTokenFilter keywordMarker() {
-        return TaggedUnionUtils.get(this, Kind.KeywordMarker);
+    public KStemTokenFilter kstem() {
+        return TaggedUnionUtils.get(this, Kind.Kstem);
     }
 
     /**
@@ -539,9 +466,7 @@ public boolean isKuromojiPartOfSpeech() {
     /**
      * Get the {@code kuromoji_part_of_speech} variant value.
      *
-     * @throws IllegalStateException
-     *             if the current variant is not of the
-     *             {@code kuromoji_part_of_speech} kind.
+     * @throws IllegalStateException if the current variant is not the {@code kuromoji_part_of_speech} kind.
      */
     public KuromojiPartOfSpeechTokenFilter kuromojiPartOfSpeech() {
         return TaggedUnionUtils.get(this, Kind.KuromojiPartOfSpeech);
@@ -557,9 +482,7 @@ public boolean isKuromojiReadingform() {
     /**
      * Get the {@code kuromoji_readingform} variant value.
      *
-     * @throws IllegalStateException
-     *             if the current variant is not of the {@code kuromoji_readingform}
-     *             kind.
+     * @throws IllegalStateException if the current variant is not the {@code kuromoji_readingform} kind.
      */
     public KuromojiReadingFormTokenFilter kuromojiReadingform() {
         return TaggedUnionUtils.get(this, Kind.KuromojiReadingform);
@@ -575,9 +498,7 @@ public boolean isKuromojiStemmer() {
     /**
      * Get the {@code kuromoji_stemmer} variant value.
      *
-     * @throws IllegalStateException
-     *             if the current variant is not of the {@code kuromoji_stemmer}
-     *             kind.
+     * @throws IllegalStateException if the current variant is not the {@code kuromoji_stemmer} kind.
      */
     public KuromojiStemmerTokenFilter kuromojiStemmer() {
         return TaggedUnionUtils.get(this, Kind.KuromojiStemmer);
@@ -593,8 +514,7 @@ public boolean isLength() {
     /**
      * Get the {@code length} variant value.
      *
-     * @throws IllegalStateException
-     *             if the current variant is not of the {@code length} kind.
+     * @throws IllegalStateException if the current variant is not the {@code length} kind.
      */
     public LengthTokenFilter length() {
         return TaggedUnionUtils.get(this, Kind.Length);
@@ -610,8 +530,7 @@ public boolean isLimit() {
     /**
      * Get the {@code limit} variant value.
      *
-     * @throws IllegalStateException
-     *             if the current variant is not of the {@code limit} kind.
+     * @throws IllegalStateException if the current variant is not the {@code limit} kind.
      */
     public LimitTokenCountTokenFilter limit() {
         return TaggedUnionUtils.get(this, Kind.Limit);
@@ -627,8 +546,7 @@ public boolean isLowercase() {
     /**
      * Get the {@code lowercase} variant value.
      *
-     * @throws IllegalStateException
-     *             if the current variant is not of the {@code lowercase} kind.
+     * @throws IllegalStateException if the current variant is not the {@code lowercase} kind.
      */
     public LowercaseTokenFilter lowercase() {
         return TaggedUnionUtils.get(this, Kind.Lowercase);
@@ -644,8 +562,7 @@ public boolean isMultiplexer() {
     /**
      * Get the {@code multiplexer} variant value.
      *
-     * @throws IllegalStateException
-     *             if the current variant is not of the {@code multiplexer} kind.
+     * @throws IllegalStateException if the current variant is not the {@code multiplexer} kind.
      */
     public MultiplexerTokenFilter multiplexer() {
         return TaggedUnionUtils.get(this, Kind.Multiplexer);
@@ -661,8 +578,7 @@ public boolean isNgram() {
     /**
      * Get the {@code ngram} variant value.
      *
-     * @throws IllegalStateException
-     *             if the current variant is not of the {@code ngram} kind.
+     * @throws IllegalStateException if the current variant is not the {@code ngram} kind.
      */
     public NGramTokenFilter ngram() {
         return TaggedUnionUtils.get(this, Kind.Ngram);
@@ -678,9 +594,7 @@ public boolean isNoriPartOfSpeech() {
     /**
      * Get the {@code nori_part_of_speech} variant value.
      *
-     * @throws IllegalStateException
-     *             if the current variant is not of the {@code nori_part_of_speech}
-     *             kind.
+     * @throws IllegalStateException if the current variant is not the {@code nori_part_of_speech} kind.
      */
     public NoriPartOfSpeechTokenFilter noriPartOfSpeech() {
         return TaggedUnionUtils.get(this, Kind.NoriPartOfSpeech);
@@ -696,9 +610,7 @@ public boolean isPatternCapture() {
     /**
      * Get the {@code pattern_capture} variant value.
      *
-     * @throws IllegalStateException
-     *             if the current variant is not of the {@code pattern_capture}
-     *             kind.
+     * @throws IllegalStateException if the current variant is not the {@code pattern_capture} kind.
      */
     public PatternCaptureTokenFilter patternCapture() {
         return TaggedUnionUtils.get(this, Kind.PatternCapture);
@@ -714,14 +626,28 @@ public boolean isPatternReplace() {
     /**
      * Get the {@code pattern_replace} variant value.
      *
-     * @throws IllegalStateException
-     *             if the current variant is not of the {@code pattern_replace}
-     *             kind.
+     * @throws IllegalStateException if the current variant is not the {@code pattern_replace} kind.
      */
     public PatternReplaceTokenFilter patternReplace() {
         return TaggedUnionUtils.get(this, Kind.PatternReplace);
     }
 
+    /**
+     * Is this variant instance of kind {@code persian_stem}?
+     */
+    public boolean isPersianStem() {
+        return _kind == Kind.PersianStem;
+    }
+
+    /**
+     * Get the {@code persian_stem} variant value.
+     *
+     * @throws IllegalStateException if the current variant is not the {@code persian_stem} kind.
+     */
+    public PersianStemTokenFilter persianStem() {
+        return TaggedUnionUtils.get(this, Kind.PersianStem);
+    }
+
     /**
      * Is this variant instance of kind {@code phonetic}?
      */
@@ -732,8 +658,7 @@ public boolean isPhonetic() {
     /**
      * Get the {@code phonetic} variant value.
      *
-     * @throws IllegalStateException
-     *             if the current variant is not of the {@code phonetic} kind.
+     * @throws IllegalStateException if the current variant is not the {@code phonetic} kind.
      */
     public PhoneticTokenFilter phonetic() {
         return TaggedUnionUtils.get(this, Kind.Phonetic);
@@ -749,8 +674,7 @@ public boolean isPorterStem() {
     /**
      * Get the {@code porter_stem} variant value.
      *
-     * @throws IllegalStateException
-     *             if the current variant is not of the {@code porter_stem} kind.
+     * @throws IllegalStateException if the current variant is not the {@code porter_stem} kind.
      */
     public PorterStemTokenFilter porterStem() {
         return TaggedUnionUtils.get(this, Kind.PorterStem);
@@ -766,9 +690,7 @@ public boolean isPredicateTokenFilter() {
     /**
      * Get the {@code predicate_token_filter} variant value.
      *
-     * @throws IllegalStateException
-     *             if the current variant is not of the
-     *             {@code predicate_token_filter} kind.
+     * @throws IllegalStateException if the current variant is not the {@code predicate_token_filter} kind.
      */
     public PredicateTokenFilter predicateTokenFilter() {
         return TaggedUnionUtils.get(this, Kind.PredicateTokenFilter);
@@ -784,9 +706,7 @@ public boolean isRemoveDuplicates() {
     /**
      * Get the {@code remove_duplicates} variant value.
      *
-     * @throws IllegalStateException
-     *             if the current variant is not of the {@code remove_duplicates}
-     *             kind.
+     * @throws IllegalStateException if the current variant is not the {@code remove_duplicates} kind.
      */
     public RemoveDuplicatesTokenFilter removeDuplicates() {
         return TaggedUnionUtils.get(this, Kind.RemoveDuplicates);
@@ -802,8 +722,7 @@ public boolean isReverse() {
     /**
      * Get the {@code reverse} variant value.
      *
-     * @throws IllegalStateException
-     *             if the current variant is not of the {@code reverse} kind.
+     * @throws IllegalStateException if the current variant is not the {@code reverse} kind.
      */
     public ReverseTokenFilter reverse() {
         return TaggedUnionUtils.get(this, Kind.Reverse);
@@ -819,46 +738,42 @@ public boolean isShingle() {
     /**
      * Get the {@code shingle} variant value.
      *
-     * @throws IllegalStateException
-     *             if the current variant is not of the {@code shingle} kind.
+     * @throws IllegalStateException if the current variant is not the {@code shingle} kind.
      */
     public ShingleTokenFilter shingle() {
         return TaggedUnionUtils.get(this, Kind.Shingle);
     }
 
     /**
-     * Is this variant instance of kind {@code snowball}?
+     * Is this variant instance of kind {@code smartcn_stop}?
      */
-    public boolean isSnowball() {
-        return _kind == Kind.Snowball;
+    public boolean isSmartcnStop() {
+        return _kind == Kind.SmartcnStop;
     }
 
     /**
-     * Get the {@code snowball} variant value.
+     * Get the {@code smartcn_stop} variant value.
      *
-     * @throws IllegalStateException
-     *             if the current variant is not of the {@code snowball} kind.
+     * @throws IllegalStateException if the current variant is not the {@code smartcn_stop} kind.
      */
-    public SnowballTokenFilter snowball() {
-        return TaggedUnionUtils.get(this, Kind.Snowball);
+    public SmartcnStopTokenFilter smartcnStop() {
+        return TaggedUnionUtils.get(this, Kind.SmartcnStop);
     }
 
     /**
-     * Is this variant instance of kind {@code stemmer_override}?
+     * Is this variant instance of kind {@code snowball}?
      */
-    public boolean isStemmerOverride() {
-        return _kind == Kind.StemmerOverride;
+    public boolean isSnowball() {
+        return _kind == Kind.Snowball;
     }
 
     /**
-     * Get the {@code stemmer_override} variant value.
+     * Get the {@code snowball} variant value.
      *
-     * @throws IllegalStateException
-     *             if the current variant is not of the {@code stemmer_override}
-     *             kind.
+     * @throws IllegalStateException if the current variant is not the {@code snowball} kind.
      */
-    public StemmerOverrideTokenFilter stemmerOverride() {
-        return TaggedUnionUtils.get(this, Kind.StemmerOverride);
+    public SnowballTokenFilter snowball() {
+        return TaggedUnionUtils.get(this, Kind.Snowball);
     }
 
     /**
@@ -871,45 +786,42 @@ public boolean isStemmer() {
     /**
      * Get the {@code stemmer} variant value.
      *
-     * @throws IllegalStateException
-     *             if the current variant is not of the {@code stemmer} kind.
+     * @throws IllegalStateException if the current variant is not the {@code stemmer} kind.
      */
     public StemmerTokenFilter stemmer() {
         return TaggedUnionUtils.get(this, Kind.Stemmer);
     }
 
     /**
-     * Is this variant instance of kind {@code stop}?
+     * Is this variant instance of kind {@code stemmer_override}?
      */
-    public boolean isStop() {
-        return _kind == Kind.Stop;
+    public boolean isStemmerOverride() {
+        return _kind == Kind.StemmerOverride;
     }
 
     /**
-     * Get the {@code stop} variant value.
+     * Get the {@code stemmer_override} variant value.
      *
-     * @throws IllegalStateException
-     *             if the current variant is not of the {@code stop} kind.
+     * @throws IllegalStateException if the current variant is not the {@code stemmer_override} kind.
      */
-    public StopTokenFilter stop() {
-        return TaggedUnionUtils.get(this, Kind.Stop);
+    public StemmerOverrideTokenFilter stemmerOverride() {
+        return TaggedUnionUtils.get(this, Kind.StemmerOverride);
     }
 
     /**
-     * Is this variant instance of kind {@code synonym_graph}?
+     * Is this variant instance of kind {@code stop}?
      */
-    public boolean isSynonymGraph() {
-        return _kind == Kind.SynonymGraph;
+    public boolean isStop() {
+        return _kind == Kind.Stop;
     }
 
     /**
-     * Get the {@code synonym_graph} variant value.
+     * Get the {@code stop} variant value.
      *
-     * @throws IllegalStateException
-     *             if the current variant is not of the {@code synonym_graph} kind.
+     * @throws IllegalStateException if the current variant is not the {@code stop} kind.
      */
-    public SynonymGraphTokenFilter synonymGraph() {
-        return TaggedUnionUtils.get(this, Kind.SynonymGraph);
+    public StopTokenFilter stop() {
+        return TaggedUnionUtils.get(this, Kind.Stop);
     }
 
     /**
@@ -922,13 +834,28 @@ public boolean isSynonym() {
     /**
      * Get the {@code synonym} variant value.
      *
-     * @throws IllegalStateException
-     *             if the current variant is not of the {@code synonym} kind.
+     * @throws IllegalStateException if the current variant is not the {@code synonym} kind.
      */
     public SynonymTokenFilter synonym() {
         return TaggedUnionUtils.get(this, Kind.Synonym);
     }
 
+    /**
+     * Is this variant instance of kind {@code synonym_graph}?
+     */
+    public boolean isSynonymGraph() {
+        return _kind == Kind.SynonymGraph;
+    }
+
+    /**
+     * Get the {@code synonym_graph} variant value.
+     *
+     * @throws IllegalStateException if the current variant is not the {@code synonym_graph} kind.
+     */
+    public SynonymGraphTokenFilter synonymGraph() {
+        return TaggedUnionUtils.get(this, Kind.SynonymGraph);
+    }
+
     /**
      * Is this variant instance of kind {@code trim}?
      */
@@ -939,8 +866,7 @@ public boolean isTrim() {
     /**
      * Get the {@code trim} variant value.
      *
-     * @throws IllegalStateException
-     *             if the current variant is not of the {@code trim} kind.
+     * @throws IllegalStateException if the current variant is not the {@code trim} kind.
      */
     public TrimTokenFilter trim() {
         return TaggedUnionUtils.get(this, Kind.Trim);
@@ -956,8 +882,7 @@ public boolean isTruncate() {
     /**
      * Get the {@code truncate} variant value.
      *
-     * @throws IllegalStateException
-     *             if the current variant is not of the {@code truncate} kind.
+     * @throws IllegalStateException if the current variant is not the {@code truncate} kind.
      */
     public TruncateTokenFilter truncate() {
         return TaggedUnionUtils.get(this, Kind.Truncate);
@@ -973,8 +898,7 @@ public boolean isUnique() {
     /**
      * Get the {@code unique} variant value.
      *
-     * @throws IllegalStateException
-     *             if the current variant is not of the {@code unique} kind.
+     * @throws IllegalStateException if the current variant is not the {@code unique} kind.
      */
     public UniqueTokenFilter unique() {
         return TaggedUnionUtils.get(this, Kind.Unique);
@@ -990,53 +914,47 @@ public boolean isUppercase() {
     /**
      * Get the {@code uppercase} variant value.
      *
-     * @throws IllegalStateException
-     *             if the current variant is not of the {@code uppercase} kind.
+     * @throws IllegalStateException if the current variant is not the {@code uppercase} kind.
      */
     public UppercaseTokenFilter uppercase() {
         return TaggedUnionUtils.get(this, Kind.Uppercase);
     }
 
     /**
-     * Is this variant instance of kind {@code word_delimiter_graph}?
+     * Is this variant instance of kind {@code word_delimiter}?
      */
-    public boolean isWordDelimiterGraph() {
-        return _kind == Kind.WordDelimiterGraph;
+    public boolean isWordDelimiter() {
+        return _kind == Kind.WordDelimiter;
     }
 
     /**
-     * Get the {@code word_delimiter_graph} variant value.
+     * Get the {@code word_delimiter} variant value.
      *
-     * @throws IllegalStateException
-     *             if the current variant is not of the {@code word_delimiter_graph}
-     *             kind.
+     * @throws IllegalStateException if the current variant is not the {@code word_delimiter} kind.
      */
-    public WordDelimiterGraphTokenFilter wordDelimiterGraph() {
-        return TaggedUnionUtils.get(this, Kind.WordDelimiterGraph);
+    public WordDelimiterTokenFilter wordDelimiter() {
+        return TaggedUnionUtils.get(this, Kind.WordDelimiter);
     }
 
     /**
-     * Is this variant instance of kind {@code word_delimiter}?
+     * Is this variant instance of kind {@code word_delimiter_graph}?
      */
-    public boolean isWordDelimiter() {
-        return _kind == Kind.WordDelimiter;
+    public boolean isWordDelimiterGraph() {
+        return _kind == Kind.WordDelimiterGraph;
     }
 
     /**
-     * Get the {@code word_delimiter} variant value.
+     * Get the {@code word_delimiter_graph} variant value.
      *
-     * @throws IllegalStateException
-     *             if the current variant is not of the {@code word_delimiter} kind.
+     * @throws IllegalStateException if the current variant is not the {@code word_delimiter_graph} kind.
      */
-    public WordDelimiterTokenFilter wordDelimiter() {
-        return TaggedUnionUtils.get(this, Kind.WordDelimiter);
+    public WordDelimiterGraphTokenFilter wordDelimiterGraph() {
+        return TaggedUnionUtils.get(this, Kind.WordDelimiterGraph);
     }
 
     @Override
     public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-
         mapper.serialize(_value, generator);
-
     }
 
     public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TokenFilterDefinition> {
@@ -1217,14 +1135,14 @@ public ObjectBuilder<TokenFilterDefinition> icuTransform(
             return this.icuTransform(fn.apply(new IcuTransformTokenFilter.Builder()).build());
         }
 
-        public ObjectBuilder<TokenFilterDefinition> kstem(KStemTokenFilter v) {
-            this._kind = Kind.Kstem;
+        public ObjectBuilder<TokenFilterDefinition> keep(KeepWordsTokenFilter v) {
+            this._kind = Kind.Keep;
             this._value = v;
             return this;
         }
 
-        public ObjectBuilder<TokenFilterDefinition> kstem(Function<KStemTokenFilter.Builder, ObjectBuilder<KStemTokenFilter>> fn) {
-            return this.kstem(fn.apply(new KStemTokenFilter.Builder()).build());
+        public ObjectBuilder<TokenFilterDefinition> keep(Function<KeepWordsTokenFilter.Builder, ObjectBuilder<KeepWordsTokenFilter>> fn) {
+            return this.keep(fn.apply(new KeepWordsTokenFilter.Builder()).build());
         }
 
         public ObjectBuilder<TokenFilterDefinition> keepTypes(KeepTypesTokenFilter v) {
@@ -1239,16 +1157,6 @@ public ObjectBuilder<TokenFilterDefinition> keepTypes(
             return this.keepTypes(fn.apply(new KeepTypesTokenFilter.Builder()).build());
         }
 
-        public ObjectBuilder<TokenFilterDefinition> keep(KeepWordsTokenFilter v) {
-            this._kind = Kind.Keep;
-            this._value = v;
-            return this;
-        }
-
-        public ObjectBuilder<TokenFilterDefinition> keep(Function<KeepWordsTokenFilter.Builder, ObjectBuilder<KeepWordsTokenFilter>> fn) {
-            return this.keep(fn.apply(new KeepWordsTokenFilter.Builder()).build());
-        }
-
         public ObjectBuilder<TokenFilterDefinition> keywordMarker(KeywordMarkerTokenFilter v) {
             this._kind = Kind.KeywordMarker;
             this._value = v;
@@ -1261,6 +1169,16 @@ public ObjectBuilder<TokenFilterDefinition> keywordMarker(
             return this.keywordMarker(fn.apply(new KeywordMarkerTokenFilter.Builder()).build());
         }
 
+        public ObjectBuilder<TokenFilterDefinition> kstem(KStemTokenFilter v) {
+            this._kind = Kind.Kstem;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> kstem(Function<KStemTokenFilter.Builder, ObjectBuilder<KStemTokenFilter>> fn) {
+            return this.kstem(fn.apply(new KStemTokenFilter.Builder()).build());
+        }
+
         public ObjectBuilder<TokenFilterDefinition> kuromojiPartOfSpeech(KuromojiPartOfSpeechTokenFilter v) {
             this._kind = Kind.KuromojiPartOfSpeech;
             this._value = v;
@@ -1389,6 +1307,18 @@ public ObjectBuilder<TokenFilterDefinition> patternReplace(
             return this.patternReplace(fn.apply(new PatternReplaceTokenFilter.Builder()).build());
         }
 
+        public ObjectBuilder<TokenFilterDefinition> persianStem(PersianStemTokenFilter v) {
+            this._kind = Kind.PersianStem;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> persianStem(
+            Function<PersianStemTokenFilter.Builder, ObjectBuilder<PersianStemTokenFilter>> fn
+        ) {
+            return this.persianStem(fn.apply(new PersianStemTokenFilter.Builder()).build());
+        }
+
         public ObjectBuilder<TokenFilterDefinition> phonetic(PhoneticTokenFilter v) {
             this._kind = Kind.Phonetic;
             this._value = v;
@@ -1455,6 +1385,18 @@ public ObjectBuilder<TokenFilterDefinition> shingle(Function<ShingleTokenFilter.
             return this.shingle(fn.apply(new ShingleTokenFilter.Builder()).build());
         }
 
+        public ObjectBuilder<TokenFilterDefinition> smartcnStop(SmartcnStopTokenFilter v) {
+            this._kind = Kind.SmartcnStop;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> smartcnStop(
+            Function<SmartcnStopTokenFilter.Builder, ObjectBuilder<SmartcnStopTokenFilter>> fn
+        ) {
+            return this.smartcnStop(fn.apply(new SmartcnStopTokenFilter.Builder()).build());
+        }
+
         public ObjectBuilder<TokenFilterDefinition> snowball(SnowballTokenFilter v) {
             this._kind = Kind.Snowball;
             this._value = v;
@@ -1465,6 +1407,16 @@ public ObjectBuilder<TokenFilterDefinition> snowball(Function<SnowballTokenFilte
             return this.snowball(fn.apply(new SnowballTokenFilter.Builder()).build());
         }
 
+        public ObjectBuilder<TokenFilterDefinition> stemmer(StemmerTokenFilter v) {
+            this._kind = Kind.Stemmer;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> stemmer(Function<StemmerTokenFilter.Builder, ObjectBuilder<StemmerTokenFilter>> fn) {
+            return this.stemmer(fn.apply(new StemmerTokenFilter.Builder()).build());
+        }
+
         public ObjectBuilder<TokenFilterDefinition> stemmerOverride(StemmerOverrideTokenFilter v) {
             this._kind = Kind.StemmerOverride;
             this._value = v;
@@ -1477,24 +1429,24 @@ public ObjectBuilder<TokenFilterDefinition> stemmerOverride(
             return this.stemmerOverride(fn.apply(new StemmerOverrideTokenFilter.Builder()).build());
         }
 
-        public ObjectBuilder<TokenFilterDefinition> stemmer(StemmerTokenFilter v) {
-            this._kind = Kind.Stemmer;
+        public ObjectBuilder<TokenFilterDefinition> stop(StopTokenFilter v) {
+            this._kind = Kind.Stop;
             this._value = v;
             return this;
         }
 
-        public ObjectBuilder<TokenFilterDefinition> stemmer(Function<StemmerTokenFilter.Builder, ObjectBuilder<StemmerTokenFilter>> fn) {
-            return this.stemmer(fn.apply(new StemmerTokenFilter.Builder()).build());
+        public ObjectBuilder<TokenFilterDefinition> stop(Function<StopTokenFilter.Builder, ObjectBuilder<StopTokenFilter>> fn) {
+            return this.stop(fn.apply(new StopTokenFilter.Builder()).build());
         }
 
-        public ObjectBuilder<TokenFilterDefinition> stop(StopTokenFilter v) {
-            this._kind = Kind.Stop;
+        public ObjectBuilder<TokenFilterDefinition> synonym(SynonymTokenFilter v) {
+            this._kind = Kind.Synonym;
             this._value = v;
             return this;
         }
 
-        public ObjectBuilder<TokenFilterDefinition> stop(Function<StopTokenFilter.Builder, ObjectBuilder<StopTokenFilter>> fn) {
-            return this.stop(fn.apply(new StopTokenFilter.Builder()).build());
+        public ObjectBuilder<TokenFilterDefinition> synonym(Function<SynonymTokenFilter.Builder, ObjectBuilder<SynonymTokenFilter>> fn) {
+            return this.synonym(fn.apply(new SynonymTokenFilter.Builder()).build());
         }
 
         public ObjectBuilder<TokenFilterDefinition> synonymGraph(SynonymGraphTokenFilter v) {
@@ -1509,16 +1461,6 @@ public ObjectBuilder<TokenFilterDefinition> synonymGraph(
             return this.synonymGraph(fn.apply(new SynonymGraphTokenFilter.Builder()).build());
         }
 
-        public ObjectBuilder<TokenFilterDefinition> synonym(SynonymTokenFilter v) {
-            this._kind = Kind.Synonym;
-            this._value = v;
-            return this;
-        }
-
-        public ObjectBuilder<TokenFilterDefinition> synonym(Function<SynonymTokenFilter.Builder, ObjectBuilder<SynonymTokenFilter>> fn) {
-            return this.synonym(fn.apply(new SynonymTokenFilter.Builder()).build());
-        }
-
         public ObjectBuilder<TokenFilterDefinition> trim(TrimTokenFilter v) {
             this._kind = Kind.Trim;
             this._value = v;
@@ -1561,18 +1503,6 @@ public ObjectBuilder<TokenFilterDefinition> uppercase(
             return this.uppercase(fn.apply(new UppercaseTokenFilter.Builder()).build());
         }
 
-        public ObjectBuilder<TokenFilterDefinition> wordDelimiterGraph(WordDelimiterGraphTokenFilter v) {
-            this._kind = Kind.WordDelimiterGraph;
-            this._value = v;
-            return this;
-        }
-
-        public ObjectBuilder<TokenFilterDefinition> wordDelimiterGraph(
-            Function<WordDelimiterGraphTokenFilter.Builder, ObjectBuilder<WordDelimiterGraphTokenFilter>> fn
-        ) {
-            return this.wordDelimiterGraph(fn.apply(new WordDelimiterGraphTokenFilter.Builder()).build());
-        }
-
         public ObjectBuilder<TokenFilterDefinition> wordDelimiter(WordDelimiterTokenFilter v) {
             this._kind = Kind.WordDelimiter;
             this._value = v;
@@ -1585,27 +1515,26 @@ public ObjectBuilder<TokenFilterDefinition> wordDelimiter(
             return this.wordDelimiter(fn.apply(new WordDelimiterTokenFilter.Builder()).build());
         }
 
-        public ObjectBuilder<TokenFilterDefinition> smartcn_stop(SmartcnStopTokenFilter v) {
-            this._kind = Kind.IcuTokenizer;
+        public ObjectBuilder<TokenFilterDefinition> wordDelimiterGraph(WordDelimiterGraphTokenFilter v) {
+            this._kind = Kind.WordDelimiterGraph;
             this._value = v;
             return this;
         }
 
-        public ObjectBuilder<TokenFilterDefinition> smartcn_stop(
-            Function<SmartcnStopTokenFilter.Builder, ObjectBuilder<SmartcnStopTokenFilter>> fn
+        public ObjectBuilder<TokenFilterDefinition> wordDelimiterGraph(
+            Function<WordDelimiterGraphTokenFilter.Builder, ObjectBuilder<WordDelimiterGraphTokenFilter>> fn
         ) {
-            return this.smartcn_stop(fn.apply(new SmartcnStopTokenFilter.Builder()).build());
+            return this.wordDelimiterGraph(fn.apply(new WordDelimiterGraphTokenFilter.Builder()).build());
         }
 
+        @Override
         public TokenFilterDefinition build() {
             _checkSingleUse();
             return new TokenFilterDefinition(this);
         }
-
     }
 
     protected static void setupTokenFilterDefinitionDeserializer(ObjectDeserializer<Builder> op) {
-
         op.add(Builder::asciifolding, AsciiFoldingTokenFilter._DESERIALIZER, "asciifolding");
         op.add(Builder::commonGrams, CommonGramsTokenFilter._DESERIALIZER, "common_grams");
         op.add(Builder::condition, ConditionTokenFilter._DESERIALIZER, "condition");
@@ -1621,10 +1550,10 @@ protected static void setupTokenFilterDefinitionDeserializer(ObjectDeserializer<
         op.add(Builder::icuNormalizer, IcuNormalizationTokenFilter._DESERIALIZER, "icu_normalizer");
         op.add(Builder::icuTokenizer, IcuTokenizer._DESERIALIZER, "icu_tokenizer");
         op.add(Builder::icuTransform, IcuTransformTokenFilter._DESERIALIZER, "icu_transform");
-        op.add(Builder::kstem, KStemTokenFilter._DESERIALIZER, "kstem");
-        op.add(Builder::keepTypes, KeepTypesTokenFilter._DESERIALIZER, "keep_types");
         op.add(Builder::keep, KeepWordsTokenFilter._DESERIALIZER, "keep");
+        op.add(Builder::keepTypes, KeepTypesTokenFilter._DESERIALIZER, "keep_types");
         op.add(Builder::keywordMarker, KeywordMarkerTokenFilter._DESERIALIZER, "keyword_marker");
+        op.add(Builder::kstem, KStemTokenFilter._DESERIALIZER, "kstem");
         op.add(Builder::kuromojiPartOfSpeech, KuromojiPartOfSpeechTokenFilter._DESERIALIZER, "kuromoji_part_of_speech");
         op.add(Builder::kuromojiReadingform, KuromojiReadingFormTokenFilter._DESERIALIZER, "kuromoji_readingform");
         op.add(Builder::kuromojiStemmer, KuromojiStemmerTokenFilter._DESERIALIZER, "kuromoji_stemmer");
@@ -1636,28 +1565,28 @@ protected static void setupTokenFilterDefinitionDeserializer(ObjectDeserializer<
         op.add(Builder::noriPartOfSpeech, NoriPartOfSpeechTokenFilter._DESERIALIZER, "nori_part_of_speech");
         op.add(Builder::patternCapture, PatternCaptureTokenFilter._DESERIALIZER, "pattern_capture");
         op.add(Builder::patternReplace, PatternReplaceTokenFilter._DESERIALIZER, "pattern_replace");
+        op.add(Builder::persianStem, PersianStemTokenFilter._DESERIALIZER, "persian_stem");
         op.add(Builder::phonetic, PhoneticTokenFilter._DESERIALIZER, "phonetic");
         op.add(Builder::porterStem, PorterStemTokenFilter._DESERIALIZER, "porter_stem");
         op.add(Builder::predicateTokenFilter, PredicateTokenFilter._DESERIALIZER, "predicate_token_filter");
         op.add(Builder::removeDuplicates, RemoveDuplicatesTokenFilter._DESERIALIZER, "remove_duplicates");
         op.add(Builder::reverse, ReverseTokenFilter._DESERIALIZER, "reverse");
         op.add(Builder::shingle, ShingleTokenFilter._DESERIALIZER, "shingle");
+        op.add(Builder::smartcnStop, SmartcnStopTokenFilter._DESERIALIZER, "smartcn_stop");
         op.add(Builder::snowball, SnowballTokenFilter._DESERIALIZER, "snowball");
-        op.add(Builder::stemmerOverride, StemmerOverrideTokenFilter._DESERIALIZER, "stemmer_override");
         op.add(Builder::stemmer, StemmerTokenFilter._DESERIALIZER, "stemmer");
+        op.add(Builder::stemmerOverride, StemmerOverrideTokenFilter._DESERIALIZER, "stemmer_override");
         op.add(Builder::stop, StopTokenFilter._DESERIALIZER, "stop");
-        op.add(Builder::synonymGraph, SynonymGraphTokenFilter._DESERIALIZER, "synonym_graph");
         op.add(Builder::synonym, SynonymTokenFilter._DESERIALIZER, "synonym");
+        op.add(Builder::synonymGraph, SynonymGraphTokenFilter._DESERIALIZER, "synonym_graph");
         op.add(Builder::trim, TrimTokenFilter._DESERIALIZER, "trim");
         op.add(Builder::truncate, TruncateTokenFilter._DESERIALIZER, "truncate");
         op.add(Builder::unique, UniqueTokenFilter._DESERIALIZER, "unique");
         op.add(Builder::uppercase, UppercaseTokenFilter._DESERIALIZER, "uppercase");
-        op.add(Builder::wordDelimiterGraph, WordDelimiterGraphTokenFilter._DESERIALIZER, "word_delimiter_graph");
         op.add(Builder::wordDelimiter, WordDelimiterTokenFilter._DESERIALIZER, "word_delimiter");
-        op.add(Builder::smartcn_stop, SmartcnStopTokenFilter._DESERIALIZER, Kind.SmartcnStop.jsonValue());
+        op.add(Builder::wordDelimiterGraph, WordDelimiterGraphTokenFilter._DESERIALIZER, "word_delimiter_graph");
 
         op.setTypeProperty("type", null);
-
     }
 
     public static final JsonpDeserializer<TokenFilterDefinition> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
@@ -1665,4 +1594,20 @@ protected static void setupTokenFilterDefinitionDeserializer(ObjectDeserializer<
         TokenFilterDefinition::setupTokenFilterDefinitionDeserializer,
         Builder::build
     );
+
+    @Override
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + Objects.hashCode(this._kind);
+        result = 31 * result + Objects.hashCode(this._value);
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        TokenFilterDefinition other = (TokenFilterDefinition) o;
+        return Objects.equals(this._kind, other._kind) && Objects.equals(this._value, other._value);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenFilterDefinitionBuilders.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/TokenFilterDefinitionBuilders.java
similarity index 75%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenFilterDefinitionBuilders.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/TokenFilterDefinitionBuilders.java
index 0eda693af2..ca7f7772f2 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenFilterDefinitionBuilders.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/TokenFilterDefinitionBuilders.java
@@ -30,396 +30,368 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.analysis;
 
+import javax.annotation.Generated;
+
 /**
  * Builders for {@link TokenFilterDefinition} variants.
  */
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class TokenFilterDefinitionBuilders {
     private TokenFilterDefinitionBuilders() {}
 
     /**
-     * Creates a builder for the {@link AsciiFoldingTokenFilter asciifolding}
-     * {@code TokenFilterDefinition} variant.
+     * Creates a builder for the {@link AsciiFoldingTokenFilter asciifolding} {@code TokenFilterDefinition} variant.
      */
     public static AsciiFoldingTokenFilter.Builder asciifolding() {
         return new AsciiFoldingTokenFilter.Builder();
     }
 
     /**
-     * Creates a builder for the {@link CommonGramsTokenFilter common_grams}
-     * {@code TokenFilterDefinition} variant.
+     * Creates a builder for the {@link CommonGramsTokenFilter common_grams} {@code TokenFilterDefinition} variant.
      */
     public static CommonGramsTokenFilter.Builder commonGrams() {
         return new CommonGramsTokenFilter.Builder();
     }
 
     /**
-     * Creates a builder for the {@link ConditionTokenFilter condition}
-     * {@code TokenFilterDefinition} variant.
+     * Creates a builder for the {@link ConditionTokenFilter condition} {@code TokenFilterDefinition} variant.
      */
     public static ConditionTokenFilter.Builder condition() {
         return new ConditionTokenFilter.Builder();
     }
 
     /**
-     * Creates a builder for the {@link DelimitedPayloadTokenFilter
-     * delimited_payload} {@code TokenFilterDefinition} variant.
+     * Creates a builder for the {@link DelimitedPayloadTokenFilter delimited_payload} {@code TokenFilterDefinition} variant.
      */
     public static DelimitedPayloadTokenFilter.Builder delimitedPayload() {
         return new DelimitedPayloadTokenFilter.Builder();
     }
 
     /**
-     * Creates a builder for the {@link DictionaryDecompounderTokenFilter
-     * dictionary_decompounder} {@code TokenFilterDefinition} variant.
+     * Creates a builder for the {@link DictionaryDecompounderTokenFilter dictionary_decompounder} {@code TokenFilterDefinition} variant.
      */
     public static DictionaryDecompounderTokenFilter.Builder dictionaryDecompounder() {
         return new DictionaryDecompounderTokenFilter.Builder();
     }
 
     /**
-     * Creates a builder for the {@link EdgeNGramTokenFilter edge_ngram}
-     * {@code TokenFilterDefinition} variant.
+     * Creates a builder for the {@link EdgeNGramTokenFilter edge_ngram} {@code TokenFilterDefinition} variant.
      */
     public static EdgeNGramTokenFilter.Builder edgeNgram() {
         return new EdgeNGramTokenFilter.Builder();
     }
 
     /**
-     * Creates a builder for the {@link ElisionTokenFilter elision}
-     * {@code TokenFilterDefinition} variant.
+     * Creates a builder for the {@link ElisionTokenFilter elision} {@code TokenFilterDefinition} variant.
      */
     public static ElisionTokenFilter.Builder elision() {
         return new ElisionTokenFilter.Builder();
     }
 
     /**
-     * Creates a builder for the {@link FingerprintTokenFilter fingerprint}
-     * {@code TokenFilterDefinition} variant.
+     * Creates a builder for the {@link FingerprintTokenFilter fingerprint} {@code TokenFilterDefinition} variant.
      */
     public static FingerprintTokenFilter.Builder fingerprint() {
         return new FingerprintTokenFilter.Builder();
     }
 
     /**
-     * Creates a builder for the {@link HunspellTokenFilter hunspell}
-     * {@code TokenFilterDefinition} variant.
+     * Creates a builder for the {@link HunspellTokenFilter hunspell} {@code TokenFilterDefinition} variant.
      */
     public static HunspellTokenFilter.Builder hunspell() {
         return new HunspellTokenFilter.Builder();
     }
 
     /**
-     * Creates a builder for the {@link HyphenationDecompounderTokenFilter
-     * hyphenation_decompounder} {@code TokenFilterDefinition} variant.
+     * Creates a builder for the {@link HyphenationDecompounderTokenFilter hyphenation_decompounder} {@code TokenFilterDefinition} variant.
      */
     public static HyphenationDecompounderTokenFilter.Builder hyphenationDecompounder() {
         return new HyphenationDecompounderTokenFilter.Builder();
     }
 
     /**
-     * Creates a builder for the {@link IcuCollationTokenFilter icu_collation}
-     * {@code TokenFilterDefinition} variant.
+     * Creates a builder for the {@link IcuCollationTokenFilter icu_collation} {@code TokenFilterDefinition} variant.
      */
     public static IcuCollationTokenFilter.Builder icuCollation() {
         return new IcuCollationTokenFilter.Builder();
     }
 
     /**
-     * Creates a builder for the {@link IcuFoldingTokenFilter icu_folding}
-     * {@code TokenFilterDefinition} variant.
+     * Creates a builder for the {@link IcuFoldingTokenFilter icu_folding} {@code TokenFilterDefinition} variant.
      */
     public static IcuFoldingTokenFilter.Builder icuFolding() {
         return new IcuFoldingTokenFilter.Builder();
     }
 
     /**
-     * Creates a builder for the {@link IcuNormalizationTokenFilter icu_normalizer}
-     * {@code TokenFilterDefinition} variant.
+     * Creates a builder for the {@link IcuNormalizationTokenFilter icu_normalizer} {@code TokenFilterDefinition} variant.
      */
     public static IcuNormalizationTokenFilter.Builder icuNormalizer() {
         return new IcuNormalizationTokenFilter.Builder();
     }
 
     /**
-     * Creates a builder for the {@link IcuTokenizer icu_tokenizer}
-     * {@code TokenFilterDefinition} variant.
+     * Creates a builder for the {@link IcuTokenizer icu_tokenizer} {@code TokenFilterDefinition} variant.
      */
     public static IcuTokenizer.Builder icuTokenizer() {
         return new IcuTokenizer.Builder();
     }
 
     /**
-     * Creates a builder for the {@link IcuTransformTokenFilter icu_transform}
-     * {@code TokenFilterDefinition} variant.
+     * Creates a builder for the {@link IcuTransformTokenFilter icu_transform} {@code TokenFilterDefinition} variant.
      */
     public static IcuTransformTokenFilter.Builder icuTransform() {
         return new IcuTransformTokenFilter.Builder();
     }
 
     /**
-     * Creates a builder for the {@link KStemTokenFilter kstem}
-     * {@code TokenFilterDefinition} variant.
+     * Creates a builder for the {@link KeepWordsTokenFilter keep} {@code TokenFilterDefinition} variant.
      */
-    public static KStemTokenFilter.Builder kstem() {
-        return new KStemTokenFilter.Builder();
+    public static KeepWordsTokenFilter.Builder keep() {
+        return new KeepWordsTokenFilter.Builder();
     }
 
     /**
-     * Creates a builder for the {@link KeepTypesTokenFilter keep_types}
-     * {@code TokenFilterDefinition} variant.
+     * Creates a builder for the {@link KeepTypesTokenFilter keep_types} {@code TokenFilterDefinition} variant.
      */
     public static KeepTypesTokenFilter.Builder keepTypes() {
         return new KeepTypesTokenFilter.Builder();
     }
 
     /**
-     * Creates a builder for the {@link KeepWordsTokenFilter keep}
-     * {@code TokenFilterDefinition} variant.
+     * Creates a builder for the {@link KeywordMarkerTokenFilter keyword_marker} {@code TokenFilterDefinition} variant.
      */
-    public static KeepWordsTokenFilter.Builder keep() {
-        return new KeepWordsTokenFilter.Builder();
+    public static KeywordMarkerTokenFilter.Builder keywordMarker() {
+        return new KeywordMarkerTokenFilter.Builder();
     }
 
     /**
-     * Creates a builder for the {@link KeywordMarkerTokenFilter keyword_marker}
-     * {@code TokenFilterDefinition} variant.
+     * Creates a builder for the {@link KStemTokenFilter kstem} {@code TokenFilterDefinition} variant.
      */
-    public static KeywordMarkerTokenFilter.Builder keywordMarker() {
-        return new KeywordMarkerTokenFilter.Builder();
+    public static KStemTokenFilter.Builder kstem() {
+        return new KStemTokenFilter.Builder();
     }
 
     /**
-     * Creates a builder for the {@link KuromojiPartOfSpeechTokenFilter
-     * kuromoji_part_of_speech} {@code TokenFilterDefinition} variant.
+     * Creates a builder for the {@link KuromojiPartOfSpeechTokenFilter kuromoji_part_of_speech} {@code TokenFilterDefinition} variant.
      */
     public static KuromojiPartOfSpeechTokenFilter.Builder kuromojiPartOfSpeech() {
         return new KuromojiPartOfSpeechTokenFilter.Builder();
     }
 
     /**
-     * Creates a builder for the {@link KuromojiReadingFormTokenFilter
-     * kuromoji_readingform} {@code TokenFilterDefinition} variant.
+     * Creates a builder for the {@link KuromojiReadingFormTokenFilter kuromoji_readingform} {@code TokenFilterDefinition} variant.
      */
     public static KuromojiReadingFormTokenFilter.Builder kuromojiReadingform() {
         return new KuromojiReadingFormTokenFilter.Builder();
     }
 
     /**
-     * Creates a builder for the {@link KuromojiStemmerTokenFilter kuromoji_stemmer}
-     * {@code TokenFilterDefinition} variant.
+     * Creates a builder for the {@link KuromojiStemmerTokenFilter kuromoji_stemmer} {@code TokenFilterDefinition} variant.
      */
     public static KuromojiStemmerTokenFilter.Builder kuromojiStemmer() {
         return new KuromojiStemmerTokenFilter.Builder();
     }
 
     /**
-     * Creates a builder for the {@link LengthTokenFilter length}
-     * {@code TokenFilterDefinition} variant.
+     * Creates a builder for the {@link LengthTokenFilter length} {@code TokenFilterDefinition} variant.
      */
     public static LengthTokenFilter.Builder length() {
         return new LengthTokenFilter.Builder();
     }
 
     /**
-     * Creates a builder for the {@link LimitTokenCountTokenFilter limit}
-     * {@code TokenFilterDefinition} variant.
+     * Creates a builder for the {@link LimitTokenCountTokenFilter limit} {@code TokenFilterDefinition} variant.
      */
     public static LimitTokenCountTokenFilter.Builder limit() {
         return new LimitTokenCountTokenFilter.Builder();
     }
 
     /**
-     * Creates a builder for the {@link LowercaseTokenFilter lowercase}
-     * {@code TokenFilterDefinition} variant.
+     * Creates a builder for the {@link LowercaseTokenFilter lowercase} {@code TokenFilterDefinition} variant.
      */
     public static LowercaseTokenFilter.Builder lowercase() {
         return new LowercaseTokenFilter.Builder();
     }
 
     /**
-     * Creates a builder for the {@link MultiplexerTokenFilter multiplexer}
-     * {@code TokenFilterDefinition} variant.
+     * Creates a builder for the {@link MultiplexerTokenFilter multiplexer} {@code TokenFilterDefinition} variant.
      */
     public static MultiplexerTokenFilter.Builder multiplexer() {
         return new MultiplexerTokenFilter.Builder();
     }
 
     /**
-     * Creates a builder for the {@link NGramTokenFilter ngram}
-     * {@code TokenFilterDefinition} variant.
+     * Creates a builder for the {@link NGramTokenFilter ngram} {@code TokenFilterDefinition} variant.
      */
     public static NGramTokenFilter.Builder ngram() {
         return new NGramTokenFilter.Builder();
     }
 
     /**
-     * Creates a builder for the {@link NoriPartOfSpeechTokenFilter
-     * nori_part_of_speech} {@code TokenFilterDefinition} variant.
+     * Creates a builder for the {@link NoriPartOfSpeechTokenFilter nori_part_of_speech} {@code TokenFilterDefinition} variant.
      */
     public static NoriPartOfSpeechTokenFilter.Builder noriPartOfSpeech() {
         return new NoriPartOfSpeechTokenFilter.Builder();
     }
 
     /**
-     * Creates a builder for the {@link PatternCaptureTokenFilter pattern_capture}
-     * {@code TokenFilterDefinition} variant.
+     * Creates a builder for the {@link PatternCaptureTokenFilter pattern_capture} {@code TokenFilterDefinition} variant.
      */
     public static PatternCaptureTokenFilter.Builder patternCapture() {
         return new PatternCaptureTokenFilter.Builder();
     }
 
     /**
-     * Creates a builder for the {@link PatternReplaceTokenFilter pattern_replace}
-     * {@code TokenFilterDefinition} variant.
+     * Creates a builder for the {@link PatternReplaceTokenFilter pattern_replace} {@code TokenFilterDefinition} variant.
      */
     public static PatternReplaceTokenFilter.Builder patternReplace() {
         return new PatternReplaceTokenFilter.Builder();
     }
 
     /**
-     * Creates a builder for the {@link PhoneticTokenFilter phonetic}
-     * {@code TokenFilterDefinition} variant.
+     * Creates a builder for the {@link PersianStemTokenFilter persian_stem} {@code TokenFilterDefinition} variant.
+     */
+    public static PersianStemTokenFilter.Builder persianStem() {
+        return new PersianStemTokenFilter.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link PhoneticTokenFilter phonetic} {@code TokenFilterDefinition} variant.
      */
     public static PhoneticTokenFilter.Builder phonetic() {
         return new PhoneticTokenFilter.Builder();
     }
 
     /**
-     * Creates a builder for the {@link PorterStemTokenFilter porter_stem}
-     * {@code TokenFilterDefinition} variant.
+     * Creates a builder for the {@link PorterStemTokenFilter porter_stem} {@code TokenFilterDefinition} variant.
      */
     public static PorterStemTokenFilter.Builder porterStem() {
         return new PorterStemTokenFilter.Builder();
     }
 
     /**
-     * Creates a builder for the {@link PredicateTokenFilter predicate_token_filter}
-     * {@code TokenFilterDefinition} variant.
+     * Creates a builder for the {@link PredicateTokenFilter predicate_token_filter} {@code TokenFilterDefinition} variant.
      */
     public static PredicateTokenFilter.Builder predicateTokenFilter() {
         return new PredicateTokenFilter.Builder();
     }
 
     /**
-     * Creates a builder for the {@link RemoveDuplicatesTokenFilter
-     * remove_duplicates} {@code TokenFilterDefinition} variant.
+     * Creates a builder for the {@link RemoveDuplicatesTokenFilter remove_duplicates} {@code TokenFilterDefinition} variant.
      */
     public static RemoveDuplicatesTokenFilter.Builder removeDuplicates() {
         return new RemoveDuplicatesTokenFilter.Builder();
     }
 
     /**
-     * Creates a builder for the {@link ReverseTokenFilter reverse}
-     * {@code TokenFilterDefinition} variant.
+     * Creates a builder for the {@link ReverseTokenFilter reverse} {@code TokenFilterDefinition} variant.
      */
     public static ReverseTokenFilter.Builder reverse() {
         return new ReverseTokenFilter.Builder();
     }
 
     /**
-     * Creates a builder for the {@link ShingleTokenFilter shingle}
-     * {@code TokenFilterDefinition} variant.
+     * Creates a builder for the {@link ShingleTokenFilter shingle} {@code TokenFilterDefinition} variant.
      */
     public static ShingleTokenFilter.Builder shingle() {
         return new ShingleTokenFilter.Builder();
     }
 
     /**
-     * Creates a builder for the {@link SnowballTokenFilter snowball}
-     * {@code TokenFilterDefinition} variant.
+     * Creates a builder for the {@link SmartcnStopTokenFilter smartcn_stop} {@code TokenFilterDefinition} variant.
      */
-    public static SnowballTokenFilter.Builder snowball() {
-        return new SnowballTokenFilter.Builder();
+    public static SmartcnStopTokenFilter.Builder smartcnStop() {
+        return new SmartcnStopTokenFilter.Builder();
     }
 
     /**
-     * Creates a builder for the {@link StemmerOverrideTokenFilter stemmer_override}
-     * {@code TokenFilterDefinition} variant.
+     * Creates a builder for the {@link SnowballTokenFilter snowball} {@code TokenFilterDefinition} variant.
      */
-    public static StemmerOverrideTokenFilter.Builder stemmerOverride() {
-        return new StemmerOverrideTokenFilter.Builder();
+    public static SnowballTokenFilter.Builder snowball() {
+        return new SnowballTokenFilter.Builder();
     }
 
     /**
-     * Creates a builder for the {@link StemmerTokenFilter stemmer}
-     * {@code TokenFilterDefinition} variant.
+     * Creates a builder for the {@link StemmerTokenFilter stemmer} {@code TokenFilterDefinition} variant.
      */
     public static StemmerTokenFilter.Builder stemmer() {
         return new StemmerTokenFilter.Builder();
     }
 
     /**
-     * Creates a builder for the {@link StopTokenFilter stop}
-     * {@code TokenFilterDefinition} variant.
+     * Creates a builder for the {@link StemmerOverrideTokenFilter stemmer_override} {@code TokenFilterDefinition} variant.
      */
-    public static StopTokenFilter.Builder stop() {
-        return new StopTokenFilter.Builder();
+    public static StemmerOverrideTokenFilter.Builder stemmerOverride() {
+        return new StemmerOverrideTokenFilter.Builder();
     }
 
     /**
-     * Creates a builder for the {@link SynonymGraphTokenFilter synonym_graph}
-     * {@code TokenFilterDefinition} variant.
+     * Creates a builder for the {@link StopTokenFilter stop} {@code TokenFilterDefinition} variant.
      */
-    public static SynonymGraphTokenFilter.Builder synonymGraph() {
-        return new SynonymGraphTokenFilter.Builder();
+    public static StopTokenFilter.Builder stop() {
+        return new StopTokenFilter.Builder();
     }
 
     /**
-     * Creates a builder for the {@link SynonymTokenFilter synonym}
-     * {@code TokenFilterDefinition} variant.
+     * Creates a builder for the {@link SynonymTokenFilter synonym} {@code TokenFilterDefinition} variant.
      */
     public static SynonymTokenFilter.Builder synonym() {
         return new SynonymTokenFilter.Builder();
     }
 
     /**
-     * Creates a builder for the {@link TrimTokenFilter trim}
-     * {@code TokenFilterDefinition} variant.
+     * Creates a builder for the {@link SynonymGraphTokenFilter synonym_graph} {@code TokenFilterDefinition} variant.
+     */
+    public static SynonymGraphTokenFilter.Builder synonymGraph() {
+        return new SynonymGraphTokenFilter.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link TrimTokenFilter trim} {@code TokenFilterDefinition} variant.
      */
     public static TrimTokenFilter.Builder trim() {
         return new TrimTokenFilter.Builder();
     }
 
     /**
-     * Creates a builder for the {@link TruncateTokenFilter truncate}
-     * {@code TokenFilterDefinition} variant.
+     * Creates a builder for the {@link TruncateTokenFilter truncate} {@code TokenFilterDefinition} variant.
      */
     public static TruncateTokenFilter.Builder truncate() {
         return new TruncateTokenFilter.Builder();
     }
 
     /**
-     * Creates a builder for the {@link UniqueTokenFilter unique}
-     * {@code TokenFilterDefinition} variant.
+     * Creates a builder for the {@link UniqueTokenFilter unique} {@code TokenFilterDefinition} variant.
      */
     public static UniqueTokenFilter.Builder unique() {
         return new UniqueTokenFilter.Builder();
     }
 
     /**
-     * Creates a builder for the {@link UppercaseTokenFilter uppercase}
-     * {@code TokenFilterDefinition} variant.
+     * Creates a builder for the {@link UppercaseTokenFilter uppercase} {@code TokenFilterDefinition} variant.
      */
     public static UppercaseTokenFilter.Builder uppercase() {
         return new UppercaseTokenFilter.Builder();
     }
 
     /**
-     * Creates a builder for the {@link WordDelimiterGraphTokenFilter
-     * word_delimiter_graph} {@code TokenFilterDefinition} variant.
+     * Creates a builder for the {@link WordDelimiterTokenFilter word_delimiter} {@code TokenFilterDefinition} variant.
      */
-    public static WordDelimiterGraphTokenFilter.Builder wordDelimiterGraph() {
-        return new WordDelimiterGraphTokenFilter.Builder();
+    public static WordDelimiterTokenFilter.Builder wordDelimiter() {
+        return new WordDelimiterTokenFilter.Builder();
     }
 
     /**
-     * Creates a builder for the {@link WordDelimiterTokenFilter word_delimiter}
-     * {@code TokenFilterDefinition} variant.
+     * Creates a builder for the {@link WordDelimiterGraphTokenFilter word_delimiter_graph} {@code TokenFilterDefinition} variant.
      */
-    public static WordDelimiterTokenFilter.Builder wordDelimiter() {
-        return new WordDelimiterTokenFilter.Builder();
+    public static WordDelimiterGraphTokenFilter.Builder wordDelimiterGraph() {
+        return new WordDelimiterGraphTokenFilter.Builder();
     }
-
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenFilterDefinitionVariant.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/TokenFilterDefinitionVariant.java
similarity index 85%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenFilterDefinitionVariant.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/TokenFilterDefinitionVariant.java
index ad351b6535..4b668bf8b6 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenFilterDefinitionVariant.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/TokenFilterDefinitionVariant.java
@@ -30,19 +30,23 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.analysis;
 
+import javax.annotation.Generated;
 import org.opensearch.client.json.JsonpSerializable;
 
 /**
  * Base interface for {@link TokenFilterDefinition} variants.
  */
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public interface TokenFilterDefinitionVariant extends JsonpSerializable {
-
     TokenFilterDefinition.Kind _tokenFilterDefinitionKind();
 
     default TokenFilterDefinition _toTokenFilterDefinition() {
         return new TokenFilterDefinition(this);
     }
-
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenizerBase.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/TokenizerBase.java
similarity index 79%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenizerBase.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/TokenizerBase.java
index c59e801b43..877d1e97f6 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenizerBase.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/TokenizerBase.java
@@ -30,9 +30,15 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.analysis;
 
 import jakarta.json.stream.JsonGenerator;
+import java.util.Objects;
+import javax.annotation.Generated;
 import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -42,16 +48,16 @@
 
 // typedef: _types.analysis.TokenizerBase
 
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public abstract class TokenizerBase implements PlainJsonSerializable {
+
     @Nullable
     private final String version;
 
     // ---------------------------------------------------------------------------------------------
 
     protected TokenizerBase(AbstractBuilder<?> builder) {
-
         this.version = builder.version;
-
     }
 
     /**
@@ -65,6 +71,7 @@ public final String version() {
     /**
      * Serialize this object to JSON.
      */
+    @Override
     public void serialize(JsonGenerator generator, JsonpMapper mapper) {
         generator.writeStartObject();
         serializeInternal(generator, mapper);
@@ -72,15 +79,14 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         if (this.version != null) {
             generator.writeKey("version");
             generator.write(this.version);
-
         }
-
     }
 
+    // ---------------------------------------------------------------------------------------------
+
     protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
         @Nullable
         private String version;
@@ -94,14 +100,26 @@ public final BuilderT version(@Nullable String value) {
         }
 
         protected abstract BuilderT self();
-
     }
 
     // ---------------------------------------------------------------------------------------------
-    protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupTokenizerBaseDeserializer(ObjectDeserializer<BuilderT> op) {
 
+    protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupTokenizerBaseDeserializer(ObjectDeserializer<BuilderT> op) {
         op.add(AbstractBuilder::version, JsonpDeserializer.stringDeserializer(), "version");
+    }
 
+    @Override
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + Objects.hashCode(this.version);
+        return result;
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        TokenizerBase other = (TokenizerBase) o;
+        return Objects.equals(this.version, other.version);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TrimTokenFilter.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/TrimTokenFilter.java
similarity index 78%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TrimTokenFilter.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/TrimTokenFilter.java
index 9a1f20b3bd..f62324ca7c 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TrimTokenFilter.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/TrimTokenFilter.java
@@ -30,10 +30,15 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.analysis;
 
 import jakarta.json.stream.JsonGenerator;
 import java.util.function.Function;
+import javax.annotation.Generated;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -44,20 +49,21 @@
 // typedef: _types.analysis.TrimTokenFilter
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class TrimTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
+
     // ---------------------------------------------------------------------------------------------
 
     private TrimTokenFilter(Builder builder) {
         super(builder);
-
     }
 
-    public static TrimTokenFilter of(Function<Builder, ObjectBuilder<TrimTokenFilter>> fn) {
+    public static TrimTokenFilter of(Function<TrimTokenFilter.Builder, ObjectBuilder<TrimTokenFilter>> fn) {
         return fn.apply(new Builder()).build();
     }
 
     /**
-     * TokenFilterDefinition variant kind.
+     * {@link TokenFilterDefinition} variant kind.
      */
     @Override
     public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
@@ -65,10 +71,8 @@ public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         generator.write("type", "trim");
         super.serializeInternal(generator, mapper);
-
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -76,8 +80,8 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     /**
      * Builder for {@link TrimTokenFilter}.
      */
-
     public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<TrimTokenFilter> {
+
         @Override
         protected Builder self() {
             return this;
@@ -86,8 +90,7 @@ protected Builder self() {
         /**
          * Builds a {@link TrimTokenFilter}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public TrimTokenFilter build() {
             _checkSingleUse();
@@ -107,9 +110,24 @@ public TrimTokenFilter build() {
     );
 
     protected static void setupTrimTokenFilterDeserializer(ObjectDeserializer<TrimTokenFilter.Builder> op) {
-        TokenFilterBase.setupTokenFilterBaseDeserializer(op);
+        setupTokenFilterBaseDeserializer(op);
 
         op.ignore("type");
     }
 
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        return true;
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TruncateTokenFilter.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/TruncateTokenFilter.java
similarity index 71%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TruncateTokenFilter.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/TruncateTokenFilter.java
index a8f0dbfa36..d38c255a31 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TruncateTokenFilter.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/TruncateTokenFilter.java
@@ -30,39 +30,46 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 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.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
-import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 
 // typedef: _types.analysis.TruncateTokenFilter
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class TruncateTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
-    private final int length;
+
+    @Nullable
+    private final Integer length;
 
     // ---------------------------------------------------------------------------------------------
 
     private TruncateTokenFilter(Builder builder) {
         super(builder);
-
-        this.length = ApiTypeHelper.requireNonNull(builder.length, this, "length");
-
+        this.length = builder.length;
     }
 
-    public static TruncateTokenFilter of(Function<Builder, ObjectBuilder<TruncateTokenFilter>> fn) {
+    public static TruncateTokenFilter of(Function<TruncateTokenFilter.Builder, ObjectBuilder<TruncateTokenFilter>> fn) {
         return fn.apply(new Builder()).build();
     }
 
     /**
-     * TokenFilterDefinition variant kind.
+     * {@link TokenFilterDefinition} variant kind.
      */
     @Override
     public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
@@ -70,19 +77,20 @@ public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
     }
 
     /**
-     * Required - API name: {@code length}
+     * API name: {@code length}
      */
-    public final int length() {
+    @Nullable
+    public final Integer length() {
         return this.length;
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         generator.write("type", "truncate");
         super.serializeInternal(generator, mapper);
-        generator.writeKey("length");
-        generator.write(this.length);
-
+        if (this.length != null) {
+            generator.writeKey("length");
+            generator.write(this.length);
+        }
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -90,14 +98,14 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     /**
      * Builder for {@link TruncateTokenFilter}.
      */
-
     public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<TruncateTokenFilter> {
+        @Nullable
         private Integer length;
 
         /**
-         * Required - API name: {@code length}
+         * API name: {@code length}
          */
-        public final Builder length(int value) {
+        public final Builder length(@Nullable Integer value) {
             this.length = value;
             return this;
         }
@@ -110,8 +118,7 @@ protected Builder self() {
         /**
          * Builds a {@link TruncateTokenFilter}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public TruncateTokenFilter build() {
             _checkSingleUse();
@@ -137,4 +144,21 @@ protected static void setupTruncateTokenFilterDeserializer(ObjectDeserializer<Tr
         op.ignore("type");
     }
 
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + Objects.hashCode(this.length);
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        TruncateTokenFilter other = (TruncateTokenFilter) o;
+        return Objects.equals(this.length, other.length);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/UniqueTokenFilter.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/UniqueTokenFilter.java
similarity index 80%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/UniqueTokenFilter.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/UniqueTokenFilter.java
index 90f714e78d..7b2a67fa0a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/UniqueTokenFilter.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/UniqueTokenFilter.java
@@ -30,10 +30,16 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 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.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -45,7 +51,9 @@
 // typedef: _types.analysis.UniqueTokenFilter
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class UniqueTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
+
     @Nullable
     private final Boolean onlyOnSamePosition;
 
@@ -53,17 +61,15 @@ public class UniqueTokenFilter extends TokenFilterBase implements TokenFilterDef
 
     private UniqueTokenFilter(Builder builder) {
         super(builder);
-
         this.onlyOnSamePosition = builder.onlyOnSamePosition;
-
     }
 
-    public static UniqueTokenFilter of(Function<Builder, ObjectBuilder<UniqueTokenFilter>> fn) {
+    public static UniqueTokenFilter of(Function<UniqueTokenFilter.Builder, ObjectBuilder<UniqueTokenFilter>> fn) {
         return fn.apply(new Builder()).build();
     }
 
     /**
-     * TokenFilterDefinition variant kind.
+     * {@link TokenFilterDefinition} variant kind.
      */
     @Override
     public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
@@ -79,15 +85,12 @@ public final Boolean onlyOnSamePosition() {
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         generator.write("type", "unique");
         super.serializeInternal(generator, mapper);
         if (this.onlyOnSamePosition != null) {
             generator.writeKey("only_on_same_position");
             generator.write(this.onlyOnSamePosition);
-
         }
-
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -95,7 +98,6 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     /**
      * Builder for {@link UniqueTokenFilter}.
      */
-
     public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<UniqueTokenFilter> {
         @Nullable
         private Boolean onlyOnSamePosition;
@@ -116,8 +118,7 @@ protected Builder self() {
         /**
          * Builds a {@link UniqueTokenFilter}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public UniqueTokenFilter build() {
             _checkSingleUse();
@@ -143,4 +144,21 @@ protected static void setupUniqueTokenFilterDeserializer(ObjectDeserializer<Uniq
         op.ignore("type");
     }
 
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + Objects.hashCode(this.onlyOnSamePosition);
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        UniqueTokenFilter other = (UniqueTokenFilter) o;
+        return Objects.equals(this.onlyOnSamePosition, other.onlyOnSamePosition);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/UppercaseTokenFilter.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/UppercaseTokenFilter.java
similarity index 80%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/UppercaseTokenFilter.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/UppercaseTokenFilter.java
index cbfea5eb74..1f309f3f5e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/UppercaseTokenFilter.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/UppercaseTokenFilter.java
@@ -30,10 +30,15 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.analysis;
 
 import jakarta.json.stream.JsonGenerator;
 import java.util.function.Function;
+import javax.annotation.Generated;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -44,20 +49,21 @@
 // typedef: _types.analysis.UppercaseTokenFilter
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class UppercaseTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
+
     // ---------------------------------------------------------------------------------------------
 
     private UppercaseTokenFilter(Builder builder) {
         super(builder);
-
     }
 
-    public static UppercaseTokenFilter of(Function<Builder, ObjectBuilder<UppercaseTokenFilter>> fn) {
+    public static UppercaseTokenFilter of(Function<UppercaseTokenFilter.Builder, ObjectBuilder<UppercaseTokenFilter>> fn) {
         return fn.apply(new Builder()).build();
     }
 
     /**
-     * TokenFilterDefinition variant kind.
+     * {@link TokenFilterDefinition} variant kind.
      */
     @Override
     public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
@@ -65,10 +71,8 @@ public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         generator.write("type", "uppercase");
         super.serializeInternal(generator, mapper);
-
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -76,8 +80,8 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     /**
      * Builder for {@link UppercaseTokenFilter}.
      */
-
     public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<UppercaseTokenFilter> {
+
         @Override
         protected Builder self() {
             return this;
@@ -86,8 +90,7 @@ protected Builder self() {
         /**
          * Builds a {@link UppercaseTokenFilter}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public UppercaseTokenFilter build() {
             _checkSingleUse();
@@ -112,4 +115,19 @@ protected static void setupUppercaseTokenFilterDeserializer(ObjectDeserializer<U
         op.ignore("type");
     }
 
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        return true;
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/WordDelimiterGraphTokenFilter.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/WordDelimiterGraphTokenFilter.java
similarity index 83%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/WordDelimiterGraphTokenFilter.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/WordDelimiterGraphTokenFilter.java
index adc3f85ec5..3674d28072 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/WordDelimiterGraphTokenFilter.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/WordDelimiterGraphTokenFilter.java
@@ -30,11 +30,18 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.analysis;
 
 import jakarta.json.stream.JsonGenerator;
 import java.util.List;
+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;
@@ -47,7 +54,9 @@
 // typedef: _types.analysis.WordDelimiterGraphTokenFilter
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class WordDelimiterGraphTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
+
     @Nullable
     private final Boolean adjustOffsets;
 
@@ -72,6 +81,7 @@ public class WordDelimiterGraphTokenFilter extends TokenFilterBase implements To
     @Nullable
     private final Boolean preserveOriginal;
 
+    @Nonnull
     private final List<String> protectedWords;
 
     @Nullable
@@ -86,6 +96,7 @@ public class WordDelimiterGraphTokenFilter extends TokenFilterBase implements To
     @Nullable
     private final Boolean stemEnglishPossessive;
 
+    @Nonnull
     private final List<String> typeTable;
 
     @Nullable
@@ -95,7 +106,6 @@ public class WordDelimiterGraphTokenFilter extends TokenFilterBase implements To
 
     private WordDelimiterGraphTokenFilter(Builder builder) {
         super(builder);
-
         this.adjustOffsets = builder.adjustOffsets;
         this.catenateAll = builder.catenateAll;
         this.catenateNumbers = builder.catenateNumbers;
@@ -111,15 +121,16 @@ private WordDelimiterGraphTokenFilter(Builder builder) {
         this.stemEnglishPossessive = builder.stemEnglishPossessive;
         this.typeTable = ApiTypeHelper.unmodifiable(builder.typeTable);
         this.typeTablePath = builder.typeTablePath;
-
     }
 
-    public static WordDelimiterGraphTokenFilter of(Function<Builder, ObjectBuilder<WordDelimiterGraphTokenFilter>> fn) {
+    public static WordDelimiterGraphTokenFilter of(
+        Function<WordDelimiterGraphTokenFilter.Builder, ObjectBuilder<WordDelimiterGraphTokenFilter>> fn
+    ) {
         return fn.apply(new Builder()).build();
     }
 
     /**
-     * TokenFilterDefinition variant kind.
+     * {@link TokenFilterDefinition} variant kind.
      */
     @Override
     public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
@@ -193,6 +204,7 @@ public final Boolean preserveOriginal() {
     /**
      * API name: {@code protected_words}
      */
+    @Nonnull
     public final List<String> protectedWords() {
         return this.protectedWords;
     }
@@ -232,6 +244,7 @@ public final Boolean stemEnglishPossessive() {
     /**
      * API name: {@code type_table}
      */
+    @Nonnull
     public final List<String> typeTable() {
         return this.typeTable;
     }
@@ -245,95 +258,90 @@ public final String typeTablePath() {
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         generator.write("type", "word_delimiter_graph");
         super.serializeInternal(generator, mapper);
         if (this.adjustOffsets != null) {
             generator.writeKey("adjust_offsets");
             generator.write(this.adjustOffsets);
-
         }
+
         if (this.catenateAll != null) {
             generator.writeKey("catenate_all");
             generator.write(this.catenateAll);
-
         }
+
         if (this.catenateNumbers != null) {
             generator.writeKey("catenate_numbers");
             generator.write(this.catenateNumbers);
-
         }
+
         if (this.catenateWords != null) {
             generator.writeKey("catenate_words");
             generator.write(this.catenateWords);
-
         }
+
         if (this.generateNumberParts != null) {
             generator.writeKey("generate_number_parts");
             generator.write(this.generateNumberParts);
-
         }
+
         if (this.generateWordParts != null) {
             generator.writeKey("generate_word_parts");
             generator.write(this.generateWordParts);
-
         }
+
         if (this.ignoreKeywords != null) {
             generator.writeKey("ignore_keywords");
             generator.write(this.ignoreKeywords);
-
         }
+
         if (this.preserveOriginal != null) {
             generator.writeKey("preserve_original");
             generator.write(this.preserveOriginal);
-
         }
+
         if (ApiTypeHelper.isDefined(this.protectedWords)) {
             generator.writeKey("protected_words");
             generator.writeStartArray();
             for (String item0 : this.protectedWords) {
                 generator.write(item0);
-
             }
             generator.writeEnd();
-
         }
+
         if (this.protectedWordsPath != null) {
             generator.writeKey("protected_words_path");
             generator.write(this.protectedWordsPath);
-
         }
+
         if (this.splitOnCaseChange != null) {
             generator.writeKey("split_on_case_change");
             generator.write(this.splitOnCaseChange);
-
         }
+
         if (this.splitOnNumerics != null) {
             generator.writeKey("split_on_numerics");
             generator.write(this.splitOnNumerics);
-
         }
+
         if (this.stemEnglishPossessive != null) {
             generator.writeKey("stem_english_possessive");
             generator.write(this.stemEnglishPossessive);
-
         }
+
         if (ApiTypeHelper.isDefined(this.typeTable)) {
             generator.writeKey("type_table");
             generator.writeStartArray();
             for (String item0 : this.typeTable) {
                 generator.write(item0);
-
             }
             generator.writeEnd();
-
         }
+
         if (this.typeTablePath != null) {
             generator.writeKey("type_table_path");
             generator.write(this.typeTablePath);
-
         }
-
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -341,50 +349,35 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     /**
      * Builder for {@link WordDelimiterGraphTokenFilter}.
      */
-
     public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<WordDelimiterGraphTokenFilter> {
         @Nullable
         private Boolean adjustOffsets;
-
         @Nullable
         private Boolean catenateAll;
-
         @Nullable
         private Boolean catenateNumbers;
-
         @Nullable
         private Boolean catenateWords;
-
         @Nullable
         private Boolean generateNumberParts;
-
         @Nullable
         private Boolean generateWordParts;
-
         @Nullable
         private Boolean ignoreKeywords;
-
         @Nullable
         private Boolean preserveOriginal;
-
         @Nullable
         private List<String> protectedWords;
-
         @Nullable
         private String protectedWordsPath;
-
         @Nullable
         private Boolean splitOnCaseChange;
-
         @Nullable
         private Boolean splitOnNumerics;
-
         @Nullable
         private Boolean stemEnglishPossessive;
-
         @Nullable
         private List<String> typeTable;
-
         @Nullable
         private String typeTablePath;
 
@@ -454,8 +447,10 @@ public final Builder preserveOriginal(@Nullable Boolean value) {
 
         /**
          * API name: {@code protected_words}
+         *
          * <p>
          * Adds all elements of <code>list</code> to <code>protectedWords</code>.
+         * </p>
          */
         public final Builder protectedWords(List<String> list) {
             this.protectedWords = _listAddAll(this.protectedWords, list);
@@ -464,8 +459,10 @@ public final Builder protectedWords(List<String> list) {
 
         /**
          * API name: {@code protected_words}
+         *
          * <p>
          * Adds one or more values to <code>protectedWords</code>.
+         * </p>
          */
         public final Builder protectedWords(String value, String... values) {
             this.protectedWords = _listAdd(this.protectedWords, value, values);
@@ -506,8 +503,10 @@ public final Builder stemEnglishPossessive(@Nullable Boolean value) {
 
         /**
          * API name: {@code type_table}
+         *
          * <p>
          * Adds all elements of <code>list</code> to <code>typeTable</code>.
+         * </p>
          */
         public final Builder typeTable(List<String> list) {
             this.typeTable = _listAddAll(this.typeTable, list);
@@ -516,8 +515,10 @@ public final Builder typeTable(List<String> list) {
 
         /**
          * API name: {@code type_table}
+         *
          * <p>
          * Adds one or more values to <code>typeTable</code>.
+         * </p>
          */
         public final Builder typeTable(String value, String... values) {
             this.typeTable = _listAdd(this.typeTable, value, values);
@@ -540,8 +541,7 @@ protected Builder self() {
         /**
          * Builds a {@link WordDelimiterGraphTokenFilter}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public WordDelimiterGraphTokenFilter build() {
             _checkSingleUse();
@@ -561,7 +561,7 @@ public WordDelimiterGraphTokenFilter build() {
     );
 
     protected static void setupWordDelimiterGraphTokenFilterDeserializer(ObjectDeserializer<WordDelimiterGraphTokenFilter.Builder> op) {
-        TokenFilterBase.setupTokenFilterBaseDeserializer(op);
+        setupTokenFilterBaseDeserializer(op);
         op.add(Builder::adjustOffsets, JsonpDeserializer.booleanDeserializer(), "adjust_offsets");
         op.add(Builder::catenateAll, JsonpDeserializer.booleanDeserializer(), "catenate_all");
         op.add(Builder::catenateNumbers, JsonpDeserializer.booleanDeserializer(), "catenate_numbers");
@@ -581,4 +581,49 @@ protected static void setupWordDelimiterGraphTokenFilterDeserializer(ObjectDeser
         op.ignore("type");
     }
 
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + Objects.hashCode(this.adjustOffsets);
+        result = 31 * result + Objects.hashCode(this.catenateAll);
+        result = 31 * result + Objects.hashCode(this.catenateNumbers);
+        result = 31 * result + Objects.hashCode(this.catenateWords);
+        result = 31 * result + Objects.hashCode(this.generateNumberParts);
+        result = 31 * result + Objects.hashCode(this.generateWordParts);
+        result = 31 * result + Objects.hashCode(this.ignoreKeywords);
+        result = 31 * result + Objects.hashCode(this.preserveOriginal);
+        result = 31 * result + Objects.hashCode(this.protectedWords);
+        result = 31 * result + Objects.hashCode(this.protectedWordsPath);
+        result = 31 * result + Objects.hashCode(this.splitOnCaseChange);
+        result = 31 * result + Objects.hashCode(this.splitOnNumerics);
+        result = 31 * result + Objects.hashCode(this.stemEnglishPossessive);
+        result = 31 * result + Objects.hashCode(this.typeTable);
+        result = 31 * result + Objects.hashCode(this.typeTablePath);
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        WordDelimiterGraphTokenFilter other = (WordDelimiterGraphTokenFilter) o;
+        return Objects.equals(this.adjustOffsets, other.adjustOffsets)
+            && Objects.equals(this.catenateAll, other.catenateAll)
+            && Objects.equals(this.catenateNumbers, other.catenateNumbers)
+            && Objects.equals(this.catenateWords, other.catenateWords)
+            && Objects.equals(this.generateNumberParts, other.generateNumberParts)
+            && Objects.equals(this.generateWordParts, other.generateWordParts)
+            && Objects.equals(this.ignoreKeywords, other.ignoreKeywords)
+            && Objects.equals(this.preserveOriginal, other.preserveOriginal)
+            && Objects.equals(this.protectedWords, other.protectedWords)
+            && Objects.equals(this.protectedWordsPath, other.protectedWordsPath)
+            && Objects.equals(this.splitOnCaseChange, other.splitOnCaseChange)
+            && Objects.equals(this.splitOnNumerics, other.splitOnNumerics)
+            && Objects.equals(this.stemEnglishPossessive, other.stemEnglishPossessive)
+            && Objects.equals(this.typeTable, other.typeTable)
+            && Objects.equals(this.typeTablePath, other.typeTablePath);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/WordDelimiterTokenFilter.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/WordDelimiterTokenFilter.java
similarity index 83%
rename from java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/WordDelimiterTokenFilter.java
rename to java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/WordDelimiterTokenFilter.java
index c12e56f279..6a4432a19e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/WordDelimiterTokenFilter.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/WordDelimiterTokenFilter.java
@@ -30,11 +30,18 @@
  * GitHub history for details.
  */
 
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
 package org.opensearch.client.opensearch._types.analysis;
 
 import jakarta.json.stream.JsonGenerator;
 import java.util.List;
+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;
@@ -47,7 +54,9 @@
 // typedef: _types.analysis.WordDelimiterTokenFilter
 
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public class WordDelimiterTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
+
     @Nullable
     private final Boolean catenateAll;
 
@@ -66,6 +75,7 @@ public class WordDelimiterTokenFilter extends TokenFilterBase implements TokenFi
     @Nullable
     private final Boolean preserveOriginal;
 
+    @Nonnull
     private final List<String> protectedWords;
 
     @Nullable
@@ -80,6 +90,7 @@ public class WordDelimiterTokenFilter extends TokenFilterBase implements TokenFi
     @Nullable
     private final Boolean stemEnglishPossessive;
 
+    @Nonnull
     private final List<String> typeTable;
 
     @Nullable
@@ -89,7 +100,6 @@ public class WordDelimiterTokenFilter extends TokenFilterBase implements TokenFi
 
     private WordDelimiterTokenFilter(Builder builder) {
         super(builder);
-
         this.catenateAll = builder.catenateAll;
         this.catenateNumbers = builder.catenateNumbers;
         this.catenateWords = builder.catenateWords;
@@ -103,15 +113,14 @@ private WordDelimiterTokenFilter(Builder builder) {
         this.stemEnglishPossessive = builder.stemEnglishPossessive;
         this.typeTable = ApiTypeHelper.unmodifiable(builder.typeTable);
         this.typeTablePath = builder.typeTablePath;
-
     }
 
-    public static WordDelimiterTokenFilter of(Function<Builder, ObjectBuilder<WordDelimiterTokenFilter>> fn) {
+    public static WordDelimiterTokenFilter of(Function<WordDelimiterTokenFilter.Builder, ObjectBuilder<WordDelimiterTokenFilter>> fn) {
         return fn.apply(new Builder()).build();
     }
 
     /**
-     * TokenFilterDefinition variant kind.
+     * {@link TokenFilterDefinition} variant kind.
      */
     @Override
     public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
@@ -169,6 +178,7 @@ public final Boolean preserveOriginal() {
     /**
      * API name: {@code protected_words}
      */
+    @Nonnull
     public final List<String> protectedWords() {
         return this.protectedWords;
     }
@@ -208,6 +218,7 @@ public final Boolean stemEnglishPossessive() {
     /**
      * API name: {@code type_table}
      */
+    @Nonnull
     public final List<String> typeTable() {
         return this.typeTable;
     }
@@ -221,85 +232,80 @@ public final String typeTablePath() {
     }
 
     protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
         generator.write("type", "word_delimiter");
         super.serializeInternal(generator, mapper);
         if (this.catenateAll != null) {
             generator.writeKey("catenate_all");
             generator.write(this.catenateAll);
-
         }
+
         if (this.catenateNumbers != null) {
             generator.writeKey("catenate_numbers");
             generator.write(this.catenateNumbers);
-
         }
+
         if (this.catenateWords != null) {
             generator.writeKey("catenate_words");
             generator.write(this.catenateWords);
-
         }
+
         if (this.generateNumberParts != null) {
             generator.writeKey("generate_number_parts");
             generator.write(this.generateNumberParts);
-
         }
+
         if (this.generateWordParts != null) {
             generator.writeKey("generate_word_parts");
             generator.write(this.generateWordParts);
-
         }
+
         if (this.preserveOriginal != null) {
             generator.writeKey("preserve_original");
             generator.write(this.preserveOriginal);
-
         }
+
         if (ApiTypeHelper.isDefined(this.protectedWords)) {
             generator.writeKey("protected_words");
             generator.writeStartArray();
             for (String item0 : this.protectedWords) {
                 generator.write(item0);
-
             }
             generator.writeEnd();
-
         }
+
         if (this.protectedWordsPath != null) {
             generator.writeKey("protected_words_path");
             generator.write(this.protectedWordsPath);
-
         }
+
         if (this.splitOnCaseChange != null) {
             generator.writeKey("split_on_case_change");
             generator.write(this.splitOnCaseChange);
-
         }
+
         if (this.splitOnNumerics != null) {
             generator.writeKey("split_on_numerics");
             generator.write(this.splitOnNumerics);
-
         }
+
         if (this.stemEnglishPossessive != null) {
             generator.writeKey("stem_english_possessive");
             generator.write(this.stemEnglishPossessive);
-
         }
+
         if (ApiTypeHelper.isDefined(this.typeTable)) {
             generator.writeKey("type_table");
             generator.writeStartArray();
             for (String item0 : this.typeTable) {
                 generator.write(item0);
-
             }
             generator.writeEnd();
-
         }
+
         if (this.typeTablePath != null) {
             generator.writeKey("type_table_path");
             generator.write(this.typeTablePath);
-
         }
-
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -307,44 +313,31 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     /**
      * Builder for {@link WordDelimiterTokenFilter}.
      */
-
     public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<WordDelimiterTokenFilter> {
         @Nullable
         private Boolean catenateAll;
-
         @Nullable
         private Boolean catenateNumbers;
-
         @Nullable
         private Boolean catenateWords;
-
         @Nullable
         private Boolean generateNumberParts;
-
         @Nullable
         private Boolean generateWordParts;
-
         @Nullable
         private Boolean preserveOriginal;
-
         @Nullable
         private List<String> protectedWords;
-
         @Nullable
         private String protectedWordsPath;
-
         @Nullable
         private Boolean splitOnCaseChange;
-
         @Nullable
         private Boolean splitOnNumerics;
-
         @Nullable
         private Boolean stemEnglishPossessive;
-
         @Nullable
         private List<String> typeTable;
-
         @Nullable
         private String typeTablePath;
 
@@ -398,8 +391,10 @@ public final Builder preserveOriginal(@Nullable Boolean value) {
 
         /**
          * API name: {@code protected_words}
+         *
          * <p>
          * Adds all elements of <code>list</code> to <code>protectedWords</code>.
+         * </p>
          */
         public final Builder protectedWords(List<String> list) {
             this.protectedWords = _listAddAll(this.protectedWords, list);
@@ -408,8 +403,10 @@ public final Builder protectedWords(List<String> list) {
 
         /**
          * API name: {@code protected_words}
+         *
          * <p>
          * Adds one or more values to <code>protectedWords</code>.
+         * </p>
          */
         public final Builder protectedWords(String value, String... values) {
             this.protectedWords = _listAdd(this.protectedWords, value, values);
@@ -450,8 +447,10 @@ public final Builder stemEnglishPossessive(@Nullable Boolean value) {
 
         /**
          * API name: {@code type_table}
+         *
          * <p>
          * Adds all elements of <code>list</code> to <code>typeTable</code>.
+         * </p>
          */
         public final Builder typeTable(List<String> list) {
             this.typeTable = _listAddAll(this.typeTable, list);
@@ -460,8 +459,10 @@ public final Builder typeTable(List<String> list) {
 
         /**
          * API name: {@code type_table}
+         *
          * <p>
          * Adds one or more values to <code>typeTable</code>.
+         * </p>
          */
         public final Builder typeTable(String value, String... values) {
             this.typeTable = _listAdd(this.typeTable, value, values);
@@ -484,8 +485,7 @@ protected Builder self() {
         /**
          * Builds a {@link WordDelimiterTokenFilter}.
          *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
+         * @throws NullPointerException if some of the required fields are null.
          */
         public WordDelimiterTokenFilter build() {
             _checkSingleUse();
@@ -505,7 +505,7 @@ public WordDelimiterTokenFilter build() {
     );
 
     protected static void setupWordDelimiterTokenFilterDeserializer(ObjectDeserializer<WordDelimiterTokenFilter.Builder> op) {
-        TokenFilterBase.setupTokenFilterBaseDeserializer(op);
+        setupTokenFilterBaseDeserializer(op);
         op.add(Builder::catenateAll, JsonpDeserializer.booleanDeserializer(), "catenate_all");
         op.add(Builder::catenateNumbers, JsonpDeserializer.booleanDeserializer(), "catenate_numbers");
         op.add(Builder::catenateWords, JsonpDeserializer.booleanDeserializer(), "catenate_words");
@@ -523,4 +523,45 @@ protected static void setupWordDelimiterTokenFilterDeserializer(ObjectDeserializ
         op.ignore("type");
     }
 
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + Objects.hashCode(this.catenateAll);
+        result = 31 * result + Objects.hashCode(this.catenateNumbers);
+        result = 31 * result + Objects.hashCode(this.catenateWords);
+        result = 31 * result + Objects.hashCode(this.generateNumberParts);
+        result = 31 * result + Objects.hashCode(this.generateWordParts);
+        result = 31 * result + Objects.hashCode(this.preserveOriginal);
+        result = 31 * result + Objects.hashCode(this.protectedWords);
+        result = 31 * result + Objects.hashCode(this.protectedWordsPath);
+        result = 31 * result + Objects.hashCode(this.splitOnCaseChange);
+        result = 31 * result + Objects.hashCode(this.splitOnNumerics);
+        result = 31 * result + Objects.hashCode(this.stemEnglishPossessive);
+        result = 31 * result + Objects.hashCode(this.typeTable);
+        result = 31 * result + Objects.hashCode(this.typeTablePath);
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        WordDelimiterTokenFilter other = (WordDelimiterTokenFilter) o;
+        return Objects.equals(this.catenateAll, other.catenateAll)
+            && Objects.equals(this.catenateNumbers, other.catenateNumbers)
+            && Objects.equals(this.catenateWords, other.catenateWords)
+            && Objects.equals(this.generateNumberParts, other.generateNumberParts)
+            && Objects.equals(this.generateWordParts, other.generateWordParts)
+            && Objects.equals(this.preserveOriginal, other.preserveOriginal)
+            && Objects.equals(this.protectedWords, other.protectedWords)
+            && Objects.equals(this.protectedWordsPath, other.protectedWordsPath)
+            && Objects.equals(this.splitOnCaseChange, other.splitOnCaseChange)
+            && Objects.equals(this.splitOnNumerics, other.splitOnNumerics)
+            && Objects.equals(this.stemEnglishPossessive, other.stemEnglishPossessive)
+            && Objects.equals(this.typeTable, other.typeTable)
+            && Objects.equals(this.typeTablePath, other.typeTablePath);
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuCollationTokenFilter.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuCollationTokenFilter.java
deleted file mode 100644
index f12d7343e3..0000000000
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuCollationTokenFilter.java
+++ /dev/null
@@ -1,382 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- *
- * The OpenSearch Contributors require contributions made to
- * this file be licensed under the Apache-2.0 license or a
- * compatible open source license.
- */
-
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/*
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
- */
-
-package org.opensearch.client.opensearch._types.analysis;
-
-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;
-import org.opensearch.client.json.ObjectBuilderDeserializer;
-import org.opensearch.client.json.ObjectDeserializer;
-import org.opensearch.client.util.ApiTypeHelper;
-import org.opensearch.client.util.ObjectBuilder;
-
-// typedef: _types.analysis.IcuCollationTokenFilter
-
-@JsonpDeserializable
-public class IcuCollationTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
-    private final IcuCollationAlternate alternate;
-
-    private final IcuCollationCaseFirst casefirst;
-
-    private final boolean caselevel;
-
-    private final String country;
-
-    private final IcuCollationDecomposition decomposition;
-
-    private final boolean hiraganaquaternarymode;
-
-    private final String language;
-
-    private final boolean numeric;
-
-    private final IcuCollationStrength strength;
-
-    @Nullable
-    private final String variabletop;
-
-    private final String variant;
-
-    // ---------------------------------------------------------------------------------------------
-
-    private IcuCollationTokenFilter(Builder builder) {
-        super(builder);
-
-        this.alternate = ApiTypeHelper.requireNonNull(builder.alternate, this, "alternate");
-        this.casefirst = ApiTypeHelper.requireNonNull(builder.casefirst, this, "casefirst");
-        this.caselevel = ApiTypeHelper.requireNonNull(builder.caselevel, this, "caselevel");
-        this.country = ApiTypeHelper.requireNonNull(builder.country, this, "country");
-        this.decomposition = ApiTypeHelper.requireNonNull(builder.decomposition, this, "decomposition");
-        this.hiraganaquaternarymode = ApiTypeHelper.requireNonNull(builder.hiraganaquaternarymode, this, "hiraganaquaternarymode");
-        this.language = ApiTypeHelper.requireNonNull(builder.language, this, "language");
-        this.numeric = ApiTypeHelper.requireNonNull(builder.numeric, this, "numeric");
-        this.strength = ApiTypeHelper.requireNonNull(builder.strength, this, "strength");
-        this.variabletop = builder.variabletop;
-        this.variant = ApiTypeHelper.requireNonNull(builder.variant, this, "variant");
-
-    }
-
-    public static IcuCollationTokenFilter of(Function<Builder, ObjectBuilder<IcuCollationTokenFilter>> fn) {
-        return fn.apply(new Builder()).build();
-    }
-
-    /**
-     * TokenFilterDefinition variant kind.
-     */
-    @Override
-    public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
-        return TokenFilterDefinition.Kind.IcuCollation;
-    }
-
-    /**
-     * Required - API name: {@code alternate}
-     */
-    public final IcuCollationAlternate alternate() {
-        return this.alternate;
-    }
-
-    /**
-     * Required - API name: {@code caseFirst}
-     */
-    public final IcuCollationCaseFirst casefirst() {
-        return this.casefirst;
-    }
-
-    /**
-     * Required - API name: {@code caseLevel}
-     */
-    public final boolean caselevel() {
-        return this.caselevel;
-    }
-
-    /**
-     * Required - API name: {@code country}
-     */
-    public final String country() {
-        return this.country;
-    }
-
-    /**
-     * Required - API name: {@code decomposition}
-     */
-    public final IcuCollationDecomposition decomposition() {
-        return this.decomposition;
-    }
-
-    /**
-     * Required - API name: {@code hiraganaQuaternaryMode}
-     */
-    public final boolean hiraganaquaternarymode() {
-        return this.hiraganaquaternarymode;
-    }
-
-    /**
-     * Required - API name: {@code language}
-     */
-    public final String language() {
-        return this.language;
-    }
-
-    /**
-     * Required - API name: {@code numeric}
-     */
-    public final boolean numeric() {
-        return this.numeric;
-    }
-
-    /**
-     * Required - API name: {@code strength}
-     */
-    public final IcuCollationStrength strength() {
-        return this.strength;
-    }
-
-    /**
-     * API name: {@code variableTop}
-     */
-    @Nullable
-    public final String variabletop() {
-        return this.variabletop;
-    }
-
-    /**
-     * Required - API name: {@code variant}
-     */
-    public final String variant() {
-        return this.variant;
-    }
-
-    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-        generator.write("type", "icu_collation");
-        super.serializeInternal(generator, mapper);
-        generator.writeKey("alternate");
-        this.alternate.serialize(generator, mapper);
-        generator.writeKey("caseFirst");
-        this.casefirst.serialize(generator, mapper);
-        generator.writeKey("caseLevel");
-        generator.write(this.caselevel);
-
-        generator.writeKey("country");
-        generator.write(this.country);
-
-        generator.writeKey("decomposition");
-        this.decomposition.serialize(generator, mapper);
-        generator.writeKey("hiraganaQuaternaryMode");
-        generator.write(this.hiraganaquaternarymode);
-
-        generator.writeKey("language");
-        generator.write(this.language);
-
-        generator.writeKey("numeric");
-        generator.write(this.numeric);
-
-        generator.writeKey("strength");
-        this.strength.serialize(generator, mapper);
-        if (this.variabletop != null) {
-            generator.writeKey("variableTop");
-            generator.write(this.variabletop);
-
-        }
-        generator.writeKey("variant");
-        generator.write(this.variant);
-
-    }
-
-    // ---------------------------------------------------------------------------------------------
-
-    /**
-     * Builder for {@link IcuCollationTokenFilter}.
-     */
-
-    public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<IcuCollationTokenFilter> {
-        private IcuCollationAlternate alternate;
-
-        private IcuCollationCaseFirst casefirst;
-
-        private Boolean caselevel;
-
-        private String country;
-
-        private IcuCollationDecomposition decomposition;
-
-        private Boolean hiraganaquaternarymode;
-
-        private String language;
-
-        private Boolean numeric;
-
-        private IcuCollationStrength strength;
-
-        @Nullable
-        private String variabletop;
-
-        private String variant;
-
-        /**
-         * Required - API name: {@code alternate}
-         */
-        public final Builder alternate(IcuCollationAlternate value) {
-            this.alternate = value;
-            return this;
-        }
-
-        /**
-         * Required - API name: {@code caseFirst}
-         */
-        public final Builder casefirst(IcuCollationCaseFirst value) {
-            this.casefirst = value;
-            return this;
-        }
-
-        /**
-         * Required - API name: {@code caseLevel}
-         */
-        public final Builder caselevel(boolean value) {
-            this.caselevel = value;
-            return this;
-        }
-
-        /**
-         * Required - API name: {@code country}
-         */
-        public final Builder country(String value) {
-            this.country = value;
-            return this;
-        }
-
-        /**
-         * Required - API name: {@code decomposition}
-         */
-        public final Builder decomposition(IcuCollationDecomposition value) {
-            this.decomposition = value;
-            return this;
-        }
-
-        /**
-         * Required - API name: {@code hiraganaQuaternaryMode}
-         */
-        public final Builder hiraganaquaternarymode(boolean value) {
-            this.hiraganaquaternarymode = value;
-            return this;
-        }
-
-        /**
-         * Required - API name: {@code language}
-         */
-        public final Builder language(String value) {
-            this.language = value;
-            return this;
-        }
-
-        /**
-         * Required - API name: {@code numeric}
-         */
-        public final Builder numeric(boolean value) {
-            this.numeric = value;
-            return this;
-        }
-
-        /**
-         * Required - API name: {@code strength}
-         */
-        public final Builder strength(IcuCollationStrength value) {
-            this.strength = value;
-            return this;
-        }
-
-        /**
-         * API name: {@code variableTop}
-         */
-        public final Builder variabletop(@Nullable String value) {
-            this.variabletop = value;
-            return this;
-        }
-
-        /**
-         * Required - API name: {@code variant}
-         */
-        public final Builder variant(String value) {
-            this.variant = value;
-            return this;
-        }
-
-        @Override
-        protected Builder self() {
-            return this;
-        }
-
-        /**
-         * Builds a {@link IcuCollationTokenFilter}.
-         *
-         * @throws NullPointerException
-         *             if some of the required fields are null.
-         */
-        public IcuCollationTokenFilter build() {
-            _checkSingleUse();
-
-            return new IcuCollationTokenFilter(this);
-        }
-    }
-
-    // ---------------------------------------------------------------------------------------------
-
-    /**
-     * Json deserializer for {@link IcuCollationTokenFilter}
-     */
-    public static final JsonpDeserializer<IcuCollationTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
-        Builder::new,
-        IcuCollationTokenFilter::setupIcuCollationTokenFilterDeserializer
-    );
-
-    protected static void setupIcuCollationTokenFilterDeserializer(ObjectDeserializer<IcuCollationTokenFilter.Builder> op) {
-        TokenFilterBase.setupTokenFilterBaseDeserializer(op);
-        op.add(Builder::alternate, IcuCollationAlternate._DESERIALIZER, "alternate");
-        op.add(Builder::casefirst, IcuCollationCaseFirst._DESERIALIZER, "caseFirst");
-        op.add(Builder::caselevel, JsonpDeserializer.booleanDeserializer(), "caseLevel");
-        op.add(Builder::country, JsonpDeserializer.stringDeserializer(), "country");
-        op.add(Builder::decomposition, IcuCollationDecomposition._DESERIALIZER, "decomposition");
-        op.add(Builder::hiraganaquaternarymode, JsonpDeserializer.booleanDeserializer(), "hiraganaQuaternaryMode");
-        op.add(Builder::language, JsonpDeserializer.stringDeserializer(), "language");
-        op.add(Builder::numeric, JsonpDeserializer.booleanDeserializer(), "numeric");
-        op.add(Builder::strength, IcuCollationStrength._DESERIALIZER, "strength");
-        op.add(Builder::variabletop, JsonpDeserializer.stringDeserializer(), "variableTop");
-        op.add(Builder::variant, JsonpDeserializer.stringDeserializer(), "variant");
-
-        op.ignore("type");
-    }
-
-}
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/experiments/ParsingTests.java b/java-client/src/test/java/org/opensearch/client/opensearch/experiments/ParsingTests.java
index 6963f82f89..d013cc3fc7 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/experiments/ParsingTests.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/experiments/ParsingTests.java
@@ -149,7 +149,7 @@ public void testSmartcn_Tokenizer() {
 
     @Test
     public void testSmartcn_StopFilter() {
-        final TokenFilterDefinition analyzer = new TokenFilterDefinition.Builder().smartcn_stop(b -> b).build();
+        final TokenFilterDefinition analyzer = new TokenFilterDefinition.Builder().smartcnStop(b -> b).build();
 
         String str = toJson(analyzer);
         assertEquals("{\"type\":\"smartcn_stop\"}", str);
diff --git a/java-client/src/test/java11/org/opensearch/client/opensearch/integTest/AbstractCrudIT.java b/java-client/src/test/java11/org/opensearch/client/opensearch/integTest/AbstractCrudIT.java
index f83247fa1b..0020a118eb 100644
--- a/java-client/src/test/java11/org/opensearch/client/opensearch/integTest/AbstractCrudIT.java
+++ b/java-client/src/test/java11/org/opensearch/client/opensearch/integTest/AbstractCrudIT.java
@@ -16,6 +16,7 @@
 import org.joda.time.DateTimeZone;
 import org.joda.time.format.DateTimeFormat;
 import org.opensearch.client.json.JsonData;
+import org.opensearch.client.opensearch._types.BuiltinScriptLanguage;
 import org.opensearch.client.opensearch._types.InlineScript;
 import org.opensearch.client.opensearch._types.OpenSearchException;
 import org.opensearch.client.opensearch._types.Refresh;
@@ -340,7 +341,7 @@ public void testBulkUpdateScript() throws IOException {
                 .script(
                     Script.of(
                         s -> s.inline(
-                            new InlineScript.Builder().lang("painless")
+                            new InlineScript.Builder().lang(l -> l.builtin(BuiltinScriptLanguage.Painless))
                                 .source("ctx._source.intValue += params.inc")
                                 .params("inc", JsonData.of(1))
                                 .build()
@@ -374,7 +375,7 @@ public void testBulkUpdateScriptUpsert() throws IOException {
                 .script(
                     Script.of(
                         s -> s.inline(
-                            new InlineScript.Builder().lang("painless")
+                            new InlineScript.Builder().lang(l -> l.builtin(BuiltinScriptLanguage.Painless))
                                 .source("ctx._source.intValue += params.inc")
                                 .params("inc", JsonData.of(1))
                                 .build()
@@ -411,7 +412,7 @@ public void testBulkUpdateScriptedUpsertUpdate() throws IOException {
                 .script(
                     Script.of(
                         s -> s.inline(
-                            new InlineScript.Builder().lang("painless")
+                            new InlineScript.Builder().lang(l -> l.builtin(BuiltinScriptLanguage.Painless))
                                 .source("ctx._source.intValue = ctx?._source?.intValue == null ? 7777 : 9999")
                                 .build()
                         )
@@ -441,7 +442,7 @@ public void testBulkUpdateScriptedUpsertInsert() throws IOException {
                 .script(
                     Script.of(
                         s -> s.inline(
-                            new InlineScript.Builder().lang("painless")
+                            new InlineScript.Builder().lang(l -> l.builtin(BuiltinScriptLanguage.Painless))
                                 .source("ctx._source.intValue = ctx?._source?.intValue == null ? 7777 : 9999")
                                 .build()
                         )
diff --git a/java-client/src/test/java11/org/opensearch/client/opensearch/integTest/AbstractMultiSearchRequestIT.java b/java-client/src/test/java11/org/opensearch/client/opensearch/integTest/AbstractMultiSearchRequestIT.java
index 0d35a11f7e..66623566a6 100644
--- a/java-client/src/test/java11/org/opensearch/client/opensearch/integTest/AbstractMultiSearchRequestIT.java
+++ b/java-client/src/test/java11/org/opensearch/client/opensearch/integTest/AbstractMultiSearchRequestIT.java
@@ -20,6 +20,7 @@
 import java.util.function.Function;
 import org.junit.Test;
 import org.opensearch.client.json.JsonData;
+import org.opensearch.client.opensearch._types.BuiltinScriptLanguage;
 import org.opensearch.client.opensearch._types.FieldSort;
 import org.opensearch.client.opensearch._types.FieldValue;
 import org.opensearch.client.opensearch._types.InlineScript;
@@ -208,7 +209,7 @@ public void shouldReturnMultiSearchesScriptFields() throws Exception {
             new ScriptField.Builder().script(
                 Script.of(
                     s -> s.inline(
-                        new InlineScript.Builder().lang("painless")
+                        new InlineScript.Builder().lang(l -> l.builtin(BuiltinScriptLanguage.Painless))
                             .source("doc['quantity'].value + params.inc")
                             .params("inc", JsonData.of(1))
                             .build()
diff --git a/java-codegen/src/main/java/org/opensearch/client/codegen/model/overrides/Overrides.java b/java-codegen/src/main/java/org/opensearch/client/codegen/model/overrides/Overrides.java
index bd040d5f5b..eb10a76375 100644
--- a/java-codegen/src/main/java/org/opensearch/client/codegen/model/overrides/Overrides.java
+++ b/java-codegen/src/main/java/org/opensearch/client/codegen/model/overrides/Overrides.java
@@ -24,16 +24,19 @@ public class Overrides {
     private static final JsonPointer SCHEMAS = JsonPointer.of("components", "schemas");
 
     public static final Overrides OVERRIDES = builder().withSchemas(
-        s -> s
+        s -> s.with(SCHEMAS.append("_common.analysis:TokenFilter"), so -> so.withShouldGenerate(ShouldGenerate.Always))
+
             // TODO: Remove this to generate property mapping types
             .with(SCHEMAS.append("_common.mapping:Property"), so -> so.withShouldGenerate(ShouldGenerate.Never))
             .with(SCHEMAS.append("_common.mapping:PropertyBase"), so -> so.withShouldGenerate(ShouldGenerate.Never))
             .with(SCHEMAS.append("_common.mapping:KnnVectorProperty"), so -> so.withShouldGenerate(ShouldGenerate.Always))
+
             // TODO: Remove this to generate query types
             .with(
                 SCHEMAS.append("_common.query_dsl:QueryContainer"),
                 so -> so.withMappedType(t -> t.withPackage(Types.Client.OpenSearch._Types.PACKAGE + ".query_dsl").withName("Query"))
             )
+
             // TODO: Remove this to generate index settings types
             .with(SCHEMAS.append("indices._common:IndexSettings"), so -> so.withShouldGenerate(ShouldGenerate.Never))
     ).build();
diff --git a/samples/src/main/java/org/opensearch/client/samples/knn/KnnScriptScore.java b/samples/src/main/java/org/opensearch/client/samples/knn/KnnScriptScore.java
index eb0ccec60f..2277db6d13 100644
--- a/samples/src/main/java/org/opensearch/client/samples/knn/KnnScriptScore.java
+++ b/samples/src/main/java/org/opensearch/client/samples/knn/KnnScriptScore.java
@@ -67,7 +67,7 @@ public static void main(String[] args) {
                                 .script(
                                     sss -> sss.inline(
                                         i -> i.source("knn_score")
-                                            .lang("knn")
+                                            .lang(l -> l.custom("knn"))
                                             .params("field", JsonData.of("values"))
                                             .params("query_value", JsonData.of(searchVector))
                                             .params("space_type", JsonData.of("cosinesimil"))