Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fs2-rabbit backend #82

Merged
merged 30 commits into from
Jul 11, 2024
Merged
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
c32699d
init consumer using rabbit fs2
thomasl8 Jun 9, 2023
1a8aff2
implement amqpClient interface with fs2 rabbit
thomasl8 Jun 9, 2023
521c432
fix requeue
thomasl8 Jun 9, 2023
4edb9c6
WIP separation into modules
andrewgee Jun 15, 2023
b89a68e
All compilation and tests
andrewgee Jun 16, 2023
b84c7cd
Finish off Delivery MessageEncoder and support all declaration options
andrewgee Jun 21, 2023
243b0a6
Remove temporary client in examples module
andrewgee Jun 21, 2023
9be1b06
Requeue on reject for RequeueImmediately support
andrewgee Jun 21, 2023
a9edcef
Restore example to JavaBackend client
andrewgee Jun 21, 2023
b54c346
Bleh! Type erasure is the worst
andrewgee Jun 21, 2023
82bd57d
`deliveryEncoder` tests
andrewgee Jun 28, 2023
b28cab8
WIP
andrewgee Jan 2, 2024
6794781
Get compiling again after a rebase
andrewgee Jan 26, 2024
1d1b51e
Passing tests
andrewgee Jan 26, 2024
06fdcb0
Abstract out fs2-rabbit config
andrewgee Jan 26, 2024
a71e5c4
Move unit tests to relevant module
andrewgee Jan 26, 2024
99e7b50
Fix up test logging
andrewgee Jan 26, 2024
3a02be6
Sort declarations before executing them!
andrewgee Jan 26, 2024
8b84713
Try existing integration tests with new client
andrewgee Jan 26, 2024
b7949a9
Added lots
JosBogan Jul 5, 2024
f92eb0f
Reworked publisher to return an F[Publisher[F, ???]]
andrewgee Jul 5, 2024
e611e99
Fixed error in publishing
JosBogan Jul 10, 2024
ffdae11
working for cross compile
JosBogan Jul 10, 2024
548d06d
Supporting 2.12
JosBogan Jul 10, 2024
e123926
More 2.12
JosBogan Jul 10, 2024
7e0dc47
More 2.12 madness
JosBogan Jul 10, 2024
da665da
revert version
JosBogan Jul 10, 2024
1d74b7c
Co-authored-by: Andrew Gee <andrew.gee@itv.com> 🫥
JosBogan Jul 10, 2024
c575c41
Time :(
JosBogan Jul 10, 2024
80055a4
success?
andrewgee Jul 10, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
working for cross compile
JosBogan committed Jul 10, 2024
commit ffdae11aee9a59ca95f950ac3da38433cf7198cf
Original file line number Diff line number Diff line change
@@ -246,7 +246,9 @@ object Fs2RabbitAmqpClient {
case _ => NullVal
}

val fs2MessageHeaders: Map[String, model.AmqpFieldValue] = publishCommand.basicProperties.headers.view.mapValues(toAmqpValue).toMap
val fs2MessageHeaders: Map[String, model.AmqpFieldValue] = publishCommand.basicProperties.headers.map { case (key, headerValue) =>
key -> toAmqpValue(headerValue)
}

val message = model.AmqpMessage(
publishCommand.body.value,
@@ -276,7 +278,7 @@ object Fs2RabbitAmqpClient {
val messageProperties = publish.MessageProperties(
contentType = amqpEnvelope.properties.contentType.map(ContentType.apply),
contentEncoding = amqpEnvelope.properties.contentEncoding.map(ContentEncoding.apply),
headers = amqpEnvelope.properties.headers.view.mapValues(_.toValueWriterCompatibleJava).toMap,
headers = amqpEnvelope.properties.headers.map { case (key, headerValue) => key -> headerValue.toValueWriterCompatibleJava },
deliveryMode = amqpEnvelope.properties.deliveryMode.map(dm => DeliveryMode(dm.value)),
priority = amqpEnvelope.properties.priority,
correlationId = amqpEnvelope.properties.correlationId,