Revert "HADOOP-11602. Fix toUpperCase/toLowerCase to use Locale.ENGLI…

…SH. (ozawa)" This reverts commit 946456c. Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/QuotaByStorageTypeEntry.java
apache · Feb 24, 2015 · 9cedad1 · 9cedad1
1 parent b53fd71
commit 9cedad1
Show file tree

Hide file tree

Showing 98 changed files with 192 additions and 332 deletions.
diff --git a/...op-annotations/src/main/java/org/apache/hadoop/classification/tools/StabilityOptions.java b/...op-annotations/src/main/java/org/apache/hadoop/classification/tools/StabilityOptions.java
@@ -21,15 +21,14 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
 
 class StabilityOptions {
   public static final String STABLE_OPTION = "-stable";
   public static final String EVOLVING_OPTION = "-evolving";
   public static final String UNSTABLE_OPTION = "-unstable";
 
   public static Integer optionLength(String option) {
-    String opt = option.toLowerCase(Locale.ENGLISH);
+    String opt = option.toLowerCase();
     if (opt.equals(UNSTABLE_OPTION)) return 1;
     if (opt.equals(EVOLVING_OPTION)) return 1;
     if (opt.equals(STABLE_OPTION)) return 1;
@@ -39,7 +38,7 @@ public static Integer optionLength(String option) {
   public static void validOptions(String[][] options,
       DocErrorReporter reporter) {
     for (int i = 0; i < options.length; i++) {
-      String opt = options[i][0].toLowerCase(Locale.ENGLISH);
+      String opt = options[i][0].toLowerCase();
       if (opt.equals(UNSTABLE_OPTION)) {
 	RootDocProcessor.stability = UNSTABLE_OPTION;
       } else if (opt.equals(EVOLVING_OPTION)) {

diff --git a/...va/org/apache/hadoop/security/authentication/server/AltKerberosAuthenticationHandler.java b/...va/org/apache/hadoop/security/authentication/server/AltKerberosAuthenticationHandler.java
@@ -14,7 +14,6 @@
 package org.apache.hadoop.security.authentication.server;
 
 import java.io.IOException;
-import java.util.Locale;
 import java.util.Properties;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -69,8 +68,7 @@ public void init(Properties config) throws ServletException {
             NON_BROWSER_USER_AGENTS, NON_BROWSER_USER_AGENTS_DEFAULT)
             .split("\\W*,\\W*");
     for (int i = 0; i < nonBrowserUserAgents.length; i++) {
-        nonBrowserUserAgents[i] =
+        nonBrowserUserAgents[i] = nonBrowserUserAgents[i].toLowerCase();
-            nonBrowserUserAgents[i].toLowerCase(Locale.ENGLISH);
     }
   }
 
@@ -122,7 +120,7 @@ protected boolean isBrowser(String userAgent) {
     if (userAgent == null) {
       return false;
     }
-    userAgent = userAgent.toLowerCase(Locale.ENGLISH);
+    userAgent = userAgent.toLowerCase();
     boolean isBrowser = true;
     for (String nonBrowserUserAgent : nonBrowserUserAgents) {
         if (userAgent.contains(nonBrowserUserAgent)) {

diff --git a/...p-auth/src/test/java/org/apache/hadoop/security/authentication/util/TestKerberosUtil.java b/...p-auth/src/test/java/org/apache/hadoop/security/authentication/util/TestKerberosUtil.java
@@ -21,7 +21,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Locale;
 import java.util.regex.Pattern;
 
 import org.apache.directory.server.kerberos.shared.keytab.Keytab;
@@ -59,25 +58,24 @@ public void testGetServerPrincipal() throws IOException {
 
     // send null hostname
     Assert.assertEquals("When no hostname is sent",
-        service + "/" + localHostname.toLowerCase(Locale.ENGLISH),
+        service + "/" + localHostname.toLowerCase(),
         KerberosUtil.getServicePrincipal(service, null));
     // send empty hostname
     Assert.assertEquals("When empty hostname is sent",
-        service + "/" + localHostname.toLowerCase(Locale.ENGLISH),
+        service + "/" + localHostname.toLowerCase(),
         KerberosUtil.getServicePrincipal(service, ""));
     // send 0.0.0.0 hostname
     Assert.assertEquals("When 0.0.0.0 hostname is sent",
-        service + "/" + localHostname.toLowerCase(Locale.ENGLISH),
+        service + "/" + localHostname.toLowerCase(),
         KerberosUtil.getServicePrincipal(service, "0.0.0.0"));
     // send uppercase hostname
     Assert.assertEquals("When uppercase hostname is sent",
-        service + "/" + testHost.toLowerCase(Locale.ENGLISH),
+        service + "/" + testHost.toLowerCase(),
         KerberosUtil.getServicePrincipal(service, testHost));
     // send lowercase hostname
     Assert.assertEquals("When lowercase hostname is sent",
-        service + "/" + testHost.toLowerCase(Locale.ENGLISH),
+        service + "/" + testHost.toLowerCase(),
-        KerberosUtil.getServicePrincipal(
+        KerberosUtil.getServicePrincipal(service, testHost.toLowerCase()));
-            service, testHost.toLowerCase(Locale.ENGLISH)));
   }
 
   @Test

diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -405,8 +405,6 @@ Trunk (Unreleased)
 
     HADOOP-11585. Fix formatting in Tracing.md (Masatake Iwasaki via aw)
 
-    HADOOP-11602. Fix toUpperCase/toLowerCase to use Locale.ENGLISH. (ozawa)
-
     HADOOP-11625. Minor fixes to command manual & SLA doc (aw)
 
   OPTIMIZATIONS

diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
@@ -46,7 +46,6 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
-import java.util.Locale;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Properties;
@@ -1452,7 +1451,7 @@ public boolean getBoolean(String name, boolean defaultValue) {
       return defaultValue;
     }
 
-    valueString = valueString.toLowerCase(Locale.ENGLISH);
+    valueString = valueString.toLowerCase();
 
     if ("true".equals(valueString))
       return true;

diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/CipherSuite.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/CipherSuite.java
@@ -18,7 +18,6 @@
 
 package org.apache.hadoop.crypto;
 
-import java.util.Locale;
 import org.apache.hadoop.classification.InterfaceAudience;
 
 /**
@@ -98,7 +97,7 @@ public String getConfigSuffix() {
     String[] parts = name.split("/");
     StringBuilder suffix = new StringBuilder();
     for (String part : parts) {
-      suffix.append(".").append(part.toLowerCase(Locale.ENGLISH));
+      suffix.append(".").append(part.toLowerCase());
     }
 
     return suffix.toString();

diff --git a/...roject/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/JavaKeyStoreProvider.java b/...roject/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/JavaKeyStoreProvider.java
@@ -53,7 +53,6 @@
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReadWriteLock;
@@ -423,7 +422,7 @@ public Metadata getMetadata(String name) throws IOException {
   @Override
   public KeyVersion createKey(String name, byte[] material,
                                Options options) throws IOException {
-    Preconditions.checkArgument(name.equals(name.toLowerCase(Locale.ENGLISH)),
+    Preconditions.checkArgument(name.equals(name.toLowerCase()),
         "Uppercase key names are unsupported: %s", name);
     writeLock.lock();
     try {

diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java
@@ -33,7 +33,6 @@
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.ServiceLoader;
@@ -2796,10 +2795,8 @@ static class Key {
       }
 
       Key(URI uri, Configuration conf, long unique) throws IOException {
-        scheme = uri.getScheme() == null ?
+        scheme = uri.getScheme()==null?"":uri.getScheme().toLowerCase();
-            "" : uri.getScheme().toLowerCase(Locale.ENGLISH);
+        authority = uri.getAuthority()==null?"":uri.getAuthority().toLowerCase();
-        authority = uri.getAuthority() == null ?
-            "" : uri.getAuthority().toLowerCase(Locale.ENGLISH);
         this.unique = unique;
 
         this.ugi = UserGroupInformation.getCurrentUser();

diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/StorageType.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/StorageType.java
@@ -21,7 +21,6 @@
 import java.util.Arrays;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
 
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceStability;
@@ -79,7 +78,7 @@ public static StorageType parseStorageType(int i) {
   }
 
   public static StorageType parseStorageType(String s) {
-    return StorageType.valueOf(s.toUpperCase(Locale.ENGLISH));
+    return StorageType.valueOf(s.toUpperCase());
   }
 
   private static List<StorageType> getNonTransientTypes() {

diff --git a/...-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/AclEntry.java b/...-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/AclEntry.java
@@ -20,7 +20,6 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import java.util.Locale;
 
 import com.google.common.base.Objects;
 
@@ -107,7 +106,7 @@ public String toString() {
       sb.append("default:");
     }
     if (type != null) {
-      sb.append(type.toString().toLowerCase(Locale.ENGLISH));
+      sb.append(type.toString().toLowerCase());
     }
     sb.append(':');
     if (name != null) {
@@ -264,8 +263,7 @@ public static AclEntry parseAclEntry(String aclStr,
 
     AclEntryType aclType = null;
     try {
-      aclType = Enum.valueOf(
+      aclType = Enum.valueOf(AclEntryType.class, split[index].toUpperCase());
-          AclEntryType.class, split[index].toUpperCase(Locale.ENGLISH));
       builder.setType(aclType);
       index++;
     } catch (IllegalArgumentException iae) {

diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/find/Name.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/find/Name.java
@@ -19,7 +19,6 @@
 
 import java.io.IOException;
 import java.util.Deque;
-import java.util.Locale;
 
 import org.apache.hadoop.fs.GlobPattern;
 import org.apache.hadoop.fs.shell.PathData;
@@ -74,7 +73,7 @@ public void addArguments(Deque<String> args) {
   public void prepare() throws IOException {
     String argPattern = getArgument(1);
     if (!caseSensitive) {
-      argPattern = argPattern.toLowerCase(Locale.ENGLISH);
+      argPattern = argPattern.toLowerCase();
     }
     globPattern = new GlobPattern(argPattern);
   }
@@ -83,7 +82,7 @@ public void prepare() throws IOException {
   public Result apply(PathData item, int depth) throws IOException {
     String name = getPath(item).getName();
     if (!caseSensitive) {
-      name = name.toLowerCase(Locale.ENGLISH);
+      name = name.toLowerCase();
     }
     if (globPattern.matches(name)) {
       return Result.PASS;

diff --git a/...ct/hadoop-common/src/main/java/org/apache/hadoop/io/compress/CompressionCodecFactory.java b/...ct/hadoop-common/src/main/java/org/apache/hadoop/io/compress/CompressionCodecFactory.java
@@ -65,10 +65,10 @@ private void addCodec(CompressionCodec codec) {
     codecsByClassName.put(codec.getClass().getCanonicalName(), codec);
 
     String codecName = codec.getClass().getSimpleName();
-    codecsByName.put(codecName.toLowerCase(Locale.ENGLISH), codec);
+    codecsByName.put(codecName.toLowerCase(), codec);
     if (codecName.endsWith("Codec")) {
       codecName = codecName.substring(0, codecName.length() - "Codec".length());
-      codecsByName.put(codecName.toLowerCase(Locale.ENGLISH), codec);
+      codecsByName.put(codecName.toLowerCase(), codec);
     }
   }
 
@@ -240,7 +240,7 @@ public CompressionCodec getCodecByName(String codecName) {
       CompressionCodec codec = getCodecByClassName(codecName);
       if (codec == null) {
         // trying to get the codec by name in case the name was specified instead a class
-        codec = codecsByName.get(codecName.toLowerCase(Locale.ENGLISH));
+        codec = codecsByName.get(codecName.toLowerCase());
       }
       return codec;
     }

diff --git a/...on-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsConfig.java b/...on-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsConfig.java
@@ -85,13 +85,12 @@ class MetricsConfig extends SubsetConfiguration {
   private ClassLoader pluginLoader;
 
   MetricsConfig(Configuration c, String prefix) {
-    super(c, prefix.toLowerCase(Locale.ENGLISH), ".");
+    super(c, prefix.toLowerCase(Locale.US), ".");
   }
 
   static MetricsConfig create(String prefix) {
-    return loadFirst(prefix, "hadoop-metrics2" + "-"
+    return loadFirst(prefix, "hadoop-metrics2-"+ prefix.toLowerCase(Locale.US)
-        + prefix.toLowerCase(Locale.ENGLISH)
+                     +".properties", DEFAULT_FILE_NAME);
-        +".properties", DEFAULT_FILE_NAME);
   }
 
   static MetricsConfig create(String prefix, String... fileNames) {

diff --git a/...roject/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java b/...roject/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java
@@ -617,6 +617,6 @@ private InitMode initMode() {
     String m = System.getProperty(MS_INIT_MODE_KEY);
     String m2 = m == null ? System.getenv(MS_INIT_MODE_KEY) : m;
     return InitMode.valueOf((m2 == null ? InitMode.NORMAL.name() : m2)
-                            .toUpperCase(Locale.ENGLISH));
+                            .toUpperCase(Locale.US));
   }
 }
diff --git a/...p-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SecurityUtil.java b/...p-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SecurityUtil.java
@@ -182,8 +182,7 @@ private static String replacePattern(String[] components, String hostname)
     if (fqdn == null || fqdn.isEmpty() || fqdn.equals("0.0.0.0")) {
       fqdn = getLocalHostName();
     }
-    return components[0] + "/" + fqdn.toLowerCase(Locale.ENGLISH) + "@"
+    return components[0] + "/" + fqdn.toLowerCase(Locale.US) + "@" + components[2];
-        + components[2];
   }
 
   static String getLocalHostName() throws UnknownHostException {
@@ -380,7 +379,7 @@ public static Text buildTokenService(InetSocketAddress addr) {
       }
       host = addr.getAddress().getHostAddress();
     } else {
-      host = addr.getHostName().toLowerCase(Locale.ENGLISH);
+      host = addr.getHostName().toLowerCase();
     }
     return new Text(host + ":" + addr.getPort());
   }

diff --git a/...roject/hadoop-common/src/main/java/org/apache/hadoop/security/WhitelistBasedResolver.java b/...roject/hadoop-common/src/main/java/org/apache/hadoop/security/WhitelistBasedResolver.java
@@ -19,7 +19,6 @@
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
-import java.util.Locale;
 import java.util.Map;
 import java.util.TreeMap;
 
@@ -139,8 +138,7 @@ static Map<String, String> getSaslProperties(Configuration conf) {
         QualityOfProtection.PRIVACY.toString());
 
     for (int i=0; i < qop.length; i++) {
-      qop[i] = QualityOfProtection.valueOf(
+      qop[i] = QualityOfProtection.valueOf(qop[i].toUpperCase()).getSaslQop();
-          qop[i].toUpperCase(Locale.ENGLISH)).getSaslQop();
     }
 
     saslProps.put(Sasl.QOP, StringUtils.join(",", qop));

diff --git a/...hadoop-common/src/main/java/org/apache/hadoop/security/ssl/FileBasedKeyStoresFactory.java b/...hadoop-common/src/main/java/org/apache/hadoop/security/ssl/FileBasedKeyStoresFactory.java
@@ -33,7 +33,6 @@
 import java.security.GeneralSecurityException;
 import java.security.KeyStore;
 import java.text.MessageFormat;
-import java.util.Locale;
 
 /**
  * {@link KeyStoresFactory} implementation that reads the certificates from
@@ -95,8 +94,7 @@ public class FileBasedKeyStoresFactory implements KeyStoresFactory {
   @VisibleForTesting
   public static String resolvePropertyName(SSLFactory.Mode mode,
                                            String template) {
-    return MessageFormat.format(
+    return MessageFormat.format(template, mode.toString().toLowerCase());
-        template, mode.toString().toLowerCase(Locale.ENGLISH));
   }
 
   /**

diff --git a/...common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ssl/SSLFactory.java b/...common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ssl/SSLFactory.java
@@ -33,7 +33,6 @@
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.security.GeneralSecurityException;
-import java.util.Locale;
 
 /**
  * Factory that creates SSLEngine and SSLSocketFactory instances using
@@ -139,7 +138,7 @@ public void init() throws GeneralSecurityException, IOException {
   private HostnameVerifier getHostnameVerifier(Configuration conf)
       throws GeneralSecurityException, IOException {
     return getHostnameVerifier(conf.get(SSL_HOSTNAME_VERIFIER_KEY, "DEFAULT").
-        trim().toUpperCase(Locale.ENGLISH));
+        trim().toUpperCase());
   }
 
   public static HostnameVerifier getHostnameVerifier(String verifier)