Commit: 2416 - ThoughtBase (svn)

Commit MetaInfo

• Revision: 2416 (tree)
• Time: 2022-10-05 19:20:13
• Author: t_nakayama1971

Log Message

(empty log message)

Change Summary

• modified: trunk/framework/pjDb/ftl/pojo/Ejb3PropertyGetAnnotation.ftl
• modified: trunk/framework/pjDb/src/main/java/project/db/model/FooMaster.java
• modified: trunk/framework/pjDb/src/test/java/common/db/dao/hibernate/reveng/DefaultStrategy.java

Incremental Difference

--- trunk/framework/pjDb/src/main/java/project/db/model/FooMaster.java	(revision 2415)
+++ trunk/framework/pjDb/src/main/java/project/db/model/FooMaster.java	(revision 2416)
@@ -1,149 +1,144 @@
-package project.db.model;
-
-import java.util.Date;
-
+package project.db.model;
+
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
+import static jakarta.persistence.GenerationType.SEQUENCE;
 import jakarta.persistence.Id;
 import jakarta.persistence.SequenceGenerator;
 import jakarta.persistence.Table;
-import jakarta.persistence.Temporal;
-import jakarta.persistence.TemporalType;
-
-/**
- * FooMaster generated by hbm2java
- */
[e-mail]
-@Entity
-@Table(name = "foo_master")
-public class FooMaster implements java.io.Serializable {
-
-	private Long id;
-	private String fooId;
-	private String hooId;
-	private Date torokuDatetime;
-	private String fooName;
-	private String fooAddress;
-	private String fooPhone;
-	private int version;
-	private String insertId;
-	private Date insertDatetime;
-	private String updateId;
-	private Date updateDatetime;
-
-	@Id
-	@SequenceGenerator(name = "generator", sequenceName = "generator", allocationSize = 1)
-	@GeneratedValue(generator = "generator")
-	@Column(name = "id", unique = true, nullable = false)
-	public Long getId() {
-		return this.id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	@Column(name = "foo_id", nullable = false, length = 32)
-	public String getFooId() {
-		return this.fooId;
-	}
-
-	public void setFooId(String fooId) {
-		this.fooId = fooId;
-	}
-
-	@Column(name = "hoo_id", nullable = false, length = 64)
-	public String getHooId() {
-		return this.hooId;
-	}
-
-	public void setHooId(String hooId) {
-		this.hooId = hooId;
-	}
-
-	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name = "toroku_datetime", nullable = false, length = 29)
-	public Date getTorokuDatetime() {
-		return this.torokuDatetime;
-	}
-
-	public void setTorokuDatetime(Date torokuDatetime) {
-		this.torokuDatetime = torokuDatetime;
-	}
-
-	@Column(name = "foo_name", nullable = false, length = 128)
-	public String getFooName() {
-		return this.fooName;
-	}
-
-	public void setFooName(String fooName) {
-		this.fooName = fooName;
-	}
-
-	@Column(name = "foo_address", length = 256)
-	public String getFooAddress() {
-		return this.fooAddress;
-	}
-
-	public void setFooAddress(String fooAddress) {
-		this.fooAddress = fooAddress;
-	}
-
-	@Column(name = "foo_phone", length = 128)
-	public String getFooPhone() {
-		return this.fooPhone;
-	}
-
-	public void setFooPhone(String fooPhone) {
-		this.fooPhone = fooPhone;
-	}
-
-	@Column(name = "version", nullable = false)
-	public int getVersion() {
-		return this.version;
-	}
-
-	public void setVersion(int version) {
-		this.version = version;
-	}
-
-	@Column(name = "insert_id", nullable = false, length = 32)
-	public String getInsertId() {
-		return this.insertId;
-	}
-
-	public void setInsertId(String insertId) {
-		this.insertId = insertId;
-	}
-
-	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name = "insert_datetime", nullable = false, length = 29)
-	public Date getInsertDatetime() {
-		return this.insertDatetime;
-	}
-
-	public void setInsertDatetime(Date insertDatetime) {
-		this.insertDatetime = insertDatetime;
-	}
-
-	@Column(name = "update_id", nullable = false, length = 32)
-	public String getUpdateId() {
-		return this.updateId;
-	}
-
-	public void setUpdateId(String updateId) {
-		this.updateId = updateId;
-	}
-
-	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name = "update_datetime", nullable = false, length = 29)
-	public Date getUpdateDatetime() {
-		return this.updateDatetime;
-	}
-
-	public void setUpdateDatetime(Date updateDatetime) {
-		this.updateDatetime = updateDatetime;
-	}
-
-}
+import java.sql.Timestamp;
+
+/**
+ * FooMaster generated by hbm2java
+ */
[e-mail]
+@Entity
+@Table(name="foo_master"
+)
+public class FooMaster implements java.io.Serializable {
+
+    private Long id;
+    private String fooId;
+    private String hooId;
+    private Timestamp torokuDatetime;
+    private String fooName;
+    private String fooAddress;
+    private String fooPhone;
+    private int version;
+    private String insertId;
+    private Timestamp insertDatetime;
+    private String updateId;
+    private Timestamp updateDatetime;
+
+    @SequenceGenerator(name="project.db.model.FooMasterIdGenerator", sequenceName="generator", allocationSize=1)
+    @Id
+    @GeneratedValue(strategy=SEQUENCE, generator="project.db.model.FooMasterIdGenerator")
+    @Column(name="id", unique=true, nullable=false)
+    public Long getId() {
+        return this.id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="foo_id", nullable=false, length=32)
+    public String getFooId() {
+        return this.fooId;
+    }
+
+    public void setFooId(String fooId) {
+        this.fooId = fooId;
+    }
+
+    @Column(name="hoo_id", nullable=false, length=64)
+    public String getHooId() {
+        return this.hooId;
+    }
+
+    public void setHooId(String hooId) {
+        this.hooId = hooId;
+    }
+
+    @Column(name="toroku_datetime", nullable=false, length=29)
+    public Timestamp getTorokuDatetime() {
+        return this.torokuDatetime;
+    }
+
+    public void setTorokuDatetime(Timestamp torokuDatetime) {
+        this.torokuDatetime = torokuDatetime;
+    }
+
+    @Column(name="foo_name", nullable=false, length=128)
+    public String getFooName() {
+        return this.fooName;
+    }
+
+    public void setFooName(String fooName) {
+        this.fooName = fooName;
+    }
+
+    @Column(name="foo_address", length=256)
+    public String getFooAddress() {
+        return this.fooAddress;
+    }
+
+    public void setFooAddress(String fooAddress) {
+        this.fooAddress = fooAddress;
+    }
+
+    @Column(name="foo_phone", length=128)
+    public String getFooPhone() {
+        return this.fooPhone;
+    }
+
+    public void setFooPhone(String fooPhone) {
+        this.fooPhone = fooPhone;
+    }
+
+    @Column(name="version", nullable=false)
+    public int getVersion() {
+        return this.version;
+    }
+
+    public void setVersion(int version) {
+        this.version = version;
+    }
+
+    @Column(name="insert_id", nullable=false, length=32)
+    public String getInsertId() {
+        return this.insertId;
+    }
+
+    public void setInsertId(String insertId) {
+        this.insertId = insertId;
+    }
+
+    @Column(name="insert_datetime", nullable=false, length=29)
+    public Timestamp getInsertDatetime() {
+        return this.insertDatetime;
+    }
+
+    public void setInsertDatetime(Timestamp insertDatetime) {
+        this.insertDatetime = insertDatetime;
+    }
+
+    @Column(name="update_id", nullable=false, length=32)
+    public String getUpdateId() {
+        return this.updateId;
+    }
+
+    public void setUpdateId(String updateId) {
+        this.updateId = updateId;
+    }
+
+    @Column(name="update_datetime", nullable=false, length=29)
+    public Timestamp getUpdateDatetime() {
+        return this.updateDatetime;
+    }
+
+    public void setUpdateDatetime(Timestamp updateDatetime) {
+        this.updateDatetime = updateDatetime;
+    }
+}

--- trunk/framework/pjDb/src/test/java/common/db/dao/hibernate/reveng/DefaultStrategy.java	(revision 2415)
+++ trunk/framework/pjDb/src/test/java/common/db/dao/hibernate/reveng/DefaultStrategy.java	(revision 2416)
@@ -50,6 +50,7 @@
 		Set<String> columns = this.tables.get(name);
 		if (columns != null) {
 			if (columns.contains("ID") || columns.contains("id")) {
+				params.put("allocationSize", Integer.valueOf(1));
 				if (name.startsWith("ms_") || name.startsWith("MS_")) {
 					params.put(SequenceStyleGenerator.SEQUENCE_PARAM, "sq_master");
 				} else if (name.startsWith("tr_") || name.startsWith("TR_")) {