From d8c668bbca31a835c387a3d52293c9938c424f58 Mon Sep 17 00:00:00 2001 From: Christof Rabensteiner Date: Tue, 9 Jul 2019 10:32:54 +0200 Subject: Refactor MsgResponse and its IDs StoreSOAPBodyBinaryInRepositoryInterceptor: - Replace "generate body's id via concatenation" with "give the right generator function the app delivery id and let the generator function do the work". Reason: Prevent the logistics of deriving IDs to spill into unrelated components. MsgResponse refactor: - Make MsgResponse an abstract class. - Derive ResponseID's ONLY in MsgResponse::createResponseID. Others: - Ensure that all invocations to DeliveryRepository.getResponse and BinaryRepository.get use "responseID" instead of ambiguous "id" or incorrect "appDeliveryID". - Move SingleThreadedDeliveryPipeline into process package. --- .../java/at/gv/egiz/moazs/scheme/RequestStatusResponse.java | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'src/main/java/at/gv/egiz/moazs/scheme/RequestStatusResponse.java') diff --git a/src/main/java/at/gv/egiz/moazs/scheme/RequestStatusResponse.java b/src/main/java/at/gv/egiz/moazs/scheme/RequestStatusResponse.java index 89c8be3..0705698 100644 --- a/src/main/java/at/gv/egiz/moazs/scheme/RequestStatusResponse.java +++ b/src/main/java/at/gv/egiz/moazs/scheme/RequestStatusResponse.java @@ -10,28 +10,22 @@ import static at.gv.zustellung.msg.xsd.DeliveryRequestStatusType.Error.errorBuil import static at.gv.zustellung.msg.xsd.DeliveryRequestStatusType.deliveryRequestStatusTypeBuilder; import static at.gv.zustellung.msg.xsd.ErrorInfoType.errorInfoTypeBuilder; -public class RequestStatusResponse implements MsgResponse { +public class RequestStatusResponse extends MsgResponse { private final DeliveryRequestStatusType status; private final DeliveryAnswerType answer; - private final String responseID; private static final String ID_SUFFIX = ".RS"; public RequestStatusResponse(DeliveryRequestStatusType status) { this.status = status; this.answer = coalesce(status.getSuccess(), status.getPartialSuccess(), status.getError()).get(); - this.responseID = getResponseID(answer.getAppDeliveryID()); + super.id = createResponseId(answer.getAppDeliveryID(), ID_SUFFIX); } public static String getResponseID(String appDeliveryID) { return appDeliveryID + ID_SUFFIX; } - @Override - public String getResponseID() { - return this.responseID; - } - @Override public DeliveryRequestStatusType getResponse() { return status; @@ -81,7 +75,4 @@ public class RequestStatusResponse implements MsgResponse