Fix missing imports for schemaMapping in API interfaces

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

@@ -4623,6 +4623,8 @@ public CodegenOperation fromOperation(String path,
                         !languageSpecificPrimitives.contains(r.baseType)) {
                     imports.add(r.baseType);
                 }
+
+                addImportMappedType(imports, r.dataType);
 
                 if ("set".equals(r.containerType) && typeMapping.containsKey(r.containerType)) {
                     op.uniqueItems = true;
@@ -4868,6 +4870,17 @@ public CodegenOperation fromOperation(String path,
         return op;
     }
 
+    /**
+     * Helper method to add an import for a data type if it exists in the importMapping.
+     * @param imports The set of imports to add to.
+     * @param dataType The data type to check for a mapping.
+     */
+    protected void addImportMappedType(Set<String> imports, String dataType) {
+        if (importMapping.containsKey(dataType)) {
+            imports.add(dataType);
+        }
+    }
+
     public void SortParametersByRequiredFlag(List<CodegenParameter> parameters) {
         Collections.sort(parameters, new Comparator<CodegenParameter>() {
             @Override
@@ -5464,6 +5477,7 @@ public CodegenParameter fromParameter(Parameter parameter, Set<String> imports)
         if (codegenProperty.complexType != null) {
             imports.add(codegenProperty.complexType);
         }
+        addImportMappedType(imports, codegenParameter.dataType);
 
         codegenParameter.pattern = toRegularExpression(parameterSchema.getPattern());
 

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

@@ -277,9 +277,9 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
 
         {{#useJackson3}}
         Consumer<HttpMessageConverters.ClientBuilder> messageConverters = builder -> {
-            builder.addCustomConverter(new JacksonJsonHttpMessageConverter(mapper));
+            builder.registerDefaults().withJsonConverter(new JacksonJsonHttpMessageConverter(mapper));
             {{#withXml}}
-            builder.addCustomConverter(new JacksonXmlHttpMessageConverter(xmlMapper));
+            builder.withXmlConverter(new JacksonXmlHttpMessageConverter(xmlMapper));
             {{/withXml}}
         };
 

modules/openapi-generator/src/main/resources/Java/libraries/restclient/build.gradle.mustache

@@ -118,7 +118,7 @@ ext {
     jakarta_annotation_version = "2.1.1"
     {{/useSpringBoot4}}
     {{#useSpringBoot4}}
-    spring_web_version = "7.0.5"
+    spring_web_version = "7.0.8"
     jakarta_annotation_version = "3.0.0"
     {{/useSpringBoot4}}
     bean_validation_version = "3.1.1"

modules/openapi-generator/src/main/resources/Java/libraries/restclient/pom.mustache

@@ -355,7 +355,7 @@
         {{/performBeanValidation}}
         {{/useSpringBoot4}}
         {{#useSpringBoot4}}
-        <spring-web-version>7.0.5</spring-web-version>
+        <spring-web-version>7.0.8</spring-web-version>
         {{#useJackson3}}
         <jackson-version>3.1.5</jackson-version>
         {{/useJackson3}}

modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache

@@ -126,7 +126,7 @@ ext {
     jackson_databind_nullable_version = "0.2.11"
     {{/openApiNullable}}
     {{#useSpringBoot4}}
-    spring_web_version = "7.0.5"
+    spring_web_version = "7.0.8"
     jakarta_annotation_version = "3.0.0"
     bean_validation_version = "3.1.1"
     {{/useSpringBoot4}}

modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache

@@ -379,7 +379,7 @@
         {{/swagger2AnnotationLibrary}}
 
         {{#useSpringBoot4}}
-        <spring-web-version>7.0.5</spring-web-version>
+        <spring-web-version>7.0.8</spring-web-version>
         {{#useJackson3}}
         <jackson-version>3.1.5</jackson-version>
         {{/useJackson3}}

modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java

@@ -3702,6 +3702,33 @@ public void testJackson3DefaultMapperFallsBackToDefaultDateFormat_issue_24588()
         }
     }
 
+    @Test(description = "Regression test for issue #24587: restclient with useJackson3=true must call"
+            + " builder.registerDefaults().withJsonConverter(...) inside configureMessageConverters so default Spring converters"
+            + " (ByteArray, String, Resource) are registered with Jackson as the JSON converter.")
+    public void testRestClientJackson3RegistersDefaults_issue_24587() {
+        final Path output = newTempFolder();
+        final CodegenConfigurator configurator = new CodegenConfigurator()
+                .setGeneratorName(JAVA_GENERATOR)
+                .setLibrary(JavaClientCodegen.RESTCLIENT)
+                .setAdditionalProperties(Map.of(
+                        CodegenConstants.API_PACKAGE, "xyz.abcdef.api",
+                        JavaClientCodegen.USE_JACKSON_3, true,
+                        JavaClientCodegen.USE_SPRING_BOOT4, true,
+                        JavaClientCodegen.OPENAPI_NULLABLE, false
+                ))
+                .setInputSpec("src/test/resources/3_1/java/petstore.yaml")
+                .setOutputDir(output.toString().replace("\\", "/"));
+
+        List<File> files = new DefaultGenerator().opts(configurator.toClientOptInput()).generate();
+
+        validateJavaSourceFiles(files);
+        assertFileContains(
+                output.resolve("src/main/java/xyz/abcdef/ApiClient.java"),
+                "Consumer<HttpMessageConverters.ClientBuilder> messageConverters = builder -> {",
+                "builder.registerDefaults().withJsonConverter(new JacksonJsonHttpMessageConverter(mapper));"
+        );
+    }
+
 
     @Test
     public void testRestClientWithUseSingleRequestParameter_issue_19406() {

modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java

@@ -8690,4 +8690,32 @@ public void testReactiveSpringHttpInterfaceSupportListOfStringReturnTypeNoRespon
                 "Mono<Set<String>> getUserIdSet"
         );
     }
+
+    @Test
+    public void testSchemaMappingAddsImport_issue24232() throws IOException {
+        Map<String, Object> properties = new HashMap<>();
+        properties.put(CodegenConstants.API_PACKAGE, "xyz.abcdef.api");
+        properties.put(INTERFACE_ONLY, true);
+
+        File output = Files.createTempDirectory("test").toFile();
+        output.deleteOnExit();
+
+        final CodegenConfigurator configurator = new CodegenConfigurator()
+                .setGeneratorName("spring")
+                .setAdditionalProperties(properties)
+                .setSchemaMappings(Map.of("MyKey", "MyCustomKey"))
+                .setImportMappings(Map.of("MyCustomKey", "org.myorg.MyCustomKey"))
+                .setInputSpec("src/test/resources/bugs/issue_24232.yaml")
+                .setOutputDir(output.getAbsolutePath().replace("\\", "/"));
+
+        DefaultGenerator generator = new DefaultGenerator();
+        List<File> files = generator.opts(configurator.toClientOptInput()).generate();
+        files.forEach(File::deleteOnExit);
+
+        validateJavaSourceFiles(files);
+
+        File testApi = new File(output, "src/main/java/xyz/abcdef/api/SomeApi.java");
+
+        JavaFileAssert.assertThat(testApi).fileContains("import org.myorg.MyCustomKey;");
+    }
 }

modules/openapi-generator/src/test/resources/bugs/issue_24232.yaml

@@ -0,0 +1,42 @@
+openapi: 3.0.0
+info:
+  version: "1.0.0"
+  title: mapping
+paths:
+  /some/dummy/endpoint/{id}:
+    get:
+      operationId: getDummy
+      parameters:
+        - name: id
+          in: path
+          required: true
+          description: My Custom Id
+          schema:
+            $ref: '#/components/schemas/MyId'
+        - name: key
+          in: query
+          required: true
+          description: filter on key
+          schema:
+            $ref: '#/components/schemas/MyKey'
+      responses:
+        200:
+          description: Successfully created reverse listings for retail
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Dummy'
+components:
+  schemas:
+    Dummy:
+      type: object
+      properties:
+        id:
+          $ref: '#/components/schemas/MyId'
+        key:
+          $ref: '#/components/schemas/MyKey'
+    MyId:
+      type: string
+      format: custom
+    MyKey:
+      type: string

samples/client/petstore/java/restclient-springBoot4-jackson2/build.gradle

@@ -100,7 +100,7 @@ ext {
     jackson_version = "2.21.5"
     jackson_annotations_version = "2.21"
     jackson_databind_nullable_version = "0.2.11"
-    spring_web_version = "7.0.5"
+    spring_web_version = "7.0.8"
     jakarta_annotation_version = "3.0.0"
     bean_validation_version = "3.1.1"
     jodatime_version = "2.14.0"

samples/client/petstore/java/restclient-springBoot4-jackson2/pom.xml

@@ -263,7 +263,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <spring-web-version>7.0.5</spring-web-version>
+        <spring-web-version>7.0.8</spring-web-version>
         <jackson-version>2.21.5</jackson-version>
         <jakarta-annotation-version>3.0.0</jakarta-annotation-version>
 

samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/build.gradle

@@ -99,7 +99,7 @@ if(hasProperty('target') && target == 'android') {
 ext {
     jackson_version = "3.1.5"
     jackson_annotations_version = "2.21"
-    spring_web_version = "7.0.5"
+    spring_web_version = "7.0.8"
     jakarta_annotation_version = "3.0.0"
     bean_validation_version = "3.1.1"
     jodatime_version = "2.14.0"

samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/pom.xml

@@ -253,7 +253,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <spring-web-version>7.0.5</spring-web-version>
+        <spring-web-version>7.0.8</spring-web-version>
         <jackson-version>3.1.5</jackson-version>
         <jakarta-annotation-version>3.0.0</jakarta-annotation-version>
 

samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/ApiClient.java

@@ -158,7 +158,7 @@ protected void init() {
     public static RestClient.Builder buildRestClientBuilder(JsonMapper mapper) {
 
         Consumer<HttpMessageConverters.ClientBuilder> messageConverters = builder -> {
-            builder.addCustomConverter(new JacksonJsonHttpMessageConverter(mapper));
+            builder.registerDefaults().withJsonConverter(new JacksonJsonHttpMessageConverter(mapper));
         };
 
         return RestClient.builder().configureMessageConverters(messageConverters);

samples/client/petstore/java/restclient-springBoot4-jackson3/build.gradle

@@ -99,7 +99,7 @@ if(hasProperty('target') && target == 'android') {
 ext {
     jackson_version = "3.1.5"
     jackson_annotations_version = "2.21"
-    spring_web_version = "7.0.5"
+    spring_web_version = "7.0.8"
     jakarta_annotation_version = "3.0.0"
     bean_validation_version = "3.1.1"
     jodatime_version = "2.14.0"

samples/client/petstore/java/restclient-springBoot4-jackson3/pom.xml

@@ -253,7 +253,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <spring-web-version>7.0.5</spring-web-version>
+        <spring-web-version>7.0.8</spring-web-version>
         <jackson-version>3.1.5</jackson-version>
         <jakarta-annotation-version>3.0.0</jakarta-annotation-version>
 

samples/client/petstore/java/restclient-springBoot4-jackson3/src/main/java/org/openapitools/client/ApiClient.java

@@ -160,7 +160,7 @@ protected void init() {
     public static RestClient.Builder buildRestClientBuilder(JsonMapper mapper) {
 
         Consumer<HttpMessageConverters.ClientBuilder> messageConverters = builder -> {
-            builder.addCustomConverter(new JacksonJsonHttpMessageConverter(mapper));
+            builder.registerDefaults().withJsonConverter(new JacksonJsonHttpMessageConverter(mapper));
         };
 
         return RestClient.builder().configureMessageConverters(messageConverters);

samples/client/petstore/java/resttemplate-springBoot4-jackson2/build.gradle

@@ -100,7 +100,7 @@ ext {
     jackson_version = "2.21.5"
     jackson_annotations_version = "2.21"
     jackson_databind_nullable_version = "0.2.11"
-    spring_web_version = "7.0.5"
+    spring_web_version = "7.0.8"
     jakarta_annotation_version = "3.0.0"
     bean_validation_version = "3.1.1"
     jodatime_version = "2.9.9"

samples/client/petstore/java/resttemplate-springBoot4-jackson2/pom.xml

@@ -279,7 +279,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <spring-web-version>7.0.5</spring-web-version>
+        <spring-web-version>7.0.8</spring-web-version>
         <jackson-version>2.21.5</jackson-version>
         <jakarta-annotation-version>3.0.0</jakarta-annotation-version>
 

samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/build.gradle

@@ -99,7 +99,7 @@ if(hasProperty('target') && target == 'android') {
 ext {
     jackson_version = "3.1.5"
     jackson_annotations_version = "2.21"
-    spring_web_version = "7.0.5"
+    spring_web_version = "7.0.8"
     jakarta_annotation_version = "3.0.0"
     bean_validation_version = "3.1.1"
     jodatime_version = "2.9.9"

samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/pom.xml

@@ -266,7 +266,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <spring-web-version>7.0.5</spring-web-version>
+        <spring-web-version>7.0.8</spring-web-version>
         <jackson-version>3.1.5</jackson-version>
         <jakarta-annotation-version>3.0.0</jakarta-annotation-version>
 

samples/client/petstore/java/resttemplate-springBoot4-jackson3/build.gradle

@@ -99,7 +99,7 @@ if(hasProperty('target') && target == 'android') {
 ext {
     jackson_version = "3.1.5"
     jackson_annotations_version = "2.21"
-    spring_web_version = "7.0.5"
+    spring_web_version = "7.0.8"
     jakarta_annotation_version = "3.0.0"
     bean_validation_version = "3.1.1"
     jodatime_version = "2.9.9"

samples/client/petstore/java/resttemplate-springBoot4-jackson3/pom.xml

@@ -269,7 +269,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <spring-web-version>7.0.5</spring-web-version>
+        <spring-web-version>7.0.8</spring-web-version>
         <jackson-version>3.1.5</jackson-version>
         <jakarta-annotation-version>3.0.0</jakarta-annotation-version>