From 80dc1a97d08d8a14bf883b0b921d92878539ccb5 Mon Sep 17 00:00:00 2001 From: Ronja Quensel Date: Wed, 8 Jul 2026 14:45:21 +0200 Subject: [PATCH] refactor: remove "port" package from core --- .../java/org/eclipse/dataplane/Dataplane.java | 22 +++++++++---------- .../registration/AuthorizationProfile.java | 2 +- .../exception/AuthorizationNotSupported.java | 2 +- .../exception/ControlPlaneNotRegistered.java | 2 +- .../DataFlowNotifyControlPlaneFailed.java | 2 +- .../exception/DataplaneNotRegistered.java | 2 +- .../IllegalAttributeTypeException.java | 2 +- .../exception/PersistenceException.java | 2 +- .../exception/ResourceNotFoundException.java | 2 +- .../exception/UnauthorizedException.java | 2 +- .../{port => }/store/ControlPlaneStore.java | 2 +- .../{port => }/store/DataFlowStore.java | 2 +- .../store/InMemoryControlPlaneStore.java | 4 ++-- .../store/InMemoryDataFlowStore.java | 4 ++-- .../dataplane/{port => }/store/Stores.java | 2 +- .../store/InMemoryControlPlaneStoreTest.java | 2 -- .../store/InMemoryDataFlowStoreTest.java | 2 -- .../store/ControlPlaneStoreTestBase.java | 3 +-- .../store/DataFlowStoreTestBase.java | 3 +-- .../dataplane/port/ExceptionMapper.java | 8 +++---- .../store/postgresql/AbstractSqlStore.java | 2 +- .../postgresql/PostgresControlPlaneStore.java | 6 ++--- .../postgresql/PostgresDataFlowStore.java | 6 ++--- .../PostgresControlPlaneStoreTest.java | 2 +- .../postgresql/PostgresDataFlowStoreTest.java | 2 +- .../org/eclipse/dataplane/DataplaneTest.java | 6 ++--- .../api/ControlPlaneRegistrationApiTest.java | 2 +- .../dataplane/scenario/AuthorizationTest.java | 2 +- 28 files changed, 47 insertions(+), 53 deletions(-) rename dataplane-sdk-core/src/main/java/org/eclipse/dataplane/{port => }/exception/AuthorizationNotSupported.java (93%) rename dataplane-sdk-core/src/main/java/org/eclipse/dataplane/{port => }/exception/ControlPlaneNotRegistered.java (92%) rename dataplane-sdk-core/src/main/java/org/eclipse/dataplane/{port => }/exception/DataFlowNotifyControlPlaneFailed.java (95%) rename dataplane-sdk-core/src/main/java/org/eclipse/dataplane/{port => }/exception/DataplaneNotRegistered.java (91%) rename dataplane-sdk-core/src/main/java/org/eclipse/dataplane/{port => }/exception/IllegalAttributeTypeException.java (91%) rename dataplane-sdk-core/src/main/java/org/eclipse/dataplane/{port => }/exception/PersistenceException.java (94%) rename dataplane-sdk-core/src/main/java/org/eclipse/dataplane/{port => }/exception/ResourceNotFoundException.java (91%) rename dataplane-sdk-core/src/main/java/org/eclipse/dataplane/{port => }/exception/UnauthorizedException.java (93%) rename dataplane-sdk-core/src/main/java/org/eclipse/dataplane/{port => }/store/ControlPlaneStore.java (97%) rename dataplane-sdk-core/src/main/java/org/eclipse/dataplane/{port => }/store/DataFlowStore.java (96%) rename dataplane-sdk-core/src/main/java/org/eclipse/dataplane/{port => }/store/InMemoryControlPlaneStore.java (95%) rename dataplane-sdk-core/src/main/java/org/eclipse/dataplane/{port => }/store/InMemoryDataFlowStore.java (93%) rename dataplane-sdk-core/src/main/java/org/eclipse/dataplane/{port => }/store/Stores.java (94%) diff --git a/dataplane-sdk-core/src/main/java/org/eclipse/dataplane/Dataplane.java b/dataplane-sdk-core/src/main/java/org/eclipse/dataplane/Dataplane.java index 68c8eb1..725a5bb 100644 --- a/dataplane-sdk-core/src/main/java/org/eclipse/dataplane/Dataplane.java +++ b/dataplane-sdk-core/src/main/java/org/eclipse/dataplane/Dataplane.java @@ -34,6 +34,12 @@ import org.eclipse.dataplane.domain.registration.AuthorizationProfile; import org.eclipse.dataplane.domain.registration.ControlPlaneRegistrationMessage; import org.eclipse.dataplane.domain.registration.DataPlaneRegistrationMessage; +import org.eclipse.dataplane.exception.AuthorizationNotSupported; +import org.eclipse.dataplane.exception.ControlPlaneNotRegistered; +import org.eclipse.dataplane.exception.DataFlowNotifyControlPlaneFailed; +import org.eclipse.dataplane.exception.DataplaneNotRegistered; +import org.eclipse.dataplane.exception.ResourceNotFoundException; +import org.eclipse.dataplane.exception.UnauthorizedException; import org.eclipse.dataplane.logic.OnCompleted; import org.eclipse.dataplane.logic.OnPrepare; import org.eclipse.dataplane.logic.OnResume; @@ -41,17 +47,11 @@ import org.eclipse.dataplane.logic.OnStarted; import org.eclipse.dataplane.logic.OnSuspend; import org.eclipse.dataplane.logic.OnTerminate; -import org.eclipse.dataplane.port.exception.AuthorizationNotSupported; -import org.eclipse.dataplane.port.exception.ControlPlaneNotRegistered; -import org.eclipse.dataplane.port.exception.DataFlowNotifyControlPlaneFailed; -import org.eclipse.dataplane.port.exception.DataplaneNotRegistered; -import org.eclipse.dataplane.port.exception.ResourceNotFoundException; -import org.eclipse.dataplane.port.exception.UnauthorizedException; -import org.eclipse.dataplane.port.store.ControlPlaneStore; -import org.eclipse.dataplane.port.store.DataFlowStore; -import org.eclipse.dataplane.port.store.InMemoryControlPlaneStore; -import org.eclipse.dataplane.port.store.InMemoryDataFlowStore; -import org.eclipse.dataplane.port.store.Stores; +import org.eclipse.dataplane.store.ControlPlaneStore; +import org.eclipse.dataplane.store.DataFlowStore; +import org.eclipse.dataplane.store.InMemoryControlPlaneStore; +import org.eclipse.dataplane.store.InMemoryDataFlowStore; +import org.eclipse.dataplane.store.Stores; import java.net.URI; import java.net.http.HttpClient; diff --git a/dataplane-sdk-core/src/main/java/org/eclipse/dataplane/domain/registration/AuthorizationProfile.java b/dataplane-sdk-core/src/main/java/org/eclipse/dataplane/domain/registration/AuthorizationProfile.java index 8d3d75c..ce355ae 100644 --- a/dataplane-sdk-core/src/main/java/org/eclipse/dataplane/domain/registration/AuthorizationProfile.java +++ b/dataplane-sdk-core/src/main/java/org/eclipse/dataplane/domain/registration/AuthorizationProfile.java @@ -17,7 +17,7 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import org.eclipse.dataplane.port.exception.IllegalAttributeTypeException; +import org.eclipse.dataplane.exception.IllegalAttributeTypeException; import java.util.HashMap; import java.util.Map; diff --git a/dataplane-sdk-core/src/main/java/org/eclipse/dataplane/port/exception/AuthorizationNotSupported.java b/dataplane-sdk-core/src/main/java/org/eclipse/dataplane/exception/AuthorizationNotSupported.java similarity index 93% rename from dataplane-sdk-core/src/main/java/org/eclipse/dataplane/port/exception/AuthorizationNotSupported.java rename to dataplane-sdk-core/src/main/java/org/eclipse/dataplane/exception/AuthorizationNotSupported.java index 52a1110..46f8954 100644 --- a/dataplane-sdk-core/src/main/java/org/eclipse/dataplane/port/exception/AuthorizationNotSupported.java +++ b/dataplane-sdk-core/src/main/java/org/eclipse/dataplane/exception/AuthorizationNotSupported.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.dataplane.port.exception; +package org.eclipse.dataplane.exception; import org.eclipse.dataplane.domain.registration.AuthorizationProfile; diff --git a/dataplane-sdk-core/src/main/java/org/eclipse/dataplane/port/exception/ControlPlaneNotRegistered.java b/dataplane-sdk-core/src/main/java/org/eclipse/dataplane/exception/ControlPlaneNotRegistered.java similarity index 92% rename from dataplane-sdk-core/src/main/java/org/eclipse/dataplane/port/exception/ControlPlaneNotRegistered.java rename to dataplane-sdk-core/src/main/java/org/eclipse/dataplane/exception/ControlPlaneNotRegistered.java index 116a0b2..5583303 100644 --- a/dataplane-sdk-core/src/main/java/org/eclipse/dataplane/port/exception/ControlPlaneNotRegistered.java +++ b/dataplane-sdk-core/src/main/java/org/eclipse/dataplane/exception/ControlPlaneNotRegistered.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.dataplane.port.exception; +package org.eclipse.dataplane.exception; public class ControlPlaneNotRegistered extends Exception { diff --git a/dataplane-sdk-core/src/main/java/org/eclipse/dataplane/port/exception/DataFlowNotifyControlPlaneFailed.java b/dataplane-sdk-core/src/main/java/org/eclipse/dataplane/exception/DataFlowNotifyControlPlaneFailed.java similarity index 95% rename from dataplane-sdk-core/src/main/java/org/eclipse/dataplane/port/exception/DataFlowNotifyControlPlaneFailed.java rename to dataplane-sdk-core/src/main/java/org/eclipse/dataplane/exception/DataFlowNotifyControlPlaneFailed.java index c84d52a..52ecea1 100644 --- a/dataplane-sdk-core/src/main/java/org/eclipse/dataplane/port/exception/DataFlowNotifyControlPlaneFailed.java +++ b/dataplane-sdk-core/src/main/java/org/eclipse/dataplane/exception/DataFlowNotifyControlPlaneFailed.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.dataplane.port.exception; +package org.eclipse.dataplane.exception; import java.net.http.HttpResponse; diff --git a/dataplane-sdk-core/src/main/java/org/eclipse/dataplane/port/exception/DataplaneNotRegistered.java b/dataplane-sdk-core/src/main/java/org/eclipse/dataplane/exception/DataplaneNotRegistered.java similarity index 91% rename from dataplane-sdk-core/src/main/java/org/eclipse/dataplane/port/exception/DataplaneNotRegistered.java rename to dataplane-sdk-core/src/main/java/org/eclipse/dataplane/exception/DataplaneNotRegistered.java index b3d7abc..c75129c 100644 --- a/dataplane-sdk-core/src/main/java/org/eclipse/dataplane/port/exception/DataplaneNotRegistered.java +++ b/dataplane-sdk-core/src/main/java/org/eclipse/dataplane/exception/DataplaneNotRegistered.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.dataplane.port.exception; +package org.eclipse.dataplane.exception; public class DataplaneNotRegistered extends RuntimeException { public DataplaneNotRegistered(String message) { diff --git a/dataplane-sdk-core/src/main/java/org/eclipse/dataplane/port/exception/IllegalAttributeTypeException.java b/dataplane-sdk-core/src/main/java/org/eclipse/dataplane/exception/IllegalAttributeTypeException.java similarity index 91% rename from dataplane-sdk-core/src/main/java/org/eclipse/dataplane/port/exception/IllegalAttributeTypeException.java rename to dataplane-sdk-core/src/main/java/org/eclipse/dataplane/exception/IllegalAttributeTypeException.java index d30bd77..93f0fdd 100644 --- a/dataplane-sdk-core/src/main/java/org/eclipse/dataplane/port/exception/IllegalAttributeTypeException.java +++ b/dataplane-sdk-core/src/main/java/org/eclipse/dataplane/exception/IllegalAttributeTypeException.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.dataplane.port.exception; +package org.eclipse.dataplane.exception; public class IllegalAttributeTypeException extends RuntimeException { public IllegalAttributeTypeException(String message) { diff --git a/dataplane-sdk-core/src/main/java/org/eclipse/dataplane/port/exception/PersistenceException.java b/dataplane-sdk-core/src/main/java/org/eclipse/dataplane/exception/PersistenceException.java similarity index 94% rename from dataplane-sdk-core/src/main/java/org/eclipse/dataplane/port/exception/PersistenceException.java rename to dataplane-sdk-core/src/main/java/org/eclipse/dataplane/exception/PersistenceException.java index 64156b0..bd3b733 100644 --- a/dataplane-sdk-core/src/main/java/org/eclipse/dataplane/port/exception/PersistenceException.java +++ b/dataplane-sdk-core/src/main/java/org/eclipse/dataplane/exception/PersistenceException.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.dataplane.port.exception; +package org.eclipse.dataplane.exception; /** * Indicates an error during database interactions, i.e. an error occurred persisting, reading or diff --git a/dataplane-sdk-core/src/main/java/org/eclipse/dataplane/port/exception/ResourceNotFoundException.java b/dataplane-sdk-core/src/main/java/org/eclipse/dataplane/exception/ResourceNotFoundException.java similarity index 91% rename from dataplane-sdk-core/src/main/java/org/eclipse/dataplane/port/exception/ResourceNotFoundException.java rename to dataplane-sdk-core/src/main/java/org/eclipse/dataplane/exception/ResourceNotFoundException.java index de9c6b0..392f5c6 100644 --- a/dataplane-sdk-core/src/main/java/org/eclipse/dataplane/port/exception/ResourceNotFoundException.java +++ b/dataplane-sdk-core/src/main/java/org/eclipse/dataplane/exception/ResourceNotFoundException.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.dataplane.port.exception; +package org.eclipse.dataplane.exception; public class ResourceNotFoundException extends Exception { public ResourceNotFoundException(String message) { diff --git a/dataplane-sdk-core/src/main/java/org/eclipse/dataplane/port/exception/UnauthorizedException.java b/dataplane-sdk-core/src/main/java/org/eclipse/dataplane/exception/UnauthorizedException.java similarity index 93% rename from dataplane-sdk-core/src/main/java/org/eclipse/dataplane/port/exception/UnauthorizedException.java rename to dataplane-sdk-core/src/main/java/org/eclipse/dataplane/exception/UnauthorizedException.java index bd2af1e..084fa2d 100644 --- a/dataplane-sdk-core/src/main/java/org/eclipse/dataplane/port/exception/UnauthorizedException.java +++ b/dataplane-sdk-core/src/main/java/org/eclipse/dataplane/exception/UnauthorizedException.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.dataplane.port.exception; +package org.eclipse.dataplane.exception; public class UnauthorizedException extends RuntimeException { diff --git a/dataplane-sdk-core/src/main/java/org/eclipse/dataplane/port/store/ControlPlaneStore.java b/dataplane-sdk-core/src/main/java/org/eclipse/dataplane/store/ControlPlaneStore.java similarity index 97% rename from dataplane-sdk-core/src/main/java/org/eclipse/dataplane/port/store/ControlPlaneStore.java rename to dataplane-sdk-core/src/main/java/org/eclipse/dataplane/store/ControlPlaneStore.java index c3ae468..8c9adc0 100644 --- a/dataplane-sdk-core/src/main/java/org/eclipse/dataplane/port/store/ControlPlaneStore.java +++ b/dataplane-sdk-core/src/main/java/org/eclipse/dataplane/store/ControlPlaneStore.java @@ -13,7 +13,7 @@ * */ -package org.eclipse.dataplane.port.store; +package org.eclipse.dataplane.store; import org.eclipse.dataplane.domain.Result; import org.eclipse.dataplane.domain.controlplane.ControlPlane; diff --git a/dataplane-sdk-core/src/main/java/org/eclipse/dataplane/port/store/DataFlowStore.java b/dataplane-sdk-core/src/main/java/org/eclipse/dataplane/store/DataFlowStore.java similarity index 96% rename from dataplane-sdk-core/src/main/java/org/eclipse/dataplane/port/store/DataFlowStore.java rename to dataplane-sdk-core/src/main/java/org/eclipse/dataplane/store/DataFlowStore.java index 6501a83..2b87280 100644 --- a/dataplane-sdk-core/src/main/java/org/eclipse/dataplane/port/store/DataFlowStore.java +++ b/dataplane-sdk-core/src/main/java/org/eclipse/dataplane/store/DataFlowStore.java @@ -13,7 +13,7 @@ * */ -package org.eclipse.dataplane.port.store; +package org.eclipse.dataplane.store; import org.eclipse.dataplane.domain.Result; import org.eclipse.dataplane.domain.dataflow.DataFlow; diff --git a/dataplane-sdk-core/src/main/java/org/eclipse/dataplane/port/store/InMemoryControlPlaneStore.java b/dataplane-sdk-core/src/main/java/org/eclipse/dataplane/store/InMemoryControlPlaneStore.java similarity index 95% rename from dataplane-sdk-core/src/main/java/org/eclipse/dataplane/port/store/InMemoryControlPlaneStore.java rename to dataplane-sdk-core/src/main/java/org/eclipse/dataplane/store/InMemoryControlPlaneStore.java index 7e66b49..9f30cef 100644 --- a/dataplane-sdk-core/src/main/java/org/eclipse/dataplane/port/store/InMemoryControlPlaneStore.java +++ b/dataplane-sdk-core/src/main/java/org/eclipse/dataplane/store/InMemoryControlPlaneStore.java @@ -12,13 +12,13 @@ * */ -package org.eclipse.dataplane.port.store; +package org.eclipse.dataplane.store; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import org.eclipse.dataplane.domain.Result; import org.eclipse.dataplane.domain.controlplane.ControlPlane; -import org.eclipse.dataplane.port.exception.ResourceNotFoundException; +import org.eclipse.dataplane.exception.ResourceNotFoundException; import java.util.HashMap; import java.util.Map; diff --git a/dataplane-sdk-core/src/main/java/org/eclipse/dataplane/port/store/InMemoryDataFlowStore.java b/dataplane-sdk-core/src/main/java/org/eclipse/dataplane/store/InMemoryDataFlowStore.java similarity index 93% rename from dataplane-sdk-core/src/main/java/org/eclipse/dataplane/port/store/InMemoryDataFlowStore.java rename to dataplane-sdk-core/src/main/java/org/eclipse/dataplane/store/InMemoryDataFlowStore.java index 228377f..510c9c6 100644 --- a/dataplane-sdk-core/src/main/java/org/eclipse/dataplane/port/store/InMemoryDataFlowStore.java +++ b/dataplane-sdk-core/src/main/java/org/eclipse/dataplane/store/InMemoryDataFlowStore.java @@ -12,13 +12,13 @@ * */ -package org.eclipse.dataplane.port.store; +package org.eclipse.dataplane.store; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import org.eclipse.dataplane.domain.Result; import org.eclipse.dataplane.domain.dataflow.DataFlow; -import org.eclipse.dataplane.port.exception.ResourceNotFoundException; +import org.eclipse.dataplane.exception.ResourceNotFoundException; import java.util.HashMap; import java.util.Map; diff --git a/dataplane-sdk-core/src/main/java/org/eclipse/dataplane/port/store/Stores.java b/dataplane-sdk-core/src/main/java/org/eclipse/dataplane/store/Stores.java similarity index 94% rename from dataplane-sdk-core/src/main/java/org/eclipse/dataplane/port/store/Stores.java rename to dataplane-sdk-core/src/main/java/org/eclipse/dataplane/store/Stores.java index 8bf2693..a2e3f17 100644 --- a/dataplane-sdk-core/src/main/java/org/eclipse/dataplane/port/store/Stores.java +++ b/dataplane-sdk-core/src/main/java/org/eclipse/dataplane/store/Stores.java @@ -12,7 +12,7 @@ * */ -package org.eclipse.dataplane.port.store; +package org.eclipse.dataplane.store; /** * Data class that bundles the stores used by the dataplane. diff --git a/dataplane-sdk-core/src/test/java/org/eclipse/dataplane/store/InMemoryControlPlaneStoreTest.java b/dataplane-sdk-core/src/test/java/org/eclipse/dataplane/store/InMemoryControlPlaneStoreTest.java index 3809c56..64c46b3 100644 --- a/dataplane-sdk-core/src/test/java/org/eclipse/dataplane/store/InMemoryControlPlaneStoreTest.java +++ b/dataplane-sdk-core/src/test/java/org/eclipse/dataplane/store/InMemoryControlPlaneStoreTest.java @@ -15,8 +15,6 @@ package org.eclipse.dataplane.store; import com.fasterxml.jackson.databind.ObjectMapper; -import org.eclipse.dataplane.port.store.ControlPlaneStore; -import org.eclipse.dataplane.port.store.InMemoryControlPlaneStore; import static com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES; diff --git a/dataplane-sdk-core/src/test/java/org/eclipse/dataplane/store/InMemoryDataFlowStoreTest.java b/dataplane-sdk-core/src/test/java/org/eclipse/dataplane/store/InMemoryDataFlowStoreTest.java index e88c103..d94acc1 100644 --- a/dataplane-sdk-core/src/test/java/org/eclipse/dataplane/store/InMemoryDataFlowStoreTest.java +++ b/dataplane-sdk-core/src/test/java/org/eclipse/dataplane/store/InMemoryDataFlowStoreTest.java @@ -15,8 +15,6 @@ package org.eclipse.dataplane.store; import com.fasterxml.jackson.databind.ObjectMapper; -import org.eclipse.dataplane.port.store.DataFlowStore; -import org.eclipse.dataplane.port.store.InMemoryDataFlowStore; import static com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES; diff --git a/dataplane-sdk-core/src/testFixtures/java/org/eclipse/dataplane/store/ControlPlaneStoreTestBase.java b/dataplane-sdk-core/src/testFixtures/java/org/eclipse/dataplane/store/ControlPlaneStoreTestBase.java index 94e8d57..52e85e3 100644 --- a/dataplane-sdk-core/src/testFixtures/java/org/eclipse/dataplane/store/ControlPlaneStoreTestBase.java +++ b/dataplane-sdk-core/src/testFixtures/java/org/eclipse/dataplane/store/ControlPlaneStoreTestBase.java @@ -16,8 +16,7 @@ import org.eclipse.dataplane.domain.controlplane.ControlPlane; import org.eclipse.dataplane.domain.registration.AuthorizationProfile; -import org.eclipse.dataplane.port.exception.ResourceNotFoundException; -import org.eclipse.dataplane.port.store.ControlPlaneStore; +import org.eclipse.dataplane.exception.ResourceNotFoundException; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/dataplane-sdk-core/src/testFixtures/java/org/eclipse/dataplane/store/DataFlowStoreTestBase.java b/dataplane-sdk-core/src/testFixtures/java/org/eclipse/dataplane/store/DataFlowStoreTestBase.java index 7e9a5eb..ae0c822 100644 --- a/dataplane-sdk-core/src/testFixtures/java/org/eclipse/dataplane/store/DataFlowStoreTestBase.java +++ b/dataplane-sdk-core/src/testFixtures/java/org/eclipse/dataplane/store/DataFlowStoreTestBase.java @@ -16,8 +16,7 @@ import org.eclipse.dataplane.domain.DataAddress; import org.eclipse.dataplane.domain.dataflow.DataFlow; -import org.eclipse.dataplane.port.exception.ResourceNotFoundException; -import org.eclipse.dataplane.port.store.DataFlowStore; +import org.eclipse.dataplane.exception.ResourceNotFoundException; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/dataplane-sdk-jakarta-ee/src/main/java/org/eclipse/dataplane/port/ExceptionMapper.java b/dataplane-sdk-jakarta-ee/src/main/java/org/eclipse/dataplane/port/ExceptionMapper.java index 07256bc..501f35c 100644 --- a/dataplane-sdk-jakarta-ee/src/main/java/org/eclipse/dataplane/port/ExceptionMapper.java +++ b/dataplane-sdk-jakarta-ee/src/main/java/org/eclipse/dataplane/port/ExceptionMapper.java @@ -19,10 +19,10 @@ import jakarta.ws.rs.NotAuthorizedException; import jakarta.ws.rs.NotFoundException; import jakarta.ws.rs.WebApplicationException; -import org.eclipse.dataplane.port.exception.AuthorizationNotSupported; -import org.eclipse.dataplane.port.exception.ControlPlaneNotRegistered; -import org.eclipse.dataplane.port.exception.ResourceNotFoundException; -import org.eclipse.dataplane.port.exception.UnauthorizedException; +import org.eclipse.dataplane.exception.AuthorizationNotSupported; +import org.eclipse.dataplane.exception.ControlPlaneNotRegistered; +import org.eclipse.dataplane.exception.ResourceNotFoundException; +import org.eclipse.dataplane.exception.UnauthorizedException; import java.util.function.Function; diff --git a/dataplane-sdk-postgresql/src/main/java/org/eclipse/dataplane/store/postgresql/AbstractSqlStore.java b/dataplane-sdk-postgresql/src/main/java/org/eclipse/dataplane/store/postgresql/AbstractSqlStore.java index 7d2ad04..7c4657f 100644 --- a/dataplane-sdk-postgresql/src/main/java/org/eclipse/dataplane/store/postgresql/AbstractSqlStore.java +++ b/dataplane-sdk-postgresql/src/main/java/org/eclipse/dataplane/store/postgresql/AbstractSqlStore.java @@ -18,7 +18,7 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.JavaType; import com.fasterxml.jackson.databind.ObjectMapper; -import org.eclipse.dataplane.port.exception.PersistenceException; +import org.eclipse.dataplane.exception.PersistenceException; import java.sql.Connection; import javax.sql.DataSource; diff --git a/dataplane-sdk-postgresql/src/main/java/org/eclipse/dataplane/store/postgresql/PostgresControlPlaneStore.java b/dataplane-sdk-postgresql/src/main/java/org/eclipse/dataplane/store/postgresql/PostgresControlPlaneStore.java index 6412343..8f44187 100644 --- a/dataplane-sdk-postgresql/src/main/java/org/eclipse/dataplane/store/postgresql/PostgresControlPlaneStore.java +++ b/dataplane-sdk-postgresql/src/main/java/org/eclipse/dataplane/store/postgresql/PostgresControlPlaneStore.java @@ -18,9 +18,9 @@ import org.eclipse.dataplane.domain.Result; import org.eclipse.dataplane.domain.controlplane.ControlPlane; import org.eclipse.dataplane.domain.registration.AuthorizationProfile; -import org.eclipse.dataplane.port.exception.PersistenceException; -import org.eclipse.dataplane.port.exception.ResourceNotFoundException; -import org.eclipse.dataplane.port.store.ControlPlaneStore; +import org.eclipse.dataplane.exception.PersistenceException; +import org.eclipse.dataplane.exception.ResourceNotFoundException; +import org.eclipse.dataplane.store.ControlPlaneStore; import java.net.URI; import javax.sql.DataSource; diff --git a/dataplane-sdk-postgresql/src/main/java/org/eclipse/dataplane/store/postgresql/PostgresDataFlowStore.java b/dataplane-sdk-postgresql/src/main/java/org/eclipse/dataplane/store/postgresql/PostgresDataFlowStore.java index 30ba8a2..126e0e9 100644 --- a/dataplane-sdk-postgresql/src/main/java/org/eclipse/dataplane/store/postgresql/PostgresDataFlowStore.java +++ b/dataplane-sdk-postgresql/src/main/java/org/eclipse/dataplane/store/postgresql/PostgresDataFlowStore.java @@ -19,9 +19,9 @@ import org.eclipse.dataplane.domain.DataAddress; import org.eclipse.dataplane.domain.Result; import org.eclipse.dataplane.domain.dataflow.DataFlow; -import org.eclipse.dataplane.port.exception.PersistenceException; -import org.eclipse.dataplane.port.exception.ResourceNotFoundException; -import org.eclipse.dataplane.port.store.DataFlowStore; +import org.eclipse.dataplane.exception.PersistenceException; +import org.eclipse.dataplane.exception.ResourceNotFoundException; +import org.eclipse.dataplane.store.DataFlowStore; import java.net.URI; import javax.sql.DataSource; diff --git a/dataplane-sdk-postgresql/src/test/java/org/eclipse/dataplane/store/postgresql/PostgresControlPlaneStoreTest.java b/dataplane-sdk-postgresql/src/test/java/org/eclipse/dataplane/store/postgresql/PostgresControlPlaneStoreTest.java index c31a226..0c7232a 100644 --- a/dataplane-sdk-postgresql/src/test/java/org/eclipse/dataplane/store/postgresql/PostgresControlPlaneStoreTest.java +++ b/dataplane-sdk-postgresql/src/test/java/org/eclipse/dataplane/store/postgresql/PostgresControlPlaneStoreTest.java @@ -15,7 +15,7 @@ package org.eclipse.dataplane.store.postgresql; import com.fasterxml.jackson.databind.ObjectMapper; -import org.eclipse.dataplane.port.store.ControlPlaneStore; +import org.eclipse.dataplane.store.ControlPlaneStore; import org.eclipse.dataplane.store.ControlPlaneStoreTestBase; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/dataplane-sdk-postgresql/src/test/java/org/eclipse/dataplane/store/postgresql/PostgresDataFlowStoreTest.java b/dataplane-sdk-postgresql/src/test/java/org/eclipse/dataplane/store/postgresql/PostgresDataFlowStoreTest.java index 63a26f9..327ca02 100644 --- a/dataplane-sdk-postgresql/src/test/java/org/eclipse/dataplane/store/postgresql/PostgresDataFlowStoreTest.java +++ b/dataplane-sdk-postgresql/src/test/java/org/eclipse/dataplane/store/postgresql/PostgresDataFlowStoreTest.java @@ -15,7 +15,7 @@ package org.eclipse.dataplane.store.postgresql; import com.fasterxml.jackson.databind.ObjectMapper; -import org.eclipse.dataplane.port.store.DataFlowStore; +import org.eclipse.dataplane.store.DataFlowStore; import org.eclipse.dataplane.store.DataFlowStoreTestBase; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/e2e-tests/src/test/java/org/eclipse/dataplane/DataplaneTest.java b/e2e-tests/src/test/java/org/eclipse/dataplane/DataplaneTest.java index 8a0077a..447163c 100644 --- a/e2e-tests/src/test/java/org/eclipse/dataplane/DataplaneTest.java +++ b/e2e-tests/src/test/java/org/eclipse/dataplane/DataplaneTest.java @@ -20,9 +20,9 @@ import org.eclipse.dataplane.domain.dataflow.DataFlowPrepareMessage; import org.eclipse.dataplane.domain.registration.AuthorizationProfile; import org.eclipse.dataplane.domain.registration.ControlPlaneRegistrationMessage; -import org.eclipse.dataplane.port.exception.DataFlowNotifyControlPlaneFailed; -import org.eclipse.dataplane.port.exception.DataplaneNotRegistered; -import org.eclipse.dataplane.port.exception.ResourceNotFoundException; +import org.eclipse.dataplane.exception.DataFlowNotifyControlPlaneFailed; +import org.eclipse.dataplane.exception.DataplaneNotRegistered; +import org.eclipse.dataplane.exception.ResourceNotFoundException; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Nested; diff --git a/e2e-tests/src/test/java/org/eclipse/dataplane/api/ControlPlaneRegistrationApiTest.java b/e2e-tests/src/test/java/org/eclipse/dataplane/api/ControlPlaneRegistrationApiTest.java index b9617c6..be86539 100644 --- a/e2e-tests/src/test/java/org/eclipse/dataplane/api/ControlPlaneRegistrationApiTest.java +++ b/e2e-tests/src/test/java/org/eclipse/dataplane/api/ControlPlaneRegistrationApiTest.java @@ -20,8 +20,8 @@ import org.eclipse.dataplane.authorization.TestAuthorization; import org.eclipse.dataplane.domain.registration.AuthorizationProfile; import org.eclipse.dataplane.domain.registration.ControlPlaneRegistrationMessage; +import org.eclipse.dataplane.exception.ResourceNotFoundException; import org.eclipse.dataplane.port.DataPlaneRegistrationApiController; -import org.eclipse.dataplane.port.exception.ResourceNotFoundException; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Nested; diff --git a/e2e-tests/src/test/java/org/eclipse/dataplane/scenario/AuthorizationTest.java b/e2e-tests/src/test/java/org/eclipse/dataplane/scenario/AuthorizationTest.java index 0772cb6..d5c9089 100644 --- a/e2e-tests/src/test/java/org/eclipse/dataplane/scenario/AuthorizationTest.java +++ b/e2e-tests/src/test/java/org/eclipse/dataplane/scenario/AuthorizationTest.java @@ -21,8 +21,8 @@ import org.eclipse.dataplane.domain.Result; import org.eclipse.dataplane.domain.dataflow.DataFlowStatusMessage; import org.eclipse.dataplane.domain.registration.ControlPlaneRegistrationMessage; +import org.eclipse.dataplane.exception.DataFlowNotifyControlPlaneFailed; import org.eclipse.dataplane.port.DataPlaneSignalingApiController; -import org.eclipse.dataplane.port.exception.DataFlowNotifyControlPlaneFailed; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test;