From 0a5a7ef1c69319cb2fd3f70eb0c9c85e5c972d71 Mon Sep 17 00:00:00 2001 From: jhy Date: Fri, 9 Jul 2021 20:07:42 +1000 Subject: [PATCH] Minor cleanup --- src/main/java/org/jsoup/nodes/Attribute.java | 2 +- src/main/java/org/jsoup/nodes/DataNode.java | 4 +++- src/main/java/org/jsoup/nodes/Node.java | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/jsoup/nodes/Attribute.java b/src/main/java/org/jsoup/nodes/Attribute.java index 3bbc24a84e..fa1331a4ee 100644 --- a/src/main/java/org/jsoup/nodes/Attribute.java +++ b/src/main/java/org/jsoup/nodes/Attribute.java @@ -174,7 +174,7 @@ protected final boolean shouldCollapseAttribute(Document.OutputSettings out) { protected static boolean shouldCollapseAttribute(final String key, @Nullable final String val, final Document.OutputSettings out) { return ( out.syntax() == Document.OutputSettings.Syntax.html && - (val == null || ("".equals(val) || val.equalsIgnoreCase(key)) && Attribute.isBooleanAttribute(key))); + (val == null || (val.isEmpty() || val.equalsIgnoreCase(key)) && Attribute.isBooleanAttribute(key))); } /** diff --git a/src/main/java/org/jsoup/nodes/DataNode.java b/src/main/java/org/jsoup/nodes/DataNode.java index 336cc6a310..2c37e75661 100644 --- a/src/main/java/org/jsoup/nodes/DataNode.java +++ b/src/main/java/org/jsoup/nodes/DataNode.java @@ -57,9 +57,11 @@ public DataNode clone() { /** Create a new DataNode from HTML encoded data. @param encodedData encoded data - @param baseUri bass URI + @param baseUri base URI @return new DataNode + @deprecated Unused, and will be removed in 1.15.1. */ + @Deprecated public static DataNode createFromEncoded(String encodedData, String baseUri) { String data = Entities.unescape(encodedData); return new DataNode(data); diff --git a/src/main/java/org/jsoup/nodes/Node.java b/src/main/java/org/jsoup/nodes/Node.java index 8f7cda63ba..0efe532da2 100644 --- a/src/main/java/org/jsoup/nodes/Node.java +++ b/src/main/java/org/jsoup/nodes/Node.java @@ -111,7 +111,7 @@ public boolean hasAttr(String attributeKey) { if (attributeKey.startsWith("abs:")) { String key = attributeKey.substring("abs:".length()); - if (attributes().hasKeyIgnoreCase(key) && !absUrl(key).equals("")) + if (attributes().hasKeyIgnoreCase(key) && !absUrl(key).isEmpty()) return true; } return attributes().hasKeyIgnoreCase(attributeKey);