Skip to content

chore(next): Fix kafka starter #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import org.reactivecommons.async.kafka.config.RCKafkaConfig;
import org.reactivecommons.async.kafka.config.RCKafkaEventListenerConfig;
import org.reactivecommons.async.kafka.config.RCKafkaHandlersConfiguration;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;

Expand All @@ -14,7 +15,7 @@
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.TYPE})
@Documented
@Import({RCKafkaEventListenerConfig.class, RCKafkaConfig.class})
@Import({RCKafkaEventListenerConfig.class, RCKafkaHandlersConfiguration.class, RCKafkaConfig.class})
@Configuration
public @interface EnableEventListeners {
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.reactivecommons.async.kafka.annotations;

import org.reactivecommons.async.kafka.config.RCKafkaConfig;
import org.reactivecommons.async.kafka.config.RCKafkaHandlersConfiguration;
import org.reactivecommons.async.kafka.config.RCKafkaNotificationEventListenerConfig;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
Expand All @@ -15,7 +16,7 @@
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.TYPE})
@Documented
@Import({RCKafkaNotificationEventListenerConfig.class, RCKafkaConfig.class})
@Import({RCKafkaNotificationEventListenerConfig.class, RCKafkaHandlersConfiguration.class, RCKafkaConfig.class})
@Configuration
public @interface EnableNotificationListener {
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,22 +70,6 @@ public ConnectionManager kafkaConnectionManager(AsyncKafkaPropsDomain props,
return connectionManager;
}

@Bean
public DomainHandlers buildHandlers(AsyncKafkaPropsDomain props, ApplicationContext context,
HandlerRegistry primaryRegistry, DefaultCommandHandler<?> commandHandler) {
DomainHandlers handlers = new DomainHandlers();
final Map<String, HandlerRegistry> registries = context.getBeansOfType(HandlerRegistry.class);
if (!registries.containsValue(primaryRegistry)) {
registries.put("primaryHandlerRegistry", primaryRegistry);
}
props.forEach((domain, properties) -> {
HandlerResolver resolver = HandlerResolverBuilder.buildResolver(domain, registries, commandHandler);
handlers.add(domain, resolver);
});
return handlers;
}


// Sender
@Bean
@ConditionalOnMissingBean(DomainEventBus.class)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.reactivecommons.async.kafka.config;

import lombok.RequiredArgsConstructor;
import org.reactivecommons.async.commons.converters.MessageConverter;
import org.reactivecommons.async.commons.ext.CustomReporter;
import org.reactivecommons.async.kafka.config.props.AsyncKafkaProps;
Expand All @@ -14,7 +13,6 @@
import static org.reactivecommons.async.api.HandlerRegistry.DEFAULT_DOMAIN;

@Configuration
@RequiredArgsConstructor
public class RCKafkaEventListenerConfig {

@Bean
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package org.reactivecommons.async.kafka.config;


import org.reactivecommons.async.api.DefaultCommandHandler;
import org.reactivecommons.async.api.HandlerRegistry;
import org.reactivecommons.async.commons.HandlerResolver;
import org.reactivecommons.async.commons.HandlerResolverBuilder;
import org.reactivecommons.async.kafka.config.props.AsyncKafkaPropsDomain;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

import java.util.Map;

@Configuration
public class RCKafkaHandlersConfiguration {

@Bean
public DomainHandlers buildHandlers(AsyncKafkaPropsDomain props, ApplicationContext context,
HandlerRegistry primaryRegistry, DefaultCommandHandler<?> commandHandler) {
DomainHandlers handlers = new DomainHandlers();
final Map<String, HandlerRegistry> registries = context.getBeansOfType(HandlerRegistry.class);
if (!registries.containsValue(primaryRegistry)) {
registries.put("primaryHandlerRegistry", primaryRegistry);
}
props.forEach((domain, properties) -> {
HandlerResolver resolver = HandlerResolverBuilder.buildResolver(domain, registries, commandHandler);
handlers.add(domain, resolver);
});
return handlers;
}
}
Loading