diff --git a/config/src/main/java/com/typesafe/config/impl/ConfigSubstitution.java b/config/src/main/java/com/typesafe/config/impl/ConfigSubstitution.java index 0906fd21..cca0ebb5 100644 --- a/config/src/main/java/com/typesafe/config/impl/ConfigSubstitution.java +++ b/config/src/main/java/com/typesafe/config/impl/ConfigSubstitution.java @@ -23,6 +23,8 @@ import com.typesafe.config.ConfigValueType; final class ConfigSubstitution extends AbstractConfigValue implements Unmergeable { + private static final long serialVersionUID = 1L; + // this is a list of String and SubstitutionExpression where the // SubstitutionExpression has to be resolved to values, then if there's more // than one piece everything is stringified and concatenated diff --git a/config/src/test/scala/com/typesafe/config/impl/ConfigSubstitutionTest.scala b/config/src/test/scala/com/typesafe/config/impl/ConfigSubstitutionTest.scala index 91137f62..5236dea2 100644 --- a/config/src/test/scala/com/typesafe/config/impl/ConfigSubstitutionTest.scala +++ b/config/src/test/scala/com/typesafe/config/impl/ConfigSubstitutionTest.scala @@ -348,7 +348,7 @@ class ConfigSubstitutionTest extends TestUtils { "63743b787071007e00060000737200116a6176612e7574696c2e486173684d61700507dac1c31660" + "d103000246000a6c6f6164466163746f724900097468726573686f6c6478703f4000000000000c77" + "08000000100000000a7400046f626a457372002b636f6d2e74797065736166652e636f6e6669672e" + - "696d706c2e436f6e666967537562737469747574696f6e61f02fc05eca6d7d0200035a001069676e" + + "696d706c2e436f6e666967537562737469747574696f6e00000000000000010200035a001069676e" + "6f72657346616c6c6261636b7349000c7072656669784c656e6774684c000670696563657371007e" + "00087871007e00047371007e000700000008000000087071007e000c71007e000f70000000000073" + "7200146a6176612e7574696c2e4c696e6b65644c6973740c29535d4a608822030000787077040000" + diff --git a/config/src/test/scala/com/typesafe/config/impl/ConfigValueTest.scala b/config/src/test/scala/com/typesafe/config/impl/ConfigValueTest.scala index 62cd5dfe..f025c455 100644 --- a/config/src/test/scala/com/typesafe/config/impl/ConfigValueTest.scala +++ b/config/src/test/scala/com/typesafe/config/impl/ConfigValueTest.scala @@ -246,7 +246,7 @@ class ConfigValueTest extends TestUtils { def configSubstitutionSerializable() { val expectedSerialization = "" + "aced00057372002b636f6d2e74797065736166652e636f6e6669672e696d706c2e436f6e66696753" + - "7562737469747574696f6e61f02fc05eca6d7d0200035a001069676e6f72657346616c6c6261636b" + + "7562737469747574696f6e00000000000000010200035a001069676e6f72657346616c6c6261636b" + "7349000c7072656669784c656e6774684c00067069656365737400104c6a6176612f7574696c2f4c" + "6973743b7872002c636f6d2e74797065736166652e636f6e6669672e696d706c2e41627374726163" + "74436f6e66696756616c756500000000000000010200014c00066f726967696e74002d4c636f6d2f" + @@ -303,7 +303,7 @@ class ConfigValueTest extends TestUtils { "6176612e6c616e672e456e756d0000000000000000120000787074000747454e4552494370007372" + "00146a6176612e7574696c2e4c696e6b65644c6973740c29535d4a60882203000078707704000000" + "027372002b636f6d2e74797065736166652e636f6e6669672e696d706c2e436f6e66696753756273" + - "7469747574696f6e61f02fc05eca6d7d0200035a001069676e6f72657346616c6c6261636b734900" + + "7469747574696f6e00000000000000010200035a001069676e6f72657346616c6c6261636b734900" + "0c7072656669784c656e6774684c000670696563657371007e00017871007e00027371007e0005ff" + "ffffffffffffff7071007e000971007e000c7000000000007371007e000e7704000000017372002f" + "636f6d2e74797065736166652e636f6e6669672e696d706c2e537562737469747574696f6e457870" + @@ -364,7 +364,7 @@ class ConfigValueTest extends TestUtils { "0007ffffffffffffffff7074000c656d70747920636f6e66696771007e000e707371007e00107100" + "7e001700017372001e6a6176612e7574696c2e436f6c6c656374696f6e7324456d7074794d617059" + "3614855adce7d002000078707372002b636f6d2e74797065736166652e636f6e6669672e696d706c" + - "2e436f6e666967537562737469747574696f6e61f02fc05eca6d7d0200035a001069676e6f726573" + + "2e436f6e666967537562737469747574696f6e00000000000000010200035a001069676e6f726573" + "46616c6c6261636b7349000c7072656669784c656e6774684c000670696563657371007e00017871" + "007e00047371007e0007ffffffffffffffff7071007e000b71007e000e7000000000007371007e00" + "137704000000017372002f636f6d2e74797065736166652e636f6e6669672e696d706c2e53756273" +