Merge remote-tracking branch 'origin/master' into feature/remove-unused-normalizer

Author: jpfinne

.gitignore

@@ -49,6 +49,8 @@ nb-configuration.xml
 *.xml~
 *.t~
 
+**/.angular
+
 /target
 /generated-files
 test-output/

CI/circle_parallel.sh

@@ -11,43 +11,15 @@ export NODE_ENV=test
 
 if [ "$NODE_INDEX" = "1" ]; then
   echo "Running node $NODE_INDEX ..."
-  java -version
 
   sudo apt-get -y install cpanminus
 
-  # install rust
-  curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
-  source "$HOME/.cargo/env"
-
   echo "Testing perl"
   (cd samples/client/petstore/perl && /bin/bash ./test.bash)
 
-  echo "Testing ruby"
-  (cd samples/client/petstore/ruby && mvn integration-test)
-  (cd samples/client/petstore/ruby-faraday && mvn integration-test)
-  (cd samples/client/petstore/ruby-httpx && mvn integration-test)
-  (cd samples/client/petstore/ruby-autoload && mvn integration-test)
-
-  echo "Testing rust"
-  (cd samples/server/petstore/rust-axum && mvn integration-test)
 
 elif [ "$NODE_INDEX" = "2" ]; then
-  echo "Running node $NODE_INDEX to test Go"
-  # install haskell
-  #curl -sSLk https://get.haskellstack.org/ | sh
-  #stack upgrade
-  #stack --version
-
-  # install curl
-  #sudo apt-get -y build-dep libcurl4-gnutls-dev
-  #sudo apt-get -y install libcurl4-gnutls-dev
-
-  # Install golang version 1.18
-  go version
-  sudo mkdir /usr/local/go1.18
-  wget -c https://dl.google.com/go/go1.18.linux-amd64.tar.gz -O - | sudo tar -xz -C /usr/local/go1.18
-  export PATH="/usr/local/go1.18/go/bin:$PATH"
-  go version
+  echo "Running node $NODE_INDEX to test cpp-restsdk"
 
   # install cpprestsdk
   sudo apt-get install libcpprest-dev
@@ -62,54 +34,15 @@ elif [ "$NODE_INDEX" = "3" ]; then
 
   echo "Running node $NODE_INDEX ... "
 
-  ## Install node@stable (for angular 6)
-  #set +e
-  #curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.11/install.sh | bash
-  #export NVM_DIR="/opt/circleci/.nvm"
-  #[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
-  ##nvm install stable
-  ## install v16 instead of the latest stable version
-  #nvm install 18
-  #nvm alias default 18
-  #node --version
-
-  ## Each step uses the same `$BASH_ENV`, so need to modify it
-  #echo 'export NVM_DIR="/opt/circleci/.nvm"' >> $BASH_ENV
-  #echo "[ -s \"$NVM_DIR/nvm.sh\" ] && . \"$NVM_DIR/nvm.sh\"" >> $BASH_ENV
-
-  #(cd samples/client/others/typescript-angular && mvn integration-test)
-  #(cd samples/client/petstore/typescript-angular-v12-provided-in-root && mvn integration-test)
-  #(cd samples/client/petstore/typescript-angular-v13-provided-in-root && mvn integration-test)
-  #(cd samples/client/petstore/typescript-angular-v14-provided-in-root && mvn integration-test)
-  #(cd samples/client/petstore/typescript-angular-v15-provided-in-root && mvn integration-test)
-  #(cd samples/client/petstore/typescript-angular-v16-provided-in-root && mvn integration-test)
-  #(cd samples/client/petstore/typescript-angular-v17-provided-in-root && mvn integration-test)
-  #(cd samples/client/petstore/typescript-angular-v18-provided-in-root && mvn integration-test)
-  #(cd samples/client/petstore/typescript-angular-v19-provided-in-root && mvn integration-test)
-  #(cd samples/openapi3/client/petstore/typescript/builds/default && mvn integration-test)
-  #(cd samples/openapi3/client/petstore/typescript/tests/default && mvn integration-test)
-  #(cd samples/openapi3/client/petstore/typescript/builds/jquery && mvn integration-test)
-  #(cd samples/openapi3/client/petstore/typescript/tests/jquery && mvn integration-test)
-  #(cd samples/openapi3/client/petstore/typescript/builds/object_params && mvn integration-test)
-  #(cd samples/openapi3/client/petstore/typescript/tests/object_params && mvn integration-test)
-  #(cd samples/openapi3/client/petstore/typescript/builds/inversify && mvn integration-test)
-  #(cd samples/openapi3/client/petstore/typescript/tests/inversify && mvn integration-test)
-  ##(cd samples/openapi3/client/petstore/typescript/tests/deno && mvn integration-test)
-  #(cd samples/openapi3/client/petstore/typescript/builds/browser && mvn integration-test)
-  #(cd samples/openapi3/client/petstore/typescript/tests/browser && mvn integration-test)
-  #(cd samples/openapi3/client/petstore/typescript/builds/nullable-enum && mvn integration-test)
-  #(cd samples/client/petstore/typescript-fetch/builds/default && mvn integration-test)
-  #(cd samples/client/petstore/typescript-fetch/builds/es6-target && mvn integration-test)
-  #(cd samples/client/petstore/typescript-fetch/builds/with-npm-version && mvn integration-test)
-  #(cd samples/client/petstore/typescript-fetch/tests/default && mvn integration-test)
-  #(cd samples/client/petstore/typescript-node/npm && mvn integration-test)
-  #(cd samples/client/petstore/typescript-rxjs/builds/with-npm-version && mvn integration-test)
-  #(cd samples/client/petstore/typescript-axios/builds/with-npm-version && mvn integration-test)
-  #(cd samples/client/petstore/typescript-axios/tests/default && mvn integration-test)
-  #(cd samples/client/petstore/typescript-axios/tests/with-complex-headers && mvn integration-test)
+  echo "Testing ruby"
+  (cd samples/client/petstore/ruby && mvn integration-test)
+  (cd samples/client/petstore/ruby-faraday && mvn integration-test)
+  (cd samples/client/petstore/ruby-httpx && mvn integration-test)
+  (cd samples/client/petstore/ruby-autoload && mvn integration-test)
 
 else
   echo "Running node $NODE_INDEX ..."
   java -version
+  ./mvnw clean install
 
 fi

docs/generators.md

@@ -3,6 +3,7 @@ id: generators
 title: Generators List
 ---
 
+[main] INFO  o.o.c.l.PythonFastAPIServerCodegen - Skipping sorting of path operations, order matters, let the developer decide via their specification file.
 The following generators are available:
 
 ## CLIENT generators

docs/generators/typescript-axios.md

@@ -44,6 +44,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |supportsES6|Generate code that conforms to ES6.| |false|
 |useSingleRequestParameter|Setting this property to true will generate functions with a single argument containing all API endpoint parameters instead of one argument per parameter.| |false|
 |useSquareBracketsInArrayNames|Setting this property to true will add brackets to array attribute names, e.g. my_values[].| |false|
+|withAWSV4Signature|whether to include AWS v4 signature support| |false|
 |withInterfaces|Setting this property to true will generate interfaces next to the default class implementations.| |false|
 |withNodeImports|Setting this property to true adds imports for NodeJS| |false|
 |withSeparateModelsAndApi|Put the model and api in separate folders and in separate classes. This requires in addition a value for 'apiPackage' and 'modelPackage'| |false|
@@ -291,7 +292,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |OAuth2_ClientCredentials|✗|OAS2,OAS3
 |OAuth2_AuthorizationCode|✗|OAS2,OAS3
 |SignatureAuth|✗|OAS3
-|AWSV4Signature|✗|ToolingExtension
+|AWSV4Signature|✓|ToolingExtension
 
 ### Wire Format Feature
 | Name | Supported | Defined By |

modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/GenerateBatch.java

@@ -29,6 +29,7 @@
 import io.airlift.airline.Command;
 import io.airlift.airline.Option;
 import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.Strings;
 import org.apache.commons.lang3.StringUtils;
 import org.openapitools.codegen.ClientOptInput;
 import org.openapitools.codegen.CodegenConfig;
@@ -248,7 +249,7 @@ private void cleanPreviousFiles(final String name, Path outDir) throws IOExcepti
             Path filesMeta = Paths.get(outDir.toAbsolutePath().toString(), ".openapi-generator", "FILES");
             if (filesMeta.toFile().exists()) {
                 FileUtils.readLines(filesMeta.toFile(), StandardCharsets.UTF_8).forEach(relativePath -> {
-                    if (!StringUtils.startsWith(relativePath, ".")) {
+                    if (!Strings.CS.startsWith(relativePath, ".")) {
                         Path file = outDir.resolve(relativePath).toAbsolutePath();
                         // hack: disallow directory traversal outside of output directory. we don't want to delete wrong files.
                         if (file.toString().startsWith(outDir.toAbsolutePath().toString())) {

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

@@ -5734,7 +5734,7 @@ private CodegenSecurity defaultCodegenSecurity(String key, SecurityScheme securi
         cs.name = key;
         cs.description = securityScheme.getDescription();
         cs.type = securityScheme.getType().toString();
-        cs.isCode = cs.isPassword = cs.isApplication = cs.isImplicit = cs.isOpenId = false;
+        cs.isCode = cs.isPassword = cs.isApplication = cs.isImplicit = cs.isOpenId = cs.isOAuth = false;
         cs.isHttpSignature = false;
         cs.isBasicBasic = cs.isBasicBearer = false;
         cs.scheme = securityScheme.getScheme();

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

@@ -1628,7 +1628,7 @@ public String getTypeDeclaration(Schema p) {
         Schema<?> target = ModelUtils.isGenerateAliasAsModel() ? p : schema;
         if (ModelUtils.isArraySchema(target)) {
             Schema<?> items = getSchemaItems(schema);
-            return getSchemaType(target) + "<" + getTypeDeclarationForArray(items) + ">";
+            return typeMapping.get("array") + "<" + getTypeDeclarationForArray(items) + ">";
         } else if (ModelUtils.isMapSchema(p)) {
             // Should we also support maps of maps?
             Schema<?> inner = ModelUtils.getAdditionalProperties(p);

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

@@ -34,6 +34,7 @@
 import io.swagger.v3.oas.models.parameters.Parameter;
 import io.swagger.v3.oas.models.parameters.RequestBody;
 import io.swagger.v3.oas.models.security.SecurityScheme;
+import org.apache.commons.lang3.Strings;
 import org.apache.commons.lang3.StringUtils;
 import org.openapitools.codegen.*;
 import org.openapitools.codegen.meta.features.DocumentationFeature;
@@ -601,7 +602,7 @@ public String packagePath() {
     @Override
     public String toModelImport(String name) {
         String modelImport;
-        if (StringUtils.startsWithAny(name, "import", "from")) {
+        if (Strings.CS.startsWithAny(name, "import", "from")) {
             modelImport = name;
         } else {
             modelImport = "from ";

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

@@ -20,7 +20,7 @@
 import io.swagger.v3.oas.models.media.Schema;
 import io.swagger.v3.oas.models.security.SecurityScheme;
 import lombok.Setter;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 import org.openapitools.codegen.*;
 import org.openapitools.codegen.meta.GeneratorMetadata;
 import org.openapitools.codegen.meta.Stability;
@@ -355,7 +355,7 @@ public boolean getUseOneOfDiscriminatorLookup() {
     @Override
     public String toModelImport(String name) {
         String modelImport;
-        if (StringUtils.startsWithAny(name, "import", "from")) {
+        if (Strings.CS.startsWithAny(name, "import", "from")) {
             modelImport = name;
         } else {
             modelImport = "from ";

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

@@ -23,6 +23,7 @@
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import io.swagger.v3.oas.models.media.Schema;
+import org.apache.commons.lang3.Strings;
 import org.apache.commons.lang3.StringUtils;
 import org.openapitools.codegen.*;
 import org.openapitools.codegen.meta.GeneratorMetadata;
@@ -89,6 +90,11 @@ public String getHelp() {
     public PythonFastAPIServerCodegen() {
         super();
 
+        // Skip sorting of operations to preserve the order found in the OpenAPI spec file.  See 
+        // https://fastapi.tiangolo.com/tutorial/path-params/?h=path#order-matters for details on why order matters.
+        LOGGER.info("Skipping sorting of path operations, order matters, let the developer decide via their specification file.");
+        setSkipSortingOperations(true);
+
         modifyFeatureSet(features -> features.includeSecurityFeatures(
                 SecurityFeature.OAuth2_AuthorizationCode,
                 SecurityFeature.OAuth2_Password
@@ -198,7 +204,7 @@ public String getName() {
     @Override
     public String toModelImport(String name) {
         String modelImport;
-        if (StringUtils.startsWithAny(name, "import", "from")) {
+        if (Strings.CS.startsWithAny(name, "import", "from")) {
             modelImport = name;
         } else {
             modelImport = "from ";