Get rid of scalaj-collections (#333)

salesforce · Jun 17, 2019 · 9fee4d4 · 9fee4d4
1 parent 13ddb4f
commit 9fee4d4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/build.gradle b/build.gradle
@@ -64,7 +64,6 @@ configure(allProjs) {
         scalaGraphVersion = '1.12.5'
         scalafmtVersion = '1.5.1'
         hadoopVersion = 'hadoop2'
-        scalajCollVersion = '0.1.2'
         json4sVersion = '3.2.11' // matches Spark dependency version
         jodaTimeVersion = '2.9.4'
         jodaConvertVersion = '1.8.1'

diff --git a/features/build.gradle b/features/build.gradle
@@ -5,8 +5,6 @@ dependencies {
     // Scala graph
     compile "org.scala-graph:graph-core_$scalaVersion:$scalaGraphVersion"
 
-    // Java -> Scala converters
-    compile "com.daodecode:scalaj-collection_$scalaVersion:$scalajCollVersion"
 
     // Sourcecode macros
     compile "com.lihaoyi:sourcecode_$scalaVersion:$sourceCodeVersion"

diff --git a/features/src/main/scala/com/salesforce/op/features/types/package.scala b/features/src/main/scala/com/salesforce/op/features/types/package.scala
@@ -30,7 +30,7 @@
 
 package com.salesforce.op.features
 
-import com.daodecode.scalaj.collection.immutable._
+import collection.JavaConverters._
 import org.apache.spark.ml.linalg.{Vector, Vectors}
 
 /**
@@ -206,20 +206,26 @@ package object types extends FeatureTypeSparkConverters {
 
   // Maps
   implicit class JMapStringConversions(val v: java.util.Map[String, String]) extends AnyVal {
-    def toTextMap: TextMap = new TextMap(Option(v).map(_.deepAsScalaImmutable).getOrElse(Map.empty))
+    def toTextMap: TextMap = new TextMap(Option(v).map(_.asScala.toMap).getOrElse(Map.empty))
   }
   implicit class JMapSetConversions(val v: java.util.Map[String, java.util.HashSet[String]]) extends AnyVal {
     def toMultiPickListMap: MultiPickListMap =
-      new MultiPickListMap(Option(v).map(_.deepAsScalaImmutable).getOrElse(Map.empty))
+      new MultiPickListMap(Option(v).map(_.asScala.mapValues(_.asScala.toSet).toMap).getOrElse(Map.empty))
   }
   implicit class JMapLongConversions(val v: java.util.Map[String, java.lang.Long]) extends AnyVal {
-    def toIntegralMap: IntegralMap = new IntegralMap(Option(v).map(_.deepAsScalaImmutable).getOrElse(Map.empty))
+    def toIntegralMap: IntegralMap = new IntegralMap(
+      Option(v).map(_.asScala.mapValues(_.longValue()).toMap).getOrElse(Map.empty)
+    )
   }
   implicit class JMapDoubleConversions(val v: java.util.Map[String, java.lang.Double]) extends AnyVal {
-    def toRealMap: RealMap = new RealMap(Option(v).map(_.deepAsScalaImmutable).getOrElse(Map.empty))
+    def toRealMap: RealMap = new RealMap(
+      Option(v).map(_.asScala.mapValues(_.doubleValue()).toMap).getOrElse(Map.empty)
+    )
   }
   implicit class JMapBooleanConversions(val v: java.util.Map[String, java.lang.Boolean]) extends AnyVal {
-    def toBinaryMap: BinaryMap = new BinaryMap(Option(v).map(_.deepAsScalaImmutable).getOrElse(Map.empty))
+    def toBinaryMap: BinaryMap = new BinaryMap(
+      Option(v).map(_.asScala.mapValues(_.booleanValue()).toMap).getOrElse(Map.empty)
+    )
   }
   implicit class MapStringConversions(val v: Map[String, String]) extends AnyVal {
     def toTextMap: TextMap = new TextMap(v)