chore: remove unnecessary migration (sovity#799)

truzzt · Feb 14, 2024 · 1e8eda2 · 1e8eda2
1 parent 77f01bd
commit 1e8eda2
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 52 deletions.
diff --git a/...es-flyway/src/main/resources/migration/default/V5__Migrate-MDS-Fields-To-MobilityDCAT.sql b/...es-flyway/src/main/resources/migration/default/V5__Migrate-MDS-Fields-To-MobilityDCAT.sql
diff --git a/...ppers/src/main/java/de/sovity/edc/ext/wrapper/api/common/mappers/utils/UiAssetMapper.java b/...ppers/src/main/java/de/sovity/edc/ext/wrapper/api/common/mappers/utils/UiAssetMapper.java
@@ -73,11 +73,11 @@ public UiAsset buildUiAsset(JsonObject assetJsonLd, String connectorEndpoint, St
         uiAsset.setVersion(JsonLdUtils.string(properties, Prop.Dcat.VERSION));
         uiAsset.setMediaType(JsonLdUtils.string(properties, Prop.Dcat.MEDIATYPE));
         uiAsset.setLandingPageUrl(JsonLdUtils.string(properties, Prop.Dcat.LANDING_PAGE));
-        uiAsset.setDataCategory(JsonLdUtils.string(properties, Prop.Mobility.DATA_CATEGORY));
-        uiAsset.setDataSubcategory(JsonLdUtils.string(properties, Prop.Mobility.DATA_SUBCATEGORY));
-        uiAsset.setDataModel(JsonLdUtils.string(properties, Prop.Mobility.DATA_MODEL));
-        uiAsset.setGeoReferenceMethod(JsonLdUtils.string(properties, Prop.Mobility.GEO_REFERENCE_METHOD));
-        uiAsset.setTransportMode(JsonLdUtils.string(properties, Prop.Mobility.TRANSPORT_MODE));
+        uiAsset.setDataCategory(JsonLdUtils.string(properties, Prop.Mds.DATA_CATEGORY));
+        uiAsset.setDataSubcategory(JsonLdUtils.string(properties, Prop.Mds.DATA_SUBCATEGORY));
+        uiAsset.setDataModel(JsonLdUtils.string(properties, Prop.Mds.DATA_MODEL));
+        uiAsset.setGeoReferenceMethod(JsonLdUtils.string(properties, Prop.Mds.GEO_REFERENCE_METHOD));
+        uiAsset.setTransportMode(JsonLdUtils.string(properties, Prop.Mds.TRANSPORT_MODE));
         uiAsset.setSovereignLegalName(JsonLdUtils.string(properties, Prop.MdsDcatExt.SOVEREIGN));
         uiAsset.setGeoLocation(JsonLdUtils.string(properties, Prop.MdsDcatExt.GEO_LOCATION));
         uiAsset.setNutsLocation(JsonLdUtils.stringList(properties, Prop.MdsDcatExt.NUTS_LOCATION));
@@ -121,11 +121,11 @@ public UiAsset buildUiAsset(JsonObject assetJsonLd, String connectorEndpoint, St
                 Prop.Dcterms.LICENSE,
                 Prop.Dcterms.PUBLISHER,
                 Prop.Dcterms.TITLE,
-                Prop.Mobility.DATA_CATEGORY,
-                Prop.Mobility.DATA_MODEL,
-                Prop.Mobility.DATA_SUBCATEGORY,
-                Prop.Mobility.GEO_REFERENCE_METHOD,
-                Prop.Mobility.TRANSPORT_MODE,
+                Prop.Mds.DATA_CATEGORY,
+                Prop.Mds.DATA_MODEL,
+                Prop.Mds.DATA_SUBCATEGORY,
+                Prop.Mds.GEO_REFERENCE_METHOD,
+                Prop.Mds.TRANSPORT_MODE,
                 Prop.MdsDcatExt.SOVEREIGN,
                 Prop.MdsDcatExt.GEO_LOCATION,
                 Prop.MdsDcatExt.NUTS_LOCATION,
@@ -186,11 +186,11 @@ private JsonObjectBuilder getAssetProperties(
         addNonNull(properties, Prop.Dcat.VERSION, uiAssetCreateRequest.getVersion());
         addNonNull(properties, Prop.Dcat.MEDIATYPE, uiAssetCreateRequest.getMediaType());
         addNonNull(properties, Prop.Dcat.LANDING_PAGE, uiAssetCreateRequest.getLandingPageUrl());
-        addNonNull(properties, Prop.Mobility.DATA_CATEGORY, uiAssetCreateRequest.getDataCategory());
-        addNonNull(properties, Prop.Mobility.DATA_SUBCATEGORY, uiAssetCreateRequest.getDataSubcategory());
-        addNonNull(properties, Prop.Mobility.DATA_MODEL, uiAssetCreateRequest.getDataModel());
-        addNonNull(properties, Prop.Mobility.GEO_REFERENCE_METHOD, uiAssetCreateRequest.getGeoReferenceMethod());
-        addNonNull(properties, Prop.Mobility.TRANSPORT_MODE, uiAssetCreateRequest.getTransportMode());
+        addNonNull(properties, Prop.Mds.DATA_CATEGORY, uiAssetCreateRequest.getDataCategory());
+        addNonNull(properties, Prop.Mds.DATA_SUBCATEGORY, uiAssetCreateRequest.getDataSubcategory());
+        addNonNull(properties, Prop.Mds.DATA_MODEL, uiAssetCreateRequest.getDataModel());
+        addNonNull(properties, Prop.Mds.GEO_REFERENCE_METHOD, uiAssetCreateRequest.getGeoReferenceMethod());
+        addNonNull(properties, Prop.Mds.TRANSPORT_MODE, uiAssetCreateRequest.getTransportMode());
         addNonNull(properties, Prop.MdsDcatExt.SOVEREIGN, uiAssetCreateRequest.getSovereignLegalName());
         addNonNull(properties, Prop.MdsDcatExt.GEO_LOCATION, uiAssetCreateRequest.getGeoLocation());
         addNonNullArray(properties, Prop.MdsDcatExt.NUTS_LOCATION, uiAssetCreateRequest.getNutsLocation());

diff --git a/extensions/wrapper/wrapper-common-mappers/src/test/resources/example-asset.jsonld b/extensions/wrapper/wrapper-common-mappers/src/test/resources/example-asset.jsonld
@@ -27,11 +27,11 @@
     "https://semantic.sovity.io/dcat-ext#httpDatasourceHintsProxyPath": "true",
     "https://semantic.sovity.io/dcat-ext#httpDatasourceHintsProxyQueryParams": "true",
     "https://semantic.sovity.io/dcat-ext#httpDatasourceHintsProxyBody": "true",
-    "https://w3id.org/mobilitydcat-ap/mobility-theme/data-content-category": "Infrastructure and Logistics",
-    "https://w3id.org/mobilitydcat-ap/mobility-theme/data-content-sub-category": "General Information About Planning Of Routes",
-    "https://w3id.org/mobilitydcat-ap/mobility-data-standard": "my-data-model-001",
-    "https://w3id.org/mobilitydcat-ap/georeferencing-method": "my-geo-reference-method",
-    "https://w3id.org/mobilitydcat-ap/transport-mode": "my-geo-reference-method",
+    "http://w3id.org/mds#dataCategory": "Infrastructure and Logistics",
+    "http://w3id.org/mds#dataSubcategory": "General Information About Planning Of Routes",
+    "http://w3id.org/mds#dataModel": "my-data-model-001",
+    "http://w3id.org/mds#geoReferenceMethod": "my-geo-reference-method",
+    "http://w3id.org/mds#transportMode": "my-geo-reference-method",
     "https://semantic.sovity.io/mds-dcat-ext#sovereign": "my-sovereign",
     "https://semantic.sovity.io/mds-dcat-ext#geolocation": "my-geolocation",
     "https://semantic.sovity.io/mds-dcat-ext#nuts-location": ["my-nuts-location1", "my-nuts-location2"],

diff --git a/utils/json-and-jsonld-utils/src/main/java/de/sovity/edc/utils/jsonld/vocab/Prop.java b/utils/json-and-jsonld-utils/src/main/java/de/sovity/edc/utils/jsonld/vocab/Prop.java
@@ -140,19 +140,6 @@ public class Mds {
         public final String TRANSPORT_MODE = CTX + "transportMode";
     }
 
-    /**
-     * MDS Vocabulary
-     */
-    @UtilityClass
-    public class Mobility {
-        public final String CTX = "https://w3id.org/mobilitydcat-ap/";
-        public final String DATA_CATEGORY = CTX + "mobility-theme/data-content-category";
-        public final String DATA_SUBCATEGORY = CTX + "mobility-theme/data-content-sub-category";
-        public final String DATA_MODEL = CTX + "mobility-data-standard";
-        public final String GEO_REFERENCE_METHOD = CTX + "georeferencing-method";
-        public final String TRANSPORT_MODE = CTX + "transport-mode";
-    }
-
     /**
      * Temporary Context for all MDS specific fields awaiting proper classification within the mobilityDCAT-AP specification
      */