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

refactor: remove unnecessary usage of optional fields for reply metadata (planning#1989))

parent ad84ab11
No related branches found
No related tags found
No related merge requests found
package dev.fitko.fitconnect.api.domain.subscriber; package dev.fitko.fitconnect.api.domain.subscriber;
import dev.fitko.fitconnect.api.domain.model.attachment.Attachment; import dev.fitko.fitconnect.api.domain.model.attachment.Attachment;
import dev.fitko.fitconnect.api.domain.model.callback.Callback;
import dev.fitko.fitconnect.api.domain.model.metadata.AdditionalReferenceInfo;
import dev.fitko.fitconnect.api.domain.model.metadata.AuthenticationInformation;
import dev.fitko.fitconnect.api.domain.model.metadata.data.MimeType; import dev.fitko.fitconnect.api.domain.model.metadata.data.MimeType;
import dev.fitko.fitconnect.api.domain.model.metadata.data.SubmissionSchema; import dev.fitko.fitconnect.api.domain.model.metadata.data.SubmissionSchema;
import dev.fitko.fitconnect.api.domain.model.metadata.payment.PaymentInformation;
import dev.fitko.fitconnect.api.domain.model.reply.replychannel.ReplyChannel; import dev.fitko.fitconnect.api.domain.model.reply.replychannel.ReplyChannel;
import dev.fitko.fitconnect.api.domain.subscriber.steps.BuildReplyStep; import dev.fitko.fitconnect.api.domain.subscriber.steps.BuildReplyStep;
import dev.fitko.fitconnect.api.domain.subscriber.steps.OptionalReplyPropertiesStep; import dev.fitko.fitconnect.api.domain.subscriber.steps.OptionalReplyPropertiesStep;
...@@ -30,11 +26,7 @@ public final class SendableReply { ...@@ -30,11 +26,7 @@ public final class SendableReply {
private final List<Attachment> attachments; private final List<Attachment> attachments;
private final String serviceName; private final String serviceName;
private final String serviceIdentifier; private final String serviceIdentifier;
private final List<AuthenticationInformation> authenticationInformation;
private final AdditionalReferenceInfo additionalReferenceInfo;
private final PaymentInformation paymentInformation;
private final ReplyChannel replyChannel; private final ReplyChannel replyChannel;
private final Callback callback;
private SendableReply(final SendableReply.Builder builder) { private SendableReply(final SendableReply.Builder builder) {
destinationId = builder.getDestinationId(); destinationId = builder.getDestinationId();
...@@ -45,11 +37,7 @@ public final class SendableReply { ...@@ -45,11 +37,7 @@ public final class SendableReply {
attachments = Collections.unmodifiableList(builder.getAttachments()); attachments = Collections.unmodifiableList(builder.getAttachments());
serviceName = builder.getServiceName(); serviceName = builder.getServiceName();
serviceIdentifier = builder.getServiceIdentifier(); serviceIdentifier = builder.getServiceIdentifier();
authenticationInformation = builder.getAuthenticationInformation();
additionalReferenceInfo = builder.getAdditionalReferenceInfo();
replyChannel = builder.getReplyChannel(); replyChannel = builder.getReplyChannel();
paymentInformation = builder.getPaymentInformation();
callback = builder.getCallback();
} }
public static ReplyDataStep from(final ReceivedSubmission receivedSubmission) { public static ReplyDataStep from(final ReceivedSubmission receivedSubmission) {
...@@ -67,12 +55,8 @@ public final class SendableReply { ...@@ -67,12 +55,8 @@ public final class SendableReply {
private MimeType dataMimeType; private MimeType dataMimeType;
private final String serviceName; private final String serviceName;
private final String serviceIdentifier; private final String serviceIdentifier;
private final List<AuthenticationInformation> authenticationInformation;
private final PaymentInformation paymentInformation;
private final ReplyChannel replyChannel; private final ReplyChannel replyChannel;
private final AdditionalReferenceInfo additionalReferenceInfo;
private URI schemaUri; private URI schemaUri;
private final Callback callback;
private Builder(final ReceivedSubmission receivedSubmission) { private Builder(final ReceivedSubmission receivedSubmission) {
caseId = receivedSubmission.getCaseId(); caseId = receivedSubmission.getCaseId();
...@@ -80,11 +64,7 @@ public final class SendableReply { ...@@ -80,11 +64,7 @@ public final class SendableReply {
destinationId = receivedSubmission.getDestinationId(); destinationId = receivedSubmission.getDestinationId();
serviceIdentifier = receivedSubmission.getServiceType().getIdentifier(); serviceIdentifier = receivedSubmission.getServiceType().getIdentifier();
serviceName = receivedSubmission.getServiceType().getName(); serviceName = receivedSubmission.getServiceType().getName();
callback = receivedSubmission.getCallback();
replyChannel = receivedSubmission.getMetadata().getReplyChannel(); replyChannel = receivedSubmission.getMetadata().getReplyChannel();
authenticationInformation = receivedSubmission.getMetadata().getAuthenticationInformation();
paymentInformation = receivedSubmission.getMetadata().getPaymentInformation();
additionalReferenceInfo = receivedSubmission.getMetadata().getAdditionalReferenceInfo();
} }
public OptionalReplyPropertiesStep setJsonData(final String replyData, final URI replyDataSchemaUri) { public OptionalReplyPropertiesStep setJsonData(final String replyData, final URI replyDataSchemaUri) {
......
...@@ -100,10 +100,6 @@ public class ReplySender { ...@@ -100,10 +100,6 @@ public class ReplySender {
final var metadata = new Metadata(); final var metadata = new Metadata();
metadata.setSchema(config.getMetadataSchemaWriteVersion().toString()); metadata.setSchema(config.getMetadataSchemaWriteVersion().toString());
metadata.setContentStructure(contentStructure); metadata.setContentStructure(contentStructure);
metadata.setReplyChannel(sendableReply.getReplyChannel());
metadata.setPaymentInformation(sendableReply.getPaymentInformation());
metadata.setAuthenticationInformation(sendableReply.getAuthenticationInformation());
metadata.setAdditionalReferenceInfo(sendableReply.getAdditionalReferenceInfo());
return metadata; return metadata;
} }
......
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