client/pom.xml

@@ -83,6 +83,19 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
+                <configuration>
+                    <filters>
+                        <filter>
+                            <artifact>*:*</artifact>
+                            <excludes>
+                                <exclude>META-INF/*.SF</exclude>
+                                <exclude>META-INF/*.DSA</exclude>
+                                <exclude>META-INF/*.RSA</exclude>
+                            </excludes>
+                        </filter>
+                    </filters>
+                    <!-- Additional configuration. -->
+                </configuration>
                 <executions>
                     <execution>
                         <phase>package</phase>

client/src/main/java/de/fitko/fitconnect/client/cmd/CommandLineClient.java

@@ -50,7 +50,6 @@ public class CommandLineClient {
     public void run(final String... args) throws IOException {
         final var parsedCommand = parseCommandFromArguments(args);
         if (parsedCommand == null) {
-            jc.usage();
             return;
         }
         executeCommand(parsedCommand);
@@ -76,7 +75,7 @@ public class CommandLineClient {
                 listOneSubmission(listOneSubmissionCommand);
                 break;
             default:
-                jc.usage();
+                break;
         }
     }
 

client/src/main/java/de/fitko/fitconnect/client/factory/ClientFactory.java

@@ -29,7 +29,10 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.client.RestTemplate;
 
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.stream.Collectors;
@@ -104,7 +107,6 @@ public final class ClientFactory {
         LOGGER.info("Reading metadata schema from {} ", config.getMetadataSchemaPath());
         final String metadataSchema = readPath(config.getMetadataSchemaPath());
 
-        // TODO read SET-Event Token schema
         return SubscriberClient.builder(subscriber, privateKey, metadataSchema);
     }
 
@@ -112,10 +114,9 @@ public final class ClientFactory {
         final CryptoService cryptoService = getCryptoService();
         final ValidationService validator = getValidatorService(config);
         final RestTemplate restTemplate = getRestTemplate(config);
-
         final OAuthService authService = getSubscriberConfiguredAuthService(config, restTemplate);
-        final EventLogService eventLogService = getEventLogService(config,restTemplate, authService);
-        final SubmissionService submissionService = getSubmissionService(config,restTemplate, authService);
+        final EventLogService eventLogService = getEventLogService(config, restTemplate, authService);
+        final SubmissionService submissionService = getSubmissionService(config, restTemplate, authService);
         final SecurityEventService setService = getSecurityEventTokenService(config);
         return new SubmissionSubscriber(submissionService, eventLogService, cryptoService, validator, setService);
     }
@@ -125,9 +126,9 @@ public final class ClientFactory {
         final RestTemplate restTemplate = getRestTemplate(config);
         final ValidationService validator = getValidatorService(config);
         final OAuthService authService = getSenderConfiguredAuthService(config, restTemplate);
-        final EventLogService eventLogService = getEventLogService(config,restTemplate, authService);
-        final SubmissionService submissionService = getSubmissionService(config,restTemplate, authService);
-        final DestinationService destinationService = getDestinationApiService(config,restTemplate, authService);
+        final EventLogService eventLogService = getEventLogService(config, restTemplate, authService);
+        final SubmissionService submissionService = getSubmissionService(config, restTemplate, authService);
+        final DestinationService destinationService = getDestinationApiService(config, restTemplate, authService);
         final SecurityEventService setService = getSecurityEventTokenService(config);
         return new SubmissionSender(destinationService, submissionService, eventLogService, cryptoService, validator, setService);
     }

client/src/test/resources/test-config.yml

@@ -12,12 +12,10 @@ privateSigningKeyPath: "client/src/test/java/resources/private_test_signing_key.
 # Path that references the metadata schema
 metadataSchemaPath: "client/src/test/java/resources/metadata_schema.json"
 
-# Sender Config
 senderConfig:
   clientId: "1"
   clientSecret: "123"
   
-# Subscriber Config
 subscriberConfig:
   clientId: "2"
   clientSecret: "456"

config.yml

@@ -12,13 +12,11 @@ metadataSchemaPath: "path/to/metadata_schema.json"
 # Path that references the signing key file
 privateSigningKeyPath: "path/to/singning_key.json"
 
-# Sender Config
-sender:
+senderConfig:
   clientId: "SenderClientID"
   clientSecret: "SenderSecret"
 
-# Subscriber Config
-subscriber:
+subscriberConfig:
   clientId: "SubscriberClientID"
   clientSecret: "SubscriberSecret"