Remove sonar cloud issues

Author: fugerit79

fj-core/src/main/java/org/fugerit/java/core/cfg/xml/DataListCatalogConfig.java

@@ -2,6 +2,8 @@
 
 import java.io.InputStream;
 
+import org.fugerit.java.core.cfg.ConfigRuntimeException;
+import org.fugerit.java.core.function.SafeFunction;
 import org.fugerit.java.core.xml.dom.DOMIO;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -58,18 +60,24 @@ public class DataListCatalogConfig extends GenericListCatalogConfig<String> {
 	private static final long serialVersionUID = 60670717619176336L;
 
 	/**
-	 * Worker method for loading an xml from an input stream
+	 * <p>Configure an instance of DataListCatalogConfig</p>
 	 * 
-	 * @param is			input source
-	 * @param config		config object
-	 * @return				the object configured
-	 * @throws Exception	in case of issues
+	 * <p>NOTE: starting from version 8.4.X java.lang.Exception removed in favor of org.fugerit.java.core.cfg.ConfigRuntimeException.</p>
+	 * 
+	 * @see <a href="https://fuzzymemory.fugerit.org/src/docs/sonar_cloud/java-S112.html">Define and throw a dedicated exception instead of using a generic one.</a>
+	 * 
+	 * @param is		the input stream to load from
+	 * @param config	the instance to be configured (will be configured by side effect too)
+	 * @return			the configured instance
+	 * @throws 			ConfigRuntimeException in case of issues during loading
 	 */
-	protected static DataListCatalogConfig loadConfig( InputStream is, DataListCatalogConfig config ) throws Exception {
-		Document doc = DOMIO.loadDOMDoc( is );
-		Element root = doc.getDocumentElement();
-		config.configure( root );
-		return config;
+	protected static DataListCatalogConfig loadConfig( InputStream is, DataListCatalogConfig config ) {
+		return SafeFunction.get( () -> {
+			Document doc = DOMIO.loadDOMDoc( is );
+			Element root = doc.getDocumentElement();
+			config.configure( root );
+			return config;
+		} );
 	}
 
 	/**

fj-core/src/main/java/org/fugerit/java/core/db/dao/BasicDAO.java

@@ -308,8 +308,7 @@ protected List<T> loadAll(String query, FieldList fields, RSExtractor<T> re) thr
 	}
 
 	protected LoadResult<T> loadAllResult(String query, FieldList fields, RSExtractor<T> re) throws DAOException {
-		return LoadResult.initResult(this, query, fields, re);
-
+		return DAOException.get( () -> LoadResult.initResult(this, query, fields, re) );
 	}
 
 	protected void loadAll(List<T> l, String query, FieldList fields, RSExtractor<T> re) throws DAOException {

fj-core/src/main/java/org/fugerit/java/core/db/daogen/ByteArrayDataHandler.java

@@ -15,11 +15,13 @@ public abstract class ByteArrayDataHandler {
 	public abstract byte[] getData();
 
 	public static ByteArrayDataHandler newHandlerByte( byte[] data ) throws DAOException {
-		ByteArrayDataHandler r = null;
-		if ( data != null ) {
-			r = new PreloadByteArrayDataHandler( data );
-		}
-		return r;
+		return DAOException.get( () -> {
+			ByteArrayDataHandler r = null;
+			if ( data != null ) {
+				r = new PreloadByteArrayDataHandler( data );
+			}
+			return r;
+		} );
 	}
 
 	public static ByteArrayDataHandler newHandlerDefault( Blob b ) throws DAOException {

fj-core/src/main/java/org/fugerit/java/core/db/daogen/CharArrayDataHandler.java

@@ -16,11 +16,13 @@ public abstract class CharArrayDataHandler {
 	public abstract char[] getData();
 
 	public static CharArrayDataHandler newHandlerByte( char[] data ) throws DAOException {
-		CharArrayDataHandler r = null;
-		if ( data != null ) {
-			r = new PreloadCharArrayDataHandler( data );
-		}
-		return r;
+		return DAOException.get( () -> {
+			CharArrayDataHandler r = null;
+			if ( data != null ) {
+				r = new PreloadCharArrayDataHandler( data );
+			}
+			return r;
+		} );
 	}
 
 	public static CharArrayDataHandler newHandlerDefault( Clob c ) throws DAOException {
@@ -33,8 +35,8 @@ public String toString() {
 	}
 
 	public static CharArrayDataHandler newHandlerPreload( Clob c ) throws DAOException {
-		CharArrayDataHandler handler = null;
-		try {
+		return DAOException.get( () -> {
+			CharArrayDataHandler handler = null;
 			if ( c != null && c.length() > 0 ) {
 				CharArrayWriter writer = new CharArrayWriter();
 				StreamIO.pipeChar( c.getCharacterStream(), writer, StreamIO.MODE_CLOSE_BOTH );
@@ -43,10 +45,8 @@ public static CharArrayDataHandler newHandlerPreload( Clob c ) throws DAOExcepti
 					handler = new PreloadCharArrayDataHandler( data );
 				}
 			}	
-		} catch (Exception e) {
-			throw DAOException.convertExMethod( "newHandlerPreload" , e);
-		}
-		return handler;
+			return handler;
+		} );
 	}
 
 }

fj-core/src/main/java/org/fugerit/java/core/db/helpers/SQLScriptFacade.java

@@ -9,6 +9,8 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.fugerit.java.core.io.helper.HelperIOException;
+
 public class SQLScriptFacade {
 
 	private SQLScriptFacade() {}
@@ -18,18 +20,21 @@ public static String[] parseScript( String script ) throws IOException {
 	}
 
 	public static String removeSqlComments( String script ) throws IOException {
-		return script.replaceAll("\\B--*\\B.*", "");
+		return HelperIOException.get( () -> script.replaceAll("\\B--*\\B.*", "") );
 	}
 
 	public static String[] parseSqlCommands( String script ) throws IOException {	
-		Pattern regex = Pattern.compile("/\\*[^;(\\*/)]*?(;)[^;]*?\\*/", Pattern.DOTALL | Pattern.MULTILINE);
-	    Matcher regexMatcher = regex.matcher( script );
-	    List<String> list = new ArrayList<>();
-	    while (regexMatcher.find()) {
-	        String match = regexMatcher.group();
-	        list.add( match );
-	    } 
-	    return list.toArray( new String[0] );
+		return HelperIOException.get( () -> {
+			Pattern regex = Pattern.compile("/\\*[^;(\\*/)]*?(;)[^;]*?\\*/", Pattern.DOTALL | Pattern.MULTILINE);
+		    Matcher regexMatcher = regex.matcher( script );
+		    List<String> list = new ArrayList<>();
+		    while (regexMatcher.find()) {
+		        String match = regexMatcher.group();
+		        list.add( match );
+		    } 
+		    return list.toArray( new String[0] );	
+		} );
+
 	}
 
 	public static int executeAll( SQLScriptReader reader, Connection conn ) throws SQLException, IOException {