refactoring/536_resolve-sonar-findings-of-june-2026

api/src/main/java/org/itsallcode/openfasttrace/api/core/LinkedSpecificationItem.java

@@ -3,7 +3,6 @@
 import java.util.*;
 import java.util.Map.Entry;
 import java.util.function.Predicate;
-import java.util.stream.Collectors;
 
 /**
  * Specification items with links that can be followed.
@@ -147,8 +146,7 @@ public void addLinkToItemWithStatus(final LinkedSpecificationItem item, final Li
             cacheOverCoveredArtifactType(item);
             addMyItemIdToCoveringItem(item);
             break;
-        case COVERED_OUTDATED:
-        case COVERED_PREDATED:
+        case COVERED_OUTDATED, COVERED_PREDATED:
             addMyItemIdToCoveringItem(item);
             break;
         default:
@@ -395,7 +393,7 @@ private List<LinkedSpecificationItem> getIncomingItems()
                 .stream() //
                 .filter(entry -> entry.getKey().isIncoming()) //
                 .flatMap(entry -> entry.getValue().stream()) //
-                .collect(Collectors.toList());
+                .toList();
     }
 
     /**

api/src/main/java/org/itsallcode/openfasttrace/api/core/Trace.java

@@ -1,7 +1,6 @@
 package org.itsallcode.openfasttrace.api.core;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * The result of tracing requirements.
@@ -58,7 +57,7 @@ public List<SpecificationItemId> getDefectIds()
     {
         return this.defectItems.stream()
                 .map(LinkedSpecificationItem::getId)
-                .collect(Collectors.toList());
+                .toList();
     }
 
     /**

api/src/test/java/org/itsallcode/openfasttrace/api/core/TestLinkedSpecificationItem.java

@@ -30,7 +30,7 @@ class TestLinkedSpecificationItem
     private SpecificationItem itemMock, coveredItemMock, otherItemMock;
 
     @BeforeEach
-    public void prepareAllTests()
+    void prepareAllTests()
     {
         this.linkedItem = new LinkedSpecificationItem(this.itemMock);
         this.coveredLinkedItem = new LinkedSpecificationItem(this.coveredItemMock);

api/src/test/java/org/itsallcode/openfasttrace/api/importer/TestSpecificationListBuilder.java

@@ -6,7 +6,6 @@
 import static org.junit.jupiter.api.Assertions.assertAll;
 
 import java.util.*;
-import java.util.stream.Collectors;
 
 import org.itsallcode.openfasttrace.api.FilterSettings;
 import org.itsallcode.openfasttrace.api.core.*;
@@ -16,7 +15,7 @@ class TestSpecificationListBuilder
 {
     private static final String DESCRIPTION = "description";
     private static final String TITLE = "title";
-    private final static SpecificationItemId ID = SpecificationItemId.parseId("feat~id~1");
+    private static final SpecificationItemId ID = SpecificationItemId.parseId("feat~id~1");
 
     @Test
     void testBuildBasicItem()
@@ -168,7 +167,7 @@ void testFilterSpecificationItemsByTags()
         addItemWithTags(builder, "out-C", "exporter", "database");
         addItemWithTags(builder, "out-D");
         final List<SpecificationItem> items = builder.build();
-        assertThat(items.stream().map(SpecificationItem::getName).collect(Collectors.toList()),
+        assertThat(items.stream().map(SpecificationItem::getName).toList(),
                 containsInAnyOrder("in-A", "in-B"));
     }
 
@@ -202,7 +201,7 @@ void testFilterSpecificationItemsByTagsIncludingNoTags()
         addItemWithTags(builder, "out-C", "exporter", "database");
         addItemWithTags(builder, "in-D");
         final List<SpecificationItem> items = builder.build();
-        assertThat(items.stream().map(SpecificationItem::getName).collect(Collectors.toList()),
+        assertThat(items.stream().map(SpecificationItem::getName).toList(),
                 containsInAnyOrder("in-A", "in-B", "in-D"));
     }
 

api/src/test/java/org/itsallcode/openfasttrace/api/importer/input/TestRealFileInput.java

@@ -26,7 +26,7 @@ void beforeEach(@TempDir final Path tempDir)
     }
 
     @Test
-    void testRelativeFileGetPath() throws IOException
+    void testRelativeFileGetPath()
     {
         final Path path = Paths.get("blah");
         final InputFile inputFile = RealFileInput.forPath(path);
@@ -35,7 +35,7 @@ void testRelativeFileGetPath() throws IOException
     }
 
     @Test
-    void testAbsoluteFileGetPath() throws IOException
+    void testAbsoluteFileGetPath()
     {
         final Path path = Paths.get("blah").toAbsolutePath();
         final InputFile inputFile = RealFileInput.forPath(path);
@@ -44,23 +44,23 @@ void testAbsoluteFileGetPath() throws IOException
     }
 
     @Test
-    void testRelativeFileToPath() throws IOException
+    void testRelativeFileToPath()
     {
         final Path path = Paths.get("blah");
         final InputFile inputFile = RealFileInput.forPath(path);
         assertThat(inputFile.toPath(), equalTo(path));
     }
 
     @Test
-    void testAbsoluteFileToPath() throws IOException
+    void testAbsoluteFileToPath()
     {
         final Path path = Paths.get("blah").toAbsolutePath();
         final InputFile inputFile = RealFileInput.forPath(path);
         assertThat(inputFile.toPath(), equalTo(path));
     }
 
     @Test
-    void testIsRealFileTrue() throws IOException
+    void testIsRealFileTrue()
     {
         final InputFile inputFile = RealFileInput.forPath(Paths.get("blah"));
         assertThat(inputFile.isRealFile(), equalTo(true));

core/src/main/java/org/itsallcode/openfasttrace/core/LinkedItemIndex.java

@@ -35,7 +35,7 @@ public static LinkedItemIndex create(final List<SpecificationItem> items)
 
     private static List<LinkedSpecificationItem> wrapItems(final List<SpecificationItem> items)
     {
-        return items.stream().map(LinkedSpecificationItem::new).collect(Collectors.toList());
+        return items.stream().map(LinkedSpecificationItem::new).toList();
     }
 
     /**

core/src/main/java/org/itsallcode/openfasttrace/core/Linker.java

@@ -4,7 +4,6 @@
 
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 import org.itsallcode.openfasttrace.api.core.*;
 
@@ -35,7 +34,7 @@ private List<LinkedSpecificationItem> wrapItems(final List<SpecificationItem> it
     {
         return items.stream() //
                 .map(LinkedSpecificationItem::new) //
-                .collect(Collectors.toList());
+                .toList();
     }
 
     /**

core/src/main/java/org/itsallcode/openfasttrace/core/Tracer.java

@@ -1,7 +1,6 @@
 package org.itsallcode.openfasttrace.core;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 import org.itsallcode.openfasttrace.api.core.LinkedSpecificationItem;
 import org.itsallcode.openfasttrace.api.core.Trace;
@@ -33,7 +32,7 @@ public Trace trace(final List<LinkedSpecificationItem> items)
         builder.items(items);
         builder.defectItems(items.stream() //
                 .filter(LinkedSpecificationItem::isDefect) //
-                .collect(Collectors.toList()));
+                .toList());
         return builder.build();
     }
 }

core/src/test/java/org/itsallcode/openfasttrace/core/TestLinkedItemIndex.java

@@ -18,21 +18,21 @@
 @ExtendWith(MockitoExtension.class)
 class TestLinkedItemIndex
 {
-    private final static SpecificationItemId DUPLICATE_ID_1 = SpecificationItemId.createId("type",
+    private static final SpecificationItemId DUPLICATE_ID_1 = SpecificationItemId.createId("type",
             "name", 42);
-    private final static SpecificationItemId DUPLICATE_ID_2 = SpecificationItemId.createId("type",
+    private static final SpecificationItemId DUPLICATE_ID_2 = SpecificationItemId.createId("type",
             "name", 42);
-    private final static SpecificationItemId DUPLICATE_ID_INGORING_VERSION = SpecificationItemId
+    private static final SpecificationItemId DUPLICATE_ID_INGORING_VERSION = SpecificationItemId
             .createId("type", "name", 42 + 1);
-    private final static SpecificationItemId UNIQUE_ID = SpecificationItemId.createId("type2",
+    private static final SpecificationItemId UNIQUE_ID = SpecificationItemId.createId("type2",
             "name2", 42 + 1);
 
     @Mock
     private SpecificationItem duplicateIdItem1Mock, duplicateIdItem2Mock, uniqueIdItemMock,
             duplicateIdIgnoringVersionItemMock;
 
     @BeforeEach
-    public void prepareTest()
+    void prepareTest()
     {
         lenient().when(this.duplicateIdItem1Mock.getId()).thenReturn(DUPLICATE_ID_1);
         lenient().when(this.duplicateIdItem2Mock.getId()).thenReturn(DUPLICATE_ID_2);

core/src/test/java/org/itsallcode/openfasttrace/core/TestLinkedSpecificationItem.java

@@ -31,7 +31,7 @@ class TestLinkedSpecificationItem
     private SpecificationItem itemMock, coveredItemMock, otherItemMock;
 
     @BeforeEach
-    public void prepareAllTests()
+    void prepareAllTests()
     {
         this.linkedItem = new LinkedSpecificationItem(this.itemMock);
         this.coveredLinkedItem = new LinkedSpecificationItem(this.coveredItemMock);

core/src/test/java/org/itsallcode/openfasttrace/core/TestLinker.java

@@ -45,13 +45,13 @@ private List<LinkedSpecificationItem> linkItems(final SpecificationItem... items
 
     private void assertItemUnderTestHasExactlyOneLinkWithStatus(
             final SpecificationItem itemUnderTest, final List<LinkedSpecificationItem> linkedItems,
-            final LinkStatus expected_status)
+            final LinkStatus expectedStatus)
     {
         final Optional<LinkedSpecificationItem> linkedItemUnderTest = findLinkedItem(itemUnderTest,
                 linkedItems);
         if (linkedItemUnderTest.isPresent())
         {
-            assertItemHasExactlyOneLinkWithStatus(linkedItemUnderTest.get(), expected_status);
+            assertItemHasExactlyOneLinkWithStatus(linkedItemUnderTest.get(), expectedStatus);
         }
         else
         {
@@ -92,7 +92,7 @@ void testDetectOutgoingLinkStatusOutdated()
                 .addCoveredId(REQ, "this-is-newer-than-link", 1) //
                 .build();
         final List<LinkedSpecificationItem> linkedItems = linkItems(covering, covered);
-        final Map<LinkStatus, Integer> expectedStatuses = new HashMap<>();
+        final Map<LinkStatus, Integer> expectedStatuses = new EnumMap<>(LinkStatus.class);
         expectedStatuses.put(LinkStatus.OUTDATED, 1);
         expectedStatuses.put(LinkStatus.ORPHANED, 1);
         assertItemHasLinksWithStatus(findLinkedItem(covering, linkedItems).get(), expectedStatuses);
@@ -111,7 +111,7 @@ void testDetectOutgoingLinkStatusPredated()
                 .addCoveredId(REQ, "this-is-older-than-link", 2) //
                 .build();
         final List<LinkedSpecificationItem> linkedItems = linkItems(covering, covered);
-        final Map<LinkStatus, Integer> expectedStatuses = new HashMap<>();
+        final Map<LinkStatus, Integer> expectedStatuses = new EnumMap<>(LinkStatus.class);
         expectedStatuses.put(LinkStatus.PREDATED, 1);
         expectedStatuses.put(LinkStatus.ORPHANED, 1);
         assertItemHasLinksWithStatus(findLinkedItem(covering, linkedItems).get(), expectedStatuses);
@@ -171,7 +171,7 @@ void testDetectIncomingLinkStatusCoveredShallow()
     private void assertItemHasExactlyOneLinkWithStatus(final LinkedSpecificationItem itemUnderTest,
             final LinkStatus expectedStatus)
     {
-        final Map<LinkStatus, Integer> expectedStatuses = new HashMap<>();
+        final Map<LinkStatus, Integer> expectedStatuses = new EnumMap<>(LinkStatus.class);
         expectedStatuses.put(expectedStatus, 1);
         assertItemHasLinksWithStatus(itemUnderTest, expectedStatuses);
     }
@@ -303,7 +303,7 @@ void testCoverageForDifferentArtifactTypes()
                 linkedItems);
         if (linkedCovered.isPresent())
         {
-            final Map<LinkStatus, Integer> expectedLinksOnCovered = new HashMap<>();
+            final Map<LinkStatus, Integer> expectedLinksOnCovered = new EnumMap<>(LinkStatus.class);
             expectedLinksOnCovered.put(COVERED_SHALLOW, 1);
             expectedLinksOnCovered.put(COVERED_UNWANTED, 1);
             assertItemHasLinksWithStatus(linkedCovered.get(), expectedLinksOnCovered);

core/src/test/java/org/itsallcode/openfasttrace/core/TestSpecificationItem.java

@@ -9,7 +9,6 @@
 
 import java.util.Arrays;
 import java.util.List;
-import java.util.stream.Collectors;
 
 import org.itsallcode.openfasttrace.api.core.ItemStatus;
 import org.itsallcode.openfasttrace.api.core.Location;
@@ -25,25 +24,26 @@ class TestSpecificationItem
 {
     private static final String NOT_NEEDED_ARTIFACT_TYPE = "not_needed";
     private static final String NEEDED_ARTIFACT_TYPE = "needed";
-    final static String ARTIFACT_TYPE = "req";
-    final static String NAME = "foobar";
-    final static int REVISION = 1;
-    final static String ID_AS_TEXT = ARTIFACT_TYPE + SpecificationItemId.ARTIFACT_TYPE_SEPARATOR
+    static final String ARTIFACT_TYPE = "req";
+    static final String NAME = "foobar";
+    static final int REVISION = 1;
+    static final String ID_AS_TEXT = ARTIFACT_TYPE + SpecificationItemId.ARTIFACT_TYPE_SEPARATOR
             + NAME + SpecificationItemId.REVISION_SEPARATOR + REVISION;
-    final static SpecificationItemId ID = SpecificationItemId.parseId(ID_AS_TEXT);
-    final static String DESCRIPTION = "This is a description\nwith multiple lines";
-    final static String RATIONALE = "A rationale\nwith multiple lines";
-    final static String COMMENT = "A comment\nwith multiple lines";
-    final static List<SpecificationItemId> COVERED_IDS = parseIds("feat~foo~1", "feat~bar~2",
+    static final SpecificationItemId ID = SpecificationItemId.parseId(ID_AS_TEXT);
+    static final String DESCRIPTION = "This is a description\nwith multiple lines";
+    static final String RATIONALE = "A rationale\nwith multiple lines";
+    static final String COMMENT = "A comment\nwith multiple lines";
+    static final List<SpecificationItemId> COVERED_IDS = parseIds("feat~foo~1", "feat~bar~2",
             "constr~baz~3");
-    final static List<String> NEEDED_ARTIFACT_TYPES = Arrays.asList("dsn", "uman");
-    final static List<SpecificationItemId> DEPEND_ON_IDS = parseIds("req~blah~4", "req~zoo~5");
+    static final List<String> NEEDED_ARTIFACT_TYPES = Arrays.asList("dsn", "uman");
+    static final List<SpecificationItemId> DEPEND_ON_IDS = parseIds("req~blah~4", "req~zoo~5");
     private static final String TITLE = "The title";
 
     private static List<SpecificationItemId> parseIds(final String... ids)
     {
-        return Arrays.asList(ids).stream().map(SpecificationItemId::parseId)
-                .collect(Collectors.toList());
+        return Arrays.stream(ids)
+                .map(SpecificationItemId::parseId)
+                .toList();
     }
 
     // [utest.requirement_format~1]
@@ -213,7 +213,7 @@ void testTagBuilder()
     void testBuildingWithOutIdThrowsExepction()
     {
         final Builder builder = item();
-        assertThrows(IllegalStateException.class, () -> builder.build());
+        assertThrows(IllegalStateException.class, builder::build);
     }
 
     // [utest->dsn~specification-item~3]

core/src/test/java/org/itsallcode/openfasttrace/core/TestTracer.java

@@ -28,7 +28,7 @@ class TestTracer
     LinkedSpecificationItem aMock, bMock, cMock;
 
     @BeforeEach
-    public void prepareTest()
+    void prepareTest()
     {
         lenient().when(this.aMock.getId()).thenReturn(ID_A);
         lenient().when(this.bMock.getId()).thenReturn(ID_B);