From ab5541e7556bd2e5afad490c422c2ce20e55074f Mon Sep 17 00:00:00 2001 From: Simon Spielmann Date: Fri, 8 Oct 2021 10:44:53 +0200 Subject: [PATCH 01/12] Deprecate own kafka implementation, recommend use of new spring-kafka, --- documentation/guide-kafka.asciidoc | 2 ++ .../kafka/common/messaging/api/client/MessageSender.java | 4 +++- .../common/messaging/api/config/KafkaCommonProperties.java | 6 +++++- .../messaging/api/config/KafkaConsumerProperties.java | 5 ++++- .../api/config/KafkaListenerContainerProperties.java | 4 ++++ .../messaging/api/config/KafkaProducerProperties.java | 4 ++++ .../common/messaging/api/config/MessageCommonConfig.java | 3 +++ .../common/messaging/api/config/MessageReceiverConfig.java | 4 ++++ .../common/messaging/api/config/MessageSenderConfig.java | 3 +++ .../messaging/api/config/MessageSenderProperties.java | 4 ++++ .../health/api/config/KafkaHealthIndicatorProperties.java | 3 +++ .../health/api/config/MessageHealthIndicatorConfig.java | 4 ++++ .../kafka/common/messaging/health/impl/HealthStatus.java | 3 +++ .../common/messaging/health/impl/KafkaHealthIndicator.java | 3 +++ .../kafka/common/messaging/health/impl/TopicHealthInfo.java | 4 ++++ .../kafka/common/messaging/impl/MessageSenderImpl.java | 3 +++ .../messaging/logging/impl/ConsumerGroupResolver.java | 3 +++ .../kafka/common/messaging/logging/impl/EventKey.java | 4 ++++ .../common/messaging/logging/impl/LoggingErrorHandler.java | 3 +++ .../logging/impl/MessageListenerLoggingAspect.java | 3 +++ .../messaging/logging/impl/MessageLoggingSupport.java | 4 ++++ .../messaging/logging/impl/ProducerLoggingListener.java | 3 +++ .../messaging/retry/api/MessageRetryProcessingResult.java | 3 +++ .../module/kafka/common/messaging/retry/api/RetryState.java | 3 +++ .../messaging/retry/api/client/KafkaRecordSupport.java | 3 +++ .../messaging/retry/api/client/MessageBackOffPolicy.java | 5 ++++- .../common/messaging/retry/api/client/MessageProcessor.java | 4 ++++ .../messaging/retry/api/client/MessageRetryHandler.java | 4 ++++ .../messaging/retry/api/client/MessageRetryOperations.java | 4 +++- .../messaging/retry/api/client/MessageRetryPolicy.java | 3 +++ .../retry/api/config/DefaultBackOffPolicyProperties.java | 3 +++ .../retry/api/config/DefaultRetryPolicyProperties.java | 3 +++ .../retry/api/config/MessageDefaultRetryConfig.java | 3 +++ .../common/messaging/retry/impl/DefaultBackOffPolicy.java | 3 +++ .../messaging/retry/impl/DefaultKafkaRecordSupport.java | 3 +++ .../common/messaging/retry/impl/DefaultRetryPolicy.java | 3 +++ .../common/messaging/retry/impl/MessageRetryContext.java | 3 +++ .../common/messaging/retry/impl/MessageRetryTemplate.java | 3 +++ .../common/messaging/retry/util/MessageRetryUtils.java | 3 +++ .../common/messaging/trace/api/config/TraceConfig.java | 5 ++++- .../common/messaging/trace/impl/MessageSpanExtractor.java | 3 +++ .../common/messaging/trace/impl/MessageSpanInjector.java | 3 +++ .../common/messaging/trace/impl/MessageTraceHeaders.java | 3 +++ .../common/messaging/trace/impl/MessageTraceSupport.java | 3 +++ .../kafka/common/messaging/util/KafkaPropertyMapper.java | 3 +++ .../module/kafka/common/messaging/util/MessageUtil.java | 3 +++ 46 files changed, 152 insertions(+), 6 deletions(-) diff --git a/documentation/guide-kafka.asciidoc b/documentation/guide-kafka.asciidoc index 14092658..dd13ec2c 100644 --- a/documentation/guide-kafka.asciidoc +++ b/documentation/guide-kafka.asciidoc @@ -1,6 +1,8 @@ :toc: macro toc::[] +WARNING: Devon4Js Kafka module has been abandoned. It's main feature was the implementation of a retry pattern using multiple topics. This implementation has become an integral part of Spring Kafka. We recommend to use Spring Kafkas own implemenation for retries. + = Messaging Services Messaging Services provide an asynchronous communication mechanism between applications. Technically this is diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/client/MessageSender.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/client/MessageSender.java index 2d38816a..65533d92 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/client/MessageSender.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/client/MessageSender.java @@ -14,8 +14,10 @@ * * @param the key type. * @param the value type. - * + * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * implementation. */ +@Deprecated public interface MessageSender { /** diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/KafkaCommonProperties.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/KafkaCommonProperties.java index 84af3ea3..d09be11e 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/KafkaCommonProperties.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/KafkaCommonProperties.java @@ -5,7 +5,11 @@ /** * Kafka Common Properties class which contains properties for the {@link KafkaProducer}} and {@link KafkaConsumer}}. + * + * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * implementation. */ +@Deprecated public class KafkaCommonProperties { private String bootstrapServers; @@ -346,7 +350,7 @@ public Integer getRequestTimeoutMs() { /** * Set the requestTimeoutMs for {@link #getRequestTimeoutMs()} - * + * * @param requestTimeoutMs the request timeout in milliseconds. */ public void setRequestTimeoutMs(Integer requestTimeoutMs) { diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/KafkaConsumerProperties.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/KafkaConsumerProperties.java index e8d22360..40f92dbd 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/KafkaConsumerProperties.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/KafkaConsumerProperties.java @@ -7,7 +7,10 @@ * This is a property class to create configuration for the {@link MessageReceiverConfig} by setting parameter for * {@link ConsumerConfig} to create {@link ConsumerFactory}. * + * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * implementation. */ +@Deprecated public class KafkaConsumerProperties { private Integer autoCommitIntervalMs; @@ -478,7 +481,7 @@ public String getIsolationLevel() { /** * Set the isolationLevel for {@link #getIsolationLevel()}. - * + * * @param isolationLevel the isolation level */ public void setIsolationLevel(String isolationLevel) { diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/KafkaListenerContainerProperties.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/KafkaListenerContainerProperties.java index 5602f75d..606f46d7 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/KafkaListenerContainerProperties.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/KafkaListenerContainerProperties.java @@ -5,7 +5,11 @@ /** * This is a property class used to create configuration for {@link MessageReceiverConfig}. + * + * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * implementation. */ +@Deprecated public class KafkaListenerContainerProperties { private Integer ackCount; diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/KafkaProducerProperties.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/KafkaProducerProperties.java index 72f14387..4a7ea22b 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/KafkaProducerProperties.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/KafkaProducerProperties.java @@ -6,7 +6,11 @@ /** * This is a property class to create configuration for for {@link MessageSenderConfig} by setting parameter for * {@link ProducerConfig} to create {@link ProducerFactory}. + * + * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * implementation. */ +@Deprecated public class KafkaProducerProperties { private String acks; diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/MessageCommonConfig.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/MessageCommonConfig.java index c41cd839..59ef8cb0 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/MessageCommonConfig.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/MessageCommonConfig.java @@ -15,7 +15,10 @@ * {@link MessageLoggingSupport}, {@link KafkaHealthIndicatorProperties}, {@link KafkaHealthIndicator} and * {@link ConsumerFactory}. * + * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * implementation. */ +@Deprecated @Configuration @EnableConfigurationProperties public class MessageCommonConfig { diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/MessageReceiverConfig.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/MessageReceiverConfig.java index 8fb238f8..157b5f5d 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/MessageReceiverConfig.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/MessageReceiverConfig.java @@ -27,7 +27,11 @@ /** * A class used to create a configuration for the custom message receiver. + * + * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * implementation. */ +@Deprecated @Configuration @EnableKafka @EnableAspectJAutoProxy diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/MessageSenderConfig.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/MessageSenderConfig.java index 52ec19bf..2adde258 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/MessageSenderConfig.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/MessageSenderConfig.java @@ -25,7 +25,10 @@ /** * A configuration class for the {@link MessageSender} * + * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * implementation. */ +@Deprecated @Configuration @Import(MessageCommonConfig.class) public class MessageSenderConfig { diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/MessageSenderProperties.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/MessageSenderProperties.java index 281b0231..bc303bbe 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/MessageSenderProperties.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/MessageSenderProperties.java @@ -4,7 +4,11 @@ /** * A property class used to configure for {@link MessageSender} + * + * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * implementation. */ +@Deprecated public class MessageSenderProperties { private int defaultSendTimeoutSeconds = 60; diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/health/api/config/KafkaHealthIndicatorProperties.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/health/api/config/KafkaHealthIndicatorProperties.java index e677ce85..3d677e89 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/health/api/config/KafkaHealthIndicatorProperties.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/health/api/config/KafkaHealthIndicatorProperties.java @@ -7,7 +7,10 @@ /** * A property class which is used to configure for {@link KafkaHealthIndicator} * + * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * implementation. */ +@Deprecated public class KafkaHealthIndicatorProperties { private int timeout = 60; diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/health/api/config/MessageHealthIndicatorConfig.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/health/api/config/MessageHealthIndicatorConfig.java index 97c97e5b..b5b3c12b 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/health/api/config/MessageHealthIndicatorConfig.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/health/api/config/MessageHealthIndicatorConfig.java @@ -12,7 +12,11 @@ /** * A class used to create a configuration for the custom message receiver. + * + * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * implementation. */ +@Deprecated @Configuration @Import(MessageReceiverConfig.class) public class MessageHealthIndicatorConfig { diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/health/impl/HealthStatus.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/health/impl/HealthStatus.java index 214539b4..47a6d497 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/health/impl/HealthStatus.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/health/impl/HealthStatus.java @@ -3,7 +3,10 @@ /** * An Enum class to specify the Health status. * + * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * implementation. */ +@Deprecated public enum HealthStatus { /** diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/health/impl/KafkaHealthIndicator.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/health/impl/KafkaHealthIndicator.java index b117f5e9..f9c5f297 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/health/impl/KafkaHealthIndicator.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/health/impl/KafkaHealthIndicator.java @@ -25,7 +25,10 @@ * @param the key type * @param the value type * + * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * implementation. */ +@Deprecated public class KafkaHealthIndicator implements HealthIndicator { private final ConsumerFactory consumerFactory; diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/health/impl/TopicHealthInfo.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/health/impl/TopicHealthInfo.java index 7b22eb8e..4c52eb98 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/health/impl/TopicHealthInfo.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/health/impl/TopicHealthInfo.java @@ -5,7 +5,11 @@ /** * This class is used to indicate the health. + * + * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * implementation. */ +@Deprecated public class TopicHealthInfo { private String topic; diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/impl/MessageSenderImpl.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/impl/MessageSenderImpl.java index cd615f04..4711786f 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/impl/MessageSenderImpl.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/impl/MessageSenderImpl.java @@ -35,7 +35,10 @@ * * @param the key type. * @param the value type. + * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * implementation. */ +@Deprecated public class MessageSenderImpl implements MessageSender { private static final Logger LOG = LoggerFactory.getLogger(MessageSenderImpl.class); diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/logging/impl/ConsumerGroupResolver.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/logging/impl/ConsumerGroupResolver.java index 797dadb2..97e21cbb 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/logging/impl/ConsumerGroupResolver.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/logging/impl/ConsumerGroupResolver.java @@ -15,7 +15,10 @@ /** * This class is an implementation of {@link BeanPostProcessor}. * + * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * implementation. */ +@Deprecated public class ConsumerGroupResolver implements BeanPostProcessor { private static final String DEFAULT_BEAN_NAME = KafkaListenerAnnotationBeanPostProcessor.DEFAULT_KAFKA_LISTENER_CONTAINER_FACTORY_BEAN_NAME; diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/logging/impl/EventKey.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/logging/impl/EventKey.java index 8c49dec0..81fa7334 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/logging/impl/EventKey.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/logging/impl/EventKey.java @@ -2,7 +2,11 @@ /** * An Enum keys to represent Log String format. + * + * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * implementation. */ +@Deprecated public enum EventKey { /** diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/logging/impl/LoggingErrorHandler.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/logging/impl/LoggingErrorHandler.java index f160777b..73c15542 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/logging/impl/LoggingErrorHandler.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/logging/impl/LoggingErrorHandler.java @@ -10,7 +10,10 @@ * This is an implementation class for the {@link ErrorHandler}. This class handles the exception by logging the error * message and the exception thrown. * + * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * implementation. */ +@Deprecated public class LoggingErrorHandler implements ErrorHandler { private static final Logger LOG = LoggerFactory.getLogger(LoggingErrorHandler.class); diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/logging/impl/MessageListenerLoggingAspect.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/logging/impl/MessageListenerLoggingAspect.java index 1a4176ff..540bd5e5 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/logging/impl/MessageListenerLoggingAspect.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/logging/impl/MessageListenerLoggingAspect.java @@ -33,7 +33,10 @@ * @param the key type * @param the value type * + * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * implementation. */ +@Deprecated @Aspect @Order(0) public class MessageListenerLoggingAspect { diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/logging/impl/MessageLoggingSupport.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/logging/impl/MessageLoggingSupport.java index 06410ba6..2f0cce3d 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/logging/impl/MessageLoggingSupport.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/logging/impl/MessageLoggingSupport.java @@ -4,7 +4,11 @@ /** * This class is used to log the message events by using {@link EventKey} string formats. + * + * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * implementation. */ +@Deprecated public class MessageLoggingSupport { /** diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/logging/impl/ProducerLoggingListener.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/logging/impl/ProducerLoggingListener.java index ebb7ce91..a6bce1cd 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/logging/impl/ProducerLoggingListener.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/logging/impl/ProducerLoggingListener.java @@ -11,7 +11,10 @@ * * @param The key type * @param The value type + * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * implementation. */ +@Deprecated public class ProducerLoggingListener implements ProducerListener { private static final Logger LOG = LoggerFactory.getLogger(ProducerLoggingListener.class); diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/MessageRetryProcessingResult.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/MessageRetryProcessingResult.java index 0aa9dd7a..420b1373 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/MessageRetryProcessingResult.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/MessageRetryProcessingResult.java @@ -3,7 +3,10 @@ /** * An Enum class to indicate multiple event results of retry pattern. * + * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * implementation. */ +@Deprecated public enum MessageRetryProcessingResult { /** diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/RetryState.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/RetryState.java index fb387e87..bfe87419 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/RetryState.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/RetryState.java @@ -3,7 +3,10 @@ /** * An Enum class to indicate current retry patter state. * + * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * implementation. */ +@Deprecated public enum RetryState { /** diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/client/KafkaRecordSupport.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/client/KafkaRecordSupport.java index dc12d2ed..eaa9f82c 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/client/KafkaRecordSupport.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/client/KafkaRecordSupport.java @@ -9,8 +9,11 @@ * * @param the key type. * @param the value type. + * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * implementation. */ @FunctionalInterface +@Deprecated public interface KafkaRecordSupport { /** diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/client/MessageBackOffPolicy.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/client/MessageBackOffPolicy.java index 52dc2ccc..737fef74 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/client/MessageBackOffPolicy.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/client/MessageBackOffPolicy.java @@ -7,7 +7,10 @@ /** * This interface is used to calculate next retry time stamps. * + * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * implementation. */ +@Deprecated public interface MessageBackOffPolicy { /** @@ -24,7 +27,7 @@ public interface MessageBackOffPolicy { /** * This method is used to make the thread to sleep for {@link DefaultBackOffPolicyProperties#getRetryReEnqueueDelay()} * seconds. - * + * * @param topic the topic */ void sleepBeforeReEnqueue(String topic); diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/client/MessageProcessor.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/client/MessageProcessor.java index 0aa84e28..069a96f5 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/client/MessageProcessor.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/client/MessageProcessor.java @@ -8,8 +8,12 @@ * @param the key type. * @param the value type. * + * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * implementation. + * */ @FunctionalInterface +@Deprecated public interface MessageProcessor { /** diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/client/MessageRetryHandler.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/client/MessageRetryHandler.java index d746f6de..f6a51d7c 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/client/MessageRetryHandler.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/client/MessageRetryHandler.java @@ -9,7 +9,11 @@ * * @param the key type. * @param the value type. + * + * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * implementation. */ +@Deprecated public interface MessageRetryHandler { /** diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/client/MessageRetryOperations.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/client/MessageRetryOperations.java index 14847d92..3d18bf0e 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/client/MessageRetryOperations.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/client/MessageRetryOperations.java @@ -10,9 +10,11 @@ * * @param the key type. * @param the value type. - * + * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * implementation. */ @FunctionalInterface +@Deprecated public interface MessageRetryOperations { /** diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/client/MessageRetryPolicy.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/client/MessageRetryPolicy.java index d94d16d9..5ed3ec21 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/client/MessageRetryPolicy.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/client/MessageRetryPolicy.java @@ -13,7 +13,10 @@ * * @param the key type. * @param the value type. + * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * implementation. */ +@Deprecated public interface MessageRetryPolicy { /** diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/config/DefaultBackOffPolicyProperties.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/config/DefaultBackOffPolicyProperties.java index 457d9f6c..77c21e04 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/config/DefaultBackOffPolicyProperties.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/config/DefaultBackOffPolicyProperties.java @@ -8,7 +8,10 @@ /** * This is a property class to define the retry pattern for {@link MessageBackOffPolicy} * + * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * implementation. */ +@Deprecated public class DefaultBackOffPolicyProperties { private Map retryDelay = new HashMap<>(); diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/config/DefaultRetryPolicyProperties.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/config/DefaultRetryPolicyProperties.java index 7437bf9e..97e4a3b0 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/config/DefaultRetryPolicyProperties.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/config/DefaultRetryPolicyProperties.java @@ -9,7 +9,10 @@ /** * This is a property class for {@link DefaultRetryPolicy}. * + * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * implementation. */ +@Deprecated public class DefaultRetryPolicyProperties { private Map retryPeriod = new HashMap<>(); diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/config/MessageDefaultRetryConfig.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/config/MessageDefaultRetryConfig.java index 866a8910..6a3eb133 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/config/MessageDefaultRetryConfig.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/config/MessageDefaultRetryConfig.java @@ -16,7 +16,10 @@ /** * This configuration class is used to create configurations beans for the {@link MessageRetryOperations}. * + * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * implementation. */ +@Deprecated @Configuration @EnableConfigurationProperties public class MessageDefaultRetryConfig { diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/impl/DefaultBackOffPolicy.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/impl/DefaultBackOffPolicy.java index a73acc06..1e9fafd2 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/impl/DefaultBackOffPolicy.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/impl/DefaultBackOffPolicy.java @@ -12,7 +12,10 @@ /** * This is an implementation class for the {@link MessageBackOffPolicy}. * + * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * implementation. */ +@Deprecated public class DefaultBackOffPolicy implements MessageBackOffPolicy { private DefaultBackOffPolicyProperties properties; diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/impl/DefaultKafkaRecordSupport.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/impl/DefaultKafkaRecordSupport.java index 6db5a2cd..5dc496ae 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/impl/DefaultKafkaRecordSupport.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/impl/DefaultKafkaRecordSupport.java @@ -12,7 +12,10 @@ * * @param the key type. * @param the value type. + * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * implementation. */ +@Deprecated public class DefaultKafkaRecordSupport implements KafkaRecordSupport { private final String RETRY_TOPIC_SUFFIX = "-retry"; diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/impl/DefaultRetryPolicy.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/impl/DefaultRetryPolicy.java index d54b0294..5d618c60 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/impl/DefaultRetryPolicy.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/impl/DefaultRetryPolicy.java @@ -24,7 +24,10 @@ * @param the key type * @param the value type * + * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * implementation. */ +@Deprecated public class DefaultRetryPolicy implements MessageRetryPolicy { private static final Logger LOG = LoggerFactory.getLogger(DefaultRetryPolicy.class); diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/impl/MessageRetryContext.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/impl/MessageRetryContext.java index 6467dcdd..40566607 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/impl/MessageRetryContext.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/impl/MessageRetryContext.java @@ -18,7 +18,10 @@ * The MessageRetryContext is a class used to create retry pattern with the custom headers carries values for the retry * to proceed. * + * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * implementation. */ +@Deprecated public class MessageRetryContext { /** diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/impl/MessageRetryTemplate.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/impl/MessageRetryTemplate.java index 708b445e..bcf27fb5 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/impl/MessageRetryTemplate.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/impl/MessageRetryTemplate.java @@ -24,7 +24,10 @@ * * @param the key type. * @param the value type. + * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * implementation. */ +@Deprecated public class MessageRetryTemplate implements MessageRetryOperations { private static final Logger LOG = LoggerFactory.getLogger(MessageRetryTemplate.class); diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/util/MessageRetryUtils.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/util/MessageRetryUtils.java index d98b40d6..af71299c 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/util/MessageRetryUtils.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/util/MessageRetryUtils.java @@ -8,7 +8,10 @@ /** * An Utility class to support {@link MessageRetryOperations}. * + * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * implementation. */ +@Deprecated public class MessageRetryUtils { private MessageRetryUtils() { diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/trace/api/config/TraceConfig.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/trace/api/config/TraceConfig.java index 04c4d816..2aed19a7 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/trace/api/config/TraceConfig.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/trace/api/config/TraceConfig.java @@ -10,7 +10,10 @@ * The configuration class to create configuration bean for the {@link MessageSpanInjector} and * {@link MessageSpanExtractor} * + * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * implementation. */ +@Deprecated @Configuration public class TraceConfig { @@ -27,7 +30,7 @@ public MessageSpanInjector messageSpanInjector() { /** * Creates bean for the {@link MessageSpanExtractor} - * + * * @param the key type * @param the value type * diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/trace/impl/MessageSpanExtractor.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/trace/impl/MessageSpanExtractor.java index c8ca82e3..38bd3434 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/trace/impl/MessageSpanExtractor.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/trace/impl/MessageSpanExtractor.java @@ -19,7 +19,10 @@ * @param the key type * @param the value type * + * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * implementation. */ +@Deprecated public class MessageSpanExtractor implements Extractor> { @Override diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/trace/impl/MessageSpanInjector.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/trace/impl/MessageSpanInjector.java index b924aa3b..c3dad0cc 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/trace/impl/MessageSpanInjector.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/trace/impl/MessageSpanInjector.java @@ -15,7 +15,10 @@ * This is an implementation class for the {@link brave.propagation.TraceContext.Injector} used to inject the * {@link MessageTraceHeaders} to the {@link ProducerRecord#headers()} * + * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * implementation. */ +@Deprecated public class MessageSpanInjector implements TraceContext.Injector { @Override diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/trace/impl/MessageTraceHeaders.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/trace/impl/MessageTraceHeaders.java index 866c3a1f..2fb18599 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/trace/impl/MessageTraceHeaders.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/trace/impl/MessageTraceHeaders.java @@ -5,7 +5,10 @@ /** * A custom Header class for the {@link Tracer} * + * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * implementation. */ +@Deprecated public abstract class MessageTraceHeaders { /** diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/trace/impl/MessageTraceSupport.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/trace/impl/MessageTraceSupport.java index aab22312..40b63cad 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/trace/impl/MessageTraceSupport.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/trace/impl/MessageTraceSupport.java @@ -19,7 +19,10 @@ /** * A support class for {@link Tracer} to start and finish the span. * + * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * implementation. */ +@Deprecated public final class MessageTraceSupport { private static final Logger LOG = LoggerFactory.getLogger(MessageTraceSupport.class); diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/util/KafkaPropertyMapper.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/util/KafkaPropertyMapper.java index 810b263b..eb472c5a 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/util/KafkaPropertyMapper.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/util/KafkaPropertyMapper.java @@ -14,7 +14,10 @@ /** * A property mapping class used to map the properties to {@link ProducerConfig} and {@link ConsumerConfig}. * + * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * implementation. */ +@Deprecated public class KafkaPropertyMapper { /** diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/util/MessageUtil.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/util/MessageUtil.java index 6265d897..ef9913aa 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/util/MessageUtil.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/util/MessageUtil.java @@ -9,7 +9,10 @@ /** * An utility class with support methods. * + * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * implementation. */ +@Deprecated public class MessageUtil { private static final Charset UTF_8 = Charset.forName("UTF-8"); From 8ca9f39e19b728e1c075683895cc79f5fb610810 Mon Sep 17 00:00:00 2001 From: Simon Spielmann Date: Fri, 8 Oct 2021 10:47:24 +0200 Subject: [PATCH 02/12] Typo --- documentation/guide-kafka.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/guide-kafka.asciidoc b/documentation/guide-kafka.asciidoc index dd13ec2c..46b557c1 100644 --- a/documentation/guide-kafka.asciidoc +++ b/documentation/guide-kafka.asciidoc @@ -1,7 +1,7 @@ :toc: macro toc::[] -WARNING: Devon4Js Kafka module has been abandoned. It's main feature was the implementation of a retry pattern using multiple topics. This implementation has become an integral part of Spring Kafka. We recommend to use Spring Kafkas own implemenation for retries. +WARNING: Devon4Js Kafka module has been abandoned. Its main feature was the implementation of a retry pattern using multiple topics. This implementation has become an integral part of Spring Kafka. We recommend to use Spring Kafkas own implemenation for retries. = Messaging Services From a728ae4cd41b36ebe14f9adbfa686a4a730b36b7 Mon Sep 17 00:00:00 2001 From: Simon Spielmann Date: Thu, 14 Oct 2021 10:25:08 +0200 Subject: [PATCH 03/12] Fix NPE, when Message-Key is empty --- .../messaging/trace/impl/MessageTraceSupport.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/trace/impl/MessageTraceSupport.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/trace/impl/MessageTraceSupport.java index 40b63cad..8a2544e2 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/trace/impl/MessageTraceSupport.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/trace/impl/MessageTraceSupport.java @@ -60,10 +60,12 @@ public static void startSpan(ConsumerRecord kafkaRecord, MessageSpa private static void getCurrentSpanAndLog(ConsumerRecord kafkaRecord, Tracer tracer) { Span span = tracer.currentSpan(); - - LOG.warn(EventKey.MESSAGE_WITHOUT_TRACEID.getMessage(), - new String(kafkaRecord.headers().lastHeader(KafkaHeaders.MESSAGE_KEY).value(), Charset.forName("UTF-8")), - span.context().traceIdString()); + String messageKey = null; + if (kafkaRecord.headers().lastHeader(KafkaHeaders.MESSAGE_KEY) != null) { + messageKey = new String(kafkaRecord.headers().lastHeader(KafkaHeaders.MESSAGE_KEY).value(), + Charset.forName("UTF-8")); + } + LOG.warn(EventKey.MESSAGE_WITHOUT_TRACEID.getMessage(), messageKey, span.context().traceIdString()); } private static void checkTraceHeadersAndSetContextAsSpanInScope(Tracer tracer, From 21603d1f13607d8bca513d24b152e7670f71d486 Mon Sep 17 00:00:00 2001 From: Simon Spielmann Date: Thu, 14 Oct 2021 10:25:27 +0200 Subject: [PATCH 04/12] Rework JWT-Test-Cases to work without devon4j-kafka --- .../kafka/JwtTokenValidationAspectTest.java | 22 ++++----- .../base/kafka/KafkaMessageListener.java | 48 +++++++++---------- .../base/kafka/MessageTestProcessorImpl.java | 44 ----------------- 3 files changed, 35 insertions(+), 79 deletions(-) delete mode 100644 starters/starter-security-jwt/src/test/java/com/devonfw/module/security/jwt/common/base/kafka/MessageTestProcessorImpl.java diff --git a/starters/starter-security-jwt/src/test/java/com/devonfw/module/security/jwt/common/base/kafka/JwtTokenValidationAspectTest.java b/starters/starter-security-jwt/src/test/java/com/devonfw/module/security/jwt/common/base/kafka/JwtTokenValidationAspectTest.java index e7e3a185..1a0980b2 100644 --- a/starters/starter-security-jwt/src/test/java/com/devonfw/module/security/jwt/common/base/kafka/JwtTokenValidationAspectTest.java +++ b/starters/starter-security-jwt/src/test/java/com/devonfw/module/security/jwt/common/base/kafka/JwtTokenValidationAspectTest.java @@ -19,11 +19,11 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; +import org.springframework.kafka.core.KafkaTemplate; import org.springframework.kafka.test.context.EmbeddedKafka; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringExtension; -import com.devonfw.module.kafka.common.messaging.api.client.MessageSender; import com.devonfw.module.security.jwt.common.api.JwtComponentTest; import com.devonfw.module.security.jwt.common.base.JwtConstants; @@ -47,10 +47,10 @@ public class JwtTokenValidationAspectTest extends JwtComponentTest { public static final String TEST_TOPIC_2 = "jwt-test-2"; @Autowired - private MessageSender messageSender; + private KafkaTemplate kafkaTemplate; @Autowired - private MessageTestProcessorImpl messageProcessor; + private KafkaMessageListener messageListener; @Autowired private JwtTokenValidationAspect jwtTokenValidationAspect; @@ -67,7 +67,7 @@ public class JwtTokenValidationAspectTest extends JwtComponentTest { @AfterEach public void removeMessages() { - this.messageProcessor.getReceivedMessages().clear(); + this.messageListener.getReceivedMessages().clear(); } /** @@ -88,10 +88,10 @@ public void shouldValidate_whenInValidateTokenIsPassed() throws Exception { adjustClock(); // Act - this.messageSender.sendMessageAndWait(producerRecord); + this.kafkaTemplate.send(producerRecord); // Assert - Awaitility.await().until(() -> this.messageProcessor.getReceivedMessages().size(), equalTo(1)); + Awaitility.await().until(() -> this.messageListener.getReceivedMessages().size(), equalTo(1)); } /** @@ -114,10 +114,10 @@ public void shouldValidate_whenInvalidTokenIsPassed() throws Exception { adjustClock(); // Act - this.messageSender.sendMessageAndWait(producerRecord); + this.kafkaTemplate.send(producerRecord); // Assert - Awaitility.await().until(() -> this.messageProcessor.getReceivedMessages().size(), equalTo(0)); + Awaitility.await().until(() -> this.messageListener.getReceivedMessages().size(), equalTo(0)); } /** @@ -139,7 +139,7 @@ public void shouldValidateAndThrowMissingTokenException_whenTokenIsNotPassed() t Mockito.when(this.jwtAuthentication.failOnMissingToken()).thenReturn(true); // Act - this.messageSender.sendMessageAndWait(producerRecord); + this.kafkaTemplate.send(producerRecord); // Assert Awaitility.await().untilAsserted(() -> Assertions.assertThrows(MissingTokenException.class, @@ -163,9 +163,9 @@ public void shouldNotValidate_whenTheFailOnMissingTokenIsFalse() throws Exceptio adjustClock(); // Act - this.messageSender.sendMessageAndWait(producerRecord); + this.kafkaTemplate.send(producerRecord); // Assert - Awaitility.await().until(() -> this.messageProcessor.getReceivedMessages().size(), equalTo(1)); + Awaitility.await().until(() -> this.messageListener.getReceivedMessages().size(), equalTo(1)); } } diff --git a/starters/starter-security-jwt/src/test/java/com/devonfw/module/security/jwt/common/base/kafka/KafkaMessageListener.java b/starters/starter-security-jwt/src/test/java/com/devonfw/module/security/jwt/common/base/kafka/KafkaMessageListener.java index d8e4dd3c..8b6a7175 100644 --- a/starters/starter-security-jwt/src/test/java/com/devonfw/module/security/jwt/common/base/kafka/KafkaMessageListener.java +++ b/starters/starter-security-jwt/src/test/java/com/devonfw/module/security/jwt/common/base/kafka/KafkaMessageListener.java @@ -1,16 +1,14 @@ package com.devonfw.module.security.jwt.common.base.kafka; -import javax.inject.Inject; +import java.util.ArrayList; +import java.util.List; + import javax.inject.Named; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.springframework.kafka.annotation.KafkaListener; import org.springframework.kafka.support.Acknowledgment; -import com.devonfw.module.kafka.common.messaging.retry.api.client.MessageProcessor; -import com.devonfw.module.kafka.common.messaging.retry.api.client.MessageRetryOperations; -import com.devonfw.module.security.jwt.common.base.kafka.JwtAuthentication; - /** * A Listener class with {@link KafkaListener} listens the message for the given topic and group name. * @@ -18,11 +16,23 @@ @Named public class KafkaMessageListener { - @Inject - private MessageRetryOperations messageRetryOperations; + List> receivedMessages = new ArrayList<>(); + + /** + * @return receivedMessages + */ + public List> getReceivedMessages() { + + return this.receivedMessages; + } + + /** + * @param receivedMessages new value of {@link #getReceivedMessages}. + */ + public void setReceivedMessages(List> receivedMessages) { - @Inject - private MessageProcessor messageProcessor; + this.receivedMessages = receivedMessages; + } /** * This method is used to listen the message in kafka broker for the given topic and group name in @@ -34,18 +44,9 @@ public class KafkaMessageListener { */ @JwtAuthentication(failOnMissingToken = true) @KafkaListener(topics = JwtTokenValidationAspectTest.TEST_TOPIC, groupId = "test-group") - public void consumer(ConsumerRecord consumerRecord, Acknowledgment acknowledgment) throws Exception { - - processMessageAndAcknowledgeListener(consumerRecord, acknowledgment); - } - - private void processMessageAndAcknowledgeListener(ConsumerRecord consumerRecord, - Acknowledgment acknowledgment) { + public void consume(ConsumerRecord consumerRecord, Acknowledgment acknowledgment) throws Exception { - this.messageRetryOperations.processMessageWithRetry(consumerRecord, this.messageProcessor); - - // Acknowledge the listener. - acknowledgment.acknowledge(); + this.receivedMessages.add(consumerRecord); } /** @@ -57,10 +58,9 @@ private void processMessageAndAcknowledgeListener(ConsumerRecord * @throws Exception exception */ @JwtAuthentication(failOnMissingToken = false) - @KafkaListener(topics = JwtTokenValidationAspectTest.TEST_TOPIC_2, groupId = "test-group-2") - public void consumer2(ConsumerRecord consumerRecord, Acknowledgment acknowledgment) throws Exception { + @KafkaListener(topics = JwtTokenValidationAspectTest.TEST_TOPIC_2, groupId = "test-group") + public void consume2(ConsumerRecord consumerRecord, Acknowledgment acknowledgment) throws Exception { - processMessageAndAcknowledgeListener(consumerRecord, acknowledgment); + this.receivedMessages.add(consumerRecord); } - } diff --git a/starters/starter-security-jwt/src/test/java/com/devonfw/module/security/jwt/common/base/kafka/MessageTestProcessorImpl.java b/starters/starter-security-jwt/src/test/java/com/devonfw/module/security/jwt/common/base/kafka/MessageTestProcessorImpl.java deleted file mode 100644 index 4232b332..00000000 --- a/starters/starter-security-jwt/src/test/java/com/devonfw/module/security/jwt/common/base/kafka/MessageTestProcessorImpl.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.devonfw.module.security.jwt.common.base.kafka; - -import java.util.ArrayList; -import java.util.List; - -import javax.inject.Named; - -import org.apache.kafka.clients.consumer.ConsumerRecord; - -import com.devonfw.module.kafka.common.messaging.retry.api.client.MessageProcessor; - -/** - * THis is an implementation class for the {@link MessageProcessor}. The purpose of this class is to throw NPE as it is - * a runtime exception. - */ -@Named -public class MessageTestProcessorImpl implements MessageProcessor { - - List> receivedMessages = new ArrayList<>(); - - /** - * @return receivedMessages - */ - public List> getReceivedMessages() { - - return this.receivedMessages; - } - - /** - * @param receivedMessages new value of {@link #getReceivedMessages}. - */ - public void setReceivedMessages(List> receivedMessages) { - - this.receivedMessages = receivedMessages; - } - - @Override - public void processMessage(ConsumerRecord message) { - - this.receivedMessages.add(message); - - } - -} From 909c903c3cb79bc8782dc8bf6c8c010adc09e0ff Mon Sep 17 00:00:00 2001 From: Malte Brunnlieb Date: Mon, 1 Nov 2021 13:53:28 +0100 Subject: [PATCH 05/12] Update guide-kafka.asciidoc --- documentation/guide-kafka.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/guide-kafka.asciidoc b/documentation/guide-kafka.asciidoc index 46b557c1..8f275693 100644 --- a/documentation/guide-kafka.asciidoc +++ b/documentation/guide-kafka.asciidoc @@ -1,7 +1,7 @@ :toc: macro toc::[] -WARNING: Devon4Js Kafka module has been abandoned. Its main feature was the implementation of a retry pattern using multiple topics. This implementation has become an integral part of Spring Kafka. We recommend to use Spring Kafkas own implemenation for retries. +WARNING: devon4j-kafka has been abandoned. Its main feature was the implementation of a retry pattern using multiple topics. This implementation has become an integral part of Spring Kafka. We recommend to use Spring Kafkas own implemenation for retries. = Messaging Services From 61062fcedcda8055a22ec8d12a279d1258f2508d Mon Sep 17 00:00:00 2001 From: Malte Brunnlieb Date: Mon, 1 Nov 2021 13:54:27 +0100 Subject: [PATCH 06/12] Update MessageSender.java --- .../kafka/common/messaging/api/client/MessageSender.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/client/MessageSender.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/client/MessageSender.java index 65533d92..6dc07499 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/client/MessageSender.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/client/MessageSender.java @@ -14,7 +14,7 @@ * * @param the key type. * @param the value type. - * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * @deprecated The implementation of devon4j-kafka will be abandoned. It is superseeded by Springs Kafka * implementation. */ @Deprecated @@ -45,4 +45,4 @@ public interface MessageSender { */ void sendMessageAndWait(ProducerRecord producerRecord, int timeout) throws Exception; -} \ No newline at end of file +} From 1a20e81e8e66dcba2a1a44c8f983c9893164632d Mon Sep 17 00:00:00 2001 From: Malte Brunnlieb Date: Mon, 1 Nov 2021 13:55:47 +0100 Subject: [PATCH 07/12] Update MessageUtil.java --- .../devonfw/module/kafka/common/messaging/util/MessageUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/util/MessageUtil.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/util/MessageUtil.java index ef9913aa..d4a2e3d1 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/util/MessageUtil.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/util/MessageUtil.java @@ -9,7 +9,7 @@ /** * An utility class with support methods. * - * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * @deprecated The implementation of devon4j-kafka will be abandoned. It is superseeded by Springs Kafka * implementation. */ @Deprecated From 5638007f99a39545ad2d153008c314a02f27425a Mon Sep 17 00:00:00 2001 From: Malte Brunnlieb Date: Mon, 1 Nov 2021 13:56:24 +0100 Subject: [PATCH 08/12] Update KafkaPropertyMapper.java --- .../module/kafka/common/messaging/util/KafkaPropertyMapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/util/KafkaPropertyMapper.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/util/KafkaPropertyMapper.java index eb472c5a..970afb4a 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/util/KafkaPropertyMapper.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/util/KafkaPropertyMapper.java @@ -14,7 +14,7 @@ /** * A property mapping class used to map the properties to {@link ProducerConfig} and {@link ConsumerConfig}. * - * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * @deprecated The implementation of devon4j-kafka will be abandoned. It is superseeded by Springs Kafka * implementation. */ @Deprecated From 0f41ca732ecfd74f1dd079f0a57ce9b3537fd8d7 Mon Sep 17 00:00:00 2001 From: Malte Brunnlieb Date: Mon, 1 Nov 2021 13:56:43 +0100 Subject: [PATCH 09/12] Update MessageTraceSupport.java --- .../kafka/common/messaging/trace/impl/MessageTraceSupport.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/trace/impl/MessageTraceSupport.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/trace/impl/MessageTraceSupport.java index 8a2544e2..7ff89db2 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/trace/impl/MessageTraceSupport.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/trace/impl/MessageTraceSupport.java @@ -19,7 +19,7 @@ /** * A support class for {@link Tracer} to start and finish the span. * - * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * @deprecated The implementation of devon4j-kafka will be abandoned. It is superseeded by Springs Kafka * implementation. */ @Deprecated From 7d1d25667a5f02072243980388a321ba880d8095 Mon Sep 17 00:00:00 2001 From: Malte Brunnlieb Date: Mon, 1 Nov 2021 13:57:01 +0100 Subject: [PATCH 10/12] Update MessageTraceHeaders.java --- .../kafka/common/messaging/trace/impl/MessageTraceHeaders.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/trace/impl/MessageTraceHeaders.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/trace/impl/MessageTraceHeaders.java index 2fb18599..eda7d474 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/trace/impl/MessageTraceHeaders.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/trace/impl/MessageTraceHeaders.java @@ -5,7 +5,7 @@ /** * A custom Header class for the {@link Tracer} * - * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * @deprecated The implementation of devon4j-kafka will be abandoned. It is superseeded by Springs Kafka * implementation. */ @Deprecated From 872335f302c45e797cd667f696d0d5eaee2e6772 Mon Sep 17 00:00:00 2001 From: Malte Brunnlieb Date: Mon, 1 Nov 2021 13:57:21 +0100 Subject: [PATCH 11/12] Update MessageSpanInjector.java --- .../kafka/common/messaging/trace/impl/MessageSpanInjector.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/trace/impl/MessageSpanInjector.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/trace/impl/MessageSpanInjector.java index c3dad0cc..ec8dc1e3 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/trace/impl/MessageSpanInjector.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/trace/impl/MessageSpanInjector.java @@ -15,7 +15,7 @@ * This is an implementation class for the {@link brave.propagation.TraceContext.Injector} used to inject the * {@link MessageTraceHeaders} to the {@link ProducerRecord#headers()} * - * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * @deprecated The implementation of devon4j-kafka will be abandoned. It is superseeded by Springs Kafka * implementation. */ @Deprecated From 8e42e10ec2f79a429117282457882aa9c6d8b321 Mon Sep 17 00:00:00 2001 From: Simon Spielmann Date: Tue, 2 Nov 2021 12:22:48 +0100 Subject: [PATCH 12/12] Replace 'Devon4Js Kafka module' with 'devon4j-kafka' --- .../common/messaging/api/config/KafkaCommonProperties.java | 2 +- .../common/messaging/api/config/KafkaConsumerProperties.java | 2 +- .../messaging/api/config/KafkaListenerContainerProperties.java | 2 +- .../common/messaging/api/config/KafkaProducerProperties.java | 2 +- .../kafka/common/messaging/api/config/MessageCommonConfig.java | 2 +- .../common/messaging/api/config/MessageReceiverConfig.java | 2 +- .../kafka/common/messaging/api/config/MessageSenderConfig.java | 2 +- .../common/messaging/api/config/MessageSenderProperties.java | 2 +- .../health/api/config/KafkaHealthIndicatorProperties.java | 2 +- .../health/api/config/MessageHealthIndicatorConfig.java | 2 +- .../module/kafka/common/messaging/health/impl/HealthStatus.java | 2 +- .../common/messaging/health/impl/KafkaHealthIndicator.java | 2 +- .../kafka/common/messaging/health/impl/TopicHealthInfo.java | 2 +- .../module/kafka/common/messaging/impl/MessageSenderImpl.java | 2 +- .../common/messaging/logging/impl/ConsumerGroupResolver.java | 2 +- .../module/kafka/common/messaging/logging/impl/EventKey.java | 2 +- .../common/messaging/logging/impl/LoggingErrorHandler.java | 2 +- .../messaging/logging/impl/MessageListenerLoggingAspect.java | 2 +- .../common/messaging/logging/impl/MessageLoggingSupport.java | 2 +- .../common/messaging/logging/impl/ProducerLoggingListener.java | 2 +- .../messaging/retry/api/MessageRetryProcessingResult.java | 2 +- .../module/kafka/common/messaging/retry/api/RetryState.java | 2 +- .../common/messaging/retry/api/client/KafkaRecordSupport.java | 2 +- .../common/messaging/retry/api/client/MessageBackOffPolicy.java | 2 +- .../common/messaging/retry/api/client/MessageProcessor.java | 2 +- .../common/messaging/retry/api/client/MessageRetryHandler.java | 2 +- .../messaging/retry/api/client/MessageRetryOperations.java | 2 +- .../common/messaging/retry/api/client/MessageRetryPolicy.java | 2 +- .../retry/api/config/DefaultBackOffPolicyProperties.java | 2 +- .../retry/api/config/DefaultRetryPolicyProperties.java | 2 +- .../messaging/retry/api/config/MessageDefaultRetryConfig.java | 2 +- .../kafka/common/messaging/retry/impl/DefaultBackOffPolicy.java | 2 +- .../common/messaging/retry/impl/DefaultKafkaRecordSupport.java | 2 +- .../kafka/common/messaging/retry/impl/DefaultRetryPolicy.java | 2 +- .../kafka/common/messaging/retry/impl/MessageRetryContext.java | 2 +- .../kafka/common/messaging/retry/impl/MessageRetryTemplate.java | 2 +- .../kafka/common/messaging/retry/util/MessageRetryUtils.java | 2 +- .../kafka/common/messaging/trace/api/config/TraceConfig.java | 2 +- .../kafka/common/messaging/trace/impl/MessageSpanExtractor.java | 2 +- 39 files changed, 39 insertions(+), 39 deletions(-) diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/KafkaCommonProperties.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/KafkaCommonProperties.java index d09be11e..892bf6bc 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/KafkaCommonProperties.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/KafkaCommonProperties.java @@ -6,7 +6,7 @@ /** * Kafka Common Properties class which contains properties for the {@link KafkaProducer}} and {@link KafkaConsumer}}. * - * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * @deprecated The implementation of devon4j-kafka will be abandoned. It is superseeded by Springs Kafka * implementation. */ @Deprecated diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/KafkaConsumerProperties.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/KafkaConsumerProperties.java index 40f92dbd..c3e92f6a 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/KafkaConsumerProperties.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/KafkaConsumerProperties.java @@ -7,7 +7,7 @@ * This is a property class to create configuration for the {@link MessageReceiverConfig} by setting parameter for * {@link ConsumerConfig} to create {@link ConsumerFactory}. * - * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * @deprecated The implementation of devon4j-kafka will be abandoned. It is superseeded by Springs Kafka * implementation. */ @Deprecated diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/KafkaListenerContainerProperties.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/KafkaListenerContainerProperties.java index 606f46d7..4b43cd29 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/KafkaListenerContainerProperties.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/KafkaListenerContainerProperties.java @@ -6,7 +6,7 @@ /** * This is a property class used to create configuration for {@link MessageReceiverConfig}. * - * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * @deprecated The implementation of devon4j-kafka will be abandoned. It is superseeded by Springs Kafka * implementation. */ @Deprecated diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/KafkaProducerProperties.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/KafkaProducerProperties.java index 4a7ea22b..b540b9c2 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/KafkaProducerProperties.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/KafkaProducerProperties.java @@ -7,7 +7,7 @@ * This is a property class to create configuration for for {@link MessageSenderConfig} by setting parameter for * {@link ProducerConfig} to create {@link ProducerFactory}. * - * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * @deprecated The implementation of devon4j-kafka will be abandoned. It is superseeded by Springs Kafka * implementation. */ @Deprecated diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/MessageCommonConfig.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/MessageCommonConfig.java index 59ef8cb0..275f0c72 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/MessageCommonConfig.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/MessageCommonConfig.java @@ -15,7 +15,7 @@ * {@link MessageLoggingSupport}, {@link KafkaHealthIndicatorProperties}, {@link KafkaHealthIndicator} and * {@link ConsumerFactory}. * - * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * @deprecated The implementation of devon4j-kafka will be abandoned. It is superseeded by Springs Kafka * implementation. */ @Deprecated diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/MessageReceiverConfig.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/MessageReceiverConfig.java index 157b5f5d..181f5bd1 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/MessageReceiverConfig.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/MessageReceiverConfig.java @@ -28,7 +28,7 @@ /** * A class used to create a configuration for the custom message receiver. * - * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * @deprecated The implementation of devon4j-kafka will be abandoned. It is superseeded by Springs Kafka * implementation. */ @Deprecated diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/MessageSenderConfig.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/MessageSenderConfig.java index 2adde258..7b37cef7 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/MessageSenderConfig.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/MessageSenderConfig.java @@ -25,7 +25,7 @@ /** * A configuration class for the {@link MessageSender} * - * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * @deprecated The implementation of devon4j-kafka will be abandoned. It is superseeded by Springs Kafka * implementation. */ @Deprecated diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/MessageSenderProperties.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/MessageSenderProperties.java index bc303bbe..7d63f876 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/MessageSenderProperties.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/api/config/MessageSenderProperties.java @@ -5,7 +5,7 @@ /** * A property class used to configure for {@link MessageSender} * - * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * @deprecated The implementation of devon4j-kafka will be abandoned. It is superseeded by Springs Kafka * implementation. */ @Deprecated diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/health/api/config/KafkaHealthIndicatorProperties.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/health/api/config/KafkaHealthIndicatorProperties.java index 3d677e89..fd038d95 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/health/api/config/KafkaHealthIndicatorProperties.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/health/api/config/KafkaHealthIndicatorProperties.java @@ -7,7 +7,7 @@ /** * A property class which is used to configure for {@link KafkaHealthIndicator} * - * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * @deprecated The implementation of devon4j-kafka will be abandoned. It is superseeded by Springs Kafka * implementation. */ @Deprecated diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/health/api/config/MessageHealthIndicatorConfig.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/health/api/config/MessageHealthIndicatorConfig.java index b5b3c12b..60705eb4 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/health/api/config/MessageHealthIndicatorConfig.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/health/api/config/MessageHealthIndicatorConfig.java @@ -13,7 +13,7 @@ /** * A class used to create a configuration for the custom message receiver. * - * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * @deprecated The implementation of devon4j-kafka will be abandoned. It is superseeded by Springs Kafka * implementation. */ @Deprecated diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/health/impl/HealthStatus.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/health/impl/HealthStatus.java index 47a6d497..f90f1521 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/health/impl/HealthStatus.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/health/impl/HealthStatus.java @@ -3,7 +3,7 @@ /** * An Enum class to specify the Health status. * - * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * @deprecated The implementation of devon4j-kafka will be abandoned. It is superseeded by Springs Kafka * implementation. */ @Deprecated diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/health/impl/KafkaHealthIndicator.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/health/impl/KafkaHealthIndicator.java index f9c5f297..08ed3092 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/health/impl/KafkaHealthIndicator.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/health/impl/KafkaHealthIndicator.java @@ -25,7 +25,7 @@ * @param the key type * @param the value type * - * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * @deprecated The implementation of devon4j-kafka will be abandoned. It is superseeded by Springs Kafka * implementation. */ @Deprecated diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/health/impl/TopicHealthInfo.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/health/impl/TopicHealthInfo.java index 4c52eb98..52ae5030 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/health/impl/TopicHealthInfo.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/health/impl/TopicHealthInfo.java @@ -6,7 +6,7 @@ /** * This class is used to indicate the health. * - * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * @deprecated The implementation of devon4j-kafka will be abandoned. It is superseeded by Springs Kafka * implementation. */ @Deprecated diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/impl/MessageSenderImpl.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/impl/MessageSenderImpl.java index 4711786f..846bc4a3 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/impl/MessageSenderImpl.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/impl/MessageSenderImpl.java @@ -35,7 +35,7 @@ * * @param the key type. * @param the value type. - * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * @deprecated The implementation of devon4j-kafka will be abandoned. It is superseeded by Springs Kafka * implementation. */ @Deprecated diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/logging/impl/ConsumerGroupResolver.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/logging/impl/ConsumerGroupResolver.java index 97e21cbb..e8111b5b 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/logging/impl/ConsumerGroupResolver.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/logging/impl/ConsumerGroupResolver.java @@ -15,7 +15,7 @@ /** * This class is an implementation of {@link BeanPostProcessor}. * - * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * @deprecated The implementation of devon4j-kafka will be abandoned. It is superseeded by Springs Kafka * implementation. */ @Deprecated diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/logging/impl/EventKey.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/logging/impl/EventKey.java index 81fa7334..3c4f3d6c 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/logging/impl/EventKey.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/logging/impl/EventKey.java @@ -3,7 +3,7 @@ /** * An Enum keys to represent Log String format. * - * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * @deprecated The implementation of devon4j-kafka will be abandoned. It is superseeded by Springs Kafka * implementation. */ @Deprecated diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/logging/impl/LoggingErrorHandler.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/logging/impl/LoggingErrorHandler.java index 73c15542..2f651a82 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/logging/impl/LoggingErrorHandler.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/logging/impl/LoggingErrorHandler.java @@ -10,7 +10,7 @@ * This is an implementation class for the {@link ErrorHandler}. This class handles the exception by logging the error * message and the exception thrown. * - * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * @deprecated The implementation of devon4j-kafka will be abandoned. It is superseeded by Springs Kafka * implementation. */ @Deprecated diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/logging/impl/MessageListenerLoggingAspect.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/logging/impl/MessageListenerLoggingAspect.java index 540bd5e5..5ebb32df 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/logging/impl/MessageListenerLoggingAspect.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/logging/impl/MessageListenerLoggingAspect.java @@ -33,7 +33,7 @@ * @param the key type * @param the value type * - * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * @deprecated The implementation of devon4j-kafka will be abandoned. It is superseeded by Springs Kafka * implementation. */ @Deprecated diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/logging/impl/MessageLoggingSupport.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/logging/impl/MessageLoggingSupport.java index 2f0cce3d..b13f5388 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/logging/impl/MessageLoggingSupport.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/logging/impl/MessageLoggingSupport.java @@ -5,7 +5,7 @@ /** * This class is used to log the message events by using {@link EventKey} string formats. * - * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * @deprecated The implementation of devon4j-kafka will be abandoned. It is superseeded by Springs Kafka * implementation. */ @Deprecated diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/logging/impl/ProducerLoggingListener.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/logging/impl/ProducerLoggingListener.java index a6bce1cd..b6caf6b1 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/logging/impl/ProducerLoggingListener.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/logging/impl/ProducerLoggingListener.java @@ -11,7 +11,7 @@ * * @param The key type * @param The value type - * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * @deprecated The implementation of devon4j-kafka will be abandoned. It is superseeded by Springs Kafka * implementation. */ @Deprecated diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/MessageRetryProcessingResult.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/MessageRetryProcessingResult.java index 420b1373..95517b76 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/MessageRetryProcessingResult.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/MessageRetryProcessingResult.java @@ -3,7 +3,7 @@ /** * An Enum class to indicate multiple event results of retry pattern. * - * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * @deprecated The implementation of devon4j-kafka will be abandoned. It is superseeded by Springs Kafka * implementation. */ @Deprecated diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/RetryState.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/RetryState.java index bfe87419..c1da75e0 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/RetryState.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/RetryState.java @@ -3,7 +3,7 @@ /** * An Enum class to indicate current retry patter state. * - * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * @deprecated The implementation of devon4j-kafka will be abandoned. It is superseeded by Springs Kafka * implementation. */ @Deprecated diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/client/KafkaRecordSupport.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/client/KafkaRecordSupport.java index eaa9f82c..d7d200e7 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/client/KafkaRecordSupport.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/client/KafkaRecordSupport.java @@ -9,7 +9,7 @@ * * @param the key type. * @param the value type. - * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * @deprecated The implementation of devon4j-kafka will be abandoned. It is superseeded by Springs Kafka * implementation. */ @FunctionalInterface diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/client/MessageBackOffPolicy.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/client/MessageBackOffPolicy.java index 737fef74..3715275b 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/client/MessageBackOffPolicy.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/client/MessageBackOffPolicy.java @@ -7,7 +7,7 @@ /** * This interface is used to calculate next retry time stamps. * - * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * @deprecated The implementation of devon4j-kafka will be abandoned. It is superseeded by Springs Kafka * implementation. */ @Deprecated diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/client/MessageProcessor.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/client/MessageProcessor.java index 069a96f5..5bf45962 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/client/MessageProcessor.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/client/MessageProcessor.java @@ -8,7 +8,7 @@ * @param the key type. * @param the value type. * - * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * @deprecated The implementation of devon4j-kafka will be abandoned. It is superseeded by Springs Kafka * implementation. * */ diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/client/MessageRetryHandler.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/client/MessageRetryHandler.java index f6a51d7c..fca9b387 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/client/MessageRetryHandler.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/client/MessageRetryHandler.java @@ -10,7 +10,7 @@ * @param the key type. * @param the value type. * - * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * @deprecated The implementation of devon4j-kafka will be abandoned. It is superseeded by Springs Kafka * implementation. */ @Deprecated diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/client/MessageRetryOperations.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/client/MessageRetryOperations.java index 3d18bf0e..f08f8ffc 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/client/MessageRetryOperations.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/client/MessageRetryOperations.java @@ -10,7 +10,7 @@ * * @param the key type. * @param the value type. - * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * @deprecated The implementation of devon4j-kafka will be abandoned. It is superseeded by Springs Kafka * implementation. */ @FunctionalInterface diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/client/MessageRetryPolicy.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/client/MessageRetryPolicy.java index 5ed3ec21..9ce806d2 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/client/MessageRetryPolicy.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/client/MessageRetryPolicy.java @@ -13,7 +13,7 @@ * * @param the key type. * @param the value type. - * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * @deprecated The implementation of devon4j-kafka will be abandoned. It is superseeded by Springs Kafka * implementation. */ @Deprecated diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/config/DefaultBackOffPolicyProperties.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/config/DefaultBackOffPolicyProperties.java index 77c21e04..6e1ea2fb 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/config/DefaultBackOffPolicyProperties.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/config/DefaultBackOffPolicyProperties.java @@ -8,7 +8,7 @@ /** * This is a property class to define the retry pattern for {@link MessageBackOffPolicy} * - * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * @deprecated The implementation of devon4j-kafka will be abandoned. It is superseeded by Springs Kafka * implementation. */ @Deprecated diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/config/DefaultRetryPolicyProperties.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/config/DefaultRetryPolicyProperties.java index 97e4a3b0..df1f8595 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/config/DefaultRetryPolicyProperties.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/config/DefaultRetryPolicyProperties.java @@ -9,7 +9,7 @@ /** * This is a property class for {@link DefaultRetryPolicy}. * - * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * @deprecated The implementation of devon4j-kafka will be abandoned. It is superseeded by Springs Kafka * implementation. */ @Deprecated diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/config/MessageDefaultRetryConfig.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/config/MessageDefaultRetryConfig.java index 6a3eb133..12427db0 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/config/MessageDefaultRetryConfig.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/api/config/MessageDefaultRetryConfig.java @@ -16,7 +16,7 @@ /** * This configuration class is used to create configurations beans for the {@link MessageRetryOperations}. * - * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * @deprecated The implementation of devon4j-kafka will be abandoned. It is superseeded by Springs Kafka * implementation. */ @Deprecated diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/impl/DefaultBackOffPolicy.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/impl/DefaultBackOffPolicy.java index 1e9fafd2..aad91d33 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/impl/DefaultBackOffPolicy.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/impl/DefaultBackOffPolicy.java @@ -12,7 +12,7 @@ /** * This is an implementation class for the {@link MessageBackOffPolicy}. * - * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * @deprecated The implementation of devon4j-kafka will be abandoned. It is superseeded by Springs Kafka * implementation. */ @Deprecated diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/impl/DefaultKafkaRecordSupport.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/impl/DefaultKafkaRecordSupport.java index 5dc496ae..ebb377ec 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/impl/DefaultKafkaRecordSupport.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/impl/DefaultKafkaRecordSupport.java @@ -12,7 +12,7 @@ * * @param the key type. * @param the value type. - * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * @deprecated The implementation of devon4j-kafka will be abandoned. It is superseeded by Springs Kafka * implementation. */ @Deprecated diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/impl/DefaultRetryPolicy.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/impl/DefaultRetryPolicy.java index 5d618c60..f59e99fa 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/impl/DefaultRetryPolicy.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/impl/DefaultRetryPolicy.java @@ -24,7 +24,7 @@ * @param the key type * @param the value type * - * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * @deprecated The implementation of devon4j-kafka will be abandoned. It is superseeded by Springs Kafka * implementation. */ @Deprecated diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/impl/MessageRetryContext.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/impl/MessageRetryContext.java index 40566607..d2d878ef 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/impl/MessageRetryContext.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/impl/MessageRetryContext.java @@ -18,7 +18,7 @@ * The MessageRetryContext is a class used to create retry pattern with the custom headers carries values for the retry * to proceed. * - * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * @deprecated The implementation of devon4j-kafka will be abandoned. It is superseeded by Springs Kafka * implementation. */ @Deprecated diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/impl/MessageRetryTemplate.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/impl/MessageRetryTemplate.java index bcf27fb5..c0a2aad7 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/impl/MessageRetryTemplate.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/impl/MessageRetryTemplate.java @@ -24,7 +24,7 @@ * * @param the key type. * @param the value type. - * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * @deprecated The implementation of devon4j-kafka will be abandoned. It is superseeded by Springs Kafka * implementation. */ @Deprecated diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/util/MessageRetryUtils.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/util/MessageRetryUtils.java index af71299c..94b4355c 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/util/MessageRetryUtils.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/retry/util/MessageRetryUtils.java @@ -8,7 +8,7 @@ /** * An Utility class to support {@link MessageRetryOperations}. * - * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * @deprecated The implementation of devon4j-kafka will be abandoned. It is superseeded by Springs Kafka * implementation. */ @Deprecated diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/trace/api/config/TraceConfig.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/trace/api/config/TraceConfig.java index 2aed19a7..e5273b6b 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/trace/api/config/TraceConfig.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/trace/api/config/TraceConfig.java @@ -10,7 +10,7 @@ * The configuration class to create configuration bean for the {@link MessageSpanInjector} and * {@link MessageSpanExtractor} * - * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * @deprecated The implementation of devon4j-kafka will be abandoned. It is superseeded by Springs Kafka * implementation. */ @Deprecated diff --git a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/trace/impl/MessageSpanExtractor.java b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/trace/impl/MessageSpanExtractor.java index 38bd3434..a4cadb89 100644 --- a/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/trace/impl/MessageSpanExtractor.java +++ b/modules/kafka/src/main/java/com/devonfw/module/kafka/common/messaging/trace/impl/MessageSpanExtractor.java @@ -19,7 +19,7 @@ * @param the key type * @param the value type * - * @deprecated The implementation of Devon4Js Kafka module will be abandoned. It is superseeded by Springs Kafka + * @deprecated The implementation of devon4j-kafka will be abandoned. It is superseeded by Springs Kafka * implementation. */ @Deprecated