Regenerate request/response for the info operation (opensearch-proj…

…ect#1026) * Tweak formatting rules used by codegen to allow reformatting javadoc Signed-off-by: Thomas Farr <[email protected]> * Support codegen for request shapes that may be singleton Signed-off-by: Thomas Farr <[email protected]> * Generate info operation shapes Signed-off-by: Thomas Farr <[email protected]> --------- Signed-off-by: Thomas Farr <[email protected]> (cherry picked from commit dea7e72)
Xtansia · Aug 30, 2024 · 499efde · 499efde
1 parent 80b2e29
commit 499efde
Show file tree

Hide file tree

Showing 13 changed files with 48,344 additions and 34 deletions.
diff --git a/buildSrc/formatterConfig-generated.xml b/buildSrc/formatterConfig-generated.xml
diff --git a/java-codegen/build.gradle.kts b/java-codegen/build.gradle.kts
@@ -69,7 +69,7 @@ application {
 tasks.named<JavaExec>("run") {
     args = listOf(
         "--input", "$projectDir/opensearch-openapi.yaml",
-        "--eclipse-config", "$rootDir/buildSrc/formatterConfig.xml",
+        "--eclipse-config", "$rootDir/buildSrc/formatterConfig-generated.xml",
         "--output", "${project(":java-client").projectDir}/src/generated/java/"
     )
 }
@@ -255,9 +255,9 @@ spotless {
         importOrder()
         removeUnusedImports()
 
-        eclipse().configFile("../buildSrc/formatterConfig.xml")
+        eclipse().configFile("../buildSrc/formatterConfig-generated.xml")
 
         trimTrailingWhitespace()
         endWithNewline()
     }
-}
+}
diff --git a/java-codegen/opensearch-openapi.yaml b/java-codegen/opensearch-openapi.yaml
diff --git a/java-codegen/src/main/java/org/opensearch/client/codegen/model/RequestShape.java b/java-codegen/src/main/java/org/opensearch/client/codegen/model/RequestShape.java
@@ -84,6 +84,10 @@ public String getResponseType() {
         return responseClassName(operationGroup);
     }
 
+    public boolean canBeSingleton() {
+        return !hasRequestBody() && !hasQueryParams() && hasSinglePath() && !getFirstPath().hasParams();
+    }
+
     public boolean hasRequestBody() {
         return !getBodyFields().isEmpty();
     }
@@ -109,7 +113,7 @@ public Collection<HttpPath> getHttpPaths() {
         return httpPaths;
     }
 
-    public HttpPath getFirstHttpPath() {
+    public HttpPath getFirstPath() {
         return httpPaths.get(0);
     }
 

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
@@ -20,6 +20,7 @@
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import javax.annotation.Nonnull;
 import org.apache.commons.lang3.NotImplementedException;
@@ -89,7 +90,7 @@ public void visit(@Nonnull OpenApiSpecification spec) {
     private void visit(@Nonnull OperationGroup group, @Nonnull List<OpenApiOperation> variants) {
         LOGGER.info("Visiting Operation Group: {} [{} variants]", group, variants.size());
 
-        var parent = root.child(group.getNamespace().orElse(null));
+        var parent = root.child(group.getNamespace().orElse("core"));
 
         var requestShape = visit(parent, group, variants);
         parent.addOperation(requestShape);
@@ -349,21 +350,16 @@ private Type mapTypeInner(OpenApiSchema schema) {
     }
 
     private Type mapOneOf(List<OpenApiSchema> oneOf) {
-        if (oneOf.size() == 2) {
-            var first = oneOf.get(0);
-            var second = oneOf.get(1);
+        if (isOneOfSingleAndArray(oneOf)) {
+            return mapType(oneOf.get(1));
+        }
 
-            if (isOneOfSingleAndArray(oneOf)) {
-                return mapType(second);
-            }
+        var types = oneOf.stream().map(OpenApiSchema::determineTypes).flatMap(Set::stream).collect(Collectors.toSet());
 
-            if ((first.isString() && (second.isString() || second.isNumber())) || (first.isNumber() && second.isString())) {
-                return Types.Java.Lang.String;
-            }
-
-            if (first.isBoolean() && second.isString()) {
-                return Types.Primitive.Boolean;
-            }
+        if (types.size() == 2
+            && types.contains(OpenApiSchemaType.String)
+            && (types.contains(OpenApiSchemaType.Boolean) || types.contains(OpenApiSchemaType.Number))) {
+            return Types.Java.Lang.String;
         }
 
         throw new UnsupportedOperationException("Can not get type name for oneOf: " + oneOf);

diff --git a/java-codegen/src/main/java/org/opensearch/client/codegen/openapi/HttpStatusCode.java b/java-codegen/src/main/java/org/opensearch/client/codegen/openapi/HttpStatusCode.java
@@ -14,8 +14,10 @@
 
 public enum HttpStatusCode {
     Ok("200"),
+    Created("201"),
     BadRequest("400"),
     Forbidden("403"),
+    NotFound("404"),
     InternalServerError("500"),
     NotImplemented("501");
 

diff --git a/...n/src/main/resources/org/opensearch/client/codegen/templates/ObjectShape/Builder.mustache b/...n/src/main/resources/org/opensearch/client/codegen/templates/ObjectShape/Builder.mustache
@@ -3,7 +3,7 @@
      */
     public static class Builder extends {{TYPES.Client.Util.ObjectBuilderBase}} implements {{TYPES.Client.Util.ObjectBuilder}}<{{className}}> {
         {{#fields}}
-        @{{TYPES.Javax.Annotation.Nullable}} private {{type.boxed}} {{name}};
+        {{^required}}@{{TYPES.Javax.Annotation.Nullable}} {{/required}}private {{type.boxed}} {{name}};
         {{/fields}}
 
         {{#fields}}
@@ -74,4 +74,4 @@
 
             return new {{className}}(this);
         }
-    }
+    }
diff --git a/...ain/resources/org/opensearch/client/codegen/templates/ObjectShape/FieldDoc/Basic.mustache b/...ain/resources/org/opensearch/client/codegen/templates/ObjectShape/FieldDoc/Basic.mustache
@@ -1,5 +1,3 @@
 /**
-
 {{>ObjectShape/FieldDoc/BasicInner}}
-
 */
diff --git a/...esources/org/opensearch/client/codegen/templates/ObjectShape/FieldDoc/BasicInner.mustache b/...esources/org/opensearch/client/codegen/templates/ObjectShape/FieldDoc/BasicInner.mustache
@@ -1,5 +1 @@
-{{#description}}
-* <p>{{#required}}Required - {{/required}}{{.}}</p>
-{{/description}}
-
-* <p>API name: {@code {{wireName}}}</p>
+* {{#required}}Required - {{/required}}{{#description}}{{.}}<br/>{{/description}}API name: {@code {{wireName}}}
diff --git a/...n/resources/org/opensearch/client/codegen/templates/ObjectShape/FieldDoc/ListAdd.mustache b/...n/resources/org/opensearch/client/codegen/templates/ObjectShape/FieldDoc/ListAdd.mustache
@@ -1,5 +1,4 @@
 /**
 {{>ObjectShape/FieldDoc/BasicInner}}
-
 * <p>Adds one or more values to <code>{{name}}</code>.</p>
 */
diff --git a/...esources/org/opensearch/client/codegen/templates/ObjectShape/FieldDoc/ListAddAll.mustache b/...esources/org/opensearch/client/codegen/templates/ObjectShape/FieldDoc/ListAddAll.mustache
@@ -1,5 +1,4 @@
 /**
 {{>ObjectShape/FieldDoc/BasicInner}}
-
 * <p>Adds all elements of <code>list</code> to <code>{{name}}</code>.</p>
 */
diff --git a/...es/org/opensearch/client/codegen/templates/ObjectShape/FieldDoc/ListAddBuilderFn.mustache b/...es/org/opensearch/client/codegen/templates/ObjectShape/FieldDoc/ListAddBuilderFn.mustache
@@ -1,5 +1,4 @@
 /**
 {{>ObjectShape/FieldDoc/BasicInner}}
-
 * <p>Adds a value to <code>{{name}}</code> using a builder lambda.</p>
 */
diff --git a/...-codegen/src/main/resources/org/opensearch/client/codegen/templates/RequestShape.mustache b/...-codegen/src/main/resources/org/opensearch/client/codegen/templates/RequestShape.mustache
@@ -1,4 +1,13 @@
 {{>ObjectShape/ClassDeclaration}} {
+    {{#canBeSingleton}}
+    public {{className}}() {}
+
+    /**
+     * Singleton instance for {@link {{className}}}.
+     */
+    public static final {{className}} _INSTANCE = new {{className}}();
+    {{/canBeSingleton}}
+    {{^canBeSingleton}}
     {{>ObjectShape/Fields}}
 
     // ---------------------------------------------------------------------------------------------
@@ -19,6 +28,7 @@
     // ---------------------------------------------------------------------------------------------
 
     {{>ObjectShape/Deserialize}}{{/hasRequestBody}}
+    {{/canBeSingleton}}
 
     // ---------------------------------------------------------------------------------------------
 
@@ -29,11 +39,21 @@
             // Request method
             request -> {{#quoted}}{{httpMethod}}{{/quoted}},
             // Request path
-            request -> {
+            request ->
                 {{#hasSinglePath}}
-                    {{#firstPath}}{{>RequestShape/HttpPathBuilder}}{{/firstPath}}
+                {{#firstPath}}
+                {{#hasParams}}
+                {
+                    {{>RequestShape/HttpPathBuilder}}
+                }
+                {{/hasParams}}
+                {{^hasParams}}
+                    {{#quoted}}{{this}}{{/quoted}}
+                {{/hasParams}}
+                {{/firstPath}}
                 {{/hasSinglePath}}
                 {{^hasSinglePath}}
+                {
                     {{#indexedPathParams}}
                     final int _{{left}} = 1 << {{right}};
                     {{/indexedPathParams}}
@@ -51,8 +71,8 @@
                     {{/httpPaths}}
 
                     throw {{TYPES.Client.Transport.Endpoints.SimpleEndpoint}}.noPathTemplateFound("path");
-                {{/hasSinglePath}}
-            },
+                }
+                {{/hasSinglePath}},
             // Request parameters
             {{#hasQueryParams}}
             request -> {