type-safe UiAsset

extensions/wrapper/client/src/test/java/de/sovity/edc/client/AssetApiServiceTest.java

@@ -65,7 +65,7 @@ void assetPage(AssetService assetStore) {
         var assets = result.getAssets();
         assertThat(assets).hasSize(1);
         var asset = assets.get(0);
-        assertThat(asset.getProperties()).isEqualTo(properties);
+        assertThat(asset.getAdditionalProperties()).isEqualTo(properties);
         assertThat(asset.getPrivateProperties()).isEqualTo(privateProperties);
     }
 
@@ -83,7 +83,7 @@ void assetPageSorting(AssetService assetService) {
 
         // assert
         assertThat(result.getAssets())
-                .extracting(asset -> asset.getProperties().get(Asset.PROPERTY_ID))
+                .extracting(asset -> asset.getAdditionalProperties().get(Asset.PROPERTY_ID))
                 .containsExactly("asset-3", "asset-2", "asset-1");
     }
 

extensions/wrapper/wrapper-common-api/build.gradle.kts

@@ -9,6 +9,7 @@ dependencies {
     annotationProcessor("org.projectlombok:lombok:${lombokVersion}")
     compileOnly("org.projectlombok:lombok:${lombokVersion}")
 
+
     api("jakarta.ws.rs:jakarta.ws.rs-api:3.1.0")
     api("jakarta.validation:jakarta.validation-api:3.0.2")
     api("io.swagger.core.v3:swagger-annotations-jakarta:2.2.15")

extensions/wrapper/wrapper-common-api/src/main/java/de/sovity/edc/ext/wrapper/api/common/model/UiAsset.java

@@ -0,0 +1,108 @@
+/*
+ *  Copyright (c) 2022 sovity GmbH
+ *
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Apache License, Version 2.0 which is available at
+ *  https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  SPDX-License-Identifier: Apache-2.0
+ *
+ *  Contributors:
+ *       sovity GmbH - initial API and implementation
+ *
+ */
+
+package de.sovity.edc.ext.wrapper.api.common.model;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.util.List;
+import java.util.Map;
+
+@Getter
+@Setter
+@ToString
+@AllArgsConstructor
+@Builder(toBuilder = true)
+@RequiredArgsConstructor
+@Schema(description = "Asset Details")
+public class UiAsset {
+
+    @Schema(description = "Asset Name", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String name;
+
+    @Schema(description = "Asset Title", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String title;
+
+    @Schema(description = "Asset Language", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String language;
+
+    @Schema(description = "Asset Description", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String description;
+
+    @Schema(description = "Asset Creator", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String creator;
+
+    @Schema(description = "Asset Publisher", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String publisher;
+
+    @Schema(description = "License URL", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String license;
+
+    @Schema(description = "Version", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String version;
+
+    @Schema(description = "Asset Keywords", requiredMode = Schema.RequiredMode.REQUIRED)
+    private List<String> keywords;
+
+    @Schema(description = "Distribution", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String distribution;
+
+    @Schema(description = "Landing Page URL", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String landingPage;
+
+    @Schema(description = "HTTP Datasource Hints Proxy Method", requiredMode = Schema.RequiredMode.REQUIRED)
+    private Boolean httpDatasourceHintsProxyMethod;
+
+    @Schema(description = "HTTP Datasource Hints Proxy Path", requiredMode = Schema.RequiredMode.REQUIRED)
+    private Boolean httpDatasourceHintsProxyPath;
+
+    @Schema(description = "HTTP Datasource Hints Proxy Query Params", requiredMode = Schema.RequiredMode.REQUIRED)
+    private Boolean httpDatasourceHintsProxyQueryParams;
+
+    @Schema(description = "HTTP Datasource Hints Proxy Body", requiredMode = Schema.RequiredMode.REQUIRED)
+    private Boolean httpDatasourceHintsProxyBody;
+
+    @Schema(description = "Data Category", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String dataCategory;
+
+    @Schema(description = "Data Subcategory", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String dataSubcategory;
+
+    @Schema(description = "Data Model", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String dataModel;
+
+    @Schema(description = "Geo-Reference Method", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String geoReferenceMethod;
+
+    @Schema(description = "Transport Mode", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String transportMode;
+
+    @Schema(description = "Asset JsonLd", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String assetJsonLd;
+
+    @Schema(description = "Asset additional Properties", requiredMode = Schema.RequiredMode.REQUIRED)
+    private Map<String, String> additionalProperties;
+
+    @Schema(description = "Asset Private Properties", requiredMode = Schema.RequiredMode.REQUIRED)
+    private Map<String, String> privateProperties;
+
+    @Schema(description = "Asset Json Properties", requiredMode = Schema.RequiredMode.REQUIRED)
+    private Map<String, String> additionalJsonProperties;
+}

extensions/wrapper/wrapper-common-api/src/main/java/de/sovity/edc/ext/wrapper/api/common/model/UiAssetCreateRequest.java

@@ -0,0 +1,40 @@
+/*
+ *  Copyright (c) 2022 sovity GmbH
+ *
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Apache License, Version 2.0 which is available at
+ *  https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  SPDX-License-Identifier: Apache-2.0
+ *
+ *  Contributors:
+ *       sovity GmbH - initial API and implementation
+ *
+ */
+
+package de.sovity.edc.ext.wrapper.api.common.model;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.util.Map;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(description = "Type-Safe OpenAPI generator friendly Asset Create DTO that supports an opinionated\"\n" +
+        "        + \" subset of the original EDC Asset Entity.")
+public class UiAssetCreateRequest {
+    @Schema(description = "Data Address", requiredMode = Schema.RequiredMode.REQUIRED)
+    private Map<String, String> dataAddressProperties;
+
+    @Schema(description = "Properties of the Data Address", requiredMode = Schema.RequiredMode.REQUIRED)
+    private Map<String, String> properties;
+
+    @Schema(description = "Private Asset Properties", requiredMode = Schema.RequiredMode.REQUIRED)
+    private Map<String, String> privateProperties;
+}

extensions/wrapper/wrapper-common-api/src/main/java/de/sovity/edc/ext/wrapper/api/common/model/UiAssetCreator.java

@@ -0,0 +1,29 @@
+package de.sovity.edc.ext.wrapper.api.common.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+
+@Getter
+@Setter
+@ToString
+@AllArgsConstructor
+@Builder(toBuilder = true)
+@RequiredArgsConstructor
+@Schema(description = "Asset Creator Details")
+public class UiAssetCreator {
+
+    @JsonProperty("@type")
+    @Schema(description = "Type", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String type;
+
+    @JsonProperty("http://xmlns.com/foaf/0.1/name")
+    @Schema(description = "Name", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String name;
+}

extensions/wrapper/wrapper-common-api/src/main/java/de/sovity/edc/ext/wrapper/api/common/model/UiAssetDistribution.java

@@ -0,0 +1,29 @@
+package de.sovity.edc.ext.wrapper.api.common.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+
+@Getter
+@Setter
+@ToString
+@AllArgsConstructor
+@Builder(toBuilder = true)
+@RequiredArgsConstructor
+@Schema(description = "Asset Distribution  Details")
+public class UiAssetDistribution {
+
+    @JsonProperty("@type")
+    @Schema(description = "Type", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String type;
+
+    @JsonProperty("http://www.w3.org/ns/dcat#mediaType")
+    @Schema(description = "Media Type", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String name;
+}

extensions/wrapper/wrapper-common-api/src/main/java/de/sovity/edc/ext/wrapper/api/common/model/UiAssetHelperDto.java

@@ -0,0 +1,96 @@
+package de.sovity.edc.ext.wrapper.api.common.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import de.sovity.edc.ext.wrapper.api.common.model.utils.CustomDeserializer;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.util.List;
+
+
+@Getter
+@Setter
+@ToString
+@AllArgsConstructor
+@Builder(toBuilder = true)
+@RequiredArgsConstructor
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class UiAssetHelperDto {
+
+    @JsonProperty("https://w3id.org/edc/v0.0.1/ns/")
+    private String ns;
+
+    @JsonProperty("http://purl.org/dc/terms/identifier")
+    private String identifier;
+
+    @JsonProperty("http://purl.org/dc/terms/title")
+    @JsonDeserialize(using = CustomDeserializer.class)
+    private String title;
+
+    @JsonProperty("http://purl.org/dc/terms/language")
+    private String language;
+
+    @JsonProperty("http://purl.org/dc/terms/description")
+    private String description;
+
+    @JsonProperty("http://purl.org/dc/terms/creator")
+    private UiAssetCreator creator;
+
+    @JsonProperty("http://purl.org/dc/terms/publisher")
+    private UiAssetPublisher publisher;
+
+    @JsonProperty("http://purl.org/dc/terms/license")
+    private String license;
+
+    @JsonProperty("http://www.w3.org/ns/dcat#version")
+    private String version;
+
+    @JsonProperty("http://www.w3.org/ns/dcat#keyword")
+    @JsonDeserialize(using = CustomDeserializer.class)
+    private List<String> keywords;
+
+    @JsonProperty("http://www.w3.org/ns/dcat#distribution")
+    private UiAssetDistribution distribution;
+
+    @JsonProperty("http://www.w3.org/ns/dcat#landingPage")
+    private String landingPage;
+
+    @JsonProperty("https://semantic.sovity.io/dcat-ext#httpDatasourceHintsProxyMethod")
+    @JsonDeserialize(using = CustomDeserializer.class)
+    private Boolean httpDatasourceHintsProxyMethod;
+
+    @JsonProperty("https://semantic.sovity.io/dcat-ext#httpDatasourceHintsProxyPath")
+    @JsonDeserialize(using = CustomDeserializer.class)
+    private Boolean httpDatasourceHintsProxyPath;
+
+    @JsonProperty("https://semantic.sovity.io/dcat-ext#httpDatasourceHintsProxyQueryParams")
+    @JsonDeserialize(using = CustomDeserializer.class)
+    private Boolean httpDatasourceHintsProxyQueryParams;
+
+    @JsonProperty("https://semantic.sovity.io/dcat-ext#httpDatasourceHintsProxyBody")
+    @JsonDeserialize(using = CustomDeserializer.class)
+    private Boolean httpDatasourceHintsProxyBody;
+
+    @JsonProperty("http://w3id.org/mds#dataCategory")
+    private String dataCategory;
+
+    @JsonProperty("http://w3id.org/mds#dataSubcategory")
+    private String dataSubcategory;
+
+    @JsonProperty("http://w3id.org/mds#dataModel")
+    private String dataModel;
+
+    @JsonProperty("http://w3id.org/mds#geoReferenceMethod")
+    private String geoReferenceMethod;
+
+    @JsonProperty("http://w3id.org/mds#transportMode")
+    private String transportMode;
+}
+

extensions/wrapper/wrapper-common-api/src/main/java/de/sovity/edc/ext/wrapper/api/common/model/UiAssetPublisher.java

@@ -0,0 +1,29 @@
+package de.sovity.edc.ext.wrapper.api.common.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+
+@Getter
+@Setter
+@ToString
+@AllArgsConstructor
+@Builder(toBuilder = true)
+@RequiredArgsConstructor
+@Schema(description = "Asset Publisher Details")
+public class UiAssetPublisher {
+
+    @JsonProperty("@type")
+    @Schema(description = "Type", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String type;
+
+    @JsonProperty("http://xmlns.com/foaf/0.1/homepage")
+    @Schema(description = "Homepage URL", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String name;
+}