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.

Sign up for GitHub

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

Jump to bottom

Add QueueType model #946

Merged
merged 2 commits into from
Jun 4, 2024
Merged

Add QueueType model #946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
402a870
Add QueueType model
geirolz May 2, 2024
723f7c2
Declare queue type
geirolz May 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
42 changes: 23 additions & 19 deletions core/src/main/scala/dev/profunktor/fs2rabbit/algebra/Declaration.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package dev.profunktor.fs2rabbit.algebra

import cats.effect.Sync
import cats.syntax.functor._
import cats.syntax.all._
import dev.profunktor.fs2rabbit.arguments._
import dev.profunktor.fs2rabbit.config.declaration.{DeclarationExchangeConfig, DeclarationQueueConfig}
import dev.profunktor.fs2rabbit.effects.BoolValue.syntax._
Expand Down Expand Up @@ -63,26 +63,30 @@ object Declaration {
}

override def declareQueue(channel: AMQPChannel, config: DeclarationQueueConfig): F[Unit] =
Sync[F].blocking {
channel.value.queueDeclare(
config.queueName.value,
config.durable.isTrue,
config.exclusive.isTrue,
config.autoDelete.isTrue,
config.arguments
)
}.void
Sync[F].fromEither(config.validatedArguments).flatMap { args =>
Sync[F].blocking {
channel.value.queueDeclare(
config.queueName.value,
config.durable.isTrue,
config.exclusive.isTrue,
config.autoDelete.isTrue,
args
)
}.void
}

override def declareQueueNoWait(channel: AMQPChannel, config: DeclarationQueueConfig): F[Unit] =
Sync[F].blocking {
channel.value.queueDeclareNoWait(
config.queueName.value,
config.durable.isTrue,
config.exclusive.isTrue,
config.autoDelete.isTrue,
config.arguments
)
}.void
Sync[F].fromEither(config.validatedArguments).flatMap { args =>
Sync[F].blocking {
channel.value.queueDeclareNoWait(
config.queueName.value,
config.durable.isTrue,
config.exclusive.isTrue,
config.autoDelete.isTrue,
args
)
}.void
}

override def declareQueuePassive(channel: AMQPChannel, queueName: QueueName): F[Unit] =
Sync[F].blocking {
Expand Down
40 changes: 36 additions & 4 deletions core/src/main/scala/dev/profunktor/fs2rabbit/config/declaration.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package dev.profunktor.fs2rabbit.config

import dev.profunktor.fs2rabbit.arguments.Arguments
import dev.profunktor.fs2rabbit.model.{ExchangeName, ExchangeType, QueueName}
import dev.profunktor.fs2rabbit.model.{ExchangeName, ExchangeType, QueueName, QueueType}

object declaration {

Expand All @@ -26,12 +26,44 @@ object declaration {
durable: DurableCfg,
exclusive: ExclusiveCfg,
autoDelete: AutoDeleteCfg,
arguments: Arguments
)
arguments: Arguments,
queueType: Option[QueueType]
) {

lazy val validatedArguments: Either[IllegalArgumentException, Arguments] =
queueType match {
case Some(_) if arguments.contains("x-queue-type") =>
Left(
new IllegalArgumentException(
"Queue type defined twice. It is set in the arguments and in the DeclarationQueueConfig."
)
)
case Some(queueType) =>
Right(arguments + ("x-queue-type" -> queueType.asString))
case None =>
Right(arguments)
}
}
object DeclarationQueueConfig {

def default(queueName: QueueName): DeclarationQueueConfig =
DeclarationQueueConfig(queueName, NonDurable, NonExclusive, NonAutoDelete, Map.empty)
DeclarationQueueConfig(
queueName = queueName,
durable = NonDurable,
exclusive = NonExclusive,
autoDelete = NonAutoDelete,
arguments = Map.empty,
queueType = None
)

def classic(queueName: QueueName): DeclarationQueueConfig =
default(queueName).copy(queueType = Some(QueueType.Classic))

def quorum(queueName: QueueName): DeclarationQueueConfig =
default(queueName).copy(queueType = Some(QueueType.Quorum))

def stream(queueName: QueueName): DeclarationQueueConfig =
default(queueName).copy(queueType = Some(QueueType.Stream))
}

sealed trait DurableCfg extends Product with Serializable
Expand Down
14 changes: 13 additions & 1 deletion core/src/main/scala/dev/profunktor/fs2rabbit/model.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,20 @@ object model {
extends ExchangeType // for use with the plugin https://github.com/rabbitmq/rabbitmq-delayed-message-exchange/
}

sealed abstract class DeliveryMode(val value: Int) extends Product with Serializable
sealed trait QueueType extends Product with Serializable {
def asString: String = this match {
case QueueType.Classic => "classic"
case QueueType.Quorum => "quorum"
case QueueType.Stream => "stream"
}
}
object QueueType {
case object Classic extends QueueType
case object Quorum extends QueueType
case object Stream extends QueueType
}

sealed abstract class DeliveryMode(val value: Int) extends Product with Serializable
object DeliveryMode {
case object NonPersistent extends DeliveryMode(1)
case object Persistent extends DeliveryMode(2)
Expand Down