Inlining DynamicParameterListBuilder

Author: pesse

src/main/java/org/utplsql/api/db/DynamicParameterList.java

@@ -88,4 +88,46 @@ public void setParamsStartWithIndex(CallableStatement statement, int startIndex
         }
     }
 
+    public static DynamicParameterListBuilder builder() {
+        return new DynamicParameterListBuilder();
+    }
+
+    public static class DynamicParameterListBuilder {
+
+        private LinkedHashMap<String, DynamicParameterList.DynamicParameter> params = new LinkedHashMap<>();
+        private boolean addIfNullOrEmpty = true;
+
+        private DynamicParameterListBuilder() {
+
+        }
+
+        public DynamicParameterListBuilder onlyAddIfNotEmpty() {
+            addIfNullOrEmpty = false;
+            return this;
+        }
+
+        public DynamicParameterListBuilder add(String identifier, String value ) {
+            if ( addIfNullOrEmpty || (value != null && !value.isEmpty()) ) {
+                params.put(identifier, new DynamicParameterList.DynamicStringParameter(value));
+            }
+            return this;
+        }
+        public DynamicParameterListBuilder add(String identifier, Integer value ) {
+            if ( addIfNullOrEmpty || (value != null)) {
+                params.put(identifier, new DynamicParameterList.DynamicIntegerParameter(value));
+            }
+            return this;
+        }
+        public DynamicParameterListBuilder add(String identifier, Object[] value, String customTypeName, OracleConnection oraConnection ) {
+            if ( addIfNullOrEmpty || (value != null && value.length > 0 )) {
+                params.put(identifier, new DynamicParameterList.DynamicArrayParameter(value, customTypeName, oraConnection));
+            }
+            return this;
+        }
+
+        public DynamicParameterList build() {
+            return new DynamicParameterList(params);
+        }
+    }
+
 }

src/main/java/org/utplsql/api/db/DynamicParameterListBuilder.java

@@ -10,7 +10,6 @@
 import org.utplsql.api.FileMapping;
 import org.utplsql.api.KeyValuePair;
 import org.utplsql.api.db.DynamicParameterList;
-import org.utplsql.api.db.DynamicParameterListBuilder;
 
 import java.sql.*;
 import java.util.*;
@@ -44,7 +43,7 @@ private static Array buildFileMappingArray(
             typeMapArray = mapperOptions.getTypeMappings().toArray();
         }
 
-        DynamicParameterList parameterList =  DynamicParameterListBuilder.create()
+        DynamicParameterList parameterList =  DynamicParameterList.builder()
                 .add("a_file_paths", filePathsArray, CustomTypes.UT_VARCHAR2_LIST, oraConn)
                 .onlyAddIfNotEmpty()
                 .add("a_object_owner", mapperOptions.getObjectOwner())

src/main/java/org/utplsql/api/testRunner/FileMapper.java

@@ -19,7 +19,7 @@ void call_with_three_different_types() throws SQLException {
 
         Object[] numArr = new Object[]{1, 2};
 
-        DynamicParameterList parameterList = DynamicParameterListBuilder.create()
+        DynamicParameterList parameterList = DynamicParameterList.builder()
                 .add("a_object_owner", "MyOwner")
                 .add("a_num_param", 123)
                 .add("a_num_array", numArr, "MY_NUM_ARR", mockedConn)
@@ -41,7 +41,7 @@ void when_not_accept_empty_filter_empty_elements() throws SQLException {
         CallableStatement mockedStatement = mock(CallableStatement.class);
         OracleConnection mockedConn = mock(OracleConnection.class);
 
-        DynamicParameterList parameterList = DynamicParameterListBuilder.create()
+        DynamicParameterList parameterList = DynamicParameterList.builder()
                 .onlyAddIfNotEmpty()
                 .add("a_object_owner", (String)null)
                 .add("a_num_param", (Integer)null)