Skip to content

Commit 9f33db9

Browse files
authored
fix: typo dcat:endpointUrl (#4524)
fix: adds dcat:endpointURL and deprecate dcat:endpointUrl in DataService transformer
1 parent f449c33 commit 9f33db9

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

data-protocols/dsp/dsp-catalog/dsp-catalog-transform/src/main/java/org/eclipse/edc/protocol/dsp/catalog/transform/from/JsonObjectFromDataServiceTransformer.java

+2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.DCAT_DATA_SERVICE_TYPE;
2828
import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.DCAT_ENDPOINT_DESCRIPTION_ATTRIBUTE;
2929
import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.DCAT_ENDPOINT_URL_ATTRIBUTE;
30+
import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.DCAT_ENDPOINT_URL_OLD_ATTRIBUTE;
3031

3132
/**
3233
* Converts from a {@link DataService} to a DCAT data service as a {@link JsonObject} in JSON-LD expanded form.
@@ -47,6 +48,7 @@ public JsonObjectFromDataServiceTransformer(JsonBuilderFactory jsonFactory) {
4748
.add(TYPE, DCAT_DATA_SERVICE_TYPE);
4849

4950
addIfNotNull(dataService.getEndpointDescription(), DCAT_ENDPOINT_DESCRIPTION_ATTRIBUTE, objectBuilder);
51+
addIfNotNull(dataService.getEndpointUrl(), DCAT_ENDPOINT_URL_OLD_ATTRIBUTE, objectBuilder);
5052
addIfNotNull(dataService.getEndpointUrl(), DCAT_ENDPOINT_URL_ATTRIBUTE, objectBuilder);
5153

5254
return objectBuilder.build();

data-protocols/dsp/dsp-catalog/dsp-catalog-transform/src/test/java/org/eclipse/edc/protocol/dsp/catalog/transform/from/JsonObjectFromDataServiceTransformerTest.java

+2
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.DCAT_DATA_SERVICE_TYPE;
3030
import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.DCAT_ENDPOINT_DESCRIPTION_ATTRIBUTE;
3131
import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.DCAT_ENDPOINT_URL_ATTRIBUTE;
32+
import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.DCAT_ENDPOINT_URL_OLD_ATTRIBUTE;
3233
import static org.mockito.Mockito.mock;
3334

3435
class JsonObjectFromDataServiceTransformerTest {
@@ -57,6 +58,7 @@ void transform_returnJsonObject() {
5758
assertThat(result.getJsonString(ID).getString()).isEqualTo(dataService.getId());
5859
assertThat(result.getJsonString(TYPE).getString()).isEqualTo(DCAT_DATA_SERVICE_TYPE);
5960
assertThat(result.getJsonString(DCAT_ENDPOINT_DESCRIPTION_ATTRIBUTE).getString()).isEqualTo("description");
61+
assertThat(result.getJsonString(DCAT_ENDPOINT_URL_OLD_ATTRIBUTE).getString()).isEqualTo("url");
6062
assertThat(result.getJsonString(DCAT_ENDPOINT_URL_ATTRIBUTE).getString()).isEqualTo("url");
6163
}
6264

spi/common/json-ld-spi/src/main/java/org/eclipse/edc/jsonld/spi/PropertyAndTypeNames.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ public interface PropertyAndTypeNames {
3333
String DCAT_DATASET_ATTRIBUTE = DCAT_SCHEMA + "dataset";
3434
String DCAT_DISTRIBUTION_ATTRIBUTE = DCAT_SCHEMA + "distribution";
3535
String DCAT_ACCESS_SERVICE_ATTRIBUTE = DCAT_SCHEMA + "accessService";
36-
String DCAT_ENDPOINT_URL_ATTRIBUTE = DCAT_SCHEMA + "endpointUrl";
36+
@Deprecated(since = "0.10.0")
37+
String DCAT_ENDPOINT_URL_OLD_ATTRIBUTE = DCAT_SCHEMA + "endpointUrl";
38+
String DCAT_ENDPOINT_URL_ATTRIBUTE = DCAT_SCHEMA + "endpointURL";
3739
String DCAT_ENDPOINT_DESCRIPTION_ATTRIBUTE = DCAT_SCHEMA + "endpointDescription";
3840

3941
//EDC

0 commit comments

Comments
 (0)