#414 Load custom logger via SPI

api/src/main/java/fitconnect/api/domain/metadata/Metadata.java

@@ -4,6 +4,7 @@ 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 lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -21,6 +22,7 @@ import java.util.Map;
 })
 @Getter
 @Setter
+@Builder
 public class Metadata {
     @JsonProperty("contentStructure")
     ContentStructure contentStructure;

api/src/main/java/fitconnect/api/domain/metadata/data/Data.java

@@ -4,6 +4,7 @@ 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 lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -20,6 +21,7 @@ import java.util.Map;
 })
 @Getter
 @Setter
+@Builder
 public class Data {
 
     @JsonProperty("signature")

api/src/main/java/fitconnect/api/domain/submission/Callback.java

+package fitconnect.api.domain.submission;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.Value;
+
+import java.net.URI;
+
+@Getter
+@Setter
+@Value
+public class Callback {
+
+    @JsonProperty("uri")
+    URI uri;
+
+    @JsonProperty("secret")
+    String secret;
+}

api/src/main/java/fitconnect/api/domain/submission/ServiceType.java

+package fitconnect.api.domain.submission;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.Value;
+
+@Getter
+@Setter
+@Value
+public class ServiceType {
+
+    @JsonProperty("name")
+    String name;
+
+    @JsonProperty("description")
+    String description;
+
+    @JsonProperty("identifier")
+    String identifier;
+}

api/src/main/java/fitconnect/api/domain/submission/Submission.java

 package fitconnect.api.domain.submission;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
+import lombok.Value;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
 
 @Getter
 @Setter
+@Value
+@Builder
 public class Submission {
+
+    @JsonProperty("destinationId")
+    UUID destinationId;
+
+    @JsonProperty("destinationId")
+    Optional<UUID> caseId;
+
+    @JsonProperty("announcedAttachments")
+    List<UUID> announcedAttachments;
+
+    @JsonProperty("serviceType")
+    ServiceType serviceType;
+
+    @JsonProperty("callback")
+    Callback callback;
+
 }

api/src/main/java/fitconnect/api/logger/LoggingProvider.java

+package fitconnect.api.logger;
+
+import java.util.logging.Logger;
+
+/**
+ * Provider that allows to register a custom {@link Logger} implementation.
+ *
+ */
+public interface LoggingProvider {
+
+    /**
+     * Creates a new custom {@link Logger}.
+     *
+     * @param name custom name for the logger
+     * @return Implementation of a {@link Logger}
+     */
+    Logger createLogger(final String name);
+}

client/src/main/java/de/fitconnect/client/FitConnectClient.java

@@ -6,7 +6,7 @@ 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.logger.SdkLogger;
+import fitconnect.impl.logger.SdkLogger;
 
 import java.util.List;
 import java.util.Optional;
@@ -15,7 +15,7 @@ import java.util.logging.Logger;
 
 public class FitConnectClient {
 
-    private static final Logger logger = SdkLogger.defaultLogger(FitConnectClient.class);
+    private static final Logger logger = SdkLogger.customLogger(FitConnectClient.class);
 
     private final Sender sender;
     private Optional<OAuthToken> token = Optional.empty();

client/src/main/java/de/fitconnect/client/TestRunner.java

 package de.fitconnect.client;
 
+import fitconnect.api.domain.metadata.Metadata;
+import fitconnect.api.domain.metadata.data.Data;
 import fitconnect.api.domain.submission.Submission;
 
 import java.util.Collections;
@@ -14,11 +16,10 @@ public class TestRunner {
         FitConnectClient client = new FitConnectClient();
 
         // sample high -level- api calls to send a submission
-        client
+        client.authenticate(clientId,secret)
                 .printToken()
-                .authenticate(clientId,secret)
-                .createSubmission(new Submission())
+                .createSubmission(Submission.builder().build())
                 .uploadAttachments(Collections.emptyList())
-                .sendSubmission(null, null);
+                .sendSubmission(Metadata.builder().build(), Data.builder().build());
     }
 }

impl/src/main/java/fitconnect/impl/SubmissionSender.java

@@ -10,7 +10,7 @@ import fitconnect.api.domain.metadata.attachment.Attachment;
 import fitconnect.api.domain.metadata.data.Data;
 import fitconnect.api.exceptions.AuthenticationException;
 import fitconnect.api.exceptions.EncryptionException;
-import fitconnect.api.logger.SdkLogger;
+import fitconnect.impl.logger.SdkLogger;
 import fitconnect.api.validation.CertificateValidator;
 import fitconnect.api.validation.ValidationResult;
 import fitconnect.impl.auth.FitCoAuthService;

impl/src/main/java/fitconnect/impl/SubmissionSubscriber.java

@@ -10,7 +10,7 @@ import fitconnect.api.domain.metadata.attachment.Attachment;
 import fitconnect.api.domain.metadata.data.Data;
 import fitconnect.api.exceptions.AuthenticationException;
 import fitconnect.api.exceptions.DecryptionException;
-import fitconnect.api.logger.SdkLogger;
+import fitconnect.impl.logger.SdkLogger;
 import fitconnect.api.validation.MetadataValidator;
 import fitconnect.api.validation.ValidationResult;
 import fitconnect.impl.auth.FitCoAuthService;

impl/src/main/java/fitconnect/impl/auth/FitCoAuthService.java

@@ -4,7 +4,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import fitconnect.api.auth.OAuthService;
 import fitconnect.api.auth.OAuthToken;
 import fitconnect.api.exceptions.AuthenticationException;
-import fitconnect.api.logger.SdkLogger;
+import fitconnect.impl.logger.SdkLogger;
 
 import java.io.IOException;
 import java.net.URI;

impl/src/main/java/fitconnect/impl/logger/DefaultLoggingProvider.java

+package fitconnect.impl.logger;
+
+import fitconnect.api.logger.LoggingProvider;
+
+import java.util.logging.Logger;
+
+public class DefaultLoggingProvider implements LoggingProvider {
+
+    @Override
+    public Logger createLogger(final String name) {
+        return Logger.getLogger(name);
+    }
+}

api/src/main/java/fitconnect/api/logger/SdkLogger.java → impl/src/main/java/fitconnect/impl/logger/SdkLogger.java

-package fitconnect.api.logger;
+package fitconnect.impl.logger;
 
 
+import fitconnect.api.logger.LoggingProvider;
+
+import java.util.ServiceLoader;
 import java.util.logging.Logger;
 
 public final class SdkLogger {
 
-    // TODO make custom logging module injectable / load via SPI
-
     public static Logger defaultLogger(final Class clazz) {
         return Logger.getLogger(clazz.getName());
     }
+
+    // TODO find a better solution than this ;)
+    public static Logger customLogger(final Class clazz) {
+        var serviceLoader = ServiceLoader.load(LoggingProvider.class);
+        final LoggingProvider loggingProvider = serviceLoader.iterator().next();
+        return loggingProvider.createLogger(clazz.getName());
+    }
+
 }

impl/src/main/resources/META-INF/services/fitconnect.api.logger.LoggingProvider

+fitconnect.impl.logger.DefaultLoggingProvider
\ No newline at end of file

impl/src/test/java/fitconnect/impl/auth/OAuthTokenIntegrationTest.java

@@ -31,8 +31,8 @@ class OAuthTokenIntegrationTest {
         // Then
 
         assertTrue(token.isPresent());
-        assertNull(token.get().error());
-        assertNotNull(token.get().access_token());
-        assertEquals(1800, token.get().expires_in());
+        assertNull(token.get().getError());
+        assertNotNull(token.get().getAccessToken());
+        assertEquals(1800, token.get().getExpiresIn());
     }
 }
\ No newline at end of file