Skip to content

Commit de60344

Browse files
committed
Fix mentioning of the deprecated ListenableFuture
* Some rearranging fixes for `nav.adoc` and `appendix\previous-whats-new` dir
1 parent 1f0a6d3 commit de60344

File tree

7 files changed

+12
-27
lines changed

7 files changed

+12
-27
lines changed

src/reference/antora/modules/ROOT/nav.adoc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,11 @@
7171
*** xref:appendix/previous-whats-new/changes-in-3-1-since-3-0.adoc[]
7272
*** xref:appendix/previous-whats-new/changes-in-3-0-since-2-4.adoc[]
7373
*** xref:appendix/previous-whats-new/changes-in-2-4-since-2-3.adoc[]
74-
*** xref:appendix/previous-whats-new/message-converter-changes.adoc[]
75-
*** xref:appendix/previous-whats-new/stream-support-changes.adoc[]
7674
*** xref:appendix/previous-whats-new/changes-in-2-3-since-2-2.adoc[]
7775
*** xref:appendix/previous-whats-new/changes-in-2-2-since-2-1.adoc[]
7876
*** xref:appendix/previous-whats-new/changes-in-2-1-since-2-0.adoc[]
7977
*** xref:appendix/previous-whats-new/changes-in-2-0-since-1-7.adoc[]
8078
*** xref:appendix/previous-whats-new/changes-in-1-7-since-1-6.adoc[]
81-
*** xref:appendix/previous-whats-new/earlier-releases.adoc[]
8279
*** xref:appendix/previous-whats-new/changes-in-1-6-since-1-5.adoc[]
8380
*** xref:appendix/previous-whats-new/changes-in-1-5-since-1-4.adoc[]
8481
*** xref:appendix/previous-whats-new/changes-in-1-4-since-1-3.adoc[]

src/reference/antora/modules/ROOT/pages/amqp/request-reply.adoc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -290,8 +290,6 @@ Version 2.0 introduced variants of these methods (`convertSendAndReceiveAsType`)
290290
You must configure the underlying `RabbitTemplate` with a `SmartMessageConverter`.
291291
See xref:amqp/message-converters.adoc#json-complex[Converting From a `Message` With `RabbitTemplate`] for more information.
292292

293-
IMPORTANT: Starting with version 3.0, the `AsyncRabbitTemplate` methods now return `CompletableFuture` s instead of `ListenableFuture` s.
294-
295293
[[remoting]]
296294
== Spring Remoting with AMQP
297295

src/reference/antora/modules/ROOT/pages/appendix/previous-whats-new/changes-in-2-4-since-2-3.adoc

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,15 @@ See xref:amqp/broker-configuration.adoc#declarable-recovery[Recovering Auto-Dele
2222

2323
Support remoting using Spring Framework’s RMI support is deprecated and will be removed in 3.0. See Spring Remoting with AMQP for more information.
2424

25+
[[stream-support-changes]]
26+
== Stream Support Changes
27+
28+
`RabbitStreamOperations` and `RabbitStreamTemplate` have been deprecated in favor of `RabbitStreamOperations2` and `RabbitStreamTemplate2` respectively; they return `CompletableFuture` instead of `ListenableFuture`.
29+
See xref:stream.adoc[Using the RabbitMQ Stream Plugin] for more information.
30+
31+
[[message-converter-changes]]
32+
== Message Converter Changes
33+
34+
The `Jackson2JsonMessageConverter` can now determine the charset from the `contentEncoding` header.
35+
See xref:amqp/message-converters.adoc#json-message-converter[`Jackson2JsonMessageConverter`] for more information.
36+

src/reference/antora/modules/ROOT/pages/appendix/previous-whats-new/earlier-releases.adoc

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

src/reference/antora/modules/ROOT/pages/appendix/previous-whats-new/message-converter-changes.adoc

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

src/reference/antora/modules/ROOT/pages/appendix/previous-whats-new/stream-support-changes.adoc

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

src/reference/antora/modules/ROOT/pages/stream.adoc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,6 @@ The `ProducerCustomizer` provides a mechanism to customize the producer before i
111111

112112
Refer to the {rabbitmq-stream-docs}[Java Client Documentation] about customizing the `Environment` and `Producer`.
113113

114-
IMPORTANT: Starting with version 3.0, the method return types are `CompletableFuture` instead of `ListenableFuture`.
115-
116114
[[receiving-messages]]
117115
== Receiving Messages
118116

0 commit comments

Comments
 (0)