refactor: remove "port" package from core (#111)

ronjaquensel · web-flow · commit dde8f700ffc8 · 2026-07-08T15:33:11.000+02:00
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
@@ -34,24 +34,24 @@
 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;
 import org.eclipse.dataplane.logic.OnStart;
 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
@@ -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/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/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/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/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/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/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/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/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/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/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/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/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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`*`
`13`	`13`	`*/`
`14`	`14`
`15`		`-package org.eclipse.dataplane.port.exception;`
	`15`	`+package org.eclipse.dataplane.exception;`
`16`	`16`
`17`	`17`	`import org.eclipse.dataplane.domain.registration.AuthorizationProfile;`
`18`	`18`