archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8214971: Replace use of string.equals("") with isEmpty()

Browse source 
Reviewed-by: jlaskey, prappo, lancea, dfuchs, redestad
This commit is contained in:
Roger Riggs 2018-12-07 11:51:17 -05:00
parent df5b42f33b
commit 938b844088
95 changed files with 195 additions and 195 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/java.base/share/classes/java/io/File.java
View file

@ -257,7 +257,7 @@ public class File
*/
private File(String child, File parent) {
assert parent.path != null;
assert (!parent.path.equals(""));
assert (!parent.path.isEmpty());
this.path = fs.resolve(parent.path, child);
this.prefixLength = parent.prefixLength;
}
@ -316,7 +316,7 @@ public class File
throw new NullPointerException();
}
if (parent != null) {
if (parent.equals("")) {
if (parent.isEmpty()) {
this.path = fs.resolve(fs.getDefaultParent(),
fs.normalize(child));
} else {
@ -359,7 +359,7 @@ public class File
throw new NullPointerException();
}
if (parent != null) {
if (parent.path.equals("")) {
if (parent.path.isEmpty()) {
this.path = fs.resolve(fs.getDefaultParent(),
fs.normalize(child));
} else {
@ -426,7 +426,7 @@ public class File
if (uri.getRawQuery() != null)
throw new IllegalArgumentException("URI has a query component");
String p = uri.getPath();
if (p.equals(""))
if (p.isEmpty())
throw new IllegalArgumentException("URI path component is empty");
// Okay, now initialize

2
src/java.base/share/classes/java/lang/SecurityManager.java
View file

@ -1201,7 +1201,7 @@ public class SecurityManager {
private static String[] getPackages(String p) {
String packages[] = null;
if (p != null && !p.equals("")) {
if (p != null && !p.isEmpty()) {
java.util.StringTokenizer tok =
new java.util.StringTokenizer(p, ",");
int n = tok.countTokens();

2
src/java.base/share/classes/java/lang/System.java
View file

@ -970,7 +970,7 @@ public final class System {
if (key == null) {
throw new NullPointerException("key can't be null");
}
if (key.equals("")) {
if (key.isEmpty()) {
throw new IllegalArgumentException("key can't be empty");
}
}

4
src/java.base/share/classes/java/lang/reflect/Parameter.java
View file

@ -174,9 +174,9 @@ public final class Parameter implements AnnotatedElement {
*/
public String getName() {
// Note: empty strings as parameter names are now outlawed.
// The .equals("") is for compatibility with current JVM
// The .isEmpty() is for compatibility with current JVM
// behavior. It may be removed at some point.
if(name == null || name.equals(""))
if(name == null || name.isEmpty())
return "arg" + index;
else
return name;

6
src/java.base/share/classes/java/net/HostPortrange.java
View file

@ -241,7 +241,7 @@ class HostPortrange {
int[] parsePort(String port)
{
if (port == null || port.equals("")) {
if (port == null || port.isEmpty()) {
return defaultPort();
}
@ -260,13 +260,13 @@ class HostPortrange {
String high = port.substring(dash+1);
int l,h;
if (low.equals("")) {
if (low.isEmpty()) {
l = PORT_MIN;
} else {
l = Integer.parseInt(low);
}
if (high.equals("")) {
if (high.isEmpty()) {
h = PORT_MAX;
} else {
h = Integer.parseInt(high);

4
src/java.base/share/classes/java/net/InetAddress.java
View file

@ -1009,7 +1009,7 @@ class InetAddress implements java.io.Serializable {
+ " not found ");
}
if ((host == null) || (host.equals("")) || (host.equals(" "))) {
if ((host == null) || (host.isEmpty()) || (host.equals(" "))) {
throw new UnknownHostException("Requested address "
+ addrString
+ " resolves to an invalid entry in hosts file "
@ -1046,7 +1046,7 @@ class InetAddress implements java.io.Serializable {
hostEntry = removeComments(hostEntry);
if (hostEntry.contains(host)) {
addrStr = extractHostAddr(hostEntry, host);
if ((addrStr != null) && (!addrStr.equals(""))) {
if ((addrStr != null) && (!addrStr.isEmpty())) {
addr = createAddressByteArray(addrStr);
if (inetAddresses == null) {
inetAddresses = new ArrayList<>(1);

10
src/java.base/share/classes/java/net/SocketPermission.java
View file

@ -305,7 +305,7 @@ public final class SocketPermission extends Permission
}
private static String getHost(String host) {
if (host.equals("")) {
if (host.isEmpty()) {
return "localhost";
} else {
/* IPv6 literal address used in this context should follow
@ -344,7 +344,7 @@ public final class SocketPermission extends Permission
throws Exception
{
if (port == null || port.equals("") || port.equals("*")) {
if (port == null || port.isEmpty() || port.equals("*")) {
return new int[] {PORT_MIN, PORT_MAX};
}
@ -358,13 +358,13 @@ public final class SocketPermission extends Permission
String high = port.substring(dash+1);
int l,h;
if (low.equals("")) {
if (low.isEmpty()) {
l = PORT_MIN;
} else {
l = Integer.parseInt(low);
}
if (high.equals("")) {
if (high.isEmpty()) {
h = PORT_MAX;
} else {
h = Integer.parseInt(high);
@ -496,7 +496,7 @@ public final class SocketPermission extends Permission
throw new NullPointerException("action can't be null");
}
if (action.equals("")) {
if (action.isEmpty()) {
throw new IllegalArgumentException("action can't be empty");
}

4
src/java.base/share/classes/java/net/URLPermission.java
View file

@ -533,11 +533,11 @@ public final class URLPermission extends Permission {
String thishost = this.p.hostname();
String thathost = that.p.hostname();
if (p.wildcard() && thishost.equals("")) {
if (p.wildcard() && thishost.isEmpty()) {
// this "*" implies all others
return true;
}
if (that.p.wildcard() && thathost.equals("")) {
if (that.p.wildcard() && thathost.isEmpty()) {
// that "*" can only be implied by this "*"
return false;
}

2
src/java.base/share/classes/java/net/URLStreamHandler.java
View file

@ -437,7 +437,7 @@ public abstract class URLStreamHandler {
return u.hostAddress;
String host = u.getHost();
if (host == null || host.equals("")) {
if (host == null || host.isEmpty()) {
return null;
} else {
try {

6
src/java.base/share/classes/java/util/Locale.java
View file

@ -2226,10 +2226,10 @@ public final class Locale implements Cloneable, Serializable {
default:
return Arrays.stream(stringList).reduce("",
(s1, s2) -> {
if (s1.equals("")) {
if (s1.isEmpty()) {
return s2;
}
if (s2.equals("")) {
if (s2.isEmpty()) {
return s1;
}
return MessageFormat.format(pattern, s1, s2);
@ -3069,7 +3069,7 @@ public final class Locale implements Cloneable, Serializable {
private static boolean isSubtagIllFormed(String subtag,
boolean isFirstSubtag) {
if (subtag.equals("") || subtag.length() > 8) {
if (subtag.isEmpty() || subtag.length() > 8) {
return true;
} else if (subtag.equals("*")) {
return false;

2
src/java.base/share/classes/java/util/jar/Pack200.java
View file

@ -704,7 +704,7 @@ public abstract class Pack200 {
if (impl == null) {
// The first time, we must decide which class to use.
implName = GetPropertyAction.privilegedGetProperty(prop,"");
if (implName != null && !implName.equals(""))
if (implName != null && !implName.isEmpty())
impl = Class.forName(implName);
else if (PACK_PROVIDER.equals(prop))
impl = com.sun.java.util.jar.pack.PackerImpl.class;

2
src/java.base/share/classes/java/util/regex/Pattern.java
View file

@ -1290,7 +1290,7 @@ public final class Pattern
// Construct result
int resultSize = matchList.size();
if (limit == 0)
while (resultSize > 0 && matchList.get(resultSize-1).equals(""))
while (resultSize > 0 && matchList.get(resultSize-1).isEmpty())
resultSize--;
String[] result = new String[resultSize];
return matchList.subList(0, resultSize).toArray(result);