Use Java 17 features and cleanup

Author: strangelookingnerd

src/main/java/de/westemeyer/plugins/multiselect/MultiselectDecisionItem.java

@@ -3,6 +3,7 @@
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.DataBoundSetter;
 
+import java.io.Serial;
 import java.io.Serializable;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
@@ -14,6 +15,7 @@
  */
 public class MultiselectDecisionItem implements Serializable {
     /** Serial version UID. */
+    @Serial
     private static final long serialVersionUID = -7959174754803921973L;
 
     /** Label for display in selection list. */

src/main/java/de/westemeyer/plugins/multiselect/MultiselectDecisionTree.java

@@ -9,6 +9,7 @@
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.io.Serial;
 import java.io.Serializable;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayDeque;
@@ -30,6 +31,7 @@
  */
 public class MultiselectDecisionTree implements Serializable {
     /** Serial version UID. */
+    @Serial
     private static final long serialVersionUID = -5015514196308288683L;
 
     /** Logger for this object. */

src/main/java/de/westemeyer/plugins/multiselect/MultiselectParameterDefinition.java

@@ -19,6 +19,7 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import java.io.IOException;
+import java.io.Serial;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -36,6 +37,7 @@
  */
 public class MultiselectParameterDefinition extends ParameterDefinition {
     /** Serialization UID. */
+    @Serial
     private static final long serialVersionUID = 3307975793661301522L;
 
     /** Logger for this object. */

src/main/java/de/westemeyer/plugins/multiselect/MultiselectParameterValue.java

@@ -8,6 +8,7 @@
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.DataBoundSetter;
 
+import java.io.Serial;
 import java.util.Map;
 import java.util.Objects;
 
@@ -17,6 +18,7 @@
  */
 public class MultiselectParameterValue extends ParameterValue {
     /** Serial version UID. */
+    @Serial
     private static final long serialVersionUID = -5612496743376284422L;
 
     /** The values selected in "build with parameters" step. */

src/main/java/de/westemeyer/plugins/multiselect/MultiselectVariableDescriptor.java

@@ -3,6 +3,7 @@
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.DataBoundSetter;
 
+import java.io.Serial;
 import java.io.Serializable;
 import java.util.List;
 
@@ -11,6 +12,7 @@
  */
 public class MultiselectVariableDescriptor implements Serializable {
     /** Serial version UID. */
+    @Serial
     private static final long serialVersionUID = -3664707568849231781L;
 
     /** Variable label. */

src/test/java/de/westemeyer/plugins/multiselect/MultiselectDecisionTreeTest.java

@@ -9,6 +9,7 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.OutputStream;
+import java.io.Serial;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
@@ -67,6 +68,7 @@ void resolveValues() {
     @Test
     void exceptionInToString() {
         MultiselectDecisionTree decisionTree = new MultiselectDecisionTree() {
+            @Serial
             private static final long serialVersionUID = -2603343900904810385L;
 
             @Override
@@ -96,6 +98,7 @@ void getInitialValuesForColumn() {
     @Test
     void emptyItemListInitialValues() {
         MultiselectDecisionTree decisionTree = new MultiselectDecisionTree() {
+            @Serial
             private static final long serialVersionUID = -2603343900904810385L;
 
             @Override
@@ -118,15 +121,17 @@ void serializationRoundTripTest() throws Exception {
                 createItem("Very popular sport", "Wakeboard", createItem(null, "WSC Duisburg Rheinhausen"))));
         try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream()) {
             decisionTree.serialize(new CsvWriter(), outputStream);
-            assertEquals("H,Sport,Team\n" +
-                    "V,SELECTED_SPORT,SELECTED_TEAM\n" +
-                    "C,Tennis,Tennisclub Rumeln-Kaldenhausen e.V.\n" +
-                    "T,,Alternative label\n" +
-                    "C,Tennis,Oppumer TC\n" +
-                    "C,Football,Rumelner TV\n" +
-                    "C,Football,FC Rumeln\n" +
-                    "T,Very popular sport,\n" +
-                    "C,Wakeboard,WSC Duisburg Rheinhausen\n", outputStream.toString());
+            assertEquals("""
+                    H,Sport,Team
+                    V,SELECTED_SPORT,SELECTED_TEAM
+                    C,Tennis,Tennisclub Rumeln-Kaldenhausen e.V.
+                    T,,Alternative label
+                    C,Tennis,Oppumer TC
+                    C,Football,Rumelner TV
+                    C,Football,FC Rumeln
+                    T,Very popular sport,
+                    C,Wakeboard,WSC Duisburg Rheinhausen
+                    """, outputStream.toString());
         }
     }
 

src/test/java/de/westemeyer/plugins/multiselect/MultiselectParameterDefinitionTest.java

@@ -14,7 +14,6 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Queue;
-import java.util.stream.Collectors;
 
 import static de.westemeyer.plugins.multiselect.MultiselectConfigurationFormat.CSV;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
@@ -90,7 +89,7 @@ void getDependingVariableIds(String name, int index, int resultLength) {
         MultiselectParameterDefinition definition = new MultiselectParameterDefinition(NAME, DESCRIPTION, INPUT, CSV);
         MultiselectDecisionTree decisionTree = definition.getDecisionTree();
         assertNotNull(decisionTree);
-        List<String> idList = decisionTree.getVariableDescriptions().stream().map(MultiselectVariableDescriptor::getUuid).collect(Collectors.toList());
+        List<String> idList = decisionTree.getVariableDescriptions().stream().map(MultiselectVariableDescriptor::getUuid).toList();
 
         String[] dependingVariableIds = definition.getDependingVariableIds(idList.get(index));
         assertEquals(resultLength, dependingVariableIds.length);
@@ -210,9 +209,9 @@ public MultiselectDecisionTree parseConfiguration(String input) throws IOExcepti
     @Test
     void testEquals() {
         MultiselectParameterDefinition value = new MultiselectParameterDefinition(NAME, DESCRIPTION, INPUT, CSV);
-        assertNotEquals(value, this);
+        assertNotEquals(this, value);
         assertEquals(value, value);
-        assertNotEquals(value, new MultiselectParameterDefinition("Other name", DESCRIPTION, INPUT, CSV));
+        assertNotEquals(new MultiselectParameterDefinition("Other name", DESCRIPTION, INPUT, CSV), value);
         MultiselectParameterValue sameNameDifferentContent = new MultiselectParameterValue("Hello", Collections.singletonMap("key", "value"));
         assertNotEquals(value, sameNameDifferentContent);
         MultiselectParameterDefinition actual = new MultiselectParameterDefinition(NAME, DESCRIPTION, INPUT, CSV);

src/test/java/de/westemeyer/plugins/multiselect/parser/CsvParserTest.java

@@ -22,11 +22,13 @@ class CsvParserTest {
     private static final String INPUT_NO_TITLES = "H,Type,Sport,Country,Team\nV,SELECTED_TYPE,SELECTED_SPORT,SELECTED_COUNTRY,SELECTED_TEAM\nC,Water,Wakeboarding,Germany,WSC Duisburg Rheinhausen\nC,Water,Wakeboarding,Germany,WSC Paderborn\nC,Water,Wakeboarding,Austria,WSC Wien\nC,Water,Waterball,Germany,Waterball Team\nC,Water,Surfing,England,Bristol Surf Team\nC,Ball,Football,France,Paris St. Germain\nC,Ball,Handball,Germany,THW Kiel\n";
 
     /** Input from issue JENKINS-66486. */
-    private static final String INPUT_QUOTED = "H,Component,Container,Machine\n"
-            + "V,SELECTED_COMPONENT,SELECTED_CONTAINER,MACHINES\n"
-            + "C,component1,container1,\"machine1,machine2\"\n"
-            + "C,component2,container1,\"machine3,machine4\"\n"
-            + "C,component3,container2,\"machine1,machine2\"\n";
+    private static final String INPUT_QUOTED = """
+            H,Component,Container,Machine
+            V,SELECTED_COMPONENT,SELECTED_CONTAINER,MACHINES
+            C,component1,container1,"machine1,machine2"
+            C,component2,container1,"machine3,machine4"
+            C,component3,container2,"machine1,machine2"
+            """;
 
     @ParameterizedTest
     @ValueSource(strings = {INPUT_CSV, INPUT_NO_TITLES, "", "V,A,B\n", "H,Hello,World\n", "C,a,b\n", INPUT_QUOTED})