From 7487a0a9d9c9f94284d67254066df7bdbbb68b6a Mon Sep 17 00:00:00 2001 From: peller Date: Tue, 27 Sep 2016 15:32:47 -0400 Subject: [PATCH] Fix some Scala and R warnings (c) Copyright IBM Corp. 2016 --- kernel-r/declarativewidgets/man/widgets-package.Rd | 2 +- .../scala/declarativewidgets/query/QuerySupport.scala | 9 ++++----- .../src/main/scala/declarativewidgets/util/Explore.scala | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/kernel-r/declarativewidgets/man/widgets-package.Rd b/kernel-r/declarativewidgets/man/widgets-package.Rd index 18f5cef4..51b4dffb 100644 --- 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 index b516d1db..e9ae1442 100644 --- a/kernel-scala/src/main/scala/declarativewidgets/query/QuerySupport.scala +++ b/kernel-scala/src/main/scala/declarativewidgets/query/QuerySupport.scala @@ -42,7 +42,7 @@ 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 } ) @@ -50,9 +50,8 @@ trait QuerySupport extends LogLike { 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 index abb622ce..0c8b0b64 100644 --- 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")