Skip to content
Snippets Groups Projects
Commit 8e889c00 authored by Martin Vogel's avatar Martin Vogel
Browse files

#414 Add log message, finalize param

parent 59d951a7
No related branches found
No related tags found
2 merge requests!2#414 Remaining changes from MR,!1planning#414 Methoden Signaturen (Zwischenstand)
package de.fitko.fitconnect.api.services.metadata; 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.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.attachment.Attachment;
import de.fitko.fitconnect.api.domain.model.metadata.data.Data;
import de.fitko.fitconnect.api.domain.model.submission.Submission; import de.fitko.fitconnect.api.domain.model.submission.Submission;
import java.util.List; import java.util.List;
...@@ -18,7 +17,8 @@ import java.util.List; ...@@ -18,7 +17,8 @@ import java.util.List;
public interface MetadataService { 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 data the actual data payload (json or xml)
* @param attachments list of 0..n attachments as binary data * @param attachments list of 0..n attachments as binary data
......
...@@ -23,11 +23,11 @@ public class ProxyConfig { ...@@ -23,11 +23,11 @@ public class ProxyConfig {
public RestTemplate proxyRestTemplate() { public RestTemplate proxyRestTemplate() {
if (!hasProxySet()) { if (!hasProxySet()) {
logger.info("Using no proxy"); logger.info("no proxy configured");
return new RestTemplate(); return new RestTemplate();
} }
logger.info("Using proxy {}", this); logger.info("using proxy {}", this);
var requestFactory = new SimpleClientHttpRequestFactory(); var requestFactory = new SimpleClientHttpRequestFactory();
var proxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress(host, port)); var proxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress(host, port));
requestFactory.setProxy(proxy); requestFactory.setProxy(proxy);
......
...@@ -5,7 +5,7 @@ import org.springframework.web.client.RestTemplate; ...@@ -5,7 +5,7 @@ import org.springframework.web.client.RestTemplate;
public class ProxyRestTemplate extends RestTemplate { public class ProxyRestTemplate extends RestTemplate {
public ProxyRestTemplate(ClientHttpRequestFactory requestFactory) { public ProxyRestTemplate(final ClientHttpRequestFactory requestFactory) {
super(requestFactory); super(requestFactory);
this.getMessageConverters().add(new X509CRLHttpMessageConverter()); this.getMessageConverters().add(new X509CRLHttpMessageConverter());
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment