Merge branch 'OpenAPITools:master' into master

.devcontainer/devcontainer.json

@@ -9,7 +9,12 @@
     "ghcr.io/devcontainers/features/node:1": {
       "version": "lts"
     },
-    "ghcr.io/snebjorn/devcontainer-feature/chromium:latest": {}
+    "ghcr.io/snebjorn/devcontainer-feature/chromium:latest": {},
+    "docker-in-docker": {
+      "version": "latest",
+      "moby": true,
+      "dockerDashComposeVersion": "v1"
+    }
   },
   // Configure tool-specific properties.
   "customizations": {
@@ -44,4 +49,4 @@
   // "postCreateCommand": "mvn clean package -DskipTests",
   // Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
   "remoteUser": "vscode"
-}
+}

.github/workflows/samples-python-server.yaml

@@ -3,10 +3,10 @@ name: Python Server
 on:
   push:
     paths:
-      - samples/server/petstore/python-aiohttp/**
+      - samples/server/petstore/python-aiohttp-srclayout/**
   pull_request:
     paths:
-      - samples/server/petstore/python-aiohttp/**
+      - samples/server/petstore/python-aiohttp-srclayout/**
 jobs:
   build:
     name: Test Python server
@@ -16,7 +16,7 @@ jobs:
       matrix:
         sample:
           # servers
-          - samples/server/petstore/python-aiohttp/
+          - samples/server/petstore/python-aiohttp-srclayout/
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v4

bin/configs/unmaintained/jmeter.yaml → bin/configs/jmeter.yaml

@@ -1,4 +1,4 @@
 generatorName: jmeter
 outputDir: samples/client/petstore/jmeter
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+inputSpec: modules/openapi-generator/src/test/resources/3_0/jmeter/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/jmeter-client

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

@@ -2024,16 +2024,6 @@ private PythonType uuidType(IJsonSchemaValidationProperties cp) {
             return new PythonType(cp.getDataType());
         }
 
-        private PythonType freeFormType(IJsonSchemaValidationProperties cp) {
-            typingImports.add("Dict");
-            typingImports.add("Any");
-            typingImports.add("Union");
-            PythonType pt = new PythonType("Union");
-            pt.addTypeParam(new PythonType("str"));
-            pt.addTypeParam(new PythonType("Any"));
-            return pt;
-        }
-
         private PythonType modelType(IJsonSchemaValidationProperties cp) {
             // add model prefix
             hasModelsToImport = true;
@@ -2056,7 +2046,7 @@ private PythonType fromCommon(IJsonSchemaValidationProperties cp) {
 
             if (cp.getIsArray()) {
                 return arrayType(cp);
-            } else if (cp.getIsMap()) {
+            } else if (cp.getIsMap() || cp.getIsFreeFormObject()) {
                 return mapType(cp);
             } else if (cp.getIsString()) {
                 return stringType(cp);
@@ -2076,8 +2066,6 @@ private PythonType fromCommon(IJsonSchemaValidationProperties cp) {
                 return dateType(cp);
             } else if (cp.getIsUuid()) {
                 return uuidType(cp);
-            } else if (cp.getIsFreeFormObject()) { // type: object
-                return freeFormType(cp);
             }
 
             return null;

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

@@ -163,6 +163,12 @@ public void preprocessOpenAPI(OpenAPI openAPI) {
         }
     }
 
+    @Override
+    public String toOperationId(String operationId) {
+        // replace $ with _
+        return super.toOperationId(operationId.replace("$", "_"));
+    }
+
     /**
      * Escapes a reserved word as defined in the `reservedWords` array. Handle escaping
      * those terms here.  This logic is only called if a variable matches the reserved words

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

@@ -149,7 +149,7 @@ private ModelsMap postProcessModelsMap(ModelsMap objs) {
                     propType = prop.dataType;
                 }
 
-                if ((!prop.required || prop.isNullable)) { // optional or nullable
+                if ((!prop.required || prop.isNullable) && propType != "mixed") { // optional or nullable but not mixed
                     propType = "?" + propType;
                 }
 

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

@@ -193,7 +193,7 @@ public RustServerCodegen() {
         typeMapping.put("ByteArray", bytesType);
         typeMapping.put("binary", bytesType);
         typeMapping.put("boolean", "bool");
-        typeMapping.put("date", "chrono::DateTime::<chrono::Utc>");
+        typeMapping.put("date", "chrono::naive::NaiveDate");
         typeMapping.put("DateTime", "chrono::DateTime::<chrono::Utc>");
         typeMapping.put("password", "String");
         typeMapping.put("File", bytesType);

modules/openapi-generator/src/main/resources/Java/auth/HttpBearerAuth.mustache

@@ -4,13 +4,15 @@ package {{invokerPackage}}.auth;
 
 import {{invokerPackage}}.Pair;
 
-import java.util.Map;
 import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.Supplier;
 
 {{>generatedAnnotation}}
 public class HttpBearerAuth implements Authentication {
   private final String scheme;
-  private String bearerToken;
+  private Supplier<String> tokenSupplier;
 
   public HttpBearerAuth(String scheme) {
     this.scheme = scheme;
@@ -22,7 +24,7 @@ public class HttpBearerAuth implements Authentication {
    * @return The bearer token
    */
   public String getBearerToken() {
-    return bearerToken;
+    return tokenSupplier.get();
   }
 
   /**
@@ -31,12 +33,22 @@ public class HttpBearerAuth implements Authentication {
    * @param bearerToken The bearer token to send in the Authorization header
    */
   public void setBearerToken(String bearerToken) {
-    this.bearerToken = bearerToken;
+    this.tokenSupplier = () -> bearerToken;
+  }
+
+  /**
+   * Sets the supplier of tokens, which together with the scheme, will be sent as the value of the Authorization header.
+   *
+   * @param tokenSupplier The supplier of bearer tokens to send in the Authorization header
+   */
+  public void setBearerToken(Supplier<String> tokenSupplier) {
+    this.tokenSupplier = tokenSupplier;
   }
 
   @Override
   public void applyToParams(List<Pair> queryParams, Map<String, String> headerParams, Map<String, String> cookieParams) {
-    if(bearerToken == null) {
+    String bearerToken = Optional.ofNullable(tokenSupplier).map(Supplier::get).orElse(null);
+    if (bearerToken == null) {
       return;
     }
 

modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/ApiClient.mustache

@@ -49,6 +49,7 @@ import java.util.List;
 import java.util.Arrays;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.function.Supplier;
 import java.util.TimeZone;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -335,6 +336,20 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
     throw new RuntimeException("No Bearer authentication configured!");
   }
 
+  /**
+   * Helper method to set the supplier of access tokens for Bearer authentication.
+   *
+   * @param tokenSupplier the token supplier function
+   */
+  public void setBearerToken(Supplier<String> tokenSupplier) {
+    for (Authentication auth : authentications.values()) {
+      if (auth instanceof HttpBearerAuth) {
+        ((HttpBearerAuth) auth).setBearerToken(tokenSupplier);
+        return;
+      }
+    }
+    throw new RuntimeException("No Bearer authentication configured!");
+  }
   {{/hasHttpBearerMethods}}
 
   {{#hasHttpBasicMethods}}

modules/openapi-generator/src/main/resources/Java/libraries/feign/ApiClient.mustache

@@ -2,6 +2,7 @@ package {{invokerPackage}};
 
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.function.Supplier;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -265,6 +266,15 @@ public class ApiClient {
     apiAuthorization.setBearerToken(bearerToken);
   }
 
+  /**
+   * Helper method to configure the supplier of bearer tokens.
+   * @param tokenSupplier the supplier of bearer tokens.
+   */
+  public void setBearerToken(Supplier<String> tokenSupplier) {
+    HttpBearerAuth apiAuthorization =  getAuthorization(HttpBearerAuth.class);
+    apiAuthorization.setBearerToken(tokenSupplier);
+  }
+
   /**
    * Helper method to configure the first api key found
    * @param apiKey API key

modules/openapi-generator/src/main/resources/Java/libraries/feign/auth/HttpBearerAuth.mustache

@@ -2,35 +2,51 @@ package {{invokerPackage}}.auth;
 
 import feign.RequestInterceptor;
 import feign.RequestTemplate;
+import java.util.Optional;
+import java.util.function.Supplier;
 
 /**
  * An interceptor that adds the request header needed to use HTTP bearer authentication.
  */
 public class HttpBearerAuth implements RequestInterceptor {
   private final String scheme;
-  private String bearerToken;
+  private Supplier<String> tokenSupplier;
 
   public HttpBearerAuth(String scheme) {
     this.scheme = scheme;
   }
 
   /**
    * Gets the token, which together with the scheme, will be sent as the value of the Authorization header.
+   *
+   * @return The bearer token
    */
   public String getBearerToken() {
-    return bearerToken;
+    return tokenSupplier.get();
   }
 
   /**
    * Sets the token, which together with the scheme, will be sent as the value of the Authorization header.
+   *
+   * @param bearerToken The bearer token to send in the Authorization header
    */
   public void setBearerToken(String bearerToken) {
-    this.bearerToken = bearerToken;
+    this.tokenSupplier = () -> bearerToken;
+  }
+
+  /**
+   * Sets the supplier of tokens, which together with the scheme, will be sent as the value of the Authorization header.
+   *
+   * @param tokenSupplier The supplier of bearer tokens to send in the Authorization header
+   */
+  public void setBearerToken(Supplier<String> tokenSupplier) {
+    this.tokenSupplier = tokenSupplier;
   }
 
   @Override
   public void apply(RequestTemplate template) {
-    if(bearerToken == null) {
+    String bearerToken = Optional.ofNullable(tokenSupplier).map(Supplier::get).orElse(null);
+    if (bearerToken == null) {
       return;
     }
 

modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache

@@ -53,6 +53,7 @@ import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.Map.Entry;
 import java.util.concurrent.TimeUnit;
+import java.util.function.Supplier;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -528,14 +529,23 @@ public class ApiClient {
     }
 
     {{#hasHttpBearerMethods}}
-        /**
-        * Helper method to set access token for the first Bearer authentication.
-        * @param bearerToken Bearer token
-        */
+    /**
+     * Helper method to set access token for the first Bearer authentication.
+     * @param bearerToken Bearer token
+     */
     public void setBearerToken(String bearerToken) {
+        setBearerToken(() -> bearerToken);
+    }
+
+    /**
+     * Helper method to set the supplier of access tokens for Bearer authentication.
+     *
+     * @param tokenSupplier The supplier of bearer tokens
+     */
+    public void setBearerToken(Supplier<String> tokenSupplier) {
         for (Authentication auth : authentications.values()) {
             if (auth instanceof HttpBearerAuth) {
-                ((HttpBearerAuth) auth).setBearerToken(bearerToken);
+                ((HttpBearerAuth) auth).setBearerToken(tokenSupplier);
                 return;
             }
         }

modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/auth/HttpBearerAuth.mustache

@@ -6,13 +6,15 @@ import {{invokerPackage}}.ApiException;
 import {{invokerPackage}}.Pair;
 
 import java.net.URI;
-import java.util.Map;
 import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.Supplier;
 
 {{>generatedAnnotation}}
 public class HttpBearerAuth implements Authentication {
   private final String scheme;
-  private String bearerToken;
+  private Supplier<String> tokenSupplier;
 
   public HttpBearerAuth(String scheme) {
     this.scheme = scheme;
@@ -24,7 +26,7 @@ public class HttpBearerAuth implements Authentication {
    * @return The bearer token
    */
   public String getBearerToken() {
-    return bearerToken;
+    return tokenSupplier.get();
   }
 
   /**
@@ -33,12 +35,22 @@ public class HttpBearerAuth implements Authentication {
    * @param bearerToken The bearer token to send in the Authorization header
    */
   public void setBearerToken(String bearerToken) {
-    this.bearerToken = bearerToken;
+    this.tokenSupplier = () -> bearerToken;
+  }
+
+  /**
+   * Sets the supplier of tokens, which together with the scheme, will be sent as the value of the Authorization header.
+   *
+   * @param tokenSupplier The supplier of bearer tokens to send in the Authorization header
+   */
+  public void setBearerToken(Supplier<String> tokenSupplier) {
+    this.tokenSupplier = tokenSupplier;
   }
 
   @Override
   public void applyToParams(List<Pair> queryParams, Map<String, String> headerParams, Map<String, String> cookieParams,
                             String payload, String method, URI uri) throws ApiException {
+    String bearerToken = Optional.ofNullable(tokenSupplier).map(Supplier::get).orElse(null);
     if (bearerToken == null) {
       return;
     }

modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/ApiClient.mustache

@@ -188,18 +188,18 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
 
     {{#hasHttpBearerMethods}}
     /**
-     * Helper method to set token for HTTP bearer authentication.
+     * Helper method to set access token for the first Bearer authentication.
      *
-     * @param bearerToken the token
+     * @param bearerToken Bearer token
      */
     public void setBearerToken(String bearerToken) {
         setBearerToken(() -> bearerToken);
     }
 
     /**
-     * Helper method to set the token supplier for HTTP bearer authentication.
+     * Helper method to set the supplier of access tokens for Bearer authentication.
      *
-     * @param tokenSupplier the token supplier function
+     * @param tokenSupplier The supplier of bearer tokens
      */
     public void setBearerToken(Supplier<String> tokenSupplier) {
         for (Authentication auth : authentications.values()) {