From c7a77e96dd1c180e04ed5df0b2b9e798a3a2edaf Mon Sep 17 00:00:00 2001 From: dhommen Date: Thu, 25 Jan 2024 10:25:08 +0100 Subject: [PATCH 01/13] fix(edc-extension): remove unused maven repos --- build.gradle.kts | 6 ------ 1 file changed, 6 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 34c4eea..b9b647a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -40,12 +40,6 @@ allprojects { repositories { mavenCentral() mavenLocal() - maven { - url = uri("https://maven.iais.fraunhofer.de/artifactory/eis-ids-public/") - } - maven { - url = uri("https://oss.sonatype.org/content/repositories/snapshots/") - } } } From 8910eefd1c4c67f9cd64fa323987199f8ec814a1 Mon Sep 17 00:00:00 2001 From: dhommen Date: Thu, 25 Jan 2024 11:41:30 +0100 Subject: [PATCH 02/13] fix: checkstyle plugin --- build.gradle.kts | 4 +- checkstyle/checkstyle-config.xml | 416 +++++++++++++++++++++++++++++++ 2 files changed, 418 insertions(+), 2 deletions(-) create mode 100644 checkstyle/checkstyle-config.xml diff --git a/build.gradle.kts b/build.gradle.kts index b9b647a..9a5195d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -32,8 +32,8 @@ allprojects { checkstyle { toolVersion = "10.9.3" - configFile = rootProject.file("docs/dev/checkstyle/checkstyle-config.xml") - configDirectory.set(rootProject.file("docs/dev/checkstyle")) + configFile = rootProject.file("checkstyle/checkstyle-config.xml") + configDirectory.set(rootProject.file("checkstyle")) maxErrors = 0 // does not tolerate errors } diff --git a/checkstyle/checkstyle-config.xml b/checkstyle/checkstyle-config.xml new file mode 100644 index 0000000..302943a --- /dev/null +++ b/checkstyle/checkstyle-config.xml @@ -0,0 +1,416 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 8f1db235db8aed7002e89827f119923f52d8402c Mon Sep 17 00:00:00 2001 From: dhommen Date: Thu, 25 Jan 2024 13:48:33 +0100 Subject: [PATCH 03/13] chore: add build job for pr checks --- .github/workflows/publish.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 399a17e..02cd3c9 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -2,7 +2,10 @@ name: Publish package to GitHub Packages on: push: branches: ["main"] - paths: ["logging-house-client"] + paths: ["logging-house-client/**/*"] + pull_reqeust: + branches: ["main"] + jobs: publish: runs-on: ubuntu-latest @@ -17,7 +20,13 @@ jobs: distribution: 'temurin' - name: Validate Gradle wrapper uses: gradle/wrapper-validation-action@ccb4328a959376b642e027874838f60f8e596de3 + - name: Build package + if: ${{ github.ref != 'refs/heads/main' }} + uses: gradle/gradle-build-action@749f47bda3e44aa060e82d7b3ef7e40d953bd629 + with: + arguments: build - name: Publish package + if: ${{ github.ref == 'refs/heads/main' }} uses: gradle/gradle-build-action@749f47bda3e44aa060e82d7b3ef7e40d953bd629 with: arguments: publish From 4cc27ca0fb2e7a36e8ac5468e46a01a7a4b35add Mon Sep 17 00:00:00 2001 From: dhommen Date: Thu, 25 Jan 2024 13:49:48 +0100 Subject: [PATCH 04/13] fix typo --- .github/workflows/publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 02cd3c9..18381da 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -3,7 +3,7 @@ on: push: branches: ["main"] paths: ["logging-house-client/**/*"] - pull_reqeust: + pull_request: branches: ["main"] jobs: From fefc59d407f1737374f2246cb559ae834cafee01 Mon Sep 17 00:00:00 2001 From: dhommen Date: Thu, 25 Jan 2024 13:57:22 +0100 Subject: [PATCH 05/13] renamed ci file to edc extension --- .github/workflows/{publish.yml => build-and-publish-edc.yml} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename .github/workflows/{publish.yml => build-and-publish-edc.yml} (94%) diff --git a/.github/workflows/publish.yml b/.github/workflows/build-and-publish-edc.yml similarity index 94% rename from .github/workflows/publish.yml rename to .github/workflows/build-and-publish-edc.yml index 18381da..a6092ed 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/build-and-publish-edc.yml @@ -1,4 +1,4 @@ -name: Publish package to GitHub Packages +name: Build and Publish EDC Extension on: push: branches: ["main"] @@ -7,7 +7,7 @@ on: branches: ["main"] jobs: - publish: + build-and-publish: runs-on: ubuntu-latest permissions: contents: read From f6b69af002440c087677870e2c17d3da296d94db Mon Sep 17 00:00:00 2001 From: dhommen Date: Thu, 25 Jan 2024 14:00:29 +0100 Subject: [PATCH 06/13] chore: bump version number of edc extension --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 9a5195d..7fedeae 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -51,7 +51,7 @@ subprojects { maven { name = "GitHubPackages" url = uri("https://maven.pkg.github.com/truzzt/mds-ap3") - version = "0.1.0" + version = "0.1.1" credentials { username = System.getenv("USERNAME") password = System.getenv("TOKEN") From 298790210812de550d5743e640828d9fd34a622e Mon Sep 17 00:00:00 2001 From: dhommen Date: Thu, 25 Jan 2024 14:44:24 +0100 Subject: [PATCH 07/13] add minimal unit test --- build.gradle.kts | 1 + .../client/LoggingHouseClientExtension.java | 49 ++----------------- .../LoggingHouseClientExtensionTest.java | 28 +++++++++++ 3 files changed, 33 insertions(+), 45 deletions(-) create mode 100644 logging-house-client/src/test/java/com/truzzt/extension/logginghouse/client/LoggingHouseClientExtensionTest.java diff --git a/build.gradle.kts b/build.gradle.kts index 7fedeae..06b15a4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,6 +7,7 @@ plugins { dependencies { testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.0") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.0") + testImplementation("org.mockito:mockito-core:3.6.28") } val downloadArtifact: Configuration by configurations.creating { diff --git a/logging-house-client/src/main/java/com/truzzt/extension/logginghouse/client/LoggingHouseClientExtension.java b/logging-house-client/src/main/java/com/truzzt/extension/logginghouse/client/LoggingHouseClientExtension.java index 4868330..7bffb8a 100644 --- a/logging-house-client/src/main/java/com/truzzt/extension/logginghouse/client/LoggingHouseClientExtension.java +++ b/logging-house-client/src/main/java/com/truzzt/extension/logginghouse/client/LoggingHouseClientExtension.java @@ -13,20 +13,11 @@ package com.truzzt.extension.logginghouse.client; -/*import org.eclipse.edc.connector.contract.spi.negotiation.store.ContractNegotiationStore; -import org.eclipse.edc.connector.transfer.spi.store.TransferProcessStore;*/ -//import org.eclipse.edc.runtime.metamodel.annotation.Inject; import org.eclipse.edc.runtime.metamodel.annotation.Setting; import org.eclipse.edc.spi.EdcException; -//import org.eclipse.edc.spi.event.EventRouter; -//import org.eclipse.edc.spi.http.EdcHttpClient; -//import org.eclipse.edc.spi.iam.IdentityService; -//import org.eclipse.edc.spi.message.RemoteMessageDispatcherRegistry; import org.eclipse.edc.spi.monitor.Monitor; -//import org.eclipse.edc.spi.system.Hostname; import org.eclipse.edc.spi.system.ServiceExtension; import org.eclipse.edc.spi.system.ServiceExtensionContext; -//import org.eclipse.edc.spi.types.TypeManager; import java.net.MalformedURLException; import java.net.URL; @@ -34,7 +25,7 @@ public class LoggingHouseClientExtension implements ServiceExtension { - public static final String CATALOG_TRANSFER_EXTENSION = "LoggingHouseClientExtension"; + public static final String LOGGINGHOUSE_CLIENT_EXTENSION = "LoggingHouseClientExtension"; private static final String TYPE_MANAGER_SERIALIZER_KEY = "ids-clearinghouse"; private static final Map CONTEXT_MAP = Map.of( @@ -45,47 +36,15 @@ public class LoggingHouseClientExtension implements ServiceExtension { public static final String CLEARINGHOUSE_LOG_URL_SETTING = "edc.clearinghouse.log.url"; @Setting - private static final String CLEARINGHOUSE_CLIENT_EXTENSION_ENABLED = "clearinghouse.client.extension.enabled"; - - /*@Inject - private IdsApiConfiguration idsApiConfiguration; - - @Inject - private RemoteMessageDispatcherRegistry dispatcherRegistry; - - @Inject - private IdentityService identityService; - - @Inject - private IdsTransformerRegistry transformerRegistry; - - @Inject - private ContractNegotiationStore contractNegotiationStore; - - @Inject - private TransferProcessStore transferProcessStore; - - @Inject - private Hostname hostname; - - @Inject - private EdcHttpClient edcHttpClient; - - @Inject - private DynamicAttributeTokenService dynamicAttributeTokenService; - - @Inject - private EventRouter eventRouter; - - private IdsClearingHouseService idsClearingHouseService;*/ + public static final String CLEARINGHOUSE_CLIENT_EXTENSION_ENABLED = "clearinghouse.client.extension.enabled"; private URL clearingHouseLogUrl; - private Monitor monitor; + public Monitor monitor; @Override public String name() { - return CATALOG_TRANSFER_EXTENSION; + return LOGGINGHOUSE_CLIENT_EXTENSION; } @Override diff --git a/logging-house-client/src/test/java/com/truzzt/extension/logginghouse/client/LoggingHouseClientExtensionTest.java b/logging-house-client/src/test/java/com/truzzt/extension/logginghouse/client/LoggingHouseClientExtensionTest.java new file mode 100644 index 0000000..89f9ed5 --- /dev/null +++ b/logging-house-client/src/test/java/com/truzzt/extension/logginghouse/client/LoggingHouseClientExtensionTest.java @@ -0,0 +1,28 @@ +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import com.truzzt.extension.logginghouse.client.LoggingHouseClientExtension; +import org.eclipse.edc.spi.system.ServiceExtensionContext; + +import static org.mockito.Mockito.*; + +class LoggingHouseClientExtensionTest { + + private LoggingHouseClientExtension extension; + + @Mock + private ServiceExtensionContext context; + + @BeforeEach + void setUp() { + MockitoAnnotations.openMocks(this); + extension = new LoggingHouseClientExtension(); + } + + @Test + void name_shouldReturnCorrectName() { + assertEquals(LoggingHouseClientExtension.LOGGINGHOUSE_CLIENT_EXTENSION, extension.name()); + } +} From 8c6b75cc6bbb7e6697a8d51de65d0f9f1819565e Mon Sep 17 00:00:00 2001 From: dhommen Date: Thu, 25 Jan 2024 14:50:40 +0100 Subject: [PATCH 08/13] test checkstyle fix --- .../logginghouse/client/LoggingHouseClientExtensionTest.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/logging-house-client/src/test/java/com/truzzt/extension/logginghouse/client/LoggingHouseClientExtensionTest.java b/logging-house-client/src/test/java/com/truzzt/extension/logginghouse/client/LoggingHouseClientExtensionTest.java index 89f9ed5..7e41fce 100644 --- a/logging-house-client/src/test/java/com/truzzt/extension/logginghouse/client/LoggingHouseClientExtensionTest.java +++ b/logging-house-client/src/test/java/com/truzzt/extension/logginghouse/client/LoggingHouseClientExtensionTest.java @@ -1,9 +1,10 @@ +import com.truzzt.extension.logginghouse.client.LoggingHouseClientExtension; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import com.truzzt.extension.logginghouse.client.LoggingHouseClientExtension; import org.eclipse.edc.spi.system.ServiceExtensionContext; import static org.mockito.Mockito.*; From 875f498e38c079f501acfc8963d1e2cd88490b9b Mon Sep 17 00:00:00 2001 From: dhommen Date: Thu, 25 Jan 2024 14:55:50 +0100 Subject: [PATCH 09/13] checkstyle... --- .../logginghouse/client/LoggingHouseClientExtensionTest.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/logging-house-client/src/test/java/com/truzzt/extension/logginghouse/client/LoggingHouseClientExtensionTest.java b/logging-house-client/src/test/java/com/truzzt/extension/logginghouse/client/LoggingHouseClientExtensionTest.java index 7e41fce..a6523b7 100644 --- a/logging-house-client/src/test/java/com/truzzt/extension/logginghouse/client/LoggingHouseClientExtensionTest.java +++ b/logging-house-client/src/test/java/com/truzzt/extension/logginghouse/client/LoggingHouseClientExtensionTest.java @@ -7,8 +7,6 @@ import org.mockito.MockitoAnnotations; import org.eclipse.edc.spi.system.ServiceExtensionContext; -import static org.mockito.Mockito.*; - class LoggingHouseClientExtensionTest { private LoggingHouseClientExtension extension; From 3eb42ebf23d763e141a06dbdd08d706d5e8d963d Mon Sep 17 00:00:00 2001 From: dhommen Date: Thu, 25 Jan 2024 15:32:59 +0100 Subject: [PATCH 10/13] checkstyle ... --- .../logginghouse/client/LoggingHouseClientExtensionTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/logging-house-client/src/test/java/com/truzzt/extension/logginghouse/client/LoggingHouseClientExtensionTest.java b/logging-house-client/src/test/java/com/truzzt/extension/logginghouse/client/LoggingHouseClientExtensionTest.java index a6523b7..31efc4d 100644 --- a/logging-house-client/src/test/java/com/truzzt/extension/logginghouse/client/LoggingHouseClientExtensionTest.java +++ b/logging-house-client/src/test/java/com/truzzt/extension/logginghouse/client/LoggingHouseClientExtensionTest.java @@ -1,5 +1,3 @@ -import com.truzzt.extension.logginghouse.client.LoggingHouseClientExtension; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -7,6 +5,8 @@ import org.mockito.MockitoAnnotations; import org.eclipse.edc.spi.system.ServiceExtensionContext; +import com.truzzt.extension.logginghouse.client.LoggingHouseClientExtension; + class LoggingHouseClientExtensionTest { private LoggingHouseClientExtension extension; From 50f81021292654a2b9236e0db4ed7d26807452e1 Mon Sep 17 00:00:00 2001 From: dhommen Date: Thu, 25 Jan 2024 15:58:52 +0100 Subject: [PATCH 11/13] checkstyle ... --- .../client/LoggingHouseClientExtensionTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/logging-house-client/src/test/java/com/truzzt/extension/logginghouse/client/LoggingHouseClientExtensionTest.java b/logging-house-client/src/test/java/com/truzzt/extension/logginghouse/client/LoggingHouseClientExtensionTest.java index 31efc4d..08154a5 100644 --- a/logging-house-client/src/test/java/com/truzzt/extension/logginghouse/client/LoggingHouseClientExtensionTest.java +++ b/logging-house-client/src/test/java/com/truzzt/extension/logginghouse/client/LoggingHouseClientExtensionTest.java @@ -1,12 +1,12 @@ +import org.eclipse.edc.spi.system.ServiceExtensionContext; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.eclipse.edc.spi.system.ServiceExtensionContext; - import com.truzzt.extension.logginghouse.client.LoggingHouseClientExtension; +import static org.junit.jupiter.api.Assertions.assertEquals; + class LoggingHouseClientExtensionTest { private LoggingHouseClientExtension extension; From 092601a4e13d3d4c9606e795d36bee8ca545b8fd Mon Sep 17 00:00:00 2001 From: dhommen Date: Thu, 25 Jan 2024 16:00:47 +0100 Subject: [PATCH 12/13] checkstyle --- .../logginghouse/client/LoggingHouseClientExtensionTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/logging-house-client/src/test/java/com/truzzt/extension/logginghouse/client/LoggingHouseClientExtensionTest.java b/logging-house-client/src/test/java/com/truzzt/extension/logginghouse/client/LoggingHouseClientExtensionTest.java index 08154a5..1a4b403 100644 --- a/logging-house-client/src/test/java/com/truzzt/extension/logginghouse/client/LoggingHouseClientExtensionTest.java +++ b/logging-house-client/src/test/java/com/truzzt/extension/logginghouse/client/LoggingHouseClientExtensionTest.java @@ -1,9 +1,9 @@ import org.eclipse.edc.spi.system.ServiceExtensionContext; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import com.truzzt.extension.logginghouse.client.LoggingHouseClientExtension; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import com.truzzt.extension.logginghouse.client.LoggingHouseClientExtension; import static org.junit.jupiter.api.Assertions.assertEquals; From 1dcbf35f3dc2b93b52a99d52052aa43448413c01 Mon Sep 17 00:00:00 2001 From: dhommen Date: Thu, 25 Jan 2024 16:02:15 +0100 Subject: [PATCH 13/13] checkstyle --- .../logginghouse/client/LoggingHouseClientExtensionTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/logging-house-client/src/test/java/com/truzzt/extension/logginghouse/client/LoggingHouseClientExtensionTest.java b/logging-house-client/src/test/java/com/truzzt/extension/logginghouse/client/LoggingHouseClientExtensionTest.java index 1a4b403..14c8cbe 100644 --- a/logging-house-client/src/test/java/com/truzzt/extension/logginghouse/client/LoggingHouseClientExtensionTest.java +++ b/logging-house-client/src/test/java/com/truzzt/extension/logginghouse/client/LoggingHouseClientExtensionTest.java @@ -1,7 +1,7 @@ +import com.truzzt.extension.logginghouse.client.LoggingHouseClientExtension; import org.eclipse.edc.spi.system.ServiceExtensionContext; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import com.truzzt.extension.logginghouse.client.LoggingHouseClientExtension; import org.mockito.Mock; import org.mockito.MockitoAnnotations;