spring-boot: adjust Column (#31815)

Author: mshima

generators/spring-boot/templates/src/main/java/_package_/domain/AbstractAuditingEntity.java.ejs

@@ -44,7 +44,11 @@ import java.io.Serial;
 import java.io.Serializable;
 import java.time.Instant;
 <%_ if (databaseTypeSql) { _%>
+  <%_ if (reactive) { _%>
+import org.springframework.data.relational.core.mapping.Column;
+  <%_ } else { _%>
 import jakarta.persistence.Column;
+  <%_ } _%>
 <%_ } _%>
 <%_ if (databaseTypeSql && !reactive) { _%>
 import jakarta.persistence.EntityListeners;
@@ -71,7 +75,11 @@ public abstract class AbstractAuditingEntity<T> implements Serializable {
     @CreatedBy
 <%_ } _%>
 <%_ if (databaseTypeSql) { _%>
+  <%_ if (reactive) { _%>
+    @Column("created_by")
+  <%_ } else { _%>
     @Column(name = "created_by", nullable = false, length = 50, updatable = false)
+  <%_ } _%>
 <%_ } _%>
 <%_ if (databaseTypeMongodb) { _%>
     @Field("created_by")
@@ -86,7 +94,11 @@ public abstract class AbstractAuditingEntity<T> implements Serializable {
 
     @CreatedDate
 <%_ if (databaseTypeSql) { _%>
+  <%_ if (reactive) { _%>
+    @Column("created_date")
+  <%_ } else { _%>
     @Column(name = "created_date", updatable = false)
+  <%_ } _%>
 <%_ } _%>
 <%_ if (databaseTypeMongodb) { _%>
     @Field("created_date")
@@ -103,7 +115,11 @@ public abstract class AbstractAuditingEntity<T> implements Serializable {
     @LastModifiedBy
 <%_ } _%>
 <%_ if (databaseTypeSql) { _%>
+  <%_ if (reactive) { _%>
+    @Column("last_modified_by")
+  <%_ } else { _%>
     @Column(name = "last_modified_by", length = 50)
+  <%_ } _%>
 <%_ } _%>
 <%_ if (databaseTypeMongodb) { _%>
     @Field("last_modified_by")
@@ -118,7 +134,11 @@ public abstract class AbstractAuditingEntity<T> implements Serializable {
 
     @LastModifiedDate
 <%_ if (databaseTypeSql) { _%>
+  <%_ if (reactive) { _%>
+    @Column("last_modified_date")
+  <%_ } else { _%>
     @Column(name = "last_modified_date")
+  <%_ } _%>
 <%_ } _%>
 <%_ if (databaseTypeMongodb) { _%>
     @Field("last_modified_date")

generators/spring-boot/templates/src/main/java/_package_/domain/User.java.ejs

@@ -158,6 +158,11 @@ public class <%= user.persistClass %><% if (generateSpringAuditor) { %> extends
   <%_ if (searchEngineElasticsearch && authenticationTypeOauth2) { _%>
     @org.springframework.data.elasticsearch.annotations.Field(type = FieldType.Keyword)
   <%_ } _%>
+  <%_ if (reactive) { _%>
+    @Column("id")
+  <%_ } else { _%>
+    @Column(name = "id")
+  <%_ } _%>
 <%_ } else if (databaseTypeNeo4j) { _%>
     @Id
   <%_ if (!authenticationTypeOauth2) { _%>
@@ -191,8 +196,12 @@ public class <%= user.persistClass %><% if (generateSpringAuditor) { %> extends
     @NotNull
     @Pattern(regexp = Constants.LOGIN_REGEX)
     @Size(min = 1, max = 50)
-<%_ if (databaseTypeSql && !reactive) { _%>
-    @Column(length = 50, unique = true, nullable = false)
+<%_ if (databaseTypeSql) { _%>
+  <%_ if (reactive) { _%>
+    @Column("login")
+  <%_ } else { _%>
+    @Column(name = "login", length = 50, unique = true, nullable = false)
+  <%_ } _%>
 <%_ } _%>
 <%_ if (databaseTypeMongodb) { _%>
     @Indexed
@@ -262,8 +271,12 @@ public class <%= user.persistClass %><% if (generateSpringAuditor) { %> extends
 
     @Email
     @Size(min = 5, max = 254)
-<%_ if (databaseTypeSql && !reactive) { _%>
-    @Column(length = 254, unique = true)
+<%_ if (databaseTypeSql) { _%>
+  <%_ if (reactive) { _%>
+    @Column("email")
+  <%_ } else { _%>
+    @Column(name = "email", length = 254, unique = true)
+  <%_ } _%>
 <%_ } _%>
 <%_ if (databaseTypeMongodb) { _%>
     @Indexed
@@ -272,8 +285,10 @@ public class <%= user.persistClass %><% if (generateSpringAuditor) { %> extends
 
 <%_ if (databaseTypeSql) { _%>
     @NotNull
-  <%_ if (!reactive) { _%>
-    @Column(nullable = false)
+  <%_ if (reactive) { _%>
+    @Column("activated")
+  <%_ } else { _%>
+    @Column(name = "activated", nullable = false)
   <%_ } _%>
 <%_ } _%>
     private boolean activated = false;