remove and replace deprecated APIs marked for removal in 2.0.x

Due to gh-1187, we should remove deprecates that are marked for removal
from version 1.2.0.

Closes: gh-1187

Signed-off-by: Andrey Litvitski <[email protected]>

Author: therepanic

spring-pulsar-reactive/src/test/java/org/springframework/pulsar/reactive/config/DefaultReactivePulsarListenerContainerFactoryTests.java

@@ -18,8 +18,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import org.apache.pulsar.client.api.SubscriptionType;
@@ -34,18 +32,6 @@
  */
 class DefaultReactivePulsarListenerContainerFactoryTests {
 
-	@SuppressWarnings({ "removal", "unchecked" })
-	@Test
-	void deprecatedCreateListenerContainerCallsReplacementApi() {
-		var containerFactory = spy(new DefaultReactivePulsarListenerContainerFactory<String>(
-				mock(ReactivePulsarConsumerFactory.class), new ReactivePulsarContainerProperties<>()));
-		var endpoint = mock(ReactivePulsarListenerEndpoint.class);
-		when(endpoint.getConcurrency()).thenReturn(1);
-		var createdContainer = containerFactory.createListenerContainer(endpoint);
-		assertThat(createdContainer).isNotNull();
-		verify(containerFactory).createRegisteredContainer(endpoint);
-	}
-
 	@SuppressWarnings("unchecked")
 	@Nested
 	class SubscriptionTypeFrom {

spring-pulsar-test/src/main/java/org/springframework/pulsar/test/support/model/UserPojo.java

@@ -19,6 +19,7 @@ dependencies {
 	api 'org.springframework:spring-context'
 	api 'org.springframework:spring-messaging'
 	api 'org.springframework:spring-tx'
+	testImplementation libs.spring.boot.starter.pulsar
 	api (libs.spring.retry) {
 		exclude group: 'org.springframework'
 	}

spring-pulsar-test/src/main/java/org/springframework/pulsar/test/support/model/UserRecord.java

@@ -49,11 +49,6 @@ public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, B
 					new RootBeanDefinition(PulsarTemplateBeanCustomizerPostProcessor.class));
 		}
 
-		if (!registry.containsBeanDefinition("concurrentContainerFactoryCustomizerPostProcessor")) {
-			registry.registerBeanDefinition("concurrentContainerFactoryCustomizerPostProcessor",
-					new RootBeanDefinition(ConcurrentPulsarListenerContainerFactoryBeanCustomizerPostProcessor.class));
-		}
-
 		if (!registry
 			.containsBeanDefinition(PulsarAnnotationSupportBeanNames.PULSAR_LISTENER_ANNOTATION_PROCESSOR_BEAN_NAME)) {
 			registry.registerBeanDefinition(

spring-pulsar/spring-pulsar.gradle

@@ -51,17 +51,6 @@ public ConcurrentPulsarListenerContainerFactory(PulsarConsumerFactory<? super T>
 		super(consumerFactory, containerProperties);
 	}
 
-	/**
-	 * Specify the container concurrency.
-	 * @param concurrency the number of consumers to create.
-	 * @deprecated since 1.2.0 for removal in 2.0.0 in favor of
-	 * {@link PulsarContainerProperties#setConcurrency}
-	 */
-	@Deprecated(since = "1.2.0", forRemoval = true)
-	public void setConcurrency(Integer concurrency) {
-		getContainerProperties().setConcurrency(concurrency);
-	}
-
 	@Override
 	public ConcurrentPulsarMessageListenerContainer<T> createContainer(String... topics) {
 		PulsarListenerEndpoint endpoint = new PulsarListenerEndpoint() {

spring-pulsar/src/main/java/org/springframework/pulsar/annotation/ConcurrentPulsarListenerContainerFactoryBeanCustomizerPostProcessor.java

@@ -30,17 +30,4 @@
 public interface ListenerContainerFactory<C extends MessageListenerContainer, E extends ListenerEndpoint<C>>
 		extends PulsarContainerFactory<C, E> {
 
-	/**
-	 * Create a {@link MessageListenerContainer} for the given {@link ListenerEndpoint}.
-	 * Containers created using this method are added to the listener endpoint registry.
-	 * @param endpoint the endpoint to configure
-	 * @return the created container
-	 * @deprecated since 1.2.0 for removal in 1.4.0 in favor of
-	 * {@link PulsarContainerFactory#createRegisteredContainer}
-	 */
-	@Deprecated(since = "1.2.0", forRemoval = true)
-	default C createListenerContainer(E endpoint) {
-		return createRegisteredContainer(endpoint);
-	}
-
 }

spring-pulsar/src/main/java/org/springframework/pulsar/annotation/PulsarBootstrapConfiguration.java

@@ -29,29 +29,4 @@
 public interface ReaderContainerFactory<C extends PulsarMessageReaderContainer, E extends PulsarReaderEndpoint<C>>
 		extends PulsarContainerFactory<C, E> {
 
-	/**
-	 * Create a message reader container for the given endpoint and register the container
-	 * with the listener endpoint registry.
-	 * @param endpoint reader endpoint
-	 * @return the created container
-	 * @deprecated since 1.2.0 for removal in 1.4.0 in favor of
-	 * {@link PulsarContainerFactory#createRegisteredContainer}
-	 */
-	@Deprecated(since = "1.2.0", forRemoval = true)
-	default C createReaderContainer(E endpoint) {
-		return createRegisteredContainer(endpoint);
-	}
-
-	/**
-	 * Create a message reader container for the given endpoint.
-	 * @param topics the topics to read from
-	 * @return the created container
-	 * @deprecated since 1.2.0 for removal in 1.4.0 in favor of
-	 * {@link PulsarContainerFactory#createContainer}
-	 */
-	@Deprecated(since = "1.2.0", forRemoval = true)
-	default C createReaderContainer(String... topics) {
-		return createContainer(topics);
-	}
-
 }