From e11f117200cafe912745d4fecdde40433090afe3 Mon Sep 17 00:00:00 2001
From: Havoc Pennington <hp@pobox.com>
Date: Tue, 8 Nov 2011 21:37:19 -0500
Subject: [PATCH] make ConfigTransformer private, don't think it's useful

---
 src/main/java/com/typesafe/config/Config.java   |  2 +-
 .../java/com/typesafe/config/ConfigConfig.java  |  7 +------
 .../com/typesafe/config/ConfigTransformer.java  | 11 -----------
 .../config/impl/AbstractConfigObject.java       |  1 -
 .../com/typesafe/config/impl/ConfigImpl.java    | 14 +++++---------
 .../typesafe/config/impl/ConfigTransformer.java | 17 +++++++++++++++++
 .../config/impl/DefaultTransformer.java         |  4 +++-
 .../config/impl/SimpleConfigObject.java         |  1 -
 .../typesafe/config/impl/StackConfigObject.java |  1 -
 .../typesafe/config/impl/StackTransformer.java  |  1 -
 .../config/impl/TransformedConfigObject.java    |  1 -
 .../typesafe/config/impl/ConfParserTest.scala   |  4 ----
 .../typesafe/config/impl/ConfigValueTest.scala  |  4 ----
 .../com/typesafe/config/impl/JsonTest.scala     |  4 ----
 .../com/typesafe/config/impl/TokenTest.scala    |  4 ----
 .../typesafe/config/impl/TokenizerTest.scala    |  4 ----
 16 files changed, 27 insertions(+), 53 deletions(-)
 delete mode 100644 src/main/java/com/typesafe/config/ConfigTransformer.java
 create mode 100644 src/main/java/com/typesafe/config/impl/ConfigTransformer.java

diff --git a/src/main/java/com/typesafe/config/Config.java b/src/main/java/com/typesafe/config/Config.java
index b5763a0a..8a32501f 100644
--- a/src/main/java/com/typesafe/config/Config.java
+++ b/src/main/java/com/typesafe/config/Config.java
@@ -10,7 +10,7 @@ public final class Config {
     }
 
     public static ConfigObject load(String rootPath) {
-        return ConfigImpl.loadConfig(new ConfigConfig(rootPath, null));
+        return ConfigImpl.loadConfig(new ConfigConfig(rootPath));
     }
 
     private static String getUnits(String s) {
diff --git a/src/main/java/com/typesafe/config/ConfigConfig.java b/src/main/java/com/typesafe/config/ConfigConfig.java
index a09483b2..02bc712a 100644
--- a/src/main/java/com/typesafe/config/ConfigConfig.java
+++ b/src/main/java/com/typesafe/config/ConfigConfig.java
@@ -6,17 +6,12 @@ package com.typesafe.config;
 public final class ConfigConfig {
 
     private String rootPath;
-    private ConfigTransformer extraTransformer;
 
-    public ConfigConfig(String rootPath, ConfigTransformer extraTransformer) {
+    public ConfigConfig(String rootPath) {
         this.rootPath = rootPath;
     }
 
     public String rootPath() {
         return rootPath;
     }
-
-    public ConfigTransformer extraTransformer() {
-        return extraTransformer;
-    }
 }
diff --git a/src/main/java/com/typesafe/config/ConfigTransformer.java b/src/main/java/com/typesafe/config/ConfigTransformer.java
deleted file mode 100644
index 8e970ec6..00000000
--- a/src/main/java/com/typesafe/config/ConfigTransformer.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.typesafe.config;
-
-/**
- * A ConfigTransformer converts values in the config to other values, most often
- * it's used to parse strings and treat them as some other kind of value.
- * There's no implementation of ConfigValue included in the public API of this
- * library, you have to just create one.
- */
-public interface ConfigTransformer {
-    ConfigValue transform(ConfigValue value, ConfigValueType requested);
-}
diff --git a/src/main/java/com/typesafe/config/impl/AbstractConfigObject.java b/src/main/java/com/typesafe/config/impl/AbstractConfigObject.java
index 76146ab3..822325d2 100644
--- a/src/main/java/com/typesafe/config/impl/AbstractConfigObject.java
+++ b/src/main/java/com/typesafe/config/impl/AbstractConfigObject.java
@@ -11,7 +11,6 @@ import com.typesafe.config.Config;
 import com.typesafe.config.ConfigException;
 import com.typesafe.config.ConfigObject;
 import com.typesafe.config.ConfigOrigin;
-import com.typesafe.config.ConfigTransformer;
 import com.typesafe.config.ConfigValue;
 import com.typesafe.config.ConfigValueType;
 
diff --git a/src/main/java/com/typesafe/config/impl/ConfigImpl.java b/src/main/java/com/typesafe/config/impl/ConfigImpl.java
index 54658407..92082d7f 100644
--- a/src/main/java/com/typesafe/config/impl/ConfigImpl.java
+++ b/src/main/java/com/typesafe/config/impl/ConfigImpl.java
@@ -11,7 +11,6 @@ import java.util.Properties;
 import com.typesafe.config.ConfigConfig;
 import com.typesafe.config.ConfigException;
 import com.typesafe.config.ConfigObject;
-import com.typesafe.config.ConfigTransformer;
 import com.typesafe.config.ConfigValue;
 
 /** This is public but is only supposed to be used by the "config" package */
@@ -30,8 +29,7 @@ public class ConfigImpl {
         if (system != null)
             stack.add(system);
 
-        ConfigTransformer transformer = withExtraTransformer(configConfig
-                .extraTransformer());
+        ConfigTransformer transformer = withExtraTransformer(null);
 
         AbstractConfigObject merged = AbstractConfigObject
                 .merge(new SimpleConfigOrigin("config for "
@@ -40,20 +38,18 @@ public class ConfigImpl {
         return merged;
     }
 
-    public static ConfigObject getEnvironmentAsConfig(
-            ConfigTransformer extraTransformer) {
+    public static ConfigObject getEnvironmentAsConfig() {
         // This should not need to create a new config object
         // as long as the transformer is just the default transformer.
         return AbstractConfigObject.transformed(envVariablesConfig(),
-                withExtraTransformer(extraTransformer));
+                withExtraTransformer(null));
     }
 
-    public static ConfigObject getSystemPropertiesAsConfig(
-            ConfigTransformer extraTransformer) {
+    public static ConfigObject getSystemPropertiesAsConfig() {
         // This should not need to create a new config object
         // as long as the transformer is just the default transformer.
         return AbstractConfigObject.transformed(systemPropertiesConfig(),
-                withExtraTransformer(extraTransformer));
+                withExtraTransformer(null));
     }
 
     private static ConfigTransformer withExtraTransformer(
diff --git a/src/main/java/com/typesafe/config/impl/ConfigTransformer.java b/src/main/java/com/typesafe/config/impl/ConfigTransformer.java
new file mode 100644
index 00000000..3777d879
--- /dev/null
+++ b/src/main/java/com/typesafe/config/impl/ConfigTransformer.java
@@ -0,0 +1,17 @@
+package com.typesafe.config.impl;
+
+import com.typesafe.config.ConfigValue;
+import com.typesafe.config.ConfigValueType;
+
+/**
+ * A ConfigTransformer converts values in the config to other values, most often
+ * it's used to parse strings and treat them as some other kind of value.
+ * 
+ * This was originally in the public API but I'm now thinking it is not useful
+ * to customize, so it's not public for now. It's still used internally, but
+ * probably the code could be cleaned up by just hard-coding the equivalent of
+ * the DefaultTransformer.
+ */
+interface ConfigTransformer {
+    ConfigValue transform(ConfigValue value, ConfigValueType requested);
+}
diff --git a/src/main/java/com/typesafe/config/impl/DefaultTransformer.java b/src/main/java/com/typesafe/config/impl/DefaultTransformer.java
index af944939..e884cbe1 100644
--- a/src/main/java/com/typesafe/config/impl/DefaultTransformer.java
+++ b/src/main/java/com/typesafe/config/impl/DefaultTransformer.java
@@ -1,9 +1,11 @@
 package com.typesafe.config.impl;
 
-import com.typesafe.config.ConfigTransformer;
 import com.typesafe.config.ConfigValue;
 import com.typesafe.config.ConfigValueType;
 
+/**
+ * Default automatic type transformations.
+ */
 class DefaultTransformer implements ConfigTransformer {
 
     @Override
diff --git a/src/main/java/com/typesafe/config/impl/SimpleConfigObject.java b/src/main/java/com/typesafe/config/impl/SimpleConfigObject.java
index 4b13862b..a17202ea 100644
--- a/src/main/java/com/typesafe/config/impl/SimpleConfigObject.java
+++ b/src/main/java/com/typesafe/config/impl/SimpleConfigObject.java
@@ -7,7 +7,6 @@ import java.util.Set;
 import com.typesafe.config.ConfigException;
 import com.typesafe.config.ConfigObject;
 import com.typesafe.config.ConfigOrigin;
-import com.typesafe.config.ConfigTransformer;
 import com.typesafe.config.ConfigValue;
 
 class SimpleConfigObject extends AbstractConfigObject {
diff --git a/src/main/java/com/typesafe/config/impl/StackConfigObject.java b/src/main/java/com/typesafe/config/impl/StackConfigObject.java
index 63ffd243..91a13897 100644
--- a/src/main/java/com/typesafe/config/impl/StackConfigObject.java
+++ b/src/main/java/com/typesafe/config/impl/StackConfigObject.java
@@ -8,7 +8,6 @@ import java.util.Map;
 import java.util.Set;
 
 import com.typesafe.config.ConfigOrigin;
-import com.typesafe.config.ConfigTransformer;
 import com.typesafe.config.ConfigValue;
 
 /**
diff --git a/src/main/java/com/typesafe/config/impl/StackTransformer.java b/src/main/java/com/typesafe/config/impl/StackTransformer.java
index 31ac996e..013a9c34 100644
--- a/src/main/java/com/typesafe/config/impl/StackTransformer.java
+++ b/src/main/java/com/typesafe/config/impl/StackTransformer.java
@@ -2,7 +2,6 @@ package com.typesafe.config.impl;
 
 import java.util.List;
 
-import com.typesafe.config.ConfigTransformer;
 import com.typesafe.config.ConfigValue;
 import com.typesafe.config.ConfigValueType;
 
diff --git a/src/main/java/com/typesafe/config/impl/TransformedConfigObject.java b/src/main/java/com/typesafe/config/impl/TransformedConfigObject.java
index eee4d31b..9098af18 100644
--- a/src/main/java/com/typesafe/config/impl/TransformedConfigObject.java
+++ b/src/main/java/com/typesafe/config/impl/TransformedConfigObject.java
@@ -2,7 +2,6 @@ package com.typesafe.config.impl;
 
 import java.util.Set;
 
-import com.typesafe.config.ConfigTransformer;
 import com.typesafe.config.ConfigValue;
 
 class TransformedConfigObject extends AbstractConfigObject {
diff --git a/src/test/scala/com/typesafe/config/impl/ConfParserTest.scala b/src/test/scala/com/typesafe/config/impl/ConfParserTest.scala
index ba430a38..810319df 100644
--- a/src/test/scala/com/typesafe/config/impl/ConfParserTest.scala
+++ b/src/test/scala/com/typesafe/config/impl/ConfParserTest.scala
@@ -9,10 +9,6 @@ import java.util.HashMap
 
 class ConfParserTest extends TestUtils {
 
-    @org.junit.Before
-    def setup() {
-    }
-
     def parse(s: String): ConfigValue = {
         Parser.parse(SyntaxFlavor.CONF, new SimpleConfigOrigin("test conf string"), s)
     }
diff --git a/src/test/scala/com/typesafe/config/impl/ConfigValueTest.scala b/src/test/scala/com/typesafe/config/impl/ConfigValueTest.scala
index 3a06c79d..4c44ab89 100644
--- a/src/test/scala/com/typesafe/config/impl/ConfigValueTest.scala
+++ b/src/test/scala/com/typesafe/config/impl/ConfigValueTest.scala
@@ -6,10 +6,6 @@ import com.typesafe.config.ConfigValue
 
 class ConfigValueTest extends TestUtils {
 
-    @org.junit.Before
-    def setup() {
-    }
-
     @Test
     def configIntEquality() {
         val a = new ConfigInt(fakeOrigin(), 42)
diff --git a/src/test/scala/com/typesafe/config/impl/JsonTest.scala b/src/test/scala/com/typesafe/config/impl/JsonTest.scala
index 18a68ad5..c1136ff6 100644
--- a/src/test/scala/com/typesafe/config/impl/JsonTest.scala
+++ b/src/test/scala/com/typesafe/config/impl/JsonTest.scala
@@ -10,10 +10,6 @@ import java.util.HashMap
 
 class ParseTest extends TestUtils {
 
-    @org.junit.Before
-    def setup() {
-    }
-
     def parse(s: String): ConfigValue = {
         Parser.parse(SyntaxFlavor.JSON, new SimpleConfigOrigin("test json string"), s)
     }
diff --git a/src/test/scala/com/typesafe/config/impl/TokenTest.scala b/src/test/scala/com/typesafe/config/impl/TokenTest.scala
index c6efab05..5c3edcd2 100644
--- a/src/test/scala/com/typesafe/config/impl/TokenTest.scala
+++ b/src/test/scala/com/typesafe/config/impl/TokenTest.scala
@@ -5,10 +5,6 @@ import org.junit._
 
 class TokenTest extends TestUtils {
 
-    @org.junit.Before
-    def setup() {
-    }
-
     @Test
     def tokenEquality() {
         checkEqualObjects(Tokens.START, Tokens.START)
diff --git a/src/test/scala/com/typesafe/config/impl/TokenizerTest.scala b/src/test/scala/com/typesafe/config/impl/TokenizerTest.scala
index 64909ebe..ec8ae0c8 100644
--- a/src/test/scala/com/typesafe/config/impl/TokenizerTest.scala
+++ b/src/test/scala/com/typesafe/config/impl/TokenizerTest.scala
@@ -10,10 +10,6 @@ import java.util.HashMap
 
 class TokenizerTest extends TestUtils {
 
-    @org.junit.Before
-    def setup() {
-    }
-
     def tokenTrue = Tokens.newBoolean(fakeOrigin(), true)
     def tokenFalse = Tokens.newBoolean(fakeOrigin(), false)
     def tokenNull = Tokens.newNull(fakeOrigin())