Merge pull request #266 from jtarvydas/fixMarshallableFromCC

mpollmeier · web-flow · commit 0004dfa455c8 · 2018-11-14T19:54:59.000+13:00
Fix Marshallable's fromCC
diff --git a/macros/src/main/scala/gremlin/scala/Marshallable.scala b/macros/src/main/scala/gremlin/scala/Marshallable.scala
@@ -194,11 +194,10 @@ object Marshallable {
               this.FromCC(
                 $idParam,
                 $label,
-                _root_.scala.collection.immutable.List(..$fromCCParams)
+                _root_.scala.collection.immutable.List[_root_.scala.collection.immutable.List[(_root_.scala.Predef.String,_root_.scala.Any)]](..$fromCCParams)
                   .flatten
                   .filter { kv =>
-                    kv.isInstanceOf[Product2[_, _]] &&
-                    kv.asInstanceOf[Product2[_, _]]._2 != null
+                    _root_.scala.Option(kv._2).isDefined
                   }
               )
             def toCC(element: _root_.gremlin.scala.Element): $tpe = $companion(..$toCCParams)

Original file line number	Diff line number	Diff line change
`@@ -194,11 +194,10 @@ object Marshallable {`
`194`	`194`	`this.FromCC(`
`195`	`195`	`$idParam,`
`196`	`196`	`$label,`
`197`		`- _root_.scala.collection.immutable.List(..$fromCCParams)`
	`197`	`+ _root_.scala.collection.immutable.List[_root_.scala.collection.immutable.List[(_root_.scala.Predef.String,_root_.scala.Any)]](..$fromCCParams)`
`198`	`198`	`.flatten`
`199`	`199`	`.filter { kv =>`
`200`		`- kv.isInstanceOf[Product2[_, _]] &&`
`201`		`- kv.asInstanceOf[Product2[_, _]]._2 != null`
	`200`	`+ _root_.scala.Option(kv._2).isDefined`
`202`	`201`	`}`
`203`	`202`	`)`
`204`	`203`	`def toCC(element: _root_.gremlin.scala.Element): $tpe = $companion(..$toCCParams)`