bindQueue declaration API fixed

Author: jendakol

Migration-6_1-7.md

@@ -1,4 +1,6 @@
-## Migration from 6.1.x to 6.2.x
+## Migration from 6.1.x to 7.0.x
+
+Additional declarations: `bindQueue` now has more consistent API. The only change is `bindArguments` were renamed to `arguments`.
 
 Changes in Scala API:
 

core/src/main/resources/reference.conf

@@ -124,6 +124,14 @@ avastRabbitMQDeclareQueueDefaults {
   arguments {}
 }
 
+avastRabbitMQBindQueueDefaults {
+  //  queueName = ""
+  //  routingKeys = [""]
+  //  exchangeName = ""
+
+  arguments {}
+}
+
 avastRabbitMQDeclareExchangeDefaults {
   //      type = "direct" //fanout, topic
   durable = true

core/src/main/scala/com/avast/clients/rabbitmq/DefaultRabbitMQClientFactory.scala

@@ -33,6 +33,9 @@ private[rabbitmq] object DefaultRabbitMQClientFactory extends LazyLogging {
   private[rabbitmq] final val DeclareQueueRootConfigKey = "avastRabbitMQDeclareQueueDefaults"
   private[rabbitmq] final val DeclareQueueDefaultConfig = ConfigFactory.defaultReference().getConfig(DeclareQueueRootConfigKey)
 
+  private[rabbitmq] final val BindQueueRootConfigKey = "avastRabbitMQBindQueueDefaults"
+  private[rabbitmq] final val BindQueueDefaultConfig = ConfigFactory.defaultReference().getConfig(BindQueueRootConfigKey)
+
   private[rabbitmq] final val BindExchangeRootConfigKey = "avastRabbitMQBindExchangeDefaults"
   private[rabbitmq] final val BindExchangeDefaultConfig = ConfigFactory.defaultReference().getConfig(BindExchangeRootConfigKey)
 
@@ -203,7 +206,7 @@ private[rabbitmq] object DefaultRabbitMQClientFactory extends LazyLogging {
     }
 
     def bindQueue(config: Config, channel: ServerChannel, channelFactoryInfo: RabbitMQConnectionInfo): Task[Unit] = {
-      bindQueue(config.withFallback(ConsumerBindingDefaultConfig).as[BindQueue], channel, channelFactoryInfo)
+      bindQueue(config.withFallback(BindQueueDefaultConfig).as[BindQueue], channel, channelFactoryInfo)
     }
 
     def bindExchange(config: Config, channel: ServerChannel, channelFactoryInfo: RabbitMQConnectionInfo): Task[Unit] = {
@@ -228,7 +231,7 @@ private[rabbitmq] object DefaultRabbitMQClientFactory extends LazyLogging {
       import config._
 
       routingKeys.foreach {
-        DefaultRabbitMQClientFactory.this.bindQueue(channelFactoryInfo)(channel, queueName)(exchangeName, _, bindArguments.value)
+        DefaultRabbitMQClientFactory.this.bindQueue(channelFactoryInfo)(channel, queueName)(exchangeName, _, arguments.value)
       }
     }
 

core/src/main/scala/com/avast/clients/rabbitmq/configuration.scala

@@ -63,6 +63,6 @@ case class DeclareExchange(name: String, `type`: String, durable: Boolean, autoD
 
 case class DeclareQueue(name: String, durable: Boolean, exclusive: Boolean, autoDelete: Boolean, arguments: DeclareArguments)
 
-case class BindQueue(queueName: String, exchangeName: String, routingKeys: immutable.Seq[String], bindArguments: BindArguments)
+case class BindQueue(queueName: String, exchangeName: String, routingKeys: immutable.Seq[String], arguments: BindArguments)
 
 case class BindExchange(sourceExchangeName: String, destExchangeName: String, routingKeys: immutable.Seq[String], arguments: BindArguments)