Skip to content
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.

Sign up for GitHub

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

MODPUBSUB-290 Use folio-kafka-wrapper to create topics #264

Merged
merged 1 commit into from
Apr 29, 2024
Merged

MODPUBSUB-290 Use folio-kafka-wrapper to create topics #264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 10 additions & 0 deletions mod-pubsub-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,16 @@
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
</dependency>
<dependency>
<groupId>org.folio</groupId>
<artifactId>folio-kafka-wrapper</artifactId>
<version>3.1.1</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.14.0</version>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-web-client</artifactId>
Expand Down
10 changes: 8 additions & 2 deletions mod-pubsub-server/src/main/java/org/folio/config/ApplicationConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
import javax.annotation.PreDestroy;

import org.apache.kafka.clients.admin.AdminClientConfig;
import org.folio.kafka.KafkaConfig;
import org.folio.kafka.PubSubKafkaConfig;
import org.folio.kafka.services.KafkaAdminClientService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
Expand All @@ -26,13 +27,18 @@ public class ApplicationConfig {

private KafkaAdminClient adminClient;
@Bean
public KafkaAdminClient kafkaAdminClient(@Autowired Vertx vertx, @Autowired KafkaConfig config) {
public KafkaAdminClient kafkaAdminClient(@Autowired Vertx vertx, @Autowired PubSubKafkaConfig config) {
Map<String, String> configs = new HashMap<>();
configs.put(AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG, config.getKafkaUrl());
adminClient = KafkaAdminClient.create(vertx, configs);
return adminClient;
}

@Bean
public KafkaAdminClientService kafkaAdminClientService(@Autowired Vertx vertx) {
return new KafkaAdminClientService(vertx);
}

@PreDestroy
public void closeAdminClient() {
adminClient.close(1_000);
Expand Down
2 changes: 1 addition & 1 deletion ...ain/java/org/folio/kafka/KafkaConfig.java → ...va/org/folio/kafka/PubSubKafkaConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import java.util.Map;

@Component
public class KafkaConfig {
public class PubSubKafkaConfig {

@Value("${KAFKA_HOST}")
private String kafkaHost;
Expand Down
6 changes: 6 additions & 0 deletions mod-pubsub-server/src/main/java/org/folio/kafka/PubSubKafkaTopic.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package org.folio.kafka;

import org.folio.kafka.services.KafkaTopic;

public record PubSubKafkaTopic(String moduleName, String topicName) implements KafkaTopic {
}
6 changes: 3 additions & 3 deletions mod-pubsub-server/src/main/java/org/folio/services/impl/KafkaConsumerServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.folio.HttpStatus;
import org.folio.kafka.KafkaConfig;
import org.folio.kafka.PubSubKafkaConfig;
import org.folio.kafka.PubSubConfig;
import org.folio.okapi.common.GenericCompositeFuture;
import org.folio.rest.jaxrs.model.AuditMessage;
Expand Down Expand Up @@ -53,14 +53,14 @@ public class KafkaConsumerServiceImpl implements ConsumerService {
private static final Logger LOGGER = LogManager.getLogger();

private Vertx vertx;
private KafkaConfig kafkaConfig;
private PubSubKafkaConfig kafkaConfig;
private Cache cache;
private AuditService auditService;
private SecurityManager securityManager;
private static final int RETRY_NUMBER = Integer.parseInt(MODULE_SPECIFIC_ARGS.getOrDefault("pubsub.delivery.retry.number", "5"));

public KafkaConsumerServiceImpl(@Autowired Vertx vertx,
@Autowired KafkaConfig kafkaConfig,
@Autowired PubSubKafkaConfig kafkaConfig,
@Autowired SecurityManager securityManager,
@Autowired Cache cache) {
this.vertx = vertx;
Expand Down
33 changes: 16 additions & 17 deletions mod-pubsub-server/src/main/java/org/folio/services/impl/KafkaTopicServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,43 +1,42 @@
package org.folio.services.impl;

import io.vertx.core.Future;
import io.vertx.kafka.admin.KafkaAdminClient;
import io.vertx.kafka.admin.NewTopic;
import static io.vertx.core.Future.succeededFuture;

import java.util.List;

import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.folio.kafka.KafkaConfig;
import org.folio.kafka.PubSubConfig;
import org.folio.kafka.PubSubKafkaTopic;
import org.folio.kafka.services.KafkaAdminClientService;
import org.folio.services.KafkaTopicService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import java.util.List;
import java.util.stream.Collectors;
import io.vertx.core.Future;

@Component
public class KafkaTopicServiceImpl implements KafkaTopicService {

private static final Logger LOGGER = LogManager.getLogger();

private KafkaAdminClient kafkaAdminClient;
private KafkaConfig kafkaConfig;
private final KafkaAdminClientService kafkaAdminClientService;

public KafkaTopicServiceImpl(@Autowired KafkaAdminClient kafkaAdminClient, @Autowired KafkaConfig kafkaConfig) {
this.kafkaAdminClient = kafkaAdminClient;
this.kafkaConfig = kafkaConfig;
public KafkaTopicServiceImpl(@Autowired KafkaAdminClientService kafkaAdminClientService) {
this.kafkaAdminClientService = kafkaAdminClientService;
}

@Override
public Future<Void> createTopics(List<String> eventTypes, String tenantId) {
List<NewTopic> topics = eventTypes.stream()
.map(eventType -> new NewTopic(new PubSubConfig(kafkaConfig.getEnvId(), tenantId, eventType).getTopicName(), kafkaConfig.getNumberOfPartitions(), (short) kafkaConfig.getReplicationFactor()))
.collect(Collectors.toList());
return kafkaAdminClient.createTopics(topics)
PubSubKafkaTopic[] topics = eventTypes.stream()
.map(eventType -> new PubSubKafkaTopic("mod-pubsub", eventType))
.toArray(PubSubKafkaTopic[]::new);

return succeededFuture()
.compose(r -> kafkaAdminClientService.createKafkaTopics(topics, tenantId))
.onSuccess(r -> LOGGER.info("Created topics: [{}]", StringUtils.join(eventTypes, ",")))
.onFailure(e -> LOGGER.error("Some of the topics [{}] were not created. Cause: {}",
StringUtils.join(eventTypes, ","), e.getMessage(), e))
.recover(e -> Future.succeededFuture());
.recover(e -> succeededFuture());
}
}
6 changes: 3 additions & 3 deletions mod-pubsub-server/src/main/java/org/folio/services/impl/StartupServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import io.vertx.core.Future;
import io.vertx.core.Vertx;
import org.folio.dao.MessagingModuleDao;
import org.folio.kafka.KafkaConfig;
import org.folio.kafka.PubSubKafkaConfig;
import org.folio.rest.util.MessagingModuleFilter;
import org.folio.rest.util.OkapiConnectionParams;
import org.folio.services.ConsumerService;
Expand All @@ -21,13 +21,13 @@
public class StartupServiceImpl implements StartupService {

private Vertx vertx;
private KafkaConfig kafkaConfig;
private PubSubKafkaConfig kafkaConfig;
private MessagingModuleDao messagingModuleDao;
private ConsumerService consumerService;
private KafkaTopicService kafkaTopicService;

public StartupServiceImpl(@Autowired Vertx vertx,
@Autowired KafkaConfig kafkaConfig,
@Autowired PubSubKafkaConfig kafkaConfig,
@Autowired MessagingModuleDao messagingModuleDao,
@Autowired ConsumerService consumerService,
@Autowired KafkaTopicService kafkaTopicService) {
Expand Down
6 changes: 3 additions & 3 deletions mod-pubsub-server/src/main/java/org/folio/services/publish/PublishingServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import io.vertx.kafka.client.producer.impl.KafkaProducerRecordImpl;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.folio.kafka.KafkaConfig;
import org.folio.kafka.PubSubKafkaConfig;
import org.folio.kafka.PubSubConfig;
import org.folio.rest.jaxrs.model.AuditMessage;
import org.folio.rest.jaxrs.model.Event;
Expand All @@ -27,13 +27,13 @@ public class PublishingServiceImpl implements PublishingService {
private static final int THREAD_POOL_SIZE =
Integer.parseInt(MODULE_SPECIFIC_ARGS.getOrDefault("event.publishing.thread.pool.size", "20"));

private KafkaConfig kafkaConfig;
private PubSubKafkaConfig kafkaConfig;
private WorkerExecutor executor;
private AuditService auditService;
private Vertx vertx;

public PublishingServiceImpl(@Autowired Vertx vertx,
@Autowired KafkaConfig kafkaConfig) {
@Autowired PubSubKafkaConfig kafkaConfig) {
this.kafkaConfig = kafkaConfig;
this.auditService = AuditService.createProxy(vertx);
this.vertx = vertx;
Expand Down
6 changes: 3 additions & 3 deletions ...java/org/folio/kafka/KafkaConfigTest.java → ...rg/folio/kafka/PubSubKafkaConfigTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
import org.junit.Test;


public class KafkaConfigTest {
public class PubSubKafkaConfigTest {

@Test
public void shouldReturnProducerProperties() {
Map<String, String> producerProps = new KafkaConfig().getProducerProps();
Map<String, String> producerProps = new PubSubKafkaConfig().getProducerProps();

Assert.assertEquals("PLAINTEXT", producerProps.get("security.protocol"));
Assert.assertEquals("TLSv1.2", producerProps.get("ssl.protocol"));
Expand All @@ -21,7 +21,7 @@ public void shouldReturnProducerProperties() {

@Test
public void shouldReturnConsumerProperties() {
Map<String, String> consumerProps = new KafkaConfig().getConsumerProps();
Map<String, String> consumerProps = new PubSubKafkaConfig().getConsumerProps();

Assert.assertEquals("PLAINTEXT", consumerProps.get("security.protocol"));
Assert.assertEquals("TLSv1.2", consumerProps.get("ssl.protocol"));
Expand Down
4 changes: 2 additions & 2 deletions mod-pubsub-server/src/test/java/org/folio/services/impl/ConsumerServiceUnitTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

import org.apache.kafka.clients.consumer.ConsumerRecord;
import org.folio.config.user.SystemUserConfig;
import org.folio.kafka.KafkaConfig;
import org.folio.kafka.PubSubKafkaConfig;
import org.folio.rest.jaxrs.model.Event;
import org.folio.rest.jaxrs.model.EventMetadata;
import org.folio.rest.jaxrs.model.MessagingModule;
Expand Down Expand Up @@ -71,7 +71,7 @@ public class ConsumerServiceUnitTest {

private Vertx vertx = Vertx.vertx();
@Mock
private KafkaConfig kafkaConfig;
private PubSubKafkaConfig kafkaConfig;
@Mock
private Cache cache;
@Mock
Expand Down