From 8e889c00b29152f6e8894fce7612ff2b34134a6d Mon Sep 17 00:00:00 2001
From: Martin Vogel <martin.vogel@sinc.de>
Date: Thu, 16 Jun 2022 10:25:18 +0200
Subject: [PATCH] #414 Add log message, finalize param
---
.../fitconnect/api/services/metadata/MetadataService.java | 6 +++---
.../java/de/fitko/fitconnect/impl/http/ProxyConfig.java | 4 ++--
.../de/fitko/fitconnect/impl/http/ProxyRestTemplate.java | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/api/src/main/java/de/fitko/fitconnect/api/services/metadata/MetadataService.java b/api/src/main/java/de/fitko/fitconnect/api/services/metadata/MetadataService.java
index fc9440f07..a27af31d8 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/services/metadata/MetadataService.java
+++ b/api/src/main/java/de/fitko/fitconnect/api/services/metadata/MetadataService.java
@@ -1,9 +1,8 @@
package de.fitko.fitconnect.api.services.metadata;
-import com.nimbusds.jose.jwk.RSAKey;
import de.fitko.fitconnect.api.domain.model.metadata.Metadata;
-import de.fitko.fitconnect.api.domain.model.metadata.data.Data;
import de.fitko.fitconnect.api.domain.model.metadata.attachment.Attachment;
+import de.fitko.fitconnect.api.domain.model.metadata.data.Data;
import de.fitko.fitconnect.api.domain.model.submission.Submission;
import java.util.List;
@@ -18,7 +17,8 @@ import java.util.List;
public interface MetadataService {
/**
- * Generates valid metadata for a submission including its JWE-encrypted data and attachments.
+ * Generates valid metadata for a submission including its JWE-encrypted data and attachments
+ * and uploads it to the Fit-Connect API
*
* @param data the actual data payload (json or xml)
* @param attachments list of 0..n attachments as binary data
diff --git a/impl/src/main/java/de/fitko/fitconnect/impl/http/ProxyConfig.java b/impl/src/main/java/de/fitko/fitconnect/impl/http/ProxyConfig.java
index b39c1f97d..8453fa02c 100644
--- a/impl/src/main/java/de/fitko/fitconnect/impl/http/ProxyConfig.java
+++ b/impl/src/main/java/de/fitko/fitconnect/impl/http/ProxyConfig.java
@@ -23,11 +23,11 @@ public class ProxyConfig {
public RestTemplate proxyRestTemplate() {
if (!hasProxySet()) {
- logger.info("Using no proxy");
+ logger.info("no proxy configured");
return new RestTemplate();
}
- logger.info("Using proxy {}", this);
+ logger.info("using proxy {}", this);
var requestFactory = new SimpleClientHttpRequestFactory();
var proxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress(host, port));
requestFactory.setProxy(proxy);
diff --git a/impl/src/main/java/de/fitko/fitconnect/impl/http/ProxyRestTemplate.java b/impl/src/main/java/de/fitko/fitconnect/impl/http/ProxyRestTemplate.java
index 68ab56b21..63abd231c 100644
--- a/impl/src/main/java/de/fitko/fitconnect/impl/http/ProxyRestTemplate.java
+++ b/impl/src/main/java/de/fitko/fitconnect/impl/http/ProxyRestTemplate.java
@@ -5,7 +5,7 @@ import org.springframework.web.client.RestTemplate;
public class ProxyRestTemplate extends RestTemplate {
- public ProxyRestTemplate(ClientHttpRequestFactory requestFactory) {
+ public ProxyRestTemplate(final ClientHttpRequestFactory requestFactory) {
super(requestFactory);
this.getMessageConverters().add(new X509CRLHttpMessageConverter());
}
--
GitLab