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.

1 files changed, 2 insertions, 8 deletions

diff --git a/src/main/java/at/gv/egiz/moazs/config/RepositoryConfig.java b/src/main/java/at/gv/egiz/moazs/config/RepositoryConfig.java
index 01a4cc3..59bfb88 100644
--- a/src/main/java/at/gv/egiz/moazs/config/RepositoryConfig.java
+++ b/src/main/java/at/gv/egiz/moazs/config/RepositoryConfig.java
@@ -1,7 +1,5 @@
 package at.gv.egiz.moazs.config;
 
-import at.gv.egiz.moazs.repository.BinaryRepository;
-import at.gv.egiz.moazs.repository.InMemoryBinaryRepository;
 import at.gv.egiz.moazs.scheme.NameSpace;
 import at.gv.egiz.moazs.scheme.NotificationResponse;
 import at.gv.egiz.moazs.scheme.RequestStatusResponse;
@@ -17,17 +15,13 @@ import java.util.function.Function;
 @Profile("!cluster")
 public class RepositoryConfig {
 
-    @Value("${repository.expiresAfterWrite}")
-    private int expiresAfterWrite;
-
     @Bean
-    public BinaryRepository binaryRepository() {
-        return new InMemoryBinaryRepository(expiresAfterWrite);
+    public int expiresAfterWrite(@Value("${repository.expiresAfterWrite}") int exp) {
+        return exp;
     }
 
     @Bean
     public Map<String, Function<String, String>> idGenerators() {
-
         return Map.of(NameSpace.MSG_DELIVERY_REQUEST_STATUS, RequestStatusResponse::getResponseID,
                       NameSpace.MSG_DELIVERY_NOTIFICATION,   NotificationResponse::getResponseID);
     }