fix CI error - codestyle

apache · Oct 30, 2018 · af2d29a · af2d29a
1 parent 0a8d06b
commit af2d29a
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/scala-package/macros/src/main/scala/org/apache/mxnet/GeneratorBase.scala b/scala-package/macros/src/main/scala/org/apache/mxnet/GeneratorBase.scala
@@ -216,19 +216,17 @@ private[mxnet] trait RandomHelpers {
 
   // unify call targets (random_xyz and sample_xyz) and unify their argument types
   private def unifyRandom(func: Func, isSymbol: Boolean): Func = {
-    var typeConv = if (isSymbol)
+    var typeConv = if (isSymbol) {
       Map(
         "org.apache.mxnet.Symbol" -> "Any",
         "org.apache.mxnet.Base.MXFloat" -> "Any",
-        "Int" -> "Any"
-      )
-    else
+        "Int" -> "Any")
+    } else {
       Map(
         "org.apache.mxnet.NDArray" -> "Any",
         "org.apache.mxnet.Base.MXFloat" -> "Any",
-        "Int" -> "Any"
-      )
-
+        "Int" -> "Any")
+    }
     func.copy(
       name = func.name.replaceAll("(random|sample)_", ""),
       listOfArgs = func.listOfArgs

diff --git a/scala-package/macros/src/main/scala/org/apache/mxnet/NDArrayMacro.scala b/scala-package/macros/src/main/scala/org/apache/mxnet/NDArrayMacro.scala
@@ -95,9 +95,9 @@ private[mxnet] object TypedNDArrayAPIMacro extends TypedAPIMacroBase {
     structGeneration(c)(functionDefs, annottees: _*)
   }
 
-  override def apiReturnType = "org.apache.mxnet.NDArrayFuncReturn"
+  override def apiReturnType: String = "org.apache.mxnet.NDArrayFuncReturn"
 
-  override def apiDataType = "org.apache.mxnet.NDArray"
+  override def apiDataType: String = "org.apache.mxnet.NDArray"
 
   override protected def buildArgDef(func: Func): List[String] = {
     super.buildArgDef(func) ++ List(
@@ -155,9 +155,9 @@ private[mxnet] object TypedNDArrayRandomAPIMacro extends TypedAPIMacroBase
     )
   }
 
-  override def apiDataType = "Any"
+  override def apiDataType: String = "Any"
 
-  override def apiReturnType = "org.apache.mxnet.NDArrayFuncReturn"
+  override def apiReturnType: String = "org.apache.mxnet.NDArrayFuncReturn"
 
   override def prepareBackendCall(function: Func): List[String] = {
     val impl = ListBuffer[String]()
@@ -186,10 +186,11 @@ private[mxnet] object TypedNDArrayRandomAPIMacro extends TypedAPIMacroBase
          """.stripMargin
           }
         } else {
-          if (arg.isOptional)
+          if (arg.isOptional) {
             s"""if (!${arg.safeArgName}.isEmpty) map("${arg.argName}") = ${arg.safeArgName}.get"""
-          else
+          } else {
             s"""map("${arg.argName}") = ${arg.safeArgName}"""
+          }
         }
       }
     }

diff --git a/scala-package/macros/src/main/scala/org/apache/mxnet/SymbolMacro.scala b/scala-package/macros/src/main/scala/org/apache/mxnet/SymbolMacro.scala
@@ -90,9 +90,9 @@ private[mxnet] object TypedSymbolAPIMacro extends TypedAPIMacroBase {
     structGeneration(c)(functionDefs, annottees: _*)
   }
 
-  override def apiReturnType = "org.apache.mxnet.Symbol"
+  override def apiReturnType: String = "org.apache.mxnet.Symbol"
 
-  override def apiDataType = "org.apache.mxnet.Symbol"
+  override def apiDataType: String = "org.apache.mxnet.Symbol"
 
   override protected def buildArgDef(func: Func): List[String] = {
     super.buildArgDef(func) ++ List(
@@ -142,9 +142,9 @@ private[mxnet] object TypedSymbolRandomAPIMacro extends TypedAPIMacroBase
     structGeneration(c)(functionDefs, annottees: _*)
   }
 
-  override def apiDataType = "Any"
+  override def apiDataType: String = "Any"
 
-  override def apiReturnType = "org.apache.mxnet.Symbol"
+  override def apiReturnType: String = "org.apache.mxnet.Symbol"
 
   override protected def buildArgDef(func: Func): List[String] = {
     super.buildArgDef(func) ++ List(
@@ -163,10 +163,11 @@ private[mxnet] object TypedSymbolRandomAPIMacro extends TypedAPIMacroBase
         s"args = ${arg.safeArgName}.toSeq"
       } else {
         // all go in kwargs
-        if (arg.isOptional)
+        if (arg.isOptional) {
           s"""if (!${arg.safeArgName}.isEmpty) map("${arg.argName}") = ${arg.safeArgName}.get"""
-        else
+        } else {
           s"""map("${arg.argName}") = ${arg.safeArgName}"""
+        }
       }
     }