From bbba7c7a72a182ead2a2844aa749ff38e37a1bb5 Mon Sep 17 00:00:00 2001
From: Martin Vogel <martin.vogel@sinc.de>
Date: Mon, 13 Jun 2022 18:05:02 +0200
Subject: [PATCH] #414 Move sender and subscriber to services
---
api/src/main/java/fitconnect/api/{ => services}/Sender.java | 2 +-
.../main/java/fitconnect/api/{ => services}/Subscriber.java | 2 +-
client/src/main/java/de/fitconnect/client/ClientFactory.java | 4 ++--
.../src/main/java/de/fitconnect/client/FitConnectClient.java | 2 +-
impl/src/main/java/fitconnect/impl/SubmissionSender.java | 2 +-
impl/src/main/java/fitconnect/impl/SubmissionSubscriber.java | 2 +-
.../java/fitconnect/impl/auth/OAuthTokenIntegrationTest.java | 2 +-
7 files changed, 8 insertions(+), 8 deletions(-)
rename api/src/main/java/fitconnect/api/{ => services}/Sender.java (98%)
rename api/src/main/java/fitconnect/api/{ => services}/Subscriber.java (98%)
diff --git a/api/src/main/java/fitconnect/api/Sender.java b/api/src/main/java/fitconnect/api/services/Sender.java
similarity index 98%
rename from api/src/main/java/fitconnect/api/Sender.java
rename to api/src/main/java/fitconnect/api/services/Sender.java
index efaaadc86..6c0bfac70 100644
--- a/api/src/main/java/fitconnect/api/Sender.java
+++ b/api/src/main/java/fitconnect/api/services/Sender.java
@@ -1,4 +1,4 @@
-package fitconnect.api;
+package fitconnect.api.services;
import com.nimbusds.jose.jwk.RSAKey;
import fitconnect.api.domain.auth.OAuthToken;
diff --git a/api/src/main/java/fitconnect/api/Subscriber.java b/api/src/main/java/fitconnect/api/services/Subscriber.java
similarity index 98%
rename from api/src/main/java/fitconnect/api/Subscriber.java
rename to api/src/main/java/fitconnect/api/services/Subscriber.java
index 5f47f3023..d6ee13bc1 100644
--- a/api/src/main/java/fitconnect/api/Subscriber.java
+++ b/api/src/main/java/fitconnect/api/services/Subscriber.java
@@ -1,4 +1,4 @@
-package fitconnect.api;
+package fitconnect.api.services;
import com.nimbusds.jose.jwk.RSAKey;
import fitconnect.api.domain.auth.OAuthToken;
diff --git a/client/src/main/java/de/fitconnect/client/ClientFactory.java b/client/src/main/java/de/fitconnect/client/ClientFactory.java
index 43301119b..1bf87706b 100644
--- a/client/src/main/java/de/fitconnect/client/ClientFactory.java
+++ b/client/src/main/java/de/fitconnect/client/ClientFactory.java
@@ -1,7 +1,7 @@
package de.fitconnect.client;
-import fitconnect.api.Sender;
-import fitconnect.api.Subscriber;
+import fitconnect.api.services.Sender;
+import fitconnect.api.services.Subscriber;
import fitconnect.api.services.auth.OAuthService;
import fitconnect.api.services.crypto.CryptoService;
import fitconnect.api.services.validation.CertificateValidator;
diff --git a/client/src/main/java/de/fitconnect/client/FitConnectClient.java b/client/src/main/java/de/fitconnect/client/FitConnectClient.java
index 47135fc66..9ff95f54f 100644
--- a/client/src/main/java/de/fitconnect/client/FitConnectClient.java
+++ b/client/src/main/java/de/fitconnect/client/FitConnectClient.java
@@ -1,6 +1,6 @@
package de.fitconnect.client;
-import fitconnect.api.Sender;
+import fitconnect.api.services.Sender;
import fitconnect.api.domain.auth.OAuthToken;
import fitconnect.api.domain.model.metadata.Metadata;
import fitconnect.api.domain.model.metadata.attachment.Attachment;
diff --git a/impl/src/main/java/fitconnect/impl/SubmissionSender.java b/impl/src/main/java/fitconnect/impl/SubmissionSender.java
index 62f444926..dc441e79c 100644
--- a/impl/src/main/java/fitconnect/impl/SubmissionSender.java
+++ b/impl/src/main/java/fitconnect/impl/SubmissionSender.java
@@ -1,7 +1,7 @@
package fitconnect.impl;
import com.nimbusds.jose.jwk.RSAKey;
-import fitconnect.api.Sender;
+import fitconnect.api.services.Sender;
import fitconnect.api.services.auth.OAuthService;
import fitconnect.api.domain.auth.OAuthToken;
import fitconnect.api.services.crypto.CryptoService;
diff --git a/impl/src/main/java/fitconnect/impl/SubmissionSubscriber.java b/impl/src/main/java/fitconnect/impl/SubmissionSubscriber.java
index b0f7f0e6f..4e0c68c33 100644
--- a/impl/src/main/java/fitconnect/impl/SubmissionSubscriber.java
+++ b/impl/src/main/java/fitconnect/impl/SubmissionSubscriber.java
@@ -1,7 +1,7 @@
package fitconnect.impl;
import com.nimbusds.jose.jwk.RSAKey;
-import fitconnect.api.Subscriber;
+import fitconnect.api.services.Subscriber;
import fitconnect.api.services.auth.OAuthService;
import fitconnect.api.domain.auth.OAuthToken;
import fitconnect.api.services.crypto.CryptoService;
diff --git a/impl/src/test/java/fitconnect/impl/auth/OAuthTokenIntegrationTest.java b/impl/src/test/java/fitconnect/impl/auth/OAuthTokenIntegrationTest.java
index b73442256..e282aff6b 100644
--- a/impl/src/test/java/fitconnect/impl/auth/OAuthTokenIntegrationTest.java
+++ b/impl/src/test/java/fitconnect/impl/auth/OAuthTokenIntegrationTest.java
@@ -1,6 +1,6 @@
package fitconnect.impl.auth;
-import fitconnect.api.Sender;
+import fitconnect.api.services.Sender;
import fitconnect.api.domain.auth.OAuthToken;
import fitconnect.impl.SubmissionSender;
import org.junit.jupiter.api.Test;
--
GitLab