refactor: get keys from string path or from jwk config (planning#1902)

client/src/main/java/dev/fitko/fitconnect/client/bootstrap/ClientFactory.java

@@ -109,25 +109,8 @@ public final class ClientFactory {
         LOGGER.info("Initializing subscriber client ...");
         final SubscriberConfig subscriberConfig = config.getSubscriberConfig();
 
-        final RSAKey rsaDecryptionKey;
-        final RSAKey rsaSigningKey;
-
-        if (subscriberConfig.getSubscriberKeys() != null) {
-
-            rsaDecryptionKey = subscriberConfig.getSubscriberKeys().getPrivateDecryptionKeys().get(0).toRSAKey();
-            rsaSigningKey = subscriberConfig.getSubscriberKeys().getPrivateSigningKey().toRSAKey();
-
-        } else {
-            final String decryptionKeyPath = getPrivateDecryptionKeyPathFromSubscriber(subscriberConfig);
-            LOGGER.info("Reading private decryption key from {}", decryptionKeyPath);
-            final String decryptionKey = RessourceLoadingUtils.readKeyFromPath(decryptionKeyPath);
-            rsaDecryptionKey = parseRSAKeyFromString(decryptionKey);
-
-            LOGGER.info("Reading private signing key from {} ", config.getSubscriberConfig().getPrivateSigningKeyPath());
-            final String signingKey = RessourceLoadingUtils.readKeyFromPath(config.getSubscriberConfig().getPrivateSigningKeyPath());
-            rsaSigningKey = parseRSAKeyFromString(signingKey);
-        }
-
+        final RSAKey rsaDecryptionKey = getDecryptionKeyFromConfig(subscriberConfig);
+        final RSAKey rsaSigningKey = getSignatureKeyFromConfig(subscriberConfig);
 
         final FitConnectService fitConnectService = createFitConnectService(config, subscriberConfig.getClientId(), subscriberConfig.getClientSecret(), rsaSigningKey);
         final ValidDataGuard dataGuard = new ValidDataGuard(fitConnectService);
@@ -232,4 +215,22 @@ public final class ClientFactory {
         }
         return subscriberConfig.getPrivateDecryptionKeyPaths().get(0);
     }
+
+    private static RSAKey getSignatureKeyFromConfig(SubscriberConfig config) {
+        LOGGER.info("Initialising private signature key");
+        if (config.getSubscriberKeys() != null) {
+            return config.getSubscriberKeys().getPrivateSigningKey().toRSAKey();
+        }
+        return parseRSAKeyFromString(RessourceLoadingUtils.readKeyFromPath(config.getPrivateSigningKeyPath()));
+    }
+
+    private static RSAKey getDecryptionKeyFromConfig(SubscriberConfig config) {
+        LOGGER.info("Initialising private decryption key");
+        if (config.getSubscriberKeys() != null) {
+            return config.getSubscriberKeys().getPrivateDecryptionKeys().get(0).toRSAKey();
+        }
+        final String decryptionKeyPath = getPrivateDecryptionKeyPathFromSubscriber(config);
+        final String decryptionKey = RessourceLoadingUtils.readKeyFromPath(decryptionKeyPath);
+        return parseRSAKeyFromString(decryptionKey);
+    }
 }