Skip to content

Commit

Permalink
Merged PR 65953: Update all non-major dependencies
Browse files Browse the repository at this point in the history
This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [nu.ndw.nls.geometry:nls-geometry](https://spring.io/projects/spring-boot) ([source](https://github.com/spring-projects/spring-boot)) | compile | patch | `3.1.0` -> `3.1.1` |
| [nu.ndw.nls:routing-map-matcher-library](https://spring.io/projects/spring-boot) ([source](https://github.com/spring-projects/spring-boot)) | compile | patch | `13.0.3` -> `13.0.4` |
| [nu.ndw.nls.springboot:openapi](https://spring.io/projects/spring-boot) ([source](https://github.com/spring-projects/spring-boot)) | build | patch | `5.0.7` -> `5.0.8` |
| [nu.ndw.nls.springboot:oauth2-client-credentials](https://spring.io/projects/spring-boot) ([source](https://github.com/spring-projects/spring-boot)) | compile | patch | `5.0.7` -> `5.0.8` |
| [nu.ndw.nls.springboot:test](https://spring.io/projects/spring-boot) ([source](https://github.com/spring-projects/spring-boot)) | test | patch | `5.0.7` -> `5.0.8` |
| [nu.ndw.nls.springboot:security](https://spring.io/projects/spring-boot) ([source](https://github.com/spring-projects/spring-boot)) | compile | patch | `5.0.7` -> `5.0.8` |
| [nu.ndw.nls.springboot:messaging](https://spring.io/projects/spring-boot) ([source](https://github.com/spring-projects/spring-boot)) | compile | patch | `5.0.7` -> `5.0.8` |
| [nu.ndw.nls.springboot:monitoring](https://spring.io/projects/spring-boot) ([source](https://github.com/spring-projects/spring-boot)) | compile | patch | `5.0.7` -> `5.0.8` |
| [nu.ndw.nls.springboot:client-feign](https://spring.io/projects/spring-boot) ([source](https://github.com/spring-projects/spring-boot)) | compile | patch | `5.0.7` -> `5.0.8` |
| [nu.ndw:nls-nwb-data-access-jooq](https://spring.io/projects/spring-boot) ([source](https://github.com/spring-projects/spring-boot)) | compile | patch | `7.1.4` -> `7.1.5` |
| [org.codehaus.mojo:exec-maven-plugin](https://www.mojohaus.org/exec-maven-plugin) ([source](https://github.com/mojohaus/exec-maven-plugin)) | build | minor | `3.4.1` -> `3.5.0` |
| [org.springframework.boot:spring-boot-starter-parent](https://spring.io/projects/spring-boot) ([source](https://github.com/spring-projects/spring-boot)) | parent | patch | `3.3.4` -> `3.3.5` |

---

### Release Notes

<details>
<summary>spring-projects/spring-boot (nu.ndw.nls.geometry:nls-geometry)</summary>

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

[Compare Source](spring-projects/spring-boot@v3.1.0...v3.1.1)

#### 🐞 Bug Fixes

-   Websockets don't work when using WebFlux with Jetty [#&#8203;36009](spring-projects/spring-boot#36009)
-   When using SimpleClientHttpRequestFactory, non-GET requests sent with RestTemplate have the wrong HttpMethod when SSLBundles are used [#&#8203;36007](spring-projects/spring-boot#36007)
-   Spring Boot properties migrator can create circular references [#&#8203;35934...
  • Loading branch information
ndwlocatieservices committed Oct 30, 2024
2 parents 643c6d7 + e752ff9 commit 24eec9b
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import lombok.RequiredArgsConstructor;
import nu.ndw.nls.accessibilitymap.accessibility.graphhopper.IsochroneService;
import nu.ndw.nls.geometry.distance.FractionAndDistanceCalculator;

import nu.ndw.nls.geometry.factories.GeometryFactoryWgs84;
import nu.ndw.nls.routingmapmatcher.isochrone.algorithm.ShortestPathTreeFactory;
import nu.ndw.nls.routingmapmatcher.isochrone.mappers.IsochroneMatchMapper;
import nu.ndw.nls.routingmapmatcher.network.NetworkGraphHopper;
Expand All @@ -24,10 +24,12 @@ public class IsochroneServiceFactory {

private final FractionAndDistanceCalculator fractionAndDistanceCalculator;

private final GeometryFactoryWgs84 geometryFactory;

public IsochroneService createService(NetworkGraphHopper network) {
EncodingManager encodingManager = network.getEncodingManager();
IsochroneMatchMapper isochroneMatchMapper = new IsochroneMatchMapper(encodingManager,
edgeIteratorStateReverseExtractor, new PointListUtil(), fractionAndDistanceCalculator);
edgeIteratorStateReverseExtractor, new PointListUtil(geometryFactory), fractionAndDistanceCalculator);
Weighting weighting = network.createWeighting(PROFILE, new PMap());
ShortestPathTreeFactory shortestPathTreeFactory = new ShortestPathTreeFactory(weighting,encodingManager);
return new IsochroneService(encodingManager, isochroneMatchMapper, shortestPathTreeFactory);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
import java.util.stream.Collectors;
import java.util.stream.Stream;
import lombok.extern.slf4j.Slf4j;
import nu.ndw.nls.accessibilitymap.backend.exceptions.IncompleteArgumentsException;
import nu.ndw.nls.accessibilitymap.accessibility.exceptions.ResourceNotFoundException;
import nu.ndw.nls.accessibilitymap.backend.exceptions.IncompleteArgumentsException;
import nu.ndw.nls.accessibilitymap.backend.exceptions.VehicleTypeNotSupportedException;
import nu.ndw.nls.accessibilitymap.backend.exceptions.VehicleWeightRequiredException;
import nu.ndw.nls.accessibilitymap.backend.generated.model.v1.APIErrorJson;
Expand Down Expand Up @@ -60,7 +60,7 @@ public ResponseEntity<APIErrorJson> handleBadRequestException(RuntimeException e
public ResponseEntity<APIErrorJson> handleMethodArgumentTypeMismatchException(
MethodArgumentTypeMismatchException exception) {
APIErrorJson restError = new APIErrorJson()
.message("'" + exception.getPropertyName() + "' " + exception.getMessage());
.message(exception.getMessage());
return ResponseEntity.badRequest()
.body(restError);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,12 @@ void handleAccessDenied_ok() {

@Test
void handleMethodArgumentTypeMismatchException_ok() {
when(methodArgumentTypeMismatchException.getPropertyName()).thenReturn(PROPERTY_NAME);
when(methodArgumentTypeMismatchException.getMessage()).thenReturn(MESSAGE);
ResponseEntity<APIErrorJson> response = errorHandlerController
.handleMethodArgumentTypeMismatchException(methodArgumentTypeMismatchException);
assertThat(response.getStatusCode()).isEqualTo(HttpStatus.BAD_REQUEST);
assertThat(response.getBody()).isNotNull();
assertThat(response.getBody().getMessage()).isEqualTo("'" + PROPERTY_NAME + "' " + MESSAGE);
assertThat(response.getBody().getMessage()).isEqualTo(MESSAGE);
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,17 @@ public AccessibilityMapFactory accessibilityMapFactory() {
RestrictionMapperProvider restrictionMapperProvider = new RestrictionMapperProvider();
VehicleRestrictionsModelFactory vehicleRestrictionsModelFactory = new VehicleRestrictionsModelFactory(
restrictionMapperProvider);

EdgeIteratorStateReverseExtractor edgeIteratorStateReverseExtractor = new EdgeIteratorStateReverseExtractor();
GeodeticCalculatorFactory geodeticCalculatorFactory = new GeodeticCalculatorFactory();
IsochroneServiceFactory isochroneServiceFactory = new IsochroneServiceFactory(
edgeIteratorStateReverseExtractor, new FractionAndDistanceCalculator(geodeticCalculatorFactory,
List.of(new GeometryFactoryWgs84()), new BearingCalculator(geodeticCalculatorFactory)));
edgeIteratorStateReverseExtractor,
new FractionAndDistanceCalculator(
geodeticCalculatorFactory,
List.of(new GeometryFactoryWgs84()),
new BearingCalculator(geodeticCalculatorFactory)),
new GeometryFactoryWgs84());

return new AccessibilityMapFactory(vehicleRestrictionsModelFactory, isochroneServiceFactory);
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"message": "'vehicleHasTrailer' Failed to convert value of type 'java.lang.String' to required type 'java.lang.Boolean'; Invalid boolean value [2]"
"message": "Method parameter 'vehicleHasTrailer': Failed to convert value of type 'java.lang.String' to required type 'java.lang.Boolean'; Invalid boolean value [2]"
}
12 changes: 6 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.4</version>
<version>3.3.5</version>
</parent>
<groupId>nu.ndw.nls.accessibilitymap</groupId>
<artifactId>parent</artifactId>
Expand All @@ -22,7 +22,7 @@
</modules>
<properties>
<java.version>21</java.version>
<exec-maven-plugin.version>3.4.1</exec-maven-plugin.version>
<exec-maven-plugin.version>3.5.0</exec-maven-plugin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<jackson-databind-nullable.version>0.2.6</jackson-databind-nullable.version>
Expand All @@ -38,10 +38,10 @@
<stream-utils.version>1.3.1</stream-utils.version>
<swagger-annotations.version>2.2.25</swagger-annotations.version>
<nls-events.version>5.0.6</nls-events.version>
<nls-nwb-data-access.version>7.1.4</nls-nwb-data-access.version>
<nls-springboot.version>5.0.7</nls-springboot.version>
<nls-routing-map-matcher.version>13.0.3</nls-routing-map-matcher.version>
<nls-geometry.version>3.1.0</nls-geometry.version>
<nls-nwb-data-access.version>7.1.5</nls-nwb-data-access.version>
<nls-springboot.version>5.0.8</nls-springboot.version>
<nls-routing-map-matcher.version>13.0.4</nls-routing-map-matcher.version>
<nls-geometry.version>3.1.1</nls-geometry.version>
<jackson-geojson.version>1.14</jackson-geojson.version>
<jsurfer-jackson.version>1.6.5</jsurfer-jackson.version>
<json-unit.version>3.4.1</json-unit.version>
Expand Down

0 comments on commit 24eec9b

Please sign in to comment.