Generate code for OpenAPI 3.2 query/additionalOperations/in:querystring

modules/openapi-generator/pom.xml

@@ -103,6 +103,111 @@
                             <outputDirectory>${project.build.directory}/lib</outputDirectory>
                         </configuration>
                     </execution>
+                    <!-- jars for the kotlin-okhttp generated-client compile/capture
+                         test (versions mirror the jvm-okhttp4 template). Kept off the
+                         test classpath: their Kotlin 1.8+/2.x metadata breaks the
+                         embedded 1.6 compiler used by KotlinTestUtils. -->
+                    <execution>
+                        <id>kotlin-capture-deps</id>
+                        <phase>process-test-classes</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>com.squareup.okhttp3</groupId>
+                                    <artifactId>okhttp-jvm</artifactId>
+                                    <version>5.4.0</version>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>com.squareup.okio</groupId>
+                                    <artifactId>okio-jvm</artifactId>
+                                    <version>3.17.0</version>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>com.squareup.moshi</groupId>
+                                    <artifactId>moshi</artifactId>
+                                    <version>1.15.2</version>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>com.squareup.moshi</groupId>
+                                    <artifactId>moshi-kotlin</artifactId>
+                                    <version>1.15.2</version>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>com.squareup.moshi</groupId>
+                                    <artifactId>moshi-adapters</artifactId>
+                                    <version>1.15.2</version>
+                                </artifactItem>
+                                <!-- jars for the kotlin spring-restclient/webclient
+                                     generated-client compile checks (same reason:
+                                     keep 2.x-metadata jars off the shared test
+                                     classpath). -->
+                                <artifactItem>
+                                    <groupId>org.springframework</groupId>
+                                    <artifactId>spring-web</artifactId>
+                                    <version>6.2.10</version>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.springframework</groupId>
+                                    <artifactId>spring-core</artifactId>
+                                    <version>6.2.10</version>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.springframework</groupId>
+                                    <artifactId>spring-jcl</artifactId>
+                                    <version>6.2.10</version>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.springframework</groupId>
+                                    <artifactId>spring-webflux</artifactId>
+                                    <version>6.2.10</version>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>io.projectreactor</groupId>
+                                    <artifactId>reactor-core</artifactId>
+                                    <version>3.7.10</version>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.reactivestreams</groupId>
+                                    <artifactId>reactive-streams</artifactId>
+                                    <version>1.0.4</version>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>io.micrometer</groupId>
+                                    <artifactId>micrometer-observation</artifactId>
+                                    <version>1.14.10</version>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>io.micrometer</groupId>
+                                    <artifactId>micrometer-commons</artifactId>
+                                    <version>1.14.10</version>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>com.fasterxml.jackson.core</groupId>
+                                    <artifactId>jackson-databind</artifactId>
+                                    <version>2.22.1</version>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>com.fasterxml.jackson.core</groupId>
+                                    <artifactId>jackson-core</artifactId>
+                                    <version>2.22.1</version>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>com.fasterxml.jackson.core</groupId>
+                                    <artifactId>jackson-annotations</artifactId>
+                                    <version>2.22</version>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>com.fasterxml.jackson.module</groupId>
+                                    <artifactId>jackson-module-kotlin</artifactId>
+                                    <version>2.21.5</version>
+                                </artifactItem>
+                            </artifactItems>
+                            <outputDirectory>${project.build.directory}/kotlin-capture-deps</outputDirectory>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
             <plugin>

modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConfig.java

@@ -397,4 +397,32 @@ default List<Operation> divideOperationsByContentType(OpenAPI openAPI, String pa
 
     Set<String> getOpenapiGeneratorIgnoreList();
 
+    /**
+     * Whether this generator can emit operations defined through OpenAPI 3.2's
+     * {@code query} fixed field and {@code additionalOperations} map, i.e. HTTP
+     * methods outside the original eight fixed methods. Generators whose
+     * templates embed enumerated method constants (e.g. {@code HttpMethod.QUERY})
+     * must keep the default {@code false}: the affected operations are then
+     * skipped with a warning instead of producing uncompilable code.
+     *
+     * @return true if the generator supports OpenAPI 3.2 query/additional operations
+     */
+    default boolean supportsAdditionalOperations() {
+        return false;
+    }
+
+    /**
+     * Whether the generator can serialize an OpenAPI 3.2 {@code in: querystring}
+     * parameter (the caller supplies the whole, already-encoded query string).
+     * Generators that cannot must keep the default {@code false}: operations
+     * declaring such a parameter are then skipped with a warning instead of
+     * emitting it through the ordinary name=value query serialization, which
+     * would corrupt the encoded value on the wire.
+     *
+     * @return true if the generator supports {@code in: querystring} parameters
+     */
+    default boolean supportsQueryStringParameters() {
+        return false;
+    }
+
 }

modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenParameter.java

@@ -50,6 +50,11 @@ public class CodegenParameter implements IJsonSchemaValidationProperties {
      * If a query parameter should be serialized as json
      */
     public boolean queryIsJsonMimeType;
+    /**
+     * OpenAPI 3.2 {@code in: querystring} parameter: the parameter value describes
+     * the entire query string (via {@code content}), not a single name=value pair.
+     */
+    public boolean isQueryStringParam;
     /**
      * datatype is the generic inner parameter of a std::optional for C++, or Optional (Java)
      */
@@ -270,6 +275,7 @@ public CodegenParameter copy() {
         output.isArray = this.isArray;
         output.isMap = this.isMap;
         output.queryIsJsonMimeType = this.queryIsJsonMimeType;
+        output.isQueryStringParam = this.isQueryStringParam;
         output.isOptional = this.isOptional;
         output.isExplode = this.isExplode;
         output.style = this.style;
@@ -294,7 +300,7 @@ public int hashCode() {
                 isFormStyle, isSpaceDelimited, isPipeDelimited,
                 jsonSchema, isString, isNumeric, isInteger, isLong, isNumber, isFloat, isDouble, isDecimal,
                 isByteArray, isBinary, isBoolean, isDate, isDateTime, isUuid, isUri, isEmail, isPassword,
-                isFreeFormObject, isAnyType, isArray, isMap, queryIsJsonMimeType, isOptional, isFile, isEnum, isEnumRef, _enum, allowableValues,
+                isFreeFormObject, isAnyType, isArray, isMap, queryIsJsonMimeType, isQueryStringParam, isOptional, isFile, isEnum, isEnumRef, _enum, allowableValues,
                 items, mostInnerItems, additionalProperties, vars, requiredVars, vendorExtensions, hasValidation,
                 getMaxProperties(), getMinProperties(), isNullable, isDeprecated, required, getMaximum(),
                 getExclusiveMaximum(), getMinimum(), getExclusiveMinimum(), getMaxLength(), getMinLength(),
@@ -312,6 +318,7 @@ public boolean equals(Object o) {
         CodegenParameter that = (CodegenParameter) o;
         return isFormParam == that.isFormParam &&
                 isQueryParam == that.isQueryParam &&
+                isQueryStringParam == that.isQueryStringParam &&
                 isPathParam == that.isPathParam &&
                 isHeaderParam == that.isHeaderParam &&
                 isCookieParam == that.isCookieParam &&
@@ -429,6 +436,7 @@ public String toString() {
         final StringBuilder sb = new StringBuilder("CodegenParameter{");
         sb.append("isFormParam=").append(isFormParam);
         sb.append(", isQueryParam=").append(isQueryParam);
+        sb.append(", isQueryStringParam=").append(isQueryStringParam);
         sb.append(", isPathParam=").append(isPathParam);
         sb.append(", isHeaderParam=").append(isHeaderParam);
         sb.append(", isCookieParam=").append(isCookieParam);