Generate basic index template operations (#1293)

* Generate basic index template operations Generate indices.get_index_template Signed-off-by: Thomas Farr <tsfarr@amazon.com> Generate indices.put_index_template Signed-off-by: Thomas Farr <tsfarr@amazon.com> Generate indices.exists_index_template Signed-off-by: Thomas Farr <tsfarr@amazon.com> Generate indices.delete_index_template Signed-off-by: Thomas Farr <tsfarr@amazon.com> Generate indices.simulate_index_template Signed-off-by: Thomas Farr <tsfarr@amazon.com> * Allow deserializing path params from JSON Signed-off-by: Thomas Farr <tsfarr@amazon.com> * Fix compile Signed-off-by: Thomas Farr <tsfarr@amazon.com> --------- Signed-off-by: Thomas Farr <tsfarr@amazon.com>
opensearch-project · Nov 14, 2024 · c7103d8 · c7103d8
1 parent 5dbe61e
commit c7103d8
Show file tree

Hide file tree

Showing 37 changed files with 2,127 additions and 1,304 deletions.
diff --git a/UPGRADING.md b/UPGRADING.md
@@ -82,4 +82,17 @@ After:
 - `PointProperty` has been removed and is replaced by `XyPointProperty`.
 
 ### PropertyBase
-- The `name` and `localMetadata` fields, getters and builder methods have been removed from `PropertyBase` as they are not supported by OpenSearch.
+- The `name` and `localMetadata` fields, getters and builder methods have been removed from `PropertyBase` as they are not supported by OpenSearch.
+
+### IndexTemplate
+- `IndexTemplate` has been moved from the `org.opensearch.client.opensearch.indices.get_index_template` package to the `org.opensearch.client.opensearch.indices` package.
+- The `dataStream` property is now of type `IndexTemplateDataStreamConfiguration` instead of `Map<String, JsonData>`.
+
+### IndexTemplateSummary
+- `IndexTemplateSummary` has been moved from the `org.opensearch.client.opensearch.indices.get_index_template` package to the `org.opensearch.client.opensearch.indices` package.
+- The `settings` property is now of type `IndexSettings` instead of `Map<String, JsonData>`.
+
+### DataStream renamed to IndexTemplateDataStreamConfiguration
+- The `DataStream` class has been renamed to `IndexTemplateDataStreamConfiguration`, this affects:
+  - `PutIndexTemplateRequest`'s `dataStream` field.
+  - `SimulateIndexTemplateRequest`'s `dataStream` field.
diff --git a/...ted/java/org/opensearch/client/opensearch/_types/mapping/IcuCollationKeywordProperty.java b/...ted/java/org/opensearch/client/opensearch/_types/mapping/IcuCollationKeywordProperty.java
@@ -67,6 +67,9 @@ public class IcuCollationKeywordProperty extends DocValuesPropertyBase implement
     @Nullable
     private final Boolean caseLevel;
 
+    @Nullable
+    private final String country;
+
     @Nullable
     private final IcuCollationDecomposition decomposition;
 
@@ -76,6 +79,9 @@ public class IcuCollationKeywordProperty extends DocValuesPropertyBase implement
     @Nullable
     private final Boolean index;
 
+    @Nullable
+    private final String language;
+
     @Nullable
     private final String nullValue;
 
@@ -88,20 +94,26 @@ public class IcuCollationKeywordProperty extends DocValuesPropertyBase implement
     @Nullable
     private final String variableTop;
 
+    @Nullable
+    private final String variant;
+
     // ---------------------------------------------------------------------------------------------
 
     private IcuCollationKeywordProperty(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.index = builder.index;
+        this.language = builder.language;
         this.nullValue = builder.nullValue;
         this.numeric = builder.numeric;
         this.strength = builder.strength;
         this.variableTop = builder.variableTop;
+        this.variant = builder.variant;
     }
 
     public static IcuCollationKeywordProperty of(
@@ -142,6 +154,14 @@ public final Boolean caseLevel() {
         return this.caseLevel;
     }
 
+    /**
+     * API name: {@code country}
+     */
+    @Nullable
+    public final String country() {
+        return this.country;
+    }
+
     /**
      * API name: {@code decomposition}
      */
@@ -166,6 +186,14 @@ public final Boolean index() {
         return this.index;
     }
 
+    /**
+     * API name: {@code language}
+     */
+    @Nullable
+    public final String language() {
+        return this.language;
+    }
+
     /**
      * API name: {@code null_value}
      */
@@ -198,6 +226,14 @@ 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_keyword");
         super.serializeInternal(generator, mapper);
@@ -216,6 +252,11 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
             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);
@@ -231,6 +272,11 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
             generator.write(this.index);
         }
 
+        if (this.language != null) {
+            generator.writeKey("language");
+            generator.write(this.language);
+        }
+
         if (this.nullValue != null) {
             generator.writeKey("null_value");
             generator.write(this.nullValue);
@@ -250,6 +296,11 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
             generator.writeKey("variable_top");
             generator.write(this.variableTop);
         }
+
+        if (this.variant != null) {
+            generator.writeKey("variant");
+            generator.write(this.variant);
+        }
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -267,19 +318,25 @@ public static class Builder extends DocValuesPropertyBase.AbstractBuilder<Builde
         @Nullable
         private Boolean caseLevel;
         @Nullable
+        private String country;
+        @Nullable
         private IcuCollationDecomposition decomposition;
         @Nullable
         private Boolean hiraganaQuaternaryMode;
         @Nullable
         private Boolean index;
         @Nullable
+        private String language;
+        @Nullable
         private String nullValue;
         @Nullable
         private Boolean numeric;
         @Nullable
         private IcuCollationStrength strength;
         @Nullable
         private String variableTop;
+        @Nullable
+        private String variant;
 
         /**
          * API name: {@code alternate}
@@ -305,6 +362,14 @@ public final Builder caseLevel(@Nullable Boolean value) {
             return this;
         }
 
+        /**
+         * API name: {@code country}
+         */
+        public final Builder country(@Nullable String value) {
+            this.country = value;
+            return this;
+        }
+
         /**
          * API name: {@code decomposition}
          */
@@ -329,6 +394,14 @@ public final Builder index(@Nullable Boolean value) {
             return this;
         }
 
+        /**
+         * API name: {@code language}
+         */
+        public final Builder language(@Nullable String value) {
+            this.language = value;
+            return this;
+        }
+
         /**
          * API name: {@code null_value}
          */
@@ -361,6 +434,14 @@ public final Builder variableTop(@Nullable String 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;
@@ -393,13 +474,16 @@ protected static void setupIcuCollationKeywordPropertyDeserializer(ObjectDeseria
         op.add(Builder::alternate, IcuCollationAlternate._DESERIALIZER, "alternate");
         op.add(Builder::caseFirst, IcuCollationCaseFirst._DESERIALIZER, "case_first");
         op.add(Builder::caseLevel, JsonpDeserializer.booleanDeserializer(), "case_level");
+        op.add(Builder::country, JsonpDeserializer.stringDeserializer(), "country");
         op.add(Builder::decomposition, IcuCollationDecomposition._DESERIALIZER, "decomposition");
         op.add(Builder::hiraganaQuaternaryMode, JsonpDeserializer.booleanDeserializer(), "hiragana_quaternary_mode");
         op.add(Builder::index, JsonpDeserializer.booleanDeserializer(), "index");
+        op.add(Builder::language, JsonpDeserializer.stringDeserializer(), "language");
         op.add(Builder::nullValue, JsonpDeserializer.stringDeserializer(), "null_value");
         op.add(Builder::numeric, JsonpDeserializer.booleanDeserializer(), "numeric");
         op.add(Builder::strength, IcuCollationStrength._DESERIALIZER, "strength");
         op.add(Builder::variableTop, JsonpDeserializer.stringDeserializer(), "variable_top");
+        op.add(Builder::variant, JsonpDeserializer.stringDeserializer(), "variant");
 
         op.ignore("type");
     }
@@ -410,13 +494,16 @@ public int 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.index);
+        result = 31 * result + Objects.hashCode(this.language);
         result = 31 * result + Objects.hashCode(this.nullValue);
         result = 31 * result + Objects.hashCode(this.numeric);
         result = 31 * result + Objects.hashCode(this.strength);
         result = 31 * result + Objects.hashCode(this.variableTop);
+        result = 31 * result + Objects.hashCode(this.variant);
         return result;
     }
 
@@ -431,12 +518,15 @@ public boolean equals(Object 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.index, other.index)
+            && Objects.equals(this.language, other.language)
             && Objects.equals(this.nullValue, other.nullValue)
             && Objects.equals(this.numeric, other.numeric)
             && Objects.equals(this.strength, other.strength)
-            && Objects.equals(this.variableTop, other.variableTop);
+            && Objects.equals(this.variableTop, other.variableTop)
+            && Objects.equals(this.variant, other.variant);
     }
 }
diff --git a/...lient/src/generated/java/org/opensearch/client/opensearch/indices/CreateIndexRequest.java b/...lient/src/generated/java/org/opensearch/client/opensearch/indices/CreateIndexRequest.java
@@ -449,6 +449,7 @@ public CreateIndexRequest build() {
 
     protected static void setupCreateIndexRequestDeserializer(ObjectDeserializer<CreateIndexRequest.Builder> op) {
         op.add(Builder::aliases, JsonpDeserializer.stringMapDeserializer(Alias._DESERIALIZER), "aliases");
+        op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index");
         op.add(Builder::mappings, TypeMapping._DESERIALIZER, "mappings");
         op.add(Builder::settings, IndexSettings._DESERIALIZER, "settings");
     }