adjusts

mshima · Aug 2, 2024 · 1450b3d · 1450b3d
1 parent f98f1a6
commit 1450b3d
Show file tree

Hide file tree

Showing 9 changed files with 388 additions and 2,055 deletions.
diff --git a/generators/kotlin/generator.js b/generators/kotlin/generator.js
@@ -132,6 +132,7 @@ tasks.withType(org.jetbrains.kotlin.gradle.internal.KaptGenerateStubsTask.class)
 }
 `,
                         );
+                        this.editFile('gradle/swagger.gradle', content => content.replace(', useSpringBoot3: "true"', ''));
                     }
                 }
             },
@@ -328,6 +329,10 @@ tasks.withType(org.jetbrains.kotlin.gradle.internal.KaptGenerateStubsTask.class)
                             },
                         ],
                     });
+
+                    if (application.enableSwaggerCodegen) {
+                        this.editFile('pom.xml', content => content.replace('<useSpringBoot3>true</useSpringBoot3>', ''));
+                    }
                 }
             },
         });

diff --git a/generators/migration/generator.js b/generators/migration/generator.js
@@ -36,6 +36,10 @@ export default class extends BaseApplicationGenerator {
                                 .replaceAll('jackson-datatype-hibernate6', 'jackson-datatype-hibernate5')
                                 .replaceAll('org.apache.cassandra', 'com.datastax.oss')
                                 // Gradle only
+                                .replace(
+                                    'importMappings = [Problem:"org.zalando.problem.Problem"]',
+                                    'importMappings = [Problem:"org.springframework.http.ProblemDetail"]',
+                                )
                                 .replace('hibernate-jcache"', 'hibernate-jcache:${hibernateVersion}"')
                                 .replace(
                                     "excludes = ['time']",
@@ -45,7 +49,6 @@ export default class extends BaseApplicationGenerator {
                                 )
                                 // Maven only
                                 .replaceAll('<classifier>jakarta</classifier>', '')
-                                .replace('<useSpringBoot3>true</useSpringBoot3>', '')
                                 .replace(
                                     '<skipValidateSpec>false</skipValidateSpec>',
                                     '<importMappings>Problem=org.zalando.problem.Problem</importMappings><skipValidateSpec>false</skipValidateSpec>',
-Original file line number
+Diff line change
@@ Expand Up @@
     }
     `,
                             );
+                            this.editFile('gradle/swagger.gradle', content => content.replace(', useSpringBoot3: "true"', ''));
                         }
                     }
                 },
@@ Expand Down Expand Up @@
                                 },
                             ],
                         });
+                        if (application.enableSwaggerCodegen) {
+                            this.editFile('pom.xml', content => content.replace('<useSpringBoot3>true</useSpringBoot3>', ''));
+                        }
                     }
                 },
             });
@@ Expand Down @@