[openwhisk] branch master updated: Enable strict compile options on all scala projects and fix warnings. (#4742)

[ch...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

chetanm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwhisk.git


The following commit(s) were added to refs/heads/master by this push:
     new eb25b67  Enable strict compile options on all scala projects and fix warnings. (#4742)
eb25b67 is described below

commit eb25b67e09177daab28f85ce802b10f5b429589b
Author: Markus Thömmes <ma...@me.com>
AuthorDate: Fri Nov 22 05:01:55 2019 +0100

    Enable strict compile options on all scala projects and fix warnings. (#4742)
---
 core/standalone/build.gradle                             |  4 ++++
 .../apache/openwhisk/standalone/ServerStartupCheck.scala |  2 +-
 tools/admin/build.gradle                                 |  4 ++++
 .../apache/openwhisk/core/database/LimitsCommand.scala   | 16 ++++------------
 .../org/apache/openwhisk/core/database/UserCommand.scala |  7 ++++---
 5 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/core/standalone/build.gradle b/core/standalone/build.gradle
index 3a23524..81b19ac 100644
--- a/core/standalone/build.gradle
+++ b/core/standalone/build.gradle
@@ -162,6 +162,10 @@ dependencies {
     testCompile "org.scalatest:scalatest_${gradle.scala.depVersion}:3.0.5"
 }
 
+tasks.withType(ScalaCompile) {
+    scalaCompileOptions.additionalParameters = gradle.scala.compileFlags
+}
+
 gradle.projectsEvaluated {
     tasks.withType(Test) {
         testLogging {
diff --git a/core/standalone/src/main/scala/org/apache/openwhisk/standalone/ServerStartupCheck.scala b/core/standalone/src/main/scala/org/apache/openwhisk/standalone/ServerStartupCheck.scala
index 04a2c9f..56f6f0d 100644
--- a/core/standalone/src/main/scala/org/apache/openwhisk/standalone/ServerStartupCheck.scala
+++ b/core/standalone/src/main/scala/org/apache/openwhisk/standalone/ServerStartupCheck.scala
@@ -17,7 +17,7 @@
 
 package org.apache.openwhisk.standalone
 
-import java.net.{HttpURLConnection, URI, URL}
+import java.net.{HttpURLConnection, URL}
 
 import akka.http.scaladsl.model.Uri
 import com.google.common.base.Stopwatch
diff --git a/tools/admin/build.gradle b/tools/admin/build.gradle
index d0e87d0..e6fb24a 100644
--- a/tools/admin/build.gradle
+++ b/tools/admin/build.gradle
@@ -50,3 +50,7 @@ dependencies {
     compile project(':common:scala')
     compile "org.rogach:scallop_${gradle.scala.depVersion}:3.1.2"
 }
+
+tasks.withType(ScalaCompile) {
+    scalaCompileOptions.additionalParameters = gradle.scala.compileFlags
+}
diff --git a/tools/admin/src/main/scala/org/apache/openwhisk/core/database/LimitsCommand.scala b/tools/admin/src/main/scala/org/apache/openwhisk/core/database/LimitsCommand.scala
index 9c3ea32..83973f5 100644
--- a/tools/admin/src/main/scala/org/apache/openwhisk/core/database/LimitsCommand.scala
+++ b/tools/admin/src/main/scala/org/apache/openwhisk/core/database/LimitsCommand.scala
@@ -19,26 +19,18 @@ package org.apache.openwhisk.core.database
 
 import akka.actor.ActorSystem
 import akka.stream.ActorMaterializer
-import org.rogach.scallop.{ScallopConfBase, Subcommand}
-import spray.json.{JsObject, JsString, JsValue, RootJsonFormat}
 import org.apache.openwhisk.common.{Logging, TransactionId}
 import org.apache.openwhisk.core.cli.{CommandError, CommandMessages, IllegalState, WhiskCommand}
 import org.apache.openwhisk.core.database.LimitsCommand.LimitEntity
 import org.apache.openwhisk.core.entity.types.AuthStore
-import org.apache.openwhisk.core.entity.{
-  DocId,
-  DocInfo,
-  DocRevision,
-  EntityName,
-  Subject,
-  UserLimits,
-  WhiskAuth,
-  WhiskDocumentReader
-}
+import org.apache.openwhisk.core.entity._
 import org.apache.openwhisk.http.Messages
 import org.apache.openwhisk.spi.SpiLoader
+import org.rogach.scallop.{ScallopConfBase, Subcommand}
+import spray.json.{JsObject, JsString, JsValue, RootJsonFormat}
 
 import scala.concurrent.{ExecutionContext, Future}
+import scala.language.reflectiveCalls
 import scala.reflect.classTag
 import scala.util.{Properties, Try}
 
diff --git a/tools/admin/src/main/scala/org/apache/openwhisk/core/database/UserCommand.scala b/tools/admin/src/main/scala/org/apache/openwhisk/core/database/UserCommand.scala
index 91d2e9d..4e4247b 100644
--- a/tools/admin/src/main/scala/org/apache/openwhisk/core/database/UserCommand.scala
+++ b/tools/admin/src/main/scala/org/apache/openwhisk/core/database/UserCommand.scala
@@ -22,17 +22,18 @@ import java.util.UUID
 import akka.actor.ActorSystem
 import akka.stream.ActorMaterializer
 import akka.stream.scaladsl.{Sink, Source}
-import org.rogach.scallop.{ScallopConfBase, Subcommand}
-import spray.json.{JsBoolean, JsObject, JsString, JsValue, RootJsonFormat}
 import org.apache.openwhisk.common.{Logging, TransactionId}
 import org.apache.openwhisk.core.cli.{CommandError, CommandMessages, IllegalState, WhiskCommand}
 import org.apache.openwhisk.core.database.UserCommand.ExtendedAuth
-import org.apache.openwhisk.core.entity.types._
 import org.apache.openwhisk.core.entity._
+import org.apache.openwhisk.core.entity.types._
 import org.apache.openwhisk.http.Messages
 import org.apache.openwhisk.spi.SpiLoader
+import org.rogach.scallop.{ScallopConfBase, Subcommand}
+import spray.json.{JsBoolean, JsObject, JsString, JsValue, RootJsonFormat}
 
 import scala.concurrent.{ExecutionContext, Future}
+import scala.language.reflectiveCalls
 import scala.reflect.classTag
 import scala.util.{Properties, Try}