From 25ecf659256af1e229ba39abec4f708b5c9dbf82 Mon Sep 17 00:00:00 2001
From: Martin Vogel <martin.vogel@sinc.de>
Date: Wed, 8 Jun 2022 12:25:28 +0200
Subject: [PATCH] #414 Cleanup and move classes
---
.../fitconnect/client/SubmissionSender.java | 44 -------------------
.../{ => impl/auth}/FitCoAuthService.java | 2 +-
.../{ => auth}/OAuthTokenIntegrationTest.java | 6 ++-
3 files changed, 5 insertions(+), 47 deletions(-)
delete mode 100644 client/src/main/java/fitconnect/client/SubmissionSender.java
rename client/src/main/java/fitconnect/client/{ => impl/auth}/FitCoAuthService.java (98%)
rename client/src/test/java/fitconnect/client/{ => auth}/OAuthTokenIntegrationTest.java (82%)
diff --git a/client/src/main/java/fitconnect/client/SubmissionSender.java b/client/src/main/java/fitconnect/client/SubmissionSender.java
deleted file mode 100644
index 178b92b3a..000000000
--- a/client/src/main/java/fitconnect/client/SubmissionSender.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package fitconnect.client;
-
-import fitconnect.api.Sender;
-import fitconnect.api.auth.OAuthService;
-import fitconnect.api.auth.OAuthToken;
-import fitconnect.api.data.Data;
-import fitconnect.api.data.Metadata;
-import fitconnect.api.validation.ValidationResult;
-
-import java.io.ByteArrayInputStream;
-
-public class SubmissionSender implements Sender {
-
- private final OAuthService authService;
-
- public SubmissionSender(final OAuthService authService){
- this.authService = authService;
- }
-
- @Override
- public OAuthToken retrieveAuthenticationToken(String clientId, String clientSecret, String... scope) {
- return authService.authenticate(clientId, clientSecret, scope).orElseThrow();
- }
-
- @Override
- public ValidationResult validateCertificateChain(byte[] chain) {
- throw new UnsupportedOperationException("Not yet implemented");
- }
-
- @Override
- public Data encryptData(Data unencryptedData) {
- throw new UnsupportedOperationException("Not yet implemented");
- }
-
- @Override
- public ByteArrayInputStream encryptAttachment(ByteArrayInputStream unencryptedAttachmentBinary) {
- throw new UnsupportedOperationException("Not yet implemented");
- }
-
- @Override
- public Metadata generateMetadata(byte[] attachment) {
- throw new UnsupportedOperationException("Not yet implemented");
- }
-}
diff --git a/client/src/main/java/fitconnect/client/FitCoAuthService.java b/client/src/main/java/fitconnect/client/impl/auth/FitCoAuthService.java
similarity index 98%
rename from client/src/main/java/fitconnect/client/FitCoAuthService.java
rename to client/src/main/java/fitconnect/client/impl/auth/FitCoAuthService.java
index 3e6167041..a5433f0d2 100644
--- a/client/src/main/java/fitconnect/client/FitCoAuthService.java
+++ b/client/src/main/java/fitconnect/client/impl/auth/FitCoAuthService.java
@@ -1,4 +1,4 @@
-package fitconnect.client;
+package fitconnect.client.impl.auth;
import com.fasterxml.jackson.databind.ObjectMapper;
import fitconnect.api.auth.OAuthService;
diff --git a/client/src/test/java/fitconnect/client/OAuthTokenIntegrationTest.java b/client/src/test/java/fitconnect/client/auth/OAuthTokenIntegrationTest.java
similarity index 82%
rename from client/src/test/java/fitconnect/client/OAuthTokenIntegrationTest.java
rename to client/src/test/java/fitconnect/client/auth/OAuthTokenIntegrationTest.java
index 2be2d7aac..30f2f3ca5 100644
--- a/client/src/test/java/fitconnect/client/OAuthTokenIntegrationTest.java
+++ b/client/src/test/java/fitconnect/client/auth/OAuthTokenIntegrationTest.java
@@ -1,6 +1,8 @@
-package fitconnect.client;
+package fitconnect.client.auth;
import fitconnect.api.auth.OAuthToken;
+import fitconnect.client.impl.auth.FitCoAuthService;
+import fitconnect.client.impl.SubmissionSender;
import org.junit.jupiter.api.Test;
import java.net.http.HttpClient;
@@ -20,7 +22,7 @@ class OAuthTokenIntegrationTest {
var httpClient = HttpClient.newHttpClient();
var authService = new FitCoAuthService(httpClient, tokenUrl);
- var sender = new SubmissionSender(authService);
+ var sender = new SubmissionSender(authService, null);
// When
OAuthToken token = sender.retrieveAuthenticationToken(clientId, secret, scope);
--
GitLab