From ec5064f6b46fefa768d8ec329dd9f5339c48e8f5 Mon Sep 17 00:00:00 2001
From: Jim Martens <github@2martens.de>
Date: Sat, 18 Jul 2020 12:42:24 +0200
Subject: [PATCH] Moved entities to dto sub package

---
 .../de/twomartens/oparlservice/OParlServiceRestTests.java   | 2 +-
 .../twomartens/oparlservice/actuator/RestHealthCheck.java   | 2 +-
 .../de/twomartens/oparlservice/control/OParlController.java | 4 ++--
 .../oparlservice/entity/{ => dto}/AgendaItem.java           | 2 +-
 .../de/twomartens/oparlservice/entity/{ => dto}/Body.java   | 3 +--
 .../oparlservice/entity/{ => dto}/Consultation.java         | 2 +-
 .../oparlservice/entity/{ => dto}/ErrorObject.java          | 2 +-
 .../de/twomartens/oparlservice/entity/{ => dto}/File.java   | 2 +-
 .../twomartens/oparlservice/entity/{ => dto}/Greeting.java  | 2 +-
 .../oparlservice/entity/{ => dto}/LegislativeTerm.java      | 2 +-
 .../de/twomartens/oparlservice/entity/{ => dto}/Links.java  | 2 +-
 .../twomartens/oparlservice/entity/{ => dto}/Location.java  | 2 +-
 .../twomartens/oparlservice/entity/{ => dto}/Meeting.java   | 2 +-
 .../oparlservice/entity/{ => dto}/MeetingState.java         | 2 +-
 .../oparlservice/entity/{ => dto}/Membership.java           | 2 +-
 .../oparlservice/entity/{ => dto}/ObjectList.java           | 2 +-
 .../oparlservice/entity/{ => dto}/Organization.java         | 2 +-
 .../oparlservice/entity/{ => dto}/OrganizationType.java     | 2 +-
 .../oparlservice/entity/{ => dto}/Pagination.java           | 2 +-
 .../de/twomartens/oparlservice/entity/{ => dto}/Paper.java  | 2 +-
 .../de/twomartens/oparlservice/entity/{ => dto}/Person.java | 2 +-
 .../de/twomartens/oparlservice/entity/{ => dto}/System.java | 2 +-
 .../de/twomartens/oparlservice/service/OParlService.java    | 4 ++--
 .../oparlservice/control/OParlControllerTest.java           | 6 +++---
 24 files changed, 28 insertions(+), 29 deletions(-)
 rename oparl-server/src/main/java/de/twomartens/oparlservice/entity/{ => dto}/AgendaItem.java (98%)
 rename oparl-server/src/main/java/de/twomartens/oparlservice/entity/{ => dto}/Body.java (98%)
 rename oparl-server/src/main/java/de/twomartens/oparlservice/entity/{ => dto}/Consultation.java (97%)
 rename oparl-server/src/main/java/de/twomartens/oparlservice/entity/{ => dto}/ErrorObject.java (93%)
 rename oparl-server/src/main/java/de/twomartens/oparlservice/entity/{ => dto}/File.java (98%)
 rename oparl-server/src/main/java/de/twomartens/oparlservice/entity/{ => dto}/Greeting.java (88%)
 rename oparl-server/src/main/java/de/twomartens/oparlservice/entity/{ => dto}/LegislativeTerm.java (97%)
 rename oparl-server/src/main/java/de/twomartens/oparlservice/entity/{ => dto}/Links.java (95%)
 rename oparl-server/src/main/java/de/twomartens/oparlservice/entity/{ => dto}/Location.java (98%)
 rename oparl-server/src/main/java/de/twomartens/oparlservice/entity/{ => dto}/Meeting.java (98%)
 rename oparl-server/src/main/java/de/twomartens/oparlservice/entity/{ => dto}/MeetingState.java (88%)
 rename oparl-server/src/main/java/de/twomartens/oparlservice/entity/{ => dto}/Membership.java (98%)
 rename oparl-server/src/main/java/de/twomartens/oparlservice/entity/{ => dto}/ObjectList.java (97%)
 rename oparl-server/src/main/java/de/twomartens/oparlservice/entity/{ => dto}/Organization.java (98%)
 rename oparl-server/src/main/java/de/twomartens/oparlservice/entity/{ => dto}/OrganizationType.java (91%)
 rename oparl-server/src/main/java/de/twomartens/oparlservice/entity/{ => dto}/Pagination.java (94%)
 rename oparl-server/src/main/java/de/twomartens/oparlservice/entity/{ => dto}/Paper.java (98%)
 rename oparl-server/src/main/java/de/twomartens/oparlservice/entity/{ => dto}/Person.java (98%)
 rename oparl-server/src/main/java/de/twomartens/oparlservice/entity/{ => dto}/System.java (98%)

diff --git a/oparl-server/src/integration-test/java/de/twomartens/oparlservice/OParlServiceRestTests.java b/oparl-server/src/integration-test/java/de/twomartens/oparlservice/OParlServiceRestTests.java
index b950123..3dcb99d 100644
--- a/oparl-server/src/integration-test/java/de/twomartens/oparlservice/OParlServiceRestTests.java
+++ b/oparl-server/src/integration-test/java/de/twomartens/oparlservice/OParlServiceRestTests.java
@@ -1,6 +1,6 @@
 package de.twomartens.oparlservice;
 
-import de.twomartens.oparlservice.entity.System;
+import de.twomartens.oparlservice.entity.dto.System;
 import de.twomartens.oparlservice.interceptors.RequestTypeInterceptor;
 import de.twomartens.oparlservice.interceptors.TraceIdInterceptor;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/oparl-server/src/main/java/de/twomartens/oparlservice/actuator/RestHealthCheck.java b/oparl-server/src/main/java/de/twomartens/oparlservice/actuator/RestHealthCheck.java
index 3f42d45..61ae078 100644
--- a/oparl-server/src/main/java/de/twomartens/oparlservice/actuator/RestHealthCheck.java
+++ b/oparl-server/src/main/java/de/twomartens/oparlservice/actuator/RestHealthCheck.java
@@ -1,6 +1,6 @@
 package de.twomartens.oparlservice.actuator;
 
-import de.twomartens.oparlservice.entity.System;
+import de.twomartens.oparlservice.entity.dto.System;
 import de.twomartens.oparlservice.interceptors.RequestTypeInterceptor;
 import de.twomartens.oparlservice.interceptors.TraceIdInterceptor;
 import lombok.extern.slf4j.Slf4j;
diff --git a/oparl-server/src/main/java/de/twomartens/oparlservice/control/OParlController.java b/oparl-server/src/main/java/de/twomartens/oparlservice/control/OParlController.java
index 4e7b82b..a322091 100644
--- a/oparl-server/src/main/java/de/twomartens/oparlservice/control/OParlController.java
+++ b/oparl-server/src/main/java/de/twomartens/oparlservice/control/OParlController.java
@@ -1,7 +1,7 @@
 package de.twomartens.oparlservice.control;
 
-import de.twomartens.oparlservice.entity.System;
-import de.twomartens.oparlservice.entity.*;
+import de.twomartens.oparlservice.entity.dto.*;
+import de.twomartens.oparlservice.entity.dto.System;
 import de.twomartens.oparlservice.service.OParlService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
diff --git a/oparl-server/src/main/java/de/twomartens/oparlservice/entity/AgendaItem.java b/oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/AgendaItem.java
similarity index 98%
rename from oparl-server/src/main/java/de/twomartens/oparlservice/entity/AgendaItem.java
rename to oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/AgendaItem.java
index 352bd2d..4b52542 100644
--- a/oparl-server/src/main/java/de/twomartens/oparlservice/entity/AgendaItem.java
+++ b/oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/AgendaItem.java
@@ -1,4 +1,4 @@
-package de.twomartens.oparlservice.entity;
+package de.twomartens.oparlservice.entity.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/oparl-server/src/main/java/de/twomartens/oparlservice/entity/Body.java b/oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/Body.java
similarity index 98%
rename from oparl-server/src/main/java/de/twomartens/oparlservice/entity/Body.java
rename to oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/Body.java
index 86b9234..adea999 100644
--- a/oparl-server/src/main/java/de/twomartens/oparlservice/entity/Body.java
+++ b/oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/Body.java
@@ -1,10 +1,9 @@
-package de.twomartens.oparlservice.entity;
+package de.twomartens.oparlservice.entity.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
-import lombok.experimental.SuperBuilder;
 
 import java.time.ZonedDateTime;
 import java.util.List;
diff --git a/oparl-server/src/main/java/de/twomartens/oparlservice/entity/Consultation.java b/oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/Consultation.java
similarity index 97%
rename from oparl-server/src/main/java/de/twomartens/oparlservice/entity/Consultation.java
rename to oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/Consultation.java
index e1508ff..05a142d 100644
--- a/oparl-server/src/main/java/de/twomartens/oparlservice/entity/Consultation.java
+++ b/oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/Consultation.java
@@ -1,4 +1,4 @@
-package de.twomartens.oparlservice.entity;
+package de.twomartens.oparlservice.entity.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/oparl-server/src/main/java/de/twomartens/oparlservice/entity/ErrorObject.java b/oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/ErrorObject.java
similarity index 93%
rename from oparl-server/src/main/java/de/twomartens/oparlservice/entity/ErrorObject.java
rename to oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/ErrorObject.java
index 4b32a34..ee75634 100644
--- a/oparl-server/src/main/java/de/twomartens/oparlservice/entity/ErrorObject.java
+++ b/oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/ErrorObject.java
@@ -1,4 +1,4 @@
-package de.twomartens.oparlservice.entity;
+package de.twomartens.oparlservice.entity.dto;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/oparl-server/src/main/java/de/twomartens/oparlservice/entity/File.java b/oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/File.java
similarity index 98%
rename from oparl-server/src/main/java/de/twomartens/oparlservice/entity/File.java
rename to oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/File.java
index 02a3b62..d8335aa 100644
--- a/oparl-server/src/main/java/de/twomartens/oparlservice/entity/File.java
+++ b/oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/File.java
@@ -1,4 +1,4 @@
-package de.twomartens.oparlservice.entity;
+package de.twomartens.oparlservice.entity.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/oparl-server/src/main/java/de/twomartens/oparlservice/entity/Greeting.java b/oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/Greeting.java
similarity index 88%
rename from oparl-server/src/main/java/de/twomartens/oparlservice/entity/Greeting.java
rename to oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/Greeting.java
index 98708ff..f1741c4 100644
--- a/oparl-server/src/main/java/de/twomartens/oparlservice/entity/Greeting.java
+++ b/oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/Greeting.java
@@ -1,4 +1,4 @@
-package de.twomartens.oparlservice.entity;
+package de.twomartens.oparlservice.entity.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
diff --git a/oparl-server/src/main/java/de/twomartens/oparlservice/entity/LegislativeTerm.java b/oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/LegislativeTerm.java
similarity index 97%
rename from oparl-server/src/main/java/de/twomartens/oparlservice/entity/LegislativeTerm.java
rename to oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/LegislativeTerm.java
index 9e1f83e..52285bd 100644
--- a/oparl-server/src/main/java/de/twomartens/oparlservice/entity/LegislativeTerm.java
+++ b/oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/LegislativeTerm.java
@@ -1,4 +1,4 @@
-package de.twomartens.oparlservice.entity;
+package de.twomartens.oparlservice.entity.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/oparl-server/src/main/java/de/twomartens/oparlservice/entity/Links.java b/oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/Links.java
similarity index 95%
rename from oparl-server/src/main/java/de/twomartens/oparlservice/entity/Links.java
rename to oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/Links.java
index c459b20..ec4d53c 100644
--- a/oparl-server/src/main/java/de/twomartens/oparlservice/entity/Links.java
+++ b/oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/Links.java
@@ -1,4 +1,4 @@
-package de.twomartens.oparlservice.entity;
+package de.twomartens.oparlservice.entity.dto;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/oparl-server/src/main/java/de/twomartens/oparlservice/entity/Location.java b/oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/Location.java
similarity index 98%
rename from oparl-server/src/main/java/de/twomartens/oparlservice/entity/Location.java
rename to oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/Location.java
index 95b3375..812a533 100644
--- a/oparl-server/src/main/java/de/twomartens/oparlservice/entity/Location.java
+++ b/oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/Location.java
@@ -1,4 +1,4 @@
-package de.twomartens.oparlservice.entity;
+package de.twomartens.oparlservice.entity.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/oparl-server/src/main/java/de/twomartens/oparlservice/entity/Meeting.java b/oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/Meeting.java
similarity index 98%
rename from oparl-server/src/main/java/de/twomartens/oparlservice/entity/Meeting.java
rename to oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/Meeting.java
index c98b34d..ca88539 100644
--- a/oparl-server/src/main/java/de/twomartens/oparlservice/entity/Meeting.java
+++ b/oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/Meeting.java
@@ -1,4 +1,4 @@
-package de.twomartens.oparlservice.entity;
+package de.twomartens.oparlservice.entity.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/oparl-server/src/main/java/de/twomartens/oparlservice/entity/MeetingState.java b/oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/MeetingState.java
similarity index 88%
rename from oparl-server/src/main/java/de/twomartens/oparlservice/entity/MeetingState.java
rename to oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/MeetingState.java
index 0b6f925..4d82af5 100644
--- a/oparl-server/src/main/java/de/twomartens/oparlservice/entity/MeetingState.java
+++ b/oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/MeetingState.java
@@ -1,4 +1,4 @@
-package de.twomartens.oparlservice.entity;
+package de.twomartens.oparlservice.entity.dto;
 
 import com.fasterxml.jackson.annotation.JsonValue;
 import lombok.Getter;
diff --git a/oparl-server/src/main/java/de/twomartens/oparlservice/entity/Membership.java b/oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/Membership.java
similarity index 98%
rename from oparl-server/src/main/java/de/twomartens/oparlservice/entity/Membership.java
rename to oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/Membership.java
index 3196c7f..1dcd144 100644
--- a/oparl-server/src/main/java/de/twomartens/oparlservice/entity/Membership.java
+++ b/oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/Membership.java
@@ -1,4 +1,4 @@
-package de.twomartens.oparlservice.entity;
+package de.twomartens.oparlservice.entity.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/oparl-server/src/main/java/de/twomartens/oparlservice/entity/ObjectList.java b/oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/ObjectList.java
similarity index 97%
rename from oparl-server/src/main/java/de/twomartens/oparlservice/entity/ObjectList.java
rename to oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/ObjectList.java
index c32ba60..6a24a21 100644
--- a/oparl-server/src/main/java/de/twomartens/oparlservice/entity/ObjectList.java
+++ b/oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/ObjectList.java
@@ -1,4 +1,4 @@
-package de.twomartens.oparlservice.entity;
+package de.twomartens.oparlservice.entity.dto;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/oparl-server/src/main/java/de/twomartens/oparlservice/entity/Organization.java b/oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/Organization.java
similarity index 98%
rename from oparl-server/src/main/java/de/twomartens/oparlservice/entity/Organization.java
rename to oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/Organization.java
index 5d2dde1..6deb43d 100644
--- a/oparl-server/src/main/java/de/twomartens/oparlservice/entity/Organization.java
+++ b/oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/Organization.java
@@ -1,4 +1,4 @@
-package de.twomartens.oparlservice.entity;
+package de.twomartens.oparlservice.entity.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/oparl-server/src/main/java/de/twomartens/oparlservice/entity/OrganizationType.java b/oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/OrganizationType.java
similarity index 91%
rename from oparl-server/src/main/java/de/twomartens/oparlservice/entity/OrganizationType.java
rename to oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/OrganizationType.java
index 3ff70ac..ee1d5a1 100644
--- a/oparl-server/src/main/java/de/twomartens/oparlservice/entity/OrganizationType.java
+++ b/oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/OrganizationType.java
@@ -1,4 +1,4 @@
-package de.twomartens.oparlservice.entity;
+package de.twomartens.oparlservice.entity.dto;
 
 import com.fasterxml.jackson.annotation.JsonValue;
 import lombok.Getter;
diff --git a/oparl-server/src/main/java/de/twomartens/oparlservice/entity/Pagination.java b/oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/Pagination.java
similarity index 94%
rename from oparl-server/src/main/java/de/twomartens/oparlservice/entity/Pagination.java
rename to oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/Pagination.java
index 74667c7..b7c58a2 100644
--- a/oparl-server/src/main/java/de/twomartens/oparlservice/entity/Pagination.java
+++ b/oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/Pagination.java
@@ -1,4 +1,4 @@
-package de.twomartens.oparlservice.entity;
+package de.twomartens.oparlservice.entity.dto;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/oparl-server/src/main/java/de/twomartens/oparlservice/entity/Paper.java b/oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/Paper.java
similarity index 98%
rename from oparl-server/src/main/java/de/twomartens/oparlservice/entity/Paper.java
rename to oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/Paper.java
index c6f9268..6ccaf41 100644
--- a/oparl-server/src/main/java/de/twomartens/oparlservice/entity/Paper.java
+++ b/oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/Paper.java
@@ -1,4 +1,4 @@
-package de.twomartens.oparlservice.entity;
+package de.twomartens.oparlservice.entity.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/oparl-server/src/main/java/de/twomartens/oparlservice/entity/Person.java b/oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/Person.java
similarity index 98%
rename from oparl-server/src/main/java/de/twomartens/oparlservice/entity/Person.java
rename to oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/Person.java
index a186eb7..3b29e9d 100644
--- a/oparl-server/src/main/java/de/twomartens/oparlservice/entity/Person.java
+++ b/oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/Person.java
@@ -1,4 +1,4 @@
-package de.twomartens.oparlservice.entity;
+package de.twomartens.oparlservice.entity.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/oparl-server/src/main/java/de/twomartens/oparlservice/entity/System.java b/oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/System.java
similarity index 98%
rename from oparl-server/src/main/java/de/twomartens/oparlservice/entity/System.java
rename to oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/System.java
index dd0d75f..69c74dd 100644
--- a/oparl-server/src/main/java/de/twomartens/oparlservice/entity/System.java
+++ b/oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/System.java
@@ -1,4 +1,4 @@
-package de.twomartens.oparlservice.entity;
+package de.twomartens.oparlservice.entity.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/oparl-server/src/main/java/de/twomartens/oparlservice/service/OParlService.java b/oparl-server/src/main/java/de/twomartens/oparlservice/service/OParlService.java
index 1aa78cb..c5c0d1b 100644
--- a/oparl-server/src/main/java/de/twomartens/oparlservice/service/OParlService.java
+++ b/oparl-server/src/main/java/de/twomartens/oparlservice/service/OParlService.java
@@ -1,8 +1,8 @@
 package de.twomartens.oparlservice.service;
 
 import de.twomartens.oparlservice.configs.OParlServiceProperties;
-import de.twomartens.oparlservice.entity.System;
-import de.twomartens.oparlservice.entity.*;
+import de.twomartens.oparlservice.entity.dto.*;
+import de.twomartens.oparlservice.entity.dto.System;
 import org.springframework.stereotype.Service;
 
 import java.util.Optional;
diff --git a/oparl-server/src/test/java/de/twomartens/oparlservice/control/OParlControllerTest.java b/oparl-server/src/test/java/de/twomartens/oparlservice/control/OParlControllerTest.java
index 118e489..d76c715 100644
--- a/oparl-server/src/test/java/de/twomartens/oparlservice/control/OParlControllerTest.java
+++ b/oparl-server/src/test/java/de/twomartens/oparlservice/control/OParlControllerTest.java
@@ -1,7 +1,7 @@
 package de.twomartens.oparlservice.control;
 
-import de.twomartens.oparlservice.entity.System;
-import de.twomartens.oparlservice.entity.*;
+import de.twomartens.oparlservice.entity.dto.*;
+import de.twomartens.oparlservice.entity.dto.System;
 import de.twomartens.oparlservice.service.OParlService;
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.BeforeEach;
@@ -687,4 +687,4 @@ class OParlControllerTest {
                 .papers(Collections.emptyList())
                 .build();
     }
-}
\ No newline at end of file
+}