feat: add negotiation endpoint api spec examples

eclipse-edc · Jul 13, 2023 · 3e0bf57 · 3e0bf57
1 parent c37de26
commit 3e0bf57
Show file tree

Hide file tree

Showing 152 changed files with 1,686 additions and 2,886 deletions.
diff --git a/core/common/connector-core/build.gradle.kts b/core/common/connector-core/build.gradle.kts
@@ -28,6 +28,7 @@ dependencies {
     api(project(":spi:common:validator-spi"))
 
     implementation(project(":core:common:policy-engine"))
+    implementation(project(":core:common:transform-core"))
     implementation(project(":core:common:util"))
 
     implementation(libs.dnsOverHttps)

diff --git a/...on/connector-core/src/main/java/org/eclipse/edc/connector/core/CoreServicesExtension.java b/...on/connector-core/src/main/java/org/eclipse/edc/connector/core/CoreServicesExtension.java
@@ -22,8 +22,8 @@
 import org.eclipse.edc.connector.core.health.HealthCheckServiceConfiguration;
 import org.eclipse.edc.connector.core.health.HealthCheckServiceImpl;
 import org.eclipse.edc.connector.core.security.DefaultPrivateKeyParseFunction;
-import org.eclipse.edc.connector.core.transform.TypeTransformerRegistryImpl;
 import org.eclipse.edc.connector.core.validator.JsonObjectValidatorRegistryImpl;
+import org.eclipse.edc.core.transform.TypeTransformerRegistryImpl;
 import org.eclipse.edc.policy.engine.PolicyEngineImpl;
 import org.eclipse.edc.policy.engine.RuleBindingRegistryImpl;
 import org.eclipse.edc.policy.engine.ScopeFilter;

diff --git a/core/common/junit/src/main/java/org/eclipse/edc/junit/assertions/AbstractResultAssert.java b/core/common/junit/src/main/java/org/eclipse/edc/junit/assertions/AbstractResultAssert.java
@@ -43,7 +43,7 @@ public static <SELF extends AbstractResultAssert<SELF, RESULT, C, F>, RESULT ext
     public ObjectAssert<C> isSucceeded() {
         isNotNull();
         if (!actual.succeeded()) {
-            failWithMessage("Expected result to be succeeded, but it was failed");
+            failWithMessage("Expected result to be succeeded, but it was failed: " + actual.getFailureDetail());
         }
         return Assertions.assertThat(actual.getContent());
     }

diff --git a/...tocols/dsp/dsp-transform/build.gradle.kts → core/common/transform-core/build.gradle.kts b/...tocols/dsp/dsp-transform/build.gradle.kts → core/common/transform-core/build.gradle.kts
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2023 Fraunhofer Institute for Software and Systems Engineering
+ *  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Apache License, Version 2.0 which is available at
@@ -8,21 +8,23 @@
  *  SPDX-License-Identifier: Apache-2.0
  *
  *  Contributors:
- *       Fraunhofer Institute for Software and Systems Engineering - initial API and implementation
+ *       Bayerische Motoren Werke Aktiengesellschaft (BMW AG) - initial API and implementation
  *
  */
 
 plugins {
     `java-library`
+    `maven-publish`
 }
 
 dependencies {
-    api(libs.titaniumJsonLd)
-
-    api(project(":extensions:common:json-ld"))
-    api(project(":spi:common:core-spi"))
     api(project(":spi:common:catalog-spi"))
+    api(project(":spi:common:core-spi"))
     api(project(":spi:common:json-ld-spi"))
+    api(project(":spi:common:transform-spi"))
+
+    api(libs.jakartaJson)
 
     testImplementation(project(":core:common:junit"))
+    testImplementation(project(":extensions:common:json-ld"))
 }
diff --git a/...ore/transform/TransformerContextImpl.java → ...ore/transform/TransformerContextImpl.java b/...ore/transform/TransformerContextImpl.java → ...ore/transform/TransformerContextImpl.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2022 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+ *  Copyright (c) 2022 - 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Apache License, Version 2.0 which is available at
@@ -12,7 +12,7 @@
  *
  */
 
-package org.eclipse.edc.connector.core.transform;
+package org.eclipse.edc.core.transform;
 
 import org.eclipse.edc.transform.spi.ProblemBuilder;
 import org.eclipse.edc.transform.spi.TransformerContext;

diff --git a/...ransform/TypeTransformerRegistryImpl.java → ...ransform/TypeTransformerRegistryImpl.java b/...ransform/TypeTransformerRegistryImpl.java → ...ransform/TypeTransformerRegistryImpl.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2022 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+ *  Copyright (c) 2022 - 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Apache License, Version 2.0 which is available at
@@ -12,7 +12,7 @@
  *
  */
 
-package org.eclipse.edc.connector.core.transform;
+package org.eclipse.edc.core.transform;
 
 import org.eclipse.edc.spi.EdcException;
 import org.eclipse.edc.spi.result.Result;

diff --git a/.../transformer/OdrlTransformersFactory.java → .../transformer/OdrlTransformersFactory.java b/.../transformer/OdrlTransformersFactory.java → .../transformer/OdrlTransformersFactory.java
@@ -12,15 +12,15 @@
  *
  */
 
-package org.eclipse.edc.jsonld.transformer;
+package org.eclipse.edc.core.transform.transformer;
 
-import org.eclipse.edc.jsonld.transformer.to.JsonObjectToActionTransformer;
-import org.eclipse.edc.jsonld.transformer.to.JsonObjectToConstraintTransformer;
-import org.eclipse.edc.jsonld.transformer.to.JsonObjectToDutyTransformer;
-import org.eclipse.edc.jsonld.transformer.to.JsonObjectToOperatorTransformer;
-import org.eclipse.edc.jsonld.transformer.to.JsonObjectToPermissionTransformer;
-import org.eclipse.edc.jsonld.transformer.to.JsonObjectToPolicyTransformer;
-import org.eclipse.edc.jsonld.transformer.to.JsonObjectToProhibitionTransformer;
+import org.eclipse.edc.core.transform.transformer.to.JsonObjectToActionTransformer;
+import org.eclipse.edc.core.transform.transformer.to.JsonObjectToConstraintTransformer;
+import org.eclipse.edc.core.transform.transformer.to.JsonObjectToDutyTransformer;
+import org.eclipse.edc.core.transform.transformer.to.JsonObjectToOperatorTransformer;
+import org.eclipse.edc.core.transform.transformer.to.JsonObjectToPermissionTransformer;
+import org.eclipse.edc.core.transform.transformer.to.JsonObjectToPolicyTransformer;
+import org.eclipse.edc.core.transform.transformer.to.JsonObjectToProhibitionTransformer;
 import org.eclipse.edc.transform.spi.TypeTransformer;
 
 import java.util.stream.Stream;

diff --git a/.../from/JsonObjectFromAssetTransformer.java → .../from/JsonObjectFromAssetTransformer.java b/.../from/JsonObjectFromAssetTransformer.java → .../from/JsonObjectFromAssetTransformer.java
@@ -12,7 +12,7 @@
  *
  */
 
-package org.eclipse.edc.jsonld.transformer.from;
+package org.eclipse.edc.core.transform.transformer.from;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.json.JsonBuilderFactory;

diff --git a/...rom/JsonObjectFromCatalogTransformer.java → ...rom/JsonObjectFromCatalogTransformer.java b/...rom/JsonObjectFromCatalogTransformer.java → ...rom/JsonObjectFromCatalogTransformer.java
@@ -12,7 +12,7 @@
  *
  */
 
-package org.eclipse.edc.jsonld.transformer.from;
+package org.eclipse.edc.core.transform.transformer.from;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.json.JsonArrayBuilder;

diff --git a/...m/JsonObjectFromCriterionTransformer.java → ...m/JsonObjectFromCriterionTransformer.java b/...m/JsonObjectFromCriterionTransformer.java → ...m/JsonObjectFromCriterionTransformer.java
@@ -12,7 +12,7 @@
  *
  */
 
-package org.eclipse.edc.jsonld.transformer.from;
+package org.eclipse.edc.core.transform.transformer.from;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.json.JsonBuilderFactory;

diff --git a/...JsonObjectFromDataServiceTransformer.java → ...JsonObjectFromDataServiceTransformer.java b/...JsonObjectFromDataServiceTransformer.java → ...JsonObjectFromDataServiceTransformer.java
@@ -12,7 +12,7 @@
  *
  */
 
-package org.eclipse.edc.jsonld.transformer.from;
+package org.eclipse.edc.core.transform.transformer.from;
 
 import jakarta.json.JsonBuilderFactory;
 import jakarta.json.JsonObject;

diff --git a/...rom/JsonObjectFromDatasetTransformer.java → ...rom/JsonObjectFromDatasetTransformer.java b/...rom/JsonObjectFromDatasetTransformer.java → ...rom/JsonObjectFromDatasetTransformer.java
@@ -12,7 +12,7 @@
  *
  */
 
-package org.eclipse.edc.jsonld.transformer.from;
+package org.eclipse.edc.core.transform.transformer.from;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.json.Json;

diff --git a/...sonObjectFromDistributionTransformer.java → ...sonObjectFromDistributionTransformer.java b/...sonObjectFromDistributionTransformer.java → ...sonObjectFromDistributionTransformer.java
@@ -12,7 +12,7 @@
  *
  */
 
-package org.eclipse.edc.jsonld.transformer.from;
+package org.eclipse.edc.core.transform.transformer.from;
 
 import jakarta.json.JsonBuilderFactory;
 import jakarta.json.JsonObject;

diff --git a/...from/JsonObjectFromPolicyTransformer.java → ...from/JsonObjectFromPolicyTransformer.java b/...from/JsonObjectFromPolicyTransformer.java → ...from/JsonObjectFromPolicyTransformer.java
@@ -12,7 +12,7 @@
  *
  */
 
-package org.eclipse.edc.jsonld.transformer.from;
+package org.eclipse.edc.core.transform.transformer.from;
 
 import jakarta.json.Json;
 import jakarta.json.JsonArray;

diff --git a/...m/JsonObjectFromQuerySpecTransformer.java → ...m/JsonObjectFromQuerySpecTransformer.java b/...m/JsonObjectFromQuerySpecTransformer.java → ...m/JsonObjectFromQuerySpecTransformer.java
@@ -12,7 +12,7 @@
  *
  */
 
-package org.eclipse.edc.jsonld.transformer.from;
+package org.eclipse.edc.core.transform.transformer.from;
 
 import jakarta.json.JsonArrayBuilder;
 import jakarta.json.JsonBuilderFactory;

diff --git a/...mer/to/JsonObjectToActionTransformer.java → ...mer/to/JsonObjectToActionTransformer.java b/...mer/to/JsonObjectToActionTransformer.java → ...mer/to/JsonObjectToActionTransformer.java
@@ -12,7 +12,7 @@
  *
  */
 
-package org.eclipse.edc.jsonld.transformer.to;
+package org.eclipse.edc.core.transform.transformer.to;
 
 import jakarta.json.JsonObject;
 import jakarta.json.JsonValue;

diff --git a/...rmer/to/JsonObjectToAssetTransformer.java → ...rmer/to/JsonObjectToAssetTransformer.java b/...rmer/to/JsonObjectToAssetTransformer.java → ...rmer/to/JsonObjectToAssetTransformer.java
@@ -12,7 +12,7 @@
  *
  */
 
-package org.eclipse.edc.jsonld.transformer.to;
+package org.eclipse.edc.core.transform.transformer.to;
 
 import jakarta.json.JsonArray;
 import jakarta.json.JsonObject;

diff --git a/...er/to/JsonObjectToCatalogTransformer.java → ...er/to/JsonObjectToCatalogTransformer.java b/...er/to/JsonObjectToCatalogTransformer.java → ...er/to/JsonObjectToCatalogTransformer.java
@@ -12,7 +12,7 @@
  *
  */
 
-package org.eclipse.edc.jsonld.transformer.to;
+package org.eclipse.edc.core.transform.transformer.to;
 
 import jakarta.json.JsonObject;
 import jakarta.json.JsonValue;

diff --git a/...to/JsonObjectToConstraintTransformer.java → ...to/JsonObjectToConstraintTransformer.java b/...to/JsonObjectToConstraintTransformer.java → ...to/JsonObjectToConstraintTransformer.java
@@ -12,7 +12,7 @@
  *
  */
 
-package org.eclipse.edc.jsonld.transformer.to;
+package org.eclipse.edc.core.transform.transformer.to;
 
 import jakarta.json.JsonNumber;
 import jakarta.json.JsonObject;

diff --git a/.../to/JsonObjectToCriterionTransformer.java → .../to/JsonObjectToCriterionTransformer.java b/.../to/JsonObjectToCriterionTransformer.java → .../to/JsonObjectToCriterionTransformer.java
@@ -12,7 +12,7 @@
  *
  */
 
-package org.eclipse.edc.jsonld.transformer.to;
+package org.eclipse.edc.core.transform.transformer.to;
 
 import jakarta.json.JsonObject;
 import org.eclipse.edc.jsonld.spi.transformer.AbstractJsonLdTransformer;

diff --git a/...o/JsonObjectToDataAddressTransformer.java → ...o/JsonObjectToDataAddressTransformer.java b/...o/JsonObjectToDataAddressTransformer.java → ...o/JsonObjectToDataAddressTransformer.java
@@ -12,7 +12,7 @@
  *
  */
 
-package org.eclipse.edc.jsonld.transformer.to;
+package org.eclipse.edc.core.transform.transformer.to;
 
 import jakarta.json.JsonArray;
 import jakarta.json.JsonObject;

diff --git a/...o/JsonObjectToDataServiceTransformer.java → ...o/JsonObjectToDataServiceTransformer.java b/...o/JsonObjectToDataServiceTransformer.java → ...o/JsonObjectToDataServiceTransformer.java
@@ -12,7 +12,7 @@
  *
  */
 
-package org.eclipse.edc.jsonld.transformer.to;
+package org.eclipse.edc.core.transform.transformer.to;
 
 import jakarta.json.JsonObject;
 import jakarta.json.JsonValue;

diff --git a/...er/to/JsonObjectToDatasetTransformer.java → ...er/to/JsonObjectToDatasetTransformer.java b/...er/to/JsonObjectToDatasetTransformer.java → ...er/to/JsonObjectToDatasetTransformer.java
@@ -12,7 +12,7 @@
  *
  */
 
-package org.eclipse.edc.jsonld.transformer.to;
+package org.eclipse.edc.core.transform.transformer.to;
 
 import jakarta.json.JsonArray;
 import jakarta.json.JsonObject;

diff --git a/.../JsonObjectToDistributionTransformer.java → .../JsonObjectToDistributionTransformer.java b/.../JsonObjectToDistributionTransformer.java → .../JsonObjectToDistributionTransformer.java
@@ -12,7 +12,7 @@
  *
  */
 
-package org.eclipse.edc.jsonld.transformer.to;
+package org.eclipse.edc.core.transform.transformer.to;
 
 import jakarta.json.JsonObject;
 import jakarta.json.JsonValue;

diff --git a/...ormer/to/JsonObjectToDutyTransformer.java → ...ormer/to/JsonObjectToDutyTransformer.java b/...ormer/to/JsonObjectToDutyTransformer.java → ...ormer/to/JsonObjectToDutyTransformer.java
@@ -12,7 +12,7 @@
  *
  */
 
-package org.eclipse.edc.jsonld.transformer.to;
+package org.eclipse.edc.core.transform.transformer.to;
 
 import jakarta.json.JsonObject;
 import org.eclipse.edc.jsonld.spi.transformer.AbstractJsonLdTransformer;

diff --git a/...r/to/JsonObjectToOperatorTransformer.java → ...r/to/JsonObjectToOperatorTransformer.java b/...r/to/JsonObjectToOperatorTransformer.java → ...r/to/JsonObjectToOperatorTransformer.java
@@ -12,7 +12,7 @@
  *
  */
 
-package org.eclipse.edc.jsonld.transformer.to;
+package org.eclipse.edc.core.transform.transformer.to;
 
 import jakarta.json.JsonObject;
 import org.eclipse.edc.jsonld.spi.transformer.AbstractJsonLdTransformer;

diff --git a/...to/JsonObjectToPermissionTransformer.java → ...to/JsonObjectToPermissionTransformer.java b/...to/JsonObjectToPermissionTransformer.java → ...to/JsonObjectToPermissionTransformer.java
@@ -12,7 +12,7 @@
  *
  */
 
-package org.eclipse.edc.jsonld.transformer.to;
+package org.eclipse.edc.core.transform.transformer.to;
 
 import jakarta.json.JsonObject;
 import org.eclipse.edc.jsonld.spi.transformer.AbstractJsonLdTransformer;

diff --git a/...mer/to/JsonObjectToPolicyTransformer.java → ...mer/to/JsonObjectToPolicyTransformer.java b/...mer/to/JsonObjectToPolicyTransformer.java → ...mer/to/JsonObjectToPolicyTransformer.java
@@ -12,7 +12,7 @@
  *
  */
 
-package org.eclipse.edc.jsonld.transformer.to;
+package org.eclipse.edc.core.transform.transformer.to;
 
 import jakarta.json.JsonObject;
 import org.eclipse.edc.jsonld.spi.transformer.AbstractJsonLdTransformer;

diff --git a/...o/JsonObjectToProhibitionTransformer.java → ...o/JsonObjectToProhibitionTransformer.java b/...o/JsonObjectToProhibitionTransformer.java → ...o/JsonObjectToProhibitionTransformer.java
@@ -12,7 +12,7 @@
  *
  */
 
-package org.eclipse.edc.jsonld.transformer.to;
+package org.eclipse.edc.core.transform.transformer.to;
 
 import jakarta.json.JsonObject;
 import org.eclipse.edc.jsonld.spi.transformer.AbstractJsonLdTransformer;

diff --git a/.../to/JsonObjectToQuerySpecTransformer.java → .../to/JsonObjectToQuerySpecTransformer.java b/.../to/JsonObjectToQuerySpecTransformer.java → .../to/JsonObjectToQuerySpecTransformer.java
@@ -12,7 +12,7 @@
  *
  */
 
-package org.eclipse.edc.jsonld.transformer.to;
+package org.eclipse.edc.core.transform.transformer.to;
 
 import jakarta.json.JsonObject;
 import org.eclipse.edc.jsonld.spi.transformer.AbstractJsonLdTransformer;

diff --git a/...to/JsonValueToGenericTypeTransformer.java → ...to/JsonValueToGenericTypeTransformer.java b/...to/JsonValueToGenericTypeTransformer.java → ...to/JsonValueToGenericTypeTransformer.java
@@ -12,7 +12,7 @@
  *
  */
 
-package org.eclipse.edc.jsonld.transformer.to;
+package org.eclipse.edc.core.transform.transformer.to;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;

diff --git a/...lipse/edc/jsonld/transformer/Payload.java → ...g/eclipse/edc/core/transform/Payload.java b/...lipse/edc/jsonld/transformer/Payload.java → ...g/eclipse/edc/core/transform/Payload.java
@@ -12,7 +12,7 @@
  *
  */
 
-package org.eclipse.edc.jsonld.transformer;
+package org.eclipse.edc.core.transform;
 
 public class Payload {
     private String name;

diff --git a/...sonld/transformer/PayloadTransformer.java → ...dc/core/transform/PayloadTransformer.java b/...sonld/transformer/PayloadTransformer.java → ...dc/core/transform/PayloadTransformer.java
@@ -12,7 +12,7 @@
  *
  */
 
-package org.eclipse.edc.jsonld.transformer;
+package org.eclipse.edc.core.transform;
 
 import jakarta.json.JsonObject;
 import org.eclipse.edc.jsonld.spi.transformer.AbstractJsonLdTransformer;

diff --git a/...ansform/StringIntegerTypeTransformer.java → ...ansform/StringIntegerTypeTransformer.java b/...ansform/StringIntegerTypeTransformer.java → ...ansform/StringIntegerTypeTransformer.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2022 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+ *  Copyright (c) 2022 - 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Apache License, Version 2.0 which is available at
@@ -12,7 +12,7 @@
  *
  */
 
-package org.eclipse.edc.connector.core.transform;
+package org.eclipse.edc.core.transform;
 
 import org.eclipse.edc.transform.spi.TransformerContext;
 import org.eclipse.edc.transform.spi.TypeTransformer;

diff --git a/...transform/TransformerContextImplTest.java → ...transform/TransformerContextImplTest.java b/...transform/TransformerContextImplTest.java → ...transform/TransformerContextImplTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2022 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+ *  Copyright (c) 2022 - 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Apache License, Version 2.0 which is available at
@@ -12,7 +12,7 @@
  *
  */
 
-package org.eclipse.edc.connector.core.transform;
+package org.eclipse.edc.core.transform;
 
 import org.eclipse.edc.transform.spi.TypeTransformerRegistry;
 import org.junit.jupiter.api.Test;