Skip to content

Commit b50778f

Browse files
therepaniconobc
authored andcommitted
Remove deprecated APIs marked for removal
This commit removes APIs that were marked for removal in version 1.2.0. Also updates the `whats-new.adoc` with the list of removed APIs. Fixes: #1187 Signed-off-by: Andrey Litvitski <[email protected]>
1 parent 18e8fc9 commit b50778f

22 files changed

+43
-605
lines changed

spring-pulsar-docs/src/main/antora/modules/ROOT/pages/whats-new.adoc

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,26 @@
11
= What's new?
22

3+
[[what-s-new-in-2-0-since-1-2]]
4+
== What's New in 2.0 Since 1.2
5+
:page-section-summary-toc: 1
6+
7+
This section covers the changes made from version 1.2 to version 2.0.
8+
9+
=== Removals
10+
The following previously deprecated APIs, which were marked for removal in version 2.0.x, have now been removed:
11+
12+
- `org.springframework.pulsar.config.ConcurrentPulsarListenerContainerFactory#setConcurrency`
13+
- `org.springframework.pulsar.config.ConcurrentPulsarListenerContainerFactoryCustomizer`
14+
- `org.springframework.pulsar.config.ListenerContainerFactory#createListenerContainer`
15+
- `org.springframework.pulsar.config.ReaderContainerFactory#createReaderContainer`
16+
- `org.springframework.pulsar.config.ProducerBuilderConfigurationUtil`
17+
- `org.springframework.pulsar.config.PulsarClientProxy#getPartitionsForTopic`
18+
- `org.springframework.pulsar.config.PulsarTopic#builder`
19+
- `org.springframework.pulsar.config.PulsarTopic#getFullyQualifiedTopicName`
20+
- `org.springframework.pulsar.config.Resolved#get`
21+
- `org.springframework.pulsar.test.support.model.UserPojo`
22+
- `org.springframework.pulsar.test.support.model.UserRecord`
23+
324
[[what-s-new-in-1-2-since-1-1]]
425
== What's New in 1.2 Since 1.1
526
:page-section-summary-toc: 1

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

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818

1919
import static org.assertj.core.api.Assertions.assertThat;
2020
import static org.mockito.Mockito.mock;
21-
import static org.mockito.Mockito.spy;
22-
import static org.mockito.Mockito.verify;
2321
import static org.mockito.Mockito.when;
2422

2523
import org.apache.pulsar.client.api.SubscriptionType;
@@ -34,18 +32,6 @@
3432
*/
3533
class DefaultReactivePulsarListenerContainerFactoryTests {
3634

37-
@SuppressWarnings({ "removal", "unchecked" })
38-
@Test
39-
void deprecatedCreateListenerContainerCallsReplacementApi() {
40-
var containerFactory = spy(new DefaultReactivePulsarListenerContainerFactory<String>(
41-
mock(ReactivePulsarConsumerFactory.class), new ReactivePulsarContainerProperties<>()));
42-
var endpoint = mock(ReactivePulsarListenerEndpoint.class);
43-
when(endpoint.getConcurrency()).thenReturn(1);
44-
var createdContainer = containerFactory.createListenerContainer(endpoint);
45-
assertThat(createdContainer).isNotNull();
46-
verify(containerFactory).createRegisteredContainer(endpoint);
47-
}
48-
4935
@SuppressWarnings("unchecked")
5036
@Nested
5137
class SubscriptionTypeFrom {

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

Lines changed: 0 additions & 84 deletions
This file was deleted.

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

Lines changed: 0 additions & 29 deletions
This file was deleted.

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

Lines changed: 0 additions & 75 deletions
This file was deleted.

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,6 @@ public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, B
4949
new RootBeanDefinition(PulsarTemplateBeanCustomizerPostProcessor.class));
5050
}
5151

52-
if (!registry.containsBeanDefinition("concurrentContainerFactoryCustomizerPostProcessor")) {
53-
registry.registerBeanDefinition("concurrentContainerFactoryCustomizerPostProcessor",
54-
new RootBeanDefinition(ConcurrentPulsarListenerContainerFactoryBeanCustomizerPostProcessor.class));
55-
}
56-
5752
if (!registry
5853
.containsBeanDefinition(PulsarAnnotationSupportBeanNames.PULSAR_LISTENER_ANNOTATION_PROCESSOR_BEAN_NAME)) {
5954
registry.registerBeanDefinition(

spring-pulsar/src/main/java/org/springframework/pulsar/config/ConcurrentPulsarListenerContainerFactory.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -51,17 +51,6 @@ public ConcurrentPulsarListenerContainerFactory(PulsarConsumerFactory<? super T>
5151
super(consumerFactory, containerProperties);
5252
}
5353

54-
/**
55-
* Specify the container concurrency.
56-
* @param concurrency the number of consumers to create.
57-
* @deprecated since 1.2.0 for removal in 2.0.0 in favor of
58-
* {@link PulsarContainerProperties#setConcurrency}
59-
*/
60-
@Deprecated(since = "1.2.0", forRemoval = true)
61-
public void setConcurrency(Integer concurrency) {
62-
getContainerProperties().setConcurrency(concurrency);
63-
}
64-
6554
@Override
6655
public ConcurrentPulsarMessageListenerContainer<T> createContainer(String... topics) {
6756
PulsarListenerEndpoint endpoint = new PulsarListenerEndpoint() {

spring-pulsar/src/main/java/org/springframework/pulsar/config/ConcurrentPulsarListenerContainerFactoryCustomizer.java

Lines changed: 0 additions & 38 deletions
This file was deleted.

spring-pulsar/src/main/java/org/springframework/pulsar/config/ListenerContainerFactory.java

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,4 @@
3030
public interface ListenerContainerFactory<C extends MessageListenerContainer, E extends ListenerEndpoint<C>>
3131
extends PulsarContainerFactory<C, E> {
3232

33-
/**
34-
* Create a {@link MessageListenerContainer} for the given {@link ListenerEndpoint}.
35-
* Containers created using this method are added to the listener endpoint registry.
36-
* @param endpoint the endpoint to configure
37-
* @return the created container
38-
* @deprecated since 1.2.0 for removal in 1.4.0 in favor of
39-
* {@link PulsarContainerFactory#createRegisteredContainer}
40-
*/
41-
@Deprecated(since = "1.2.0", forRemoval = true)
42-
default C createListenerContainer(E endpoint) {
43-
return createRegisteredContainer(endpoint);
44-
}
45-
4633
}

spring-pulsar/src/main/java/org/springframework/pulsar/config/ReaderContainerFactory.java

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -29,29 +29,4 @@
2929
public interface ReaderContainerFactory<C extends PulsarMessageReaderContainer, E extends PulsarReaderEndpoint<C>>
3030
extends PulsarContainerFactory<C, E> {
3131

32-
/**
33-
* Create a message reader container for the given endpoint and register the container
34-
* with the listener endpoint registry.
35-
* @param endpoint reader endpoint
36-
* @return the created container
37-
* @deprecated since 1.2.0 for removal in 1.4.0 in favor of
38-
* {@link PulsarContainerFactory#createRegisteredContainer}
39-
*/
40-
@Deprecated(since = "1.2.0", forRemoval = true)
41-
default C createReaderContainer(E endpoint) {
42-
return createRegisteredContainer(endpoint);
43-
}
44-
45-
/**
46-
* Create a message reader container for the given endpoint.
47-
* @param topics the topics to read from
48-
* @return the created container
49-
* @deprecated since 1.2.0 for removal in 1.4.0 in favor of
50-
* {@link PulsarContainerFactory#createContainer}
51-
*/
52-
@Deprecated(since = "1.2.0", forRemoval = true)
53-
default C createReaderContainer(String... topics) {
54-
return createContainer(topics);
55-
}
56-
5732
}

0 commit comments

Comments
 (0)