simplify code

PhilippSalvisberg · PhilippSalvisberg · commit 22c2898c58f9 · 2020-06-01T22:25:44.000+02:00
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/runner/UtplsqlRunner.java b/sqldev/src/main/java/org/utplsql/sqldev/runner/UtplsqlRunner.java
@@ -19,7 +19,6 @@
 import java.awt.Toolkit;
 import java.sql.Connection;
 import java.text.SimpleDateFormat;
-import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.UUID;
@@ -133,7 +132,7 @@ public void dispose() {
 
     @Override
     public void process(final RealtimeReporterEvent event) {
-        logger.fine(() -> event.toString());
+        logger.fine(event::toString);
         // dynamic dispatching code originally generated by Xtend
         if (event instanceof PostRunEvent) {
             doProcess((PostRunEvent) event);
@@ -144,11 +143,11 @@ public void process(final RealtimeReporterEvent event) {
         } else if (event instanceof PreRunEvent) {
             doProcess((PreRunEvent) event);
         } else if (event instanceof PreSuiteEvent) {
-            doProcess((PreSuiteEvent) event);
+            // not processed
         } else if (event instanceof PreTestEvent) {
             doProcess((PreTestEvent) event);
         } else {
-            throw new IllegalArgumentException("Unhandled parameter types: " + Arrays.asList(event).toString());
+            throw new IllegalArgumentException("Unhandled event: " + event.toString());
         }
     }
 
@@ -191,10 +190,6 @@ private void doProcess(final PostRunEvent event) {
         panel.update(realtimeReporterId);
     }
 
-    private void doProcess(final PreSuiteEvent event) {
-        // ignore
-    }
-
     private void doProcess(final PostSuiteEvent event) {
         final Test test = run.getCurrentTest();
         // Errors on suite levels are reported as warnings by the utPLSQL framework, 
@@ -291,8 +286,7 @@ private void produce() {
             }
             logger.fine(() -> "All events produced for reporter id " + realtimeReporterId + ".");
         } catch (Exception e) {
-            logger.severe(() -> "Error while producing events for reporter id " + realtimeReporterId + ": "
-                    + (e != null ? e.getMessage() : "???"));
+            logger.severe(() -> "Error while producing events for reporter id " + realtimeReporterId + ": " + e.getMessage() + ".");
         }
     }
 
@@ -307,12 +301,11 @@ private void consume() {
                 CodeCoverageReporter.openInBrowser(html);
             }
         } catch (Exception e) {
-            logger.severe(() -> "Error while consuming events for reporter id " + realtimeReporterId + ": "
-                    + (e != null ? e.getMessage() : "???"));
+            logger.severe(() -> "Error while consuming events for reporter id " + realtimeReporterId + ": " + e.getMessage() + ".");
         }
         if (run.getTotalNumberOfTests() < 0) {
             run.setStatus(UtplsqlResources.getString("RUNNER_NO_TESTS_FOUND_TEXT"));
-            run.setExecutionTime(Double.valueOf(System.currentTimeMillis() - Double.valueOf(run.getStart())) / 1000);
+            run.setExecutionTime((System.currentTimeMillis() - Double.valueOf(run.getStart())) / 1000);
             run.setEndTime(getSysdate());
             run.setTotalNumberOfTests(0);
             panel.update(realtimeReporterId);
@@ -332,7 +325,7 @@ private boolean initGUI() {
             logger.severe(() -> "Error getting utPLSQL dockable. Cannot run utPLSQL test.");
             return false;
         } else {
-            if (isRunningInSqlDeveloper() && dockable != null) {
+            if (isRunningInSqlDeveloper()) {
                 RunnerFactory.showDockable();
                 panel = dockable.getRunnerPanel();
             } else {
@@ -356,13 +349,13 @@ public void runTestAsync() {
         // start tests when the GUI has been successfully initialized.
         if (initGUI()) {
             // the consumer
-            consumerThread = new Thread(() -> consume());
+            consumerThread = new Thread(this::consume);
             consumerThread.setName("realtime consumer");
             consumerThread.start();
             // avoid concurrency on output header table to fix issue #80
             SystemTools.sleep(100);
             // the producer
-            producerThread = new Thread(() -> produce());
+            producerThread = new Thread(this::produce);
             producerThread.setName("realtime producer");
             producerThread.start();
         }
