Reverted removal of duplicate code

Author: simasch

src/main/java/org/utplsql/maven/plugin/UtPLSQLMojo.java

@@ -233,7 +233,37 @@ private FileMapperOptions buildSourcesOptions() throws MojoExecutionException {
 
             List<String> scripts = SQLScannerHelper.findSQLs(project.getBasedir(), sources,
                     PluginDefault.SOURCE_DIRECTORY, PluginDefault.SOURCE_FILE_PATTERN);
-            return createFileMapperOptions(scripts);
+            FileMapperOptions fileMapperOptions = new FileMapperOptions(scripts);
+
+            if (StringUtils.isNotEmpty(sourcesOwner)) {
+                fileMapperOptions.setObjectOwner(sourcesOwner);
+            }
+
+            if (StringUtils.isNotEmpty(sourcesRegexExpression)) {
+                fileMapperOptions.setRegexPattern(sourcesRegexExpression);
+            }
+
+            if (sourcesOwnerSubexpression != null) {
+                fileMapperOptions.setOwnerSubExpression(sourcesOwnerSubexpression);
+            }
+
+            if (sourcesNameSubexpression != null) {
+                fileMapperOptions.setNameSubExpression(sourcesNameSubexpression);
+            }
+
+            if (sourcesTypeSubexpression != null) {
+                fileMapperOptions.setTypeSubExpression(sourcesTypeSubexpression);
+            }
+
+            if (sourcesCustomTypeMapping != null && !sourcesCustomTypeMapping.isEmpty()) {
+                fileMapperOptions.setTypeMappings(new ArrayList<>());
+                for (CustomTypeMapping typeMapping : sourcesCustomTypeMapping) {
+                    fileMapperOptions.getTypeMappings()
+                            .add(new KeyValuePair(typeMapping.getCustomMapping(), typeMapping.getType()));
+                }
+            }
+
+            return fileMapperOptions;
 
         } catch (Exception e) {
             throw new MojoExecutionException("Invalid <SOURCES> in your pom.xml", e);
@@ -254,46 +284,42 @@ private FileMapperOptions buildTestsOptions() throws MojoExecutionException {
 
             List<String> scripts = SQLScannerHelper.findSQLs(project.getBasedir(), tests, PluginDefault.TEST_DIRECTORY,
                     PluginDefault.TEST_FILE_PATTERN);
-            return createFileMapperOptions(scripts);
-
-        } catch (Exception e) {
-            throw new MojoExecutionException("Invalid <TESTS> in your pom.xml: " + e.getMessage());
-        }
+            FileMapperOptions fileMapperOptions = new FileMapperOptions(scripts);
 
-    }
+            if (StringUtils.isNotEmpty(testsOwner)) {
+                fileMapperOptions.setObjectOwner(testsOwner);
+            }
 
-    private FileMapperOptions createFileMapperOptions(List<String> scripts) {
-        FileMapperOptions fileMapperOptions = new FileMapperOptions(scripts);
+            if (StringUtils.isNotEmpty(testsRegexExpression)) {
+                fileMapperOptions.setRegexPattern(testsRegexExpression);
+            }
 
-        if (StringUtils.isNotEmpty(sourcesOwner)) {
-            fileMapperOptions.setObjectOwner(sourcesOwner);
-        }
+            if (testsOwnerSubexpression != null) {
+                fileMapperOptions.setOwnerSubExpression(testsOwnerSubexpression);
+            }
 
-        if (StringUtils.isNotEmpty(sourcesRegexExpression)) {
-            fileMapperOptions.setRegexPattern(sourcesRegexExpression);
-        }
+            if (testsNameSubexpression != null) {
+                fileMapperOptions.setNameSubExpression(testsNameSubexpression);
+            }
 
-        if (sourcesOwnerSubexpression != null) {
-            fileMapperOptions.setOwnerSubExpression(sourcesOwnerSubexpression);
-        }
+            if (testsTypeSubexpression != null) {
+                fileMapperOptions.setTypeSubExpression(testsTypeSubexpression);
+            }
 
-        if (sourcesNameSubexpression != null) {
-            fileMapperOptions.setNameSubExpression(sourcesNameSubexpression);
-        }
+            if (testsCustomTypeMapping != null && !testsCustomTypeMapping.isEmpty()) {
+                fileMapperOptions.setTypeMappings(new ArrayList<>());
+                for (CustomTypeMapping typeMapping : testsCustomTypeMapping) {
+                    fileMapperOptions.getTypeMappings()
+                            .add(new KeyValuePair(typeMapping.getCustomMapping(), typeMapping.getType()));
+                }
+            }
 
-        if (sourcesTypeSubexpression != null) {
-            fileMapperOptions.setTypeSubExpression(sourcesTypeSubexpression);
-        }
+            return fileMapperOptions;
 
-        if (sourcesCustomTypeMapping != null && !sourcesCustomTypeMapping.isEmpty()) {
-            fileMapperOptions.setTypeMappings(new ArrayList<>());
-            for (CustomTypeMapping typeMapping : sourcesCustomTypeMapping) {
-                fileMapperOptions.getTypeMappings()
-                        .add(new KeyValuePair(typeMapping.getCustomMapping(), typeMapping.getType()));
-            }
+        } catch (Exception e) {
+            throw new MojoExecutionException("Invalid <TESTS> in your pom.xml: " + e.getMessage());
         }
 
-        return fileMapperOptions;
     }
 
     private List<Reporter> initReporters(Connection connection, Version utlVersion, ReporterFactory reporterFactory)