From 783cde39207b313a7e6e32294e99ffbaf7bd6877 Mon Sep 17 00:00:00 2001 From: Jorge Espinosa Date: Wed, 30 Apr 2025 09:39:58 -0500 Subject: [PATCH 1/3] Remove -event from groupid --- .../async/kafka/listeners/ApplicationEventListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/async/async-kafka/src/main/java/org/reactivecommons/async/kafka/listeners/ApplicationEventListener.java b/async/async-kafka/src/main/java/org/reactivecommons/async/kafka/listeners/ApplicationEventListener.java index 50a19375..56b0e745 100644 --- a/async/async-kafka/src/main/java/org/reactivecommons/async/kafka/listeners/ApplicationEventListener.java +++ b/async/async-kafka/src/main/java/org/reactivecommons/async/kafka/listeners/ApplicationEventListener.java @@ -34,7 +34,7 @@ public ApplicationEventListener(ReactiveMessageListener receiver, CustomReporter errorReporter, String appName) { super(receiver, withDLQRetry, createTopology, maxRetries, retryDelay, discardNotifier, - "event", errorReporter, appName + "-events", resolver.getEventNames()); + "event", errorReporter, appName, resolver.getEventNames()); this.resolver = resolver; this.messageConverter = messageConverter; } From 2dc1ecbe8cc8ea1908101f60d7644485d024d786 Mon Sep 17 00:00:00 2001 From: Jorge Espinosa Date: Wed, 30 Apr 2025 10:25:32 -0500 Subject: [PATCH 2/3] Add param variable for group id --- .../async/kafka/listeners/ApplicationEventListener.java | 3 +++ .../async/starter/props/GenericAsyncProps.java | 1 + .../async/starter/props/GenericAsyncPropsDomain.java | 6 +++++- .../async/kafka/config/props/AsyncKafkaPropsDomain.java | 3 ++- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/async/async-kafka/src/main/java/org/reactivecommons/async/kafka/listeners/ApplicationEventListener.java b/async/async-kafka/src/main/java/org/reactivecommons/async/kafka/listeners/ApplicationEventListener.java index 56b0e745..ccd6c81e 100644 --- a/async/async-kafka/src/main/java/org/reactivecommons/async/kafka/listeners/ApplicationEventListener.java +++ b/async/async-kafka/src/main/java/org/reactivecommons/async/kafka/listeners/ApplicationEventListener.java @@ -33,8 +33,11 @@ public ApplicationEventListener(ReactiveMessageListener receiver, DiscardNotifier discardNotifier, CustomReporter errorReporter, String appName) { + + super(receiver, withDLQRetry, createTopology, maxRetries, retryDelay, discardNotifier, "event", errorReporter, appName, resolver.getEventNames()); + this.resolver = resolver; this.messageConverter = messageConverter; } diff --git a/starters/async-commons-starter/src/main/java/org/reactivecommons/async/starter/props/GenericAsyncProps.java b/starters/async-commons-starter/src/main/java/org/reactivecommons/async/starter/props/GenericAsyncProps.java index 20dabcb1..6688fb46 100644 --- a/starters/async-commons-starter/src/main/java/org/reactivecommons/async/starter/props/GenericAsyncProps.java +++ b/starters/async-commons-starter/src/main/java/org/reactivecommons/async/starter/props/GenericAsyncProps.java @@ -13,6 +13,7 @@ @SuperBuilder public abstract class GenericAsyncProps

{ private String appName; + private String groupId; private String secret; public abstract void setConnectionProperties(P properties); diff --git a/starters/async-commons-starter/src/main/java/org/reactivecommons/async/starter/props/GenericAsyncPropsDomain.java b/starters/async-commons-starter/src/main/java/org/reactivecommons/async/starter/props/GenericAsyncPropsDomain.java index a6717026..afc6b5c3 100644 --- a/starters/async-commons-starter/src/main/java/org/reactivecommons/async/starter/props/GenericAsyncPropsDomain.java +++ b/starters/async-commons-starter/src/main/java/org/reactivecommons/async/starter/props/GenericAsyncPropsDomain.java @@ -22,6 +22,7 @@ public class GenericAsyncPropsDomain, P> extends private Class

propsClass; public GenericAsyncPropsDomain(String defaultAppName, + String groupId, P defaultProperties, GenericAsyncPropsDomainProperties configured, SecretFiller

secretFiller, @@ -44,7 +45,10 @@ public GenericAsyncPropsDomain(String defaultAppName, + " has not set the property appName. please use respective property or " + " spring.application.name property or withDefaultAppName in builder"); } - value.setAppName(defaultAppName); + if(value.getGroupId() != null){ + value.setAppName(groupId); + } + value.setAppName(defaultAppName + "-events"); } if (value.getConnectionProperties() == null) { if (defaultProperties == null) { diff --git a/starters/async-kafka-starter/src/main/java/org/reactivecommons/async/kafka/config/props/AsyncKafkaPropsDomain.java b/starters/async-kafka-starter/src/main/java/org/reactivecommons/async/kafka/config/props/AsyncKafkaPropsDomain.java index ea9f9496..f722f7a6 100644 --- a/starters/async-kafka-starter/src/main/java/org/reactivecommons/async/kafka/config/props/AsyncKafkaPropsDomain.java +++ b/starters/async-kafka-starter/src/main/java/org/reactivecommons/async/kafka/config/props/AsyncKafkaPropsDomain.java @@ -13,10 +13,11 @@ public class AsyncKafkaPropsDomain extends GenericAsyncPropsDomain { public AsyncKafkaPropsDomain(@Value("${spring.application.name}") String defaultAppName, + @Value("${spring.kafka.consumer.group.id}") String groupId, KafkaProperties defaultKafkaProperties, AsyncKafkaPropsDomainProperties configured, KafkaSecretFiller kafkaSecretFiller) { - super(defaultAppName, defaultKafkaProperties, configured, kafkaSecretFiller, AsyncKafkaProps.class, + super(defaultAppName, groupId, defaultKafkaProperties, configured, kafkaSecretFiller, AsyncKafkaProps.class, KafkaProperties.class); } From 053de718e53fb07fedbc2d444155713e7dc14352 Mon Sep 17 00:00:00 2001 From: Jorge Espinosa Date: Mon, 5 May 2025 08:52:33 -0500 Subject: [PATCH 3/3] add condition group id --- .../async/starter/props/GenericAsyncPropsDomain.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/starters/async-commons-starter/src/main/java/org/reactivecommons/async/starter/props/GenericAsyncPropsDomain.java b/starters/async-commons-starter/src/main/java/org/reactivecommons/async/starter/props/GenericAsyncPropsDomain.java index afc6b5c3..eb845370 100644 --- a/starters/async-commons-starter/src/main/java/org/reactivecommons/async/starter/props/GenericAsyncPropsDomain.java +++ b/starters/async-commons-starter/src/main/java/org/reactivecommons/async/starter/props/GenericAsyncPropsDomain.java @@ -48,7 +48,10 @@ public GenericAsyncPropsDomain(String defaultAppName, if(value.getGroupId() != null){ value.setAppName(groupId); } - value.setAppName(defaultAppName + "-events"); + else { + value.setAppName(defaultAppName + "-events"); + } + } if (value.getConnectionProperties() == null) { if (defaultProperties == null) {