Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: update cached dspace jsonld document #4292

Merged
merged 3 commits into from
Jun 20, 2024
Merged

feat: update cached dspace jsonld document #4292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
849cb05
feat: update cached dspace jsonld document
ndr-brt Jun 20, 2024
18c7457
dependencies
ndr-brt Jun 20, 2024
41ef5c7
improve log
ndr-brt Jun 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DEPENDENCIES
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
maven/mavencentral/com.apicatalog/carbon-did/0.3.0, Apache-2.0, approved, clearlydefined

Check warning on line 1 in DEPENDENCIES

View workflow job for this annotation

GitHub Actions / check / Dash-Verify-Licenses

Restricted Dependencies found 

Some dependencies are marked 'restricted' - please review them
maven/mavencentral/com.apicatalog/copper-multibase/0.5.0, Apache-2.0, approved, #14501
maven/mavencentral/com.apicatalog/copper-multicodec/0.1.1, Apache-2.0, approved, #14500
maven/mavencentral/com.apicatalog/iron-ed25519-cryptosuite-2020/0.14.0, Apache-2.0, approved, #14503
Expand Down Expand Up @@ -47,7 +47,7 @@
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
Expand Down
8 changes: 4 additions & 4 deletions .../main/java/org/eclipse/edc/connector/core/validator/DataAddressValidatorRegistryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,17 @@ public void registerDestinationValidator(String type, Validator<DataAddress> 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();
}
}
2 changes: 1 addition & 1 deletion extensions/common/json-ld/src/main/resources/document/dspace.jsonld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
}
Expand Down
Loading