Skip to content

Commit 8ee69bf

Browse files
authored
Fix MergedSpecBuilder not passing auth (#21782)
1 parent 8d06496 commit 8ee69bf

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

modules/openapi-generator-maven-plugin/src/main/java/org/openapitools/codegen/plugin/CodeGenMojo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,7 @@ public void execute() throws MojoExecutionException {
567567
inputSpecRootDirectory = inputSpecRootDirectory.replaceAll("\\\\", "/");
568568

569569
inputSpec = new MergedSpecBuilder(inputSpecRootDirectory, mergedFileName,
570-
mergedFileInfoName, mergedFileInfoDescription, mergedFileInfoVersion)
570+
mergedFileInfoName, mergedFileInfoDescription, mergedFileInfoVersion, auth)
571571
.buildMergedSpec();
572572
LOGGER.info("Merge input spec would be used - {}", inputSpec);
573573
}

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import io.swagger.parser.OpenAPIParser;
77
import io.swagger.v3.oas.models.OpenAPI;
88
import io.swagger.v3.parser.core.models.ParseOptions;
9+
import org.openapitools.codegen.auth.AuthParser;
910
import org.slf4j.Logger;
1011
import org.slf4j.LoggerFactory;
1112

@@ -28,18 +29,20 @@ public class MergedSpecBuilder {
2829
private final String mergedFileInfoName;
2930
private final String mergedFileInfoDescription;
3031
private final String mergedFileInfoVersion;
32+
private final String auth;
3133

3234
public MergedSpecBuilder(final String rootDirectory, final String mergeFileName) {
33-
this(rootDirectory, mergeFileName, "merged spec", "merged spec", "1.0.0");
35+
this(rootDirectory, mergeFileName, "merged spec", "merged spec", "1.0.0", null);
3436
}
3537

3638
public MergedSpecBuilder(final String rootDirectory, final String mergeFileName,
37-
final String mergedFileInfoName, final String mergedFileInfoDescription, final String mergedFileInfoVersion) {
39+
final String mergedFileInfoName, final String mergedFileInfoDescription, final String mergedFileInfoVersion, final String auth) {
3840
this.inputSpecRootDirectory = rootDirectory;
3941
this.mergeFileName = mergeFileName;
4042
this.mergedFileInfoName = mergedFileInfoName;
4143
this.mergedFileInfoDescription = mergedFileInfoDescription;
4244
this.mergedFileInfoVersion = mergedFileInfoVersion;
45+
this.auth = auth;
4346
}
4447

4548
public String buildMergedSpec() {
@@ -62,7 +65,7 @@ public String buildMergedSpec() {
6265
LOGGER.info("Reading spec: {}", specPath);
6366

6467
OpenAPI result = new OpenAPIParser()
65-
.readLocation(specPath, new ArrayList<>(), options)
68+
.readLocation(specPath, AuthParser.parse(auth), options)
6669
.getOpenAPI();
6770

6871
if (openapiVersion == null) {

0 commit comments

Comments
 (0)