From 8e36fa01ea42d282eacdc78d6749daf9ae1ede9c Mon Sep 17 00:00:00 2001 From: Christof Rabensteiner Date: Tue, 9 Jul 2019 11:13:35 +0200 Subject: Refactor: Merge BinaryRepository into DeliveryRepository - Reason: Components, which rely on one of those, usually also rely on the other, so merging them reduces amount of dependencies. - Frame operations in DeliveryRepository API as "store" and "retrieve" operations. - Rename: Convert *Id in local variable names to upper case. --- .../java/at/gv/egiz/moazs/verify/MsgResponseVerifier.java | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'src/main/java/at/gv/egiz/moazs/verify/MsgResponseVerifier.java') diff --git a/src/main/java/at/gv/egiz/moazs/verify/MsgResponseVerifier.java b/src/main/java/at/gv/egiz/moazs/verify/MsgResponseVerifier.java index 6b4ef7a..9c8b17c 100644 --- a/src/main/java/at/gv/egiz/moazs/verify/MsgResponseVerifier.java +++ b/src/main/java/at/gv/egiz/moazs/verify/MsgResponseVerifier.java @@ -1,7 +1,6 @@ package at.gv.egiz.moazs.verify; import at.gv.egiz.moazs.MoaZSException; -import at.gv.egiz.moazs.repository.BinaryRepository; import at.gv.egiz.moazs.repository.DeliveryRepository; import at.gv.egiz.moazs.scheme.MsgResponse; import at.gv.egiz.moazs.service.MsgService; @@ -20,25 +19,21 @@ public class MsgResponseVerifier { public static final String MOASP_SIGNATURE_INVALID_ERROR_MSG = "Signature of Msg Response " + "with AppDeliveryID=%s is not valid."; - private final DeliveryRepository repo; - private final BinaryRepository binaryRepo; + private final DeliveryRepository repository; private final SignatureVerifier verifier; @Autowired - public MsgResponseVerifier(DeliveryRepository repo, - BinaryRepository binaryStatusRepository, - SignatureVerifier verifier) { - this.repo = repo; - this.binaryRepo = binaryStatusRepository; + public MsgResponseVerifier(DeliveryRepository repository, SignatureVerifier verifier) { + this.repository = repository; this.verifier = verifier; } public MsgResponse verify(String responseID) { - var response = repo.getResponse(responseID).get(); + var response = repository.retrieveResponse(responseID).get(); var builder = moaZSExceptionBuilder().withAllParametersInAnswer(response.getAnswer()); - var binaryResponse = binaryRepo.get(responseID).get(); + var binaryResponse = repository.retrieveBinaryResponse(responseID).get(); try { verifier.verify(binaryResponse); -- cgit v1.2.3