Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed calls to toLowerCase() to be toLowerCase(Locale.US) instead. #420

Merged
merged 1 commit into from Aug 2, 2018
Merged

Fixed calls to toLowerCase() to be toLowerCase(Locale.US) instead. #420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion google-http-client/src/main/java/com/google/api/client/http/GenericUrl.java
View file
Open in desktop
Expand Up @@ -30,6 +30,7 @@
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Set;

Expand Down Expand Up @@ -155,7 +156,7 @@ private GenericUrl(String scheme,
String fragment,
String query,
String userInfo) {
this.scheme = scheme.toLowerCase();
this.scheme = scheme.toLowerCase(Locale.US);
this.host = host;
this.port = port;
this.pathParts = toPathParts(path);
Expand Down
5 changes: 3 additions & 2 deletions google-http-client/src/main/java/com/google/api/client/http/HttpHeaders.java
View file
Open in desktop
Expand Up @@ -36,6 +36,7 @@
import java.util.EnumSet;
import java.util.HashSet;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
Expand Down Expand Up @@ -1035,7 +1036,7 @@ private <T> List<T> getAsList(T passedValue) {
* @since 1.13
*/
public String getFirstHeaderStringValue(String name) {
Object value = get(name.toLowerCase());
Object value = get(name.toLowerCase(Locale.US));
if (value == null) {
return null;
}
Expand All @@ -1056,7 +1057,7 @@ public String getFirstHeaderStringValue(String name) {
* @since 1.13
*/
public List<String> getHeaderStringValues(String name) {
Object value = get(name.toLowerCase());
Object value = get(name.toLowerCase(Locale.US));
if (value == null) {
return Collections.emptyList();
}
Expand Down
7 changes: 4 additions & 3 deletions google-http-client/src/main/java/com/google/api/client/http/HttpMediaType.java
View file
Open in desktop
Expand Up @@ -18,6 +18,7 @@

import java.nio.charset.Charset;
import java.util.Collections;
import java.util.Locale;
import java.util.Map;
import java.util.Map.Entry;
import java.util.SortedMap;
Expand Down Expand Up @@ -200,7 +201,7 @@ public HttpMediaType setParameter(String name, String value) {
Preconditions.checkArgument(
TOKEN_REGEX.matcher(name).matches(), "Name contains reserved characters");
cachedBuildResult = null;
parameters.put(name.toLowerCase(), value);
parameters.put(name.toLowerCase(Locale.US), value);
return this;
}

Expand All @@ -210,7 +211,7 @@ public HttpMediaType setParameter(String name, String value) {
* @param name name of the parameter
*/
public String getParameter(String name) {
return parameters.get(name.toLowerCase());
return parameters.get(name.toLowerCase(Locale.US));
}

/**
Expand All @@ -220,7 +221,7 @@ public String getParameter(String name) {
*/
public HttpMediaType removeParameter(String name) {
cachedBuildResult = null;
parameters.remove(name.toLowerCase());
parameters.remove(name.toLowerCase(Locale.US));
return this;
}

Expand Down
7 changes: 4 additions & 3 deletions ...http-client/src/main/java/com/google/api/client/testing/http/MockLowLevelHttpRequest.java
View file
Open in desktop
Expand Up @@ -30,6 +30,7 @@
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.zip.GZIPInputStream;

Expand Down Expand Up @@ -75,7 +76,7 @@ public MockLowLevelHttpRequest(String url) {

@Override
public void addHeader(String name, String value) throws IOException {
name = name.toLowerCase();
name = name.toLowerCase(Locale.US);
List<String> values = headersMap.get(name);
if (values == null) {
values = new ArrayList<String>();
Expand Down Expand Up @@ -119,7 +120,7 @@ public Map<String, List<String>> getHeaders() {
* @since 1.13
*/
public String getFirstHeaderValue(String name) {
List<String> values = headersMap.get(name.toLowerCase());
List<String> values = headersMap.get(name.toLowerCase(Locale.US));
return values == null ? null : values.get(0);
}

Expand All @@ -130,7 +131,7 @@ public String getFirstHeaderValue(String name) {
* @since 1.13
*/
public List<String> getHeaderValues(String name) {
List<String> values = headersMap.get(name.toLowerCase());
List<String> values = headersMap.get(name.toLowerCase(Locale.US));
return values == null ? Collections.<String>emptyList() : Collections.unmodifiableList(values);
}

Expand Down
5 changes: 3 additions & 2 deletions google-http-client/src/main/java/com/google/api/client/util/ClassInfo.java
View file
Open in desktop
Expand Up @@ -21,6 +21,7 @@
import java.util.Comparator;
import java.util.IdentityHashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.TreeSet;
import java.util.WeakHashMap;
Expand Down Expand Up @@ -121,7 +122,7 @@ public final boolean getIgnoreCase() {
public FieldInfo getFieldInfo(String name) {
if (name != null) {
if (ignoreCase) {
name = name.toLowerCase();
name = name.toLowerCase(Locale.US);
}
name = name.intern();
}
Expand Down Expand Up @@ -175,7 +176,7 @@ public int compare(String s0, String s1) {
}
String fieldName = fieldInfo.getName();
if (ignoreCase) {
fieldName = fieldName.toLowerCase().intern();
fieldName = fieldName.toLowerCase(Locale.US).intern();
}
FieldInfo conflictingFieldInfo = nameToFieldInfoMap.get(fieldName);
Preconditions.checkArgument(conflictingFieldInfo == null,
Expand Down
3 changes: 2 additions & 1 deletion google-http-client/src/main/java/com/google/api/client/util/DataMap.java
View file
Open in desktop
Expand Up @@ -17,6 +17,7 @@
import java.util.AbstractMap;
import java.util.AbstractSet;
import java.util.Iterator;
import java.util.Locale;
import java.util.Map;
import java.util.NoSuchElementException;

Expand Down Expand Up @@ -204,7 +205,7 @@ final class Entry implements Map.Entry<String, Object> {
public String getKey() {
String result = fieldInfo.getName();
if (classInfo.getIgnoreCase()) {
result = result.toLowerCase();
result = result.toLowerCase(Locale.US);
}
return result;
}
Expand Down
9 changes: 5 additions & 4 deletions google-http-client/src/main/java/com/google/api/client/util/GenericData.java
View file
Open in desktop
Expand Up @@ -18,6 +18,7 @@
import java.util.AbstractSet;
import java.util.EnumSet;
import java.util.Iterator;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentMap;
Expand Down Expand Up @@ -90,7 +91,7 @@ public final Object get(Object name) {
return fieldInfo.getValue(this);
}
if (classInfo.getIgnoreCase()) {
fieldName = fieldName.toLowerCase();
fieldName = fieldName.toLowerCase(Locale.US);
}
return unknownFields.get(fieldName);
}
Expand All @@ -104,7 +105,7 @@ public final Object put(String fieldName, Object value) {
return oldValue;
}
if (classInfo.getIgnoreCase()) {
fieldName = fieldName.toLowerCase();
fieldName = fieldName.toLowerCase(Locale.US);
}
return unknownFields.put(fieldName, value);
}
Expand All @@ -125,7 +126,7 @@ public GenericData set(String fieldName, Object value) {
fieldInfo.setValue(this, value);
} else {
if (classInfo.getIgnoreCase()) {
fieldName = fieldName.toLowerCase();
fieldName = fieldName.toLowerCase(Locale.US);
}
unknownFields.put(fieldName, value);
}
Expand All @@ -150,7 +151,7 @@ public final Object remove(Object name) {
throw new UnsupportedOperationException();
}
if (classInfo.getIgnoreCase()) {
fieldName = fieldName.toLowerCase();
fieldName = fieldName.toLowerCase(Locale.US);
}
return unknownFields.remove(fieldName);
}
Expand Down