From f1bedacdfcd8a06c61e829d31e45119d07e7b299 Mon Sep 17 00:00:00 2001
From: Havoc Pennington <hp@pobox.com>
Date: Sat, 12 Nov 2011 22:59:43 -0500
Subject: [PATCH] get rid of ConfigConfig, wasn't the right API.

Will replace it with something better later.
---
 src/main/java/com/typesafe/config/Config.java | 12 +-------
 .../com/typesafe/config/ConfigConfig.java     | 29 -------------------
 .../com/typesafe/config/impl/ConfigImpl.java  |  8 ++---
 .../com/typesafe/config/impl/ConfigTest.scala |  6 ----
 4 files changed, 4 insertions(+), 51 deletions(-)
 delete mode 100644 src/main/java/com/typesafe/config/ConfigConfig.java

diff --git a/src/main/java/com/typesafe/config/Config.java b/src/main/java/com/typesafe/config/Config.java
index ce83ec62..2eb6f834 100644
--- a/src/main/java/com/typesafe/config/Config.java
+++ b/src/main/java/com/typesafe/config/Config.java
@@ -9,16 +9,6 @@ import com.typesafe.config.impl.ConfigUtil;
  * This class holds some global static methods for the config package.
  */
 public final class Config {
-    /**
-     * Loads a configuration object.
-     *
-     * @param configConfig
-     *            configuration for the configuration.
-     * @return a configuration object
-     */
-    public static ConfigRoot load(ConfigConfig configConfig) {
-        return ConfigImpl.loadConfig(configConfig);
-    }
 
     /**
      * Loads a configuration for the given root path. The root path should be a
@@ -37,7 +27,7 @@ public final class Config {
      * @return configuration object for the requested root path
      */
     public static ConfigRoot load(String rootPath) {
-        return ConfigImpl.loadConfig(new ConfigConfig(rootPath));
+        return ConfigImpl.loadConfig(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
deleted file mode 100644
index c915ec63..00000000
--- a/src/main/java/com/typesafe/config/ConfigConfig.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.typesafe.config;
-
-/**
- * Configuration for a configuration!
- */
-public final class ConfigConfig {
-
-    final private String rootPath;
-
-    /**
-     * Creates a new configuration configuration.
-     *
-     * @param rootPath
-     *            the root path as described in Config.load() docs
-     */
-    public ConfigConfig(String rootPath) {
-        this.rootPath = rootPath;
-    }
-
-    /**
-     * Get the configured root path. This method would be used by code
-     * implementing a configuration backend; don't worry about it.
-     *
-     * @return the root path
-     */
-    public String rootPath() {
-        return rootPath;
-    }
-}
diff --git a/src/main/java/com/typesafe/config/impl/ConfigImpl.java b/src/main/java/com/typesafe/config/impl/ConfigImpl.java
index cb081f7b..74b91cbc 100644
--- a/src/main/java/com/typesafe/config/impl/ConfigImpl.java
+++ b/src/main/java/com/typesafe/config/impl/ConfigImpl.java
@@ -5,20 +5,18 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.typesafe.config.ConfigConfig;
 import com.typesafe.config.ConfigException;
 import com.typesafe.config.ConfigObject;
 import com.typesafe.config.ConfigRoot;
 
 /** This is public but is only supposed to be used by the "config" package */
 public class ConfigImpl {
-    public static ConfigRoot loadConfig(ConfigConfig configConfig) {
+    public static ConfigRoot loadConfig(String rootPath) {
         ConfigTransformer transformer = withExtraTransformer(null);
 
         AbstractConfigObject system = null;
         try {
-            system = systemPropertiesConfig()
-                    .getObject(configConfig.rootPath());
+            system = systemPropertiesConfig().getObject(rootPath);
         } catch (ConfigException e) {
             // no system props in the requested root path
         }
@@ -32,7 +30,7 @@ public class ConfigImpl {
         // object that the app might be able to pass in.
         IncludeHandler includer = defaultIncluder();
 
-        stack.add(includer.include(configConfig.rootPath()).transformed(
+        stack.add(includer.include(rootPath).transformed(
                 transformer));
 
         AbstractConfigObject merged = AbstractConfigObject.merge(stack);
diff --git a/src/test/scala/com/typesafe/config/impl/ConfigTest.scala b/src/test/scala/com/typesafe/config/impl/ConfigTest.scala
index 14111ac6..801165a5 100644
--- a/src/test/scala/com/typesafe/config/impl/ConfigTest.scala
+++ b/src/test/scala/com/typesafe/config/impl/ConfigTest.scala
@@ -8,7 +8,6 @@ import com.typesafe.config.ConfigObject
 import com.typesafe.config.ConfigException
 import java.util.concurrent.TimeUnit
 import scala.collection.JavaConverters._
-import com.typesafe.config.ConfigConfig
 
 class ConfigTest extends TestUtils {
 
@@ -620,11 +619,6 @@ class ConfigTest extends TestUtils {
         }
     }
 
-    @Test
-    def test01LoadWithConfigConfig() {
-        val conf = Config.load(new ConfigConfig("test01"))
-    }
-
     @Test
     def test02SubstitutionsWithWeirdPaths() {
         val conf = Config.load("test02")