opensearch-project
diff --git a/‎CHANGELOG.md‎
Lines changed: 15 additions & 2 deletions b/‎CHANGELOG.md‎
Lines changed: 15 additions & 2 deletions
diff --git a/‎README.md‎
Lines changed: 1 addition & 1 deletion b/‎README.md‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎buildSrc/build.gradle.kts‎
Lines changed: 1 addition & 1 deletion b/‎buildSrc/build.gradle.kts‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎java-client/build.gradle.kts‎
Lines changed: 2 additions & 2 deletions b/‎java-client/build.gradle.kts‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎java-client/src/generated/java/org/opensearch/client/opensearch/core/SearchShardsRequest.java‎
Lines changed: 2 additions & 2 deletions b/‎java-client/src/generated/java/org/opensearch/client/opensearch/core/SearchShardsRequest.java‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎java-client/src/generated/java/org/opensearch/client/opensearch/ml/AdditionalConfig.java‎
Lines changed: 169 additions & 0 deletions b/‎java-client/src/generated/java/org/opensearch/client/opensearch/ml/AdditionalConfig.java‎
Lines changed: 169 additions & 0 deletions
diff --git a/‎java-client/src/generated/java/org/opensearch/client/opensearch/ml/ColumnMeta.java‎
Lines changed: 0 additions & 6 deletions b/‎java-client/src/generated/java/org/opensearch/client/opensearch/ml/ColumnMeta.java‎
Lines changed: 0 additions & 6 deletions
diff --git a/‎java-client/src/generated/java/org/opensearch/client/opensearch/ml/CreateModelMetaRequest.java‎
Lines changed: 33 additions & 0 deletions b/‎java-client/src/generated/java/org/opensearch/client/opensearch/ml/CreateModelMetaRequest.java‎
Lines changed: 33 additions & 0 deletions
@@ -3,7 +3,6 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
 ## [Unreleased 2.x]
 ### Added
-- Added Jackson `ObjectMapper` module auto-detection ([#1643](https://github.com/opensearch-project/opensearch-java/pull/1643))
 
 ### Dependencies
 
@@ -17,6 +16,19 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
 ### Security
 
+## [2.26.0] - 07/10/2025
+### Added
+- Added Jackson `ObjectMapper` module auto-detection ([#1643](https://github.com/opensearch-project/opensearch-java/pull/1643))
+
+### Dependencies
+- Bump `org.owasp.dependencycheck` from 12.1.1 to 12.1.3 ([#1608](https://github.com/opensearch-project/opensearch-java/pull/1608), [#1607](https://github.com/opensearch-project/opensearch-java/pull/1607), [#1623](https://github.com/opensearch-project/opensearch-java/pull/1623))
+- Bump `org.junit:junit-bom` from 5.13.0 to 5.13.2 ([#1606](https://github.com/opensearch-project/opensearch-java/pull/1606), [#1650](https://github.com/opensearch-project/opensearch-java/pull/1650), [#1665](https://github.com/opensearch-project/opensearch-java/pull/1665))
+- Bump `org.ajoberstar.grgit:grgit-gradle` from 5.3.0 to 5.3.2 ([#1621](https://github.com/opensearch-project/opensearch-java/pull/1621))
+- Bump `io.github.classgraph:classgraph` from 4.8.179 to 4.8.180 ([#1651](https://github.com/opensearch-project/opensearch-java/pull/1651))
+
+### Fixed
+- Fixed `ApacheHttpClient5Transport` not honoring connect & socket timeouts configured on `ConnectionConfig` ([#1662](https://github.com/opensearch-project/opensearch-java/pull/1662))
+
 ## [2.25.0] - 06/03/2025
 ### Added
 - Added support for the `template` query type ([#1586](https://github.com/opensearch-project/opensearch-java/pull/1586))
@@ -476,7 +488,8 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - Fix catching JsonParsingException ([#494](https://github.com/opensearch-project/opensearch-java/issues/494))
 - Fix StoryStats numeric value out of range of int ([#489](https://github.com/opensearch-project/opensearch-java/pull/489))
 
-[Unreleased 2.x]: https://github.com/opensearch-project/opensearch-java/compare/v2.25.0...2.x
+[Unreleased 2.x]: https://github.com/opensearch-project/opensearch-java/compare/v2.26.0...2.x
+[2.26.0]: https://github.com/opensearch-project/opensearch-java/compare/v2.25.0...v2.26.0
 [2.25.0]: https://github.com/opensearch-project/opensearch-java/compare/v2.24.0...v2.25.0
 [2.24.0]: https://github.com/opensearch-project/opensearch-java/compare/v2.23.0...v2.24.0
 [2.23.0]: https://github.com/opensearch-project/opensearch-java/compare/v2.22.0...v2.23.0
 
@@ -53,7 +53,7 @@ This project has adopted the [Amazon Open Source Code of Conduct](CODE_OF_CONDUC
 See [User Guide](USER_GUIDE.md).
 
 ## Snapshot Builds
-The [snapshots builds](https://central.sonatype.com/service/rest/repository/browse/maven-snapshots/org/opensearch/client/opensearch-java/) are published to sonatype using [publish-snapshots.yml](./.github/workflows/publish-snapshots.yml) workflow. Each `push` event to the main branch triggers this workflow.
+The [snapshots builds](https://central.sonatype.com/repository/maven-snapshots/org/opensearch/client/opensearch-java/maven-metadata.xml) are published to sonatype using [publish-snapshots.yml](./.github/workflows/publish-snapshots.yml) workflow. Each `push` event to the main branch triggers this workflow.
 
 ## Compatibility with OpenSearch
 
 
@@ -43,7 +43,7 @@ repositories {
 }
 
 dependencies {
-    implementation("org.ajoberstar.grgit:grgit-gradle:5.3.0")
+    implementation("org.ajoberstar.grgit:grgit-gradle:5.3.2")
     implementation("com.diffplug.spotless", "spotless-plugin-gradle", "6.25.0")
 }
 
@@ -50,7 +50,7 @@ plugins {
     `java-library`
     `maven-publish`
     id("com.github.jk1.dependency-license-report") version "2.9"
-    id("org.owasp.dependencycheck") version "12.1.1"
+    id("org.owasp.dependencycheck") version "12.1.3"
 
     id("opensearch-java.spotless-conventions")
 }
@@ -244,7 +244,7 @@ dependencies {
     implementation("org.eclipse", "yasson", "2.0.2")
 
     // https://github.com/classgraph/classgraph
-    testImplementation("io.github.classgraph:classgraph:4.8.179")
+    testImplementation("io.github.classgraph:classgraph:4.8.180")
 
     // Eclipse 1.0
     testImplementation("junit", "junit" , "4.13.2") {
 
@@ -188,7 +188,7 @@ public final String preference() {
     }
 
     /**
-     * Custom value used to route operations to a specific shard.
+     * A custom value used to route operations to a specific shard.
      * <p>
      * API name: {@code routing}
      * </p>
@@ -415,7 +415,7 @@ public final Builder preference(@Nullable String value) {
         }
 
         /**
-         * Custom value used to route operations to a specific shard.
+         * A custom value used to route operations to a specific shard.
          * <p>
          * API name: {@code routing}
          * </p>
 
@@ -0,0 +1,169 @@
+/*
+ * 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.
+ */
+
+//----------------------------------------------------
+// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------
+
+package org.opensearch.client.opensearch.ml;
+
+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;
+import org.opensearch.client.json.ObjectBuilderDeserializer;
+import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.json.PlainJsonSerializable;
+import org.opensearch.client.util.CopyableBuilder;
+import org.opensearch.client.util.ObjectBuilder;
+import org.opensearch.client.util.ObjectBuilderBase;
+import org.opensearch.client.util.ToCopyableBuilder;
+
+// typedef: ml.AdditionalConfig
+
+@JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
+public class AdditionalConfig implements PlainJsonSerializable, ToCopyableBuilder<AdditionalConfig.Builder, AdditionalConfig> {
+
+    @Nullable
+    private final String spaceType;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private AdditionalConfig(Builder builder) {
+        this.spaceType = builder.spaceType;
+    }
+
+    public static AdditionalConfig of(Function<AdditionalConfig.Builder, ObjectBuilder<AdditionalConfig>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * The distance metric for k-NN search.
+     * <p>
+     * API name: {@code space_type}
+     * </p>
+     */
+    @Nullable
+    public final String spaceType() {
+        return this.spaceType;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    @Override
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+        if (this.spaceType != null) {
+            generator.writeKey("space_type");
+            generator.write(this.spaceType);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    @Override
+    @Nonnull
+    public Builder toBuilder() {
+        return new Builder(this);
+    }
+
+    @Nonnull
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    /**
+     * Builder for {@link AdditionalConfig}.
+     */
+    public static class Builder extends ObjectBuilderBase implements CopyableBuilder<Builder, AdditionalConfig> {
+        @Nullable
+        private String spaceType;
+
+        public Builder() {}
+
+        private Builder(AdditionalConfig o) {
+            this.spaceType = o.spaceType;
+        }
+
+        private Builder(Builder o) {
+            this.spaceType = o.spaceType;
+        }
+
+        @Override
+        @Nonnull
+        public Builder copy() {
+            return new Builder(this);
+        }
+
+        /**
+         * The distance metric for k-NN search.
+         * <p>
+         * API name: {@code space_type}
+         * </p>
+         */
+        @Nonnull
+        public final Builder spaceType(@Nullable String value) {
+            this.spaceType = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link AdditionalConfig}.
+         *
+         * @throws NullPointerException if some of the required fields are null.
+         */
+        @Override
+        @Nonnull
+        public AdditionalConfig build() {
+            _checkSingleUse();
+
+            return new AdditionalConfig(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link AdditionalConfig}
+     */
+    public static final JsonpDeserializer<AdditionalConfig> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        AdditionalConfig::setupAdditionalConfigDeserializer
+    );
+
+    protected static void setupAdditionalConfigDeserializer(ObjectDeserializer<AdditionalConfig.Builder> op) {
+        op.add(Builder::spaceType, JsonpDeserializer.stringDeserializer(), "space_type");
+    }
+
+    @Override
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + Objects.hashCode(this.spaceType);
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || this.getClass() != o.getClass()) return false;
+        AdditionalConfig other = (AdditionalConfig) o;
+        return Objects.equals(this.spaceType, other.spaceType);
+    }
+}
@@ -53,10 +53,7 @@ public static ColumnMeta of(Function<ColumnMeta.Builder, ObjectBuilder<ColumnMet
     }
 
     /**
-     * The column type.
-     * <p>
      * API name: {@code column_type}
-     * </p>
      */
     @Nullable
     public final String columnType() {
@@ -134,10 +131,7 @@ public Builder copy() {
         }
 
         /**
-         * The column type.
-         * <p>
          * API name: {@code column_type}
-         * </p>
          */
         @Nonnull
         public final Builder columnType(@Nullable String value) {
 
@@ -50,6 +50,9 @@ public final class CreateModelMetaRequest extends RequestBase
     @Nullable
     private final String description;
 
+    @Nullable
+    private final FunctionName functionName;
+
     @Nonnull
     private final ModelConfig modelConfig;
 
@@ -78,6 +81,7 @@ public final class CreateModelMetaRequest extends RequestBase
     private CreateModelMetaRequest(Builder builder) {
         super(builder);
         this.description = builder.description;
+        this.functionName = builder.functionName;
         this.modelConfig = ApiTypeHelper.requireNonNull(builder.modelConfig, this, "modelConfig");
         this.modelContentHashValue = ApiTypeHelper.requireNonNull(builder.modelContentHashValue, this, "modelContentHashValue");
         this.modelFormat = ApiTypeHelper.requireNonNull(builder.modelFormat, this, "modelFormat");
@@ -103,6 +107,14 @@ public final String description() {
         return this.description;
     }
 
+    /**
+     * API name: {@code function_name}
+     */
+    @Nullable
+    public final FunctionName functionName() {
+        return this.functionName;
+    }
+
     /**
      * Required - API name: {@code model_config}
      */
@@ -194,6 +206,11 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
             generator.write(this.description);
         }
 
+        if (this.functionName != null) {
+            generator.writeKey("function_name");
+            this.functionName.serialize(generator, mapper);
+        }
+
         generator.writeKey("model_config");
         this.modelConfig.serialize(generator, mapper);
 
@@ -242,6 +259,8 @@ public static Builder builder() {
     public static class Builder extends RequestBase.AbstractBuilder<Builder> implements CopyableBuilder<Builder, CreateModelMetaRequest> {
         @Nullable
         private String description;
+        @Nullable
+        private FunctionName functionName;
         private ModelConfig modelConfig;
         private String modelContentHashValue;
         private ModelFormat modelFormat;
@@ -258,6 +277,7 @@ public Builder() {}
         private Builder(CreateModelMetaRequest o) {
             super(o);
             this.description = o.description;
+            this.functionName = o.functionName;
             this.modelConfig = o.modelConfig;
             this.modelContentHashValue = o.modelContentHashValue;
             this.modelFormat = o.modelFormat;
@@ -271,6 +291,7 @@ private Builder(CreateModelMetaRequest o) {
         private Builder(Builder o) {
             super(o);
             this.description = o.description;
+            this.functionName = o.functionName;
             this.modelConfig = o.modelConfig;
             this.modelContentHashValue = o.modelContentHashValue;
             this.modelFormat = o.modelFormat;
@@ -305,6 +326,15 @@ public final Builder description(@Nullable String value) {
             return this;
         }
 
+        /**
+         * API name: {@code function_name}
+         */
+        @Nonnull
+        public final Builder functionName(@Nullable FunctionName value) {
+            this.functionName = value;
+            return this;
+        }
+
         /**
          * Required - API name: {@code model_config}
          */
@@ -423,6 +453,7 @@ public CreateModelMetaRequest build() {
 
     protected static void setupCreateModelMetaRequestDeserializer(ObjectDeserializer<CreateModelMetaRequest.Builder> op) {
         op.add(Builder::description, JsonpDeserializer.stringDeserializer(), "description");
+        op.add(Builder::functionName, FunctionName._DESERIALIZER, "function_name");
         op.add(Builder::modelConfig, ModelConfig._DESERIALIZER, "model_config");
         op.add(Builder::modelContentHashValue, JsonpDeserializer.stringDeserializer(), "model_content_hash_value");
         op.add(Builder::modelFormat, ModelFormat._DESERIALIZER, "model_format");
@@ -458,6 +489,7 @@ protected static void setupCreateModelMetaRequestDeserializer(ObjectDeserializer
     public int hashCode() {
         int result = 17;
         result = 31 * result + Objects.hashCode(this.description);
+        result = 31 * result + Objects.hashCode(this.functionName);
         result = 31 * result + this.modelConfig.hashCode();
         result = 31 * result + this.modelContentHashValue.hashCode();
         result = 31 * result + this.modelFormat.hashCode();
@@ -475,6 +507,7 @@ public boolean equals(Object o) {
         if (o == null || this.getClass() != o.getClass()) return false;
         CreateModelMetaRequest other = (CreateModelMetaRequest) o;
         return Objects.equals(this.description, other.description)
+            && Objects.equals(this.functionName, other.functionName)
             && this.modelConfig.equals(other.modelConfig)
             && this.modelContentHashValue.equals(other.modelContentHashValue)
             && this.modelFormat.equals(other.modelFormat)
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ repositories {`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`dependencies {`
`46`		`- implementation("org.ajoberstar.grgit:grgit-gradle:5.3.0")`
	`46`	`+ implementation("org.ajoberstar.grgit:grgit-gradle:5.3.2")`
`47`	`47`	`implementation("com.diffplug.spotless", "spotless-plugin-gradle", "6.25.0")`
`48`	`48`	`}`
`49`	`49`