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

#414 Add MetadataService impl stub and bind via guice

parent 6b48bae8
No related branches found
No related tags found
2 merge requests!2#414 Remaining changes from MR,!1planning#414 Methoden Signaturen (Zwischenstand)
...@@ -22,8 +22,7 @@ public interface MetadataService { ...@@ -22,8 +22,7 @@ public interface MetadataService {
* *
* @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
* @param publicKey the publicKey the data and attachments are encrypted with
* @return Metadata with hashes of the data and attachments to send * @return Metadata with hashes of the data and attachments to send
*/ */
Metadata createMetadata(final Data data, final List<Attachment> attachments, final RSAKey publicKey); Metadata createMetadata(final Data data, final List<Attachment> attachments);
} }
...@@ -9,6 +9,7 @@ import de.fitko.fitconnect.api.services.Sender; ...@@ -9,6 +9,7 @@ import de.fitko.fitconnect.api.services.Sender;
import de.fitko.fitconnect.api.services.Subscriber; import de.fitko.fitconnect.api.services.Subscriber;
import de.fitko.fitconnect.api.services.auth.OAuthService; import de.fitko.fitconnect.api.services.auth.OAuthService;
import de.fitko.fitconnect.api.services.crypto.CryptoService; import de.fitko.fitconnect.api.services.crypto.CryptoService;
import de.fitko.fitconnect.api.services.metadata.MetadataService;
import de.fitko.fitconnect.api.services.validation.CertificateValidator; import de.fitko.fitconnect.api.services.validation.CertificateValidator;
import de.fitko.fitconnect.api.services.validation.MetadataValidator; import de.fitko.fitconnect.api.services.validation.MetadataValidator;
import de.fitko.fitconnect.impl.SubmissionSender; import de.fitko.fitconnect.impl.SubmissionSender;
...@@ -16,6 +17,7 @@ import de.fitko.fitconnect.impl.SubmissionSubscriber; ...@@ -16,6 +17,7 @@ import de.fitko.fitconnect.impl.SubmissionSubscriber;
import de.fitko.fitconnect.impl.auth.DefaultOAuthService; import de.fitko.fitconnect.impl.auth.DefaultOAuthService;
import de.fitko.fitconnect.impl.crypto.JWECryptoService; import de.fitko.fitconnect.impl.crypto.JWECryptoService;
import de.fitko.fitconnect.impl.http.ProxyConfig; import de.fitko.fitconnect.impl.http.ProxyConfig;
import de.fitko.fitconnect.impl.metadata.MetadataGenerationService;
import de.fitko.fitconnect.impl.validation.KeyValidator; import de.fitko.fitconnect.impl.validation.KeyValidator;
import de.fitko.fitconnect.impl.validation.MetadataSubmissionValidator; import de.fitko.fitconnect.impl.validation.MetadataSubmissionValidator;
import org.slf4j.Logger; import org.slf4j.Logger;
...@@ -40,6 +42,7 @@ public class SdkModule extends AbstractModule { ...@@ -40,6 +42,7 @@ public class SdkModule extends AbstractModule {
bind(CryptoService.class).to(JWECryptoService.class); bind(CryptoService.class).to(JWECryptoService.class);
bind(CertificateValidator.class).to(KeyValidator.class); bind(CertificateValidator.class).to(KeyValidator.class);
bind(MetadataValidator.class).to(MetadataSubmissionValidator.class); bind(MetadataValidator.class).to(MetadataSubmissionValidator.class);
bind(MetadataService.class).to(MetadataGenerationService.class);
bind(Sender.class).to(SubmissionSender.class); bind(Sender.class).to(SubmissionSender.class);
bind(Subscriber.class).to(SubmissionSubscriber.class); bind(Subscriber.class).to(SubmissionSubscriber.class);
......
...@@ -12,6 +12,7 @@ import de.fitko.fitconnect.api.exceptions.AuthenticationException; ...@@ -12,6 +12,7 @@ import de.fitko.fitconnect.api.exceptions.AuthenticationException;
import de.fitko.fitconnect.api.services.Sender; import de.fitko.fitconnect.api.services.Sender;
import de.fitko.fitconnect.api.services.auth.OAuthService; import de.fitko.fitconnect.api.services.auth.OAuthService;
import de.fitko.fitconnect.api.services.crypto.CryptoService; import de.fitko.fitconnect.api.services.crypto.CryptoService;
import de.fitko.fitconnect.api.services.metadata.MetadataService;
import de.fitko.fitconnect.api.services.validation.CertificateValidator; import de.fitko.fitconnect.api.services.validation.CertificateValidator;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
...@@ -26,14 +27,17 @@ public class SubmissionSender implements Sender { ...@@ -26,14 +27,17 @@ public class SubmissionSender implements Sender {
private final OAuthService authService; private final OAuthService authService;
private final CertificateValidator certificateValidator; private final CertificateValidator certificateValidator;
private final CryptoService cryptoService; private final CryptoService cryptoService;
private final MetadataService metadataService;
@Inject @Inject
public SubmissionSender(final OAuthService authService, public SubmissionSender(final OAuthService authService,
final CryptoService encryptionService, final CryptoService encryptionService,
final CertificateValidator certificateValidator) { final CertificateValidator certificateValidator,
final MetadataService metadataService) {
this.authService = authService; this.authService = authService;
this.cryptoService = encryptionService; this.cryptoService = encryptionService;
this.certificateValidator = certificateValidator; this.certificateValidator = certificateValidator;
this.metadataService = metadataService;
} }
......
package de.fitko.fitconnect.impl.metadata;
import de.fitko.fitconnect.api.domain.model.metadata.Metadata;
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.services.metadata.MetadataService;
import java.util.List;
public class MetadataGenerationService implements MetadataService {
@Override
public Metadata createMetadata(Data data, List<Attachment> attachments) {
throw new UnsupportedOperationException("not yet implemented");
}
}
...@@ -23,7 +23,7 @@ class OAuthTokenIntegrationTest { ...@@ -23,7 +23,7 @@ class OAuthTokenIntegrationTest {
var scope = "send:region:DE"; var scope = "send:region:DE";
var authService = new DefaultOAuthService( new RestTemplate(), tokenUrl); var authService = new DefaultOAuthService( new RestTemplate(), tokenUrl);
final Sender sender = new SubmissionSender(authService, null, null); final Sender sender = new SubmissionSender(authService, null, null, null);
// When // When
Optional<OAuthToken> token = sender.retrieveOAuthToken(clientId, secret, scope); Optional<OAuthToken> token = sender.retrieveOAuthToken(clientId, secret, scope);
......
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