Begin generating indices.get

Signed-off-by: Thomas Farr <[email protected]>
Xtansia · Oct 7, 2024 · b730726 · b730726
1 parent d045d86
commit b730726
Show file tree

Hide file tree

Showing 49 changed files with 3,243 additions and 1,374 deletions.
diff --git a/UPGRADING.md b/UPGRADING.md
@@ -51,4 +51,13 @@ After:
 - The `name` field, getter and builder method have been renamed to `repository`.
 
 ### CloneSnapshotRequest timeout removal
-- The `timeout` field, getter and builder method have been removed from `CloneSnapshotRequest` as it is not supported by OpenSearch.
+- The `timeout` field, getter and builder method have been removed from `CloneSnapshotRequest` as it is not supported by OpenSearch.
+
+### indices.Alias
+- The `indexRouting`, `routing` and `searchRouting` properties now accept a `List<String>` instead of a `String`.
+
+### InlineScript
+- The `lang` property now accepts a `ScriptLanguage` enum instead of a `String`.
+
+### DynamicMapping
+- Removed the `Runtime` variant from the `DynamicMapping` enum as it is not supported by OpenSearch.
diff --git a/...client/src/generated/java/org/opensearch/client/opensearch/OpenSearchAsyncClientBase.java b/...client/src/generated/java/org/opensearch/client/opensearch/OpenSearchAsyncClientBase.java
@@ -45,6 +45,7 @@
 import org.opensearch.client.opensearch.core.InfoRequest;
 import org.opensearch.client.opensearch.core.InfoResponse;
 import org.opensearch.client.opensearch.dangling_indices.OpenSearchDanglingIndicesAsyncClient;
+import org.opensearch.client.opensearch.indices.OpenSearchIndicesAsyncClient;
 import org.opensearch.client.opensearch.ml.OpenSearchMlAsyncClient;
 import org.opensearch.client.opensearch.snapshot.OpenSearchSnapshotAsyncClient;
 import org.opensearch.client.opensearch.tasks.OpenSearchTasksAsyncClient;
@@ -66,6 +67,10 @@ public OpenSearchDanglingIndicesAsyncClient danglingIndices() {
         return new OpenSearchDanglingIndicesAsyncClient(this.transport, this.transportOptions);
     }
 
+    public OpenSearchIndicesAsyncClient indices() {
+        return new OpenSearchIndicesAsyncClient(this.transport, this.transportOptions);
+    }
+
     public OpenSearchMlAsyncClient ml() {
         return new OpenSearchMlAsyncClient(this.transport, this.transportOptions);
     }

diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/OpenSearchClientBase.java b/java-client/src/generated/java/org/opensearch/client/opensearch/OpenSearchClientBase.java
@@ -44,6 +44,7 @@
 import org.opensearch.client.opensearch.core.InfoRequest;
 import org.opensearch.client.opensearch.core.InfoResponse;
 import org.opensearch.client.opensearch.dangling_indices.OpenSearchDanglingIndicesClient;
+import org.opensearch.client.opensearch.indices.OpenSearchIndicesClient;
 import org.opensearch.client.opensearch.ml.OpenSearchMlClient;
 import org.opensearch.client.opensearch.snapshot.OpenSearchSnapshotClient;
 import org.opensearch.client.opensearch.tasks.OpenSearchTasksClient;
@@ -65,6 +66,10 @@ public OpenSearchDanglingIndicesClient danglingIndices() {
         return new OpenSearchDanglingIndicesClient(this.transport, this.transportOptions);
     }
 
+    public OpenSearchIndicesClient indices() {
+        return new OpenSearchIndicesClient(this.transport, this.transportOptions);
+    }
+
     public OpenSearchMlClient ml() {
         return new OpenSearchMlClient(this.transport, this.transportOptions);
     }

diff --git a/...ent/opensearch/_types/ExpandWildcard.java → ...ent/opensearch/_types/ExpandWildcard.java b/...ent/opensearch/_types/ExpandWildcard.java → ...ent/opensearch/_types/ExpandWildcard.java
@@ -30,32 +30,33 @@
  * 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.ExpandWildcard
+
 @JsonpDeserializable
+@Generated("org.opensearch.client.codegen.CodeGenerator")
 public enum ExpandWildcard implements JsonEnum {
     /**
-     * Match any data stream or index, including hidden ones.
+     * Match any index, including hidden ones.
      */
     All("all"),
 
     /**
-     * Match open, non-hidden indices. Also matches any non-hidden data stream.
-     */
-    Open("open"),
-
-    /**
-     * Match closed, non-hidden indices. Also matches any non-hidden data stream.
-     * Data streams cannot be closed.
+     * Match closed, non-hidden indices.
      */
     Closed("closed"),
 
     /**
-     * Match hidden data streams and hidden indices. Must be combined with open,
-     * closed, or both.
+     * Match hidden indices. Must be combined with open, closed, or both.
      */
     Hidden("hidden"),
 
@@ -64,7 +65,10 @@ public enum ExpandWildcard implements JsonEnum {
      */
     None("none"),
 
-    ;
+    /**
+     * Match open, non-hidden indices.
+     */
+    Open("open");
 
     private final String jsonValue;
 

diff --git a/...lient/opensearch/_types/InlineScript.java → ...lient/opensearch/_types/InlineScript.java b/...lient/opensearch/_types/InlineScript.java → ...lient/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,102 +54,105 @@
 // 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();
     }
 
     /**
      * 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);
-
     }
 
     // ---------------------------------------------------------------------------------------------
 
     /**
      * 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 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,16 +161,21 @@ 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);
             return this;
         }
 
         /**
-         * 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 +190,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 +210,27 @@ 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");
-
+    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;
     }
 
+    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);
+    }
 }