scalastyle add return check (warning level)

yzhliu · Dec 31, 2015 · ab87ca9 · ab87ca9
1 parent def4e70
commit ab87ca9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/scala-package/core/scalastyle-config.xml b/scala-package/core/scalastyle-config.xml
@@ -142,4 +142,7 @@ You can also disable only one rule, by specifying its rule id, as specified in:
   <check level="error" class="org.scalastyle.scalariform.IllegalImportsChecker" enabled="true">
     <parameters><parameter name="illegalImports"><![CDATA[sun._,java.awt._]]></parameter></parameters>
   </check>
+
+  <!-- We can use return quite a bit for control flows and guards -->
+  <check level="warning" class="org.scalastyle.scalariform.ReturnChecker" enabled="true"></check>
 </scalastyle>
diff --git a/scala-package/core/src/main/scala/ml/dmlc/mxnet/IO.scala b/scala-package/core/src/main/scala/ml/dmlc/mxnet/IO.scala
@@ -56,7 +56,7 @@ object IO {
     val keys = params.keys.toArray
     val vals = params.values.toArray
     checkCall(_LIB.mxDataIterCreateIter(handle, keys, vals, out))
-    return new MXDataIter(out)
+    new MXDataIter(out)
   }
 }
 
@@ -180,7 +180,7 @@ class MXDataIter(val handle: DataIterHandle) extends DataIter {
     val outIndex = new ListBuffer[Long]
     val outSize = new RefLong
     checkCall(_LIB.mxDataIterGetIndex(handle, outIndex, outSize))
-    return outIndex.toList
+    outIndex.toList
   }
 
   /**

diff --git a/tests/travis/run_test.sh b/tests/travis/run_test.sh
@@ -142,6 +142,7 @@ if [ ${TASK} == "scala_test" ]; then
 fi
 
 if [ ${TASK} == "scala_lint" ]; then
+    export JAVA_HOME=$(/usr/libexec/java_home)
     cd scala-package/core
     mvn scalastyle:check || exit -1
     exit 0