Fix GetIndexRequest

Signed-off-by: Thomas Farr <[email protected]>
Xtansia · Sep 26, 2024 · e0c062e · e0c062e
1 parent 4bdcb4d
commit e0c062e
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 42 deletions.
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/indices/GetIndexRequest.java b/java-client/src/generated/java/org/opensearch/client/opensearch/indices/GetIndexRequest.java
@@ -40,6 +40,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
+import java.util.stream.Collectors;
 import javax.annotation.Generated;
 import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
@@ -437,7 +438,7 @@ public GetIndexRequest build() {
                 params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
             }
             if (ApiTypeHelper.isDefined(request.expandWildcards)) {
-                params.put("expand_wildcards", request.expandWildcards.jsonValue());
+                params.put("expand_wildcards", request.expandWildcards.stream().map(v -> v.jsonValue()).collect(Collectors.joining(",")));
             }
             if (request.flatSettings != null) {
                 params.put("flat_settings", String.valueOf(request.flatSettings));

diff --git a/java-codegen/src/main/java/org/opensearch/client/codegen/model/SpecTransformer.java b/java-codegen/src/main/java/org/opensearch/client/codegen/model/SpecTransformer.java
@@ -256,6 +256,8 @@ private Shape visit(Namespace parent, String className, String typedefName, Open
         var description = schema.getDescription().orElse(null);
 
         var oneOf = schema.getOneOf();
+        var isTaggedUnion = oneOf.isPresent()
+            && (schema.getDiscriminator().isPresent() || oneOf.orElseThrow().stream().allMatch(OpenApiSchema::hasTitle));
 
         if (schema.isArray()) {
             shape = new ArrayShape(parent, className, mapType(schema), typedefName, description);
@@ -276,47 +278,44 @@ private Shape visit(Namespace parent, String className, String typedefName, Open
 
             shape = new EnumShape(parent, className, variants, typedefName, description);
             visitedSchemas.putIfAbsent(schema, shape);
-        } else if (oneOf.isPresent()
-            && (schema.getDiscriminator().isPresent() || oneOf.orElseThrow().stream().allMatch(OpenApiSchema::hasTitle))) {
-                var discriminatingField = schema.getDiscriminator().flatMap(OpenApiDiscriminator::getPropertyName).orElse(null);
-                var taggedUnion = new TaggedUnionShape(parent, className, typedefName, description, discriminatingField);
-                shape = taggedUnion;
-                visitedSchemas.putIfAbsent(schema, shape);
+        } else if (isTaggedUnion) {
+            var discriminatingField = schema.getDiscriminator().flatMap(OpenApiDiscriminator::getPropertyName).orElse(null);
+            var taggedUnion = new TaggedUnionShape(parent, className, typedefName, description, discriminatingField);
+            shape = taggedUnion;
+            visitedSchemas.putIfAbsent(schema, shape);
 
-                oneOf.get().forEach(s -> {
-                    String name;
-                    if (discriminatingField != null) {
-                        var props = new HashMap<String, OpenApiSchema>();
-                        collectObjectProperties(s, props, new ArrayList<>());
-                        name = Maps.tryGet(props, discriminatingField)
-                            .flatMap(OpenApiSchema::getEnums)
-                            .flatMap(enums -> enums.stream().findFirst())
-                            .orElseThrow(
-                                () -> new IllegalStateException(
-                                    "oneOf variant ["
-                                        + s.getPointer()
-                                        + "] is missing the `"
-                                        + discriminatingField
-                                        + "` property as a single value enum"
-                                )
-                            );
-                    } else {
-                        name = s.getTitle()
-                            .orElseThrow(
-                                () -> new IllegalStateException("oneOf variant [" + s.getPointer() + "] is missing a `title` tag")
-                            );
-                    }
-                    taggedUnion.addVariant(name, mapType(s));
-                });
-            } else if (schema.determineSingleType().orElse(null) == OpenApiSchemaType.Object) {
-                var objShape = new ObjectShape(parent, className, typedefName, description);
-                shape = objShape;
-                visitedSchemas.putIfAbsent(schema, shape);
+            oneOf.get().forEach(s -> {
+                String name;
+                if (discriminatingField != null) {
+                    var props = new HashMap<String, OpenApiSchema>();
+                    collectObjectProperties(s, props, new ArrayList<>());
+                    name = Maps.tryGet(props, discriminatingField)
+                        .flatMap(OpenApiSchema::getEnums)
+                        .flatMap(enums -> enums.stream().findFirst())
+                        .orElseThrow(
+                            () -> new IllegalStateException(
+                                "oneOf variant ["
+                                    + s.getPointer()
+                                    + "] is missing the `"
+                                    + discriminatingField
+                                    + "` property as a single value enum"
+                            )
+                        );
+                } else {
+                    name = s.getTitle()
+                        .orElseThrow(() -> new IllegalStateException("oneOf variant [" + s.getPointer() + "] is missing a `title` tag"));
+                }
+                taggedUnion.addVariant(name, mapType(s));
+            });
+        } else if (schema.determineSingleType().orElse(null) == OpenApiSchemaType.Object) {
+            var objShape = new ObjectShape(parent, className, typedefName, description);
+            shape = objShape;
+            visitedSchemas.putIfAbsent(schema, shape);
 
-                visitInto(schema, objShape);
-            } else {
-                throw new NotImplementedException("Unsupported schema: " + schema);
-            }
+            visitInto(schema, objShape);
+        } else {
+            throw new NotImplementedException("Unsupported schema: " + schema);
+        }
 
         parent.addShape(shape);
 

diff --git a/java-codegen/src/main/java/org/opensearch/client/codegen/model/Types.java b/java-codegen/src/main/java/org/opensearch/client/codegen/model/Types.java
@@ -77,7 +77,6 @@ public static final class Util {
             public static Type Map(Type keyType, Type valueType) {
                 return Map.toBuilder()
                     .withTypeParameters(keyType, valueType)
-                    .withTargetShape(valueType.getTargetShape().orElse(null))
                     .build();
             }
 
@@ -92,7 +91,6 @@ public static Type List(Type valueType) {
                     .withPackage(PACKAGE)
                     .withName("List")
                     .withTypeParameters(valueType)
-                    .withTargetShape(valueType.getTargetShape().orElse(null))
                     .build();
             }