Merged PR 71016: Update all non-major dependencies

This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [nu.ndw.nls.springboot:test](https://dev.azure.com/ndwnu/NLS/_git/nls-springboot) ([source](https://dev.azure.com/ndwnu/NLS/_git/nls-springboot)) | test | patch | `8.0.1` -> `8.0.2` |
| [com.google.guava:guava](https://github.com/google/guava) | compile | minor | `33.3.1-jre` -> `33.4.0-jre` |
| [org.springframework.boot:spring-boot-starter-parent](https://spring.io/projects/spring-boot) ([source](https://github.com/spring-projects/spring-boot)) | parent | patch | `3.4.0` -> `3.4.1` |

---

### Release Notes

<details>
<summary>spring-projects/spring-boot (org.springframework.boot:spring-boot-starter-parent)</summary>

### [`v3.4.1`](https://github.com/spring-projects/spring-boot/releases/tag/v3.4.1)

[Compare Source](spring-projects/spring-boot@v3.4.0...v3.4.1)

##### 🐞 Bug Fixes

-   KafkaProperties fail to build SSL properties when the bundle name is an empty string [#&#8203;43563](spring-projects/spring-boot#43563)
-   Diagnostics are poor when property resolution throws a ConversionFailedException [#&#8203;43559](spring-projects/spring-boot#43559)
-   SpringApplicationShutdownHandlers do not run in deterministic order [#&#8203;43536](spring-projects/spring-boot#43536)
-   Unable to find a `@SpringBootConfiguration` results in misleading error message [#&#8203;43507](spring-projects/spring-boot#43507)
-   With multiple ResourceHandlerRegistrationCustomizer beans in the context, only one of them is used [#&#8203;43497](spring-projects/spring-boot#43497)
-   Unable to use Docker Compose support when mixing dedicated and shared services [#&#8203;43472](spring-projects/spring-boot#43472)
-   Kafka dependency management does not include the kafka-server module [#&#8203;43454](spring-projects/spring-boot#43454)
-   Docker API version is incorrectly reported when '/\_ping\` calls fail and version should be fixed [#&#8203;43452](spring-projects/spring-boot#43452)
-   Methods to build producer / consumer properties from KafkaProperties are inconvienenent to use without an SSL bundle [#&#8203;43448](spring-projects/spring-boot#43448)
-   Failures in -Djarmode=tools do not consistently return a non-zero exit [#&#8203;43436](spring-projects/spring-boot#43436)
-   HttpComponentsClientHttpRequestFactoryBuilder replaces the existing defaultRequestConfigCustomizer rather than adding to it [#&#8203;43429](spring-projects/spring-boot#43429)
-   spring-boot-maven-plugin sets imagePlatform even if it's empty [#&#8203;43424](spring-projects/spring-boot#43424)
-   OnBeanCondition fails to match on annotations when using Scoped ...

Author: ndwlocatieservices

map-matcher-geometry/pom.xml

@@ -39,11 +39,6 @@
             <artifactId>mockito-junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-library</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>

map-matcher-library/pom.xml

@@ -58,10 +58,6 @@
             <groupId>jakarta.persistence</groupId>
             <artifactId>jakarta.persistence-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
@@ -82,11 +78,6 @@
             <artifactId>mockito-junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-library</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>

map-matcher-library/src/main/java/nu/ndw/nls/routingmapmatcher/network/init/NetworkReader.java

@@ -1,7 +1,5 @@
 package nu.ndw.nls.routingmapmatcher.network.init;
 
-
-import com.google.common.base.Preconditions;
 import com.graphhopper.coll.LongLongMap;
 import com.graphhopper.routing.ev.EdgeIntAccess;
 import com.graphhopper.routing.util.parsers.TagParser;
@@ -13,6 +11,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.function.Supplier;
 import lombok.extern.slf4j.Slf4j;
 import nu.ndw.nls.routingmapmatcher.network.model.Link;
@@ -37,11 +36,10 @@ public NetworkReader(BaseGraph baseGraph, Supplier<Iterator<? extends Link>> lin
             List<TagParser> wayTagParsers, LongLongMap nodeIdToInternalNodeIdMap, Map<Long, Integer> edgeMap,
             boolean expandBounds) {
         this.linkSupplier = linkSupplier;
-        this.nodeIdToInternalNodeIdMap = Preconditions.checkNotNull(nodeIdToInternalNodeIdMap);
-        this.wayTagParsers = Preconditions.checkNotNull(wayTagParsers);
-        this.baseGraph = Preconditions.checkNotNull(baseGraph);
+        this.nodeIdToInternalNodeIdMap = Objects.requireNonNull(nodeIdToInternalNodeIdMap);
+        this.wayTagParsers = Objects.requireNonNull(wayTagParsers);
+        this.baseGraph = Objects.requireNonNull(baseGraph);
         this.edgeIntAccess = baseGraph.createEdgeIntAccess();
-
         this.edgeMap = edgeMap;
         this.expandBounds = expandBounds;
     }

map-matcher-library/src/main/java/nu/ndw/nls/routingmapmatcher/singlepoint/SinglePointMapMatcher.java

@@ -6,8 +6,6 @@
 import static nu.ndw.nls.routingmapmatcher.util.MatchUtil.getQueryResults;
 import static nu.ndw.nls.routingmapmatcher.util.PathUtil.determineEdgeDirection;
 
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
 import com.graphhopper.config.Profile;
 import com.graphhopper.routing.util.EncodingManager;
 import com.graphhopper.routing.util.FiniteWeightFilter;
@@ -21,6 +19,7 @@
 import com.graphhopper.util.FetchMode;
 import com.graphhopper.util.PMap;
 import java.util.List;
+import java.util.Objects;
 import nu.ndw.nls.geometry.bearing.BearingCalculator;
 import nu.ndw.nls.geometry.distance.FractionAndDistanceCalculator;
 import nu.ndw.nls.geometry.factories.GeometryFactoryWgs84;
@@ -67,8 +66,8 @@ public SinglePointMapMatcher(DiameterToPolygonMapper diameterToPolygonMapper,
             String profileName, ClosestPointService closestPointService,
             PointListUtil pointListUtil) {
         this.diameterToPolygonMapper = diameterToPolygonMapper;
-        this.network = Preconditions.checkNotNull(network);
-        this.profile = Preconditions.checkNotNull(network.getProfile(profileName));
+        this.network = Objects.requireNonNull(network);
+        this.profile = Objects.requireNonNull(network.getProfile(profileName));
         this.locationIndexTree = network.getLocationIndex();
         BaseGraph baseGraph = network.getBaseGraph();
         EncodingManager encodingManager = network.getEncodingManager();
@@ -92,7 +91,7 @@ private PMap createShortestDistanceHints() {
     }
 
     public SinglePointMatch match(SinglePointLocation singlePointLocation) {
-        Preconditions.checkNotNull(singlePointLocation);
+        Objects.requireNonNull(singlePointLocation);
         Weighting matchWeighting = network.createWeighting(profile, new PMap());
         Point inputPoint = singlePointLocation.getPoint();
         double inputRadius = singlePointLocation.getCutoffDistance();
@@ -211,7 +210,7 @@ private List<MatchedPoint> calculateMatches(EdgeIteratorState edge, Polygon circ
     private SinglePointMatch createFailedMatch(SinglePointLocation singlePointLocation) {
         return SinglePointMatch.builder()
                 .id(singlePointLocation.getId())
-                .candidateMatches(Lists.newArrayList())
+                .candidateMatches(List.of())
                 .reliability(0.0)
                 .status(MatchStatus.NO_MATCH)
                 .build();

map-matcher-library/src/main/java/nu/ndw/nls/routingmapmatcher/starttoend/StartToEndMapMatcher.java

@@ -3,7 +3,6 @@
 import static com.graphhopper.util.Parameters.Algorithms.DIJKSTRA_BI;
 import static nu.ndw.nls.routingmapmatcher.util.MatchUtil.getQueryResults;
 
-import com.google.common.base.Preconditions;
 import com.graphhopper.config.Profile;
 import com.graphhopper.routing.AlgorithmOptions;
 import com.graphhopper.routing.Path;
@@ -25,6 +24,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import nu.ndw.nls.geometry.distance.FractionAndDistanceCalculator;
 import nu.ndw.nls.routingmapmatcher.domain.MapMatcher;
 import nu.ndw.nls.routingmapmatcher.model.MatchStatus;
@@ -55,8 +55,8 @@ public class StartToEndMapMatcher implements MapMatcher<LineStringLocation, Line
 
     public StartToEndMapMatcher(NetworkGraphHopper networkGraphHopper, String profileName,
             FractionAndDistanceCalculator fractionAndDistanceCalculator, PointListUtil pointListUtil) {
-        this.networkGraphHopper = Preconditions.checkNotNull(networkGraphHopper);
-        Profile profile = Preconditions.checkNotNull(networkGraphHopper.getProfile(profileName));
+        this.networkGraphHopper = Objects.requireNonNull(networkGraphHopper);
+        Profile profile = Objects.requireNonNull(networkGraphHopper.getProfile(profileName));
         this.routingGraph = networkGraphHopper.getBaseGraph();
         this.algorithmOptions = new AlgorithmOptions()
                 .setAlgorithm(DIJKSTRA_BI)
@@ -75,7 +75,7 @@ private PMap createShortestDistanceHints() {
     }
 
     public LineStringMatch match(LineStringLocation lineStringLocation) {
-        Preconditions.checkNotNull(lineStringLocation);
+        Objects.requireNonNull(lineStringLocation);
 
         List<Snap> startCandidates = findCandidates(lineStringLocation.getGeometry().getStartPoint());
         List<Snap> endCandidates = findCandidates(lineStringLocation.getGeometry().getEndPoint());

map-matcher-library/src/main/java/nu/ndw/nls/routingmapmatcher/viterbi/ViterbiLineStringMapMatcher.java

@@ -2,7 +2,6 @@
 
 import static nu.ndw.nls.routingmapmatcher.util.MatchUtil.getQueryResults;
 
-import com.google.common.base.Preconditions;
 import com.graphhopper.config.Profile;
 import com.graphhopper.matching.MapMatching;
 import com.graphhopper.matching.MatchResult;
@@ -24,6 +23,7 @@
 import com.graphhopper.util.shapes.GHPoint;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import lombok.extern.slf4j.Slf4j;
 import nu.ndw.nls.geometry.distance.FractionAndDistanceCalculator;
 import nu.ndw.nls.geometry.factories.GeometryFactoryWgs84;
@@ -85,19 +85,18 @@ public class ViterbiLineStringMapMatcher implements
     public ViterbiLineStringMapMatcher(NetworkGraphHopper networkGraphHopper, String profileName,
             GeometryFactoryWgs84 geometryFactoryWgs84, FractionAndDistanceCalculator fractionAndDistanceCalculator,
             PointListUtil pointListUtil) {
-        this.networkGraphHopper = Preconditions.checkNotNull(networkGraphHopper);
+        this.networkGraphHopper = Objects.requireNonNull(networkGraphHopper);
         this.locationIndexTree = networkGraphHopper.getLocationIndex();
         this.geometryFactoryWgs84 = geometryFactoryWgs84;
-        this.profile = Preconditions.checkNotNull(networkGraphHopper.getProfile(profileName));
-        this.lineStringMatchUtil = new LineStringMatchUtil(networkGraphHopper, this.profile,
-                fractionAndDistanceCalculator, pointListUtil);
+        this.profile = Objects.requireNonNull(networkGraphHopper.getProfile(profileName));
+        this.lineStringMatchUtil = new LineStringMatchUtil(networkGraphHopper, this.profile, fractionAndDistanceCalculator, pointListUtil);
         this.lineStringScoreUtil = new LineStringScoreUtil(fractionAndDistanceCalculator);
         this.pointListUtil = pointListUtil;
     }
 
     @Override
     public LineStringMatch match(LineStringLocation lineStringLocation) {
-        Preconditions.checkNotNull(lineStringLocation);
+        Objects.requireNonNull(lineStringLocation);
         PointList pointList = PointList.fromLineString(lineStringLocation.getGeometry());
         var simplifier = new RamerDouglasPeucker();
         simplifier.setMaxDistance(LINE_SMOOTHING_TOLERANCE);

map-matcher-library/src/test/java/nu/ndw/nls/routingmapmatcher/singlepoint/PointMatchingServiceIT.java

@@ -182,7 +182,7 @@ void calculateMatches_with_no_matching_bearing_should_produce_no_match() {
                 .travelDirection(EdgeIteratorTravelDirection.BOTH_DIRECTIONS)
                 .build();
         var matches = pointMatchingService.calculateMatches(request);
-        assertThat(matches).hasSize(0);
+        assertThat(matches).isEmpty();
     }
 
     @Test