From 1feb5c5493b1c24426fd1c4b05c8aa3b5142f774 Mon Sep 17 00:00:00 2001 From: Enrico Risa Date: Fri, 8 Nov 2024 10:17:52 +0100 Subject: [PATCH] chore: fixes checkstyle --- .../tests/fixtures/DataspaceIssuer.java | 4 ++-- .../tests/transfer/TransferEndToEndTest.java | 20 +++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/compatibility-tests/src/test/java/org/eclipse/tractusx/edc/compatibility/tests/fixtures/DataspaceIssuer.java b/tests/compatibility-tests/src/test/java/org/eclipse/tractusx/edc/compatibility/tests/fixtures/DataspaceIssuer.java index 57af3c5..fcd593a 100644 --- a/tests/compatibility-tests/src/test/java/org/eclipse/tractusx/edc/compatibility/tests/fixtures/DataspaceIssuer.java +++ b/tests/compatibility-tests/src/test/java/org/eclipse/tractusx/edc/compatibility/tests/fixtures/DataspaceIssuer.java @@ -48,11 +48,11 @@ import java.util.UUID; import java.util.function.Supplier; +import static org.eclipse.edc.jsonld.util.JacksonJsonLd.createObjectMapper; +import static org.eclipse.edc.util.io.Ports.getFreePort; import static org.eclipse.tractusx.edc.compatibility.tests.fixtures.DcpHelperFunctions.createVc; import static org.eclipse.tractusx.edc.compatibility.tests.fixtures.DcpHelperFunctions.frameworkAgreementSubject; import static org.eclipse.tractusx.edc.compatibility.tests.fixtures.DcpHelperFunctions.membershipSubject; -import static org.eclipse.edc.jsonld.util.JacksonJsonLd.createObjectMapper; -import static org.eclipse.edc.util.io.Ports.getFreePort; /** * Dataspace issuer configurations diff --git a/tests/compatibility-tests/src/test/java/org/eclipse/tractusx/edc/compatibility/tests/transfer/TransferEndToEndTest.java b/tests/compatibility-tests/src/test/java/org/eclipse/tractusx/edc/compatibility/tests/transfer/TransferEndToEndTest.java index 73e4fb0..618c32e 100644 --- a/tests/compatibility-tests/src/test/java/org/eclipse/tractusx/edc/compatibility/tests/transfer/TransferEndToEndTest.java +++ b/tests/compatibility-tests/src/test/java/org/eclipse/tractusx/edc/compatibility/tests/transfer/TransferEndToEndTest.java @@ -20,13 +20,6 @@ package org.eclipse.tractusx.edc.compatibility.tests.transfer; import jakarta.json.JsonObject; -import org.eclipse.tractusx.edc.compatibility.tests.fixtures.BaseParticipant; -import org.eclipse.tractusx.edc.compatibility.tests.fixtures.DataspaceIssuer; -import org.eclipse.tractusx.edc.compatibility.tests.fixtures.EdcDockerRuntimes; -import org.eclipse.tractusx.edc.compatibility.tests.fixtures.IdentityHubParticipant; -import org.eclipse.tractusx.edc.compatibility.tests.fixtures.LocalParticipant; -import org.eclipse.tractusx.edc.compatibility.tests.fixtures.RemoteParticipant; -import org.eclipse.tractusx.edc.compatibility.tests.fixtures.Runtimes; import org.eclipse.edc.connector.controlplane.test.system.utils.PolicyFixtures; import org.eclipse.edc.junit.annotations.EndToEndTest; import org.eclipse.edc.junit.extensions.RuntimeExtension; @@ -34,6 +27,13 @@ import org.eclipse.edc.spi.iam.AudienceResolver; import org.eclipse.edc.spi.result.Result; import org.eclipse.edc.spi.security.Vault; +import org.eclipse.tractusx.edc.compatibility.tests.fixtures.BaseParticipant; +import org.eclipse.tractusx.edc.compatibility.tests.fixtures.DataspaceIssuer; +import org.eclipse.tractusx.edc.compatibility.tests.fixtures.EdcDockerRuntimes; +import org.eclipse.tractusx.edc.compatibility.tests.fixtures.IdentityHubParticipant; +import org.eclipse.tractusx.edc.compatibility.tests.fixtures.LocalParticipant; +import org.eclipse.tractusx.edc.compatibility.tests.fixtures.RemoteParticipant; +import org.eclipse.tractusx.edc.compatibility.tests.fixtures.Runtimes; import org.eclipse.tractusx.edc.spi.identity.mapper.BdrsClient; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.BeforeAll; @@ -60,14 +60,14 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.awaitility.Awaitility.await; -import static org.eclipse.tractusx.edc.compatibility.tests.fixtures.DcpHelperFunctions.configureParticipant; -import static org.eclipse.tractusx.edc.compatibility.tests.fixtures.DcpHelperFunctions.configureParticipantContext; import static org.eclipse.edc.connector.controlplane.test.system.utils.PolicyFixtures.noConstraintPolicy; import static org.eclipse.edc.connector.controlplane.transfer.spi.types.TransferProcessStates.STARTED; import static org.eclipse.edc.connector.controlplane.transfer.spi.types.TransferProcessStates.SUSPENDED; import static org.eclipse.edc.spi.constants.CoreConstants.EDC_NAMESPACE; import static org.eclipse.edc.sql.testfixtures.PostgresqlEndToEndInstance.createDatabase; import static org.eclipse.edc.util.io.Ports.getFreePort; +import static org.eclipse.tractusx.edc.compatibility.tests.fixtures.DcpHelperFunctions.configureParticipant; +import static org.eclipse.tractusx.edc.compatibility.tests.fixtures.DcpHelperFunctions.configureParticipantContext; import static org.mockserver.integration.ClientAndServer.startClientAndServer; @@ -79,7 +79,7 @@ public class TransferEndToEndTest { .name("identity-hub") .id("identity-hub") .build(); - + protected static final DataspaceIssuer ISSUER = DataspaceIssuer.Builder.newInstance().id("issuer").name("issuer") .did(IDENTITY_HUB_PARTICIPANT.didFor("issuer")) .build();