accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject [3/5] git commit: ACCUMULO-2317 banishing loadDefault(String) and providing adequate documentation to the constructor
Date Mon, 03 Feb 2014 23:40:37 GMT
ACCUMULO-2317 banishing loadDefault(String) and providing adequate documentation to the constructor


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1d411fbe
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1d411fbe
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1d411fbe

Branch: refs/heads/master
Commit: 1d411fbe829cd72d9c7d888c829c545e4da8cb16
Parents: 98e374b
Author: John Vines <vines@apache.org>
Authored: Mon Feb 3 18:34:23 2014 -0500
Committer: John Vines <vines@apache.org>
Committed: Mon Feb 3 18:34:23 2014 -0500

----------------------------------------------------------------------
 .../core/client/ClientConfiguration.java        | 25 ++++++--------------
 1 file changed, 7 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/1d411fbe/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java b/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
index 26974e2..a3d51cf 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
@@ -17,7 +17,6 @@
 package org.apache.accumulo.core.client;
 
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.StringReader;
 import java.io.StringWriter;
 import java.util.Arrays;
@@ -109,6 +108,13 @@ public class ClientConfiguration extends CompositeConfiguration {
     super(configs);
   }
 
+  /**
+   * Iterates through the Configuration objects, populating this object.
+   * 
+   * @see PropertiesConfiguration
+   * @see #loadDefault()
+   */
+
   public ClientConfiguration(Configuration... configs) {
     this(Arrays.asList(configs));
   }
@@ -128,23 +134,6 @@ public class ClientConfiguration extends CompositeConfiguration {
     return loadFromSearchPath(getDefaultSearchPath());
   }
 
-  /**
-   * Attempts to load the overridePropertiesFilename as a configuration file using PropertiesConfiguration.
Uses {@link #loadDefault()} if argument is null
-   * 
-   * @throws FileNotFoundException
-   *           Cannot find overridePropertiesFilename
-   * @throws ConfigurationException
-   *           Error while loading the properties file
-   * @see PropertiesConfiguration
-   * @see #loadDefault()
-   */
-  public static ClientConfiguration loadDefault(String overridePropertiesFilename) throws
FileNotFoundException, ConfigurationException {
-    if (overridePropertiesFilename == null)
-      return loadDefault();
-    else
-      return new ClientConfiguration(new PropertiesConfiguration(overridePropertiesFilename));
-  }
-
   private static ClientConfiguration loadFromSearchPath(List<String> paths) {
     try {
       List<Configuration> configs = new LinkedList<Configuration>();


Mime
View raw message