Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: add negotiation endpoint api spec examples #3283

Merged
merged 1 commit into from
Jul 13, 2023
Merged

feat: add negotiation endpoint api spec examples #3283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions core/common/connector-core/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion ...on/connector-core/src/main/java/org/eclipse/edc/connector/core/CoreServicesExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion core/common/junit/src/main/java/org/eclipse/edc/junit/assertions/AbstractResultAssert.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
Expand Down
14 changes: 8 additions & 6 deletions ...tocols/dsp/dsp-transform/build.gradle.kts → core/common/transform-core/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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"))
}
4 changes: 2 additions & 2 deletions ...ore/transform/TransformerContextImpl.java → ...ore/transform/TransformerContextImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...ransform/TypeTransformerRegistryImpl.java → ...ransform/TypeTransformerRegistryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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;
Expand Down
16 changes: 8 additions & 8 deletions .../transformer/OdrlTransformersFactory.java → .../transformer/OdrlTransformersFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion .../from/JsonObjectFromAssetTransformer.java → .../from/JsonObjectFromAssetTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...rom/JsonObjectFromCatalogTransformer.java → ...rom/JsonObjectFromCatalogTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...m/JsonObjectFromCriterionTransformer.java → ...m/JsonObjectFromCriterionTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...JsonObjectFromDataServiceTransformer.java → ...JsonObjectFromDataServiceTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...rom/JsonObjectFromDatasetTransformer.java → ...rom/JsonObjectFromDatasetTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...sonObjectFromDistributionTransformer.java → ...sonObjectFromDistributionTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...from/JsonObjectFromPolicyTransformer.java → ...from/JsonObjectFromPolicyTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...m/JsonObjectFromQuerySpecTransformer.java → ...m/JsonObjectFromQuerySpecTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...mer/to/JsonObjectToActionTransformer.java → ...mer/to/JsonObjectToActionTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...rmer/to/JsonObjectToAssetTransformer.java → ...rmer/to/JsonObjectToAssetTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...er/to/JsonObjectToCatalogTransformer.java → ...er/to/JsonObjectToCatalogTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...to/JsonObjectToConstraintTransformer.java → ...to/JsonObjectToConstraintTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion .../to/JsonObjectToCriterionTransformer.java → .../to/JsonObjectToCriterionTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...o/JsonObjectToDataAddressTransformer.java → ...o/JsonObjectToDataAddressTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...o/JsonObjectToDataServiceTransformer.java → ...o/JsonObjectToDataServiceTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...er/to/JsonObjectToDatasetTransformer.java → ...er/to/JsonObjectToDatasetTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion .../JsonObjectToDistributionTransformer.java → .../JsonObjectToDistributionTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...ormer/to/JsonObjectToDutyTransformer.java → ...ormer/to/JsonObjectToDutyTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...r/to/JsonObjectToOperatorTransformer.java → ...r/to/JsonObjectToOperatorTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...to/JsonObjectToPermissionTransformer.java → ...to/JsonObjectToPermissionTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...mer/to/JsonObjectToPolicyTransformer.java → ...mer/to/JsonObjectToPolicyTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...o/JsonObjectToProhibitionTransformer.java → ...o/JsonObjectToProhibitionTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion .../to/JsonObjectToQuerySpecTransformer.java → .../to/JsonObjectToQuerySpecTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...to/JsonValueToGenericTypeTransformer.java → ...to/JsonValueToGenericTypeTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...lipse/edc/jsonld/transformer/Payload.java → ...g/eclipse/edc/core/transform/Payload.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*
*/

package org.eclipse.edc.jsonld.transformer;
package org.eclipse.edc.core.transform;

public class Payload {
private String name;
Expand Down
2 changes: 1 addition & 1 deletion ...sonld/transformer/PayloadTransformer.java → ...dc/core/transform/PayloadTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...ansform/StringIntegerTypeTransformer.java → ...ansform/StringIntegerTypeTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...transform/TransformerContextImplTest.java → ...transform/TransformerContextImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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;
Expand Down
Loading
Loading