Merge branch 'master' into feature/jspecify

Author: jpfinne

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

@@ -167,16 +167,6 @@ private ModelsMap postProcessModelsMap(ModelsMap objs) {
 
                 prop.vendorExtensions.putIfAbsent("x-php-prop-type", propType);
             }
-
-            if (model.isEnum) {
-                for (Map<String, Object> enumVars : (List<Map<String, Object>>) model.getAllowableValues().get("enumVars")) {
-                    if ((Boolean) enumVars.get("isString")) {
-                        model.vendorExtensions.putIfAbsent("x-php-enum-type", "string");
-                    } else {
-                        model.vendorExtensions.putIfAbsent("x-php-enum-type", "int");
-                    }
-                }
-            }
         }
         return objs;
     }

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

@@ -179,6 +179,8 @@ public void processOpts() {
         supportingFiles.add(new SupportingFile("apiSettings.mustache", invokerFolder, "ApiSettings.scala"));
         final String apiFolder = (sourceFolder + File.separator + apiPackage).replace(".", File.separator);
         supportingFiles.add(new SupportingFile("project/build.properties.mustache", "project", "build.properties"));
+        supportingFiles.add(new SupportingFile("project/plugins.mustache", "project", "plugins.sbt"));
+        supportingFiles.add(new SupportingFile("scalafmt.mustache", "", ".scalafmt.conf"));
         supportingFiles.add(new SupportingFile("enumsSerializers.mustache", apiFolder, "EnumsSerializers.scala"));
         supportingFiles.add(new SupportingFile("serializers.mustache", invokerFolder, "Serializers.scala"));
     }

modules/openapi-generator/src/main/resources/csharp/libraries/generichost/DependencyInjectionTests.mustache

@@ -76,8 +76,8 @@ namespace {{packageName}}.Test.{{apiPackage}}
 
                 {{/httpSignatureMethods}}
                 {{#oauthMethods}}
-                OAuthToken oauthToken = new{{^net70OrLater}} OAuthToken{{/net70OrLater}}("token", timeout: TimeSpan.FromSeconds(1));
-                options.AddTokens(oauthToken);
+                OAuthToken oauthToken{{-index}} = new{{^net70OrLater}} OAuthToken{{/net70OrLater}}("token", timeout: TimeSpan.FromSeconds(1));
+                options.AddTokens(oauthToken{{-index}});
 
                 {{/oauthMethods}}
                 {{/lambda.trimTrailingWithNewLine}}

modules/openapi-generator/src/main/resources/csharp/libraries/generichost/TokenBase.mustache

@@ -15,7 +15,7 @@ namespace {{packageName}}.{{clientPackage}}
     {{>visibility}} abstract class TokenBase
     {
         private DateTime _nextAvailable = DateTime.UtcNow;
-        private object _nextAvailableLock = new object();
+        private readonly object _nextAvailableLock = new object();
         private readonly System.Timers.Timer _timer = new System.Timers.Timer();
 
         internal TimeSpan? Timeout { get; set; }
@@ -59,7 +59,7 @@ namespace {{packageName}}.{{clientPackage}}
         /// <summary>
         /// Returns true while the token is rate limited.
         /// </summary>
-        public bool IsRateLimited => _nextAvailable > DateTime.UtcNow;
+        public bool IsRateLimited { get { lock (_nextAvailableLock) return _nextAvailable > DateTime.UtcNow; } }
 
         /// <summary>
         /// Triggered when the server returns status code TooManyRequests
@@ -73,8 +73,8 @@ namespace {{packageName}}.{{clientPackage}}
 
         private void OnTimer(object{{nrt?}} sender, System.Timers.ElapsedEventArgs e)
         {
-            if (TokenBecameAvailable != null && !IsRateLimited)
-                TokenBecameAvailable.Invoke(this);
+            if (!IsRateLimited)
+                TokenBecameAvailable?.Invoke(this);
         }
     }
 }

modules/openapi-generator/src/main/resources/php-nextgen/model_enum.mustache

@@ -1,4 +1,4 @@
-enum {{classname}}: {{exts.x-php-enum-type}}
+enum {{classname}}: {{dataType}}
 {
     {{#allowableValues}}
     {{#enumVars}}

modules/openapi-generator/src/main/resources/scala-cask/example.mustache

@@ -16,7 +16,7 @@
 * ======================
 * == Building Locally ==
 * ======================
-* This project can be built using [[scala-clit][https://scala-cli.virtuslab.org]]
+* This project can be built using [[scala-cli][https://scala-cli.virtuslab.org]]
 *
 * To simply run the project
 * ```

modules/openapi-generator/src/main/resources/scala-pekko-client/project/plugins.mustache

@@ -0,0 +1 @@
+addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.6")

modules/openapi-generator/src/main/resources/scala-pekko-client/scalafmt.mustache

@@ -0,0 +1,58 @@
+version=3.10.6
+runner.dialect = scala213
+project {
+  git = false
+  excludeFilters = [
+    scalafmt-benchmarks/src/resources,
+    sbt-test
+    bin/issue
+  ]
+  layout = StandardConvention
+}
+align {
+  preset = none
+  stripMargin = true
+}
+binPack {
+  importSelectors = fold
+}
+newlines {
+  avoidForSimpleOverflow = all
+  ignoreInSyntax = false
+  source = fold
+}
+rewrite {
+  rules = [
+    AvoidInfix,
+    Imports,
+    RedundantBraces,
+    RedundantParens,
+    SortModifiers,
+  ]
+  imports {
+    selectors = fold
+    removeRedundantSelectors = true
+    sort = ascii
+    groups = [
+      ["org\\.scalafmt\\..*"],
+      ["scala\\.meta\\..*", "org\\.scalameta\\..*"],
+      ["sbt\\..*"],
+      ["java.?\\..*"],
+      ["scala\\..*"],
+      ["org\\..*"],
+      ["com\\..*"],
+    ]
+  }
+  redundantBraces {
+    preset = all
+    oneStatApply {
+      parensMaxSpan = 300
+      bracesMinSpan = 300
+    }
+  }
+  redundantParens {
+    preset = all
+  }
+  sortModifiers.preset = styleGuide
+  trailingCommas.style = "always"
+}

modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml

@@ -73,6 +73,9 @@ paths:
         - petstore_auth:
             - 'write:pets'
             - 'read:pets'
+        - petstore_auth2:
+            - 'write:pets'
+            - 'read:pets'
       requestBody:
         $ref: '#/components/requestBodies/Pet'
     put:
@@ -1430,6 +1433,14 @@ components:
           scopes:
             'write:pets': modify pets in your account
             'read:pets': read your pets
+    petstore_auth2:
+      type: oauth2
+      flows:
+        implicit:
+          authorizationUrl: 'http://petstore.swagger.io/api/oauth/dialog'
+          scopes:
+            'write:pets': modify pets in your account
+            'read:pets': read your pets
     api_key:
       type: apiKey
       name: api-key

samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/TokenBase.cs

@@ -20,7 +20,7 @@ namespace Org.OpenAPITools.Client
     public abstract class TokenBase
     {
         private DateTime _nextAvailable = DateTime.UtcNow;
-        private object _nextAvailableLock = new object();
+        private readonly object _nextAvailableLock = new object();
         private readonly System.Timers.Timer _timer = new System.Timers.Timer();
 
         internal TimeSpan? Timeout { get; set; }
@@ -64,7 +64,7 @@ internal void StartTimer(TimeSpan timeout)
         /// <summary>
         /// Returns true while the token is rate limited.
         /// </summary>
-        public bool IsRateLimited => _nextAvailable > DateTime.UtcNow;
+        public bool IsRateLimited { get { lock (_nextAvailableLock) return _nextAvailable > DateTime.UtcNow; } }
 
         /// <summary>
         /// Triggered when the server returns status code TooManyRequests
@@ -78,8 +78,8 @@ public void BeginRateLimit()
 
         private void OnTimer(object? sender, System.Timers.ElapsedEventArgs e)
         {
-            if (TokenBecameAvailable != null && !IsRateLimited)
-                TokenBecameAvailable.Invoke(this);
+            if (!IsRateLimited)
+                TokenBecameAvailable?.Invoke(this);
         }
     }
 }