feat: catalog + contract negotiation endpoints with tests

extensions/wrapper/client/build.gradle.kts

@@ -65,6 +65,7 @@ dependencies {
 
     testImplementation("${edcGroup}:json-ld-spi:${edcVersion}")
     testImplementation("${edcGroup}:dsp-http-spi:${edcVersion}")
+    testImplementation("${edcGroup}:dsp-api-configuration:${edcVersion}")
     testImplementation(project(":extensions:wrapper:wrapper"))
     testImplementation(project(":extensions:wrapper:wrapper-common-mappers"))
     testImplementation("io.rest-assured:rest-assured:${restAssured}")

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

@@ -5,7 +5,7 @@
 import de.sovity.edc.client.gen.model.UiCriterionDto;
 import de.sovity.edc.client.gen.model.UiCriterionLiteralDto;
 import de.sovity.edc.ext.wrapper.api.common.mappers.OperatorMapper;
-import de.sovity.edc.ext.wrapper.api.ui.pages.contracts.services.utils.CriterionMapper;
+import de.sovity.edc.ext.wrapper.api.ui.pages.contract_definitions.CriterionMapper;
 import org.eclipse.edc.connector.contract.spi.types.offer.ContractDefinition;
 import org.eclipse.edc.connector.spi.contractdefinition.ContractDefinitionService;
 import org.eclipse.edc.junit.annotations.ApiTest;

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

@@ -15,15 +15,12 @@
 package de.sovity.edc.client;
 
 
-import de.sovity.edc.client.gen.model.ContractNegotiationRequest;
 import de.sovity.edc.client.gen.model.PolicyDefinitionCreateRequest;
 import de.sovity.edc.client.gen.model.PolicyDefinitionDto;
 import de.sovity.edc.client.gen.model.UiPolicyConstraint;
 import de.sovity.edc.client.gen.model.UiPolicyCreateRequest;
 import de.sovity.edc.client.gen.model.UiPolicyLiteral;
-import jakarta.json.Json;
 import lombok.SneakyThrows;
-import org.eclipse.edc.connector.spi.contractnegotiation.ContractNegotiationService;
 import org.eclipse.edc.connector.spi.policydefinition.PolicyDefinitionService;
 import org.eclipse.edc.junit.annotations.ApiTest;
 import org.eclipse.edc.junit.extensions.EdcExtension;
@@ -35,10 +32,7 @@
 
 import java.util.List;
 
-import static jakarta.json.Json.createObjectBuilder;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.CONTEXT;
-import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE;
 
 @ApiTest
 @ExtendWith(EdcExtension.class)

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

@@ -29,6 +29,6 @@ public class PolicyDefinitionDto {
     private String policyDefinitionId;
 
     @Schema(description = "Policy Contents", requiredMode = Schema.RequiredMode.REQUIRED)
-    private UiPolicyDto policy;
+    private UiPolicy policy;
 }
 

extensions/wrapper/wrapper-common-api/src/main/java/de/sovity/edc/ext/wrapper/api/common/model/UiPolicyDto.java → extensions/wrapper/wrapper-common-api/src/main/java/de/sovity/edc/ext/wrapper/api/common/model/UiPolicy.java

@@ -32,7 +32,7 @@
 @Builder(toBuilder = true)
 @RequiredArgsConstructor
 @Schema(description = "Type-Safe OpenAPI generator friendly Policy DTO as needed by our UI")
-public class UiPolicyDto {
+public class UiPolicy {
     @Schema(description = "EDC Policy JSON-LD. This is required because the EDC requires the " +
             "full policy when initiating contract negotiations.", requiredMode = RequiredMode.REQUIRED)
     private String policyJsonLd;

extensions/wrapper/wrapper-common-mappers/src/main/java/de/sovity/edc/ext/wrapper/api/common/mappers/AssetMapper.java

@@ -1,9 +1,6 @@
 package de.sovity.edc.ext.wrapper.api.common.mappers;
 
 import de.sovity.edc.ext.wrapper.api.common.model.UiAsset;
-import de.sovity.edc.utils.jsonld.JsonLdUtils;
-import de.sovity.edc.utils.jsonld.vocab.Prop;
-import jakarta.json.Json;
 import jakarta.json.JsonObject;
 import lombok.RequiredArgsConstructor;
 import org.eclipse.edc.spi.types.domain.asset.Asset;
@@ -22,16 +19,6 @@ public UiAsset buildUiAsset(Asset asset) {
     }
 
     public Asset buildAssetFromAssetPropertiesJsonLd(JsonObject json) {
-        var assetJson = buildAssetJsonLd(json);
-        return typeTransformerRegistry.transform(assetJson, Asset.class).getContent();
-    }
-
-    private JsonObject buildAssetJsonLd(JsonObject properties) {
-        var id = JsonLdUtils.string(properties, Prop.Edc.ID);
-
-        return Json.createObjectBuilder()
-                .add(Prop.ID, id)
-                .add("properties", properties)
-                .build();
+        return typeTransformerRegistry.transform(json, Asset.class).getContent();
     }
 }