Code optimization

fugerit79 · fugerit79 · commit 9f4cc1796a33 · 2023-09-24T21:19:27.000+02:00
diff --git a/fj-daogen-sample/src/main/java/org/fugerit/java/daogen/sample/helper/ServiceProviderHelper.java b/fj-daogen-sample/src/main/java/org/fugerit/java/daogen/sample/helper/ServiceProviderHelper.java
@@ -5,8 +5,8 @@
 import org.fugerit.java.core.db.daogen.CloseableDAOContext;
 import org.fugerit.java.core.db.daogen.CloseableDAOContextSC;
 import org.fugerit.java.core.db.daogen.SimpleServiceProvider;
+import org.fugerit.java.daogen.sample.def.facade.FugeritLogicFacadeHelper;
 import org.fugerit.java.daogen.sample.impl.facade.data.FugeritDataLogicFacade;
-import org.fugerit.java.daogen.sample.impl.facade.data.FugeritDataLogicFacadeHelper;
 import org.fugerit.java.test.db.helper.MemDBHelper;
 
 public class ServiceProviderHelper<T> extends SimpleServiceProvider<T> {
@@ -24,7 +24,7 @@ protected CloseableDAOContext newDefaultContext() throws DAOException {
 			 * The object asking for the context is responsible for closing it.
 			 */
 			context = new CloseableDAOContextSC( MemDBHelper.newConnection() );		// NOSONAR
-			context.setAttribute( FugeritDataLogicFacadeHelper.ATT_NAME, new FugeritDataLogicFacade() );
+			context.setAttribute( FugeritLogicFacadeHelper.ATT_NAME, new FugeritDataLogicFacade() );
 			return context;	
 		} catch (Exception e) {
 			if ( context != null ) {
diff --git a/fj-daogen-sample/src/main/java/org/fugerit/java/daogen/sample/impl/struct/ObjAddress.java b/fj-daogen-sample/src/main/java/org/fugerit/java/daogen/sample/impl/struct/ObjAddress.java
@@ -44,7 +44,7 @@ public ObjAddress() {
 
 	@Override
 	public Map<String, Class<?>> newTypeMapper() throws SQLException {
-		Map<String, Class<?>> map = new HashMap<String, Class<?>>();
+		Map<String, Class<?>> map = new HashMap<>();
 		map.put( SQL_TYPE_NAME, ObjAddress.class );
 		return map;
 	}
diff --git a/fj-daogen-sample/src/main/java/org/fugerit/java/daogen/sample/impl/struct/ObjLogData.java b/fj-daogen-sample/src/main/java/org/fugerit/java/daogen/sample/impl/struct/ObjLogData.java
@@ -44,7 +44,7 @@ public ObjLogData() {
 
 	@Override
 	public Map<String, Class<?>> newTypeMapper() throws SQLException {
-		Map<String, Class<?>> map = new HashMap<String, Class<?>>();
+		Map<String, Class<?>> map = new HashMap<>();
 		map.put( SQL_TYPE_NAME, ObjLogData.class );
 		return map;
 	}
diff --git a/fj-daogen-sample/src/main/java/org/fugerit/java/daogen/sample/impl/struct/ObjTestTwoFieldKey.java b/fj-daogen-sample/src/main/java/org/fugerit/java/daogen/sample/impl/struct/ObjTestTwoFieldKey.java
@@ -44,7 +44,7 @@ public ObjTestTwoFieldKey() {
 
 	@Override
 	public Map<String, Class<?>> newTypeMapper() throws SQLException {
-		Map<String, Class<?>> map = new HashMap<String, Class<?>>();
+		Map<String, Class<?>> map = new HashMap<>();
 		map.put( SQL_TYPE_NAME, ObjTestTwoFieldKey.class );
 		return map;
 	}
diff --git a/fj-daogen-sample/src/main/java/org/fugerit/java/daogen/sample/impl/struct/ObjUpload.java b/fj-daogen-sample/src/main/java/org/fugerit/java/daogen/sample/impl/struct/ObjUpload.java
@@ -44,7 +44,7 @@ public ObjUpload() {
 
 	@Override
 	public Map<String, Class<?>> newTypeMapper() throws SQLException {
-		Map<String, Class<?>> map = new HashMap<String, Class<?>>();
+		Map<String, Class<?>> map = new HashMap<>();
 		map.put( SQL_TYPE_NAME, ObjUpload.class );
 		return map;
 	}
@@ -92,9 +92,7 @@ public void setupLobs( java.sql.Connection conn ) throws SQLException {
 
 	public static ObjUpload wrap( ModelUpload model, java.sql.Connection conn ) throws SQLException {
 		ObjUpload res = wrap( model );
-		if ( res != null ) {
 			res.setupLobs( conn );
-		}
 		return res;
 	}
 
diff --git a/fj-daogen-sample/src/main/java/org/fugerit/java/daogen/sample/impl/struct/ObjUser.java b/fj-daogen-sample/src/main/java/org/fugerit/java/daogen/sample/impl/struct/ObjUser.java
@@ -44,7 +44,7 @@ public ObjUser() {
 
 	@Override
 	public Map<String, Class<?>> newTypeMapper() throws SQLException {
-		Map<String, Class<?>> map = new HashMap<String, Class<?>>();
+		Map<String, Class<?>> map = new HashMap<>();
 		map.put( SQL_TYPE_NAME, ObjUser.class );
 		return map;
 	}
diff --git a/fj-daogen-sample/src/main/java/org/fugerit/java/daogen/sample/impl/struct/ObjUserData.java b/fj-daogen-sample/src/main/java/org/fugerit/java/daogen/sample/impl/struct/ObjUserData.java
@@ -44,7 +44,7 @@ public ObjUserData() {
 
 	@Override
 	public Map<String, Class<?>> newTypeMapper() throws SQLException {
-		Map<String, Class<?>> map = new HashMap<String, Class<?>>();
+		Map<String, Class<?>> map = new HashMap<>();
 		map.put( SQL_TYPE_NAME, ObjUserData.class );
 		return map;
 	}
diff --git a/fj-daogen-sample/src/main/java/org/fugerit/java/test/db/helper/MemDBHelper.java b/fj-daogen-sample/src/main/java/org/fugerit/java/test/db/helper/MemDBHelper.java
@@ -10,8 +10,12 @@
 import java.sql.Statement;
 import java.util.Properties;
 
+import org.fugerit.java.core.db.dao.DAORuntimeException;
+
 public class MemDBHelper {
 
+	private MemDBHelper() {} 
+	
 	public static final String DEFAULT_DB_CONN_PATH = "test/memdb/base-db-conn.properties";
 	public static final String DEFAULT_DB_INIT_PATH = "test/memdb/base_db_init.sql";
 
@@ -23,28 +27,32 @@ public class MemDBHelper {
 
 	private static Properties cf;
 	
-	private static Connection newConnection( Properties props ) throws Exception {
-		Class.forName( props.getProperty( DRV ) );
-		return DriverManager.getConnection( props.getProperty( URL ), props.getProperty( USR ), props.getProperty( PWD ) );
+	private static Connection newConnection( Properties props ) {
+		return DAORuntimeException.get( () -> {
+			Class.forName( props.getProperty( DRV ) );
+			return DriverManager.getConnection( props.getProperty( URL ), props.getProperty( USR ), props.getProperty( PWD ) );	
+		} );
 	}
 
-    public static void init() throws Exception
+    public static void init()
     {
     	if ( cf == null ) {
-    		try ( InputStream is = MemDBHelper.class.getClassLoader().getResourceAsStream( DEFAULT_DB_CONN_PATH ) ) {
-    			Properties props = new Properties();
-    			props.load( is );
-            	try ( Connection conn = newConnection( props ) ) {
-            		try ( SQLScriptReader reader = new SQLScriptReader( MemDBHelper.class.getClassLoader().getResourceAsStream( DEFAULT_DB_INIT_PATH ) ) ) {
-            			executeAll(reader, conn);
-            			cf = props;
-            		}
+    		DAORuntimeException.apply( () -> {
+        		try ( InputStream is = MemDBHelper.class.getClassLoader().getResourceAsStream( DEFAULT_DB_CONN_PATH ) ) {
+        			Properties props = new Properties();
+        			props.load( is );
+                	try ( Connection conn = newConnection( props ) ) {
+                		try ( SQLScriptReader reader = new SQLScriptReader( MemDBHelper.class.getClassLoader().getResourceAsStream( DEFAULT_DB_INIT_PATH ) ) ) {
+                			executeAll(reader, conn);
+                			cf = props;
+                		}
+            		}	
         		}	
-    		}
+    		});
     	}
     } 
     
-    public static Connection newConnection() throws Exception {
+    public static Connection newConnection() {
     	init();
     	return newConnection( cf );
     }
diff --git a/fj-daogen-sample/src/main/resources/test/memdb/base_db_init.sql b/fj-daogen-sample/src/main/resources/test/memdb/base_db_init.sql
@@ -1,11 +1,11 @@
-SET DATABASE SQL SYNTAX PGS TRUE;
+SET DATABASE SQL SYNTAX ORA TRUE;
 
 CREATE SCHEMA fugerit;
 
 CREATE TABLE fugerit.user (
 	id bigint NOT NULL,
-	username VARCHAR(128) NOT NULL,
-	password VARCHAR(128) NOT NULL,
+	username VARCHAR2(128) NOT NULL,
+	password VARCHAR2(128) NOT NULL,
 	last_login TIMESTAMP,
 	date_insert TIMESTAMP,
 	date_update TIMESTAMP,
@@ -26,7 +26,7 @@ CREATE TABLE fugerit.address (
 	id_user bigint NOT NULL,
 	date_insert TIMESTAMP,
 	date_update TIMESTAMP,	
-	info VARCHAR(256) NOT NULL
+	info VARCHAR2(256) NOT NULL
 	
 );
 ALTER TABLE fugerit.address ADD CONSTRAINT addresses_pk PRIMARY KEY ( id );
@@ -50,23 +50,25 @@ COMMENT ON TABLE fugerit.upload IS 'Contains upload blob';
 CREATE TABLE fugerit.log_data (
 	id bigint NOT NULL,
 	log_time TIMESTAMP,
-	info VARCHAR(128) NOT NULL
+	info VARCHAR2(128) NOT NULL
 );
 
 CREATE TABLE fugerit.test_two_field_key (
 	id_one bigint NOT NULL,
 	id_two bigint NOT NULL,
-	info VARCHAR(128) NOT NULL
+	info VARCHAR2(128) NOT NULL
 );
 ALTER TABLE fugerit.test_two_field_key ADD CONSTRAINT test_two_field_key_pk PRIMARY KEY ( id_one, id_two );
 
 CREATE SEQUENCE seq_test START WITH 1;
 
-INSERT INTO fugerit.user ( id, username, password, last_login, state ) VALUES ( nextval('seq_test'), 'user1', 'a3f8h5h4h3n3n1n9', sysdate, 1 );
-INSERT INTO fugerit.user ( id, username, password, last_login, state ) VALUES ( nextval('seq_test'), 'user2', '5h4h3n3n1n9a3f8h', sysdate, 0 );
+INSERT INTO fugerit.user ( id, username, password, last_login, state ) VALUES ( seq_test.nextval, 'user1', 'a3f8h5h4h3n3n1n9', sysdate, 1 );
+INSERT INTO fugerit.user ( id, username, password, last_login, state ) VALUES ( seq_test.nextval, 'user2', '5h4h3n3n1n9a3f8h', sysdate, 0 );
+
+INSERT INTO fugerit.address ( id, id_user, info ) VALUES ( seq_test.nextval, 1, 'test address 01' );
+INSERT INTO fugerit.address ( id, id_user, info ) VALUES ( seq_test.nextval, 2, 'test address 02' );
+INSERT INTO fugerit.address ( id, id_user, info ) VALUES ( seq_test.nextval, 1, 'test address 03' );
 
-INSERT INTO fugerit.address ( id, id_user, info ) VALUES ( nextval('seq_test'), 1, 'test address 01' );
-INSERT INTO fugerit.address ( id, id_user, info ) VALUES ( nextval('seq_test'), 2, 'test address 02' );
-INSERT INTO fugerit.address ( id, id_user, info ) VALUES ( nextval('seq_test'), 1, 'test address 03' );
+INSERT INTO fugerit.test_two_field_key ( id_one, id_two, info ) VALUES ( seq_test.nextval, seq_test.nextval, 'test info 01' );
 
-INSERT INTO fugerit.test_two_field_key ( id_one, id_two, info ) VALUES ( nextval('seq_test'), nextval('seq_test'), 'test info 01' );
+SET DATABASE SQL SYNTAX PGS TRUE;

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public ObjAddress() {`
`44`	`44`
`45`	`45`	`@Override`
`46`	`46`	`public Map<String, Class<?>> newTypeMapper() throws SQLException {`
`47`		`- Map<String, Class<?>> map = new HashMap<String, Class<?>>();`
	`47`	`+ Map<String, Class<?>> map = new HashMap<>();`
`48`	`48`	`map.put( SQL_TYPE_NAME, ObjAddress.class );`
`49`	`49`	`return map;`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public ObjLogData() {`
`44`	`44`
`45`	`45`	`@Override`
`46`	`46`	`public Map<String, Class<?>> newTypeMapper() throws SQLException {`
`47`		`- Map<String, Class<?>> map = new HashMap<String, Class<?>>();`
	`47`	`+ Map<String, Class<?>> map = new HashMap<>();`
`48`	`48`	`map.put( SQL_TYPE_NAME, ObjLogData.class );`
`49`	`49`	`return map;`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public ObjTestTwoFieldKey() {`
`44`	`44`
`45`	`45`	`@Override`
`46`	`46`	`public Map<String, Class<?>> newTypeMapper() throws SQLException {`
`47`		`- Map<String, Class<?>> map = new HashMap<String, Class<?>>();`
	`47`	`+ Map<String, Class<?>> map = new HashMap<>();`
`48`	`48`	`map.put( SQL_TYPE_NAME, ObjTestTwoFieldKey.class );`
`49`	`49`	`return map;`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public ObjUser() {`
`44`	`44`
`45`	`45`	`@Override`
`46`	`46`	`public Map<String, Class<?>> newTypeMapper() throws SQLException {`
`47`		`- Map<String, Class<?>> map = new HashMap<String, Class<?>>();`
	`47`	`+ Map<String, Class<?>> map = new HashMap<>();`
`48`	`48`	`map.put( SQL_TYPE_NAME, ObjUser.class );`
`49`	`49`	`return map;`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public ObjUserData() {`
`44`	`44`
`45`	`45`	`@Override`
`46`	`46`	`public Map<String, Class<?>> newTypeMapper() throws SQLException {`
`47`		`- Map<String, Class<?>> map = new HashMap<String, Class<?>>();`
	`47`	`+ Map<String, Class<?>> map = new HashMap<>();`
`48`	`48`	`map.put( SQL_TYPE_NAME, ObjUserData.class );`
`49`	`49`	`return map;`
`50`	`50`	`}`