From cd308ce69610a5905f76fc18edee76cd04e129b3 Mon Sep 17 00:00:00 2001
From: Martin Vogel <martin.vogel@sinc.de>
Date: Mon, 13 Jun 2022 18:03:52 +0200
Subject: [PATCH] #414 Refactor api package structure
---
api/src/main/java/fitconnect/api/Sender.java | 10 +++++-----
api/src/main/java/fitconnect/api/Subscriber.java | 10 +++++-----
.../api/{ => domain}/auth/OAuthToken.java | 2 +-
.../metadata/AdditionalReferenceInfo.java | 2 +-
.../metadata/AuthenticationInformation.java | 2 +-
.../{ => model}/metadata/ContentStructure.java | 6 +++---
.../domain/{ => model}/metadata/Metadata.java | 2 +-
.../{ => model}/metadata/PaymentInformation.java | 2 +-
.../{ => model}/metadata/PublicServiceType.java | 2 +-
.../{ => model}/metadata/ReplyChannel.java | 2 +-
.../metadata/attachment/Attachment.java | 6 +++---
.../{ => model}/metadata/attachment/Purpose.java | 2 +-
.../attachment/signature/EidasAdesProfile.java | 2 +-
.../metadata/attachment/signature/Hash__1.java | 2 +-
.../attachment/signature/SignatureFormat.java | 2 +-
.../attachment/signature/Signature__1.java | 2 +-
.../metadata/attachment/signature/Type.java | 2 +-
.../domain/{ => model}/metadata/data/Data.java | 2 +-
.../metadata/data/EidasAdesProfile.java | 2 +-
.../domain/{ => model}/metadata/data/Hash.java | 2 +-
.../{ => model}/metadata/data/MimeType.java | 2 +-
.../{ => model}/metadata/data/Signature.java | 2 +-
.../metadata/data/SignatureFormat.java | 2 +-
.../metadata/data/SubmissionSchema.java | 2 +-
.../domain/{ => model}/metadata/data/Type.java | 2 +-
.../domain/{ => model}/submission/Callback.java | 2 +-
.../{ => model}/submission/ServiceType.java | 2 +-
.../{ => model}/submission/Submission.java | 2 +-
.../validation/ValidationResult.java | 2 +-
.../api/{ => services}/auth/OAuthService.java | 3 ++-
.../api/{ => services}/crypto/CryptoService.java | 2 +-
.../{ => services}/metadata/MetadataService.java | 8 ++++----
.../validation/CertificateValidator.java | 3 ++-
.../validation/MetadataValidator.java | 9 +++++----
.../java/de/fitconnect/client/ClientFactory.java | 8 ++++----
.../de/fitconnect/client/FitConnectClient.java | 10 +++++-----
.../java/de/fitconnect/client/TestRunner.java | 6 +++---
.../java/fitconnect/impl/SubmissionSender.java | 16 ++++++++--------
.../fitconnect/impl/SubmissionSubscriber.java | 16 ++++++++--------
.../fitconnect/impl/auth/FitCoAuthService.java | 4 ++--
.../fitconnect/impl/crypto/JWECryptoService.java | 2 +-
.../fitconnect/impl/validation/KeyValidator.java | 4 ++--
.../validation/MetadataSubmissionValidator.java | 6 +++---
.../impl/auth/OAuthTokenIntegrationTest.java | 2 +-
.../impl/crypto/JWECryptoServiceTest.java | 2 +-
45 files changed, 93 insertions(+), 90 deletions(-)
rename api/src/main/java/fitconnect/api/{ => domain}/auth/OAuthToken.java (93%)
rename api/src/main/java/fitconnect/api/domain/{ => model}/metadata/AdditionalReferenceInfo.java (94%)
rename api/src/main/java/fitconnect/api/domain/{ => model}/metadata/AuthenticationInformation.java (69%)
rename api/src/main/java/fitconnect/api/domain/{ => model}/metadata/ContentStructure.java (81%)
rename api/src/main/java/fitconnect/api/domain/{ => model}/metadata/Metadata.java (96%)
rename api/src/main/java/fitconnect/api/domain/{ => model}/metadata/PaymentInformation.java (68%)
rename api/src/main/java/fitconnect/api/domain/{ => model}/metadata/PublicServiceType.java (95%)
rename api/src/main/java/fitconnect/api/domain/{ => model}/metadata/ReplyChannel.java (66%)
rename api/src/main/java/fitconnect/api/domain/{ => model}/metadata/attachment/Attachment.java (83%)
rename api/src/main/java/fitconnect/api/domain/{ => model}/metadata/attachment/Purpose.java (95%)
rename api/src/main/java/fitconnect/api/domain/{ => model}/metadata/attachment/signature/EidasAdesProfile.java (96%)
rename api/src/main/java/fitconnect/api/domain/{ => model}/metadata/attachment/signature/Hash__1.java (92%)
rename api/src/main/java/fitconnect/api/domain/{ => model}/metadata/attachment/signature/SignatureFormat.java (95%)
rename api/src/main/java/fitconnect/api/domain/{ => model}/metadata/attachment/signature/Signature__1.java (93%)
rename api/src/main/java/fitconnect/api/domain/{ => model}/metadata/attachment/signature/Type.java (93%)
rename api/src/main/java/fitconnect/api/domain/{ => model}/metadata/data/Data.java (94%)
rename api/src/main/java/fitconnect/api/domain/{ => model}/metadata/data/EidasAdesProfile.java (97%)
rename api/src/main/java/fitconnect/api/domain/{ => model}/metadata/data/Hash.java (94%)
rename api/src/main/java/fitconnect/api/domain/{ => model}/metadata/data/MimeType.java (95%)
rename api/src/main/java/fitconnect/api/domain/{ => model}/metadata/data/Signature.java (94%)
rename api/src/main/java/fitconnect/api/domain/{ => model}/metadata/data/SignatureFormat.java (96%)
rename api/src/main/java/fitconnect/api/domain/{ => model}/metadata/data/SubmissionSchema.java (93%)
rename api/src/main/java/fitconnect/api/domain/{ => model}/metadata/data/Type.java (94%)
rename api/src/main/java/fitconnect/api/domain/{ => model}/submission/Callback.java (85%)
rename api/src/main/java/fitconnect/api/domain/{ => model}/submission/ServiceType.java (87%)
rename api/src/main/java/fitconnect/api/domain/{ => model}/submission/Submission.java (92%)
rename api/src/main/java/fitconnect/api/{ => domain}/validation/ValidationResult.java (95%)
rename api/src/main/java/fitconnect/api/{ => services}/auth/OAuthService.java (89%)
rename api/src/main/java/fitconnect/api/{ => services}/crypto/CryptoService.java (98%)
rename api/src/main/java/fitconnect/api/{ => services}/metadata/MetadataService.java (73%)
rename api/src/main/java/fitconnect/api/{ => services}/validation/CertificateValidator.java (83%)
rename api/src/main/java/fitconnect/api/{ => services}/validation/MetadataValidator.java (78%)
diff --git a/api/src/main/java/fitconnect/api/Sender.java b/api/src/main/java/fitconnect/api/Sender.java
index 649abe5cd..efaaadc86 100644
--- a/api/src/main/java/fitconnect/api/Sender.java
+++ b/api/src/main/java/fitconnect/api/Sender.java
@@ -1,11 +1,11 @@
package fitconnect.api;
import com.nimbusds.jose.jwk.RSAKey;
-import fitconnect.api.auth.OAuthToken;
-import fitconnect.api.domain.metadata.Metadata;
-import fitconnect.api.domain.metadata.attachment.Attachment;
-import fitconnect.api.domain.metadata.data.Data;
-import fitconnect.api.validation.ValidationResult;
+import fitconnect.api.domain.auth.OAuthToken;
+import fitconnect.api.domain.model.metadata.Metadata;
+import fitconnect.api.domain.model.metadata.attachment.Attachment;
+import fitconnect.api.domain.model.metadata.data.Data;
+import fitconnect.api.domain.validation.ValidationResult;
import java.util.List;
import java.util.Optional;
diff --git a/api/src/main/java/fitconnect/api/Subscriber.java b/api/src/main/java/fitconnect/api/Subscriber.java
index 804845219..5f47f3023 100644
--- a/api/src/main/java/fitconnect/api/Subscriber.java
+++ b/api/src/main/java/fitconnect/api/Subscriber.java
@@ -1,11 +1,11 @@
package fitconnect.api;
import com.nimbusds.jose.jwk.RSAKey;
-import fitconnect.api.auth.OAuthToken;
-import fitconnect.api.domain.metadata.Metadata;
-import fitconnect.api.domain.metadata.attachment.Attachment;
-import fitconnect.api.domain.metadata.data.Data;
-import fitconnect.api.validation.ValidationResult;
+import fitconnect.api.domain.auth.OAuthToken;
+import fitconnect.api.domain.model.metadata.Metadata;
+import fitconnect.api.domain.model.metadata.attachment.Attachment;
+import fitconnect.api.domain.model.metadata.data.Data;
+import fitconnect.api.domain.validation.ValidationResult;
import java.util.Optional;
diff --git a/api/src/main/java/fitconnect/api/auth/OAuthToken.java b/api/src/main/java/fitconnect/api/domain/auth/OAuthToken.java
similarity index 93%
rename from api/src/main/java/fitconnect/api/auth/OAuthToken.java
rename to api/src/main/java/fitconnect/api/domain/auth/OAuthToken.java
index 77a9cbbcb..215dc9a2f 100644
--- a/api/src/main/java/fitconnect/api/auth/OAuthToken.java
+++ b/api/src/main/java/fitconnect/api/domain/auth/OAuthToken.java
@@ -1,4 +1,4 @@
-package fitconnect.api.auth;
+package fitconnect.api.domain.auth;
/**
* Stores the authentication-token after the user has been authenticated
diff --git a/api/src/main/java/fitconnect/api/domain/metadata/AdditionalReferenceInfo.java b/api/src/main/java/fitconnect/api/domain/model/metadata/AdditionalReferenceInfo.java
similarity index 94%
rename from api/src/main/java/fitconnect/api/domain/metadata/AdditionalReferenceInfo.java
rename to api/src/main/java/fitconnect/api/domain/model/metadata/AdditionalReferenceInfo.java
index c694fefd3..5bf28ef4b 100644
--- a/api/src/main/java/fitconnect/api/domain/metadata/AdditionalReferenceInfo.java
+++ b/api/src/main/java/fitconnect/api/domain/model/metadata/AdditionalReferenceInfo.java
@@ -1,4 +1,4 @@
-package fitconnect.api.domain.metadata;
+package fitconnect.api.domain.model.metadata;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/api/src/main/java/fitconnect/api/domain/metadata/AuthenticationInformation.java b/api/src/main/java/fitconnect/api/domain/model/metadata/AuthenticationInformation.java
similarity index 69%
rename from api/src/main/java/fitconnect/api/domain/metadata/AuthenticationInformation.java
rename to api/src/main/java/fitconnect/api/domain/model/metadata/AuthenticationInformation.java
index 6dc93fd9b..ea9a6a60a 100644
--- a/api/src/main/java/fitconnect/api/domain/metadata/AuthenticationInformation.java
+++ b/api/src/main/java/fitconnect/api/domain/model/metadata/AuthenticationInformation.java
@@ -1,4 +1,4 @@
-package fitconnect.api.domain.metadata;
+package fitconnect.api.domain.model.metadata;
import lombok.Getter;
import lombok.Setter;
diff --git a/api/src/main/java/fitconnect/api/domain/metadata/ContentStructure.java b/api/src/main/java/fitconnect/api/domain/model/metadata/ContentStructure.java
similarity index 81%
rename from api/src/main/java/fitconnect/api/domain/metadata/ContentStructure.java
rename to api/src/main/java/fitconnect/api/domain/model/metadata/ContentStructure.java
index 093f78e4d..f02867034 100644
--- a/api/src/main/java/fitconnect/api/domain/metadata/ContentStructure.java
+++ b/api/src/main/java/fitconnect/api/domain/model/metadata/ContentStructure.java
@@ -1,11 +1,11 @@
-package fitconnect.api.domain.metadata;
+package fitconnect.api.domain.model.metadata;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import fitconnect.api.domain.metadata.attachment.Attachment;
-import fitconnect.api.domain.metadata.data.Data;
+import fitconnect.api.domain.model.metadata.attachment.Attachment;
+import fitconnect.api.domain.model.metadata.data.Data;
import lombok.Getter;
import lombok.Setter;
diff --git a/api/src/main/java/fitconnect/api/domain/metadata/Metadata.java b/api/src/main/java/fitconnect/api/domain/model/metadata/Metadata.java
similarity index 96%
rename from api/src/main/java/fitconnect/api/domain/metadata/Metadata.java
rename to api/src/main/java/fitconnect/api/domain/model/metadata/Metadata.java
index 74705e388..694eb9f1e 100644
--- a/api/src/main/java/fitconnect/api/domain/metadata/Metadata.java
+++ b/api/src/main/java/fitconnect/api/domain/model/metadata/Metadata.java
@@ -1,4 +1,4 @@
-package fitconnect.api.domain.metadata;
+package fitconnect.api.domain.model.metadata;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/api/src/main/java/fitconnect/api/domain/metadata/PaymentInformation.java b/api/src/main/java/fitconnect/api/domain/model/metadata/PaymentInformation.java
similarity index 68%
rename from api/src/main/java/fitconnect/api/domain/metadata/PaymentInformation.java
rename to api/src/main/java/fitconnect/api/domain/model/metadata/PaymentInformation.java
index 3c911876d..d8b31aa85 100644
--- a/api/src/main/java/fitconnect/api/domain/metadata/PaymentInformation.java
+++ b/api/src/main/java/fitconnect/api/domain/model/metadata/PaymentInformation.java
@@ -1,4 +1,4 @@
-package fitconnect.api.domain.metadata;
+package fitconnect.api.domain.model.metadata;
import lombok.Getter;
import lombok.Setter;
diff --git a/api/src/main/java/fitconnect/api/domain/metadata/PublicServiceType.java b/api/src/main/java/fitconnect/api/domain/model/metadata/PublicServiceType.java
similarity index 95%
rename from api/src/main/java/fitconnect/api/domain/metadata/PublicServiceType.java
rename to api/src/main/java/fitconnect/api/domain/model/metadata/PublicServiceType.java
index e3a915022..e94184aff 100644
--- a/api/src/main/java/fitconnect/api/domain/metadata/PublicServiceType.java
+++ b/api/src/main/java/fitconnect/api/domain/model/metadata/PublicServiceType.java
@@ -1,4 +1,4 @@
-package fitconnect.api.domain.metadata;
+package fitconnect.api.domain.model.metadata;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/api/src/main/java/fitconnect/api/domain/metadata/ReplyChannel.java b/api/src/main/java/fitconnect/api/domain/model/metadata/ReplyChannel.java
similarity index 66%
rename from api/src/main/java/fitconnect/api/domain/metadata/ReplyChannel.java
rename to api/src/main/java/fitconnect/api/domain/model/metadata/ReplyChannel.java
index 49802151d..1fca47d75 100644
--- a/api/src/main/java/fitconnect/api/domain/metadata/ReplyChannel.java
+++ b/api/src/main/java/fitconnect/api/domain/model/metadata/ReplyChannel.java
@@ -1,4 +1,4 @@
-package fitconnect.api.domain.metadata;
+package fitconnect.api.domain.model.metadata;
import lombok.Getter;
import lombok.Setter;
diff --git a/api/src/main/java/fitconnect/api/domain/metadata/attachment/Attachment.java b/api/src/main/java/fitconnect/api/domain/model/metadata/attachment/Attachment.java
similarity index 83%
rename from api/src/main/java/fitconnect/api/domain/metadata/attachment/Attachment.java
rename to api/src/main/java/fitconnect/api/domain/model/metadata/attachment/Attachment.java
index dc2ffca95..9dea17c63 100644
--- a/api/src/main/java/fitconnect/api/domain/metadata/attachment/Attachment.java
+++ b/api/src/main/java/fitconnect/api/domain/model/metadata/attachment/Attachment.java
@@ -1,11 +1,11 @@
-package fitconnect.api.domain.metadata.attachment;
+package fitconnect.api.domain.model.metadata.attachment;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import fitconnect.api.domain.metadata.attachment.signature.Hash__1;
-import fitconnect.api.domain.metadata.attachment.signature.Signature__1;
+import fitconnect.api.domain.model.metadata.attachment.signature.Hash__1;
+import fitconnect.api.domain.model.metadata.attachment.signature.Signature__1;
import lombok.Getter;
import lombok.Setter;
diff --git a/api/src/main/java/fitconnect/api/domain/metadata/attachment/Purpose.java b/api/src/main/java/fitconnect/api/domain/model/metadata/attachment/Purpose.java
similarity index 95%
rename from api/src/main/java/fitconnect/api/domain/metadata/attachment/Purpose.java
rename to api/src/main/java/fitconnect/api/domain/model/metadata/attachment/Purpose.java
index 550553256..255d0f09e 100644
--- a/api/src/main/java/fitconnect/api/domain/metadata/attachment/Purpose.java
+++ b/api/src/main/java/fitconnect/api/domain/model/metadata/attachment/Purpose.java
@@ -1,4 +1,4 @@
-package fitconnect.api.domain.metadata.attachment;
+package fitconnect.api.domain.model.metadata.attachment;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/api/src/main/java/fitconnect/api/domain/metadata/attachment/signature/EidasAdesProfile.java b/api/src/main/java/fitconnect/api/domain/model/metadata/attachment/signature/EidasAdesProfile.java
similarity index 96%
rename from api/src/main/java/fitconnect/api/domain/metadata/attachment/signature/EidasAdesProfile.java
rename to api/src/main/java/fitconnect/api/domain/model/metadata/attachment/signature/EidasAdesProfile.java
index a72b5e8f9..d5758d9e6 100644
--- a/api/src/main/java/fitconnect/api/domain/metadata/attachment/signature/EidasAdesProfile.java
+++ b/api/src/main/java/fitconnect/api/domain/model/metadata/attachment/signature/EidasAdesProfile.java
@@ -1,4 +1,4 @@
-package fitconnect.api.domain.metadata.attachment.signature;
+package fitconnect.api.domain.model.metadata.attachment.signature;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/api/src/main/java/fitconnect/api/domain/metadata/attachment/signature/Hash__1.java b/api/src/main/java/fitconnect/api/domain/model/metadata/attachment/signature/Hash__1.java
similarity index 92%
rename from api/src/main/java/fitconnect/api/domain/metadata/attachment/signature/Hash__1.java
rename to api/src/main/java/fitconnect/api/domain/model/metadata/attachment/signature/Hash__1.java
index 407366428..15226e12e 100644
--- a/api/src/main/java/fitconnect/api/domain/metadata/attachment/signature/Hash__1.java
+++ b/api/src/main/java/fitconnect/api/domain/model/metadata/attachment/signature/Hash__1.java
@@ -1,4 +1,4 @@
-package fitconnect.api.domain.metadata.attachment.signature;
+package fitconnect.api.domain.model.metadata.attachment.signature;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/api/src/main/java/fitconnect/api/domain/metadata/attachment/signature/SignatureFormat.java b/api/src/main/java/fitconnect/api/domain/model/metadata/attachment/signature/SignatureFormat.java
similarity index 95%
rename from api/src/main/java/fitconnect/api/domain/metadata/attachment/signature/SignatureFormat.java
rename to api/src/main/java/fitconnect/api/domain/model/metadata/attachment/signature/SignatureFormat.java
index 9bf563df3..3253d06f8 100644
--- a/api/src/main/java/fitconnect/api/domain/metadata/attachment/signature/SignatureFormat.java
+++ b/api/src/main/java/fitconnect/api/domain/model/metadata/attachment/signature/SignatureFormat.java
@@ -1,4 +1,4 @@
-package fitconnect.api.domain.metadata.attachment.signature;
+package fitconnect.api.domain.model.metadata.attachment.signature;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/api/src/main/java/fitconnect/api/domain/metadata/attachment/signature/Signature__1.java b/api/src/main/java/fitconnect/api/domain/model/metadata/attachment/signature/Signature__1.java
similarity index 93%
rename from api/src/main/java/fitconnect/api/domain/metadata/attachment/signature/Signature__1.java
rename to api/src/main/java/fitconnect/api/domain/model/metadata/attachment/signature/Signature__1.java
index 2708095c7..6f91d1238 100644
--- a/api/src/main/java/fitconnect/api/domain/metadata/attachment/signature/Signature__1.java
+++ b/api/src/main/java/fitconnect/api/domain/model/metadata/attachment/signature/Signature__1.java
@@ -1,4 +1,4 @@
-package fitconnect.api.domain.metadata.attachment.signature;
+package fitconnect.api.domain.model.metadata.attachment.signature;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/api/src/main/java/fitconnect/api/domain/metadata/attachment/signature/Type.java b/api/src/main/java/fitconnect/api/domain/model/metadata/attachment/signature/Type.java
similarity index 93%
rename from api/src/main/java/fitconnect/api/domain/metadata/attachment/signature/Type.java
rename to api/src/main/java/fitconnect/api/domain/model/metadata/attachment/signature/Type.java
index a9fc941bc..0c13021ea 100644
--- a/api/src/main/java/fitconnect/api/domain/metadata/attachment/signature/Type.java
+++ b/api/src/main/java/fitconnect/api/domain/model/metadata/attachment/signature/Type.java
@@ -1,4 +1,4 @@
-package fitconnect.api.domain.metadata.attachment.signature;
+package fitconnect.api.domain.model.metadata.attachment.signature;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/api/src/main/java/fitconnect/api/domain/metadata/data/Data.java b/api/src/main/java/fitconnect/api/domain/model/metadata/data/Data.java
similarity index 94%
rename from api/src/main/java/fitconnect/api/domain/metadata/data/Data.java
rename to api/src/main/java/fitconnect/api/domain/model/metadata/data/Data.java
index 159655d37..2b102bf23 100644
--- a/api/src/main/java/fitconnect/api/domain/metadata/data/Data.java
+++ b/api/src/main/java/fitconnect/api/domain/model/metadata/data/Data.java
@@ -1,4 +1,4 @@
-package fitconnect.api.domain.metadata.data;
+package fitconnect.api.domain.model.metadata.data;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/api/src/main/java/fitconnect/api/domain/metadata/data/EidasAdesProfile.java b/api/src/main/java/fitconnect/api/domain/model/metadata/data/EidasAdesProfile.java
similarity index 97%
rename from api/src/main/java/fitconnect/api/domain/metadata/data/EidasAdesProfile.java
rename to api/src/main/java/fitconnect/api/domain/model/metadata/data/EidasAdesProfile.java
index 51723dd5d..d17d5a1a2 100644
--- a/api/src/main/java/fitconnect/api/domain/metadata/data/EidasAdesProfile.java
+++ b/api/src/main/java/fitconnect/api/domain/model/metadata/data/EidasAdesProfile.java
@@ -1,4 +1,4 @@
-package fitconnect.api.domain.metadata.data;
+package fitconnect.api.domain.model.metadata.data;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/api/src/main/java/fitconnect/api/domain/metadata/data/Hash.java b/api/src/main/java/fitconnect/api/domain/model/metadata/data/Hash.java
similarity index 94%
rename from api/src/main/java/fitconnect/api/domain/metadata/data/Hash.java
rename to api/src/main/java/fitconnect/api/domain/model/metadata/data/Hash.java
index 815f1a489..b122728a9 100644
--- a/api/src/main/java/fitconnect/api/domain/metadata/data/Hash.java
+++ b/api/src/main/java/fitconnect/api/domain/model/metadata/data/Hash.java
@@ -1,4 +1,4 @@
-package fitconnect.api.domain.metadata.data;
+package fitconnect.api.domain.model.metadata.data;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/api/src/main/java/fitconnect/api/domain/metadata/data/MimeType.java b/api/src/main/java/fitconnect/api/domain/model/metadata/data/MimeType.java
similarity index 95%
rename from api/src/main/java/fitconnect/api/domain/metadata/data/MimeType.java
rename to api/src/main/java/fitconnect/api/domain/model/metadata/data/MimeType.java
index 026beced7..b434fb0c9 100644
--- a/api/src/main/java/fitconnect/api/domain/metadata/data/MimeType.java
+++ b/api/src/main/java/fitconnect/api/domain/model/metadata/data/MimeType.java
@@ -1,4 +1,4 @@
-package fitconnect.api.domain.metadata.data;
+package fitconnect.api.domain.model.metadata.data;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/api/src/main/java/fitconnect/api/domain/metadata/data/Signature.java b/api/src/main/java/fitconnect/api/domain/model/metadata/data/Signature.java
similarity index 94%
rename from api/src/main/java/fitconnect/api/domain/metadata/data/Signature.java
rename to api/src/main/java/fitconnect/api/domain/model/metadata/data/Signature.java
index 72f1ad881..8ce03ed4f 100644
--- a/api/src/main/java/fitconnect/api/domain/metadata/data/Signature.java
+++ b/api/src/main/java/fitconnect/api/domain/model/metadata/data/Signature.java
@@ -1,4 +1,4 @@
-package fitconnect.api.domain.metadata.data;
+package fitconnect.api.domain.model.metadata.data;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/api/src/main/java/fitconnect/api/domain/metadata/data/SignatureFormat.java b/api/src/main/java/fitconnect/api/domain/model/metadata/data/SignatureFormat.java
similarity index 96%
rename from api/src/main/java/fitconnect/api/domain/metadata/data/SignatureFormat.java
rename to api/src/main/java/fitconnect/api/domain/model/metadata/data/SignatureFormat.java
index de5b96c06..e7d7517ad 100644
--- a/api/src/main/java/fitconnect/api/domain/metadata/data/SignatureFormat.java
+++ b/api/src/main/java/fitconnect/api/domain/model/metadata/data/SignatureFormat.java
@@ -1,4 +1,4 @@
-package fitconnect.api.domain.metadata.data;
+package fitconnect.api.domain.model.metadata.data;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/api/src/main/java/fitconnect/api/domain/metadata/data/SubmissionSchema.java b/api/src/main/java/fitconnect/api/domain/model/metadata/data/SubmissionSchema.java
similarity index 93%
rename from api/src/main/java/fitconnect/api/domain/metadata/data/SubmissionSchema.java
rename to api/src/main/java/fitconnect/api/domain/model/metadata/data/SubmissionSchema.java
index c2f76da4f..960fcf067 100644
--- a/api/src/main/java/fitconnect/api/domain/metadata/data/SubmissionSchema.java
+++ b/api/src/main/java/fitconnect/api/domain/model/metadata/data/SubmissionSchema.java
@@ -1,4 +1,4 @@
-package fitconnect.api.domain.metadata.data;
+package fitconnect.api.domain.model.metadata.data;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/api/src/main/java/fitconnect/api/domain/metadata/data/Type.java b/api/src/main/java/fitconnect/api/domain/model/metadata/data/Type.java
similarity index 94%
rename from api/src/main/java/fitconnect/api/domain/metadata/data/Type.java
rename to api/src/main/java/fitconnect/api/domain/model/metadata/data/Type.java
index 4f91c120e..e191ba5e7 100644
--- a/api/src/main/java/fitconnect/api/domain/metadata/data/Type.java
+++ b/api/src/main/java/fitconnect/api/domain/model/metadata/data/Type.java
@@ -1,4 +1,4 @@
-package fitconnect.api.domain.metadata.data;
+package fitconnect.api.domain.model.metadata.data;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/api/src/main/java/fitconnect/api/domain/submission/Callback.java b/api/src/main/java/fitconnect/api/domain/model/submission/Callback.java
similarity index 85%
rename from api/src/main/java/fitconnect/api/domain/submission/Callback.java
rename to api/src/main/java/fitconnect/api/domain/model/submission/Callback.java
index b45643172..5ac995c93 100644
--- a/api/src/main/java/fitconnect/api/domain/submission/Callback.java
+++ b/api/src/main/java/fitconnect/api/domain/model/submission/Callback.java
@@ -1,4 +1,4 @@
-package fitconnect.api.domain.submission;
+package fitconnect.api.domain.model.submission;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Getter;
diff --git a/api/src/main/java/fitconnect/api/domain/submission/ServiceType.java b/api/src/main/java/fitconnect/api/domain/model/submission/ServiceType.java
similarity index 87%
rename from api/src/main/java/fitconnect/api/domain/submission/ServiceType.java
rename to api/src/main/java/fitconnect/api/domain/model/submission/ServiceType.java
index c3d3b2e1f..3a6748b47 100644
--- a/api/src/main/java/fitconnect/api/domain/submission/ServiceType.java
+++ b/api/src/main/java/fitconnect/api/domain/model/submission/ServiceType.java
@@ -1,4 +1,4 @@
-package fitconnect.api.domain.submission;
+package fitconnect.api.domain.model.submission;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Getter;
diff --git a/api/src/main/java/fitconnect/api/domain/submission/Submission.java b/api/src/main/java/fitconnect/api/domain/model/submission/Submission.java
similarity index 92%
rename from api/src/main/java/fitconnect/api/domain/submission/Submission.java
rename to api/src/main/java/fitconnect/api/domain/model/submission/Submission.java
index 7aa806e37..d47e2c90b 100644
--- a/api/src/main/java/fitconnect/api/domain/submission/Submission.java
+++ b/api/src/main/java/fitconnect/api/domain/model/submission/Submission.java
@@ -1,4 +1,4 @@
-package fitconnect.api.domain.submission;
+package fitconnect.api.domain.model.submission;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Builder;
diff --git a/api/src/main/java/fitconnect/api/validation/ValidationResult.java b/api/src/main/java/fitconnect/api/domain/validation/ValidationResult.java
similarity index 95%
rename from api/src/main/java/fitconnect/api/validation/ValidationResult.java
rename to api/src/main/java/fitconnect/api/domain/validation/ValidationResult.java
index eee5b34a5..9013a4dd2 100644
--- a/api/src/main/java/fitconnect/api/validation/ValidationResult.java
+++ b/api/src/main/java/fitconnect/api/domain/validation/ValidationResult.java
@@ -1,4 +1,4 @@
-package fitconnect.api.validation;
+package fitconnect.api.domain.validation;
import java.util.Arrays;
import java.util.Collections;
diff --git a/api/src/main/java/fitconnect/api/auth/OAuthService.java b/api/src/main/java/fitconnect/api/services/auth/OAuthService.java
similarity index 89%
rename from api/src/main/java/fitconnect/api/auth/OAuthService.java
rename to api/src/main/java/fitconnect/api/services/auth/OAuthService.java
index e33bf4f77..e7c39903e 100644
--- a/api/src/main/java/fitconnect/api/auth/OAuthService.java
+++ b/api/src/main/java/fitconnect/api/services/auth/OAuthService.java
@@ -1,5 +1,6 @@
-package fitconnect.api.auth;
+package fitconnect.api.services.auth;
+import fitconnect.api.domain.auth.OAuthToken;
import fitconnect.api.exceptions.AuthenticationException;
public interface OAuthService {
diff --git a/api/src/main/java/fitconnect/api/crypto/CryptoService.java b/api/src/main/java/fitconnect/api/services/crypto/CryptoService.java
similarity index 98%
rename from api/src/main/java/fitconnect/api/crypto/CryptoService.java
rename to api/src/main/java/fitconnect/api/services/crypto/CryptoService.java
index 74483f2ce..d019c62e5 100644
--- a/api/src/main/java/fitconnect/api/crypto/CryptoService.java
+++ b/api/src/main/java/fitconnect/api/services/crypto/CryptoService.java
@@ -1,4 +1,4 @@
-package fitconnect.api.crypto;
+package fitconnect.api.services.crypto;
import com.nimbusds.jose.jwk.RSAKey;
import fitconnect.api.exceptions.DecryptionException;
diff --git a/api/src/main/java/fitconnect/api/metadata/MetadataService.java b/api/src/main/java/fitconnect/api/services/metadata/MetadataService.java
similarity index 73%
rename from api/src/main/java/fitconnect/api/metadata/MetadataService.java
rename to api/src/main/java/fitconnect/api/services/metadata/MetadataService.java
index 94a847f08..a5140afd2 100644
--- a/api/src/main/java/fitconnect/api/metadata/MetadataService.java
+++ b/api/src/main/java/fitconnect/api/services/metadata/MetadataService.java
@@ -1,9 +1,9 @@
-package fitconnect.api.metadata;
+package fitconnect.api.services.metadata;
import com.nimbusds.jose.jwk.RSAKey;
-import fitconnect.api.domain.metadata.Metadata;
-import fitconnect.api.domain.metadata.attachment.Attachment;
-import fitconnect.api.domain.metadata.data.Data;
+import fitconnect.api.domain.model.metadata.Metadata;
+import fitconnect.api.domain.model.metadata.attachment.Attachment;
+import fitconnect.api.domain.model.metadata.data.Data;
import java.util.List;
diff --git a/api/src/main/java/fitconnect/api/validation/CertificateValidator.java b/api/src/main/java/fitconnect/api/services/validation/CertificateValidator.java
similarity index 83%
rename from api/src/main/java/fitconnect/api/validation/CertificateValidator.java
rename to api/src/main/java/fitconnect/api/services/validation/CertificateValidator.java
index ea700b999..b5fee1804 100644
--- a/api/src/main/java/fitconnect/api/validation/CertificateValidator.java
+++ b/api/src/main/java/fitconnect/api/services/validation/CertificateValidator.java
@@ -1,6 +1,7 @@
-package fitconnect.api.validation;
+package fitconnect.api.services.validation;
import com.nimbusds.jose.jwk.RSAKey;
+import fitconnect.api.domain.validation.ValidationResult;
/**
* Validator for publicKeys and certificate chains
diff --git a/api/src/main/java/fitconnect/api/validation/MetadataValidator.java b/api/src/main/java/fitconnect/api/services/validation/MetadataValidator.java
similarity index 78%
rename from api/src/main/java/fitconnect/api/validation/MetadataValidator.java
rename to api/src/main/java/fitconnect/api/services/validation/MetadataValidator.java
index ba15f0651..a58725b94 100644
--- a/api/src/main/java/fitconnect/api/validation/MetadataValidator.java
+++ b/api/src/main/java/fitconnect/api/services/validation/MetadataValidator.java
@@ -1,8 +1,9 @@
-package fitconnect.api.validation;
+package fitconnect.api.services.validation;
-import fitconnect.api.domain.metadata.Metadata;
-import fitconnect.api.domain.metadata.attachment.Attachment;
-import fitconnect.api.domain.metadata.data.Data;
+import fitconnect.api.domain.model.metadata.Metadata;
+import fitconnect.api.domain.model.metadata.attachment.Attachment;
+import fitconnect.api.domain.model.metadata.data.Data;
+import fitconnect.api.domain.validation.ValidationResult;
/**
* A validator that ensure the integrity of the transferred metadata of a submission
diff --git a/client/src/main/java/de/fitconnect/client/ClientFactory.java b/client/src/main/java/de/fitconnect/client/ClientFactory.java
index 9be54f57f..43301119b 100644
--- a/client/src/main/java/de/fitconnect/client/ClientFactory.java
+++ b/client/src/main/java/de/fitconnect/client/ClientFactory.java
@@ -2,10 +2,10 @@ package de.fitconnect.client;
import fitconnect.api.Sender;
import fitconnect.api.Subscriber;
-import fitconnect.api.auth.OAuthService;
-import fitconnect.api.crypto.CryptoService;
-import fitconnect.api.validation.CertificateValidator;
-import fitconnect.api.validation.MetadataValidator;
+import fitconnect.api.services.auth.OAuthService;
+import fitconnect.api.services.crypto.CryptoService;
+import fitconnect.api.services.validation.CertificateValidator;
+import fitconnect.api.services.validation.MetadataValidator;
import fitconnect.impl.SubmissionSender;
import fitconnect.impl.SubmissionSubscriber;
import fitconnect.impl.auth.FitCoAuthService;
diff --git a/client/src/main/java/de/fitconnect/client/FitConnectClient.java b/client/src/main/java/de/fitconnect/client/FitConnectClient.java
index d13bcfe9b..47135fc66 100644
--- a/client/src/main/java/de/fitconnect/client/FitConnectClient.java
+++ b/client/src/main/java/de/fitconnect/client/FitConnectClient.java
@@ -1,11 +1,11 @@
package de.fitconnect.client;
import fitconnect.api.Sender;
-import fitconnect.api.auth.OAuthToken;
-import fitconnect.api.domain.metadata.Metadata;
-import fitconnect.api.domain.metadata.attachment.Attachment;
-import fitconnect.api.domain.metadata.data.Data;
-import fitconnect.api.domain.submission.Submission;
+import fitconnect.api.domain.auth.OAuthToken;
+import fitconnect.api.domain.model.metadata.Metadata;
+import fitconnect.api.domain.model.metadata.attachment.Attachment;
+import fitconnect.api.domain.model.metadata.data.Data;
+import fitconnect.api.domain.model.submission.Submission;
import fitconnect.impl.logger.SdkLogger;
import java.util.List;
diff --git a/client/src/main/java/de/fitconnect/client/TestRunner.java b/client/src/main/java/de/fitconnect/client/TestRunner.java
index 8b01abaf9..8d9f175b0 100644
--- a/client/src/main/java/de/fitconnect/client/TestRunner.java
+++ b/client/src/main/java/de/fitconnect/client/TestRunner.java
@@ -1,8 +1,8 @@
package de.fitconnect.client;
-import fitconnect.api.domain.metadata.Metadata;
-import fitconnect.api.domain.metadata.data.Data;
-import fitconnect.api.domain.submission.Submission;
+import fitconnect.api.domain.model.metadata.Metadata;
+import fitconnect.api.domain.model.metadata.data.Data;
+import fitconnect.api.domain.model.submission.Submission;
import java.util.Collections;
diff --git a/impl/src/main/java/fitconnect/impl/SubmissionSender.java b/impl/src/main/java/fitconnect/impl/SubmissionSender.java
index c60c458da..62f444926 100644
--- a/impl/src/main/java/fitconnect/impl/SubmissionSender.java
+++ b/impl/src/main/java/fitconnect/impl/SubmissionSender.java
@@ -2,17 +2,17 @@ package fitconnect.impl;
import com.nimbusds.jose.jwk.RSAKey;
import fitconnect.api.Sender;
-import fitconnect.api.auth.OAuthService;
-import fitconnect.api.auth.OAuthToken;
-import fitconnect.api.crypto.CryptoService;
-import fitconnect.api.domain.metadata.Metadata;
-import fitconnect.api.domain.metadata.attachment.Attachment;
-import fitconnect.api.domain.metadata.data.Data;
+import fitconnect.api.services.auth.OAuthService;
+import fitconnect.api.domain.auth.OAuthToken;
+import fitconnect.api.services.crypto.CryptoService;
+import fitconnect.api.domain.model.metadata.Metadata;
+import fitconnect.api.domain.model.metadata.attachment.Attachment;
+import fitconnect.api.domain.model.metadata.data.Data;
import fitconnect.api.exceptions.AuthenticationException;
import fitconnect.api.exceptions.EncryptionException;
import fitconnect.impl.logger.SdkLogger;
-import fitconnect.api.validation.CertificateValidator;
-import fitconnect.api.validation.ValidationResult;
+import fitconnect.api.services.validation.CertificateValidator;
+import fitconnect.api.domain.validation.ValidationResult;
import fitconnect.impl.auth.FitCoAuthService;
import java.nio.charset.StandardCharsets;
diff --git a/impl/src/main/java/fitconnect/impl/SubmissionSubscriber.java b/impl/src/main/java/fitconnect/impl/SubmissionSubscriber.java
index e8eea17c7..b0f7f0e6f 100644
--- a/impl/src/main/java/fitconnect/impl/SubmissionSubscriber.java
+++ b/impl/src/main/java/fitconnect/impl/SubmissionSubscriber.java
@@ -2,17 +2,17 @@ package fitconnect.impl;
import com.nimbusds.jose.jwk.RSAKey;
import fitconnect.api.Subscriber;
-import fitconnect.api.auth.OAuthService;
-import fitconnect.api.auth.OAuthToken;
-import fitconnect.api.crypto.CryptoService;
-import fitconnect.api.domain.metadata.Metadata;
-import fitconnect.api.domain.metadata.attachment.Attachment;
-import fitconnect.api.domain.metadata.data.Data;
+import fitconnect.api.services.auth.OAuthService;
+import fitconnect.api.domain.auth.OAuthToken;
+import fitconnect.api.services.crypto.CryptoService;
+import fitconnect.api.domain.model.metadata.Metadata;
+import fitconnect.api.domain.model.metadata.attachment.Attachment;
+import fitconnect.api.domain.model.metadata.data.Data;
import fitconnect.api.exceptions.AuthenticationException;
import fitconnect.api.exceptions.DecryptionException;
import fitconnect.impl.logger.SdkLogger;
-import fitconnect.api.validation.MetadataValidator;
-import fitconnect.api.validation.ValidationResult;
+import fitconnect.api.services.validation.MetadataValidator;
+import fitconnect.api.domain.validation.ValidationResult;
import fitconnect.impl.auth.FitCoAuthService;
import java.util.Optional;
diff --git a/impl/src/main/java/fitconnect/impl/auth/FitCoAuthService.java b/impl/src/main/java/fitconnect/impl/auth/FitCoAuthService.java
index 5b6a8574d..4b73d3d46 100644
--- a/impl/src/main/java/fitconnect/impl/auth/FitCoAuthService.java
+++ b/impl/src/main/java/fitconnect/impl/auth/FitCoAuthService.java
@@ -1,8 +1,8 @@
package fitconnect.impl.auth;
import com.fasterxml.jackson.databind.ObjectMapper;
-import fitconnect.api.auth.OAuthService;
-import fitconnect.api.auth.OAuthToken;
+import fitconnect.api.services.auth.OAuthService;
+import fitconnect.api.domain.auth.OAuthToken;
import fitconnect.api.exceptions.AuthenticationException;
import fitconnect.impl.logger.SdkLogger;
diff --git a/impl/src/main/java/fitconnect/impl/crypto/JWECryptoService.java b/impl/src/main/java/fitconnect/impl/crypto/JWECryptoService.java
index f44905774..aa216e703 100644
--- a/impl/src/main/java/fitconnect/impl/crypto/JWECryptoService.java
+++ b/impl/src/main/java/fitconnect/impl/crypto/JWECryptoService.java
@@ -4,7 +4,7 @@ import com.nimbusds.jose.*;
import com.nimbusds.jose.crypto.RSADecrypter;
import com.nimbusds.jose.crypto.RSAEncrypter;
import com.nimbusds.jose.jwk.RSAKey;
-import fitconnect.api.crypto.CryptoService;
+import fitconnect.api.services.crypto.CryptoService;
import fitconnect.api.exceptions.DecryptionException;
import fitconnect.api.exceptions.EncryptionException;
diff --git a/impl/src/main/java/fitconnect/impl/validation/KeyValidator.java b/impl/src/main/java/fitconnect/impl/validation/KeyValidator.java
index db0fc67cc..33f8fdc95 100644
--- a/impl/src/main/java/fitconnect/impl/validation/KeyValidator.java
+++ b/impl/src/main/java/fitconnect/impl/validation/KeyValidator.java
@@ -1,8 +1,8 @@
package fitconnect.impl.validation;
import com.nimbusds.jose.jwk.RSAKey;
-import fitconnect.api.validation.CertificateValidator;
-import fitconnect.api.validation.ValidationResult;
+import fitconnect.api.services.validation.CertificateValidator;
+import fitconnect.api.domain.validation.ValidationResult;
public class KeyValidator implements CertificateValidator {
diff --git a/impl/src/main/java/fitconnect/impl/validation/MetadataSubmissionValidator.java b/impl/src/main/java/fitconnect/impl/validation/MetadataSubmissionValidator.java
index b616452f9..495323dc2 100644
--- a/impl/src/main/java/fitconnect/impl/validation/MetadataSubmissionValidator.java
+++ b/impl/src/main/java/fitconnect/impl/validation/MetadataSubmissionValidator.java
@@ -2,9 +2,9 @@ package fitconnect.impl.validation;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import fitconnect.api.domain.metadata.Metadata;
-import fitconnect.api.validation.MetadataValidator;
-import fitconnect.api.validation.ValidationResult;
+import fitconnect.api.domain.model.metadata.Metadata;
+import fitconnect.api.services.validation.MetadataValidator;
+import fitconnect.api.domain.validation.ValidationResult;
import fitconnect.impl.crypto.MetadataVerifier;
import org.everit.json.schema.Schema;
import org.everit.json.schema.ValidationException;
diff --git a/impl/src/test/java/fitconnect/impl/auth/OAuthTokenIntegrationTest.java b/impl/src/test/java/fitconnect/impl/auth/OAuthTokenIntegrationTest.java
index 5b6dcd62b..b73442256 100644
--- a/impl/src/test/java/fitconnect/impl/auth/OAuthTokenIntegrationTest.java
+++ b/impl/src/test/java/fitconnect/impl/auth/OAuthTokenIntegrationTest.java
@@ -1,7 +1,7 @@
package fitconnect.impl.auth;
import fitconnect.api.Sender;
-import fitconnect.api.auth.OAuthToken;
+import fitconnect.api.domain.auth.OAuthToken;
import fitconnect.impl.SubmissionSender;
import org.junit.jupiter.api.Test;
diff --git a/impl/src/test/java/fitconnect/impl/crypto/JWECryptoServiceTest.java b/impl/src/test/java/fitconnect/impl/crypto/JWECryptoServiceTest.java
index c4b382f80..a6e2c4a11 100644
--- a/impl/src/test/java/fitconnect/impl/crypto/JWECryptoServiceTest.java
+++ b/impl/src/test/java/fitconnect/impl/crypto/JWECryptoServiceTest.java
@@ -4,7 +4,7 @@ import com.nimbusds.jose.JOSEException;
import com.nimbusds.jose.jwk.KeyUse;
import com.nimbusds.jose.jwk.RSAKey;
import com.nimbusds.jose.jwk.gen.RSAKeyGenerator;
-import fitconnect.api.crypto.CryptoService;
+import fitconnect.api.services.crypto.CryptoService;
import org.junit.jupiter.api.Test;
import java.util.UUID;
--
GitLab