use StringTools instead of StringUtil

PhilippSalvisberg · PhilippSalvisberg · commit e17f2e4f8030 · 2020-05-25T11:27:17.000+02:00
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/dal/RealtimeReporterDao.java b/sqldev/src/main/java/org/utplsql/sqldev/dal/RealtimeReporterDao.java
@@ -34,6 +34,7 @@
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.datasource.SingleConnectionDataSource;
 import org.utplsql.sqldev.exception.GenericRuntimeException;
+import org.utplsql.sqldev.model.StringTools;
 import org.utplsql.sqldev.model.XMLTools;
 import org.utplsql.sqldev.model.runner.Counter;
 import org.utplsql.sqldev.model.runner.Expectation;
@@ -84,7 +85,7 @@ public void produceReport(final String reporterId, final List<String> pathList)
         sb.append("   sys.dbms_output.enable(NULL);\n");
         sb.append("   ut_runner.run(\n");
         sb.append("      a_paths     => ut_varchar2_list(\n");
-        sb.append(StringUtil.getCSV(pathList, 24));
+        sb.append(StringTools.getCSV(pathList, 24));
         sb.append("                     ),\n");
         sb.append("      a_reporters => ut_reporters(l_reporter)\n");
         sb.append("   );\n");
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/dal/UtplsqlDao.java b/sqldev/src/main/java/org/utplsql/sqldev/dal/UtplsqlDao.java
@@ -32,6 +32,7 @@
 import org.springframework.jdbc.core.CallableStatementCallback;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.datasource.SingleConnectionDataSource;
+import org.utplsql.sqldev.model.StringTools;
 import org.utplsql.sqldev.model.ut.Annotation;
 import org.utplsql.sqldev.model.ut.OutputLines;
 
@@ -928,21 +929,21 @@ public String htmlCodeCoverage(final List<String> pathList, final List<String> s
         sb.append("  FROM table(\n");
         sb.append("          ut.run(\n");
         sb.append("             a_paths => ut_varchar2_list(\n");
-        sb.append(StringUtil.getCSV(pathList, 16));
+        sb.append(StringTools.getCSV(pathList, 16));
         sb.append("             ),\n");
         if (schemaList.size() > 0) {
             sb.append("             a_coverage_schemes => ut_varchar2_list(\n");
-            sb.append(StringUtil.getCSV(schemaList, 16));
+            sb.append(StringTools.getCSV(schemaList, 16));
             sb.append("             ),\n");
         }
         if (includeObjectList.size() > 0) {
             sb.append("             a_include_objects => ut_varchar2_list(\n");
-            sb.append(StringUtil.getCSV(includeObjectList, 16));
+            sb.append(StringTools.getCSV(includeObjectList, 16));
             sb.append("             ),\n");
         }
         if (excludeObjectList.size() > 0) {
             sb.append("             a_exclude_objects => ut_varchar2_list(\n");
-            sb.append(StringUtil.getCSV(excludeObjectList, 16));
+            sb.append(StringTools.getCSV(excludeObjectList, 16));
             sb.append("             ),\n");
         }
         sb.append("             a_reporter => ut_coverage_html_reporter()\n");
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/menu/UtplsqlController.java b/sqldev/src/main/java/org/utplsql/sqldev/menu/UtplsqlController.java
@@ -33,9 +33,9 @@
 import org.eclipse.xtend2.lib.StringConcatenation;
 import org.utplsql.sqldev.coverage.CodeCoverageReporter;
 import org.utplsql.sqldev.dal.RealtimeReporterDao;
-import org.utplsql.sqldev.dal.StringUtil;
 import org.utplsql.sqldev.dal.UtplsqlDao;
 import org.utplsql.sqldev.exception.GenericRuntimeException;
+import org.utplsql.sqldev.model.StringTools;
 import org.utplsql.sqldev.model.URLTools;
 import org.utplsql.sqldev.model.oddgen.GenContext;
 import org.utplsql.sqldev.model.parser.PlsqlObject;
@@ -491,9 +491,9 @@ public void codeCoverage(final Context context) {
                 final String connectionName = urlTools.getConnectionName(url);
                 logger.fine(() -> "connectionName: " + connectionName);
                 final ArrayList<String> pathList = dedupPathList(getPathList(context));
-                logger.fine(() -> "pathlist: " + StringUtil.getSimpleCSV(pathList));
+                logger.fine(() -> "pathlist: " + StringTools.getSimpleCSV(pathList));
                 final List<String> includeObjectList = dependencies(context, connectionName);
-                logger.finer(() -> "includeObjectList: " + StringUtil.getSimpleCSV(includeObjectList));
+                logger.finer(() -> "includeObjectList: " + StringTools.getSimpleCSV(includeObjectList));
                 final CodeCoverageReporter reporter = new CodeCoverageReporter(pathList, includeObjectList, connectionName);
                 logger.finer(() -> "showing code coverage dialog");
                 reporter.showParameterWindow();
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/StringTools.java b/sqldev/src/main/java/org/utplsql/sqldev/model/StringTools.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.utplsql.sqldev.dal;
+package org.utplsql.sqldev.model;
 
 import java.util.Collections;
 import java.util.List;
 
-public class StringUtil {
+public class StringTools {
     // do not instantiate this class
-    private StringUtil() {
+    private StringTools() {
         super();
     }
     
