Fix sonar cloud issues

Author: fugerit79

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

@@ -81,13 +81,17 @@ protected static DataListCatalogConfig loadConfig( InputStream is, DataListCatal
 	}
 
 	/**
-	 * Worker method for loading an xml from an input stream
+	 * <p>Creates and configure an instance of DataListCatalogConfig</p>
 	 * 
-	 * @param is			input source
-	 * @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
+	 * @return			the configured instance
+	 * @throws 			ConfigRuntimeException in case of issues during loading
 	 */
-	public static DataListCatalogConfig loadConfig( InputStream is ) throws Exception {
+	public static DataListCatalogConfig loadConfig( InputStream is ) {
 		return loadConfig( is, new DataListCatalogConfig() );
 	}
 

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

@@ -4,10 +4,6 @@
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 import org.fugerit.java.core.io.helper.HelperIOException;
 
@@ -24,16 +20,7 @@ public static String removeSqlComments( String script ) throws IOException {
 	}
 
 	public static String[] parseSqlCommands( String script ) throws IOException {	
-		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] );	
-		} );
+		return HelperIOException.get( () -> script.split( "(?<=;)\\s+" ) );
 
 	}
 

fj-core/src/main/java/org/fugerit/java/core/xml/config/XMLSchemaCatalogConfig.java

@@ -19,6 +19,7 @@
 import javax.xml.validation.Validator;
 
 import org.fugerit.java.core.cfg.ConfigException;
+import org.fugerit.java.core.cfg.ConfigRuntimeException;
 import org.fugerit.java.core.cfg.xml.DataListCatalogConfig;
 import org.fugerit.java.core.function.SafeFunction;
 import org.fugerit.java.core.io.helper.StreamHelper;
@@ -51,7 +52,18 @@ private void readObject(java.io.ObjectInputStream in) throws IOException, ClassN
 
 	// code added to setup a basic conditional serialization - END	
 
-	public static XMLSchemaCatalogConfig loadConfigSchema( InputStream is ) throws Exception {
+	/**
+	 * <p>Creates and configure an instance of XMLSchemaCatalogConfig</p>
+	 * 
+	 * <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
+	 * @return			the configured instance
+	 * @throws 			ConfigRuntimeException in case of issues during loading
+	 */
+	public static XMLSchemaCatalogConfig loadConfigSchema( InputStream is ) {
 		return (XMLSchemaCatalogConfig)loadConfig( is, new XMLSchemaCatalogConfig() );
 	}
 

fj-core/src/test/java/test/org/fugerit/java/core/db/helpers/TestSQLScriptFacade.java

@@ -0,0 +1,42 @@
+package test.org.fugerit.java.core.db.helpers;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.sql.Connection;
+
+import org.fugerit.java.core.db.helpers.SQLScriptFacade;
+import org.fugerit.java.core.db.helpers.SQLScriptReader;
+import org.fugerit.java.core.function.SafeFunction;
+import org.fugerit.java.core.io.StreamIO;
+import org.fugerit.java.core.lang.helpers.ClassHelper;
+import org.junit.Assert;
+import org.junit.Test;
+
+import lombok.extern.slf4j.Slf4j;
+import test.org.fugerit.java.core.db.TestBasicDBHelper;
+
+@Slf4j
+public class TestSQLScriptFacade extends TestBasicDBHelper {
+
+	@Test
+	public void testReadScripts() {
+		SafeFunction.apply( () -> {
+			try ( InputStream is = ClassHelper.loadFromDefaultClassLoader( "test/memdb/base_db_init.sql" ) ) {
+				String script = StreamIO.readString( is );
+				log.info( "script -> {}", script );
+				String[] res = SQLScriptFacade.parseScript(script);
+				for ( int k=0; k<res.length; k++ ) {
+					log.info( "current {} -> {}", k, res[k] );
+				}
+				Assert.assertNotEquals( 0 , res.length );
+				// test sql script
+				try ( SQLScriptReader reader = new SQLScriptReader( new ByteArrayInputStream( "SELECT * FROM fugerit.user;".getBytes() ) );
+						Connection conn = newConnection() ) {
+					SQLScriptFacade.executeAll( reader , conn );
+				}
+				
+			}
+		} );
+	}
+	
+}