1 files changed, 5 insertions, 3 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 ee73b9e..01a4cc3 100644
--- a/src/main/java/at/gv/egiz/moazs/config/RepositoryConfig.java
+++ b/src/main/java/at/gv/egiz/moazs/config/RepositoryConfig.java
@@ -11,6 +11,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
 
 import java.util.Map;
+import java.util.function.Function;
 
 @Configuration
 @Profile("!cluster")
@@ -25,8 +26,9 @@ public class RepositoryConfig {
     }
 
     @Bean
-    public Map<String, String> idSuffixes() {
-        return Map.of(NameSpace.MSG_DELIVERY_REQUEST_STATUS, RequestStatusResponse.getIdSuffix(),
-                      NameSpace.MSG_DELIVERY_NOTIFICATION,   NotificationResponse.getIdSuffix());
+    public Map<String, Function<String, String>> idGenerators() {
+
+        return Map.of(NameSpace.MSG_DELIVERY_REQUEST_STATUS, RequestStatusResponse::getResponseID,
+                      NameSpace.MSG_DELIVERY_NOTIFICATION,   NotificationResponse::getResponseID);
     }
 }