Skip to content
This repository was archived by the owner on Oct 13, 2025. It is now read-only.

Commit 48cb014

Browse files
dacrrashtao
dacr
and
rashtao
authored
Add scala 2.13 support (#12)
* Add scala 2.13 support and prepare cross scala build and release using SBT * Add project release file to help automation * miscellaneous updates for scala 2_13 Co-authored-by: Michele Rastelli <rashtao@gmail.com>
1 parent 0727e17 commit 48cb014

File tree

8 files changed

+85
-62
lines changed

8 files changed

+85
-62
lines changed

‎pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44

55
<groupId>com.arangodb</groupId>
6-
<artifactId>velocypack-module-scala_2.12</artifactId>
6+
<artifactId>velocypack-module-scala_2.13</artifactId>
77
<version>1.2.0</version>
88
<inceptionYear>2017</inceptionYear>
99
<packaging>jar</packaging>
@@ -80,7 +80,7 @@
8080
<artifactId>sbt-compiler-maven-plugin</artifactId>
8181
<version>1.0.0</version>
8282
<configuration>
83-
<scalaVersion>2.12.12</scalaVersion>
83+
<scalaVersion>2.13.1</scalaVersion>
8484
</configuration>
8585
<executions>
8686
<execution>
@@ -185,7 +185,7 @@
185185
</dependency>
186186
<dependency>
187187
<groupId>org.scalatest</groupId>
188-
<artifactId>scalatest_2.12</artifactId>
188+
<artifactId>scalatest_2.13</artifactId>
189189
<scope>test</scope>
190190
</dependency>
191191
<dependency>
@@ -209,8 +209,8 @@
209209
</dependency>
210210
<dependency>
211211
<groupId>org.scalatest</groupId>
212-
<artifactId>scalatest_2.12</artifactId>
213-
<version>3.0.0</version>
212+
<artifactId>scalatest_2.13</artifactId>
213+
<version>3.2.0</version>
214214
</dependency>
215215
<dependency>
216216
<groupId>junit</groupId>

‎src/main/scala/com/arangodb/velocypack/module/scala/VPackScalaModule.scala‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,19 @@ class VPackScalaModule extends VPackModule {
2929
classOf[List[Any]],
3030
classOf[Vector[Any]],
3131
classOf[Seq[Any]],
32-
Seq(Unit).getClass,
32+
Seq(()).getClass,
3333
Seq.empty.getClass,
3434
Nil.getClass
3535
).foreach(context.registerSerializer(_, VPackScalaSerializers.SEQ))
3636

3737
Set(
38-
classOf[HashMap.HashMap1[_, _]],
39-
classOf[HashMap.HashTrieMap[_, _]],
38+
classOf[Map.Map1[_, _]],
39+
classOf[Map.Map2[_, _]],
40+
classOf[Map.Map3[_, _]],
41+
classOf[Map.Map4[_, _]],
42+
classOf[HashMap[_, _]],
4043
classOf[TreeMap[_, _]],
41-
ListMap(Unit -> Unit).getClass,
44+
ListMap(() -> ()).getClass,
4245
classOf[Map[_, _]]
4346
).foreach(context.registerSerializer(_, VPackScalaSerializers.MAP))
4447

‎src/main/scala/com/arangodb/velocypack/module/scala/internal/VPackScalaDeserializers.scala‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import com.arangodb.velocypack.VPackDeserializationContext
55
import com.arangodb.velocypack.VPackSlice
66
import com.arangodb.velocypack.VPackDeserializerParameterizedType
77
import java.lang.reflect.ParameterizedType
8-
import scala.collection.JavaConversions._
8+
import scala.jdk.CollectionConverters._
99

1010
object VPackScalaDeserializers {
1111

@@ -28,7 +28,7 @@ object VPackScalaDeserializers {
2828

2929
def deserialize(parent: VPackSlice, vpack: VPackSlice, context: VPackDeserializationContext, t: ParameterizedType): List[Any] = {
3030
val clazz = t.getActualTypeArguments()(0).asInstanceOf[Class[Any]]
31-
vpack.arrayIterator().map { slice: VPackSlice => context.deserialize[Any](slice, clazz) }.toList
31+
vpack.arrayIterator().asScala.map { slice: VPackSlice => context.deserialize[Any](slice, clazz) }.toList
3232
}
3333
}
3434

@@ -38,13 +38,13 @@ object VPackScalaDeserializers {
3838

3939
def deserialize(parent: VPackSlice, vpack: VPackSlice, context: VPackDeserializationContext, t: ParameterizedType): Vector[Any] = {
4040
val clazz = t.getActualTypeArguments()(0).asInstanceOf[Class[Any]]
41-
vpack.arrayIterator().map { slice: VPackSlice => context.deserialize[Any](slice, clazz) }.toVector
41+
vpack.arrayIterator().asScala.map { slice: VPackSlice => context.deserialize[Any](slice, clazz) }.toVector
4242
}
4343
}
4444

4545
val MAP = new VPackDeserializer[Map[Any, Any]] {
4646
def deserialize(parent: VPackSlice, vpack: VPackSlice, context: VPackDeserializationContext): Map[Any, Any] =
47-
context.deserialize[java.util.Map[Any, Any]](vpack, classOf[java.util.Map[Any, Any]]).toMap
47+
context.deserialize[java.util.Map[Any, Any]](vpack, classOf[java.util.Map[Any, Any]]).asScala.toMap
4848
}
4949

5050
val BIG_INT = new VPackDeserializer[BigInt] {

‎src/main/scala/com/arangodb/velocypack/module/scala/internal/VPackScalaSerializers.scala‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import com.arangodb.velocypack.VPackSerializer
44
import com.arangodb.velocypack.VPackSerializationContext
55
import com.arangodb.velocypack.VPackBuilder
66
import scala.collection.mutable.ListBuffer
7-
import scala.collection.JavaConversions._
7+
import scala.jdk.CollectionConverters._
88

99
object VPackScalaSerializers {
1010

@@ -15,14 +15,14 @@ object VPackScalaSerializers {
1515

1616
val SEQ = new VPackSerializer[Seq[Any]] {
1717
def serialize(builder: VPackBuilder, attribute: String, value: Seq[Any], context: VPackSerializationContext): Unit = {
18-
val list: _root_.java.util.List[Any] = ListBuffer(value: _*)
18+
val list: _root_.java.util.List[Any] = ListBuffer(value: _*).asJava
1919
context.serialize(builder, attribute, list)
2020
}
2121
}
2222

2323
val MAP = new VPackSerializer[Map[Any, Any]] {
2424
def serialize(builder: VPackBuilder, attribute: String, value: Map[Any, Any], context: VPackSerializationContext): Unit =
25-
context.serialize(builder, attribute, mapAsJavaMap(value))
25+
context.serialize(builder, attribute, value.asJava)
2626
}
2727

2828
val BIG_INT = new VPackSerializer[BigInt] {

‎src/test/scala/com/arangodb/velocypack/module/scala/VPackListTest.scala‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.arangodb.velocypack.module.scala
22

3-
import org.scalatest.Matchers
4-
import org.scalatest.FunSuite
3+
import org.scalatest.funsuite._
4+
import org.scalatest.matchers._
55
import scala.beans.BeanProperty
66
import com.arangodb.velocypack.VPack
77
import com.arangodb.velocypack.VPackBuilder
@@ -11,7 +11,7 @@ case class ListTestEntity(@BeanProperty var s: List[String] = List(), @BeanPrope
1111
def this() = this(s = List())
1212
}
1313

14-
class VPackListTest extends FunSuite with Matchers {
14+
class VPackListTest extends AnyFunSuite with should.Matchers {
1515

1616
test("serialize list") {
1717
val vp = new VPack.Builder().registerModule(new VPackScalaModule).build()
@@ -33,15 +33,15 @@ class VPackListTest extends FunSuite with Matchers {
3333

3434
test("deserialize list") {
3535
val builder = new VPackBuilder()
36-
builder add ValueType.OBJECT
37-
builder add ("s", ValueType.ARRAY)
38-
builder add "hello world"
36+
builder.add(ValueType.OBJECT)
37+
builder.add("s", ValueType.ARRAY)
38+
builder.add("hello world")
3939
builder.close
40-
builder add ("i", ValueType.ARRAY)
41-
builder add new Integer(69)
40+
builder.add ("i", ValueType.ARRAY)
41+
builder.add(Integer.valueOf(69))
4242
builder.close
43-
builder add ("o", ValueType.ARRAY)
44-
builder add ValueType.OBJECT
43+
builder.add ("o", ValueType.ARRAY)
44+
builder.add(ValueType.OBJECT)
4545
builder.close
4646
builder.close
4747
builder.close

‎src/test/scala/com/arangodb/velocypack/module/scala/VPackMapTest.scala‎

Lines changed: 44 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.arangodb.velocypack.module.scala
22

3-
import com.arangodb.velocypack.module.scala.VPackMapTest._
43
import com.arangodb.velocypack.{VPack, VPackBuilder, ValueType}
5-
import org.scalatest.{FunSuite, Matchers}
4+
import org.scalatest.funsuite._
5+
import org.scalatest.matchers._
66

77
import scala.beans.BeanProperty
88
import scala.collection.immutable._
@@ -11,7 +11,7 @@ case class MapTestEntity(@BeanProperty var m: Map[String, Any] = Map()) {
1111
def this() = this(Map())
1212
}
1313

14-
class VPackMapTest extends FunSuite with Matchers {
14+
class VPackMapTest extends AnyFunSuite with should.Matchers {
1515

1616
test("serialize map") {
1717
val vp = new VPack.Builder().registerModule(new VPackScalaModule).build()
@@ -52,22 +52,28 @@ class VPackMapTest extends FunSuite with Matchers {
5252
val vp = new VPack.Builder().registerModule(new VPackScalaModule).build()
5353

5454
val entity = MapTestEntity(m =
55-
HashTrieMap("seq" -> Seq(
56-
HashTrieMap("foo" -> 42),
57-
SortedMap("foo" -> 42),
58-
ListMap("foo" -> 42),
59-
HashMap("foo" -> 42),
60-
Map("foo" -> 42),
61-
ListMap.empty,
62-
Map.empty
63-
)))
55+
HashMap( // scala <= 2.12 -> HashTrieMap is in fact used behind the scene when Map size is >= 5
56+
"seq" -> Seq(
57+
HashMap("foo" -> 42), // scala <= 2.12 -> Map.Map1, Map.Map2, Map.Map3, HashMap4 is in fact used behind the scene when Map size is <5
58+
SortedMap("foo" -> 42),
59+
ListMap("foo" -> 42),
60+
HashMap("foo" -> 42),
61+
Map("foo" -> 42),
62+
ListMap.empty,
63+
Map.empty
64+
),
65+
"seq2" -> Seq(Map("foo" -> 42)), // Map.Map1
66+
"seq3" -> Seq(Map("foo" -> 42, "foo2" -> 42)), // Map.Map2
67+
"seq4" -> Seq(Map("foo" -> 42, "foo2" -> 42, "foo3" -> 42)), // Map.Map3
68+
"seq5" -> Seq(Map("foo" -> 42, "foo2" -> 42, "foo3" -> 42, "foo4" -> 42)), // Map.Map4
69+
))
6470

6571
val vpack = vp.serialize(entity)
6672
vpack should not be null
6773
vpack.isObject should be(true)
6874
vpack.size should be(1)
6975
vpack.get("m").isObject should be(true)
70-
vpack.get("m").size should be(1)
76+
vpack.get("m").size should be(5)
7177
vpack.get("m").get("seq").isArray should be(true)
7278

7379
vpack.get("m").get("seq").get(0).isObject should be(true)
@@ -100,14 +106,35 @@ class VPackMapTest extends FunSuite with Matchers {
100106

101107
vpack.get("m").get("seq").get(5).isObject should be(true)
102108
vpack.get("m").get("seq").get(5).size should be(0)
109+
110+
vpack.get("m").get("seq2").get(0).isObject should be(true)
111+
vpack.get("m").get("seq2").get(0).size should be(1)
112+
vpack.get("m").get("seq2").get(0).get("foo").isInt should be(true)
113+
vpack.get("m").get("seq2").get(0).get("foo").getAsInt should be(42)
114+
115+
vpack.get("m").get("seq3").get(0).isObject should be(true)
116+
vpack.get("m").get("seq3").get(0).size should be(2)
117+
vpack.get("m").get("seq3").get(0).get("foo2").isInt should be(true)
118+
vpack.get("m").get("seq3").get(0).get("foo2").getAsInt should be(42)
119+
120+
vpack.get("m").get("seq4").get(0).isObject should be(true)
121+
vpack.get("m").get("seq4").get(0).size should be(3)
122+
vpack.get("m").get("seq4").get(0).get("foo3").isInt should be(true)
123+
vpack.get("m").get("seq4").get(0).get("foo3").getAsInt should be(42)
124+
125+
vpack.get("m").get("seq5").get(0).isObject should be(true)
126+
vpack.get("m").get("seq5").get(0).size should be(4)
127+
vpack.get("m").get("seq5").get(0).get("foo4").isInt should be(true)
128+
vpack.get("m").get("seq5").get(0).get("foo4").getAsInt should be(42)
129+
103130
}
104131

105132
test("deserialize map") {
106133
val builder = new VPackBuilder
107-
builder add ValueType.OBJECT
108-
builder add ("m", ValueType.OBJECT)
109-
builder add ("s", "hello world")
110-
builder add ("i", new Integer(69))
134+
builder.add(ValueType.OBJECT)
135+
builder.add("m", ValueType.OBJECT)
136+
builder.add("s", "hello world")
137+
builder.add("i", Integer.valueOf(69))
111138
builder.close
112139
builder.close
113140

@@ -119,11 +146,3 @@ class VPackMapTest extends FunSuite with Matchers {
119146
entity.m.get("i") should be(Some(69))
120147
}
121148
}
122-
123-
object VPackMapTest {
124-
125-
object HashTrieMap {
126-
def apply[A, B](pairs: (A, B)*): Map[A, B] = new HashMap.HashTrieMap(0, Array(HashMap(pairs: _*)), pairs.size)
127-
}
128-
129-
}

‎src/test/scala/com/arangodb/velocypack/module/scala/VPackOptionTest.scala‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@ package com.arangodb.velocypack.module.scala
22

33
import scala.beans.BeanProperty
44

5-
import org.scalatest.Finders
6-
import org.scalatest.FunSuite
7-
import org.scalatest.Matchers
5+
import org.scalatest.funsuite._
6+
import org.scalatest.matchers._
87

98
import com.arangodb.velocypack.VPack
109
import com.arangodb.velocypack.VPackBuilder
@@ -16,7 +15,7 @@ case class OptionTestEntity(@BeanProperty var s: Option[String] = Option.empty,
1615
def this() = this(s = Option.empty)
1716
}
1817

19-
class VPackOptionTest extends FunSuite with Matchers {
18+
class VPackOptionTest extends AnyFunSuite with should.Matchers {
2019

2120
test("serialize Option") {
2221
val vp = new VPack.Builder().registerModule(new VPackScalaModule).build()
@@ -51,11 +50,11 @@ class VPackOptionTest extends FunSuite with Matchers {
5150

5251
test("deserialize null") {
5352
val builder = new VPackBuilder()
54-
builder add ValueType.OBJECT
55-
builder add ("s", ValueType.NULL)
56-
builder add ("i", ValueType.NULL)
57-
builder add ("o", ValueType.NULL)
58-
builder close
53+
builder.add(ValueType.OBJECT)
54+
builder.add("s", ValueType.NULL)
55+
builder.add("i", ValueType.NULL)
56+
builder.add("o", ValueType.NULL)
57+
builder.close
5958

6059
val vp = new VPack.Builder().registerModule(new VPackScalaModule).build()
6160
val entity: OptionTestEntity = vp.deserialize(builder.slice, classOf[OptionTestEntity])

‎src/test/scala/com/arangodb/velocypack/module/scala/VPackSeqTest.scala‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ package com.arangodb.velocypack.module.scala
33
import java.{util => ju}
44

55
import com.arangodb.velocypack.{VPack, VPackBuilder, ValueType}
6-
import org.scalatest.{FunSuite, Matchers}
6+
import org.scalatest.funsuite._
7+
import org.scalatest.matchers._
8+
79

810
import scala.beans.BeanProperty
911

@@ -15,7 +17,7 @@ case class WrappedSeqTestEntity(map: Map[String, Any], seq: Seq[Any], opt: Optio
1517
def this() = this(Map.empty, Nil, None)
1618
}
1719

18-
class VPackSeqTest extends FunSuite with Matchers {
20+
class VPackSeqTest extends AnyFunSuite with should.Matchers {
1921

2022
test("serialize seq") {
2123
val vp = new VPack.Builder().registerModule(new VPackScalaModule).build()

0 commit comments

Comments
 (0)