From 849cb05c4faf692842f2919e5338b0039ed86806 Mon Sep 17 00:00:00 2001 From: ndr_brt Date: Thu, 20 Jun 2024 12:05:54 +0200 Subject: [PATCH 1/3] feat: update cached dspace jsonld document --- .../common/json-ld/src/main/resources/document/dspace.jsonld | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/common/json-ld/src/main/resources/document/dspace.jsonld b/extensions/common/json-ld/src/main/resources/document/dspace.jsonld index f475b23504f..f26eaff0285 100644 --- a/extensions/common/json-ld/src/main/resources/document/dspace.jsonld +++ b/extensions/common/json-ld/src/main/resources/document/dspace.jsonld @@ -55,7 +55,7 @@ "odrl:leftOperand": { "@type": "@id" }, "odrl:operator": { "@type": "@id" }, "odrl:rightOperandReference": { "@type": "@id" }, - "odrl:profile": { "@container": "@set" } + "odrl:profile": { "@container": "@set" }, "odrl:assigner": { "@type": "@id" }, "odrl:assignee": { "@type": "@id" } } From 18c74570e0eae530e8151d132772ccf1632ef607 Mon Sep 17 00:00:00 2001 From: ndr_brt Date: Thu, 20 Jun 2024 12:10:19 +0200 Subject: [PATCH 2/3] dependencies --- DEPENDENCIES | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPENDENCIES b/DEPENDENCIES index 654e6cfec2c..bdbc47487c7 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -47,7 +47,7 @@ maven/mavencentral/com.github.docker-java/docker-java-transport-zerodep/3.3.6, A maven/mavencentral/com.github.docker-java/docker-java-transport/3.3.6, Apache-2.0, approved, #7942 maven/mavencentral/com.github.java-json-tools/btf/1.3, Apache-2.0 AND GPL-1.0-or-later AND LGPL-3.0-only AND Apache-2.0 AND LGPL-3.0-only, restricted, #15201 maven/mavencentral/com.github.java-json-tools/jackson-coreutils-equivalence/1.0, LGPL-3.0 OR Apache-2.0, approved, clearlydefined -maven/mavencentral/com.github.java-json-tools/jackson-coreutils/2.0, Apache-2.0 AND LGPL-2.1-or-later AND LGPL-3.0-only AND (Apache-2.0 AND GPL-1.0-or-later AND LGPL-3.0-only) AND Apache-2.0 AND LGPL-3.0-only, restricted, #15186 +maven/mavencentral/com.github.java-json-tools/jackson-coreutils/2.0, Apache-2.0 OR LGPL-3.0-or-later, approved, #15186 maven/mavencentral/com.github.java-json-tools/json-patch/1.13, Apache-2.0 OR LGPL-3.0-or-later, approved, CQ23929 maven/mavencentral/com.github.java-json-tools/json-schema-core/1.2.14, Apache-2.0 AND LGPL-2.1-or-later AND LGPL-3.0-only AND (Apache-2.0 AND GPL-1.0-or-later AND LGPL-3.0-only) AND Apache-2.0 AND LGPL-3.0-only, restricted, #15282 maven/mavencentral/com.github.java-json-tools/json-schema-validator/2.2.14, Apache-2.0 OR LGPL-3.0-or-later, approved, CQ20779 From 41ef5c78d63cd0719c317eb6b58591059b74455a Mon Sep 17 00:00:00 2001 From: ndr_brt Date: Thu, 20 Jun 2024 13:34:38 +0200 Subject: [PATCH 3/3] improve log --- .../core/validator/DataAddressValidatorRegistryImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/common/connector-core/src/main/java/org/eclipse/edc/connector/core/validator/DataAddressValidatorRegistryImpl.java b/core/common/connector-core/src/main/java/org/eclipse/edc/connector/core/validator/DataAddressValidatorRegistryImpl.java index fd7d726cb4b..b23619ab9f5 100644 --- a/core/common/connector-core/src/main/java/org/eclipse/edc/connector/core/validator/DataAddressValidatorRegistryImpl.java +++ b/core/common/connector-core/src/main/java/org/eclipse/edc/connector/core/validator/DataAddressValidatorRegistryImpl.java @@ -46,17 +46,17 @@ public void registerDestinationValidator(String type, Validator val @Override public ValidationResult validateSource(DataAddress dataAddress) { - return sourceValidators.getOrDefault(dataAddress.getType(), d -> warning("source")).validate(dataAddress); + return sourceValidators.getOrDefault(dataAddress.getType(), d -> warning("source", dataAddress)).validate(dataAddress); } @Override public ValidationResult validateDestination(DataAddress dataAddress) { - return destinationValidators.getOrDefault(dataAddress.getType(), d -> warning("destination")).validate(dataAddress); + return destinationValidators.getOrDefault(dataAddress.getType(), d -> warning("destination", dataAddress)).validate(dataAddress); } @NotNull - private ValidationResult warning(String type) { - monitor.warning("No %s DataAddress validator has been registered, please register one as it is strongly recommended.".formatted(type)); + private ValidationResult warning(String type, DataAddress dataAddress) { + monitor.warning("No %s DataAddress validator has been registered for type %s, please register one as it is strongly recommended.".formatted(type, dataAddress.getType())); return ValidationResult.success(); } }