Import optimizations

georgweiss · georgweiss · commit 699094c8acf4 · 2022-11-02T09:14:54.000+01:00
diff --git a/app/3d-viewer/src/test/java/org/phoebus/app/viewer3d/Viewer3dParserDemo.java b/app/3d-viewer/src/test/java/org/phoebus/app/viewer3d/Viewer3dParserDemo.java
@@ -7,18 +7,18 @@
  *******************************************************************************/
 package org.phoebus.app.viewer3d;
 
-import static org.junit.jupiter.api.Assertions.*;
-
-import java.io.ByteArrayInputStream;
-
-import org.junit.jupiter.api.Test;
-import org.phoebus.applications.viewer3d.Viewer3d;
-import org.phoebus.applications.viewer3d.Xform;
-
 import javafx.application.Platform;
 import javafx.scene.paint.Color;
 import javafx.scene.paint.PhongMaterial;
 import javafx.scene.shape.Sphere;
+import org.junit.jupiter.api.Test;
+import org.phoebus.applications.viewer3d.Viewer3d;
+import org.phoebus.applications.viewer3d.Xform;
+
+import java.io.ByteArrayInputStream;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /** Demo of 3D parser.
  *
diff --git a/app/alarm/datasource/src/test/java/org/phoebus/pv/alarm/AlarmContextTest.java b/app/alarm/datasource/src/test/java/org/phoebus/pv/alarm/AlarmContextTest.java
@@ -2,7 +2,7 @@
 
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class AlarmContextTest {
 
diff --git a/app/alarm/datasource/src/test/java/org/phoebus/pv/alarm/AlarmPVInfoTest.java b/app/alarm/datasource/src/test/java/org/phoebus/pv/alarm/AlarmPVInfoTest.java
@@ -4,7 +4,7 @@
 
 import java.util.Optional;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class AlarmPVInfoTest {
 
diff --git a/app/channel/views/src/test/java/org/phoebus/channel/views/ui/AddPropertyDemo.java b/app/channel/views/src/test/java/org/phoebus/channel/views/ui/AddPropertyDemo.java
@@ -1,15 +1,15 @@
 package org.phoebus.channel.views.ui;
 
-import java.io.IOException;
-import java.util.Arrays;
-
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
 import org.phoebus.ui.javafx.ApplicationWrapper;
 
-import static org.phoebus.channelfinder.Property.Builder.*;
+import java.io.IOException;
+import java.util.Arrays;
+
+import static org.phoebus.channelfinder.Property.Builder.property;
 
 public class AddPropertyDemo extends ApplicationWrapper {
 
diff --git a/app/display/convert-medm/src/test/java/org/csstudio/display/converter/medm/ConverterTest.java b/app/display/convert-medm/src/test/java/org/csstudio/display/converter/medm/ConverterTest.java
@@ -1,6 +1,13 @@
 package org.csstudio.display.converter.medm;
 
-import static org.junit.jupiter.api.Assertions.*;
+import org.csstudio.display.builder.model.DisplayModel;
+import org.csstudio.display.builder.model.Widget;
+import org.csstudio.display.builder.model.persist.ModelReader;
+import org.csstudio.display.builder.model.properties.ScriptPV;
+import org.csstudio.display.builder.model.rules.RuleInfo;
+import org.csstudio.display.builder.model.rules.RuleInfo.ExpressionInfo;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -12,14 +19,7 @@
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
-import org.csstudio.display.builder.model.DisplayModel;
-import org.csstudio.display.builder.model.Widget;
-import org.csstudio.display.builder.model.persist.ModelReader;
-import org.csstudio.display.builder.model.properties.ScriptPV;
-import org.csstudio.display.builder.model.rules.RuleInfo;
-import org.csstudio.display.builder.model.rules.RuleInfo.ExpressionInfo;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 
 @SuppressWarnings("nls")
diff --git a/app/display/navigation/src/test/java/org/phoebus/applications/display/navigation/ProcessOPITest.java b/app/display/navigation/src/test/java/org/phoebus/applications/display/navigation/ProcessOPITest.java
@@ -7,10 +7,10 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import static org.junit.jupiter.api.Assertions.*;
-
+import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.CoreMatchers.*;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * A utility Class for handling the navigation of .bob files
diff --git a/app/display/representation/src/test/java/org/csstudio/display/builder/representation/UpdateThrottleTest.java b/app/display/representation/src/test/java/org/csstudio/display/builder/representation/UpdateThrottleTest.java
@@ -7,16 +7,16 @@
  *******************************************************************************/
 package org.csstudio.display.builder.representation;
 
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.MatcherAssert.*;
+import org.csstudio.display.builder.model.Widget;
+import org.junit.jupiter.api.Test;
 
 import java.time.Instant;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.csstudio.display.builder.model.Widget;
-import org.junit.jupiter.api.Test;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 /** JUnit test of {@link UpdateThrottleTest}
  *
diff --git a/app/display/runtime/src/test/java/org/csstudio/display/builder/runtime/test/JythonTest.java b/app/display/runtime/src/test/java/org/csstudio/display/builder/runtime/test/JythonTest.java
@@ -7,10 +7,11 @@
  *******************************************************************************/
 package org.csstudio.display.builder.runtime.test;
 
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.hamcrest.MatcherAssert.*;
+import org.junit.jupiter.api.Test;
+import org.python.core.PyCode;
+import org.python.core.PySystemState;
+import org.python.core.RegistryKey;
+import org.python.util.PythonInterpreter;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -20,11 +21,10 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 
-import org.junit.jupiter.api.Test;
-import org.python.core.PyCode;
-import org.python.core.PySystemState;
-import org.python.core.RegistryKey;
-import org.python.util.PythonInterpreter;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 /** Jython Demo
  *
diff --git a/app/logbook/olog/ui/src/test/java/org/phoebus/logbook/olog/ui/LogPropertiesEditorDemo.java b/app/logbook/olog/ui/src/test/java/org/phoebus/logbook/olog/ui/LogPropertiesEditorDemo.java
@@ -18,7 +18,12 @@
 import org.phoebus.ui.javafx.ApplicationWrapper;
 
 import java.io.IOException;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.ResourceBundle;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
diff --git a/app/rtplot/src/test/java/org/csstudio/javafx/rtplot/TicksTestBase.java b/app/rtplot/src/test/java/org/csstudio/javafx/rtplot/TicksTestBase.java
@@ -7,15 +7,6 @@
  ******************************************************************************/
 package org.csstudio.javafx.rtplot;
 
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.MatcherAssert.*;
-
-import java.awt.Graphics2D;
-import java.awt.image.BufferedImage;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-
 import org.csstudio.javafx.rtplot.internal.LinearTicks;
 import org.csstudio.javafx.rtplot.internal.MajorTick;
 import org.csstudio.javafx.rtplot.internal.MinorTick;
@@ -24,6 +15,15 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
+import java.awt.Graphics2D;
+import java.awt.image.BufferedImage;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.MatcherAssert.assertThat;
+
 
 /** Helper for testing ticks
  *  @author Kay Kasemir
diff --git a/app/save-and-restore/model/src/test/java/org/phoebus/applications/saveandrestore/model/json/JsonSerializationTest.java b/app/save-and-restore/model/src/test/java/org/phoebus/applications/saveandrestore/model/json/JsonSerializationTest.java
@@ -18,10 +18,7 @@
 
 package org.phoebus.applications.saveandrestore.model.json;
 
-import static org.junit.jupiter.api.Assertions.*;
-
-import java.time.Instant;
-
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.epics.util.array.CollectionNumbers;
 import org.epics.vtype.Alarm;
 import org.epics.vtype.AlarmSeverity;
@@ -33,15 +30,16 @@
 import org.epics.vtype.VDoubleArray;
 import org.epics.vtype.VEnum;
 import org.epics.vtype.VType;
-
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.phoebus.applications.saveandrestore.model.ConfigPv;
 import org.phoebus.applications.saveandrestore.model.SnapshotItem;
 
+import java.time.Instant;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 /**
  * @author georgweiss Created 30 Nov 2018
  */
diff --git a/core/framework/src/test/java/org/phoebus/framework/jobs/CommandExecutorTest.java b/core/framework/src/test/java/org/phoebus/framework/jobs/CommandExecutorTest.java
@@ -10,12 +10,6 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.hamcrest.MatcherAssert.*;
-import static org.phoebus.framework.jobs.JobManager.logger;
-
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.util.Arrays;
@@ -25,6 +19,12 @@
 import java.util.logging.SimpleFormatter;
 import java.util.logging.StreamHandler;
 
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.phoebus.framework.jobs.JobManager.logger;
+
 
 
 /** JUnit test of the CommandExecutor
diff --git a/core/framework/src/test/java/org/phoebus/framework/nls/NLSMessagesTest.java b/core/framework/src/test/java/org/phoebus/framework/nls/NLSMessagesTest.java
@@ -11,11 +11,11 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.MatcherAssert.*;
-
 import java.util.Locale;
 
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.MatcherAssert.assertThat;
+
 
 /** JUnit test of the {@link NLS} message initialization
  *  @author Kay Kasemir
diff --git a/core/pv/src/test/java/org/phoebus/pv/FormulaTest.java b/core/pv/src/test/java/org/phoebus/pv/FormulaTest.java
@@ -7,7 +7,12 @@
  ******************************************************************************/
 package org.phoebus.pv;
 
-import static org.junit.jupiter.api.Assertions.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import org.epics.vtype.VType;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+import org.phoebus.core.vtypes.VTypeHelper;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
@@ -16,13 +21,9 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.epics.vtype.VType;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
-import org.phoebus.core.vtypes.VTypeHelper;
-
-import io.reactivex.rxjava3.disposables.Disposable;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /** @author Kay Kasemir */
 @SuppressWarnings("nls")
diff --git a/core/pv/src/test/java/org/phoebus/pv/ReactivePVTest.java b/core/pv/src/test/java/org/phoebus/pv/ReactivePVTest.java
@@ -7,8 +7,12 @@
  ******************************************************************************/
 package org.phoebus.pv;
 
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.MatcherAssert.*;
+import io.reactivex.rxjava3.core.BackpressureStrategy;
+import io.reactivex.rxjava3.disposables.Disposable;
+import org.epics.vtype.Time;
+import org.epics.vtype.VNumber;
+import org.epics.vtype.VType;
+import org.junit.jupiter.api.Test;
 
 import java.time.Instant;
 import java.util.List;
@@ -17,13 +21,8 @@
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
-import org.epics.vtype.Time;
-import org.epics.vtype.VNumber;
-import org.epics.vtype.VType;
-
-import io.reactivex.rxjava3.core.BackpressureStrategy;
-import io.reactivex.rxjava3.disposables.Disposable;
-import org.junit.jupiter.api.Test;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 /** Demos of the {@link PV}'s "Reactive" API
  *
diff --git a/core/pv/src/test/java/org/phoebus/pv/SimPVTest.java b/core/pv/src/test/java/org/phoebus/pv/SimPVTest.java
@@ -7,14 +7,13 @@
  ******************************************************************************/
 package org.phoebus.pv;
 
-import static org.junit.jupiter.api.Assertions.*;
-
-import java.util.concurrent.CountDownLatch;
-
+import io.reactivex.rxjava3.disposables.Disposable;
 import org.junit.jupiter.api.Test;
 import org.phoebus.core.vtypes.VTypeHelper;
 
-import io.reactivex.rxjava3.disposables.Disposable;
+import java.util.concurrent.CountDownLatch;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /** @author Kay Kasemir */
 @SuppressWarnings("nls")
diff --git a/core/ui/src/test/java/org/phoebus/ui/javafx/svg/SVGTranscoderTest.java b/core/ui/src/test/java/org/phoebus/ui/javafx/svg/SVGTranscoderTest.java
@@ -21,10 +21,11 @@
 import javafx.scene.image.Image;
 import org.junit.jupiter.api.Test;
 
-
 import java.io.InputStream;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class SVGTranscoderTest {
 
diff --git a/core/util/src/test/java/org/phoebus/util/indexname/IndexNameHelperTest.java b/core/util/src/test/java/org/phoebus/util/indexname/IndexNameHelperTest.java
@@ -10,14 +10,15 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.*;
-
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.Locale;
 import java.util.TimeZone;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
 
 /**
  * Unit test for the IndexNameHelper class.
diff --git a/core/util/src/test/java/org/phoebus/util/time/TimeDurationTest.java b/core/util/src/test/java/org/phoebus/util/time/TimeDurationTest.java
diff --git a/core/util/src/test/java/org/phoebus/util/time/TimeIntervalTest.java b/core/util/src/test/java/org/phoebus/util/time/TimeIntervalTest.java
diff --git a/core/util/src/test/java/org/phoebus/util/time/TimeRelativeIntervalTest.java b/core/util/src/test/java/org/phoebus/util/time/TimeRelativeIntervalTest.java
diff --git a/services/alarm-server/src/test/java/org/phoebus/applications/alarm/server/AutomatedActionTest.java b/services/alarm-server/src/test/java/org/phoebus/applications/alarm/server/AutomatedActionTest.java
diff --git a/services/alarm-server/src/test/java/org/phoebus/applications/alarm/server/FilterUnitTest.java b/services/alarm-server/src/test/java/org/phoebus/applications/alarm/server/FilterUnitTest.java
