feat: Add C2C custom messages

.editorconfig

@@ -9,6 +9,7 @@ charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 indent_size = 4
+ij_continuation_indent_size = 4
 
 [*.ts]
 quote_type = single

CHANGELOG.md

@@ -15,6 +15,8 @@ please see [changelog_updates.md](docs/dev/changelog_updates.md).
 
 #### Minor Changes
 
+- Add the SovityMessenger extension
+
 #### Patch Changes
 
 - Postman-collection: Fixed an issue where an API-call was previously wrong in the details of the POST-body.

build.gradle.kts

@@ -5,6 +5,7 @@ plugins {
     id("java")
     id("checkstyle")
     id("maven-publish")
+    kotlin("jvm") version "2.0.0"
 }
 
 dependencies {

docs/dev/checkstyle/checkstyle-config.xml

@@ -267,7 +267,7 @@
             <property name="braceAdjustment" value="4"/>
             <property name="caseIndent" value="4"/>
             <property name="throwsIndent" value="4"/>
-            <property name="lineWrappingIndentation" value="8"/>
+            <property name="lineWrappingIndentation" value="4"/>
             <property name="arrayInitIndent" value="4"/>
         </module>
         <module name="AbbreviationAsWordInName">

extensions/sovity-messenger-demo/build.gradle.kts

@@ -0,0 +1,75 @@
+plugins {
+    `java-library`
+    `maven-publish`
+}
+
+dependencies {
+    annotationProcessor(libs.lombok)
+
+    compileOnly(libs.lombok)
+
+    implementation(project(":extensions:sovity-messenger"))
+
+    implementation(libs.edc.controlPlaneCore)
+    implementation(libs.edc.dspApiConfiguration)
+    implementation(libs.edc.dspHttpSpi)
+    implementation(libs.edc.httpSpi)
+    implementation(libs.edc.managementApiConfiguration)
+
+//    implementation("com.squareup.okhttp3:okhttp:${okHttpVersion}")
+//    implementation("org.json:json:${jsonVersion}")
+//    implementation("org.glassfish.jersey.media:jersey-media-multipart:3.1.3")
+//
+//    implementation("de.fraunhofer.iais.eis.ids.infomodel:infomodel-java:1.0.2-basecamp")
+//    implementation("de.fraunhofer.iais.eis.ids.infomodel:infomodel-util:1.0.2-basecamp")
+//
+
+    testAnnotationProcessor(libs.lombok)
+
+    testCompileOnly(libs.lombok)
+
+    testImplementation(project(":utils:test-connector-remote"))
+
+    testImplementation(libs.edc.junit)
+    testImplementation(libs.edc.dataPlaneSelectorCore)
+    testImplementation(libs.edc.dspApiConfiguration)
+    testImplementation(libs.edc.dspHttpCore)
+    testImplementation(libs.edc.iamMock)
+    testImplementation(libs.edc.jsonLd)
+
+    testImplementation(libs.edc.http) {
+        exclude(group = "org.eclipse.jetty", module = "jetty-client")
+        exclude(group = "org.eclipse.jetty", module = "jetty-http")
+        exclude(group = "org.eclipse.jetty", module = "jetty-io")
+        exclude(group = "org.eclipse.jetty", module = "jetty-server")
+        exclude(group = "org.eclipse.jetty", module = "jetty-util")
+        exclude(group = "org.eclipse.jetty", module = "jetty-webapp")
+    }
+
+    // Updated jetty versions for e.g. CVE-2023-26048
+    testImplementation(libs.bundles.jetty.cve2023)
+
+    testImplementation(libs.assertj.core)
+    testImplementation(libs.junit.api)
+    testImplementation(libs.jsonAssert)
+    testImplementation(libs.mockito.core)
+    testImplementation(libs.mockito.inline)
+    testImplementation(libs.restAssured.restAssured)
+    testImplementation(libs.testcontainers.testcontainers)
+    testImplementation(libs.testcontainers.junitJupiter)
+    testImplementation(libs.testcontainers.postgresql)
+
+    testRuntimeOnly(libs.junit.engine)
+}
+
+tasks.getByName<Test>("test") {
+    useJUnitPlatform()
+}
+
+publishing {
+    publications {
+        create<MavenPublication>(project.name) {
+            from(components["java"])
+        }
+    }
+}

extensions/sovity-messenger-demo/src/main/java/de/sovity/edc/extension/sovitymessenger/demo/SovityMessengerDemo.java

@@ -0,0 +1,66 @@
+/*
+ *  Copyright (c) 2024 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.extension.sovitymessenger.demo;
+
+import de.sovity.edc.extension.messenger.api.MessageHandlerRegistry;
+import de.sovity.edc.extension.messenger.api.SovityMessenger;
+import de.sovity.edc.extension.sovitymessenger.demo.message.Addition;
+import de.sovity.edc.extension.sovitymessenger.demo.message.Answer;
+import de.sovity.edc.extension.sovitymessenger.demo.message.Sqrt;
+import org.eclipse.edc.runtime.metamodel.annotation.Inject;
+import org.eclipse.edc.spi.system.ServiceExtension;
+import org.eclipse.edc.spi.system.ServiceExtensionContext;
+
+import java.util.function.Function;
+
+import static java.lang.Math.sqrt;
+
+
+public class SovityMessengerDemo implements ServiceExtension {
+
+    public static final String NAME = "sovityMessengerDemo";
+
+    @Override
+    public String name() {
+        return NAME;
+    }
+
+    /*
+     * 3 parts are needed:
+     * - the messenger
+     * - the handler registry
+     * - your handlers
+     */
+
+    @Inject
+    private SovityMessenger sovityMessenger;
+
+    @Inject
+    private MessageHandlerRegistry registry;
+
+    @Override
+    public void initialize(ServiceExtensionContext context) {
+        // Register the various messages that you would like to process.
+        registry.register(Sqrt.class, (Function<Sqrt, Answer>) single -> new Answer(sqrt(single.getValue())));
+        registry.register(Addition.class, (Function<Addition, Answer>) add -> new Answer(add.op1 + add.op2));
+
+        /*
+         * In the counterpart connector, messages can be sent with the code below.
+         * Check out the de.sovity.edc.extension.sovitymessenger.demo.SovityMessengerDemoTest#demo()
+         * for a detailed usage.
+         */
+
+        // val answer = sovityMessenger.send(Answer.class, "http://localhost/api/dsp", new Sqrt(9.0));
+    }
+}

extensions/sovity-messenger-demo/src/main/java/de/sovity/edc/extension/sovitymessenger/demo/message/Addition.java

@@ -0,0 +1,40 @@
+/*
+ *  Copyright (c) 2024 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.extension.sovitymessenger.demo.message;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import de.sovity.edc.extension.messenger.api.SovityMessage;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import static de.sovity.edc.extension.sovitymessenger.demo.message.Common.ROOT;
+
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+public class Addition implements SovityMessage {
+
+    @Override
+    public String getType() {
+        return ROOT + "add";
+    }
+
+    @JsonProperty
+    public int op1;
+
+    @JsonProperty
+    public int op2;
+
+}

extensions/sovity-messenger-demo/src/main/java/de/sovity/edc/extension/sovitymessenger/demo/message/Answer.java

@@ -0,0 +1,36 @@
+/*
+ *  Copyright (c) 2024 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.extension.sovitymessenger.demo.message;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import de.sovity.edc.extension.messenger.api.SovityMessage;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import static de.sovity.edc.extension.sovitymessenger.demo.message.Common.ROOT;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Getter
+public class Answer implements SovityMessage {
+
+    @Override
+    public String getType() {
+        return ROOT + "answer";
+    }
+
+    @JsonProperty
+    private double answer;
+}

extensions/sovity-messenger-demo/src/main/java/de/sovity/edc/extension/sovitymessenger/demo/message/Common.java

@@ -0,0 +1,18 @@
+/*
+ *  Copyright (c) 2024 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.extension.sovitymessenger.demo.message;
+
+public interface Common {
+    String ROOT = "de.sovity.demo.calculator.";
+}

extensions/sovity-messenger-demo/src/main/java/de/sovity/edc/extension/sovitymessenger/demo/message/Sqrt.java

@@ -0,0 +1,40 @@
+/*
+ *  Copyright (c) 2024 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.extension.sovitymessenger.demo.message;
+
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import de.sovity.edc.extension.messenger.api.SovityMessage;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import static de.sovity.edc.extension.sovitymessenger.demo.message.Common.ROOT;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Getter
+public class Sqrt implements SovityMessage {
+
+    private static final String TYPE = ROOT + "sqrt";
+
+    @Override
+    public String getType() {
+        return TYPE;
+    }
+
+    @JsonProperty
+    private double value;
+
+}

extensions/sovity-messenger-demo/src/main/java/de/sovity/edc/extension/sovitymessenger/demo/message/UnregisteredMessage.java

@@ -0,0 +1,24 @@
+/*
+ *  Copyright (c) 2024 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.extension.sovitymessenger.demo.message;
+
+import de.sovity.edc.extension.messenger.api.SovityMessage;
+
+public class UnregisteredMessage implements SovityMessage {
+
+    @Override
+    public String getType() {
+        return "UNREGISTERED";
+    }
+}

extensions/sovity-messenger-demo/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension

@@ -0,0 +1 @@
+de.sovity.edc.extension.sovitymessenger.demo.SovityMessengerDemo