diff --git a/make/jdk/src/classes/build/tools/compileproperties/CompileProperties.java b/make/jdk/src/classes/build/tools/compileproperties/CompileProperties.java index 83e1782b72f16..3ad11c1ad487e 100644 --- a/make/jdk/src/classes/build/tools/compileproperties/CompileProperties.java +++ b/make/jdk/src/classes/build/tools/compileproperties/CompileProperties.java @@ -260,7 +260,7 @@ private static boolean createFile(String propertiesPath, String outputPath, } String packageString = ""; - if (packageName != null && !packageName.equals("")) { + if (packageName != null && !packageName.isEmpty()) { packageString = "package " + packageName + ";\n\n"; } diff --git a/make/jdk/src/classes/build/tools/generatebreakiteratordata/CharacterCategory.java b/make/jdk/src/classes/build/tools/generatebreakiteratordata/CharacterCategory.java index 400176253a12d..fcd1e39c5b028 100644 --- a/make/jdk/src/classes/build/tools/generatebreakiteratordata/CharacterCategory.java +++ b/make/jdk/src/classes/build/tools/generatebreakiteratordata/CharacterCategory.java @@ -119,7 +119,7 @@ public static void main(String[] args) { * Generates data in older format (1.4.X and earlier) and creates * the old CategoryMap if "oldFilename" is not null. */ - if (!oldDatafile.equals("")) { + if (!oldDatafile.isEmpty()) { generateOldData(); generateOldDatafile(); } diff --git a/make/jdk/src/classes/build/tools/generatebreakiteratordata/GenerateBreakIteratorData.java b/make/jdk/src/classes/build/tools/generatebreakiteratordata/GenerateBreakIteratorData.java index 98558101a9c84..0370bd59ec289 100644 --- a/make/jdk/src/classes/build/tools/generatebreakiteratordata/GenerateBreakIteratorData.java +++ b/make/jdk/src/classes/build/tools/generatebreakiteratordata/GenerateBreakIteratorData.java @@ -161,8 +161,8 @@ private static void processArgs(String[] args) { * Make locale name ("_language_country_valiant") */ private static String getLocaleName() { - if (language.equals("")) { - if (!country.equals("") || !valiant.equals("")) { + if (language.isEmpty()) { + if (!country.isEmpty() || !valiant.isEmpty()) { language = "en"; } else { return ""; @@ -172,10 +172,10 @@ private static String getLocaleName() { StringBuffer sb = new StringBuffer(); sb.append('_'); sb.append(language); - if (!country.equals("") || !valiant.equals("")) { + if (!country.isEmpty() || !valiant.isEmpty()) { sb.append('_'); sb.append(country); - if (!valiant.equals("")) { + if (!valiant.isEmpty()) { sb.append('_'); sb.append(valiant); } diff --git a/make/jdk/src/classes/build/tools/generatebreakiteratordata/RuleBasedBreakIteratorBuilder.java b/make/jdk/src/classes/build/tools/generatebreakiteratordata/RuleBasedBreakIteratorBuilder.java index 1f67f37326f54..a113c45b37740 100644 --- a/make/jdk/src/classes/build/tools/generatebreakiteratordata/RuleBasedBreakIteratorBuilder.java +++ b/make/jdk/src/classes/build/tools/generatebreakiteratordata/RuleBasedBreakIteratorBuilder.java @@ -2022,7 +2022,7 @@ protected void writeTables(String datafile) { final String outputDir; String tmpbuf = GenerateBreakIteratorData.getOutputDirectory(); - if (tmpbuf.equals("")) { + if (tmpbuf.isEmpty()) { filename = datafile; outputDir = ""; } else { @@ -2039,7 +2039,7 @@ protected void writeTables(String datafile) { } try { - if (!outputDir.equals("")) { + if (!outputDir.isEmpty()) { new File(outputDir).mkdirs(); } BufferedOutputStream out = new BufferedOutputStream(new FileOutputStream(filename)); diff --git a/make/jdk/src/classes/build/tools/pandocfilter/json/JSONParser.java b/make/jdk/src/classes/build/tools/pandocfilter/json/JSONParser.java index d6ed9d4022b22..391a860a6ca1b 100644 --- a/make/jdk/src/classes/build/tools/pandocfilter/json/JSONParser.java +++ b/make/jdk/src/classes/build/tools/pandocfilter/json/JSONParser.java @@ -375,7 +375,7 @@ public JSONValue parseValue() { } public JSONValue parse(String s) { - if (s == null || s.equals("")) { + if (s == null || s.isEmpty()) { return null; } diff --git a/make/langtools/tools/anttasks/SelectToolTask.java b/make/langtools/tools/anttasks/SelectToolTask.java index e89f68e84f387..38d79b3d83c8b 100644 --- a/make/langtools/tools/anttasks/SelectToolTask.java +++ b/make/langtools/tools/anttasks/SelectToolTask.java @@ -151,7 +151,7 @@ public void execute() { } // finally, return required values, if any - if (toolProperty != null && !(toolName == null || toolName.equals(""))) { + if (toolProperty != null && !(toolName == null || toolName.isEmpty())) { p.setProperty(toolProperty, toolName); if (argsProperty != null && toolArgs != null) @@ -169,7 +169,7 @@ void showGUI(Properties fileProps) { toolName = tool.toolName; toolArgs = argsField.getText(); if (defaultCheck.isSelected()) { - if (toolName.equals("")) { + if (toolName.isEmpty()) { fileProps.remove("tool.name"); fileProps.remove("tool.bootstrap"); } else { @@ -243,7 +243,7 @@ public void focusLost(FocusEvent e) { final JOptionPane p = new JOptionPane(body); okButton = new JButton("OK"); - okButton.setEnabled(toolProperty == null || (toolName != null && !toolName.equals(""))); + okButton.setEnabled(toolProperty == null || (toolName != null && !toolName.isEmpty())); okButton.addActionListener(e -> { JDialog d = (JDialog) SwingUtilities.getAncestorOfClass(JDialog.class, p); d.setVisible(false); @@ -304,7 +304,7 @@ String getDefaultArgsForTool(Properties props, ToolChoices tool) { if (tool == null) return ""; String toolName = tool.toolName; - return toolName.equals("") ? "" : props.getProperty(toolName + ".args", ""); + return toolName.isEmpty() ? "" : props.getProperty(toolName + ".args", ""); } // Ant task parameters diff --git a/make/langtools/tools/compileproperties/CompileProperties.java b/make/langtools/tools/compileproperties/CompileProperties.java index 49cfc8a4a4b14..1e5690aedd947 100644 --- a/make/langtools/tools/compileproperties/CompileProperties.java +++ b/make/langtools/tools/compileproperties/CompileProperties.java @@ -247,7 +247,7 @@ private boolean createFile(String propertiesPath, String outputPath, } String packageString = ""; - if (packageName != null && !packageName.equals("")) { + if (packageName != null && !packageName.isEmpty()) { packageString = "package " + packageName + ";\n\n"; } diff --git a/src/demo/share/jfc/TableExample/JDBCAdapter.java b/src/demo/share/jfc/TableExample/JDBCAdapter.java index 31e111300f23f..7a71648fa4eea 100644 --- a/src/demo/share/jfc/TableExample/JDBCAdapter.java +++ b/src/demo/share/jfc/TableExample/JDBCAdapter.java @@ -246,7 +246,7 @@ public void setValueAt(Object value, int row, int column) { // that editing is possible, we'll just lock on everything. for (int col = 0; col < getColumnCount(); col++) { String colName = getColumnName(col); - if (colName.equals("")) { + if (colName.isEmpty()) { continue; } if (col != 0) { diff --git a/src/hotspot/share/prims/jvmtiEnvFill.java b/src/hotspot/share/prims/jvmtiEnvFill.java index 5363c3acdeb56..25e39cd4b6180 100644 --- a/src/hotspot/share/prims/jvmtiEnvFill.java +++ b/src/hotspot/share/prims/jvmtiEnvFill.java @@ -211,7 +211,7 @@ boolean readGaps() throws IOException { top.add(line); } else { trimmed = line.trim(); - if (!trimmed.equals("") && !trimmed.startsWith("//") && !trimmed.startsWith("#")) { + if (!trimmed.isEmpty() && !trimmed.startsWith("//") && !trimmed.startsWith("#")) { error("only comments and blank lines allowed between functions"); } before.add(line); diff --git a/src/java.management/share/classes/javax/management/openmbean/CompositeDataSupport.java b/src/java.management/share/classes/javax/management/openmbean/CompositeDataSupport.java index 373c9e602fa62..78cdeb5f5d19b 100644 --- a/src/java.management/share/classes/javax/management/openmbean/CompositeDataSupport.java +++ b/src/java.management/share/classes/javax/management/openmbean/CompositeDataSupport.java @@ -136,7 +136,7 @@ private static SortedMap makeMap( SortedMap map = new TreeMap(); for (int i = 0; i < itemNames.length; i++) { String name = itemNames[i]; - if (name == null || name.equals("")) + if (name == null || name.isEmpty()) throw new IllegalArgumentException("Null or empty item name"); if (map.containsKey(name)) throw new OpenDataException("Duplicate item name " + name); @@ -264,7 +264,7 @@ public CompositeType getCompositeType() { */ public Object get(String key) { - if ( (key == null) || (key.trim().equals("")) ) { + if ( (key == null) || (key.trim().isEmpty()) ) { throw new IllegalArgumentException("Argument key cannot be a null or empty String."); } if ( ! contents.containsKey(key.trim())) { @@ -302,7 +302,7 @@ public Object[] getAll(String[] keys) { */ public boolean containsKey(String key) { - if ( (key == null) || (key.trim().equals("")) ) { + if ( (key == null) || (key.trim().isEmpty()) ) { return false; } return contents.containsKey(key); diff --git a/src/java.naming/share/classes/javax/naming/ldap/Rdn.java b/src/java.naming/share/classes/javax/naming/ldap/Rdn.java index a9ca22859b334..7a4cf3584e80f 100644 --- a/src/java.naming/share/classes/javax/naming/ldap/Rdn.java +++ b/src/java.naming/share/classes/javax/naming/ldap/Rdn.java @@ -195,7 +195,7 @@ public Rdn(String type, Object value) throws InvalidNameException { if (value == null) { throw new NullPointerException("Cannot set value to null"); } - if (type.equals("") || isEmptyValue(value)) { + if (type.isEmpty() || isEmptyValue(value)) { throw new InvalidNameException( "type or value cannot be empty, type:" + type + " value:" + value); diff --git a/src/java.security.jgss/share/classes/javax/security/auth/kerberos/ServicePermission.java b/src/java.security.jgss/share/classes/javax/security/auth/kerberos/ServicePermission.java index eaaa3c46cbfe5..aa407d70cfc6c 100644 --- a/src/java.security.jgss/share/classes/javax/security/auth/kerberos/ServicePermission.java +++ b/src/java.security.jgss/share/classes/javax/security/auth/kerberos/ServicePermission.java @@ -339,7 +339,7 @@ private static int getMask(String action) { throw new NullPointerException("action can't be null"); } - if (action.equals("")) { + if (action.isEmpty()) { throw new IllegalArgumentException("action can't be empty"); } diff --git a/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java b/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java index 57cebf19bd58a..4c04ea28a9033 100644 --- a/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java +++ b/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java @@ -80,7 +80,7 @@ public HashMap run() { String[] gssLibs; String defaultLib = System.getProperty("sun.security.jgss.lib"); - if (defaultLib == null || defaultLib.trim().equals("")) { + if (defaultLib == null || defaultLib.trim().isEmpty()) { String osname = System.getProperty("os.name"); if (osname.startsWith("Linux")) { gssLibs = new String[]{ diff --git a/src/java.security.jgss/share/classes/sun/security/krb5/Config.java b/src/java.security.jgss/share/classes/sun/security/krb5/Config.java index 61dd6513a2e9e..345c639df10bb 100644 --- a/src/java.security.jgss/share/classes/sun/security/krb5/Config.java +++ b/src/java.security.jgss/share/classes/sun/security/krb5/Config.java @@ -1361,7 +1361,7 @@ private String getKDCFromDNS(String realm) throws KrbException { kdcs += srvs[i].trim() + " "; } kdcs = kdcs.trim(); - if (kdcs.equals("")) { + if (kdcs.isEmpty()) { return null; } return kdcs; diff --git a/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315.java index a2459351265b2..0dcb32aa02ecc 100644 --- a/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315.java +++ b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315.java @@ -339,7 +339,7 @@ protected void handleParent(Element e, NameSpaceSymbTable ns) { String NName = e.getPrefix(); String NValue = e.getNamespaceURI(); String Name; - if (NName == null || NName.equals("")) { + if (NName == null || NName.isEmpty()) { NName = "xmlns"; Name = "xmlns"; } else { diff --git a/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/CanonicalizerBase.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/CanonicalizerBase.java index 5f6a524f0c027..b3e328b0103b6 100644 --- a/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/CanonicalizerBase.java +++ b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/CanonicalizerBase.java @@ -592,7 +592,7 @@ protected void handleParent(Element e, NameSpaceSymbTable ns) { String NName = e.getPrefix(); String NValue = e.getNamespaceURI(); String Name; - if (NName == null || NName.equals("")) { + if (NName == null || NName.isEmpty()) { NName = XMLNS; Name = XMLNS; } else { diff --git a/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/RFC2253Parser.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/RFC2253Parser.java index 98cb8c8f27315..aab399c9e36e8 100644 --- a/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/RFC2253Parser.java +++ b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/RFC2253Parser.java @@ -72,7 +72,7 @@ public static String normalize(String dn) { */ public static String normalize(String dn, boolean toXml) { //if empty string - if (dn == null || dn.equals("")) { + if (dn == null || dn.isEmpty()) { return ""; } diff --git a/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverDirectHTTP.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverDirectHTTP.java index 1018d193df57b..445eb019fab84 100644 --- a/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverDirectHTTP.java +++ b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverDirectHTTP.java @@ -210,7 +210,7 @@ public boolean engineCanResolveURI(ResourceResolverContext context) { return false; } - if (context.uriToResolve.equals("") || context.uriToResolve.charAt(0) == '#') { + if (context.uriToResolve.isEmpty() || context.uriToResolve.charAt(0) == '#') { LOG.debug("quick fail for empty URIs and local ones"); return false; } diff --git a/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverFragment.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverFragment.java index cdf204e80e481..c0685647851a9 100644 --- a/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverFragment.java +++ b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverFragment.java @@ -58,7 +58,7 @@ public XMLSignatureInput engineResolveURI(ResourceResolverContext context) Document doc = context.attr.getOwnerElement().getOwnerDocument(); Node selectedElem = null; - if (context.uriToResolve.equals("")) { + if (context.uriToResolve.isEmpty()) { /* * Identifies the node-set (minus any comment nodes) of the XML * resource containing the signature @@ -121,7 +121,7 @@ public boolean engineCanResolveURI(ResourceResolverContext context) { return false; } - if (context.uriToResolve.equals("") || + if (context.uriToResolve.isEmpty() || context.uriToResolve.charAt(0) == '#' && !context.uriToResolve.startsWith("#xpointer(") ) { LOG.debug("State I can resolve reference: \"{}\"", context.uriToResolve); diff --git a/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverLocalFilesystem.java b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverLocalFilesystem.java index 66ebd79de8455..ae54f679477f1 100644 --- a/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverLocalFilesystem.java +++ b/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverLocalFilesystem.java @@ -115,7 +115,7 @@ public boolean engineCanResolveURI(ResourceResolverContext context) { return false; } - if (context.uriToResolve.equals("") || context.uriToResolve.charAt(0) == '#' || + if (context.uriToResolve.isEmpty() || context.uriToResolve.charAt(0) == '#' || context.uriToResolve.startsWith("http:")) { return false; } diff --git a/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMReference.java b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMReference.java index b2ec7815af052..ec207f0b2a0be 100644 --- a/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMReference.java +++ b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMReference.java @@ -165,7 +165,7 @@ public DOMReference(String uri, String type, DigestMethod dm, } this.digestMethod = dm; this.uri = uri; - if (uri != null && !uri.equals("")) { + if (uri != null && !uri.isEmpty()) { try { new URI(uri); } catch (URISyntaxException e) { diff --git a/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java index 77435845809d8..c66b4c247c707 100644 --- a/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java +++ b/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java @@ -112,7 +112,7 @@ public DOMRetrievalMethod(String uri, String type, } } this.uri = uri; - if (!uri.equals("")) { + if (!uri.isEmpty()) { try { new URI(uri); } catch (URISyntaxException e) { diff --git a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java index 30245d69ff0b3..1c2946d3a466f 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java +++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java @@ -446,14 +446,14 @@ public static void printWarning(String parserClassName, String propertyName, SAX private boolean getSystemProperty(Limit limit, String sysPropertyName) { try { String value = SecuritySupport.getSystemProperty(sysPropertyName); - if (value != null && !value.equals("")) { + if (value != null && !value.isEmpty()) { values[limit.ordinal()] = Integer.parseInt(value); states[limit.ordinal()] = State.SYSTEMPROPERTY; return true; } value = SecuritySupport.readJAXPProperty(sysPropertyName); - if (value != null && !value.equals("")) { + if (value != null && !value.isEmpty()) { values[limit.ordinal()] = Integer.parseInt(value); states[limit.ordinal()] = State.JAXPDOTPROPERTIES; return true; diff --git a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java index 2cae86c1b92b5..efef84660b268 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java +++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java @@ -460,7 +460,7 @@ public boolean compile(InputSource input, String name) { if (name != null) { setClassName(name); } - else if (systemId != null && !systemId.equals("")) { + else if (systemId != null && !systemId.isEmpty()) { setClassName(Util.baseName(systemId)); } @@ -770,7 +770,7 @@ public int registerAttribute(QName name) { _attributes.put(name.toString(), code); final String uri = name.getNamespace(); final String local = "@"+name.getLocalPart(); - if ((uri != null) && (!uri.equals(""))) + if ((uri != null) && (!uri.isEmpty())) _namesIndex.add(uri+":"+local); else _namesIndex.add(local); @@ -810,7 +810,7 @@ public int registerNamespacePrefix(QName name) { code = _nextGType++; _namespacePrefixes.put(name.toString(), code); final String uri = name.getNamespace(); - if ((uri != null) && (!uri.equals(""))){ + if ((uri != null) && (!uri.isEmpty())){ // namespace::ext2:ped2 will be made empty in TypedNamespaceIterator _namesIndex.add("?"); } else{ diff --git a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/DocumentCache.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/DocumentCache.java index e0e526427f48b..7e91bc181be8e 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/DocumentCache.java +++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/DocumentCache.java @@ -256,7 +256,7 @@ public DOM retrieveDocument(String baseURI, String href, Translet trs) { CachedDocument doc; String uri = href; - if (baseURI != null && !baseURI.equals("")) { + if (baseURI != null && !baseURI.isEmpty()) { try { uri = SystemIDResolver.getAbsoluteURI(uri, baseURI); } catch (TransformerException te) { diff --git a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/LoadDocument.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/LoadDocument.java index e0aa231ff3823..ef3b90a0f4adf 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/LoadDocument.java +++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/LoadDocument.java @@ -159,13 +159,13 @@ private static DTMAxisIterator document(String uri, String base, MultiDOM multiplexer = (MultiDOM)dom; // Prepend URI base to URI (from context) - if (base != null && !base.equals("")) { + if (base != null && !base.isEmpty()) { uri = SystemIDResolver.getAbsoluteURI(uri, base); } // Return an empty iterator if the URI is clearly invalid // (to prevent some unncessary MalformedURL exceptions). - if (uri == null || uri.equals("")) { + if (uri == null || uri.isEmpty()) { return(EmptyIterator.getInstance()); } diff --git a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2DOM.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2DOM.java index 1247e6fdf76fa..d62754031d4dd 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2DOM.java +++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2DOM.java @@ -197,7 +197,7 @@ public void startElement(String namespace, String localName, String qName, String attURI = attrs.getURI(i); String type = (attrs.getType(i) == null) ? XMLSymbols.fCDATASymbol : attrs.getType(i); - if (attrs.getLocalName(i).equals("")) { + if (attrs.getLocalName(i).isEmpty()) { tmp.setAttribute(attQName, attrs.getValue(i)); if (type.equals("ID")) { tmp.setIdAttribute(attQName, true); diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java index f7467cbcf8304..e00e71c83f3e0 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java +++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java @@ -542,7 +542,7 @@ protected void addEventListener(NodeImpl node, String type, { // We can't dispatch to blank type-name, and of course we need // a listener to dispatch to - if (type == null || type.equals("") || listener == null) + if (type == null || type.isEmpty() || listener == null) return; // Each listener may be registered only once per type per phase. @@ -586,7 +586,7 @@ protected void removeEventListener(NodeImpl node, String type, boolean useCapture) { // If this couldn't be a valid listener registration, ignore request - if (type == null || type.equals("") || listener == null) + if (type == null || type.isEmpty() || listener == null) return; List nodeListeners = getEventListeners(node); if (nodeListeners == null) @@ -690,7 +690,7 @@ protected boolean dispatchEvent(NodeImpl node, Event event) { // VALIDATE -- must have been initialized at least once, must have // a non-null non-blank name. - if(!evt.initialized || evt.type == null || evt.type.equals("")) { + if(!evt.initialized || evt.type == null || evt.type.isEmpty()) { String msg = DOMMessageFormatter.formatMessage(DOMMessageFormatter.DOM_DOMAIN, "UNSPECIFIED_EVENT_TYPE_ERR", null); throw new EventException(EventException.UNSPECIFIED_EVENT_TYPE_ERR, msg); } diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLStreamReaderImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLStreamReaderImpl.java index 747bd9bc4f7ed..c8f4a4fa5569a 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLStreamReaderImpl.java +++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLStreamReaderImpl.java @@ -1051,7 +1051,7 @@ public String getNamespacePrefix(int index) { || fEventType == XMLEvent.NAMESPACE) { //namespaceContext is dynamic object. String prefix = fScanner.getNamespaceContext().getDeclaredPrefixAt(index); - return prefix.equals("") ? null : prefix; + return prefix.isEmpty() ? null : prefix; } else { throw new IllegalStateException("Current state " + getEventTypeString(fEventType) + " is not among the states " + getEventTypeString(XMLEvent.START_ELEMENT) diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/AbstractSAXParser.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/AbstractSAXParser.java index 63955e7f9e111..7a05a46496f63 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/AbstractSAXParser.java +++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/AbstractSAXParser.java @@ -2326,7 +2326,7 @@ public String getType(String name) { } public String getType(String uri, String localName) { - return uri.equals("") ? fAttributes.getType(null, localName) : + return uri.isEmpty() ? fAttributes.getType(null, localName) : fAttributes.getType(uri, localName); } @@ -2339,7 +2339,7 @@ public String getValue(String name) { } public String getValue(String uri, String localName) { - return uri.equals("") ? fAttributes.getValue(null, localName) : + return uri.isEmpty() ? fAttributes.getValue(null, localName) : fAttributes.getValue(uri, localName); } @@ -2348,7 +2348,7 @@ public int getIndex(String qName) { } public int getIndex(String uri, String localPart) { - return uri.equals("") ? fAttributes.getIndex(null, localPart) : + return uri.isEmpty() ? fAttributes.getIndex(null, localPart) : fAttributes.getIndex(uri, localPart); } diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SecurityManager.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SecurityManager.java index a5df3999748fe..b43a2eea2583c 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SecurityManager.java +++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SecurityManager.java @@ -138,7 +138,7 @@ private void readSystemProperties(){ try { String value = System.getProperty(Constants.ENTITY_EXPANSION_LIMIT); - if(value != null && !value.equals("")){ + if(value != null && !value.isEmpty()){ entityExpansionLimit = Integer.parseInt(value); if (entityExpansionLimit < 0) entityExpansionLimit = DEFAULT_ENTITY_EXPANSION_LIMIT; @@ -149,7 +149,7 @@ private void readSystemProperties(){ try { String value = System.getProperty(Constants.MAX_OCCUR_LIMIT); - if(value != null && !value.equals("")){ + if(value != null && !value.isEmpty()){ maxOccurLimit = Integer.parseInt(value); if (maxOccurLimit < 0) maxOccurLimit = DEFAULT_MAX_OCCUR_NODE_LIMIT; @@ -160,7 +160,7 @@ private void readSystemProperties(){ try { String value = System.getProperty(Constants.ELEMENT_ATTRIBUTE_LIMIT); - if(value != null && !value.equals("")){ + if(value != null && !value.isEmpty()){ fElementAttributeLimit = Integer.parseInt(value); if ( fElementAttributeLimit < 0) fElementAttributeLimit = DEFAULT_ELEMENT_ATTRIBUTE_LIMIT; diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/XMLSecurityManager.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/XMLSecurityManager.java index d8f0444d2fb48..b4a8504271197 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/XMLSecurityManager.java +++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/XMLSecurityManager.java @@ -528,14 +528,14 @@ public static void printWarning(String parserClassName, String propertyName, SAX private boolean getSystemProperty(Limit limit, String sysPropertyName) { try { String value = SecuritySupport.getSystemProperty(sysPropertyName); - if (value != null && !value.equals("")) { + if (value != null && !value.isEmpty()) { values[limit.ordinal()] = Integer.parseInt(value); states[limit.ordinal()] = State.SYSTEMPROPERTY; return true; } value = SecuritySupport.readJAXPProperty(sysPropertyName); - if (value != null && !value.equals("")) { + if (value != null && !value.isEmpty()) { values[limit.ordinal()] = Integer.parseInt(value); states[limit.ordinal()] = State.JAXPDOTPROPERTIES; return true; diff --git a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/ExpandedNameTable.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/ExpandedNameTable.java index 099b1ec7ecbbc..b310aa0a27612 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/ExpandedNameTable.java +++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/ExpandedNameTable.java @@ -301,7 +301,7 @@ public String getLocalName(int ExpandedNameID) public final int getLocalNameID(int ExpandedNameID) { // ExtendedType etype = m_extendedTypes[ExpandedNameID]; - if (m_extendedTypes[ExpandedNameID].getLocalName().equals("")) + if (m_extendedTypes[ExpandedNameID].getLocalName().isEmpty()) return 0; else return ExpandedNameID; @@ -318,7 +318,7 @@ public final int getLocalNameID(int ExpandedNameID) public String getNamespace(int ExpandedNameID) { String namespace = m_extendedTypes[ExpandedNameID].getNamespace(); - return (namespace.equals("") ? null : namespace); + return (namespace.isEmpty() ? null : namespace); } /** @@ -330,7 +330,7 @@ public String getNamespace(int ExpandedNameID) public final int getNamespaceID(int ExpandedNameID) { //ExtendedType etype = m_extendedTypes[ExpandedNameID]; - if (m_extendedTypes[ExpandedNameID].getNamespace().equals("")) + if (m_extendedTypes[ExpandedNameID].getNamespace().isEmpty()) return 0; else return ExpandedNameID; diff --git a/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/Collector.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/Collector.java index 8e81d3f13324f..3328196be8402 100644 --- a/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/Collector.java +++ b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/Collector.java @@ -164,7 +164,7 @@ private CompilationSpec collectSpecifiedMethods() { CompilationSpec compilationRestrictions = new CompilationSpec(); String methodListFileName = main.options.methodList; - if (methodListFileName != null && !methodListFileName.equals("")) { + if (methodListFileName != null && !methodListFileName.isEmpty()) { try { FileReader methListFile = new FileReader(methodListFileName); BufferedReader readBuf = new BufferedReader(methListFile); @@ -187,7 +187,7 @@ private CompilationSpec collectSpecifiedMethods() { System.out.println("Unrecognized command " + directive + ". Ignoring\n\t" + line + "\n encountered in " + methodListFileName); } } else { - if (!trimmedLine.equals("")) { + if (!trimmedLine.isEmpty()) { System.out.println("Ignoring malformed line:\n\t " + line + "\n"); } } diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java index 943337b766f3d..b3b071a94d3df 100644 --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java @@ -540,7 +540,7 @@ void run(Queue> list, Iterable elements) { * @throws IllegalArgumentException if the type expression of null or empty */ public Type parseType(String expr, TypeElement scope) { - if (expr == null || expr.equals("")) + if (expr == null || expr.isEmpty()) throw new IllegalArgumentException(); compiler = JavaCompiler.instance(context); JavaFileObject prev = compiler.log.useSource(null); diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java index bcd29a8c421f3..cd16b4d414cae 100644 --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java @@ -725,7 +725,7 @@ public Symbol resolveBinaryNameOrIdent(ModuleSymbol msym, String name) { * @param name The identifier to resolve */ public Symbol resolveIdent(ModuleSymbol msym, String name) { - if (name.equals("")) + if (name.isEmpty()) return syms.errSymbol; JavaFileObject prev = log.useSource(null); try { diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/model/JavacElements.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/model/JavacElements.java index ab789be7708db..8ed5ca12a54b6 100644 --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/model/JavacElements.java +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/model/JavacElements.java @@ -134,7 +134,7 @@ public ModuleSymbol getModuleElement(CharSequence name) { if (modules.getDefaultModule() == syms.noModule) return null; String strName = name.toString(); - if (strName.equals("")) + if (strName.isEmpty()) return syms.unnamedModule; return modules.getObservableModule(names.fromString(strName)); } diff --git a/src/jdk.compiler/share/classes/com/sun/tools/sjavac/CompileJavaPackages.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/CompileJavaPackages.java index b7d29d4a1fbb9..0295a15bea460 100644 --- a/src/jdk.compiler/share/classes/com/sun/tools/sjavac/CompileJavaPackages.java +++ b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/CompileJavaPackages.java @@ -342,7 +342,7 @@ CompileChunk[] createCompileChunks(Map> pkgSrcs, // Accumulate this information onto this chunk. cc.numDependents += ss.size(); } - if (from == null || from.trim().equals("")) from = justPkgName; + if (from == null || from.trim().isEmpty()) from = justPkgName; cc.pkgNames.append(justPkgName+"("+s.size()+") "); cc.pkgFromTos = from+" to "+justPkgName; } diff --git a/src/jdk.compiler/share/classes/com/sun/tools/sjavac/client/SjavacClient.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/client/SjavacClient.java index 17df839d45aa1..f27cd35d58fcd 100644 --- a/src/jdk.compiler/share/classes/com/sun/tools/sjavac/client/SjavacClient.java +++ b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/client/SjavacClient.java @@ -101,7 +101,7 @@ public SjavacClient(Options options) { keepalive = Util.extractIntOption("keepalive", serverConf, 120); this.poolsize = poolsize > 0 ? poolsize : Runtime.getRuntime().availableProcessors(); - settings = (serverConf.equals("")) ? "id="+id+",portfile="+portfileName : serverConf; + settings = (serverConf.isEmpty()) ? "id="+id+",portfile="+portfileName : serverConf; } /** diff --git a/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/SmartFileManager.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/SmartFileManager.java index dd3269229096b..6768358da76fa 100644 --- a/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/SmartFileManager.java +++ b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/SmartFileManager.java @@ -196,7 +196,7 @@ public FileObject getFileForOutput(Location location, file = new SmartFileObject((JavaFileObject) file); packageName = ":" + packageNameFromFileName(relativeName); } - if (packageName.equals("")) { + if (packageName.isEmpty()) { packageName = ":"; } addArtifact(packageName, file.toUri()); diff --git a/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/ui/CommonUI.java b/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/ui/CommonUI.java index edefabc8779a3..7de32da9d05da 100644 --- a/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/ui/CommonUI.java +++ b/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/ui/CommonUI.java @@ -325,7 +325,7 @@ public static String stringFromStringArray(String strings[], String delim) { String string = ""; String separator; - if(delim == null || delim.equals("")) + if(delim == null || delim.isEmpty()) separator = " "; else separator = delim; @@ -346,7 +346,7 @@ public static String stringFromStringArray(String strings[]) public static String[] stringArrayFromString(String string, String delim) { StringTokenizer st; - if(delim == null || delim.equals("")) + if(delim == null || delim.isEmpty()) st = new StringTokenizer(string); else st = new StringTokenizer(string, delim); diff --git a/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/ui/WizardDlg.java b/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/ui/WizardDlg.java index 858abc85df5d9..3d5731a6f7073 100644 --- a/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/ui/WizardDlg.java +++ b/src/jdk.hotspot.agent/share/classes/com/sun/java/swing/ui/WizardDlg.java @@ -265,7 +265,7 @@ private void setTitle() JPanel panel = (JPanel)panels.elementAt(cardShowing - 1); String newTitle = title; String panelTitle = panel.getName(); - if(panelTitle != null && panelTitle.equals("")) + if(panelTitle != null && panelTitle.isEmpty()) { newTitle = newTitle + " - "; newTitle = newTitle + panelTitle; diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/SALauncherLoader.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/SALauncherLoader.java index b917491cf3f06..c452fb4fe5625 100644 --- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/SALauncherLoader.java +++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/SALauncherLoader.java @@ -135,7 +135,7 @@ private static File[] getClassPath(String cp) { String[] tmp = cp.split(File.pathSeparator); File[] paths = new File[tmp.length]; for (int i = 0; i < paths.length; i++) { - paths[i] = new File(tmp[i].equals("")? "." : tmp[i]); + paths[i] = new File(tmp[i].isEmpty()? "." : tmp[i]); } return paths; } diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgCDebugInfoBuilder.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgCDebugInfoBuilder.java index f70c8c6e0cce3..0b5932933f09d 100644 --- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgCDebugInfoBuilder.java +++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgCDebugInfoBuilder.java @@ -278,7 +278,7 @@ CDebugInfoDataBase buildDataBase(String dllName, Address base) { case LF_ENUM: { String name = iter.getEnumName(); BasicEnumType enumType = null; - if ((name == null) || (name.equals(""))) { + if ((name == null) || (name.isEmpty())) { if (unnamedEnum == null) { unnamedEnum = new BasicEnumType(null, getTypeByIndex(iter.getEnumType())); } diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/JMap.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/JMap.java index ddb61495adc8d..e35e2c2d1241b 100644 --- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/JMap.java +++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/JMap.java @@ -146,7 +146,7 @@ public static void main(String[] args) { System.exit(1); } } else if (keyValue[0].equals("file")) { - if ((keyValue[1] == null) || keyValue[1].equals("")) { + if ((keyValue[1] == null) || keyValue[1].isEmpty()) { System.err.println("File name must be set."); System.exit(1); } diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/ObjectHistogramPanel.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/ObjectHistogramPanel.java index e856c9d73f702..620cb742fee42 100644 --- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/ObjectHistogramPanel.java +++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/ObjectHistogramPanel.java @@ -288,7 +288,7 @@ public void removePanelListener(Listener listener) { private void findObject() { String findText = toolbar.getFindText(); - if (findText == null || findText.equals("")) { + if (findText == null || findText.isEmpty()) { return; } diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/classbrowser/ClassBrowserPanel.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/classbrowser/ClassBrowserPanel.java index b4d6104816617..3fd44de791a00 100644 --- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/classbrowser/ClassBrowserPanel.java +++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/classbrowser/ClassBrowserPanel.java @@ -144,7 +144,7 @@ private void registerAction(String actionName) { private void findClasses() { String findText = toolBar.getFindText(); - if (findText == null || findText.equals("")) { + if (findText == null || findText.isEmpty()) { return; } diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/classbrowser/CodeViewerPanel.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/classbrowser/CodeViewerPanel.java index 439ff74533a04..9f59738e1cf38 100644 --- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/classbrowser/CodeViewerPanel.java +++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/classbrowser/CodeViewerPanel.java @@ -89,7 +89,7 @@ public void actionPerformed(ActionEvent e) { } private void viewAddress() { - if (address.getText() != null && !address.getText().equals("")) { + if (address.getText() != null && !address.getText().isEmpty()) { contentEditor.setText(htmlGen.genHTMLForAddress(address.getText())); } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/ScopeImpl.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/ScopeImpl.java index f16740ecd203d..8e3d5de0c5e8f 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/ScopeImpl.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/ScopeImpl.java @@ -159,7 +159,7 @@ private ScopeImpl(DebugContext owner, String unqualifiedName, ScopeImpl parent, this.unqualifiedName = unqualifiedName; this.interceptDisabled = interceptDisabled; if (parent != null) { - emptyScope = unqualifiedName.equals(""); + emptyScope = unqualifiedName.isEmpty(); } else { if (unqualifiedName.isEmpty()) { throw new IllegalArgumentException("root scope name must be non-empty"); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options.processor/src/org/graalvm/compiler/options/processor/OptionProcessor.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options.processor/src/org/graalvm/compiler/options/processor/OptionProcessor.java index cd71751b6425e..2960e976d73c1 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options.processor/src/org/graalvm/compiler/options/processor/OptionProcessor.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options.processor/src/org/graalvm/compiler/options/processor/OptionProcessor.java @@ -127,7 +127,7 @@ private void processElement(Element element, OptionsInfo info) { } String optionName = getAnnotationValue(annotation, "name", String.class); - if (optionName.equals("")) { + if (optionName.isEmpty()) { optionName = fieldName; } diff --git a/src/jdk.jcmd/share/classes/sun/tools/jmap/JMap.java b/src/jdk.jcmd/share/classes/sun/tools/jmap/JMap.java index adf189acae46d..931c5237fa92c 100644 --- a/src/jdk.jcmd/share/classes/sun/tools/jmap/JMap.java +++ b/src/jdk.jcmd/share/classes/sun/tools/jmap/JMap.java @@ -174,7 +174,7 @@ private static void histo(String pid, String options) for (int i = 0; i < subopts.length; i++) { String subopt = subopts[i]; - if (subopt.equals("") || subopt.equals("all")) { + if (subopt.isEmpty() || subopt.equals("all")) { // pass } else if (subopt.equals("live")) { liveopt = "-live"; @@ -212,7 +212,7 @@ private static void dump(String pid, String options) for (int i = 0; i < subopts.length; i++) { String subopt = subopts[i]; - if (subopt.equals("") || subopt.equals("all")) { + if (subopt.isEmpty() || subopt.equals("all")) { // pass } else if (subopt.equals("live")) { liveopt = "-live"; diff --git a/src/jdk.security.auth/share/classes/com/sun/security/auth/module/LdapLoginModule.java b/src/jdk.security.auth/share/classes/com/sun/security/auth/module/LdapLoginModule.java index 60dbb1d56fdd9..2e8897e8eb8ac 100644 --- a/src/jdk.security.auth/share/classes/com/sun/security/auth/module/LdapLoginModule.java +++ b/src/jdk.security.auth/share/classes/com/sun/security/auth/module/LdapLoginModule.java @@ -912,7 +912,7 @@ private String findUserDN(LdapContext ctx) throws LoginException { // ignore } - if (userDN.equals("")) { + if (userDN.isEmpty()) { throw (LoginException) new FailedLoginException("Cannot find user's LDAP entry"); } else { diff --git a/test/hotspot/jtreg/compiler/intrinsics/sha/TestDigest.java b/test/hotspot/jtreg/compiler/intrinsics/sha/TestDigest.java index 4801c3c43fa4d..81034cb5a27d0 100644 --- a/test/hotspot/jtreg/compiler/intrinsics/sha/TestDigest.java +++ b/test/hotspot/jtreg/compiler/intrinsics/sha/TestDigest.java @@ -102,7 +102,7 @@ public static void main(String[] args) throws Exception { testDigest(provider, algorithm, msgSize, offset, iters, warmupIters); - if (algorithm2.equals("") == false) { + if (!algorithm2.isEmpty()) { testDigest(provider, algorithm2, msgSize, offset, iters, warmupIters); } } diff --git a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ResolvePossiblyCachedConstantInPoolTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ResolvePossiblyCachedConstantInPoolTest.java index fe6922972a1ac..bc694c49ad967 100644 --- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ResolvePossiblyCachedConstantInPoolTest.java +++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ResolvePossiblyCachedConstantInPoolTest.java @@ -106,7 +106,7 @@ private static void validateString(ConstantPool constantPoolCTVM, Object constantInPool = CompilerToVMHelper.resolvePossiblyCachedConstantInPool(constantPoolCTVM, index); String stringToVerify = (String) constantInPool; String stringToRefer = entry.name; - if (stringToRefer.equals("") && cpci != ConstantPoolTestsHelper.NO_CP_CACHE_PRESENT) { + if (stringToRefer.isEmpty() && cpci != ConstantPoolTestsHelper.NO_CP_CACHE_PRESENT) { stringToRefer = null; // tested method returns null for cached empty strings } String msg = String.format("Wrong string accessed by %sconstant pool index %d", cached, index); diff --git a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/VirtualObjectFormattingTest.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/VirtualObjectFormattingTest.java index 4b8df9785f3c5..1d75d22b0e05c 100644 --- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/VirtualObjectFormattingTest.java +++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/VirtualObjectFormattingTest.java @@ -43,6 +43,6 @@ protected void test(ResolvedJavaType klass, JavaValue[] kinds, JavaKind[] values // asserting. VirtualObject virtual = VirtualObject.get(klass, 0); virtual.setValues(kinds, values); - Assert.assertTrue(!virtual.toString().equals("")); + Assert.assertTrue(!virtual.toString().isEmpty()); } } diff --git a/test/hotspot/jtreg/compiler/stringopts/TestOptimizeStringConcat.java b/test/hotspot/jtreg/compiler/stringopts/TestOptimizeStringConcat.java index 444e87897eba5..c846d89b6f97b 100644 --- a/test/hotspot/jtreg/compiler/stringopts/TestOptimizeStringConcat.java +++ b/test/hotspot/jtreg/compiler/stringopts/TestOptimizeStringConcat.java @@ -45,7 +45,7 @@ static boolean checkArgumentSyntax(String value, String allowedchars, String not } else { if (value == null) { rc = "the value null is not allowed, it is missing"; - } else if (value != null && minchar > 0 && value.trim().equals("")) { + } else if (value != null && minchar > 0 && value.trim().isEmpty()) { rc = "the value must not be empty"; } else if (value != null) { if (value.length() < minchar || value.length() > maxchar) { diff --git a/test/hotspot/jtreg/runtime/cds/serviceability/ReplaceCriticalClasses.java b/test/hotspot/jtreg/runtime/cds/serviceability/ReplaceCriticalClasses.java index e70021c4ef820..ab2204538f8d9 100644 --- a/test/hotspot/jtreg/runtime/cds/serviceability/ReplaceCriticalClasses.java +++ b/test/hotspot/jtreg/runtime/cds/serviceability/ReplaceCriticalClasses.java @@ -179,7 +179,7 @@ static void launchChild(String args[]) throws Throwable { shared, klassName); - final boolean expectDisable = !early.equals(""); + final boolean expectDisable = !early.isEmpty(); final boolean checkSubgraph = subgraph; final boolean expectShared = shared.equals("-shared"); CDSTestUtils.run(opts).assertNormalExit(out -> { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareEvent/referenceType/refType001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareEvent/referenceType/refType001.java index e576e58be4c14..9e87e740a0265 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareEvent/referenceType/refType001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareEvent/referenceType/refType001.java @@ -157,7 +157,7 @@ public void run() { } else { String refName = refType.name(); - if ((refName == null) || (refName.equals(""))) { + if ((refName == null) || (refName.isEmpty())) { log.complain("FAILURE 4: Reference has invalid empty name"); testFailed = true; } else { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareEvent/thread/thread001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareEvent/thread/thread001.java index 12bbf21d242f9..35cd2546c37c3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareEvent/thread/thread001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareEvent/thread/thread001.java @@ -173,7 +173,7 @@ public void run() { if (eventThread == null) { log.complain("FAILURE 3: ClassPrepareEvent.thread() returns null"); testFailed = true; - } else if ((threadName == null) || (threadName.equals(""))) { + } else if ((threadName == null) || (threadName.isEmpty())) { log.complain("FAILURE 4: thread reference has invalid empty name"); testFailed = true; } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadEvent/className/classname001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadEvent/className/classname001.java index 77ef71d304f01..67f95cdfae5d1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadEvent/className/classname001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadEvent/className/classname001.java @@ -219,7 +219,7 @@ public static int run(final String args[], final PrintStream out) { // check that received event is for checked class log.display("ClassUnloadEvent is received for " + refName); - if ((refName == null) || (refName.equals(""))) { + if ((refName == null) || (refName.isEmpty())) { log.complain("FAILURE 3: ClassUnloadEvent.className() returns null or empty string"); testFailed = true; } else if (refName.equals(CHECKED_CLASS)) { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadEvent/classSignature/signature001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadEvent/classSignature/signature001.java index e3afb2185b966..b3e04e9e2c7f8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadEvent/classSignature/signature001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadEvent/classSignature/signature001.java @@ -224,7 +224,7 @@ public static int run(final String args[], final PrintStream out) { log.display("ClassUnloadEvent is received for " + refSignature); // check that received event is for checked class - if ((refSignature == null) || (refSignature.equals(""))) { + if ((refSignature == null) || (refSignature.isEmpty())) { log.complain("FAILURE 3: ClassUnloadEvent.classSignature() returns null or empty string"); testFailed = true; diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathEvent/thread/thread001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathEvent/thread/thread001.java index b5a169d5c09b7..0000a6dfb584e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathEvent/thread/thread001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathEvent/thread/thread001.java @@ -160,7 +160,7 @@ public void run() { } String threadName = eventThread.name(); - if ((threadName == null) || (threadName.equals(""))) { + if ((threadName == null) || (threadName.isEmpty())) { log.complain("FAILURE 3: thread reference has invalid empty name"); testFailed = true; } else { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartEvent/thread/thread001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartEvent/thread/thread001.java index 9de6f2c301f7e..4bfd57db5434f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartEvent/thread/thread001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartEvent/thread/thread001.java @@ -220,7 +220,7 @@ public void run() { } String threadName = eventThread.name(); - if ((threadName == null) || (threadName.equals(""))) { + if ((threadName == null) || (threadName.isEmpty())) { log.complain("FAILURE 3: thread reference has invalid empty name"); testFailed = true; } else { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMStartEvent/thread/thread001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMStartEvent/thread/thread001.java index 00abeadbe049c..8cf4b680d1ec4 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMStartEvent/thread/thread001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMStartEvent/thread/thread001.java @@ -115,7 +115,7 @@ public void run() { } String threadName = eventThread.name(); - if ((threadName == null) || (threadName.equals(""))) { + if ((threadName == null) || (threadName.isEmpty())) { log.complain("FAILURE 4: thread reference has invalid empty name"); testFailed = true; } else { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResourceExhausted/resexhausted003.java b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResourceExhausted/resexhausted003.java index dd1e8d2d47703..fe17f723f6a04 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResourceExhausted/resexhausted003.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResourceExhausted/resexhausted003.java @@ -89,7 +89,7 @@ public static int run(String args[], PrintStream out) { classesDir = testpaths[i]; } } - if (classesDir.equals("")) { + if (classesDir.isEmpty()) { System.err.println("TEST BUG: Classes directory not found in test,class.path."); return Consts.TEST_FAILED; } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/LoggingMXBean/getLoggerLevel/getloggerlevel001.java b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/LoggingMXBean/getLoggerLevel/getloggerlevel001.java index f291a2598c177..a263af22aa4e9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/LoggingMXBean/getLoggerLevel/getloggerlevel001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/LoggingMXBean/getLoggerLevel/getloggerlevel001.java @@ -103,7 +103,7 @@ static int run(String[] args, PrintStream out) { // be returned. testLog1.setLevel(null); String returnedLevel = loggingMonitor.getLoggerLevel(testLog1Name); - if (returnedLevel == null || !returnedLevel.equals("")) { + if (returnedLevel == null || !returnedLevel.isEmpty()) { testFailed = true; log.complain("Failure 3."); diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/LoggingMXBean/getParentLoggerName/getparentloggername001.java b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/LoggingMXBean/getParentLoggerName/getparentloggername001.java index 293a2bfa05646..9a8d6bd02509f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/LoggingMXBean/getParentLoggerName/getparentloggername001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/LoggingMXBean/getParentLoggerName/getparentloggername001.java @@ -89,7 +89,7 @@ static int run(String[] args, PrintStream out) { // result will be an empty string. String parentName = loggingMonitor.getParentLoggerName( testLogParentName); - if (parentName == null || !parentName.equals("")) { + if (parentName == null || !parentName.isEmpty()) { testFailed = true; log.complain("Failure 3."); diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/Binder.java b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/Binder.java index d74fb93731e5c..61769c42bcaa8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/Binder.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/Binder.java @@ -1179,7 +1179,7 @@ private static String askQuestion(String question, String defaultAnswer) { System.out.print(" [" + defaultAnswer + "] "); System.out.flush(); String answer = bin.readLine(); - if (answer.equals("")) + if (answer.isEmpty()) return defaultAnswer; return answer; } catch (IOException e) { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jdwp/Binder.java b/test/hotspot/jtreg/vmTestbase/nsk/share/jdwp/Binder.java index 2424a9a56edb9..43d0747b1d95c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/share/jdwp/Binder.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jdwp/Binder.java @@ -343,7 +343,7 @@ private String askQuestion(String question, String defaultAnswer) { System.out.print(" [" + defaultAnswer + "] "); System.out.flush(); String answer = bin.readLine(); - if (answer.equals("")) + if (answer.isEmpty()) return defaultAnswer; return answer; } catch (IOException e) { diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jpda/BindServer.java b/test/hotspot/jtreg/vmTestbase/nsk/share/jpda/BindServer.java index 6ad2150acefac..9828ec1f5b279 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/share/jpda/BindServer.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jpda/BindServer.java @@ -175,7 +175,7 @@ private int runIt(String argv[], PrintStream out) { } String windir = argHandler.getDebugeeWinDir(); - if (!(windir == null || windir.equals(""))) { + if (!(windir == null || windir.isEmpty())) { logger.display("Using WINDIR: \n" + " " + argHandler.getDebugeeWinDir()); } @@ -201,7 +201,7 @@ private int runIt(String argv[], PrintStream out) { stdIn.close(); stdIn = null; break; - } else if (userInput.trim().equals("")) { + } else if (userInput.trim().isEmpty()) { continue; } else { System.out.println("ERROR: Unknown command: " + userInput); @@ -1027,7 +1027,7 @@ private void launchDebugee(LaunchDebugee request) throws IOException { String[] classPathes = convertPathes(request.classPathes, request.slash, "CLASSPATH", true); String windir = argHandler.getDebugeeWinDir(); - boolean win = (!(windir == null || windir.equals(""))); + boolean win = (!(windir == null || windir.isEmpty())); String[] envp = new String[win ? 3 : 1] ; envp[0] = "CLASSPATH=" + ArgumentParser.joinArguments(classPathes, "", pathSeparator); if (win) { @@ -1737,7 +1737,7 @@ protected boolean checkAdditionalOption(String option, String value) { if (option.equals("DEBUGGER_TESTED_JAVA_HOME") || option.equals("DEBUGGER_WORKDIR") || option.equals("DEBUGGER_TESTBASE")) { - if (value == null || value.equals("")) { + if (value == null || value.isEmpty()) { throw new BadOption("Empty value of bind-file option " + option); } return true; @@ -1746,7 +1746,7 @@ protected boolean checkAdditionalOption(String option, String value) { if (option.equals("DEBUGGEE_TESTED_JAVA_HOME") || option.equals("DEBUGGEE_WORKDIR") || option.equals("DEBUGGEE_TESTBASE")) { - if (value == null || value.equals("")) { + if (value == null || value.isEmpty()) { throw new BadOption("Empty value of bind-file option " + option); } checkDir(option, value); @@ -1754,7 +1754,7 @@ protected boolean checkAdditionalOption(String option, String value) { } if (option.equals("DEBUGGEE_WINDIR")) { - if (!(value == null || value.equals(""))) { + if (!(value == null || value.isEmpty())) { checkDir(option, value); } return true; diff --git a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/constprop/constprop02/constprop02.java b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/constprop/constprop02/constprop02.java index 2238e0cfb5aef..7ca8f42d95e72 100644 --- a/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/constprop/constprop02/constprop02.java +++ b/test/hotspot/jtreg/vmTestbase/vm/compiler/jbe/constprop/constprop02/constprop02.java @@ -149,7 +149,7 @@ String testDiv_hand_opt() { boolean verify(String str) { boolean st = true; - if (null == str || str.equals("")) + if (null == str || str.isEmpty()) System.out.println("OK"); else { st = false; diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/DOMUtil.java b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/DOMUtil.java index f59ef0110185d..db84e22dc8582 100644 --- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/DOMUtil.java +++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/DOMUtil.java @@ -154,7 +154,7 @@ public static void serializeNode(Element node, XMLStreamWriter writer) throws XM localName = attr.getNodeName(); } boolean attrPrefixDecl = isPrefixDeclared(writer, attrNS, attrPrefix); - if (!attrPrefix.equals("") && !attrPrefixDecl) { + if (!attrPrefix.isEmpty() && !attrPrefixDecl) { // attr has namespace but namespace decl is there in // ancestor node // So write the namespace decl before writing the attr diff --git a/test/jdk/com/sun/crypto/provider/CICO/PBEFunc/PBEAlgorithm.java b/test/jdk/com/sun/crypto/provider/CICO/PBEFunc/PBEAlgorithm.java index 98ef4f2d92655..6e161858b6b50 100644 --- a/test/jdk/com/sun/crypto/provider/CICO/PBEFunc/PBEAlgorithm.java +++ b/test/jdk/com/sun/crypto/provider/CICO/PBEFunc/PBEAlgorithm.java @@ -75,10 +75,10 @@ public enum PBEAlgorithm { public String getTransformation() { StringJoiner sj = new StringJoiner("/"); sj.add(baseAlgo); - if (!mode.equals("")) { + if (!mode.isEmpty()) { sj.add(this.mode); } - if (!padding.equals("")) { + if (!padding.isEmpty()) { sj.add(this.padding); } return sj.toString(); diff --git a/test/jdk/com/sun/jdi/CompatibleConnectors.java b/test/jdk/com/sun/jdi/CompatibleConnectors.java index 57e0f146b550d..ea82913d40b82 100644 --- a/test/jdk/com/sun/jdi/CompatibleConnectors.java +++ b/test/jdk/com/sun/jdi/CompatibleConnectors.java @@ -216,7 +216,7 @@ static void check(Object[] desc, Connector connector) { if (connector_arg.mustSpecify()) { String value = connector_arg.value(); - if (value.equals("")) { + if (value.isEmpty()) { value = null; } if (value == null) { diff --git a/test/jdk/com/sun/jdi/EventQueueDisconnectTest.java b/test/jdk/com/sun/jdi/EventQueueDisconnectTest.java index c050cb792eb62..685e90c71d6f0 100644 --- a/test/jdk/com/sun/jdi/EventQueueDisconnectTest.java +++ b/test/jdk/com/sun/jdi/EventQueueDisconnectTest.java @@ -65,7 +65,7 @@ public static void main(String args[]) throws Exception { VirtualMachine.TRACE_NONE); connection.setConnectorArg("main", "EventQueueDisconnectTarg"); String debuggeeVMOptions = VMConnection.getDebuggeeVMOptions(); - if (!debuggeeVMOptions.equals("")) { + if (!debuggeeVMOptions.isEmpty()) { if (connection.connectorArg("options").length() > 0) { throw new IllegalArgumentException("VM options in two places"); } diff --git a/test/jdk/com/sun/jdi/GetUninitializedStringValue.java b/test/jdk/com/sun/jdi/GetUninitializedStringValue.java index eb9ae7251c41b..5a2b2887c0a7b 100644 --- a/test/jdk/com/sun/jdi/GetUninitializedStringValue.java +++ b/test/jdk/com/sun/jdi/GetUninitializedStringValue.java @@ -78,7 +78,7 @@ protected void runTests() */ StackFrame frame = bpe.thread().frame(0); StringReference sr = (StringReference)frame.thisObject(); - if (!sr.value().equals("")) { + if (!sr.value().isEmpty()) { throw new Exception("Unexpected value for the uninitialized String"); } diff --git a/test/jdk/com/sun/jdi/VMConnection.java b/test/jdk/com/sun/jdi/VMConnection.java index a9e5355a3212f..08f7c74a219bf 100644 --- a/test/jdk/com/sun/jdi/VMConnection.java +++ b/test/jdk/com/sun/jdi/VMConnection.java @@ -73,7 +73,7 @@ static public String getDebuggeeVMOptions() { static public String[] insertDebuggeeVMOptions(String[] cmdLine) { String opts = getDebuggeeVMOptions(); - if (opts.equals("")) { + if (opts.isEmpty()) { return cmdLine; } // Insert the options at position 1. Blanks in args are not allowed! diff --git a/test/jdk/com/sun/jndi/dns/FedTests/FedObjectFactory.java b/test/jdk/com/sun/jndi/dns/FedTests/FedObjectFactory.java index b2e2c0a6d8a36..ba3a0a333e1bb 100644 --- a/test/jdk/com/sun/jndi/dns/FedTests/FedObjectFactory.java +++ b/test/jdk/com/sun/jndi/dns/FedTests/FedObjectFactory.java @@ -34,7 +34,7 @@ public class FedObjectFactory implements ObjectFactory { @Override public Object getObjectInstance(Object obj, Name name, Context nameCtx, Hashtable environment) { - if (name != null && name.get(name.size() - 1).equals("")) { + if (name != null && name.get(name.size() - 1).isEmpty()) { System.out.println("got nns name"); return FedSubordinateNs.getRoot(); } diff --git a/test/jdk/com/sun/security/sasl/ClientCallbackHandler.java b/test/jdk/com/sun/security/sasl/ClientCallbackHandler.java index 33a4be4823a01..2217eb5fa432c 100644 --- a/test/jdk/com/sun/security/sasl/ClientCallbackHandler.java +++ b/test/jdk/com/sun/security/sasl/ClientCallbackHandler.java @@ -82,7 +82,7 @@ public void handle(Callback[] callbacks) throws UnsupportedCallbackException, } else { System.err.print("Enter choice number: "); String result = readLine(); - if (result.equals("")) { + if (result.isEmpty()) { selection = rcb.getDefaultChoice(); } else { selection = Integer.parseInt(result); @@ -108,7 +108,7 @@ public void handle(Callback[] callbacks) throws UnsupportedCallbackException, System.err.flush(); String result = readLine(); - if (result.equals("")) { + if (result.isEmpty()) { result = realm; } rcb.setText(result); diff --git a/test/jdk/com/sun/security/sasl/digest/ClientCallbackHandler.java b/test/jdk/com/sun/security/sasl/digest/ClientCallbackHandler.java index 33a4be4823a01..2217eb5fa432c 100644 --- a/test/jdk/com/sun/security/sasl/digest/ClientCallbackHandler.java +++ b/test/jdk/com/sun/security/sasl/digest/ClientCallbackHandler.java @@ -82,7 +82,7 @@ public void handle(Callback[] callbacks) throws UnsupportedCallbackException, } else { System.err.print("Enter choice number: "); String result = readLine(); - if (result.equals("")) { + if (result.isEmpty()) { selection = rcb.getDefaultChoice(); } else { selection = Integer.parseInt(result); @@ -108,7 +108,7 @@ public void handle(Callback[] callbacks) throws UnsupportedCallbackException, System.err.flush(); String result = readLine(); - if (result.equals("")) { + if (result.isEmpty()) { result = realm; } rcb.setText(result); diff --git a/test/jdk/java/awt/Choice/UnfocusableCB_ERR/UnfocusableCB_ERR.java b/test/jdk/java/awt/Choice/UnfocusableCB_ERR/UnfocusableCB_ERR.java index 6850abcbf323e..85e88f0e2629d 100644 --- a/test/jdk/java/awt/Choice/UnfocusableCB_ERR/UnfocusableCB_ERR.java +++ b/test/jdk/java/awt/Choice/UnfocusableCB_ERR/UnfocusableCB_ERR.java @@ -77,7 +77,7 @@ public void uncaughtException(Thread t, Throwable exc){ } catch (Throwable e) { UnfocusableCB_ERR.fail("Test failed. Exception thrown: "+e); } - if (failed.equals("")){ + if (failed.isEmpty()){ UnfocusableCB_ERR.pass(); } else { UnfocusableCB_ERR.fail("Test failed:"); diff --git a/test/jdk/java/awt/Component/CompEventOnHiddenComponent/CompEventOnHiddenComponent.java b/test/jdk/java/awt/Component/CompEventOnHiddenComponent/CompEventOnHiddenComponent.java index c643aae1f002d..238c61ce81d95 100644 --- a/test/jdk/java/awt/Component/CompEventOnHiddenComponent/CompEventOnHiddenComponent.java +++ b/test/jdk/java/awt/Component/CompEventOnHiddenComponent/CompEventOnHiddenComponent.java @@ -121,7 +121,7 @@ public void ancestorResized(HierarchyEvent e) { robot.waitForIdle(); - if (passed.equals("")){ + if (passed.isEmpty()){ CompEventOnHiddenComponent.pass(); } else { CompEventOnHiddenComponent.fail(passed); diff --git a/test/jdk/java/awt/Focus/ConsumeNextKeyTypedOnModalShowTest/ConsumeNextKeyTypedOnModalShowTest.java b/test/jdk/java/awt/Focus/ConsumeNextKeyTypedOnModalShowTest/ConsumeNextKeyTypedOnModalShowTest.java index 481aef26b52a8..fc713bf1c77e8 100644 --- a/test/jdk/java/awt/Focus/ConsumeNextKeyTypedOnModalShowTest/ConsumeNextKeyTypedOnModalShowTest.java +++ b/test/jdk/java/awt/Focus/ConsumeNextKeyTypedOnModalShowTest/ConsumeNextKeyTypedOnModalShowTest.java @@ -100,7 +100,7 @@ public void run() { Util.waitForIdle(robot); - if (tf1.getText().equals("")) { + if (tf1.getText().isEmpty()) { throw new RuntimeException("Test failed: couldn't type a char!"); } System.out.println("Test passed."); diff --git a/test/jdk/java/awt/Mouse/MouseModifiersUnitTest/MouseModifiersUnitTest_Standard.java b/test/jdk/java/awt/Mouse/MouseModifiersUnitTest/MouseModifiersUnitTest_Standard.java index 3365b92173784..de47bb9586d61 100644 --- a/test/jdk/java/awt/Mouse/MouseModifiersUnitTest/MouseModifiersUnitTest_Standard.java +++ b/test/jdk/java/awt/Mouse/MouseModifiersUnitTest/MouseModifiersUnitTest_Standard.java @@ -265,7 +265,7 @@ public static void checkModifiers(int testModifier, HashMap h, i break; } } - if (!excplicitModifier.equals("")){ + if (!excplicitModifier.isEmpty()){ if (modifierElements.contains(excplicitModifier)){ modifierElements.remove(excplicitModifier); } else { @@ -308,7 +308,7 @@ public static void checkModifiers(int testModifier, HashMap h, i } }//switch - if (!extraModifiers.equals("")){ + if (!extraModifiers.isEmpty()){ if (modifierElements.contains(extraModifiers)){ modifierElements.remove(extraModifiers); } else { @@ -321,7 +321,7 @@ public static void checkModifiers(int testModifier, HashMap h, i } } - if (!extraModifiersButton3.equals("")){ + if (!extraModifiersButton3.isEmpty()){ if (modifierElements.contains(extraModifiersButton3)){ modifierElements.remove(extraModifiersButton3); } else { diff --git a/test/jdk/java/awt/SplashScreen/MultiResolutionSplash/unix/UnixMultiResolutionSplashTest.java b/test/jdk/java/awt/SplashScreen/MultiResolutionSplash/unix/UnixMultiResolutionSplashTest.java index 99cc58e13a39f..6841c4552d267 100644 --- a/test/jdk/java/awt/SplashScreen/MultiResolutionSplash/unix/UnixMultiResolutionSplashTest.java +++ b/test/jdk/java/awt/SplashScreen/MultiResolutionSplash/unix/UnixMultiResolutionSplashTest.java @@ -190,7 +190,7 @@ static float getScaleFactor() { @Override public void paint(Graphics g) { String scaleStr = System.getenv("GDK_SCALE"); - if (scaleStr != null && !scaleStr.equals("")) { + if (scaleStr != null && !scaleStr.isEmpty()) { try { scaleFactors[0] = Float.valueOf(scaleStr); } catch (NumberFormatException ex) { diff --git a/test/jdk/java/awt/font/FontNames/FCCompositeTest.java b/test/jdk/java/awt/font/FontNames/FCCompositeTest.java index 63ac9872da8bf..6e3c9aa09ed32 100644 --- a/test/jdk/java/awt/font/FontNames/FCCompositeTest.java +++ b/test/jdk/java/awt/font/FontNames/FCCompositeTest.java @@ -91,7 +91,7 @@ private static void test(int index) { String fcname = br.readLine(); if (fcname == null) break; fcFullName = fcname; - if (fcname.equals("")) { + if (fcname.isEmpty()) { System.out.println("Skip if no fullname"); return; } diff --git a/test/jdk/java/lang/ProcessBuilder/Basic.java b/test/jdk/java/lang/ProcessBuilder/Basic.java index 7344cb740424c..c05560474b9a4 100644 --- a/test/jdk/java/lang/ProcessBuilder/Basic.java +++ b/test/jdk/java/lang/ProcessBuilder/Basic.java @@ -341,9 +341,9 @@ public static void main(String args[]) throws Throwable { else redirectIO(pb, INHERIT, INHERIT, INHERIT); ProcessResults r = run(pb); - if (! r.out().equals("")) + if (! r.out().isEmpty()) System.exit(7); - if (! r.err().equals("")) + if (! r.err().isEmpty()) System.exit(8); if (r.exitValue() != 0) System.exit(9); diff --git a/test/jdk/java/lang/RuntimeTests/exec/WinCommand.java b/test/jdk/java/lang/RuntimeTests/exec/WinCommand.java index d3452c916387e..b0d22298cad65 100644 --- a/test/jdk/java/lang/RuntimeTests/exec/WinCommand.java +++ b/test/jdk/java/lang/RuntimeTests/exec/WinCommand.java @@ -81,7 +81,7 @@ private static String outputOf(String... args) { CommandRunner cr = new CommandRunner(args); if (cr.exitValue != 0) fail("exitValue != 0"); - if (! cr.err.equals("")) + if (! cr.err.isEmpty()) fail("stderr: " + cr.err); return cr.out.replaceFirst("[\r\n]+$", ""); } catch (Exception e) { @@ -163,7 +163,7 @@ public static void main(String[] args) throws Exception { // if (new File(systemDirW, "command.com").exists() // // no output if running without a console; // // fix this in Mustang -// && ! outputOf("command.com", "/C", "CD").equals("")) { +// && ! outputOf("command.com", "/C", "CD").isEmpty()) { // out.println("Running command.com tests..."); // checkCD("command.com", // systemDirM + "/command.com", @@ -172,7 +172,7 @@ public static void main(String[] args) throws Exception { // Win9x systems have a %SYSTEMDRIVE%\command.com // if (new File("C:\\COMMAND.COM").exists() -// && ! outputOf("COMMAND.COM", "/C", "CD").equals("")) { +// && ! outputOf("COMMAND.COM", "/C", "CD").isEmpty()) { // out.println("Running COMMAND.COM tests..."); // checkCD("C:/command.com", // "C:\\command.com"); diff --git a/test/jdk/java/lang/SecurityManager/CheckPackageMatching.java b/test/jdk/java/lang/SecurityManager/CheckPackageMatching.java index 418a04a685714..3e403286b71cc 100644 --- a/test/jdk/java/lang/SecurityManager/CheckPackageMatching.java +++ b/test/jdk/java/lang/SecurityManager/CheckPackageMatching.java @@ -56,7 +56,7 @@ public class CheckPackageMatching { private static List actual() { String prop = Security.getProperty("package.access"); List packages = new ArrayList<>(); - if (prop != null && !prop.equals("")) { + if (prop != null && !prop.isEmpty()) { StringTokenizer tok = new StringTokenizer(prop, ","); while (tok.hasMoreElements()) { String s = tok.nextToken().trim(); diff --git a/test/jdk/java/lang/System/MacEncoding/TestFileEncoding.java b/test/jdk/java/lang/System/MacEncoding/TestFileEncoding.java index a3b9b8dddcf55..cd9007a0f34dc 100644 --- a/test/jdk/java/lang/System/MacEncoding/TestFileEncoding.java +++ b/test/jdk/java/lang/System/MacEncoding/TestFileEncoding.java @@ -95,7 +95,7 @@ private void run() { LinkedList cmdList = new LinkedList<>(); cmdList.add(TestHelper.javaCmd); for (String vmOpt : vmOpts) { - if (vmOpt != null && !vmOpt.equals("")) { + if (vmOpt != null && !vmOpt.isEmpty()) { cmdList.add(vmOpt); } } diff --git a/test/jdk/java/lang/management/CompositeData/OpenTypeConverter.java b/test/jdk/java/lang/management/CompositeData/OpenTypeConverter.java index 49f6493fbc707..190d413f8e7d8 100644 --- a/test/jdk/java/lang/management/CompositeData/OpenTypeConverter.java +++ b/test/jdk/java/lang/management/CompositeData/OpenTypeConverter.java @@ -169,7 +169,7 @@ else if (name.startsWith("has") && type == boolean.class) else continue; - if (rest.equals("") || method.getParameterTypes().length > 0 + if (rest.isEmpty() || method.getParameterTypes().length > 0 || type == void.class || rest.equals("Class")) continue; diff --git a/test/jdk/java/lang/management/PlatformLoggingMXBean/LoggingMXBeanTest.java b/test/jdk/java/lang/management/PlatformLoggingMXBean/LoggingMXBeanTest.java index 55aa90ccce4e1..2f463a742b70f 100644 --- a/test/jdk/java/lang/management/PlatformLoggingMXBean/LoggingMXBeanTest.java +++ b/test/jdk/java/lang/management/PlatformLoggingMXBean/LoggingMXBeanTest.java @@ -117,7 +117,7 @@ public LoggingMXBeanTest(LoggingMXBean mbean) throws Exception { } String l2 = mbean.getLoggerLevel(LOGGER_NAME_2); System.out.println(" : Level for Logger " + LOGGER_NAME_2 + " : " + l2); - if (!l2.equals("")) { + if (!l2.isEmpty()) { throw new RuntimeException( "Expected level for " + LOGGER_NAME_2 + " = \"\"" + " but got " + l2); @@ -197,7 +197,7 @@ public LoggingMXBeanTest(LoggingMXBean mbean) throws Exception { } String p2 = mbean.getParentLoggerName(""); System.out.println(" : Parent Logger for \"\" : " + p2); - if (!p2.equals("")) { + if (!p2.isEmpty()) { throw new RuntimeException( "Expected parent for root logger \"\" = \"\"" + " but got " + p2); diff --git a/test/jdk/java/net/HttpURLConnection/SetAuthenticator/HTTPTestServer.java b/test/jdk/java/net/HttpURLConnection/SetAuthenticator/HTTPTestServer.java index a896142b513b6..126f56ef94feb 100644 --- a/test/jdk/java/net/HttpURLConnection/SetAuthenticator/HTTPTestServer.java +++ b/test/jdk/java/net/HttpURLConnection/SetAuthenticator/HTTPTestServer.java @@ -1147,7 +1147,7 @@ private void processRequestAndWaitToComplete(final Socket clientConnection) // Read all headers until we find the empty line that // signals the end of all headers. - while(!requestLine.equals("")) { + while(!requestLine.isEmpty()) { System.out.println("Tunnel: Reading header: " + (requestLine = readLine(ccis))); } diff --git a/test/jdk/java/net/httpclient/CookieHeaderTest.java b/test/jdk/java/net/httpclient/CookieHeaderTest.java index f5c9b57d37662..5020beec89d2e 100644 --- a/test/jdk/java/net/httpclient/CookieHeaderTest.java +++ b/test/jdk/java/net/httpclient/CookieHeaderTest.java @@ -430,7 +430,7 @@ public void run() { // signals the end of all headers. String line = requestLine; String cookies = null; - while (!line.equals("")) { + while (!line.isEmpty()) { System.out.println(now() + getName() + ": Reading header: " + (line = readLine(ccis))); if (line.startsWith("Cookie:")) { diff --git a/test/jdk/java/net/httpclient/DigestEchoServer.java b/test/jdk/java/net/httpclient/DigestEchoServer.java index b84b0eb5225c1..146ea5a51050d 100644 --- a/test/jdk/java/net/httpclient/DigestEchoServer.java +++ b/test/jdk/java/net/httpclient/DigestEchoServer.java @@ -1693,7 +1693,7 @@ public void run() { // Read all headers until we find the empty line that // signals the end of all headers. String line = requestLine; - while(!line.equals("")) { + while(!line.isEmpty()) { System.out.println(now() + "Tunnel: Reading header: " + (line = readLine(ccis))); headers.append(line).append("\r\n"); diff --git a/test/jdk/java/net/httpclient/EncodedCharsInURI.java b/test/jdk/java/net/httpclient/EncodedCharsInURI.java index 6d7a42e8532ee..e11b3bce01652 100644 --- a/test/jdk/java/net/httpclient/EncodedCharsInURI.java +++ b/test/jdk/java/net/httpclient/EncodedCharsInURI.java @@ -418,7 +418,7 @@ public void run() { // Read all headers until we find the empty line that // signals the end of all headers. String line = requestLine; - while (!line.equals("")) { + while (!line.isEmpty()) { System.out.println(now() + getName() + ": Reading header: " + (line = readLine(ccis))); headers.append(line).append("\r\n"); diff --git a/test/jdk/java/net/httpclient/ProxyTest.java b/test/jdk/java/net/httpclient/ProxyTest.java index aa2faeff32762..536ccc7544a8d 100644 --- a/test/jdk/java/net/httpclient/ProxyTest.java +++ b/test/jdk/java/net/httpclient/ProxyTest.java @@ -329,7 +329,7 @@ public void accept() { // Read all headers until we find the empty line that // signals the end of all headers. - while(!requestLine.equals("")) { + while(!requestLine.isEmpty()) { System.out.println("Tunnel: Reading header: " + (requestLine = readLine(ccis))); } diff --git a/test/jdk/java/net/httpclient/Response204.java b/test/jdk/java/net/httpclient/Response204.java index e68be645ff9fa..e06f73cee9357 100644 --- a/test/jdk/java/net/httpclient/Response204.java +++ b/test/jdk/java/net/httpclient/Response204.java @@ -77,7 +77,7 @@ public static void main (String[] args) throws Exception { HttpResponse response = client.send(request, HttpResponse.BodyHandlers.ofString()); if (response.statusCode() != 204) throw new RuntimeException("wrong response code"); - if (response.body() != null && !response.body().equals("")) + if (response.body() != null && !response.body().isEmpty()) throw new RuntimeException("should have received empty response"); System.out.println(response.headers().firstValue("content-length").orElse("nichts")); System.out.println ("OK 1"); @@ -112,7 +112,7 @@ static void testZeroContentLength(URI uri) throws Exception { System.out.println("Received headers:" + response.headers()); if (response.statusCode() != 204) throw new RuntimeException("Expected 204, got:" + response.statusCode()); - if (response.body() != null && !response.body().equals("")) + if (response.body() != null && !response.body().isEmpty()) throw new RuntimeException("Expected empty response, got: " + response.body()); if (response.headers().firstValueAsLong("Content-Length").orElse(-1L) != 0L) throw new RuntimeException("Expected Content-Length:0, in: " + response.headers()); diff --git a/test/jdk/java/net/httpclient/ServerCloseTest.java b/test/jdk/java/net/httpclient/ServerCloseTest.java index d7fa39aa56a9b..6b1a66bcfb9cf 100644 --- a/test/jdk/java/net/httpclient/ServerCloseTest.java +++ b/test/jdk/java/net/httpclient/ServerCloseTest.java @@ -319,7 +319,7 @@ public void run() { // Read all headers until we find the empty line that // signals the end of all headers. String line = requestLine; - while (!line.equals("")) { + while (!line.isEmpty()) { System.out.println(now() + getName() + ": Reading header: " + (line = readLine(ccis))); headers.append(line).append("\r\n"); diff --git a/test/jdk/java/net/httpclient/http2/ProxyTest2.java b/test/jdk/java/net/httpclient/http2/ProxyTest2.java index 41ab317d4c9f7..f576a6e6849b2 100644 --- a/test/jdk/java/net/httpclient/http2/ProxyTest2.java +++ b/test/jdk/java/net/httpclient/http2/ProxyTest2.java @@ -261,7 +261,7 @@ public void accept() { // Read all headers until we find the empty line that // signals the end of all headers. - while(!requestLine.equals("")) { + while(!requestLine.isEmpty()) { System.out.println("Tunnel: Reading header: " + (requestLine = readLine(ccis))); } diff --git a/test/jdk/java/net/httpclient/http2/server/Http2TestServer.java b/test/jdk/java/net/httpclient/http2/server/Http2TestServer.java index 33e5ade4f8340..b6d5f2cfc0bcd 100644 --- a/test/jdk/java/net/httpclient/http2/server/Http2TestServer.java +++ b/test/jdk/java/net/httpclient/http2/server/Http2TestServer.java @@ -195,7 +195,7 @@ public void setExchangeSupplier(Http2TestExchangeSupplier exchangeSupplier) { } Http2Handler getHandlerFor(String path) { - if (path == null || path.equals("")) + if (path == null || path.isEmpty()) path = "/"; final String fpath = path; diff --git a/test/jdk/java/net/httpclient/http2/server/Http2TestServerConnection.java b/test/jdk/java/net/httpclient/http2/server/Http2TestServerConnection.java index 49d02ede54150..5d1f60224ee16 100644 --- a/test/jdk/java/net/httpclient/http2/server/Http2TestServerConnection.java +++ b/test/jdk/java/net/httpclient/http2/server/Http2TestServerConnection.java @@ -400,7 +400,7 @@ void run() throws Exception { } nextstream = 1; } else if (sslSocket.getApplicationProtocol().equals("http/1.1") || - sslSocket.getApplicationProtocol().equals("")) { + sslSocket.getApplicationProtocol().isEmpty()) { standardHTTP11Response(readHttp1Request()); socket.shutdownOutput(); socket.close(); diff --git a/test/jdk/java/nio/file/Files/walkFileTree/MaxDepth.java b/test/jdk/java/nio/file/Files/walkFileTree/MaxDepth.java index a1628851f8ae8..cbe7e4e4ba278 100644 --- a/test/jdk/java/nio/file/Files/walkFileTree/MaxDepth.java +++ b/test/jdk/java/nio/file/Files/walkFileTree/MaxDepth.java @@ -52,7 +52,7 @@ static void test(final Path top) throws IOException { // compute depth based on relative path to top directory private int depth(Path file) { Path rp = file.relativize(top); - return (rp.getFileName().toString().equals("")) ? 0 : rp.getNameCount(); + return (rp.getFileName().toString().isEmpty()) ? 0 : rp.getNameCount(); } @Override diff --git a/test/jdk/java/rmi/activation/Activatable/checkAnnotations/CheckAnnotations.java b/test/jdk/java/rmi/activation/Activatable/checkAnnotations/CheckAnnotations.java index 4776f90c3bed4..cfe4d57fa80f3 100644 --- a/test/jdk/java/rmi/activation/Activatable/checkAnnotations/CheckAnnotations.java +++ b/test/jdk/java/rmi/activation/Activatable/checkAnnotations/CheckAnnotations.java @@ -183,8 +183,8 @@ public static void checkAnnotations(int iteration) outString = rmidOut.toString(); errString = rmidErr.toString(); - if ((!outString.equals("")) && - (!errString.equals(""))) + if ((!outString.isEmpty()) && + (!errString.isEmpty())) { System.err.println("obtained annotations"); break; diff --git a/test/jdk/java/rmi/activation/ActivationSystem/stubClassesPermitted/StubClassesPermitted.java b/test/jdk/java/rmi/activation/ActivationSystem/stubClassesPermitted/StubClassesPermitted.java index 43318ce0eb0f5..0b28648dbaa2a 100644 --- a/test/jdk/java/rmi/activation/ActivationSystem/stubClassesPermitted/StubClassesPermitted.java +++ b/test/jdk/java/rmi/activation/ActivationSystem/stubClassesPermitted/StubClassesPermitted.java @@ -161,7 +161,7 @@ public static void main(String args[]) { ps.flush(); String trace = new String(bout.toByteArray()); if ((trace.indexOf("exceptionReceivedFromServer") >= 0) || - trace.equals("")) + trace.isEmpty()) { throw e; } diff --git a/test/jdk/java/rmi/testlibrary/RMID.java b/test/jdk/java/rmi/testlibrary/RMID.java index 26bb6288ce359..ebd068f06845a 100644 --- a/test/jdk/java/rmi/testlibrary/RMID.java +++ b/test/jdk/java/rmi/testlibrary/RMID.java @@ -93,10 +93,10 @@ private static String makeOptions(int port, boolean debugExec, //" -Djava.compiler= "; // if test params set, want to propagate them - if (!TestParams.testSrc.equals("")) { + if (!TestParams.testSrc.isEmpty()) { options += " -Dtest.src=" + TestParams.testSrc + " "; } - //if (!TestParams.testClasses.equals("")) { + //if (!TestParams.testClasses.isEmpty()) { // options += " -Dtest.classes=" + TestParams.testClasses + " "; //} options += " -Dtest.classes=" + TestParams.testClasses //; @@ -154,20 +154,20 @@ private static String makeArgs(boolean includePortArg, int port) { // " -C-Djava.compiler= "; // if test params set, want to propagate them - if (!TestParams.testSrc.equals("")) { + if (!TestParams.testSrc.isEmpty()) { args += " -C-Dtest.src=" + TestParams.testSrc; } - if (!TestParams.testClasses.equals("")) { + if (!TestParams.testClasses.isEmpty()) { args += " -C-Dtest.classes=" + TestParams.testClasses; } - if (!TestParams.testJavaOpts.equals("")) { + if (!TestParams.testJavaOpts.isEmpty()) { for (String a : TestParams.testJavaOpts.split(" +")) { args += " -C" + a; } } - if (!TestParams.testVmOpts.equals("")) { + if (!TestParams.testVmOpts.isEmpty()) { for (String a : TestParams.testVmOpts.split(" +")) { args += " -C" + a; } diff --git a/test/jdk/java/rmi/transport/checkFQDN/CheckFQDN.java b/test/jdk/java/rmi/transport/checkFQDN/CheckFQDN.java index 6be0be0b402cb..cbde3919d03a7 100644 --- a/test/jdk/java/rmi/transport/checkFQDN/CheckFQDN.java +++ b/test/jdk/java/rmi/transport/checkFQDN/CheckFQDN.java @@ -114,7 +114,7 @@ public static void testProperty(String property, try { String propOption = ""; String equal = ""; - if (!property.equals("")) { + if (!property.isEmpty()) { propOption = " -D"; equal = "="; } diff --git a/test/jdk/java/security/Policy/ExtensiblePolicy/TVJar/TVPermission.java b/test/jdk/java/security/Policy/ExtensiblePolicy/TVJar/TVPermission.java index e1ab7630ca00d..ff8ca38ea82d4 100644 --- a/test/jdk/java/security/Policy/ExtensiblePolicy/TVJar/TVPermission.java +++ b/test/jdk/java/security/Policy/ExtensiblePolicy/TVJar/TVPermission.java @@ -84,7 +84,7 @@ public TVPermission(String channel, String action) { private synchronized int[] parseNum(String num) throws Exception { - if (num == null || num.equals("") || num.equals("*")) { + if (num == null || num.isEmpty() || num.equals("*")) { wildcard = true; return new int[]{NUM_MIN, NUM_MAX}; } @@ -104,7 +104,7 @@ private synchronized int[] parseNum(String num) String high = num.substring(dash + 1); int l, h; - if (low.equals("")) { + if (low.isEmpty()) { l = NUM_MIN; } else { try { @@ -114,7 +114,7 @@ private synchronized int[] parseNum(String num) } } - if (high.equals("")) { + if (high.isEmpty()) { h = NUM_MAX; } else { try { diff --git a/test/jdk/java/text/Format/NumberFormat/NumberRegression.java b/test/jdk/java/text/Format/NumberFormat/NumberRegression.java index 037efa827b8c1..7fffdc6a2687f 100644 --- a/test/jdk/java/text/Format/NumberFormat/NumberRegression.java +++ b/test/jdk/java/text/Format/NumberFormat/NumberRegression.java @@ -842,8 +842,8 @@ public void Test4061302() String currency = fmt.getCurrencySymbol(); String intlCurrency = fmt.getInternationalCurrencySymbol(); char monDecSeparator = fmt.getMonetaryDecimalSeparator(); - if (currency.equals("") || - intlCurrency.equals("") || + if (currency.isEmpty() || + intlCurrency.isEmpty() || monDecSeparator == 0) { errln("getCurrencySymbols failed, got empty string."); } diff --git a/test/jdk/java/text/Normalizer/NormalizerAPITest.java b/test/jdk/java/text/Normalizer/NormalizerAPITest.java index 00deb3c843c90..6cdf96586908a 100644 --- a/test/jdk/java/text/Normalizer/NormalizerAPITest.java +++ b/test/jdk/java/text/Normalizer/NormalizerAPITest.java @@ -205,7 +205,7 @@ public void Test_No_NullPointerException_java_normalize() { for (int i = 0; i < forms.length; i++) { try { String s = Normalizer.normalize("", forms[i]); - if (!s.equals("")) { + if (!s.isEmpty()) { error = true; } } @@ -230,7 +230,7 @@ public void Test_No_NullPointerException_sun_normalize() { for (int i = 0; i < forms.length; i++) { try { String s = sun.text.Normalizer.normalize("", forms[i], options[j]); - if (!s.equals("")) { + if (!s.isEmpty()) { error = true; } } diff --git a/test/jdk/java/util/Locale/Bug7069824.java b/test/jdk/java/util/Locale/Bug7069824.java index 0eb1f21c2756f..7a3359f477bd6 100644 --- a/test/jdk/java/util/Locale/Bug7069824.java +++ b/test/jdk/java/util/Locale/Bug7069824.java @@ -405,7 +405,7 @@ private static List generateLocales(String tags) { } List localeList = new ArrayList<>(); - if (tags.equals("")) { + if (tags.isEmpty()) { return localeList; } String[] t = tags.split(", "); diff --git a/test/jdk/java/util/Locale/Bug8035133.java b/test/jdk/java/util/Locale/Bug8035133.java index 8d86ca0249853..869acae2d2166 100644 --- a/test/jdk/java/util/Locale/Bug8035133.java +++ b/test/jdk/java/util/Locale/Bug8035133.java @@ -131,7 +131,7 @@ private static List generateLocales(String tags) { } List localeList = new ArrayList<>(); - if (tags.equals("")) { + if (tags.isEmpty()) { return localeList; } String[] t = tags.split(", "); diff --git a/test/jdk/java/util/Locale/Bug8040211.java b/test/jdk/java/util/Locale/Bug8040211.java index e783971c6a622..25cb962283c75 100644 --- a/test/jdk/java/util/Locale/Bug8040211.java +++ b/test/jdk/java/util/Locale/Bug8040211.java @@ -337,7 +337,7 @@ private static List generateLocales(String tags) { } List localeList = new ArrayList<>(); - if (tags.equals("")) { + if (tags.isEmpty()) { return localeList; } String[] t = tags.split(", "); diff --git a/test/jdk/java/util/Locale/Bug8159420.java b/test/jdk/java/util/Locale/Bug8159420.java index f09e0f2cbb4b4..2f733cc540d4a 100644 --- a/test/jdk/java/util/Locale/Bug8159420.java +++ b/test/jdk/java/util/Locale/Bug8159420.java @@ -196,7 +196,7 @@ private static List generateLocales(String tags) { } List localeList = new ArrayList<>(); - if (tags.equals("")) { + if (tags.isEmpty()) { return localeList; } String[] t = tags.split(", "); diff --git a/test/jdk/java/util/Locale/LocaleTest.java b/test/jdk/java/util/Locale/LocaleTest.java index f80296bd6807b..85e520490ba5c 100644 --- a/test/jdk/java/util/Locale/LocaleTest.java +++ b/test/jdk/java/util/Locale/LocaleTest.java @@ -227,7 +227,7 @@ public void TestBasicGetters() { errln(" Country code mismatch: " + testLocale.getCountry() + " versus " + dataTable[CTRY][i]); } - if (!testLocale.getVariant().equals("")) { + if (!testLocale.getVariant().isEmpty()) { errln(" Variant code mismatch: " + testLocale.getVariant() + " versus \"\""); } } @@ -337,34 +337,34 @@ private void doTestDisplayNames(Locale inLocale, int compareIndex, boolean defau String expectedName; expectedLang = dataTable[compareIndex][i]; - if (expectedLang.equals("") && defaultIsFrench) { + if (expectedLang.isEmpty() && defaultIsFrench) { expectedLang = dataTable[DLANG_EN][i]; } - if (expectedLang.equals("")) { + if (expectedLang.isEmpty()) { expectedLang = dataTable[DLANG_ROOT][i]; } expectedCtry = dataTable[compareIndex + 1][i]; - if (expectedCtry.equals("") && defaultIsFrench) { + if (expectedCtry.isEmpty() && defaultIsFrench) { expectedCtry = dataTable[DCTRY_EN][i]; } - if (expectedCtry.equals("")) { + if (expectedCtry.isEmpty()) { expectedCtry = dataTable[DCTRY_ROOT][i]; } expectedVar = dataTable[compareIndex + 2][i]; - if (expectedVar.equals("") && defaultIsFrench) { + if (expectedVar.isEmpty() && defaultIsFrench) { expectedVar = dataTable[DVAR_EN][i]; } - if (expectedVar.equals("")) { + if (expectedVar.isEmpty()) { expectedVar = dataTable[DVAR_ROOT][i]; } expectedName = dataTable[compareIndex + 3][i]; - if (expectedName.equals("") && defaultIsFrench) { + if (expectedName.isEmpty() && defaultIsFrench) { expectedName = dataTable[DNAME_EN][i]; } - if (expectedName.equals("")) { + if (expectedName.isEmpty()) { expectedName = dataTable[DNAME_ROOT][i]; } @@ -825,7 +825,7 @@ public void TestThaiCurrencyFormat() { errln("Thai currency prefix wrong: expected \"\u0e3f\", got \"" + thaiCurrency.getPositivePrefix() + "\""); } - if (!thaiCurrency.getPositiveSuffix().equals("")) { + if (!thaiCurrency.getPositiveSuffix().isEmpty()) { errln("Thai currency suffix wrong: expected \"\", got \"" + thaiCurrency.getPositiveSuffix() + "\""); } diff --git a/test/jdk/java/util/PluggableLocale/DateFormatProviderTest.java b/test/jdk/java/util/PluggableLocale/DateFormatProviderTest.java index d199be4772de6..e8d74e747e446 100644 --- a/test/jdk/java/util/PluggableLocale/DateFormatProviderTest.java +++ b/test/jdk/java/util/PluggableLocale/DateFormatProviderTest.java @@ -179,7 +179,7 @@ void messageFormatTest() { for (String type : TYPES) { for (String modifier : MODIFIERS) { String pattern, expected; - if (modifier.equals("")) { + if (modifier.isEmpty()) { pattern = String.format("%s={0,%s}", type, type); } else { pattern = String.format("%s={0,%s,%s}", type, type, modifier); diff --git a/test/jdk/java/util/PluggableLocale/LocaleNameProviderTest.java b/test/jdk/java/util/PluggableLocale/LocaleNameProviderTest.java index 8ed72427e3afc..5ee2d240f1dc9 100644 --- a/test/jdk/java/util/PluggableLocale/LocaleNameProviderTest.java +++ b/test/jdk/java/util/PluggableLocale/LocaleNameProviderTest.java @@ -93,17 +93,17 @@ void checkAvailLocValidityTest() { String jreslang = null; String jresctry = null; String jresvrnt = null; - if (!lang.equals("")) { + if (!lang.isEmpty()) { try { jreslang = rb.getString(lang); } catch (MissingResourceException mre) {} } - if (!ctry.equals("")) { + if (!ctry.isEmpty()) { try { jresctry = rb.getString(ctry); } catch (MissingResourceException mre) {} } - if (!vrnt.equals("")) { + if (!vrnt.isEmpty()) { try { jresvrnt = rb.getString("%%"+vrnt); } catch (MissingResourceException mre) {} diff --git a/test/jdk/java/util/ResourceBundle/ResourceBundleTest.java b/test/jdk/java/util/ResourceBundle/ResourceBundleTest.java index 44b845256e9e2..7596109c62f03 100644 --- a/test/jdk/java/util/ResourceBundle/ResourceBundleTest.java +++ b/test/jdk/java/util/ResourceBundle/ResourceBundleTest.java @@ -265,7 +265,7 @@ public void TestGetLocale() { test = ResourceBundle.getBundle("TestResource", new Locale("fr", "BE", "")); locale = test.getLocale(); - if (!(locale.getLanguage().equals("fr")) || !(locale.getCountry().equals(""))) + if (!(locale.getLanguage().equals("fr")) || !(locale.getCountry().isEmpty())) errln("Actual locale for TestResource_fr_BE should have been fr, got " + locale); // try to find TestResource_iw_IL, which doesn't exist. Should get root locale @@ -274,7 +274,7 @@ public void TestGetLocale() { new Locale("iw", "IL", ""), Control.getNoFallbackControl(Control.FORMAT_DEFAULT)); locale = test.getLocale(); - if (!(locale.getLanguage().equals("")) || !(locale.getCountry().equals(""))) + if (!(locale.getLanguage().isEmpty()) || !(locale.getCountry().isEmpty())) errln("Actual locale for TestResource_iw_IL should have been the root locale, got " + locale); } diff --git a/test/jdk/java/util/Scanner/ScanTest.java b/test/jdk/java/util/Scanner/ScanTest.java index f8e5ab29f47bb..06f60d8214804 100644 --- a/test/jdk/java/util/Scanner/ScanTest.java +++ b/test/jdk/java/util/Scanner/ScanTest.java @@ -157,7 +157,7 @@ public static void useCase2() throws Exception { failCount++; if (sc.nextInt() != 2) failCount++; - if (!sc.next().equals("")) + if (!sc.next().isEmpty()) failCount++; if (sc.nextInt() != 5) failCount++; @@ -426,7 +426,7 @@ public static void hasNextLineTest(int sourceType) throws Exception { if (!sc.hasNextLine()) failCount++; if (sc.nextInt() != 2) failCount++; if (!sc.hasNextLine()) failCount++; - if (!sc.nextLine().equals("")) failCount++; + if (!sc.nextLine().isEmpty()) failCount++; if (!sc.hasNextLine()) failCount++; if (sc.nextInt() != 3) failCount++; if (!sc.hasNextLine()) failCount++; @@ -463,7 +463,7 @@ public static void nextLineTest(int sourceType) throws Exception { failCount++; if (sc.nextInt() != 2) failCount++; - if (!sc.nextLine().equals("")) + if (!sc.nextLine().isEmpty()) failCount++; if (sc.nextInt() != 3) failCount++; @@ -493,7 +493,7 @@ public static void singleDelimTest(int sourceType) throws Exception { failCount++; for (int k=0; k"); indent(level); System.out.println(node.getNodeValue()); diff --git a/test/jdk/javax/imageio/plugins/wbmp/WbmpDefaultImageMetadataTest.java b/test/jdk/javax/imageio/plugins/wbmp/WbmpDefaultImageMetadataTest.java index acc00905a1fed..d489f7f47a9f0 100644 --- a/test/jdk/javax/imageio/plugins/wbmp/WbmpDefaultImageMetadataTest.java +++ b/test/jdk/javax/imageio/plugins/wbmp/WbmpDefaultImageMetadataTest.java @@ -126,7 +126,7 @@ void displayMetadata(Node node, int level) { } Node child = node.getFirstChild(); - if (node.getNodeValue() != null && !node.getNodeValue().equals("") ) { + if (node.getNodeValue() != null && !node.getNodeValue().isEmpty() ) { System.out.println(">"); indent(level); System.out.println(node.getNodeValue()); diff --git a/test/jdk/javax/management/MBeanInfo/NotificationInfoTest.java b/test/jdk/javax/management/MBeanInfo/NotificationInfoTest.java index a0cca183181a3..cd593db011d6b 100644 --- a/test/jdk/javax/management/MBeanInfo/NotificationInfoTest.java +++ b/test/jdk/javax/management/MBeanInfo/NotificationInfoTest.java @@ -271,7 +271,7 @@ private static void scanDir(File dir, String prefix, Set names) for (int i = 0; i < files.length; i++) { File f = files[i]; String name = f.getName(); - String p = (prefix.equals("")) ? name : prefix + "." + name; + String p = (prefix.isEmpty()) ? name : prefix + "." + name; if (f.isDirectory()) scanDir(f, p, names); else if (name.endsWith(".class")) { diff --git a/test/jdk/javax/management/modelmbean/InfoSupportTest.java b/test/jdk/javax/management/modelmbean/InfoSupportTest.java index 4854a79569715..5099ab5e6c08b 100644 --- a/test/jdk/javax/management/modelmbean/InfoSupportTest.java +++ b/test/jdk/javax/management/modelmbean/InfoSupportTest.java @@ -147,7 +147,7 @@ private static boolean checkMMBI(ModelMBeanInfoSupport mmbi, String what) if (!(mmbi.getNotifications() instanceof ModelMBeanNotificationInfo[])) bad += " notifications"; - if (bad.equals("")) { + if (bad.isEmpty()) { System.out.println("..." + what + ": OK"); return true; } else { diff --git a/test/jdk/javax/management/query/QueryExpStringTest.java b/test/jdk/javax/management/query/QueryExpStringTest.java index ab4eebbff96dc..752fc0ad36d37 100644 --- a/test/jdk/javax/management/query/QueryExpStringTest.java +++ b/test/jdk/javax/management/query/QueryExpStringTest.java @@ -284,7 +284,7 @@ private static ValueExp parseExp(String[] ss) throws Exception { String back = ss[0]; if (!skip(ss, " ")) return lhs; - if (ss[0].equals("") || "+-*/".indexOf(ss[0].charAt(0)) < 0) { + if (ss[0].isEmpty() || "+-*/".indexOf(ss[0].charAt(0)) < 0) { ss[0] = back; return lhs; } diff --git a/test/jdk/javax/management/remote/mandatory/connection/BrokenConnectionTest.java b/test/jdk/javax/management/remote/mandatory/connection/BrokenConnectionTest.java index e3570a5c26686..03382d461d54a 100644 --- a/test/jdk/javax/management/remote/mandatory/connection/BrokenConnectionTest.java +++ b/test/jdk/javax/management/remote/mandatory/connection/BrokenConnectionTest.java @@ -504,7 +504,7 @@ private static boolean test(Breakable breakable) System.out.println("Test " + i + (thisok ? " passed" : " FAILED")); breakable.setBroken(false); } - if (failed.equals("")) + if (failed.isEmpty()) return true; else { System.out.println("FAILING CASES:" + failed); diff --git a/test/jdk/jdk/jfr/tool/JSONValue.java b/test/jdk/jdk/jfr/tool/JSONValue.java index 27c63116c8825..bb6a9505da1e2 100644 --- a/test/jdk/jdk/jfr/tool/JSONValue.java +++ b/test/jdk/jdk/jfr/tool/JSONValue.java @@ -510,7 +510,7 @@ public JSONValue parseValue() { } public JSONValue parse(String s) { - if (s == null || s.equals("")) { + if (s == null || s.isEmpty()) { return null; } diff --git a/test/jdk/jdk/modules/incubator/ImageModules.java b/test/jdk/jdk/modules/incubator/ImageModules.java index b69c4022f13f0..e2e85ee9d969e 100644 --- a/test/jdk/jdk/modules/incubator/ImageModules.java +++ b/test/jdk/jdk/modules/incubator/ImageModules.java @@ -317,7 +317,7 @@ static ToolResult java(Path image, String... opts) throws Throwable { ByteArrayOutputStream baos = new ByteArrayOutputStream(); PrintStream ps = new PrintStream(baos); String[] options = Stream.concat(Stream.of(getJava(image)), - Stream.of(opts).filter(s -> !s.equals(""))) + Stream.of(opts).filter(s -> !s.isEmpty())) .toArray(String[]::new); ProcessBuilder pb = new ProcessBuilder(options); @@ -333,7 +333,7 @@ static ToolResult execTool(ToolProvider tool, String... args) { PrintStream ps = new PrintStream(baos); List filteredArgs = Stream.of(args) .map(s -> s.split(" ")).flatMap(Stream::of) - .filter(s -> !s.equals("")) + .filter(s -> !s.isEmpty()) .collect(Collectors.toList()); System.out.println(tool + " " + filteredArgs); int ec = tool.run(ps, ps, filteredArgs.toArray(new String[] {})); diff --git a/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/table/TableDemo.java b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/table/TableDemo.java index 86deeac797431..143b7fa1f0304 100644 --- a/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/table/TableDemo.java +++ b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/table/TableDemo.java @@ -411,7 +411,7 @@ public void setFilterString(String filterString) { } protected boolean hasFilterString() { - return filterString != null && !filterString.equals(""); + return filterString != null && !filterString.isEmpty(); } protected void configureFilters() { diff --git a/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/BundleManager.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/BundleManager.java index dcfc408cd64e1..c040a722aacee 100644 --- a/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/BundleManager.java +++ b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/BundleManager.java @@ -146,7 +146,7 @@ public Bundle loadBundleFromResource(ClassLoader cl, String resource, String ID) public Bundle load() throws IOException, FileNotFoundException { if (System.getProperty("jemmy.resources") != null - && !System.getProperty("jemmy.resources").equals("")) { + && !System.getProperty("jemmy.resources").isEmpty()) { return loadBundleFromFile(System.getProperty("jemmy.resources"), ""); } return null; diff --git a/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/JemmyProperties.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/JemmyProperties.java index ef69e6e1c087a..573e6a8ff9f96 100644 --- a/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/JemmyProperties.java +++ b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/JemmyProperties.java @@ -500,13 +500,13 @@ public void initProperties(String prop_file) { props.load(fileStream); } if (props.getProperty("TIMEOUTS_FILE") != null - && !props.getProperty("TIMEOUTS_FILE").equals("")) { + && !props.getProperty("TIMEOUTS_FILE").isEmpty()) { getOutput().printLine("Loading timeouts from " + props.getProperty("TIMEOUTS_FILE") + " file"); getTimeouts().loadDefaults(props.getProperty("TIMEOUTS_FILE")); } if (props.getProperty("RESOURCE_FILE") != null - && !props.getProperty("RESOURCE_FILE").equals("")) { + && !props.getProperty("RESOURCE_FILE").isEmpty()) { getOutput().printLine("Loading resources from " + props.getProperty("RESOURCE_FILE") + " file"); getBundleManager().loadBundleFromFile(props.getProperty("RESOURCE_FILE"), ""); @@ -524,7 +524,7 @@ public void initProperties(String prop_file) { */ public void initProperties() { if (System.getProperty("jemmy.properties") != null - && !System.getProperty("jemmy.properties").equals("")) { + && !System.getProperty("jemmy.properties").isEmpty()) { initProperties(System.getProperty("jemmy.properties")); } else { try { @@ -615,19 +615,19 @@ public void initDispatchingModel() { boolean srmask = ((getDefaultDispatchingModel() & SMOOTH_ROBOT_MODEL_MASK) != 0); boolean smask = ((getDefaultDispatchingModel() & SHORTCUT_MODEL_MASK) != 0); if (System.getProperty("jemmy.queue_dispatching") != null - && !System.getProperty("jemmy.queue_dispatching").equals("")) { + && !System.getProperty("jemmy.queue_dispatching").isEmpty()) { qmask = System.getProperty("jemmy.queue_dispatching").equals("on"); } if (System.getProperty("jemmy.robot_dispatching") != null - && !System.getProperty("jemmy.robot_dispatching").equals("")) { + && !System.getProperty("jemmy.robot_dispatching").isEmpty()) { rmask = System.getProperty("jemmy.robot_dispatching").equals("on"); } if (System.getProperty("jemmy.smooth_robot_dispatching") != null - && !System.getProperty("jemmy.smooth_robot_dispatching").equals("")) { + && !System.getProperty("jemmy.smooth_robot_dispatching").isEmpty()) { srmask = System.getProperty("jemmy.smooth_robot_dispatching").equals("on"); } if (System.getProperty("jemmy.shortcut_events") != null - && !System.getProperty("jemmy.shortcut_events").equals("")) { + && !System.getProperty("jemmy.shortcut_events").isEmpty()) { smask = System.getProperty("jemmy.shortcut_events").equals("on"); } initDispatchingModel(qmask, rmask, smask, srmask); diff --git a/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/Timeouts.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/Timeouts.java index 7edb588b8bef8..4278593045d6b 100644 --- a/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/Timeouts.java +++ b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/Timeouts.java @@ -380,7 +380,7 @@ public void load(String fileName) public void load() throws FileNotFoundException, IOException { if (System.getProperty("jemmy.timeouts") != null - && !System.getProperty("jemmy.timeouts").equals("")) { + && !System.getProperty("jemmy.timeouts").isEmpty()) { load(System.getProperty("jemmy.timeouts")); } } diff --git a/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/explorer/GUIBrowser.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/explorer/GUIBrowser.java index f90043f13fdea..56caa5224f4c7 100644 --- a/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/explorer/GUIBrowser.java +++ b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/explorer/GUIBrowser.java @@ -1152,21 +1152,21 @@ private void load() { } showAll = props.getProperty("guibrowser.showall") == null - || props.getProperty("guibrowser.showall").equals("") + || props.getProperty("guibrowser.showall").isEmpty() || props.getProperty("guibrowser.showall").equals("on"); visibleCombo.setSelectedIndex(showAll ? 1 : 0); if (props.getProperty("guibrowser.viewpage_0") != null - && !props.getProperty("guibrowser.viewpage_0").equals("")) { + && !props.getProperty("guibrowser.viewpage_0").isEmpty()) { viewTabs.removeAllElements(); viewTabs.addElement(props.getProperty("guibrowser.viewpage_0")); viewTabs.addElement(props.getProperty("guibrowser.viewpage_1")); viewTabs.addElement(props.getProperty("guibrowser.viewpage_2")); if (props.getProperty("guibrowser.viewpage_3") != null - && !props.getProperty("guibrowser.viewpage_3").equals("")) { + && !props.getProperty("guibrowser.viewpage_3").isEmpty()) { viewTabs.addElement(props.getProperty("guibrowser.viewpage_3")); } if (props.getProperty("guibrowser.viewpage_4") != null - && !props.getProperty("guibrowser.viewpage_4").equals("")) { + && !props.getProperty("guibrowser.viewpage_4").isEmpty()) { viewTabs.addElement(props.getProperty("guibrowser.viewpage_4")); } } diff --git a/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JTextComponentOperator.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JTextComponentOperator.java index daa26904e06ff..7a291467f27d2 100644 --- a/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JTextComponentOperator.java +++ b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/operators/JTextComponentOperator.java @@ -829,7 +829,7 @@ public Hashtable getDump() { Hashtable result = super.getDump(); result.put(TEXT_DPROP, ((JTextComponent) getSource()).getText()); if (((JTextComponent) getSource()).getSelectedText() != null - && !((JTextComponent) getSource()).getSelectedText().equals("")) { + && !((JTextComponent) getSource()).getSelectedText().isEmpty()) { result.put(SELECTED_TEXT_DPROP, ((JTextComponent) getSource()).getSelectedText()); } result.put(IS_EDITABLE_DPROP, ((JTextComponent) getSource()).isEditable() ? "true" : "false"); diff --git a/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/TextStyleChooser.java b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/TextStyleChooser.java index f4b75f9ea8f81..9979a13267dab 100644 --- a/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/TextStyleChooser.java +++ b/test/jdk/sanity/client/lib/jemmy/src/org/netbeans/jemmy/util/TextStyleChooser.java @@ -280,7 +280,7 @@ public String getDescription() { if (foreground != null) { result = result + foreground.toString() + " foreground, "; } - if (result.equals("")) { + if (result.isEmpty()) { result = "any, "; } return result.substring(0, result.length() - 2) + " font"; diff --git a/test/jdk/sun/net/idn/NFS4StringPrep.java b/test/jdk/sun/net/idn/NFS4StringPrep.java index 86bdaadc33831..bfa06e9aaa7a6 100644 --- a/test/jdk/sun/net/idn/NFS4StringPrep.java +++ b/test/jdk/sun/net/idn/NFS4StringPrep.java @@ -151,7 +151,7 @@ public static byte[] mixed_prepare(byte[] src) String prefixString = s.substring(0,index); int i= findStringIndex(special_prefixes, prefixString); String suffixString = s.substring(index+1, s.length()); - if(i>-1 && !suffixString.equals("")){ + if(i>-1 && !suffixString.isEmpty()){ throw new ParseException("Suffix following a special index", -1); } UCharacterIterator prefix = UCharacterIterator.getInstance(prefixString); diff --git a/test/jdk/sun/net/www/http/HttpClient/B8209178.java b/test/jdk/sun/net/www/http/HttpClient/B8209178.java index fec17ff84d1cc..9aa5bab2c2682 100644 --- a/test/jdk/sun/net/www/http/HttpClient/B8209178.java +++ b/test/jdk/sun/net/www/http/HttpClient/B8209178.java @@ -290,7 +290,7 @@ public void accept() { // Read all headers until we find the empty line that // signals the end of all headers. - while (!requestLine.equals("")) { + while (!requestLine.isEmpty()) { System.out.println("Tunnel: Reading header: " + (requestLine = readLine(ccis))); } diff --git a/test/jdk/sun/net/www/protocol/file/NonUTF8EncodedChar.java b/test/jdk/sun/net/www/protocol/file/NonUTF8EncodedChar.java index 57e809ec67b45..8e6607577748f 100644 --- a/test/jdk/sun/net/www/protocol/file/NonUTF8EncodedChar.java +++ b/test/jdk/sun/net/www/protocol/file/NonUTF8EncodedChar.java @@ -48,7 +48,7 @@ public static void main(String[] args) { ioe.printStackTrace(); } catch (IllegalArgumentException iae) { String message = iae.getMessage(); - if (message == null || message.equals("")) { + if (message == null || message.isEmpty()) { System.out.println("No message"); throw new RuntimeException("Failed: No message in Exception"); } diff --git a/test/jdk/sun/net/www/protocol/http/Modified.java b/test/jdk/sun/net/www/protocol/http/Modified.java index 7f2313db5387c..0bd240e65d306 100644 --- a/test/jdk/sun/net/www/protocol/http/Modified.java +++ b/test/jdk/sun/net/www/protocol/http/Modified.java @@ -53,7 +53,7 @@ public void run() { if (str.startsWith("If-Modified-Since")) { gotIfModified = true; } - if (str.equals("")) { + if (str.isEmpty()) { break; } } while (str != null); diff --git a/test/jdk/sun/security/ssl/CipherSuite/DisabledCurve.java b/test/jdk/sun/security/ssl/CipherSuite/DisabledCurve.java index 620b11b773eb6..cf16d659e2eaf 100644 --- a/test/jdk/sun/security/ssl/CipherSuite/DisabledCurve.java +++ b/test/jdk/sun/security/ssl/CipherSuite/DisabledCurve.java @@ -89,7 +89,7 @@ protected void configureServerSocket(SSLServerSocket serverSocket) { public static void main(String[] args) throws Exception { String expected = args[1]; String disabledName = ("DISABLE_NONE".equals(args[0]) ? "" : args[0]); - if (disabledName.equals("")) { + if (disabledName.isEmpty()) { Security.setProperty("jdk.disabled.namedCurves", ""); } System.setProperty("jdk.sunec.disableNative", "false"); diff --git a/test/jdk/sun/tools/jhsdb/heapconfig/JMapHeapConfigTest.java b/test/jdk/sun/tools/jhsdb/heapconfig/JMapHeapConfigTest.java index 71d112157b214..fee3870c3d178 100644 --- a/test/jdk/sun/tools/jhsdb/heapconfig/JMapHeapConfigTest.java +++ b/test/jdk/sun/tools/jhsdb/heapconfig/JMapHeapConfigTest.java @@ -83,7 +83,7 @@ private static Map parseJMapOutput(List jmapOutput) { continue; } - if (shouldParse && !line.equals("")) { + if (shouldParse && !line.isEmpty()) { String[] lv = line.split("\\s+"); try { heapConfigMap.put(lv[0], lv[2]); diff --git a/test/jdk/tools/jar/modularJar/src/bar/jdk/test/bar/Bar.java b/test/jdk/tools/jar/modularJar/src/bar/jdk/test/bar/Bar.java index 995abd821ef76..153d903594e1f 100644 --- a/test/jdk/tools/jar/modularJar/src/bar/jdk/test/bar/Bar.java +++ b/test/jdk/tools/jar/modularJar/src/bar/jdk/test/bar/Bar.java @@ -51,24 +51,24 @@ public static void main(String[] args) throws Exception { sj = new StringJoiner(","); md.exports().stream().map(ModuleDescriptor.Exports::source).sorted().forEach(sj::add); - if (!sj.toString().equals("")) + if (!sj.toString().isEmpty()) System.out.println("exports:" + sj.toString()); sj = new StringJoiner(","); md.uses().stream().sorted().forEach(sj::add); - if (!sj.toString().equals("")) + if (!sj.toString().isEmpty()) System.out.println("uses:" + sj.toString()); sj = new StringJoiner(","); md.provides().stream().map(Provides::service).sorted().forEach(sj::add); - if (!sj.toString().equals("")) + if (!sj.toString().isEmpty()) System.out.println("provides:" + sj.toString()); sj = new StringJoiner(","); Set concealed = new HashSet<>(md.packages()); md.exports().stream().map(Exports::source).forEach(concealed::remove); concealed.forEach(sj::add); - if (!sj.toString().equals("")) + if (!sj.toString().isEmpty()) System.out.println("contains:" + sj.toString()); diff --git a/test/jdk/tools/jar/modularJar/src/foo/jdk/test/foo/Foo.java b/test/jdk/tools/jar/modularJar/src/foo/jdk/test/foo/Foo.java index 7366bc85c3ce4..353f332cd2c6f 100644 --- a/test/jdk/tools/jar/modularJar/src/foo/jdk/test/foo/Foo.java +++ b/test/jdk/tools/jar/modularJar/src/foo/jdk/test/foo/Foo.java @@ -47,24 +47,24 @@ public static void main(String[] args) { sj = new StringJoiner(","); md.exports().stream().map(Exports::source).sorted().forEach(sj::add); - if (!sj.toString().equals("")) + if (!sj.toString().isEmpty()) System.out.println("exports:" + sj.toString()); sj = new StringJoiner(","); md.uses().stream().sorted().forEach(sj::add); - if (!sj.toString().equals("")) + if (!sj.toString().isEmpty()) System.out.println("uses:" + sj.toString()); sj = new StringJoiner(","); md.provides().stream().map(Provides::service).sorted().forEach(sj::add); - if (!sj.toString().equals("")) + if (!sj.toString().isEmpty()) System.out.println("provides:" + sj.toString()); sj = new StringJoiner(","); Set concealed = new HashSet<>(md.packages()); md.exports().stream().map(Exports::source).forEach(concealed::remove); concealed.forEach(sj::add); - if (!sj.toString().equals("")) + if (!sj.toString().isEmpty()) System.out.println("contains:" + sj.toString()); } } diff --git a/test/langtools/jdk/javadoc/tool/VerifyLocale.java b/test/langtools/jdk/javadoc/tool/VerifyLocale.java index 9e72d78f062ba..a54f1bfae7d35 100644 --- a/test/langtools/jdk/javadoc/tool/VerifyLocale.java +++ b/test/langtools/jdk/javadoc/tool/VerifyLocale.java @@ -80,7 +80,7 @@ public static void main(String[] args) { continue; } - if (!language.equals("")) { + if (!language.isEmpty()) { List options = List.of("-locale", loc.toLanguageTag()); System.err.println("test options: " + options); DocumentationTask t = tool.getTask(null, null, null, diff --git a/test/langtools/jdk/javadoc/tool/sampleapi/lib/sampleapi/generator/PackageGenerator.java b/test/langtools/jdk/javadoc/tool/sampleapi/lib/sampleapi/generator/PackageGenerator.java index a0fcd71804f77..f955f86a0140c 100644 --- a/test/langtools/jdk/javadoc/tool/sampleapi/lib/sampleapi/generator/PackageGenerator.java +++ b/test/langtools/jdk/javadoc/tool/sampleapi/lib/sampleapi/generator/PackageGenerator.java @@ -582,7 +582,7 @@ ListBuffer processMethods(Element methodsNode, HashMap JCBlock body = null; if (needBody && (declFlags & Flags.ABSTRACT) == 0) { // create body List bodyStatements = List.nil(); - if (!type.equals("") && !type.equals("void")) { // create return statement + if (!type.isEmpty() && !type.equals("void")) { // create return statement Type retType = getTypeByName(type); bodyStatements = List.of( make.Return( diff --git a/test/langtools/tools/javac/modules/ReportNonExistentPackageTest.java b/test/langtools/tools/javac/modules/ReportNonExistentPackageTest.java index bef138441fc07..41de6f1d7f81a 100644 --- a/test/langtools/tools/javac/modules/ReportNonExistentPackageTest.java +++ b/test/langtools/tools/javac/modules/ReportNonExistentPackageTest.java @@ -138,7 +138,7 @@ public void testOpensEmptyPackageSuppressed(Path base) throws Exception { .run(Task.Expect.SUCCESS) .writeAll() .getOutput(Task.OutputKind.DIRECT); - if (!log.equals("")) + if (!log.isEmpty()) throw new Exception("expected output not found, actual output: " + log); } @@ -160,7 +160,7 @@ public void testOpenOnlyWithResources(Path base) throws Exception { .run() .writeAll() .getOutput(Task.OutputKind.DIRECT); - if (!log.equals("")) + if (!log.isEmpty()) throw new Exception("expected output not found, actual output: " + log); } } diff --git a/test/lib-test/jdk/test/lib/apps/LingeredAppTest.java b/test/lib-test/jdk/test/lib/apps/LingeredAppTest.java index 600d05189c66e..5ff2ed35e9e2d 100644 --- a/test/lib-test/jdk/test/lib/apps/LingeredAppTest.java +++ b/test/lib-test/jdk/test/lib/apps/LingeredAppTest.java @@ -45,7 +45,7 @@ public static void main(String[] args) { // Propagate test.vm.options to LingeredApp, filter out possible empty options String testVmOpts[] = System.getProperty("test.vm.opts","").split("\\s+"); for (String s : testVmOpts) { - if (!s.equals("")) { + if (!s.isEmpty()) { cmd.add(s); } }