feat: bump edc-extensions version for new MDS fields (#381)

sovity · Jan 23, 2024 · e2b4996 · e2b4996
1 parent ee2040a
commit e2b4996
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 #### Major
 
 #### Minor
+- Add new MDS fields and migrate existing MDS asset keys to mobilityDCAT-AP 
 
 ### Deployment Migration Notes
 

diff --git a/...oker-server/src/test/java/de/sovity/edc/ext/brokerserver/services/api/CatalogApiTest.java b/...oker-server/src/test/java/de/sovity/edc/ext/brokerserver/services/api/CatalogApiTest.java
@@ -214,28 +214,28 @@ void testAvailableFilters_noFilter() {
             var today = OffsetDateTime.now().withNano(0);
 
             var assetJsonLd1 = getAssetJsonLd("my-asset-1", Map.of(
-                Prop.Mds.DATA_CATEGORY, "my-category-1",
-                Prop.Mds.TRANSPORT_MODE, "MY-TRANSPORT-MODE-1",
-                Prop.Mds.DATA_SUBCATEGORY, "MY-SUBCATEGORY-2",
-                Prop.Mds.DATA_MODEL, "my-data-model",
-                Prop.Mds.GEO_REFERENCE_METHOD, "my-geo-ref"
+                Prop.Mobility.DATA_CATEGORY, "my-category-1",
+                Prop.Mobility.TRANSPORT_MODE, "MY-TRANSPORT-MODE-1",
+                Prop.Mobility.DATA_SUBCATEGORY, "MY-SUBCATEGORY-2",
+                Prop.Mobility.DATA_MODEL, "my-data-model",
+                Prop.Mobility.GEO_REFERENCE_METHOD, "my-geo-ref"
             ));
 
             var assetJsonLd2 = getAssetJsonLd("my-asset-2", Map.of(
-                Prop.Mds.DATA_CATEGORY, "my-category-1",
-                Prop.Mds.TRANSPORT_MODE, "my-transport-mode-2",
-                Prop.Mds.DATA_SUBCATEGORY, "MY-SUBCATEGORY-2"
+                Prop.Mobility.DATA_CATEGORY, "my-category-1",
+                Prop.Mobility.TRANSPORT_MODE, "my-transport-mode-2",
+                Prop.Mobility.DATA_SUBCATEGORY, "MY-SUBCATEGORY-2"
             ));
 
             var assetJsonLd3 = getAssetJsonLd("my-asset-3", Map.of(
-                Prop.Mds.DATA_CATEGORY, "my-category-1",
-                Prop.Mds.TRANSPORT_MODE, "MY-TRANSPORT-MODE-1",
-                Prop.Mds.DATA_SUBCATEGORY, "my-subcategory-1"
+                Prop.Mobility.DATA_CATEGORY, "my-category-1",
+                Prop.Mobility.TRANSPORT_MODE, "MY-TRANSPORT-MODE-1",
+                Prop.Mobility.DATA_SUBCATEGORY, "my-subcategory-1"
             ));
 
             var assetJsonLd4 = getAssetJsonLd("my-asset-4", Map.of(
-                Prop.Mds.DATA_CATEGORY, "my-category-1",
-                Prop.Mds.TRANSPORT_MODE, ""
+                Prop.Mobility.DATA_CATEGORY, "my-category-1",
+                Prop.Mobility.TRANSPORT_MODE, ""
             ));
 
             createOrganizationMetadata(dsl, "MDSL123456AA", "Test Org");
@@ -348,12 +348,12 @@ void testAvailableFilters_withFilter() {
             var today = OffsetDateTime.now().withNano(0);
 
             var assetJsonLd1 = getAssetJsonLd("my-asset-1", Map.of(
-                Prop.Mds.DATA_CATEGORY, "my-category",
-                Prop.Mds.DATA_SUBCATEGORY, "my-subcategory"
+                Prop.Mobility.DATA_CATEGORY, "my-category",
+                Prop.Mobility.DATA_SUBCATEGORY, "my-subcategory"
             ));
 
             var assetJsonLd2 = getAssetJsonLd("my-asset-2", Map.of(
-                Prop.Mds.DATA_SUBCATEGORY, "my-other-subcategory"
+                Prop.Mobility.DATA_SUBCATEGORY, "my-other-subcategory"
             ));
 
             createConnector(dsl, today, "https://my-connector/api/dsp");

diff --git a/...er-server/src/test/java/de/sovity/edc/ext/brokerserver/services/api/ConnectorApiTest.java b/...er-server/src/test/java/de/sovity/edc/ext/brokerserver/services/api/ConnectorApiTest.java
@@ -63,7 +63,7 @@ void testQueryConnectors() {
             var today = OffsetDateTime.now().withNano(0);
 
             var assetJsonLd = getAssetJsonLd("my-asset-1", Map.of(
-                Prop.Mds.DATA_CATEGORY, "my-category",
+                Prop.Mobility.DATA_CATEGORY, "my-category",
                 Prop.Dcterms.TITLE, "My Asset 1"
             ));
 
@@ -89,7 +89,7 @@ void testQueryConnectorDetails() {
             var today = OffsetDateTime.now().withNano(0);
 
             var assetJsonLd = getAssetJsonLd("my-asset-1", Map.of(
-                Prop.Mds.DATA_CATEGORY, "my-category",
+                Prop.Mobility.DATA_CATEGORY, "my-category",
                 Prop.Dcterms.TITLE, "My Asset 1"
             ));
 

diff --git a/...ver/src/test/java/de/sovity/edc/ext/brokerserver/services/api/DataOfferDetailApiTest.java b/...ver/src/test/java/de/sovity/edc/ext/brokerserver/services/api/DataOfferDetailApiTest.java
@@ -63,12 +63,12 @@ void testQueryDataOfferDetails() {
             var today = OffsetDateTime.now().withNano(0);
 
             var assetJsonLd1 = getAssetJsonLd("my-asset-1", Map.of(
-                Prop.Mds.DATA_CATEGORY, "my-category",
+                Prop.Mobility.DATA_CATEGORY, "my-category",
                 Prop.Dcterms.TITLE, "My Asset 1"
             ));
 
             var assetJsonLd2 = getAssetJsonLd("my-asset-2", Map.of(
-                Prop.Mds.DATA_CATEGORY, "my-category-2",
+                Prop.Mobility.DATA_CATEGORY, "my-category-2",
                 Prop.Dcterms.TITLE, "My Asset 2"
             ));
 

diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@ sovityBrokerServerGroup=de.sovity.broker
 sovityBrokerServerVersion=0.0.1-SNAPSHOT
 
 # Sovity EDC Extensions (for common api model)
-sovityEdcExtensionsVersion=7.1.1
+sovityEdcExtensionsVersion=0.0.1-SNAPSHOT
 sovityEdcExtensionGroup=de.sovity.edc.ext
 sovityEdcGroup=de.sovity.edc