From fabdba7f810f74842ad719ab0cb1b90fd3850cdf Mon Sep 17 00:00:00 2001 From: ndr_brt Date: Fri, 12 Jul 2024 10:15:49 +0200 Subject: [PATCH 1/2] docs: remove deprecation typo --- .../src/main/resources/management-api-version.json | 4 ++-- .../controlplane/api/management/edr/v3/EdrCacheApiV3.java | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/extensions/common/api/management-api-configuration/src/main/resources/management-api-version.json b/extensions/common/api/management-api-configuration/src/main/resources/management-api-version.json index a0c6b247b00..b81ce529dea 100644 --- a/extensions/common/api/management-api-configuration/src/main/resources/management-api-version.json +++ b/extensions/common/api/management-api-configuration/src/main/resources/management-api-version.json @@ -1,8 +1,8 @@ [ { - "version": "3.0.2", + "version": "3.0.3", "urlPath": "/v3", - "lastUpdated": "2024-07-10T09:17:00Z", + "lastUpdated": "2024-07-12T10:14:00Z", "maturity": "stable" }, { diff --git a/extensions/control-plane/api/management-api/edr-cache-api/src/main/java/org/eclipse/edc/connector/controlplane/api/management/edr/v3/EdrCacheApiV3.java b/extensions/control-plane/api/management-api/edr-cache-api/src/main/java/org/eclipse/edc/connector/controlplane/api/management/edr/v3/EdrCacheApiV3.java index 2db7220c69c..ff8bf4c4f09 100644 --- a/extensions/control-plane/api/management-api/edr-cache-api/src/main/java/org/eclipse/edc/connector/controlplane/api/management/edr/v3/EdrCacheApiV3.java +++ b/extensions/control-plane/api/management-api/edr-cache-api/src/main/java/org/eclipse/edc/connector/controlplane/api/management/edr/v3/EdrCacheApiV3.java @@ -55,8 +55,7 @@ public interface EdrCacheApiV3 { content = @Content(array = @ArraySchema(schema = @Schema(implementation = ApiCoreSchema.ApiErrorDetailSchema.class)))), @ApiResponse(responseCode = "404", description = "An EDR data address with the given transfer process ID does not exist", content = @Content(array = @ArraySchema(schema = @Schema(implementation = ApiCoreSchema.ApiErrorDetailSchema.class)))) - }, - deprecated = true + } ) JsonObject getEdrEntryDataAddressV3(String transferProcessId); From 4b4c10a540f88890ea05f8171265715ed8684b1c Mon Sep 17 00:00:00 2001 From: ndr_brt Date: Fri, 12 Jul 2024 10:46:23 +0200 Subject: [PATCH 2/2] fix test --- .../edc/test/e2e/versionapi/VersionApiEndToEndTest.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/system-tests/version-api/version-api-test-runner/src/test/java/org/eclipse/edc/test/e2e/versionapi/VersionApiEndToEndTest.java b/system-tests/version-api/version-api-test-runner/src/test/java/org/eclipse/edc/test/e2e/versionapi/VersionApiEndToEndTest.java index 0564d289e4a..f96a5a47c4d 100644 --- a/system-tests/version-api/version-api-test-runner/src/test/java/org/eclipse/edc/test/e2e/versionapi/VersionApiEndToEndTest.java +++ b/system-tests/version-api/version-api-test-runner/src/test/java/org/eclipse/edc/test/e2e/versionapi/VersionApiEndToEndTest.java @@ -36,9 +36,6 @@ public class VersionApiEndToEndTest { abstract static class Tests { - Tests() { - } - @Test void getVersion() { @@ -55,7 +52,7 @@ void getVersion() { assertThat(result).containsKeys("management", "version", "control", "observability", "sts"); assertThat(result.get("management")).hasSize(2) - .anyMatch(vr -> vr.version().equals("3.0.2") && vr.maturity().equals("stable")) + .anyMatch(vr -> vr.version().startsWith("3.") && vr.maturity().equals("stable")) .anyMatch(vr -> vr.version().equals("3.1.0-alpha") && vr.maturity().equals("alpha")); assertThat(result.get("version")).hasSize(1).anyMatch(vr -> vr.version().equals("1.0.0")); assertThat(result.get("observability")).hasSize(1).anyMatch(vr -> vr.version().equals("1.0.0"));