Skip to content

Commit

Permalink
Merged PR 68628: 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.locationdataissuesapi:client-feign](https://dev.azure.com/ndwnu/NLS/_git/nls-location-data-issues) ([source](https://dev.azure.com/ndwnu/NLS/_git/nls-location-data-issues)) | compile | patch | `1.0.14` -> `1.0.15` |
| nu.ndw.nls.geojson.geometry:specification |  | patch | `1.3.5` -> `1.3.8` |
| nu.ndw.nls.geojson.geometry:specification-open-api-config |  | patch | `1.3.5` -> `1.3.8` |
| nu.ndw.nls.geojson.geometry:geometry-model | compile | patch | `1.3.5` -> `1.3.8` |
| nu.ndw.nls.geojson.geometry:specification | compile | patch | `1.3.5` -> `1.3.8` |
| nu.ndw.nls.geojson.geometry:geometry-jts | compile | patch | `1.3.5` -> `1.3.8` |
| [nu.ndw.nls:routing-map-matcher-library](https://github.com/ndwnu/nls-routing-map-matcher) | compile | minor | `13.2.4` -> `13.3.0` |
| [io.swagger.core.v3:swagger-annotations](https://github.com/swagger-api/swagger-core) | compile | patch | `2.2.26` -> `2.2.27` |

---

### Release Notes

<details>
<summary>swagger-api/swagger-core (io.swagger.core.v3:swagger-annotations)</summary>

### [`v2.2.27`](https://github.com/swagger-api/swagger-core/releases/tag/v2.2.27): Swagger-core 2.2.27 released!

[Compare Source](swagger-api/swagger-core@v2.2.26...v2.2.27)

-   fix: swagger-api/swagger-ui#10220 ([#&#8203;4806](swagger-api/swagger-core#4806))
-   Fix for record component annotations on fields with JsonProperty annotations ([#&#8203;4795](swagger-api/swagger-core#4795))
-   Fix java.lang.NullPointerException and remove stack trace output from ModelResolver ([#&#8203;4793](swagger-api/swagger-core#4793))
-   Move applySchemaResolution check to a method ([#&#8203;4791](swagger-api/swagger-core#4791))
-   feat(gradle-plugin): enable lazy evaluation, implicit task dependencies and fixing `setEncoding` ([#&#8203;4761](swagger-api/swagger-core#4761))

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or PR is renamed to start with "rebase!".

👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://github.com/renovatebot/renovate/discussions) if that's undesired.

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
  • Loading branch information
ndwlocatieservices committed Dec 16, 2024
2 parents 2f54edd + 3f6ef49 commit 80be285
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import java.util.List;
import nu.ndw.nls.accessibilitymap.shared.model.AccessibilityLink;
import nu.ndw.nls.routingmapmatcher.network.annotations.mappers.EncodedValuesMapper;
import nu.ndw.nls.routingmapmatcher.network.annotations.model.EncodedValueDto;
import nu.ndw.nls.routingmapmatcher.network.annotations.model.EncodedValuesByTypeDto;
import org.springframework.stereotype.Component;

Expand Down Expand Up @@ -42,14 +43,20 @@ void setValueOnEdge(EdgeIteratorState edgeIterator, String key, Object value) {

void resetRestrictionsOnEdge(EdgeIterator edgeIterator) {
boolean reverse = edgeIteratorStateReverseExtractor.hasReversed(edgeIterator);
encodedValuesByTypeDto.keySet().stream()
encodedValuesByTypeDto.getNetworkEncodedValueNameKeySet().stream()
.filter(key -> !EXCLUDED_KEYS.contains(key))
.map(key -> encodedValuesByTypeDto.get(getDatatypeClassFromKey(key), key))
.map(this::mapToEncodedValueDto)
.forEach(encodedValueDto -> getEdgeSetter(encodedValueDto.valueType())
.setDefaultValue(edgeIterator, encodedValueDto.key(), reverse));

}

private EncodedValueDto<?, ?> mapToEncodedValueDto(String key) {
return encodedValuesByTypeDto.getByKey(getDatatypeClassFromKey(key), key)
.orElseThrow(() -> new IllegalArgumentException(
"Could not find value by class %s and key: %s".formatted(getDatatypeClassFromKey(key), key)));
}

private EdgeSetter<?, ?> getEdgeSetter(Class<?> datatypeClass) {
return edgeSetterRegistry.getEdgeSetter(datatypeClass)
.orElseThrow(() -> new IllegalArgumentException("No EdgeSetter found for %s"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,10 @@ void setValueOnEdge_exception_no_edgeSetter() {
@Test
void resetRestrictionsOnEdge_ok() {
when(reverseExtractor.hasReversed(edgeIterator)).thenReturn(false);
when(encodedValuesByTypeDto.keySet()).thenReturn(Set.of(KEY));
when(encodedValuesByTypeDto.getNetworkEncodedValueNameKeySet()).thenReturn(Set.of(KEY));
when(encodedValuesByTypeDto.getValueTypeByKey(KEY)).thenReturn(Optional.of(Boolean.class));
when(edgeSetterRegistry.getEdgeSetter(Boolean.class)).thenReturn(Optional.of(edgeSetter));
when(encodedValuesByTypeDto.get(Boolean.class, KEY)).thenReturn(encodedValueDto);
when(encodedValuesByTypeDto.getByKey(Boolean.class, KEY)).thenReturn(Optional.of(encodedValueDto));
when(encodedValueDto.valueType()).thenReturn(Boolean.class);
when(encodedValueDto.key()).thenReturn(KEY);

Expand All @@ -104,7 +104,7 @@ void resetRestrictionsOnEdge_ok() {
@Test
void resetRestrictionsOnEdge_ok_noResults() {
when(reverseExtractor.hasReversed(edgeIterator)).thenReturn(false);
when(encodedValuesByTypeDto.keySet()).thenReturn(Set.of(TRAFFIC_SIGN_ID, WAY_ID_KEY, REVERSED_LINK_ID));
when(encodedValuesByTypeDto.getNetworkEncodedValueNameKeySet()).thenReturn(Set.of(TRAFFIC_SIGN_ID, WAY_ID_KEY, REVERSED_LINK_ID));

edgeManager.resetRestrictionsOnEdge(edgeIterator);

Expand Down
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,18 +41,18 @@
<spring-cloud-contract-wiremock.version>4.2.0</spring-cloud-contract-wiremock.version>
<springdoc.version>2.7.0</springdoc.version>
<stream-utils.version>1.3.1</stream-utils.version>
<swagger-annotations.version>2.2.26</swagger-annotations.version>
<swagger-annotations.version>2.2.27</swagger-annotations.version>
<nls-events.version>5.0.8</nls-events.version>
<nls-nwb-data-access.version>7.1.15</nls-nwb-data-access.version>
<nls-springboot.version>7.3.2</nls-springboot.version>
<nls-routing-map-matcher.version>13.2.4</nls-routing-map-matcher.version>
<nls-routing-map-matcher.version>13.3.0</nls-routing-map-matcher.version>
<nls-geometry.version>3.2.6</nls-geometry.version>
<nls-geojson-geometry.version>1.3.5</nls-geojson-geometry.version>
<nls-geojson-geometry.version>1.3.8</nls-geojson-geometry.version>
<jackson-geojson.version>1.14</jackson-geojson.version>
<jsurfer-jackson.version>1.6.5</jsurfer-jackson.version>
<json-unit.version>4.1.0</json-unit.version>
<cucumber.version>7.20.1</cucumber.version>
<location-data-issues.version>1.0.14</location-data-issues.version>
<location-data-issues.version>1.0.15</location-data-issues.version>
<unirest-java.version>1.4.9</unirest-java.version>
<yaml-combine-maven-plugin.version>2.0.8</yaml-combine-maven-plugin.version>
</properties>
Expand Down

0 comments on commit 80be285

Please # to comment.