diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java index a014466dc0d..dbd6ee46d96 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java @@ -8480,17 +8480,4 @@ public class DefaultCodegen implements CodegenConfig { } operation.hasParams = !operation.allParams.isEmpty(); } - - /** - * Returns the title in the info section of the spec or default to openapi if not defined. - * - * @return title - */ - protected String getInfoTitle() { - if (openAPI.getInfo() != null) { - return openAPI.getInfo().getTitle(); - } else { - return "openapi"; // default to openapi if title not set - } - } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ApexClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ApexClientCodegen.java index 0bdf10b5a1d..167d1f08678 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ApexClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ApexClientCodegen.java @@ -160,7 +160,7 @@ public class ApexClientCodegen extends AbstractApexCodegen { @Override public void preprocessOpenAPI(OpenAPI openAPI) { - String calloutLabel = getInfoTitle(); + String calloutLabel = openAPI.getInfo().getTitle(); if (StringUtils.isNotBlank(namedCredential)) { calloutLabel = namedCredential; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellHttpClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellHttpClientCodegen.java index a58a893ee63..a78e9a703ca 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellHttpClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellHttpClientCodegen.java @@ -550,7 +550,7 @@ public class HaskellHttpClientCodegen extends DefaultCodegen implements CodegenC @Override public void preprocessOpenAPI(OpenAPI openAPI) { - String baseTitle = getInfoTitle(); + String baseTitle = openAPI.getInfo().getTitle(); if (StringUtils.isBlank(baseTitle)) { baseTitle = "OpenAPI"; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellServantCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellServantCodegen.java index bf803e62047..a7785024a06 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellServantCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellServantCodegen.java @@ -275,7 +275,7 @@ public class HaskellServantCodegen extends DefaultCodegen implements CodegenConf @Override public void preprocessOpenAPI(OpenAPI openAPI) { // From the title, compute a reasonable name for the package and the API - String title = getInfoTitle(); + String title = openAPI.getInfo().getTitle(); // Drop any API suffix if (title == null) { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaPKMSTServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaPKMSTServerCodegen.java index fc46ba80629..351242ad353 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaPKMSTServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaPKMSTServerCodegen.java @@ -471,7 +471,7 @@ public class JavaPKMSTServerCodegen extends AbstractJavaCodegen { if (!additionalProperties.containsKey(TITLE)) { // From the title, compute a reasonable name for the package and the // API - String title = getInfoTitle(); + String title = openAPI.getInfo().getTitle(); // Drop any API suffix if (title != null) { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java index 02413275c7f..05e56b0facf 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java @@ -771,7 +771,7 @@ public class KotlinSpringServerCodegen extends AbstractKotlinCodegen // This is an additional step we add when pre-processing the API spec, if // there is no user configuration set for the `title` of the project, // we try build and normalise a title from the API spec itself. - String title = getInfoTitle(); + String title = openAPI.getInfo().getTitle(); // Drop any API suffix if (title != null) { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java index eb5219b4b80..cb3c52a99c7 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java @@ -689,7 +689,7 @@ public class SpringCodegen extends AbstractJavaCodegen if (!additionalProperties.containsKey(TITLE)) { // From the title, compute a reasonable name for the package and the API - String title = getInfoTitle(); + String title = openAPI.getInfo().getTitle(); // Drop any API suffix if (title != null) { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtml2Generator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtml2Generator.java index 6f291df8a15..0b050fbecf1 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtml2Generator.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtml2Generator.java @@ -230,7 +230,7 @@ public class StaticHtml2Generator extends DefaultCodegen implements CodegenConfi Markdown markInstance = new Markdown(); openAPI.getInfo().setDescription(markInstance.toHtml(currentDescription)); } else { - LOGGER.error("OpenAPI object description is empty [{}]", getInfoTitle()); + LOGGER.error("OpenAPI object description is empty [{}]", openAPI.getInfo().getTitle()); } }