diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java index 52e71fc22b79..64f6611734b3 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java @@ -575,7 +575,10 @@ public void processOpts() { // imports for pojos importMapping.put("ApiModelProperty", "io.swagger.annotations.ApiModelProperty"); importMapping.put("ApiModel", "io.swagger.annotations.ApiModel"); - importMapping.put("Schema", "io.swagger.v3.oas.annotations.media.Schema"); + // optional import for swagger2 annotation. Fixes #19170 + if (AnnotationLibrary.SWAGGER2.equals(getAnnotationLibrary())) { + importMapping.put("Schema", "io.swagger.v3.oas.annotations.media.Schema"); + } importMapping.put("BigDecimal", "java.math.BigDecimal"); importMapping.put("JsonProperty", "com.fasterxml.jackson.annotation.JsonProperty"); importMapping.put("JsonSubTypes", "com.fasterxml.jackson.annotation.JsonSubTypes"); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJerseyServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJerseyServerCodegen.java index 27763fcb5efd..23caa74bf1bf 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJerseyServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJerseyServerCodegen.java @@ -110,9 +110,9 @@ public void processOpts() { this.setUseJakartaEe(true); additionalProperties.put(USE_JAKARTA_EE, true); this.applyJakartaPackage(); - // --- Set Swagger2 annotations --------------- + // --- Set Swagger2 annotations and import corresponding library ---- annotationLibrary = AnnotationLibrary.SWAGGER2; - + importMapping.put("Schema", "io.swagger.v3.oas.annotations.media.Schema"); } convertPropertyToStringAndWriteBack(CodegenConstants.IMPL_FOLDER, value -> implFolder = value);