fix: use correct dcat:endpointURL spelling (#255)

Author: paullatzelsperger

DEPENDENCIES

@@ -41,7 +41,7 @@ maven/mavencentral/com.google.guava/guava/33.3.1-jre, Apache-2.0 AND CC0-1.0 AND
 maven/mavencentral/com.google.guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava, Apache-2.0, approved, CQ22657
 maven/mavencentral/com.google.j2objc/j2objc-annotations/3.0.0, Apache-2.0, approved, #13676
 maven/mavencentral/com.google.protobuf/protobuf-java/3.25.3, BSD-3-Clause, approved, clearlydefined
-maven/mavencentral/com.nimbusds/nimbus-jose-jwt/9.41.2, , restricted, clearlydefined
+maven/mavencentral/com.nimbusds/nimbus-jose-jwt/9.41.2, Apache-2.0, approved, clearlydefined
 maven/mavencentral/com.puppycrawl.tools/checkstyle/10.18.2, LGPL-2.1-or-later AND (Apache-2.0 AND LGPL-2.1-or-later) AND Apache-2.0, approved, #16060
 maven/mavencentral/com.squareup.okhttp3/okhttp-dnsoverhttps/4.12.0, Apache-2.0, approved, #11159
 maven/mavencentral/com.squareup.okhttp3/okhttp/4.12.0, Apache-2.0, approved, #15227

core/federated-catalog-core/src/main/java/org/eclipse/edc/catalog/cache/query/DspCatalogRequestAction.java

@@ -100,7 +100,7 @@ private CompletableFuture<Catalog> expandCatalog(Catalog rootCatalog) {
                 .map(CatalogUpdateResponse::getCatalog);
 
         var datasets = ofNullable(partitions.get(Dataset.class))
-                .map(ds -> new ArrayList<>(ds))
+                .map(ArrayList::new)
                 .orElseGet(ArrayList::new);
         expandedSubCatalogs.forEach(datasets::add);
         return completedFuture(copy(rootCatalog, datasets).build());

core/federated-catalog-core/src/main/java/org/eclipse/edc/catalog/transform/JsonObjectToDataServiceTransformer.java

@@ -24,6 +24,7 @@
 
 import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.DCAT_ENDPOINT_DESCRIPTION_ATTRIBUTE;
 import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.DCAT_ENDPOINT_URL_ATTRIBUTE;
+import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.DCAT_ENDPOINT_URL_OLD_ATTRIBUTE;
 
 /**
  * Converts from a DCAT data service as a {@link JsonObject} in JSON-LD expanded form to a {@link DataService}.
@@ -45,7 +46,7 @@ public JsonObjectToDataServiceTransformer() {
     }
 
     private void transformProperties(String key, JsonValue value, DataService.Builder builder, TransformerContext context) {
-        if (DCAT_ENDPOINT_URL_ATTRIBUTE.equals(key)) {
+        if (DCAT_ENDPOINT_URL_ATTRIBUTE.equals(key) || DCAT_ENDPOINT_URL_OLD_ATTRIBUTE.equals(key)) {
             transformString(value, builder::endpointUrl, context);
         } else if (DCAT_ENDPOINT_DESCRIPTION_ATTRIBUTE.equals(key)) {
             transformString(value, builder::endpointDescription, context);

system-tests/component-tests/src/test/resources/catalog.json

@@ -1,9 +1,9 @@
 {
-  "@id": "9789e27e-8200-4f65-b1c6-45d9938dc698",
+  "@id": "sub-catalog-id",
   "@type": "dcat:Catalog",
   "dcat:dataset": [
     {
-      "@id": "normal-asset-a873f2be-295e-4d03-af1c-0e15c1363627",
+      "@id": "subcatalog-asset-a873f2be-295e-4d03-af1c-0e15c1363627",
       "@type": "dcat:Dataset",
       "odrl:hasPolicy": {
         "@id": "ODkzNGY3MzEtYzdmMy00N2NiLTlmM2UtNGU1ZDljOGNjNzU3:bm9ybWFsLWFzc2V0LWE4NzNmMmJlLTI5NWUtNGQwMy1hZjFjLTBlMTVjMTM2MzYyNw==:OGZhMzc3ODktOTZlYS00ZGQ1LWIyZjktNjYzNTQwOWZlNTUw",
@@ -26,7 +26,7 @@
     "@id": "5cc832e4-9b77-412b-a21e-7d5b49516f2c",
     "@type": "dcat:DataService",
     "dcat:endpointDescription": "dspace:connector",
-    "dcat:endpointUrl": "http://localhost:55229/protocol",
+    "dcat:endpointURL": "http://localhost:55229/protocol",
     "dct:terms": "dspace:connector",
     "dct:endpointUrl": "http://localhost:55229/protocol"
   },

system-tests/component-tests/src/test/resources/catalog_of_catalogs.json

@@ -1,5 +1,5 @@
 {
-  "@id": "9789e27e-8200-4f65-b1c6-45d9938dc698",
+  "@id": "root-catalog-id",
   "@type": "dcat:Catalog",
   "dcat:dataset": [
     {
@@ -37,7 +37,7 @@
       "dcat:service": {
         "@id": "Y2F0YWxvZy1hc3NldC01YTc0ODJiZC1hMmE4LTQyNDgtYThmYS0zNTNjYjFkMTRkZjc=",
         "@type": "dcat:DataService",
-        "dcat:endpointUrl": "http://quizzqua.zz/buzz",
+        "dcat:endpointURL": "http://quizzqua.zz/buzz",
         "dct:endpointUrl": "http://quizzqua.zz/buzz"
       },
       "isCatalog": true,
@@ -50,7 +50,7 @@
     "@id": "5cc832e4-9b77-412b-a21e-7d5b49516f2c",
     "@type": "dcat:DataService",
     "dcat:endpointDescription": "dspace:connector",
-    "dcat:endpointUrl": "http://localhost:55229/protocol",
+    "dcat:endpointURL": "http://localhost:55229/protocol",
     "dct:terms": "dspace:connector",
     "dct:endpointUrl": "http://localhost:55229/protocol"
   },