Fix Micrometer Moved Package Names

garyrussell · garyrussell · commit f51ddd431fcf · 2022-02-20T15:34:44.000-05:00
Also suppress new deprecations in retry topic code and tests.
diff --git a/spring-kafka/src/main/java/org/springframework/kafka/core/MicrometerConsumerListener.java b/spring-kafka/src/main/java/org/springframework/kafka/core/MicrometerConsumerListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 the original author or authors.
+ * Copyright 2020-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,9 +24,9 @@
 
 import org.apache.kafka.clients.consumer.Consumer;
 
-import io.micrometer.core.instrument.ImmutableTag;
-import io.micrometer.core.instrument.MeterRegistry;
-import io.micrometer.core.instrument.Tag;
+import io.micrometer.api.instrument.ImmutableTag;
+import io.micrometer.api.instrument.MeterRegistry;
+import io.micrometer.api.instrument.Tag;
 import io.micrometer.core.instrument.binder.kafka.KafkaClientMetrics;
 
 /**
diff --git a/spring-kafka/src/main/java/org/springframework/kafka/core/MicrometerProducerListener.java b/spring-kafka/src/main/java/org/springframework/kafka/core/MicrometerProducerListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 the original author or authors.
+ * Copyright 2020-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,9 +24,9 @@
 
 import org.apache.kafka.clients.producer.Producer;
 
-import io.micrometer.core.instrument.ImmutableTag;
-import io.micrometer.core.instrument.MeterRegistry;
-import io.micrometer.core.instrument.Tag;
+import io.micrometer.api.instrument.ImmutableTag;
+import io.micrometer.api.instrument.MeterRegistry;
+import io.micrometer.api.instrument.Tag;
 import io.micrometer.core.instrument.binder.kafka.KafkaClientMetrics;
 
 /**
diff --git a/spring-kafka/src/main/java/org/springframework/kafka/retrytopic/RetryTopicConfigurer.java b/spring-kafka/src/main/java/org/springframework/kafka/retrytopic/RetryTopicConfigurer.java
@@ -362,6 +362,7 @@ private EndpointHandlerMethod getDltEndpointHandlerMethodOrDefault(EndpointHandl
 		return dltEndpointHandlerMethod != null ? dltEndpointHandlerMethod : DEFAULT_DLT_HANDLER;
 	}
 
+	@SuppressWarnings("deprecation")
 	private KafkaListenerContainerFactory<?> resolveAndConfigureFactoryForMainEndpoint(
 			KafkaListenerContainerFactory<?> providedFactory,
 			String defaultFactoryBeanName, RetryTopicConfiguration configuration) {
@@ -376,6 +377,7 @@ private KafkaListenerContainerFactory<?> resolveAndConfigureFactoryForMainEndpoi
 					.decorateFactoryWithoutBackOffValues(resolvedFactory, configuration.forContainerFactoryConfigurer());
 	}
 
+	@SuppressWarnings("deprecation")
 	private KafkaListenerContainerFactory<?> resolveAndConfigureFactoryForRetryEndpoint(
 			KafkaListenerContainerFactory<?> providedFactory,
 			String defaultFactoryBeanName,
diff --git a/spring-kafka/src/main/java/org/springframework/kafka/streams/KafkaStreamsMicrometerListener.java b/spring-kafka/src/main/java/org/springframework/kafka/streams/KafkaStreamsMicrometerListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 the original author or authors.
+ * Copyright 2020-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,9 +26,9 @@
 
 import org.springframework.kafka.config.StreamsBuilderFactoryBean;
 
-import io.micrometer.core.instrument.ImmutableTag;
-import io.micrometer.core.instrument.MeterRegistry;
-import io.micrometer.core.instrument.Tag;
+import io.micrometer.api.instrument.ImmutableTag;
+import io.micrometer.api.instrument.MeterRegistry;
+import io.micrometer.api.instrument.Tag;
 import io.micrometer.core.instrument.binder.kafka.KafkaStreamsMetrics;
 
 /**
diff --git a/spring-kafka/src/main/java/org/springframework/kafka/support/KafkaUtils.java b/spring-kafka/src/main/java/org/springframework/kafka/support/KafkaUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,7 +42,7 @@ public final class KafkaUtils {
 	 * True if micrometer is on the class path.
 	 */
 	public static final boolean MICROMETER_PRESENT = ClassUtils.isPresent(
-			"io.micrometer.core.instrument.MeterRegistry", KafkaUtils.class.getClassLoader());
+			"io.micrometer.api.instrument.MeterRegistry", KafkaUtils.class.getClassLoader());
 
 	private static final ThreadLocal<String> GROUP_IDS = new ThreadLocal<>();
 
diff --git a/spring-kafka/src/main/java/org/springframework/kafka/support/micrometer/MicrometerHolder.java b/spring-kafka/src/main/java/org/springframework/kafka/support/micrometer/MicrometerHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 the original author or authors.
+ * Copyright 2020-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,10 +22,11 @@
 import org.springframework.context.ApplicationContext;
 import org.springframework.lang.Nullable;
 
-import io.micrometer.core.instrument.MeterRegistry;
-import io.micrometer.core.instrument.Timer;
-import io.micrometer.core.instrument.Timer.Builder;
-import io.micrometer.core.instrument.Timer.Sample;
+import io.micrometer.api.instrument.MeterRegistry;
+import io.micrometer.api.instrument.Timer;
+import io.micrometer.api.instrument.Timer.Builder;
+import io.micrometer.api.instrument.Timer.Sample;
+
 
 /**
  * A wrapper for micrometer timers when available on the class path.
diff --git a/spring-kafka/src/test/java/org/springframework/kafka/annotation/EnableKafkaIntegrationTests.java b/spring-kafka/src/test/java/org/springframework/kafka/annotation/EnableKafkaIntegrationTests.java
@@ -156,9 +156,9 @@
 import org.springframework.validation.Errors;
 import org.springframework.validation.Validator;
 
-import io.micrometer.core.instrument.ImmutableTag;
-import io.micrometer.core.instrument.MeterRegistry;
-import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
+import io.micrometer.api.instrument.ImmutableTag;
+import io.micrometer.api.instrument.MeterRegistry;
+import io.micrometer.api.instrument.simple.SimpleMeterRegistry;
 
 /**
  * @author Gary Russell
diff --git a/spring-kafka/src/test/java/org/springframework/kafka/config/KafkaStreamsCustomizerTests.java b/spring-kafka/src/test/java/org/springframework/kafka/config/KafkaStreamsCustomizerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2020 the original author or authors.
+ * Copyright 2018-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -51,9 +51,9 @@
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 
-import io.micrometer.core.instrument.ImmutableTag;
-import io.micrometer.core.instrument.MeterRegistry;
-import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
+import io.micrometer.api.instrument.ImmutableTag;
+import io.micrometer.api.instrument.MeterRegistry;
+import io.micrometer.api.instrument.simple.SimpleMeterRegistry;
 
 /**
  * @author Nurettin Yilmaz
diff --git a/spring-kafka/src/test/java/org/springframework/kafka/retrytopic/ListenerContainerFactoryConfigurerTests.java b/spring-kafka/src/test/java/org/springframework/kafka/retrytopic/ListenerContainerFactoryConfigurerTests.java
@@ -143,6 +143,7 @@ class ListenerContainerFactoryConfigurerTests {
 	private final ListenerContainerFactoryConfigurer.Configuration lcfcConfiguration =
 			new ListenerContainerFactoryConfigurer.Configuration(Collections.singletonList(backOffValue));
 
+	@SuppressWarnings("deprecation")
 	@Test
 	void shouldSetupErrorHandling() {
 
@@ -176,6 +177,7 @@ void shouldSetupErrorHandling() {
 
 	}
 
+	@SuppressWarnings("deprecation")
 	@Test
 	void shouldSetPartitionEventIntervalAndPollTimout() {
 
@@ -205,6 +207,7 @@ void shouldSetPartitionEventIntervalAndPollTimout() {
 				.setPollTimeout(backOffValue / 4);
 	}
 
+	@SuppressWarnings("deprecation")
 	@Test
 	void shouldNotOverridePollTimeoutIfNotDefault() {
 
@@ -235,6 +238,7 @@ void shouldNotOverridePollTimeoutIfNotDefault() {
 				.setPollTimeout(previousPollTimoutValue);
 	}
 
+	@SuppressWarnings("deprecation")
 	@Test
 	void shouldApplyMinimumPollTimeoutLimit() {
 
diff --git a/spring-kafka/src/test/java/org/springframework/kafka/retrytopic/RetryTopicLegacyFactoryConfigurerIntegrationTests.java b/spring-kafka/src/test/java/org/springframework/kafka/retrytopic/RetryTopicLegacyFactoryConfigurerIntegrationTests.java
@@ -180,6 +180,7 @@ public KafkaTemplate<String, String> kafkaTemplate() {
 			return new KafkaTemplate<>(producerFactory());
 		}
 
+		@SuppressWarnings("deprecation")
 		@Bean(name = RetryTopicInternalBeanNames.RETRY_TOPIC_CONFIGURER)
 		public RetryTopicConfigurer retryTopicConfigurer(DestinationTopicProcessor destinationTopicProcessor,
 														ListenerContainerFactoryResolver containerFactoryResolver,
diff --git a/spring-kafka/src/test/java/org/springframework/kafka/support/micrometer/MicrometerHolderTests.java b/spring-kafka/src/test/java/org/springframework/kafka/support/micrometer/MicrometerHolderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 the original author or authors.
+ * Copyright 2020-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,9 +33,9 @@
 import org.springframework.context.ApplicationContext;
 import org.springframework.test.util.ReflectionTestUtils;
 
-import io.micrometer.core.instrument.MeterRegistry;
-import io.micrometer.core.instrument.Timer;
-import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
+import io.micrometer.api.instrument.MeterRegistry;
+import io.micrometer.api.instrument.Timer;
+import io.micrometer.api.instrument.simple.SimpleMeterRegistry;
 
 /**
  * @author Vasyl Sarzhynskyi

Original file line number	Diff line number	Diff line change
`@@ -362,6 +362,7 @@ private EndpointHandlerMethod getDltEndpointHandlerMethodOrDefault(EndpointHandl`
`362`	`362`	`return dltEndpointHandlerMethod != null ? dltEndpointHandlerMethod : DEFAULT_DLT_HANDLER;`
`363`	`363`	`}`
`364`	`364`
	`365`	`+ @SuppressWarnings("deprecation")`
`365`	`366`	`private KafkaListenerContainerFactory<?> resolveAndConfigureFactoryForMainEndpoint(`
`366`	`367`	`KafkaListenerContainerFactory<?> providedFactory,`
`367`	`368`	`String defaultFactoryBeanName, RetryTopicConfiguration configuration) {`
`@@ -376,6 +377,7 @@ private KafkaListenerContainerFactory<?> resolveAndConfigureFactoryForMainEndpoi`
`376`	`377`	`.decorateFactoryWithoutBackOffValues(resolvedFactory, configuration.forContainerFactoryConfigurer());`
`377`	`378`	`}`
`378`	`379`
	`380`	`+ @SuppressWarnings("deprecation")`
`379`	`381`	`private KafkaListenerContainerFactory<?> resolveAndConfigureFactoryForRetryEndpoint(`
`380`	`382`	`KafkaListenerContainerFactory<?> providedFactory,`
`381`	`383`	`String defaultFactoryBeanName,`
Original file line number	Diff line number	Diff line change
`@@ -180,6 +180,7 @@ public KafkaTemplate<String, String> kafkaTemplate() {`
`180`	`180`	`return new KafkaTemplate<>(producerFactory());`
`181`	`181`	`}`
`182`	`182`
	`183`	`+ @SuppressWarnings("deprecation")`
`183`	`184`	`@Bean(name = RetryTopicInternalBeanNames.RETRY_TOPIC_CONFIGURER)`
`184`	`185`	`public RetryTopicConfigurer retryTopicConfigurer(DestinationTopicProcessor destinationTopicProcessor,`
`185`	`186`	`ListenerContainerFactoryResolver containerFactoryResolver,`