Sample project setup for ng model

fugerit-org · Nov 14, 2024 · 770e9a6 · 770e9a6
1 parent cfbce5c
commit 770e9a6
Show file tree

Hide file tree

Showing 46 changed files with 189 additions and 533 deletions.
diff --git a/fj-daogen-sample/src/main/daogen/fugerit-sample-daogen-config.xml b/fj-daogen-sample/src/main/daogen/fugerit-sample-daogen-config.xml
@@ -29,6 +29,10 @@
  	package-junit4-model="org.fugerit.java.daogen.sample.junit4test.model"
 	factory-data-impl="org.fugerit.java.daogen.sample.impl.facade.data.FugeritDataLogicFacade"
 	default-sequence="seq_id_fugerit"
+    dao-helper-ng-mode="enabled"
+    dao-wrapper-ng-mode="enabled"
+    dao-finder-ng-mode="enabled"
+    type-mapper-time-ng="enabled"
 	openapi_host="http://localhost:9080"
 	openapi_path="/fugerit-sample-web/jax-rs"
     disable-singleton="enabled"

diff --git a/fj-daogen-sample/src/main/java/org/fugerit/java/daogen/sample/def/facade/AddressFinder.java b/fj-daogen-sample/src/main/java/org/fugerit/java/daogen/sample/def/facade/AddressFinder.java
@@ -1,6 +1,6 @@
 package org.fugerit.java.daogen.sample.def.facade;
 
-import org.fugerit.java.core.db.daogen.BaseIdFinder;
+import org.fugerit.java.core.db.daogen.IdFinderNG;
 import org.fugerit.java.daogen.sample.def.model.ModelAddress;
 
 // custom import start ( code above here will be overwritten )
@@ -15,25 +15,11 @@
  * // custom code start ( code above here will be overwritten )
  * // custom code end ( code below here will be overwritten )
  */
-public class AddressFinder extends BaseIdFinder {
+public class AddressFinder extends IdFinderNG {
 
 	// custom code start ( code above here will be overwritten )
 	// custom code end ( code below here will be overwritten )
 
-	private static final long serialVersionUID = 991425775053L;
-
-	private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
-		// this class is conditionally serializable, depending on contained object
-		// special situation can be handled using this method in future
-		out.defaultWriteObject();
-	}
-
-	private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
-		// this class is conditionally serializable, depending on contained object
-		// special situation can be handled using this method in future
-		in.defaultReadObject();
-	}
-
 	private ModelAddress model;
 
 	public void setModel( ModelAddress model ) {

diff --git a/fj-daogen-sample/src/main/java/org/fugerit/java/daogen/sample/def/facade/LogDataFinder.java b/fj-daogen-sample/src/main/java/org/fugerit/java/daogen/sample/def/facade/LogDataFinder.java
@@ -1,6 +1,6 @@
 package org.fugerit.java.daogen.sample.def.facade;
 
-import org.fugerit.java.core.db.daogen.BaseIdFinder;
+import org.fugerit.java.core.db.daogen.IdFinderNG;
 import org.fugerit.java.daogen.sample.def.model.ModelLogData;
 
 // custom import start ( code above here will be overwritten )
@@ -15,25 +15,11 @@
  * // custom code start ( code above here will be overwritten )
  * // custom code end ( code below here will be overwritten )
  */
-public class LogDataFinder extends BaseIdFinder {
+public class LogDataFinder extends IdFinderNG {
 
 	// custom code start ( code above here will be overwritten )
 	// custom code end ( code below here will be overwritten )
 
-	private static final long serialVersionUID = 329810489228L;
-
-	private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
-		// this class is conditionally serializable, depending on contained object
-		// special situation can be handled using this method in future
-		out.defaultWriteObject();
-	}
-
-	private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
-		// this class is conditionally serializable, depending on contained object
-		// special situation can be handled using this method in future
-		in.defaultReadObject();
-	}
-
 	private ModelLogData model;
 
 	public void setModel( ModelLogData model ) {

diff --git a/...sample/src/main/java/org/fugerit/java/daogen/sample/def/facade/TestTwoFieldKeyFinder.java b/...sample/src/main/java/org/fugerit/java/daogen/sample/def/facade/TestTwoFieldKeyFinder.java
@@ -1,6 +1,6 @@
 package org.fugerit.java.daogen.sample.def.facade;
 
-import org.fugerit.java.core.db.daogen.BaseIdFinder;
+import org.fugerit.java.core.db.daogen.IdFinderNG;
 import org.fugerit.java.daogen.sample.def.model.ModelTestTwoFieldKey;
 
 // custom import start ( code above here will be overwritten )
@@ -15,25 +15,11 @@
  * // custom code start ( code above here will be overwritten )
  * // custom code end ( code below here will be overwritten )
  */
-public class TestTwoFieldKeyFinder extends BaseIdFinder {
+public class TestTwoFieldKeyFinder extends IdFinderNG {
 
 	// custom code start ( code above here will be overwritten )
 	// custom code end ( code below here will be overwritten )
 
-	private static final long serialVersionUID = 772549612012L;
-
-	private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
-		// this class is conditionally serializable, depending on contained object
-		// special situation can be handled using this method in future
-		out.defaultWriteObject();
-	}
-
-	private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
-		// this class is conditionally serializable, depending on contained object
-		// special situation can be handled using this method in future
-		in.defaultReadObject();
-	}
-
 	private ModelTestTwoFieldKey model;
 
 	public void setModel( ModelTestTwoFieldKey model ) {

diff --git a/fj-daogen-sample/src/main/java/org/fugerit/java/daogen/sample/def/facade/UploadFinder.java b/fj-daogen-sample/src/main/java/org/fugerit/java/daogen/sample/def/facade/UploadFinder.java
@@ -1,6 +1,6 @@
 package org.fugerit.java.daogen.sample.def.facade;
 
-import org.fugerit.java.core.db.daogen.BaseIdFinder;
+import org.fugerit.java.core.db.daogen.IdFinderNG;
 import org.fugerit.java.daogen.sample.def.model.ModelUpload;
 
 // custom import start ( code above here will be overwritten )
@@ -15,25 +15,11 @@
  * // custom code start ( code above here will be overwritten )
  * // custom code end ( code below here will be overwritten )
  */
-public class UploadFinder extends BaseIdFinder {
+public class UploadFinder extends IdFinderNG {
 
 	// custom code start ( code above here will be overwritten )
 	// custom code end ( code below here will be overwritten )
 
-	private static final long serialVersionUID = 596269532220L;
-
-	private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
-		// this class is conditionally serializable, depending on contained object
-		// special situation can be handled using this method in future
-		out.defaultWriteObject();
-	}
-
-	private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
-		// this class is conditionally serializable, depending on contained object
-		// special situation can be handled using this method in future
-		in.defaultReadObject();
-	}
-
 	private ModelUpload model;
 
 	public void setModel( ModelUpload model ) {

diff --git a/fj-daogen-sample/src/main/java/org/fugerit/java/daogen/sample/def/facade/UserDataFinder.java b/fj-daogen-sample/src/main/java/org/fugerit/java/daogen/sample/def/facade/UserDataFinder.java
@@ -1,6 +1,6 @@
 package org.fugerit.java.daogen.sample.def.facade;
 
-import org.fugerit.java.core.db.daogen.BaseIdFinder;
+import org.fugerit.java.core.db.daogen.IdFinderNG;
 import org.fugerit.java.daogen.sample.def.model.ModelUserData;
 
 // custom import start ( code above here will be overwritten )
@@ -15,25 +15,11 @@
  * // custom code start ( code above here will be overwritten )
  * // custom code end ( code below here will be overwritten )
  */
-public class UserDataFinder extends BaseIdFinder {
+public class UserDataFinder extends IdFinderNG {
 
 	// custom code start ( code above here will be overwritten )
 	// custom code end ( code below here will be overwritten )
 
-	private static final long serialVersionUID = 338411557691L;
-
-	private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
-		// this class is conditionally serializable, depending on contained object
-		// special situation can be handled using this method in future
-		out.defaultWriteObject();
-	}
-
-	private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
-		// this class is conditionally serializable, depending on contained object
-		// special situation can be handled using this method in future
-		in.defaultReadObject();
-	}
-
 	private ModelUserData model;
 
 	public void setModel( ModelUserData model ) {

diff --git a/fj-daogen-sample/src/main/java/org/fugerit/java/daogen/sample/def/facade/UserFinder.java b/fj-daogen-sample/src/main/java/org/fugerit/java/daogen/sample/def/facade/UserFinder.java
@@ -1,6 +1,6 @@
 package org.fugerit.java.daogen.sample.def.facade;
 
-import org.fugerit.java.core.db.daogen.BaseIdFinder;
+import org.fugerit.java.core.db.daogen.IdFinderNG;
 import org.fugerit.java.daogen.sample.def.model.ModelUser;
 
 // custom import start ( code above here will be overwritten )
@@ -15,25 +15,11 @@
  * // custom code start ( code above here will be overwritten )
  * // custom code end ( code below here will be overwritten )
  */
-public class UserFinder extends BaseIdFinder {
+public class UserFinder extends IdFinderNG {
 
 	// custom code start ( code above here will be overwritten )
 	// custom code end ( code below here will be overwritten )
 
-	private static final long serialVersionUID = 657787973072L;
-
-	private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
-		// this class is conditionally serializable, depending on contained object
-		// special situation can be handled using this method in future
-		out.defaultWriteObject();
-	}
-
-	private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
-		// this class is conditionally serializable, depending on contained object
-		// special situation can be handled using this method in future
-		in.defaultReadObject();
-	}
-
 	private ModelUser model;
 
 	public void setModel( ModelUser model ) {

diff --git a/fj-daogen-sample/src/main/java/org/fugerit/java/daogen/sample/def/model/ModelAddress.java b/fj-daogen-sample/src/main/java/org/fugerit/java/daogen/sample/def/model/ModelAddress.java
@@ -81,7 +81,7 @@ public interface ModelAddress extends org.fugerit.java.core.lang.compare.CheckEm
 	 *
 	 * @return the value of dateInsert
 	 */
-	java.util.Date getDateInsert();
+	java.time.LocalDateTime getDateInsert();
 
 	/**
 	 * Setter method for property : dateInsert (nullable: yes)
@@ -90,7 +90,7 @@ public interface ModelAddress extends org.fugerit.java.core.lang.compare.CheckEm
 	 *
 	 * @param value the value of dateInsert
 	 */
-	void setDateInsert( java.util.Date value );
+	void setDateInsert( java.time.LocalDateTime value );
 
 	/**
 	 * Getter method for property : dateUpdate (nullable: yes)
@@ -99,7 +99,7 @@ public interface ModelAddress extends org.fugerit.java.core.lang.compare.CheckEm
 	 *
 	 * @return the value of dateUpdate
 	 */
-	java.util.Date getDateUpdate();
+	java.time.LocalDateTime getDateUpdate();
 
 	/**
 	 * Setter method for property : dateUpdate (nullable: yes)
@@ -108,7 +108,7 @@ public interface ModelAddress extends org.fugerit.java.core.lang.compare.CheckEm
 	 *
 	 * @param value the value of dateUpdate
 	 */
-	void setDateUpdate( java.util.Date value );
+	void setDateUpdate( java.time.LocalDateTime value );
 
 	/**
 	 * Getter method for property : info (nullable: no)

diff --git a/fj-daogen-sample/src/main/java/org/fugerit/java/daogen/sample/def/model/ModelLogData.java b/fj-daogen-sample/src/main/java/org/fugerit/java/daogen/sample/def/model/ModelLogData.java
@@ -45,7 +45,7 @@ public interface ModelLogData extends org.fugerit.java.core.lang.compare.CheckEm
 	 *
 	 * @return the value of logTime
 	 */
-	java.util.Date getLogTime();
+	java.time.LocalDateTime getLogTime();
 
 	/**
 	 * Setter method for property : logTime (nullable: yes)
@@ -54,7 +54,7 @@ public interface ModelLogData extends org.fugerit.java.core.lang.compare.CheckEm
 	 *
 	 * @param value the value of logTime
 	 */
-	void setLogTime( java.util.Date value );
+	void setLogTime( java.time.LocalDateTime value );
 
 	/**
 	 * Getter method for property : info (nullable: no)

diff --git a/fj-daogen-sample/src/main/java/org/fugerit/java/daogen/sample/def/model/ModelUpload.java b/fj-daogen-sample/src/main/java/org/fugerit/java/daogen/sample/def/model/ModelUpload.java
@@ -45,7 +45,7 @@ public interface ModelUpload extends org.fugerit.java.core.lang.compare.CheckEmp
 	 *
 	 * @return the value of dateInsert
 	 */
-	java.util.Date getDateInsert();
+	java.time.LocalDateTime getDateInsert();
 
 	/**
 	 * Setter method for property : dateInsert (nullable: yes)
@@ -54,7 +54,7 @@ public interface ModelUpload extends org.fugerit.java.core.lang.compare.CheckEmp
 	 *
 	 * @param value the value of dateInsert
 	 */
-	void setDateInsert( java.util.Date value );
+	void setDateInsert( java.time.LocalDateTime value );
 
 	/**
 	 * Getter method for property : dateUpdate (nullable: yes)
@@ -63,7 +63,7 @@ public interface ModelUpload extends org.fugerit.java.core.lang.compare.CheckEmp
 	 *
 	 * @return the value of dateUpdate
 	 */
-	java.util.Date getDateUpdate();
+	java.time.LocalDateTime getDateUpdate();
 
 	/**
 	 * Setter method for property : dateUpdate (nullable: yes)
@@ -72,7 +72,7 @@ public interface ModelUpload extends org.fugerit.java.core.lang.compare.CheckEmp
 	 *
 	 * @param value the value of dateUpdate
 	 */
-	void setDateUpdate( java.util.Date value );
+	void setDateUpdate( java.time.LocalDateTime value );
 
 	/**
 	 * Getter method for property : content (nullable: yes)

diff --git a/fj-daogen-sample/src/main/java/org/fugerit/java/daogen/sample/def/model/ModelUser.java b/fj-daogen-sample/src/main/java/org/fugerit/java/daogen/sample/def/model/ModelUser.java
@@ -99,7 +99,7 @@ public interface ModelUser extends org.fugerit.java.core.lang.compare.CheckEmpty
 	 *
 	 * @return the value of lastLogin
 	 */
-	java.util.Date getLastLogin();
+	java.time.LocalDateTime getLastLogin();
 
 	/**
 	 * Setter method for property : lastLogin (nullable: yes)
@@ -108,7 +108,7 @@ public interface ModelUser extends org.fugerit.java.core.lang.compare.CheckEmpty
 	 *
 	 * @param value the value of lastLogin
 	 */
-	void setLastLogin( java.util.Date value );
+	void setLastLogin( java.time.LocalDateTime value );
 
 	/**
 	 * Getter method for property : dateInsert (nullable: yes)
@@ -117,7 +117,7 @@ public interface ModelUser extends org.fugerit.java.core.lang.compare.CheckEmpty
 	 *
 	 * @return the value of dateInsert
 	 */
-	java.util.Date getDateInsert();
+	java.time.LocalDateTime getDateInsert();
 
 	/**
 	 * Setter method for property : dateInsert (nullable: yes)
@@ -126,7 +126,7 @@ public interface ModelUser extends org.fugerit.java.core.lang.compare.CheckEmpty
 	 *
 	 * @param value the value of dateInsert
 	 */
-	void setDateInsert( java.util.Date value );
+	void setDateInsert( java.time.LocalDateTime value );
 
 	/**
 	 * Getter method for property : dateUpdate (nullable: yes)
@@ -135,7 +135,7 @@ public interface ModelUser extends org.fugerit.java.core.lang.compare.CheckEmpty
 	 *
 	 * @return the value of dateUpdate
 	 */
-	java.util.Date getDateUpdate();
+	java.time.LocalDateTime getDateUpdate();
 
 	/**
 	 * Setter method for property : dateUpdate (nullable: yes)
@@ -144,7 +144,7 @@ public interface ModelUser extends org.fugerit.java.core.lang.compare.CheckEmpty
 	 *
 	 * @param value the value of dateUpdate
 	 */
-	void setDateUpdate( java.util.Date value );
+	void setDateUpdate( java.time.LocalDateTime value );
 
 	/**
 	 * Getter method for property : state (nullable: no)