remove retry / fix compilation errors

micronaut-projects · Nov 16, 2022 · 376918a · 376918a
1 parent f902815
commit 376918a
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 6 deletions.
diff --git a/buildSrc/src/main/groovy/io.micronaut.build.internal.kafka-module.gradle b/buildSrc/src/main/groovy/io.micronaut.build.internal.kafka-module.gradle
@@ -5,7 +5,6 @@ plugins {
 
 dependencies {
     api mn.micronaut.messaging
-    api mn.micronaut.retry
     api mn.micronaut.json.core
 
     compileOnly mn.micronaut.management

diff --git a/...in/java/io/micronaut/configuration/kafka/streams/metrics/KafkaStreamsMetricsReporter.java b/...in/java/io/micronaut/configuration/kafka/streams/metrics/KafkaStreamsMetricsReporter.java
@@ -16,8 +16,8 @@
 package io.micronaut.configuration.kafka.streams.metrics;
 
 import io.micronaut.configuration.kafka.metrics.AbstractKafkaMetricsReporter;
+import jakarta.annotation.PreDestroy;
 
-import javax.annotation.PreDestroy;
 
 /**
  * Kafka streams specific metrics reporter which prefixes all metrics with kafka-streams.

diff --git a/kafka/src/main/java/io/micronaut/configuration/kafka/annotation/KafkaClient.java b/kafka/src/main/java/io/micronaut/configuration/kafka/annotation/KafkaClient.java
@@ -18,7 +18,6 @@
 import io.micronaut.aop.Introduction;
 import io.micronaut.context.annotation.AliasFor;
 import io.micronaut.context.annotation.Property;
-import io.micronaut.retry.annotation.Recoverable;
 import jakarta.inject.Singleton;
 
 import java.lang.annotation.Documented;
@@ -37,7 +36,6 @@
 @Documented
 @Retention(RUNTIME)
 @Introduction
-@Recoverable
 @Singleton
 public @interface KafkaClient {
 

diff --git a/kafka/src/main/java/io/micronaut/configuration/kafka/processor/KafkaConsumerProcessor.java b/kafka/src/main/java/io/micronaut/configuration/kafka/processor/KafkaConsumerProcessor.java
@@ -1053,7 +1053,7 @@ private ConsumerState(String clientId, String groupId, OffsetStrategy offsetStra
                 this.errorStrategyRetryDelay = null;
                 this.errorStrategyRetryCount = 0;
                 //noinspection unchecked
-                this.errorStrategyExceptions = ReflectionUtils.EMPTY_CLASS_ARRAY;
+                this.errorStrategyExceptions = (Class<? extends Throwable>[]) ReflectionUtils.EMPTY_CLASS_ARRAY;
             }
 
             autoPaused = !kafkaListener.booleanValue("autoStartup").orElse(true);

diff --git a/kafka/src/main/java/io/micronaut/configuration/kafka/serde/CompositeSerdeRegistry.java b/kafka/src/main/java/io/micronaut/configuration/kafka/serde/CompositeSerdeRegistry.java
@@ -63,7 +63,7 @@ public <T> Serde<T> getSerde(Class<T> type) {
         if (serde != null) {
            return serde;
         } else {
-            type = ReflectionUtils.getWrapperType(type);
+            type = (Class<T>) ReflectionUtils.getWrapperType(type);
             try {
                 return Serdes.serdeFrom(type);
             } catch (IllegalArgumentException e) {