Fix procedure syntax deprecation warnings Fixes following warning: procedure syntax is deprecated: instead, add `: Unit =` to explicitly declare `beforeEach`'s return type Change-Id: Icad3dce946a563bb0d4913bc40bf29d0b0871bcb
diff --git a/src/main/scala/com/googlesource/gerrit/plugins/analytics/Contributors.scala b/src/main/scala/com/googlesource/gerrit/plugins/analytics/Contributors.scala index 880c5e1..b9427d3 100644 --- a/src/main/scala/com/googlesource/gerrit/plugins/analytics/Contributors.scala +++ b/src/main/scala/com/googlesource/gerrit/plugins/analytics/Contributors.scala
@@ -44,7 +44,7 @@ @ArgOption(name = "--since", aliases = Array("--after", "-b"), usage = "(included) begin timestamp. Must be in the format 2006-01-02[ 15:04:05[.890][ -0700]]") - def setBeginDate(date: String) { + def setBeginDate(date: String) = { try { beginDate = Some(date.isoStringToLongDate) } catch { @@ -54,7 +54,7 @@ @ArgOption(name = "--until", aliases = Array("--before", "-e"), usage = "(excluded) end timestamp. Must be in the format 2006-01-02[ 15:04:05[.890][ -0700]]") - def setEndDate(date: String) { + def setEndDate(date: String) = { try { endDate = Some(date.isoStringToLongDate) } catch { @@ -64,7 +64,7 @@ @ArgOption(name = "--aggregate", aliases = Array("-g"), usage = "Type of aggregation requested. ") - def setGranularity(value: String) { + def setGranularity(value: String) = { try { granularity = Some(AggregationStrategy.apply(value)) } catch { @@ -90,7 +90,7 @@ @ArgOption(name = "--since", aliases = Array("--after", "-b"), metaVar = "QUERY", usage = "(included) begin timestamp. Must be in the format 2006-01-02[ 15:04:05[.890][ -0700]]") - def setBeginDate(date: String) { + def setBeginDate(date: String) = { try { beginDate = Some(date.isoStringToLongDate) } catch { @@ -100,7 +100,7 @@ @ArgOption(name = "--until", aliases = Array("--before", "-e"), metaVar = "QUERY", usage = "(excluded) end timestamp. Must be in the format 2006-01-02[ 15:04:05[.890][ -0700]]") - def setEndDate(date: String) { + def setEndDate(date: String) = { try { endDate = Some(date.isoStringToLongDate) } catch { @@ -110,7 +110,7 @@ @ArgOption(name = "--granularity", aliases = Array("--aggregate", "-g"), metaVar = "QUERY", usage = "can be one of EMAIL, EMAIL_HOUR, EMAIL_DAY, EMAIL_MONTH, EMAIL_YEAR, defaulting to EMAIL") - def setGranularity(value: String) { + def setGranularity(value: String) = { try { granularity = Some(AggregationStrategy.apply(value)) } catch {
diff --git a/src/main/scala/com/googlesource/gerrit/plugins/analytics/Module.scala b/src/main/scala/com/googlesource/gerrit/plugins/analytics/Module.scala index b0c643e..a57ebac 100644 --- a/src/main/scala/com/googlesource/gerrit/plugins/analytics/Module.scala +++ b/src/main/scala/com/googlesource/gerrit/plugins/analytics/Module.scala
@@ -22,7 +22,7 @@ class Module extends AbstractModule { - override protected def configure() { + override protected def configure() = { bind(classOf[BotLikeExtractor]).to(classOf[BotLikeExtractorImpl]) install(new CommitsStatisticsCacheModule())
diff --git a/src/main/scala/com/googlesource/gerrit/plugins/analytics/SshModule.scala b/src/main/scala/com/googlesource/gerrit/plugins/analytics/SshModule.scala index 48a48b4..01fe36d 100644 --- a/src/main/scala/com/googlesource/gerrit/plugins/analytics/SshModule.scala +++ b/src/main/scala/com/googlesource/gerrit/plugins/analytics/SshModule.scala
@@ -18,7 +18,7 @@ class SshModule extends PluginCommandModule { - override protected def configureCommands { + override protected def configureCommands = { command(classOf[ContributorsCommand]) } } \ No newline at end of file
diff --git a/src/main/scala/com/googlesource/gerrit/plugins/analytics/common/GsonFormatter.scala b/src/main/scala/com/googlesource/gerrit/plugins/analytics/common/GsonFormatter.scala index b054554..310ccd0 100644 --- a/src/main/scala/com/googlesource/gerrit/plugins/analytics/common/GsonFormatter.scala +++ b/src/main/scala/com/googlesource/gerrit/plugins/analytics/common/GsonFormatter.scala
@@ -28,7 +28,7 @@ .registerTypeHierarchyAdapter(classOf[Iterable[Any]], new IterableSerializer) .registerTypeHierarchyAdapter(classOf[Option[Any]], new OptionSerializer()) - def format[T](values: TraversableOnce[T], out: PrintWriter) { + def format[T](values: TraversableOnce[T], out: PrintWriter) = { val gson: Gson = gsonBuilder.create for (value <- values) {
diff --git a/src/test/scala/com/googlesource/gerrit/plugins/analytics/test/GerritTestDaemon.scala b/src/test/scala/com/googlesource/gerrit/plugins/analytics/test/GerritTestDaemon.scala index ec1d080..abb155e 100644 --- a/src/test/scala/com/googlesource/gerrit/plugins/analytics/test/GerritTestDaemon.scala +++ b/src/test/scala/com/googlesource/gerrit/plugins/analytics/test/GerritTestDaemon.scala
@@ -71,7 +71,7 @@ def newPersonIdent(name: String = "Test Person", email: String = "person@test.com", ts: Date = new Date()) = new PersonIdent(new PersonIdent(name, email), ts) - override def beforeEach() { + override def beforeEach() = { daemonTest.setUpTestPlugin() fileRepositoryName = daemonTest.newProject(testSpecificRepositoryName) fileRepository = daemonTest.getRepository(fileRepositoryName)