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

JMS: accept Float as properties and map values #2408

Merged
merged 1 commit into from
Sep 14, 2020
Merged

JMS: accept Float as properties and map values #2408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions jms/src/main/scala/akka/stream/alpakka/jms/impl/JmsMessageProducer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ private class JmsMessageProducer(jmsProducer: jms.MessageProducer, jmsSession: J
case v: Boolean => message.setBooleanProperty(key, v)
case v: Byte => message.setByteProperty(key, v)
case v: Short => message.setShortProperty(key, v)
case v: Float => message.setFloatProperty(key, v)
case v: Long => message.setLongProperty(key, v)
case v: Double => message.setDoubleProperty(key, v)
case null => throw NullMessageProperty(key, jmsMessage)
Expand All @@ -98,6 +99,7 @@ private class JmsMessageProducer(jmsProducer: jms.MessageProducer, jmsSession: J
case v: Boolean => message.setBoolean(key, v)
case v: Byte => message.setByte(key, v)
case v: Short => message.setShort(key, v)
case v: Float => message.setFloat(key, v)
case v: Long => message.setLong(key, v)
case v: Double => message.setDouble(key, v)
case v: Array[Byte] => message.setBytes(key, v)
Expand Down
55 changes: 48 additions & 7 deletions jms/src/test/scala/akka/stream/alpakka/jms/impl/JmsMessageProducerSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,39 @@ class JmsMessageProducerSpec extends JmsSpec with MockitoSugar {
verify(textMessage).setDoubleProperty("double", 5.0)
}

"succeed if properties are set as map" in new Setup {
val props = Map(
"string" -> "string",
"int" -> 1,
"boolean" -> true,
"byte" -> 2.toByte,
"short" -> 3.toShort,
"float" -> 4.78f,
"Java-boxed float" -> java.lang.Float.valueOf(4.35f),
"long" -> 4L,
"Java-boxed long" -> java.lang.Long.valueOf(44L),
"double" -> 5.0
)

val jmsProducer = JmsMessageProducer(jmsSession, settings, 0)
jmsProducer.populateMessageProperties(
textMessage,
JmsTextMessage("test")
.withProperties(props)
)

verify(textMessage).setStringProperty("string", "string")
verify(textMessage).setIntProperty("int", 1)
verify(textMessage).setBooleanProperty("boolean", true)
verify(textMessage).setByteProperty("byte", 2.toByte)
verify(textMessage).setShortProperty("short", 3.toByte)
verify(textMessage).setFloatProperty("float", 4.78f)
verify(textMessage).setFloatProperty("Java-boxed float", 4.35f)
verify(textMessage).setLongProperty("long", 4L)
verify(textMessage).setLongProperty("Java-boxed long", 44L)
verify(textMessage).setDoubleProperty("double", 5.0)
}

"fail if a property is set to an unsupported type" in new Setup {
val jmsProducer = JmsMessageProducer(jmsSession, settings, 0)
assertThrows[UnsupportedMessagePropertyType] {
Expand All @@ -76,21 +109,29 @@ class JmsMessageProducerSpec extends JmsSpec with MockitoSugar {
val jmsProducer = JmsMessageProducer(jmsSession, settings, 0)
jmsProducer.createMessage(
JmsMapMessage(
Map("string" -> "string",
"int" -> 1,
"boolean" -> true,
"byte" -> 2.toByte,
"short" -> 3.toShort,
"long" -> 4L,
"double" -> 5.0)
Map(
"string" -> "string",
"int" -> 1,
"boolean" -> true,
"byte" -> 2.toByte,
"short" -> 3.toShort,
"float" -> 4.89f,
"Java-boxed float" -> java.lang.Float.valueOf(4.35f),
"long" -> 4L,
"Java-boxed long" -> java.lang.Long.valueOf(44L),
"double" -> 5.0
)
)
)
verify(mapMessage).setString("string", "string")
verify(mapMessage).setInt("int", 1)
verify(mapMessage).setBoolean("boolean", true)
verify(mapMessage).setByte("byte", 2.toByte)
verify(mapMessage).setShort("short", 3.toByte)
verify(mapMessage).setFloat("float", 4.89f)
verify(mapMessage).setFloat("Java-boxed float", 4.35f)
verify(mapMessage).setLong("long", 4L)
verify(mapMessage).setLong("Java-boxed long", 44L)
verify(mapMessage).setDouble("double", 5.0)
}

Expand Down