Fix some Scala and R warnings

(c) Copyright IBM Corp. 2016
jupyter · Oct 5, 2016 · 7487a0a · 7487a0a
1 parent c42d2cc
commit 7487a0a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/kernel-r/declarativewidgets/man/widgets-package.Rd b/kernel-r/declarativewidgets/man/widgets-package.Rd
@@ -23,9 +23,9 @@ Maintainer: \packageMaintainer{declarativewidgets}
 }
 \references{
 ~~ Literature or other references for background information ~~
-}
 ~~ Optionally other standard keywords, one per line, from file KEYWORDS in ~~
 ~~ the R documentation directory ~~
+}
 \keyword{ package }
 \seealso{
 ~~ Optional links to other man pages, e.g. ~~

diff --git a/kernel-scala/src/main/scala/declarativewidgets/query/QuerySupport.scala b/kernel-scala/src/main/scala/declarativewidgets/query/QuerySupport.scala
@@ -42,17 +42,16 @@ trait QuerySupport extends LogLike {
     val by = toColExpr(
       expr \ "by" match {
         case JsString(col) => List(col)
-        case JsArray(colList:Seq[JsString]) => colList.map(_.as[String]).toList
+        case JsArray(colList:Seq[_]) => colList.map(_.as[String]).toList
         case _ => Nil
       }
     )
 
     val agg =  toArrayOfFuncExpr(
       expr \ "agg"  match {
         case anAgg:JsObject => List(anAgg)
-        case JsArray(aggList:Seq[JsObject]) => aggList.map(_.as[JsObject]).toList
+        case JsArray(aggList:Seq[_]) => aggList.map(_.as[JsObject]).toList
         case _ => List()
-
       }
     )
     //rename resultant column names to dataframe format i.e. sum(columnName) -> sum_columnName
@@ -71,14 +70,14 @@ trait QuerySupport extends LogLike {
     val by = toColExpr(
       expr \ "by" match {
         case JsString(col) => List(col)
-        case JsArray(colList:Seq[JsString]) => colList.map(_.as[String]).toList
+        case JsArray(colList:Seq[_]) => colList.map(_.as[String]).toList
         case _ => Nil
       })
 
     val ascending =
       expr \ "ascending"  match {
         case JsBoolean(asc) => List(asc)
-        case JsArray(ascList:Seq[JsBoolean]) => ascList.map(_.as[Boolean]).toList
+        case JsArray(ascList:Seq[_]) => ascList.map(_.as[Boolean]).toList
         case _ => Nil
       }
 

diff --git a/kernel-scala/src/main/scala/declarativewidgets/util/Explore.scala b/kernel-scala/src/main/scala/declarativewidgets/util/Explore.scala
@@ -37,7 +37,7 @@ object Explore {
   def getDfNameFromLastExploreRequest(): String = {
     val executingRequest = getExecutingRequest()
     val requestTrees = executingRequest.map(_.trees.head.asInstanceOf[reflect.runtime.universe.Tree])
-    val valDefTrees = requestTrees collect {case c: ValDef => c}
+    val valDefTrees = requestTrees.map(_.asInstanceOf[ValDef])
     val exploreTrees = valDefTrees.filter({ eTree =>
       val children = eTree.rhs.children
       children.length > 0 && children.head.toString.equals("explore")