#13: Fix sonar warnings

itsallcode · Jan 9, 2021 · f214000 · f214000
1 parent a726cd4
commit f214000
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 6 deletions.
diff --git a/jfxui/src/main/java/org/itsallcode/whiterabbit/jfxui/uistate/UiStateService.java b/jfxui/src/main/java/org/itsallcode/whiterabbit/jfxui/uistate/UiStateService.java
@@ -65,7 +65,7 @@ private static UiStateModel loadState(Jsonb jsonb, Path path)
             }
             catch (final IOException | JsonbException e)
             {
-                LOG.warn("Error loading ui-state from " + path + ": use default values", e);
+                LOG.warn("Error loading ui-state from {}: use default values", path, e);
             }
         }
         LOG.info("Using fresh ui-state");

diff --git a/jfxui/src/main/java/org/itsallcode/whiterabbit/jfxui/uistate/model/ColumnStateModel.java b/jfxui/src/main/java/org/itsallcode/whiterabbit/jfxui/uistate/model/ColumnStateModel.java
@@ -5,6 +5,7 @@
 import org.itsallcode.whiterabbit.logic.model.json.FieldAccessStrategy;
 
 @JsonbVisibility(FieldAccessStrategy.class)
+@SuppressWarnings("java:S1104") // Encapsulation not necessary for model
 public class ColumnStateModel
 {
     public String id;

diff --git a/jfxui/src/main/java/org/itsallcode/whiterabbit/jfxui/uistate/model/SplitPaneStateModel.java b/jfxui/src/main/java/org/itsallcode/whiterabbit/jfxui/uistate/model/SplitPaneStateModel.java
@@ -7,6 +7,7 @@
 import org.itsallcode.whiterabbit.logic.model.json.FieldAccessStrategy;
 
 @JsonbVisibility(FieldAccessStrategy.class)
+@SuppressWarnings("java:S1104") // Encapsulation not necessary for model
 public class SplitPaneStateModel
 {
     public String id;

diff --git a/jfxui/src/main/java/org/itsallcode/whiterabbit/jfxui/uistate/model/StageStateModel.java b/jfxui/src/main/java/org/itsallcode/whiterabbit/jfxui/uistate/model/StageStateModel.java
@@ -5,6 +5,7 @@
 import org.itsallcode.whiterabbit.logic.model.json.FieldAccessStrategy;
 
 @JsonbVisibility(FieldAccessStrategy.class)
+@SuppressWarnings("java:S1104") // Encapsulation not necessary for model
 public class StageStateModel
 {
     public String id;

diff --git a/jfxui/src/main/java/org/itsallcode/whiterabbit/jfxui/uistate/model/TableStateModel.java b/jfxui/src/main/java/org/itsallcode/whiterabbit/jfxui/uistate/model/TableStateModel.java
@@ -7,6 +7,7 @@
 import org.itsallcode.whiterabbit.logic.model.json.FieldAccessStrategy;
 
 @JsonbVisibility(FieldAccessStrategy.class)
+@SuppressWarnings("java:S1104") // Encapsulation not necessary for model
 public class TableStateModel
 {
     public String id;

diff --git a/jfxui/src/main/java/org/itsallcode/whiterabbit/jfxui/uistate/model/UiStateModel.java b/jfxui/src/main/java/org/itsallcode/whiterabbit/jfxui/uistate/model/UiStateModel.java
@@ -8,6 +8,7 @@
 import org.itsallcode.whiterabbit.logic.model.json.FieldAccessStrategy;
 
 @JsonbVisibility(FieldAccessStrategy.class)
+@SuppressWarnings("java:S1104") // Encapsulation not necessary for model
 public class UiStateModel
 {
     public Map<String, StageStateModel> stages = new HashMap<>();

diff --git a/jfxui/src/main/java/org/itsallcode/whiterabbit/jfxui/uistate/widgets/StageStateManager.java b/jfxui/src/main/java/org/itsallcode/whiterabbit/jfxui/uistate/widgets/StageStateManager.java
@@ -14,7 +14,6 @@ class StageStateManager implements WidgetStateManager<Stage, StageStateModel>
 
     public StageStateManager(DelayedPropertyListener propertyListener)
     {
-        super();
         this.propertyListener = propertyListener;
     }
 

diff --git a/jfxui/src/uiTest/java/org/itsallcode/whiterabbit/jfxui/testutil/TimeUtil.java b/jfxui/src/uiTest/java/org/itsallcode/whiterabbit/jfxui/testutil/TimeUtil.java
@@ -57,7 +57,7 @@ public static TimeUtil start(Instant initialTime)
 
                     if (shouldRunExecutor(delayMillis.longValue(), runnable))
                     {
-                        LOG.debug("Run real execution with delay {}ms of {}", delayMillis, runnable);
+                        LOG.trace("Run real execution: delay {}ms, runnable: {}", delayMillis, runnable);
                         runnable.run();
                     }
                     else

diff --git a/.../src/main/java/org/itsallcode/whiterabbit/logic/service/scheduling/SchedulingService.java b/.../src/main/java/org/itsallcode/whiterabbit/logic/service/scheduling/SchedulingService.java
@@ -2,7 +2,6 @@
 
 import java.time.Duration;
 import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 
 import org.itsallcode.whiterabbit.logic.service.ClockService;
@@ -24,10 +23,10 @@ public ScheduledTaskFuture schedule(Trigger trigger, Runnable command)
         return new ReschedulingRunnable(command, trigger, executorService, clockService, errorHandler).schedule();
     }
 
-    public ScheduledFuture<?> schedule(Duration delay, Runnable command)
+    public void schedule(Duration delay, Runnable command)
     {
         final ErrorHandler errorHandler = new DefaultErrorHandler();
-        return executorService.schedule(new DelegatingErrorHandlingRunnable(command, errorHandler), delay.toMillis(),
+        executorService.schedule(new DelegatingErrorHandlingRunnable(command, errorHandler), delay.toMillis(),
                 TimeUnit.MILLISECONDS);
     }