Skip to content

refactor: remove "port" package from core #111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ronjaquensel merged 1 commit into from
Jul 8, 2026
Merged

refactor: remove "port" package from core #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions dataplane-sdk-core/src/main/java/org/eclipse/dataplane/Dataplane.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...dk-core/src/main/java/org/eclipse/dataplane/domain/registration/AuthorizationProfile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion .../exception/AuthorizationNotSupported.java → .../exception/AuthorizationNotSupported.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*
*/

package org.eclipse.dataplane.port.exception;
package org.eclipse.dataplane.exception;

import org.eclipse.dataplane.domain.registration.AuthorizationProfile;

Expand Down
2 changes: 1 addition & 1 deletion .../exception/ControlPlaneNotRegistered.java → .../exception/ControlPlaneNotRegistered.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*
*/

package org.eclipse.dataplane.port.exception;
package org.eclipse.dataplane.exception;

public class ControlPlaneNotRegistered extends Exception {

Expand Down
2 changes: 1 addition & 1 deletion ...ion/DataFlowNotifyControlPlaneFailed.java → ...ion/DataFlowNotifyControlPlaneFailed.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*
*/

package org.eclipse.dataplane.port.exception;
package org.eclipse.dataplane.exception;

import java.net.http.HttpResponse;

Expand Down
2 changes: 1 addition & 1 deletion ...ort/exception/DataplaneNotRegistered.java → ...ane/exception/DataplaneNotRegistered.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*
*/

package org.eclipse.dataplane.port.exception;
package org.eclipse.dataplane.exception;

public class DataplaneNotRegistered extends RuntimeException {
public DataplaneNotRegistered(String message) {
Expand Down
2 changes: 1 addition & 1 deletion ...eption/IllegalAttributeTypeException.java → ...eption/IllegalAttributeTypeException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*
*/

package org.eclipse.dataplane.port.exception;
package org.eclipse.dataplane.exception;

public class IllegalAttributeTypeException extends RuntimeException {
public IllegalAttributeTypeException(String message) {
Expand Down
2 changes: 1 addition & 1 deletion .../port/exception/PersistenceException.java → ...plane/exception/PersistenceException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .../exception/ResourceNotFoundException.java → .../exception/ResourceNotFoundException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*
*/

package org.eclipse.dataplane.port.exception;
package org.eclipse.dataplane.exception;

public class ResourceNotFoundException extends Exception {
public ResourceNotFoundException(String message) {
Expand Down
2 changes: 1 addition & 1 deletion ...port/exception/UnauthorizedException.java → ...lane/exception/UnauthorizedException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*
*/

package org.eclipse.dataplane.port.exception;
package org.eclipse.dataplane.exception;

public class UnauthorizedException extends RuntimeException {

Expand Down
2 changes: 1 addition & 1 deletion ...taplane/port/store/ControlPlaneStore.java → ...se/dataplane/store/ControlPlaneStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...e/dataplane/port/store/DataFlowStore.java → ...clipse/dataplane/store/DataFlowStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...port/store/InMemoryControlPlaneStore.java → ...lane/store/InMemoryControlPlaneStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...ane/port/store/InMemoryDataFlowStore.java → ...ataplane/store/InMemoryDataFlowStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion .../eclipse/dataplane/port/store/Stores.java → ...a/org/eclipse/dataplane/store/Stores.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 0 additions & 2 deletions ...ane-sdk-core/src/test/java/org/eclipse/dataplane/store/InMemoryControlPlaneStoreTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 0 additions & 2 deletions dataplane-sdk-core/src/test/java/org/eclipse/dataplane/store/InMemoryDataFlowStoreTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
3 changes: 1 addition & 2 deletions ...sdk-core/src/testFixtures/java/org/eclipse/dataplane/store/ControlPlaneStoreTestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
3 changes: 1 addition & 2 deletions ...ane-sdk-core/src/testFixtures/java/org/eclipse/dataplane/store/DataFlowStoreTestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
8 changes: 4 additions & 4 deletions dataplane-sdk-jakarta-ee/src/main/java/org/eclipse/dataplane/port/ExceptionMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...sdk-postgresql/src/main/java/org/eclipse/dataplane/store/postgresql/AbstractSqlStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions ...resql/src/main/java/org/eclipse/dataplane/store/postgresql/PostgresControlPlaneStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions ...ostgresql/src/main/java/org/eclipse/dataplane/store/postgresql/PostgresDataFlowStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...l/src/test/java/org/eclipse/dataplane/store/postgresql/PostgresControlPlaneStoreTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...resql/src/test/java/org/eclipse/dataplane/store/postgresql/PostgresDataFlowStoreTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions e2e-tests/src/test/java/org/eclipse/dataplane/DataplaneTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/src/test/java/org/eclipse/dataplane/api/ControlPlaneRegistrationApiTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/src/test/java/org/eclipse/dataplane/scenario/AuthorizationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down