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.

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

errorprone :: StringCaseLocaleUsage #932

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/main/java/emissary/admin/Startup.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import java.util.HashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
Expand Down Expand Up @@ -141,7 +142,7 @@ public static void main(final String[] args) throws IOException, EmissaryExcepti
final String startupConfigFile;
if (args.length == 1) {
directoryAction = setAction(ACTIONSTART);
if (args[0].startsWith("/") || args[0].toUpperCase().startsWith("HTTP")) {
if (args[0].startsWith("/") || args[0].toUpperCase(Locale.getDefault()).startsWith("HTTP")) {
startupConfigFile = args[0];
} else {
startupConfigFile = ConfigUtil.getConfigFile(args[0]);
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/emissary/command/FeedCommand.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import java.util.Comparator;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Locale;
import java.util.Set;

@Command(description = "Start the feeder process given a particular WorkSpace implementation to distribute work to peer nodes",
Expand Down Expand Up @@ -127,7 +128,7 @@ public void setupFeed() {
// Must maintain insertion order
Set<String> flavorSet = new LinkedHashSet<>();
for (String f : flavorMode.split(",")) {
flavorSet.add(f.toUpperCase());
flavorSet.add(f.toUpperCase(Locale.getDefault()));
}

overrideFlavor(String.join(",", flavorSet));
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/emissary/command/HttpCommand.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

import java.io.File;
import java.util.LinkedHashSet;
import java.util.Locale;
import java.util.Set;

/**
Expand Down Expand Up @@ -101,7 +102,7 @@ public void setupHttp() {
// Must maintain insertion order
Set<String> flavorSet = new LinkedHashSet<>();
for (String f : flavorMode.split(",")) {
flavorSet.add(f.toUpperCase());
flavorSet.add(f.toUpperCase(Locale.getDefault()));
}
overrideFlavor(String.join(",", flavorSet));

Expand Down
7 changes: 4 additions & 3 deletions src/main/java/emissary/command/ServerCommand.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

import java.nio.file.Path;
import java.util.LinkedHashSet;
import java.util.Locale;
import java.util.Set;

import static emissary.directory.EmissaryNode.STRICT_STARTUP_MODE;
Expand Down Expand Up @@ -98,9 +99,9 @@ public void setupCommand() {
public void setupServer() throws EmissaryException {
String flavorMode;
if (getFlavor() == null) {
flavorMode = getMode().toUpperCase();
flavorMode = getMode().toUpperCase(Locale.getDefault());
} else {
flavorMode = getMode().toUpperCase() + "," + getFlavor();
flavorMode = getMode().toUpperCase(Locale.getDefault()) + "," + getFlavor();
}

if (shouldStrictMode()) {
Expand All @@ -110,7 +111,7 @@ public void setupServer() throws EmissaryException {
// Must maintain insertion order
Set<String> flavorSet = new LinkedHashSet<>();
for (String f : flavorMode.split(",")) {
flavorSet.add(f.toUpperCase());
flavorSet.add(f.toUpperCase(Locale.getDefault()));
}

if (flavorSet.contains("STANDALONE") && flavorSet.contains("CLUSTER")) {
Expand Down
9 changes: 5 additions & 4 deletions src/main/java/emissary/config/ConfigUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Properties;
import java.util.Set;
import javax.annotation.Nullable;
Expand Down Expand Up @@ -445,13 +446,13 @@ public static InputStream getConfigStream(final String name) throws IOException
*/
private static List<String> toResourceName(final String name) {
String r = name.replace('.', '/');
if (r.toUpperCase().endsWith("/CFG")) {
if (r.toUpperCase(Locale.getDefault()).endsWith("/CFG")) {
r = r.substring(0, r.length() - CONFIG_FILE_ENDING.length()) + CONFIG_FILE_ENDING;
} else if (r.toUpperCase().endsWith("/XML")) {
} else if (r.toUpperCase(Locale.getDefault()).endsWith("/XML")) {
r = r.substring(0, r.length() - XML_FILE_ENDING.length()) + XML_FILE_ENDING;
} else if (r.toUpperCase().endsWith("/PROPERTIES")) {
} else if (r.toUpperCase(Locale.getDefault()).endsWith("/PROPERTIES")) {
r = r.substring(0, r.length() - PROP_FILE_ENDING.length()) + PROP_FILE_ENDING;
} else if (r.toUpperCase().endsWith("/JS")) {
} else if (r.toUpperCase(Locale.getDefault()).endsWith("/JS")) {
r = r.substring(0, r.length() - JS_FILE_ENDING.length()) + JS_FILE_ENDING;
}
final List<String> prefs = new ArrayList<>();
Expand Down
7 changes: 4 additions & 3 deletions src/main/java/emissary/config/ServiceConfigGuide.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
Expand Down Expand Up @@ -794,7 +795,7 @@ public Map<String, String> findStringMatchMap(@Nullable final String theParamete
String key = el.getKey();
key = key.substring(theParameter.length());
if (!preserveCase) {
key = key.toUpperCase();
key = key.toUpperCase(Locale.getDefault());
}
theHash.put(key, el.getValue());
}
Expand Down Expand Up @@ -834,7 +835,7 @@ public Map<String, Set<String>> findStringMatchMultiMap(@Nullable final String p
final List<ConfigEntry> parameters = this.findStringMatchEntries(param);

for (final ConfigEntry el : parameters) {
final String key = el.getKey().substring(param.length()).toUpperCase();
final String key = el.getKey().substring(param.length()).toUpperCase(Locale.getDefault());

if (theHash.containsKey(key)) {
theHash.get(key).add(el.getValue());
Expand Down Expand Up @@ -1061,7 +1062,7 @@ public boolean findBooleanEntry(final String theParameter, final boolean dflt) {

if (!matchingEntries.isEmpty()) {
String el = matchingEntries.get(0);
el = el.toUpperCase();
el = el.toUpperCase(Locale.getDefault());
if (el.startsWith("F")) {
return false;
} else if (el.startsWith("T")) {
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/emissary/directory/EmissaryNode.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import javax.annotation.Nullable;

/**
Expand Down Expand Up @@ -102,8 +103,8 @@ public EmissaryNode() {
}
this.nodeScheme = System.getProperty(NODE_SCHEME_PROPERTY, "http");
this.nodePort = Integer.getInteger(NODE_PORT_PROPERTY, -1).intValue();
this.nodeType = System.getProperty("os.name", DEFAULT_NODE_TYPE).toLowerCase().replace(' ', '_');
this.nodeMode = System.getProperty("node.mode", DEFAULT_NODE_MODE).toLowerCase();
this.nodeType = System.getProperty("os.name", DEFAULT_NODE_TYPE).toLowerCase(Locale.getDefault()).replace(' ', '_');
this.nodeMode = System.getProperty("node.mode", DEFAULT_NODE_MODE).toLowerCase(Locale.getDefault());
this.nodeServiceType = System.getProperty(NODE_SERVICE_TYPE_PROPERTY, DEFAULT_NODE_SERVICE_TYPE);
this.strictStartupMode = Boolean.parseBoolean(System.getProperty(STRICT_STARTUP_MODE, String.valueOf(false)));
}
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/emissary/id/UnixFilePlace.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
import javax.annotation.Nullable;
Expand Down Expand Up @@ -128,7 +129,7 @@ public void process(final IBaseDataObject d) {
}

if (this.upcase && currentForm.length() > 0) {
currentForm = currentForm.toUpperCase();
currentForm = currentForm.toUpperCase(Locale.getDefault());
}

if (this.removeCommas && currentForm.indexOf(",") > 0) {
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/emissary/output/DropOffUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
Expand All @@ -48,7 +49,7 @@ public class DropOffUtil {
protected static final Logger logger = LoggerFactory.getLogger(DropOffUtil.class);

protected static final String SEPARATOR = FileSystems.getDefault().getSeparator();
protected static final String OS_NAME = System.getProperty("os.name").toUpperCase();
protected static final String OS_NAME = System.getProperty("os.name").toUpperCase(Locale.getDefault());

protected String unixRoot;

Expand Down Expand Up @@ -916,7 +917,7 @@ public static Set<String> getFileExtensions(List<String> filenames, int maxFilex
// add the file extension if it is smaller than maxFilextLen
final String fext = FilenameUtils.getExtension(filename);
if (StringUtils.isNotBlank(fext) && fext.length() <= maxFilextLen) {
extensions.add(fext.toLowerCase());
extensions.add(fext.toLowerCase(Locale.getDefault()));
}
}
return extensions;
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/emissary/output/filter/AbstractFilter.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
import javax.annotation.Nullable;
Expand Down Expand Up @@ -405,13 +406,13 @@ protected String normalizeBytes(final byte[] value, final int start, final int l
*/
protected String getCharset(final IBaseDataObject d, final String defaultCharset) {
String lang = d.getFontEncoding();
if (lang == null || lang.toUpperCase().indexOf("ASCII") != -1 || lang.toUpperCase().indexOf("8859-1") != -1) {
if (lang == null || lang.toUpperCase(Locale.getDefault()).contains("ASCII") || lang.toUpperCase(Locale.getDefault()).contains("8859-1")) {
final String s = d.getStringParameter("HTML_CHARSET");
if (s != null) {
lang = s;
}
}
if (lang == null || lang.toUpperCase().indexOf("ASCII") != -1 || lang.toUpperCase().indexOf("8859-1") != -1) {
if (lang == null || lang.toUpperCase(Locale.getDefault()).contains("ASCII") || lang.toUpperCase(Locale.getDefault()).contains("8859-1")) {
final String s = d.getStringParameter("MIME_CHARSET");
if (s != null) {
lang = s;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import java.nio.file.Paths;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.concurrent.TimeUnit;

Expand Down Expand Up @@ -85,7 +86,8 @@ protected void initOutputConfig() {
* Initialize a file name generator
*/
protected void initFilenameGenerator() {
this.fileNameGenerator = new DateStampFilenameGenerator(StringUtils.isNotBlank(filterName) ? "." + filterName.toLowerCase() : "");
this.fileNameGenerator =
new DateStampFilenameGenerator(StringUtils.isNotBlank(filterName) ? "." + filterName.toLowerCase(Locale.getDefault()) : "");
}

/**
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/emissary/output/filter/JsonOutputFilter.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import java.time.Instant;
import java.util.Collection;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
Expand Down Expand Up @@ -181,7 +182,7 @@ protected Collection<Object> filter(String key, Collection<Object> values) {
}

protected String transform(String name) {
return normalize(strip(name.toUpperCase()));
return normalize(strip(name.toUpperCase(Locale.getDefault())));
}

protected String strip(String name) {
Expand Down
9 changes: 5 additions & 4 deletions src/main/java/emissary/util/CaseInsensitiveMap.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package emissary.util;

import java.util.HashMap;
import java.util.Locale;
import java.util.Map;

/**
Expand Down Expand Up @@ -49,7 +50,7 @@ public CaseInsensitiveMap(Map<? extends K, ? extends V> map) {
// @SuppressWarnings("unchecked")
public V put(K key, V value) {
if (key instanceof String) {
String uckey = ((String) key).toLowerCase();
String uckey = ((String) key).toLowerCase(Locale.getDefault());
if (remap.containsKey(uckey)) {
this.remove(uckey);
}
Expand All @@ -68,7 +69,7 @@ public V get(Object key) {
Object realkey = key;

if (key instanceof String) {
String strkey = remap.get(((String) key).toLowerCase());
String strkey = remap.get(((String) key).toLowerCase(Locale.getDefault()));
if (strkey != null) {
realkey = strkey;
}
Expand All @@ -95,7 +96,7 @@ public boolean containsKey(Object key) {
Object realkey = key;

if (key instanceof String) {
String strkey = remap.get(((String) key).toLowerCase());
String strkey = remap.get(((String) key).toLowerCase(Locale.getDefault()));
if (strkey != null) {
realkey = strkey;
}
Expand All @@ -112,7 +113,7 @@ public V remove(Object key) {
Object realkey = key;

if (key instanceof String) {
String uckey = ((String) key).toLowerCase();
String uckey = ((String) key).toLowerCase(Locale.getDefault());
String strkey = remap.get(uckey);
if (strkey != null) {
realkey = strkey;
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/emissary/util/JavaCharSet.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package emissary.util;

import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
import javax.annotation.Nullable;

Expand Down Expand Up @@ -40,7 +41,7 @@ public static String get(@Nullable final String cs) {
}

// Look up in the hash
String s = cs.toUpperCase();
String s = cs.toUpperCase(Locale.getDefault());
String charSet = charsets.get(s);

String enc = null;
Expand Down
7 changes: 4 additions & 3 deletions src/main/java/emissary/util/TypeEngine.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import javax.annotation.Nullable;

Expand Down Expand Up @@ -92,16 +93,16 @@ public String getForm(@Nullable String engine, @Nullable String label) {
// Look up an override mapping
Map<String, String> extra = extraMapping.get(engine);
if (extra != null) {
ret = extra.get(label.toUpperCase());
ret = extra.get(label.toUpperCase(Locale.getDefault()));
}

// Grab the specified engine and do the default lookup
if (ret == null) {
Configurator c = contextMapping.get(engine);
if (c != null) {
ret = c.findStringEntry(label.toUpperCase(), null);
ret = c.findStringEntry(label.toUpperCase(Locale.getDefault()), null);
if (logger.isDebugEnabled() && ret != null) {
logger.debug("Found {} while looking up type for {}", ret, label.toUpperCase());
logger.debug("Found {} while looking up type for {}", ret, label.toUpperCase(Locale.getDefault()));
}
}
}
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/emissary/util/magic/MagicNumberFactory.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.TreeMap;
import javax.annotation.Nullable;
Expand Down Expand Up @@ -385,7 +386,7 @@ private static int resolveDataType(String[] columns, MagicNumber item) throws Pa
}

private static int lookupDataType(String arg) {
int dataTypeIdInt = typeMap.get(arg.toUpperCase());
int dataTypeIdInt = typeMap.get(arg.toUpperCase(Locale.getDefault()));
switch (dataTypeIdInt) {
case MagicNumber.TYPE_DATE:
return -1;
Expand Down Expand Up @@ -427,7 +428,7 @@ private static byte[] resolveValue(String[] columns, MagicNumber item) throws Pa
if (unaryLen > 0) {
subject = subject.substring(unaryLen);
}
if (subject.toUpperCase().endsWith("L")) {
if (subject.toUpperCase(Locale.getDefault()).endsWith("L")) {
subject = subject.substring(0, subject.length() - 1);
}
byte[] valueArray = MagicMath.stringToByteArray(subject);
Expand Down