Skip to content

Commit b386dbe

Browse files
author
Dmitrii Kostianoi
committed
Fix scala 2.11 compilation issues introduced in b051d8c
1 parent 6432521 commit b386dbe

4 files changed

Lines changed: 7 additions & 8 deletions

File tree

addons/airbrake/src/main/scala/com/spingo/op_rabbit/AirbrakeLogger.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import com.rabbitmq.client.Envelope
55
import com.rabbitmq.client.AMQP.BasicProperties
66
import org.slf4j.LoggerFactory
77
import com.typesafe.config.ConfigFactory
8-
import scala.collection.convert.ImplicitConversions._
8+
import scala.collection.JavaConversions._
99

1010
/**
1111
== BATTERIES NOT INCLUDED ==

build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ val assertNoApplicationConf = taskKey[Unit]("Makes sure application.conf isn't p
1616
val commonSettings = Seq(
1717
organization := "com.spingo",
1818
version := appProperties.getProperty("version"),
19-
scalaVersion := "2.12.4",
20-
crossScalaVersions := Seq("2.11.8", "2.12.4"),
19+
scalaVersion := "2.11.12",
20+
crossScalaVersions := Seq("2.11.12", "2.12.4"),
2121
libraryDependencies ++= Seq(
2222
"com.chuusai" %% "shapeless" % "2.3.3",
2323
"com.typesafe" % "config" % "1.3.2",

core/src/main/scala/com/spingo/op_rabbit/ConnectionParams.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ case class ConnectionParams(
4646
factory.setPassword(password)
4747
factory.setVirtualHost(virtualHost)
4848
// Replace the table of client properties that will be sent to the server during subsequent connection startups.
49-
factory.setClientProperties(mapAsJavaMap(clientProperties))
49+
factory.setClientProperties(clientProperties.asJava)
5050
factory.setConnectionTimeout(connectionTimeout)
5151
factory.setExceptionHandler(exceptionHandler)
5252
factory.setRequestedChannelMax(requestedChannelMax)

core/src/main/scala/com/spingo/op_rabbit/properties/HeaderValue.scala

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import java.nio.charset.Charset
44
import java.util.Date
55
import com.rabbitmq.client.LongString
66
import scala.collection.JavaConverters._
7-
import scala.collection.convert.ImplicitConversionsToScala._
87

98
/**
109
Trait which represents all values allowed in property generc headers
@@ -122,7 +121,7 @@ object HeaderValue {
122121
implicit val convertFromByteArray : ToHeaderValue[Array[Byte] , ByteArrayHeaderValue] = ByteArrayHeaderValue(_)
123122
implicit def convertFromMap[T](implicit converter: ToHeaderValue[T, HeaderValue]): ToHeaderValue[Map[String, T], MapHeaderValue] = { m => MapHeaderValue(m.mapValues(converter)) }
124123
implicit def convertFromSeq[T](implicit converter: ToHeaderValue[T, HeaderValue]): ToHeaderValue[Seq[T], SeqHeaderValue] = { s => SeqHeaderValue(s.map(converter)) }
125-
implicit def convertFromJavaList[T](implicit converter: ToHeaderValue[T, HeaderValue]): ToHeaderValue[java.util.List[T], SeqHeaderValue] = { list => SeqHeaderValue(list.map(converter)) }
124+
implicit def convertFromJavaList[T](implicit converter: ToHeaderValue[T, HeaderValue]): ToHeaderValue[java.util.List[T], SeqHeaderValue] = { list => SeqHeaderValue(list.asScala.map(converter)) }
126125

127126
def apply[T](value: T)(implicit converter: ToHeaderValue[T, HeaderValue]): HeaderValue =
128127
if (value == null) NullHeaderValue else converter(value)
@@ -134,7 +133,7 @@ object HeaderValue {
134133
case v: java.math.BigDecimal => apply(v)
135134
case v: java.util.Date => apply(v)
136135
case v: java.util.Map[_, _] =>
137-
MapHeaderValue(v.map {
136+
MapHeaderValue(v.asScala.map {
138137
case (k, v: Object) => (k.toString, from(v))
139138
case (k, otherwise) =>
140139
throw new RuntimeException(
@@ -149,7 +148,7 @@ object HeaderValue {
149148
case v: Array[Byte] => apply(v)
150149
case null => NullHeaderValue
151150
case v: java.util.List[_] =>
152-
SeqHeaderValue(v.map { case v: Object => from(v) })
151+
SeqHeaderValue(v.asScala.map { case v: Object => from(v) })
153152
case v: Array[Object] =>
154153
SeqHeaderValue(v.map(from))
155154
case otherwise =>

0 commit comments

Comments
 (0)