Merge branch 'master' into cleanup-template-management

* master:
  [java-jersey2] Conditionally include http signature mustache template (OpenAPITools#6413)
  [bug] Fix path provider bug on CI (OpenAPITools#6409)

Author: jimschubert

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

@@ -29,6 +29,7 @@
 import io.swagger.v3.oas.models.parameters.Parameter;
 import io.swagger.v3.oas.models.security.*;
 import io.swagger.v3.oas.models.tags.Tag;
+import org.apache.commons.io.comparator.PathFileComparator;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.openapitools.codegen.api.TemplatePathLocator;
@@ -57,7 +58,6 @@
 import java.nio.file.Path;
 import java.time.ZonedDateTime;
 import java.util.*;
-import java.util.stream.Stream;
 
 import static org.openapitools.codegen.utils.OnceLogger.once;
 
@@ -913,26 +913,36 @@ public List<File> generate() {
             System.err.println(sb.toString());
         } else {
             if (generateMetadata) {
-                StringBuilder sb = new StringBuilder();
-                File outDir = new File(this.config.getOutputDir());
-                Optional.of(files)
-                        .map(Collection::stream)
-                        .orElseGet(Stream::empty)
-                        .filter(Objects::nonNull)
-                        .map(File::toPath)
-                        .sorted(Path::compareTo)
-                        .forEach(f -> {
-                    String relativePath = java.nio.file.Paths.get(outDir.toURI()).relativize(f).toString();
-                    if (!relativePath.equals(METADATA_DIR + File.separator + "VERSION")) {
-                        sb.append(relativePath).append(System.lineSeparator());
-                    }
-                });
-
-                String targetFile = config.outputFolder() + File.separator + METADATA_DIR + File.separator + "FILES";
                 try {
+                    StringBuilder sb = new StringBuilder();
+                    File outDir = new File(this.config.getOutputDir());
+
+                    List<File> filesToSort = new ArrayList<>();
+
+                    // Avoid side-effecting sort in this path when generateMetadata=true
+                    files.forEach(f -> {
+                        // We have seen NPE on CI for getPath() returning null, so guard against this (to be fixed in 5.0 template management refactor)
+                        //noinspection ConstantConditions
+                        if (f != null && f.getPath() != null) {
+                            filesToSort.add(f);
+                        }
+                    });
+
+                    filesToSort.sort(PathFileComparator.PATH_COMPARATOR);
+                    filesToSort.forEach(f -> {
+                        String relativePath = outDir.toPath().relativize(f.toPath()).toString();
+                        if (!relativePath.equals(METADATA_DIR + File.separator + "VERSION")) {
+                            sb.append(relativePath).append(System.lineSeparator());
+                        }
+                    });
+
+                    String targetFile = config.outputFolder() + File.separator + METADATA_DIR + File.separator + "FILES";
+
                     File filesFile = this.templateProcessor.writeToFile(targetFile, sb.toString().getBytes(StandardCharsets.UTF_8));
-                    files.add(filesFile);
-                } catch (IOException e) {
+                    if (filesFile != null) {
+                        files.add(filesFile);
+                    }
+                } catch (Exception e) {
                     LOGGER.warn("Failed to write FILES metadata to track generated files.");
                 }
             }

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

@@ -380,7 +380,9 @@ public void processOpts() {
         } else if (JERSEY2.equals(getLibrary())) {
             supportingFiles.add(new SupportingFile("JSON.mustache", invokerFolder, "JSON.java"));
             supportingFiles.add(new SupportingFile("ApiResponse.mustache", invokerFolder, "ApiResponse.java"));
-            supportingFiles.add(new SupportingFile("auth/HttpSignatureAuth.mustache", authFolder, "HttpSignatureAuth.java"));
+            if (ProcessUtils.hasHttpSignatureMethods(openAPI)) {
+                supportingFiles.add(new SupportingFile("auth/HttpSignatureAuth.mustache", authFolder, "HttpSignatureAuth.java"));
+            }
             supportingFiles.add(new SupportingFile("AbstractOpenApiSchema.mustache", (sourceFolder + File.separator + modelPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar), "AbstractOpenApiSchema.java"));
             forceSerializationLibrary(SERIALIZATION_LIBRARY_JACKSON);
         } else if (NATIVE.equals(getLibrary())) {

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

@@ -59,7 +59,9 @@ import java.util.regex.Pattern;
 import {{invokerPackage}}.auth.Authentication;
 import {{invokerPackage}}.auth.HttpBasicAuth;
 import {{invokerPackage}}.auth.HttpBearerAuth;
+{{#hasHttpSignatureMethods}}
 import {{invokerPackage}}.auth.HttpSignatureAuth;
+{{/hasHttpSignatureMethods}}
 import {{invokerPackage}}.auth.ApiKeyAuth;
 {{#hasOAuthMethods}}
 import {{invokerPackage}}.auth.OAuth;

samples/client/petstore/java/jersey2-java7/.openapi-generator/FILES

@@ -86,7 +86,6 @@ src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
 src/main/java/org/openapitools/client/auth/Authentication.java
 src/main/java/org/openapitools/client/auth/HttpBasicAuth.java
 src/main/java/org/openapitools/client/auth/HttpBearerAuth.java
-src/main/java/org/openapitools/client/auth/HttpSignatureAuth.java
 src/main/java/org/openapitools/client/auth/OAuth.java
 src/main/java/org/openapitools/client/auth/OAuthFlow.java
 src/main/java/org/openapitools/client/model/AbstractOpenApiSchema.java

samples/client/petstore/java/jersey2-java7/src/main/java/org/openapitools/client/ApiClient.java

@@ -51,7 +51,6 @@
 import org.openapitools.client.auth.Authentication;
 import org.openapitools.client.auth.HttpBasicAuth;
 import org.openapitools.client.auth.HttpBearerAuth;
-import org.openapitools.client.auth.HttpSignatureAuth;
 import org.openapitools.client.auth.ApiKeyAuth;
 import org.openapitools.client.auth.OAuth;
 import org.openapitools.client.model.AbstractOpenApiSchema;

samples/client/petstore/java/jersey2-java7/src/main/java/org/openapitools/client/auth/HttpSignatureAuth.java

@@ -86,7 +86,6 @@ src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
 src/main/java/org/openapitools/client/auth/Authentication.java
 src/main/java/org/openapitools/client/auth/HttpBasicAuth.java
 src/main/java/org/openapitools/client/auth/HttpBearerAuth.java
-src/main/java/org/openapitools/client/auth/HttpSignatureAuth.java
 src/main/java/org/openapitools/client/auth/OAuth.java
 src/main/java/org/openapitools/client/auth/OAuthFlow.java
 src/main/java/org/openapitools/client/model/AbstractOpenApiSchema.java

samples/client/petstore/java/jersey2-java8/.openapi-generator/FILES

@@ -51,7 +51,6 @@
 import org.openapitools.client.auth.Authentication;
 import org.openapitools.client.auth.HttpBasicAuth;
 import org.openapitools.client.auth.HttpBearerAuth;
-import org.openapitools.client.auth.HttpSignatureAuth;
 import org.openapitools.client.auth.ApiKeyAuth;
 import org.openapitools.client.auth.OAuth;
 import org.openapitools.client.model.AbstractOpenApiSchema;