spring-boot: add JacksonHibernateConfiguration (#31817)

Author: mshima

generators/java/support/add-java-annotation.ts

@@ -47,11 +47,11 @@ const addJavaAnnotationToContent = (content: string, annotationDef: JavaAnnotati
   if (packageName) {
     content = addJavaImport(content, `${packageName}.${annotation}`);
   }
-  const annotationToAdd = parameters ? `${annotation}(${parameters()})` : annotation;
-  if (!new RegExp(escapeRegExp(`\n@${annotationToAdd}\n`)).test(content)) {
-    if (new RegExp(escapeRegExp(`\n@${annotation}(`)).test(content)) {
-      throw new Error(`Annotation already exists: ${annotation} replace is not implemented yet.`);
-    }
+  const annotationWithParametersMatches = content.match(new RegExp(`@${annotation}\\((?<oldParameters>[^)]*)\\)`));
+  const annotationToAdd = parameters ? `${annotation}(${parameters(annotationWithParametersMatches?.groups?.oldParameters)})` : annotation;
+  if (annotationWithParametersMatches) {
+    content = content.replace(new RegExp(`@${annotation}\\((?<oldParameters>[^)]*)\\)`), `@${annotationToAdd}`);
+  } else if (!new RegExp(escapeRegExp(`\n@${annotationToAdd}\n`)).test(content)) {
     // add the annotation before class or interface
     content = content.replace(/\n([a-w ]*(class|@?interface|enum) )/, `\n@${annotationToAdd}\n$1`);
   }

generators/server/__snapshots__/generator.spec.ts.snap

@@ -629,6 +629,9 @@ exports[`generator - server with entities should match files snapshot 1`] = `
   "src/main/java/com/mycompany/myapp/config/JacksonConfiguration.java": {
     "stateCleared": "modified",
   },
+  "src/main/java/com/mycompany/myapp/config/JacksonHibernateConfiguration.java": {
+    "stateCleared": "modified",
+  },
   "src/main/java/com/mycompany/myapp/config/LiquibaseConfiguration.java": {
     "stateCleared": "modified",
   },

generators/server/support/__snapshots__/needles.spec.ts.snap

@@ -113,6 +113,9 @@ exports[`generator - server - support - needles generated project should match s
   "src/main/java/com/mycompany/myapp/config/JacksonConfiguration.java": {
     "stateCleared": "modified",
   },
+  "src/main/java/com/mycompany/myapp/config/JacksonHibernateConfiguration.java": {
+    "stateCleared": "modified",
+  },
   "src/main/java/com/mycompany/myapp/config/LoggingAspectConfiguration.java": {
     "stateCleared": "modified",
   },

generators/spring-boot/templates/src/main/java/_package_/config/JacksonConfiguration.java.ejs

@@ -18,10 +18,6 @@
 -%>
 package <%= packageName %>.config;
 
-<%_ if (databaseTypeSql && !reactive) { _%>
-import com.fasterxml.jackson.datatype.hibernate6.Hibernate6Module;
-import com.fasterxml.jackson.datatype.hibernate6.Hibernate6Module.Feature;
-<%_ } _%>
 import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 
@@ -44,14 +40,4 @@ public class JacksonConfiguration {
     public Jdk8Module jdk8TimeModule() {
         return new Jdk8Module();
     }
-<%_ if (databaseTypeSql && !reactive) { _%>
-
-    /*
-     * Support for Hibernate types in Jackson.
-     */
-    @Bean
-    public Hibernate6Module hibernate6Module() {
-        return new Hibernate6Module().configure(Feature.SERIALIZE_IDENTIFIER_FOR_LAZY_NOT_LOADED_OBJECTS, true);
-    }
-<%_ } _%>
 }