lightbend · havocp · Jan 7, 2019 · Jan 5, 2019
diff --git a/build.sbt b/build.sbt
@@ -8,7 +8,7 @@ ThisBuild / git.baseVersion         := "1.3.0"
 ThisBuild / organization            := "com.typesafe"
 ThisBuild / Compile / scalacOptions := List("-unchecked", "-deprecation", "-feature")
 ThisBuild / Test / scalacOptions    := List("-unchecked", "-deprecation", "-feature")
-ThisBuild / scalaVersion            := "2.10.6"
+ThisBuild / scalaVersion            := "2.12.8"
 
 ThisBuild / scmInfo                 := Option(
   ScmInfo(url("https://github.com/lightbend/config"), "scm:[email protected]:lightbend/config.git")
@@ -63,7 +63,7 @@ lazy val configLib =  Project("config", file("config"))
   .settings(nocomma {
     autoScalaLibrary                       := false
     crossPaths                             := false
-    libraryDependencies                    += "net.liftweb" %% "lift-json" % "2.5" % Test
+    libraryDependencies                    += "net.liftweb" %% "lift-json" % "3.3.0" % Test
     libraryDependencies                    += "com.novocode" % "junit-interface" % "0.11" % Test
 
     Compile / compile / javacOptions       ++= Seq("-source", "1.8", "-target", "1.8",

diff --git a/config/src/test/scala/ApiExamples.scala b/config/src/test/scala/ApiExamples.scala
@@ -52,7 +52,7 @@ class ApiExamples {
         class EnhancedConfig(c: Config) {
             def getAny(path: String): Any = c.getAnyRef(path)
         }
-        implicit def config2enhanced(c: Config) = new EnhancedConfig(c)
+        implicit def config2enhanced(c: Config): EnhancedConfig = new EnhancedConfig(c)
 
         // somewhat nicer now
         val e: Int = conf.getAny("ints.fortyTwo") match {

diff --git a/config/src/test/scala/Profiling.scala b/config/src/test/scala/Profiling.scala
@@ -36,7 +36,7 @@ object Util {
     }
 
     def time(body: () => Unit, iterations: Int): Double = {
-        timeHelper(body, iterations, false)
+        timeHelper(body, iterations, retried = false)
     }
 
     def loop(args: Seq[String], body: () => Unit) {
@@ -57,10 +57,10 @@ object FileLoad extends App {
         }
     }
 
-    val ms = Util.time(task, 4000)
+    val ms = Util.time(() => task(), 4000)
     println("file load: " + ms + "ms")
 
-    Util.loop(args, task)
+    Util.loop(args, () => task())
 }
 
 object Resolve extends App {
@@ -73,10 +73,10 @@ object Resolve extends App {
         }
     }
 
-    val ms = Util.time(task, 3000000)
+    val ms = Util.time(() => task(), 3000000)
     println("resolve: " + ms + "ms")
 
-    Util.loop(args, task)
+    Util.loop(args, () => task())
 }
 
 object GetExistingPath extends App {
@@ -88,10 +88,10 @@ object GetExistingPath extends App {
         }
     }
 
-    val ms = Util.time(task, 2000000)
+    val ms = Util.time(() => task(), 2000000)
     println("GetExistingPath: " + ms + "ms")
 
-    Util.loop(args, task)
+    Util.loop(args, () => task())
 }
 
 object GetSeveralExistingPaths extends App {
@@ -105,10 +105,10 @@ object GetSeveralExistingPaths extends App {
         }
     }
 
-    val ms = Util.time(task, 5000000)
+    val ms = Util.time(() => task(), 5000000)
     println("GetSeveralExistingPaths: " + ms + "ms")
 
-    Util.loop(args, task)
+    Util.loop(args, () => task())
 }
 
 object HasPathOnMissing extends App {
@@ -120,10 +120,10 @@ object HasPathOnMissing extends App {
         }
     }
 
-    val ms = Util.time(task, 20000000)
+    val ms = Util.time(() => task(), 20000000)
     println("HasPathOnMissing: " + ms + "ms")
 
-    Util.loop(args, task)
+    Util.loop(args, () => task())
 }
 
 object CatchExceptionOnMissing extends App {
@@ -146,9 +146,9 @@ object CatchExceptionOnMissing extends App {
     }
 
     anotherStackFrame(40) { () =>
-        val ms = Util.time(task, 300000)
+        val ms = Util.time(() => task(), 300000)
         println("CatchExceptionOnMissing: " + ms + "ms")
 
-        Util.loop(args, task)
+        Util.loop(args, () => task())
     }
 }
diff --git a/config/src/test/scala/Rendering.scala b/config/src/test/scala/Rendering.scala
@@ -62,7 +62,7 @@ object RenderOptions extends App {
 
     val rendered =
         allBooleanLists(4).foldLeft(0) { (count, values) =>
-            val formatted = values(0)
+            val formatted = values.head
             val originComments = values(1)
             val comments = values(2)
             val json = values(3)

diff --git a/config/src/test/scala/com/typesafe/config/impl/ConfParserTest.scala b/config/src/test/scala/com/typesafe/config/impl/ConfParserTest.scala
@@ -15,14 +15,14 @@ import java.util.Properties
 
 class ConfParserTest extends TestUtils {
 
-    def parseWithoutResolving(s: String) = {
+    def parseWithoutResolving(s: String): AbstractConfigValue = {
         val options = ConfigParseOptions.defaults().
             setOriginDescription("test conf string").
             setSyntax(ConfigSyntax.CONF)
-        Parseable.newString(s, options).parseValue().asInstanceOf[AbstractConfigValue]
+        Parseable.newString(s, options).parseValue()
     }
 
-    def parse(s: String) = {
+    def parse(s: String): AbstractConfigValue = {
         val tree = parseWithoutResolving(s)
 
         // resolve substitutions so we can test problems with that, like cycles or
@@ -38,7 +38,7 @@ class ConfParserTest extends TestUtils {
     @Test
     def invalidConfThrows(): Unit = {
         // be sure we throw
-        for (invalid <- whitespaceVariations(invalidConf, false)) {
+        for (invalid <- whitespaceVariations(invalidConf, validInLift = false)) {
             addOffendingJsonToException("config", invalid.test) {
                 intercept[ConfigException] {
                     parse(invalid.test)
@@ -152,7 +152,7 @@ class ConfParserTest extends TestUtils {
                 }
             } catch {
                 case e: Throwable =>
-                    System.err.println("failed on: '" + invalid + "'");
+                    System.err.println("failed on: '" + invalid + "'")
                     throw e;
             }
         }
@@ -267,9 +267,9 @@ class ConfParserTest extends TestUtils {
             { s: String => s.replace(",\n", "  \n  \n  ,  \n  \n  ") },
             { s: String => dropCurlies(s) })
 
-        var tested = 0;
+        var tested = 0
         for (v <- valids; change <- changes) {
-            tested += 1;
+            tested += 1
             val obj = parseConfig(change(v))
             assertEquals(3, obj.root.size())
             assertEquals("y", obj.getString("a"))
@@ -351,7 +351,7 @@ class ConfParserTest extends TestUtils {
     }
 
     @Test
-    def toStringForParseables() {
+    def toStringForParseablesWorks() {
         // just be sure the toString don't throw, to get test coverage
         val options = ConfigParseOptions.defaults()
         Parseable.newFile(new File("foo"), options).toString
@@ -366,7 +366,7 @@ class ConfParserTest extends TestUtils {
     }
 
     private def assertComments(comments: Seq[String], conf: Config, path: String) {
-        assertEquals(comments, conf.getValue(path).origin().comments().asScala.toSeq)
+        assertEquals(comments, conf.getValue(path).origin().comments().asScala)
     }
 
     private def assertComments(comments: Seq[String], conf: Config, path: String, index: Int) {

diff --git a/config/src/test/scala/com/typesafe/config/impl/ConfigBeanFactoryTest.scala b/config/src/test/scala/com/typesafe/config/impl/ConfigBeanFactoryTest.scala
@@ -7,7 +7,7 @@ import beanconfig.EnumsConfig.{ Solution, Problem }
 import com.typesafe.config._
 
 import java.io.{ InputStream, InputStreamReader }
-import java.time.Duration;
+import java.time.Duration
 
 import beanconfig._
 import org.junit.Assert._
@@ -19,7 +19,7 @@ import scala.collection.mutable.ArrayBuffer
 class ConfigBeanFactoryTest extends TestUtils {
 
     @Test
-    def toCamelCase() {
+    def testToCamelCase() {
         assertEquals("configProp", ConfigImplUtil.toCamelCase("config-prop"))
         assertEquals("configProp", ConfigImplUtil.toCamelCase("configProp"))
         assertEquals("fooBar", ConfigImplUtil.toCamelCase("foo-----bar"))
@@ -122,10 +122,10 @@ class ConfigBeanFactoryTest extends TestUtils {
             ConfigMemorySize.ofBytes(1073741824)),
             beanConfig.getOfMemorySize.asScala)
 
-        val stringsConfigOne = new StringsConfig();
+        val stringsConfigOne = new StringsConfig()
         stringsConfigOne.setAbcd("testAbcdOne")
         stringsConfigOne.setYes("testYesOne")
-        val stringsConfigTwo = new StringsConfig();
+        val stringsConfigTwo = new StringsConfig()
         stringsConfigTwo.setAbcd("testAbcdTwo")
         stringsConfigTwo.setYes("testYesTwo")
 
@@ -155,10 +155,10 @@ class ConfigBeanFactoryTest extends TestUtils {
             ConfigMemorySize.ofBytes(1073741824)),
             beanConfig.getOfMemorySize.asScala)
 
-        val stringsConfigOne = new StringsConfig();
+        val stringsConfigOne = new StringsConfig()
         stringsConfigOne.setAbcd("testAbcdOne")
         stringsConfigOne.setYes("testYesOne")
-        val stringsConfigTwo = new StringsConfig();
+        val stringsConfigTwo = new StringsConfig()
         stringsConfigTwo.setAbcd("testAbcdTwo")
         stringsConfigTwo.setYes("testYesTwo")
 
@@ -200,7 +200,7 @@ class ConfigBeanFactoryTest extends TestUtils {
         assertEquals("abcd", beanConfig.getConfig.getString("abcd"))
         assertEquals(3, beanConfig.getConfigObj.toConfig.getInt("intVal"))
         assertEquals(stringValue("hello world"), beanConfig.getConfigValue)
-        assertEquals(List(1, 2, 3).map(intValue(_)), beanConfig.getList.asScala)
+        assertEquals(List(1, 2, 3).map(intValue), beanConfig.getList.asScala)
         assertEquals(true, beanConfig.getUnwrappedMap.get("shouldBeInt"))
         assertEquals(42, beanConfig.getUnwrappedMap.get("should-be-boolean"))
     }

diff --git a/config/src/test/scala/com/typesafe/config/impl/ConfigDocumentParserTest.scala b/config/src/test/scala/com/typesafe/config/impl/ConfigDocumentParserTest.scala
@@ -1,6 +1,7 @@
 package com.typesafe.config.impl
 
-import com.typesafe.config.{ ConfigException, ConfigSyntax, ConfigParseOptions }
+import com.typesafe.config.ConfigSyntax.JSON
+import com.typesafe.config.{ ConfigException, ConfigParseOptions, ConfigSyntax }
 import org.junit.Assert._
 import org.junit.Test
 
@@ -14,7 +15,7 @@ class ConfigDocumentParserTest extends TestUtils {
     private def parseJSONFailuresTest(origText: String, containsMessage: String) {
         var exceptionThrown = false
         val e = intercept[ConfigException] {
-            ConfigDocumentParser.parse(tokenize(origText), fakeOrigin(), ConfigParseOptions.defaults().setSyntax(ConfigSyntax.JSON))
+            ConfigDocumentParser.parse(tokenize(origText), fakeOrigin(), ConfigParseOptions.defaults().setSyntax(JSON))
         }
         assertTrue(e.getMessage.contains(containsMessage))
     }
@@ -25,7 +26,7 @@ class ConfigDocumentParserTest extends TestUtils {
         assertEquals(expectedRenderedText, node.render())
         assertTrue(node.isInstanceOf[ConfigNodeSimpleValue])
 
-        val nodeJSON = ConfigDocumentParser.parseValue(tokenize(origText), fakeOrigin(), ConfigParseOptions.defaults().setSyntax(ConfigSyntax.JSON))
+        val nodeJSON = ConfigDocumentParser.parseValue(tokenize(origText), fakeOrigin(), ConfigParseOptions.defaults().setSyntax(JSON))
         assertEquals(expectedRenderedText, nodeJSON.render())
         assertTrue(nodeJSON.isInstanceOf[ConfigNodeSimpleValue])
     }
@@ -35,7 +36,7 @@ class ConfigDocumentParserTest extends TestUtils {
         assertEquals(origText, node.render())
         assertTrue(node.isInstanceOf[ConfigNodeComplexValue])
 
-        val nodeJSON = ConfigDocumentParser.parseValue(tokenize(origText), fakeOrigin(), ConfigParseOptions.defaults().setSyntax(ConfigSyntax.JSON))
+        val nodeJSON = ConfigDocumentParser.parseValue(tokenize(origText), fakeOrigin(), ConfigParseOptions.defaults().setSyntax(JSON))
         assertEquals(origText, nodeJSON.render())
         assertTrue(nodeJSON.isInstanceOf[ConfigNodeComplexValue])
     }
@@ -45,7 +46,7 @@ class ConfigDocumentParserTest extends TestUtils {
         assertEquals(origText, node.render())
 
         val e = intercept[ConfigException] {
-            ConfigDocumentParser.parseValue(tokenize(origText), fakeOrigin(), ConfigParseOptions.defaults().setSyntax(ConfigSyntax.JSON))
+            ConfigDocumentParser.parseValue(tokenize(origText), fakeOrigin(), ConfigParseOptions.defaults().setSyntax(JSON))
         }
         assertTrue(e.getMessage.contains(containsMessage))
     }
@@ -58,7 +59,7 @@ class ConfigDocumentParserTest extends TestUtils {
     }
 
     @Test
-    def parseSuccess {
+    def parseSuccess() {
         parseTest("foo:bar")
         parseTest(" foo : bar ")
         parseTest("""include "foo.conf" """)
@@ -185,7 +186,7 @@ class ConfigDocumentParserTest extends TestUtils {
               ]
            }
       """
-        val node = ConfigDocumentParser.parse(tokenize(origText), fakeOrigin(), ConfigParseOptions.defaults().setSyntax(ConfigSyntax.JSON))
+        val node = ConfigDocumentParser.parse(tokenize(origText), fakeOrigin(), ConfigParseOptions.defaults().setSyntax(JSON))
         assertEquals(origText, node.render())
     }
 
@@ -249,7 +250,7 @@ class ConfigDocumentParserTest extends TestUtils {
     }
 
     @Test
-    def parseSingleValuesFailures {
+    def parseSingleValuesFailures() {
         // Parse Simple Value throws on leading and trailing whitespace, comments, or newlines
         parseLeadingTrailingFailure("   123")
         parseLeadingTrailingFailure("123   ")
@@ -267,17 +268,17 @@ class ConfigDocumentParserTest extends TestUtils {
 
         // Check that concatenations in JSON will throw an error
         var origText = "123 456 \"abc\""
-        var e = intercept[ConfigException] { ConfigDocumentParser.parseValue(tokenize(origText), fakeOrigin(), ConfigParseOptions.defaults().setSyntax(ConfigSyntax.JSON)) }
+        var e = intercept[ConfigException] { ConfigDocumentParser.parseValue(tokenize(origText), fakeOrigin(), ConfigParseOptions.defaults().setSyntax(JSON)) }
         assertTrue("expected message for parsing concat as json", e.getMessage.contains("Parsing JSON and the value set in withValueText was either a concatenation or had trailing whitespace, newlines, or comments"))
 
         // Check that keys with no separators and object values in JSON will throw an error
         origText = """{"foo" { "bar" : 12 } }"""
-        e = intercept[ConfigException] { ConfigDocumentParser.parseValue(tokenize(origText), fakeOrigin(), ConfigParseOptions.defaults().setSyntax((ConfigSyntax.JSON))) }
+        e = intercept[ConfigException] { ConfigDocumentParser.parseValue(tokenize(origText), fakeOrigin(), ConfigParseOptions.defaults().setSyntax(JSON)) }
         assertTrue("expected failure for key foo followed by token", e.getMessage.contains("""Key '"foo"' may not be followed by token: '{'"""))
     }
 
     @Test
-    def parseEmptyDocument {
+    def parseEmptyDocument() {
         val node = ConfigDocumentParser.parse(tokenize(""), fakeOrigin(), ConfigParseOptions.defaults())
         assertTrue(node.value().isInstanceOf[ConfigNodeObject])
         assertTrue(node.value().children().isEmpty())

diff --git a/config/src/test/scala/com/typesafe/config/impl/ConfigDocumentTest.scala b/config/src/test/scala/com/typesafe/config/impl/ConfigDocumentTest.scala
@@ -28,7 +28,7 @@ class ConfigDocumentTest extends TestUtils {
     }
 
     @Test
-    def configDocumentReplace {
+    def configDocumentReplace() {
         // Can handle parsing/replacement with a very simple map
         configDocumentReplaceConfTest("""{"a":1}""", """{"a":2}""", "2", "a")
         configDocumentReplaceJsonTest("""{"a":1}""", """{"a":2}""", "2", "a")
@@ -37,7 +37,7 @@ class ConfigDocumentTest extends TestUtils {
         configDocumentReplaceConfTest("a: b\nc = d", "a: b\nc = 12", "12", "c")
 
         // Can handle parsing/replacement with a complicated map
-        var origText =
+        val origText =
             """{
               "a":123,
               "b": 123.456,