From 9a187a2de9cc924be702980b733142bbfb398798 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Thu, 10 Nov 2011 20:16:04 -0500 Subject: [PATCH] rename getAny to getAnyRef makes it a better name in Scala --- src/main/java/com/typesafe/config/ConfigObject.java | 4 ++-- .../typesafe/config/impl/AbstractConfigObject.java | 4 ++-- .../config/impl/ConfigSubstitutionTest.scala | 5 +++-- .../scala/com/typesafe/config/impl/ConfigTest.scala | 12 ++++++------ 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/typesafe/config/ConfigObject.java b/src/main/java/com/typesafe/config/ConfigObject.java index 101d5289..4d74a000 100644 --- a/src/main/java/com/typesafe/config/ConfigObject.java +++ b/src/main/java/com/typesafe/config/ConfigObject.java @@ -43,7 +43,7 @@ public interface ConfigObject extends ConfigValue, Map { * Gets the value at the path as an unwrapped Java boxed value (Boolean, * Integer, Long, etc.) */ - Object getAny(String path); + Object getAnyRef(String path); /** * Gets the value at the given path, unless the value is a null value or @@ -99,7 +99,7 @@ public interface ConfigObject extends ConfigValue, Map { List getObjectList(String path); - List getAnyList(String path); + List getAnyRefList(String path); List getMemorySizeList(String path); diff --git a/src/main/java/com/typesafe/config/impl/AbstractConfigObject.java b/src/main/java/com/typesafe/config/impl/AbstractConfigObject.java index e6900898..fc81b487 100644 --- a/src/main/java/com/typesafe/config/impl/AbstractConfigObject.java +++ b/src/main/java/com/typesafe/config/impl/AbstractConfigObject.java @@ -307,7 +307,7 @@ abstract class AbstractConfigObject extends AbstractConfigValue implements } @Override - public Object getAny(String path) { + public Object getAnyRef(String path) { ConfigValue v = find(path, null, path); return v.unwrapped(); } @@ -423,7 +423,7 @@ abstract class AbstractConfigObject extends AbstractConfigValue implements } @Override - public List getAnyList(String path) { + public List getAnyRefList(String path) { List l = new ArrayList(); List list = getList(path); for (ConfigValue v : list) { diff --git a/src/test/scala/com/typesafe/config/impl/ConfigSubstitutionTest.scala b/src/test/scala/com/typesafe/config/impl/ConfigSubstitutionTest.scala index 3fb4d25c..af77c5e7 100644 --- a/src/test/scala/com/typesafe/config/impl/ConfigSubstitutionTest.scala +++ b/src/test/scala/com/typesafe/config/impl/ConfigSubstitutionTest.scala @@ -258,7 +258,8 @@ class ConfigSubstitutionTest extends TestUtils { "pwd" : ${PWD}, "shell" : ${SHELL}, "lang" : ${LANG}, - "path" : ${PATH} + "path" : ${PATH}, + "not_here" : ${NOT_HERE} } """) } @@ -276,7 +277,7 @@ class ConfigSubstitutionTest extends TestUtils { existed += 1 assertEquals(e, resolved.getString(k)) } else { - assertEquals(null, resolved.getAny(k)) + assertEquals(nullValue, resolved.get(k)) } } if (existed == 0) { diff --git a/src/test/scala/com/typesafe/config/impl/ConfigTest.scala b/src/test/scala/com/typesafe/config/impl/ConfigTest.scala index 62523bf0..08505647 100644 --- a/src/test/scala/com/typesafe/config/impl/ConfigTest.scala +++ b/src/test/scala/com/typesafe/config/impl/ConfigTest.scala @@ -167,12 +167,12 @@ class ConfigTest extends TestUtils { assertEquals(stringValue("abcd"), conf.getValue("strings.abcd")) // get stuff with getAny - assertEquals(42L, conf.getAny("ints.fortyTwo")) - assertEquals("abcd", conf.getAny("strings.abcd")) - assertEquals(false, conf.getAny("booleans.falseAgain")) + assertEquals(42L, conf.getAnyRef("ints.fortyTwo")) + assertEquals("abcd", conf.getAnyRef("strings.abcd")) + assertEquals(false, conf.getAnyRef("booleans.falseAgain")) // get empty array as any type of array - assertEquals(Seq(), conf.getAnyList("arrays.empty").asScala) + assertEquals(Seq(), conf.getAnyRefList("arrays.empty").asScala) assertEquals(Seq(), conf.getIntList("arrays.empty").asScala) assertEquals(Seq(), conf.getLongList("arrays.empty").asScala) assertEquals(Seq(), conf.getStringList("arrays.empty").asScala) @@ -188,9 +188,9 @@ class ConfigTest extends TestUtils { assertEquals(Seq(1L, 2L, 3L), conf.getLongList("arrays.ofInt").asScala) assertEquals(Seq("a", "b", "c"), conf.getStringList("arrays.ofString").asScala) assertEquals(Seq(3.14, 4.14, 5.14), conf.getDoubleList("arrays.ofDouble").asScala) - assertEquals(Seq(null, null, null), conf.getAnyList("arrays.ofNull").asScala) + assertEquals(Seq(null, null, null), conf.getAnyRefList("arrays.ofNull").asScala) assertEquals(Seq(true, false), conf.getBooleanList("arrays.ofBoolean").asScala) - val listOfLists = conf.getAnyList("arrays.ofArray").asScala map { _.asInstanceOf[java.util.List[_]].asScala } + val listOfLists = conf.getAnyRefList("arrays.ofArray").asScala map { _.asInstanceOf[java.util.List[_]].asScala } assertEquals(Seq(Seq("a", "b", "c"), Seq("a", "b", "c"), Seq("a", "b", "c")), listOfLists) assertEquals(3, conf.getObjectList("arrays.ofObject").asScala.length)