You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by md...@apache.org on 2014/06/19 17:30:35 UTC
[2/3] git commit: ACCUMULO-2896 Make PATH_PROPERTY_ENV_VARS final
ACCUMULO-2896 Make PATH_PROPERTY_ENV_VARS final
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3fafd238
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3fafd238
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3fafd238
Branch: refs/heads/master
Commit: 3fafd23812775decaa9e74c4a7450bda94956e9e
Parents: 9357417
Author: Mike Drob <md...@cloudera.com>
Authored: Wed Jun 11 15:42:58 2014 -0400
Committer: Mike Drob <md...@cloudera.com>
Committed: Thu Jun 19 10:27:53 2014 -0500
----------------------------------------------------------------------
core/src/main/java/org/apache/accumulo/core/Constants.java | 5 ++++-
.../main/java/org/apache/accumulo/core/conf/PropertyType.java | 3 +--
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3fafd238/core/src/main/java/org/apache/accumulo/core/Constants.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/Constants.java b/core/src/main/java/org/apache/accumulo/core/Constants.java
index c9a51a9..15cccf4 100644
--- a/core/src/main/java/org/apache/accumulo/core/Constants.java
+++ b/core/src/main/java/org/apache/accumulo/core/Constants.java
@@ -17,6 +17,9 @@
package org.apache.accumulo.core;
import java.nio.charset.Charset;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
import org.apache.accumulo.core.security.Authorizations;
@@ -112,7 +115,7 @@ public class Constants {
public static final String EXPORT_INFO_FILE = "accumulo_export_info.txt";
// Variables that will be substituted with environment vars in PropertyType.PATH values
- public static final String[] PATH_PROPERTY_ENV_VARS = new String[] {"ACCUMULO_HOME", "ACCUMULO_CONF_DIR"};
+ public static final Collection<String> PATH_PROPERTY_ENV_VARS = Collections.unmodifiableCollection(Arrays.asList("ACCUMULO_HOME", "ACCUMULO_CONF_DIR"));
public static final String HDFS_TABLES_DIR = "/tables";
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3fafd238/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java b/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
index 60812d6..3d381a0 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
@@ -16,7 +16,6 @@
*/
package org.apache.accumulo.core.conf;
-import java.util.Arrays;
import java.util.regex.Pattern;
import org.apache.accumulo.core.Constants;
@@ -52,7 +51,7 @@ public enum PropertyType {
PATH("path", ".*",
"A string that represents a filesystem path, which can be either relative or absolute to some directory. The filesystem depends on the property. The "
- + "following environment variables will be substituted: " + Arrays.asList(Constants.PATH_PROPERTY_ENV_VARS)), ABSOLUTEPATH("absolute path", null,
+ + "following environment variables will be substituted: " + Constants.PATH_PROPERTY_ENV_VARS), ABSOLUTEPATH("absolute path", null,
"An absolute filesystem path. The filesystem depends on the property. This is the same as path, but enforces that its root is explicitly specified.") {
@Override
public boolean isValidFormat(String value) {