Add addIfNotEmpty method, remove allowEmpty-flag

Author: pesse

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

@@ -65,7 +65,7 @@ public static DynamicParameterListBuilder builder() {
      * <pre>
      *  DynamicParameterList.builder()
      *      .add("parameter1", "StringParameter")
-     *      .add("parameter2", 123)
+     *      .addIfNotEmpty("parameter2", 123)
      *      .build();
      * </pre>
      *
@@ -74,32 +74,43 @@ public static DynamicParameterListBuilder builder() {
     public static class DynamicParameterListBuilder {
 
         private LinkedHashMap<String, DynamicParameterList.DynamicParameter> params = new LinkedHashMap<>();
-        private boolean addIfNullOrEmpty = true;
 
         private DynamicParameterListBuilder() {
 
         }
 
-        public DynamicParameterListBuilder onlyAddIfNotEmpty() {
-            addIfNullOrEmpty = false;
+        public DynamicParameterListBuilder add(String identifier, String value ) {
+            params.put(identifier, new DynamicParameterList.DynamicStringParameter(value));
             return this;
         }
 
-        public DynamicParameterListBuilder add(String identifier, String value ) {
-            if ( addIfNullOrEmpty || (value != null && !value.isEmpty()) ) {
-                params.put(identifier, new DynamicParameterList.DynamicStringParameter(value));
+        public DynamicParameterListBuilder addIfNotEmpty(String identifier, String value ) {
+            if ( value != null && !value.isEmpty() ) {
+                add(identifier, value);
             }
             return this;
         }
+
         public DynamicParameterListBuilder add(String identifier, Integer value ) {
-            if ( addIfNullOrEmpty || (value != null)) {
-                params.put(identifier, new DynamicParameterList.DynamicIntegerParameter(value));
+            params.put(identifier, new DynamicParameterList.DynamicIntegerParameter(value));
+            return this;
+        }
+
+        public DynamicParameterListBuilder addIfNotEmpty(String identifier, Integer value ) {
+            if ( value != null) {
+                add(identifier, 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));
+            params.put(identifier, new DynamicParameterList.DynamicArrayParameter(value, customTypeName, oraConnection));
+            return this;
+        }
+
+        public DynamicParameterListBuilder addIfNotEmpty(String identifier, Object[] value, String customTypeName, OracleConnection oraConnection ) {
+            if ( value != null && value.length > 0 ) {
+                add(identifier, value, customTypeName, oraConnection);
             }
             return this;
         }

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

@@ -45,13 +45,12 @@ private static Array buildFileMappingArray(
 
         DynamicParameterList parameterList =  DynamicParameterList.builder()
                 .add("a_file_paths", filePathsArray, CustomTypes.UT_VARCHAR2_LIST, oraConn)
-                .onlyAddIfNotEmpty()
-                .add("a_object_owner", mapperOptions.getObjectOwner())
-                .add("a_file_to_object_type_mapping", typeMapArray, CustomTypes.UT_KEY_VALUE_PAIRS, oraConn)
-                .add("a_regex_pattern", mapperOptions.getRegexPattern())
-                .add("a_object_owner_subexpression", mapperOptions.getOwnerSubExpression())
-                .add("a_object_name_subexpression", mapperOptions.getNameSubExpression())
-                .add("a_object_type_subexpression", mapperOptions.getTypeSubExpression())
+                .addIfNotEmpty("a_object_owner", mapperOptions.getObjectOwner())
+                .addIfNotEmpty("a_file_to_object_type_mapping", typeMapArray, CustomTypes.UT_KEY_VALUE_PAIRS, oraConn)
+                .addIfNotEmpty("a_regex_pattern", mapperOptions.getRegexPattern())
+                .addIfNotEmpty("a_object_owner_subexpression", mapperOptions.getOwnerSubExpression())
+                .addIfNotEmpty("a_object_name_subexpression", mapperOptions.getNameSubExpression())
+                .addIfNotEmpty("a_object_type_subexpression", mapperOptions.getTypeSubExpression())
                 .build();
 
         CallableStatement callableStatement = conn.prepareCall(

src/test/java/org/utplsql/api/db/DynamicParameterListTest.java

@@ -42,10 +42,9 @@ void when_not_accept_empty_filter_empty_elements() throws SQLException {
         OracleConnection mockedConn = mock(OracleConnection.class);
 
         DynamicParameterList parameterList = DynamicParameterList.builder()
-                .onlyAddIfNotEmpty()
-                .add("a_object_owner", (String)null)
-                .add("a_num_param", (Integer)null)
-                .add("a_num_array", new Object[]{}, "MY_NUM_ARR", mockedConn)
+                .addIfNotEmpty("a_object_owner", (String)null)
+                .addIfNotEmpty("a_num_param", (Integer)null)
+                .addIfNotEmpty("a_num_array", new Object[]{}, "MY_NUM_ARR", mockedConn)
                 .build();
 
         assertEquals("", parameterList.getSql());