You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ti...@apache.org on 2025/04/01 13:02:02 UTC
(tika) 03/03: TIKA-4397: use isEmpty()
This is an automated email from the ASF dual-hosted git repository.
tilman pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git
commit a8d48e84f354dc487555f4585dff700dc300a913
Author: Tilman Hausherr <ti...@apache.org>
AuthorDate: Tue Apr 1 15:01:39 2025 +0200
TIKA-4397: use isEmpty()
---
tika-app/src/main/java/org/apache/tika/cli/TikaCLI.java | 2 +-
tika-batch/src/main/java/org/apache/tika/util/PropsUtil.java | 8 ++++----
.../src/test/java/org/apache/tika/batch/fs/FSBatchTestBase.java | 2 +-
tika-core/src/main/java/org/apache/tika/io/FilenameUtils.java | 2 +-
tika-core/src/main/java/org/apache/tika/mime/MediaType.java | 2 +-
.../main/java/org/apache/tika/pipes/fetcher/FetcherManager.java | 2 +-
.../java/org/apache/tika/pipes/fetcher/fs/FileSystemFetcher.java | 2 +-
.../src/main/java/org/apache/tika/sax/DIFContentHandler.java | 2 +-
.../src/main/java/org/apache/tika/sax/ToXMLContentHandler.java | 2 +-
.../src/main/java/org/apache/tika/sax/xpath/XPathParser.java | 2 +-
tika-core/src/main/java/org/apache/tika/utils/RegexUtils.java | 2 +-
tika-core/src/main/java/org/apache/tika/utils/StringUtils.java | 4 ++--
.../src/main/java/org/apache/tika/eval/app/db/JDBCUtil.java | 2 +-
.../src/main/java/org/apache/tika/eval/app/db/MimeBuffer.java | 4 ++--
.../src/main/java/org/apache/tika/parser/dwg/DWGParser.java | 2 +-
.../main/java/org/apache/tika/parser/html/DataURISchemeUtil.java | 2 +-
.../src/main/java/org/apache/tika/parser/html/HtmlHandler.java | 2 +-
.../main/java/org/apache/tika/parser/microsoft/TNEFParser.java | 4 ++--
.../java/org/apache/tika/parser/microsoft/chm/ChmCommons.java | 2 +-
.../tika/parser/microsoft/ooxml/xps/XPSPageContentHandler.java | 2 +-
.../org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java | 2 +-
.../apache/tika/parser/microsoft/ooxml/SXWPFExtractorTest.java | 2 +-
.../main/java/org/apache/tika/parser/dif/DIFContentHandler.java | 2 +-
.../src/main/java/org/apache/tika/parser/iptc/IptcAnpaParser.java | 2 +-
.../src/main/java/org/apache/tika/parser/pdf/XFAExtractor.java | 2 +-
.../apache/tika/parser/xml/AttributeDependantMetadataHandler.java | 2 +-
.../java/org/apache/tika/parser/xml/ElementMetadataHandler.java | 2 +-
tika-xmp/src/main/java/org/apache/tika/xmp/XMPMetadata.java | 2 +-
28 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/tika-app/src/main/java/org/apache/tika/cli/TikaCLI.java b/tika-app/src/main/java/org/apache/tika/cli/TikaCLI.java
index 0ea99ce98..74c3cbf44 100644
--- a/tika-app/src/main/java/org/apache/tika/cli/TikaCLI.java
+++ b/tika-app/src/main/java/org/apache/tika/cli/TikaCLI.java
@@ -443,7 +443,7 @@ public class TikaCLI {
String dirPath = arg.substring("--extract-dir=".length());
//if the user accidentally doesn't include
//a directory, set the directory to the cwd
- if (dirPath.length() == 0) {
+ if (dirPath.isEmpty()) {
dirPath = ".";
}
extractDir = new File(dirPath);
diff --git a/tika-batch/src/main/java/org/apache/tika/util/PropsUtil.java b/tika-batch/src/main/java/org/apache/tika/util/PropsUtil.java
index 830479012..a9a58bef1 100644
--- a/tika-batch/src/main/java/org/apache/tika/util/PropsUtil.java
+++ b/tika-batch/src/main/java/org/apache/tika/util/PropsUtil.java
@@ -34,7 +34,7 @@ public class PropsUtil {
* @return parsed value
*/
public static Boolean getBoolean(String v, Boolean defaultMissing) {
- if (v == null || v.length() == 0) {
+ if (v == null || v.isEmpty()) {
return defaultMissing;
}
if (v
@@ -58,7 +58,7 @@ public class PropsUtil {
* @return parsed value
*/
public static Integer getInt(String v, Integer defaultMissing) {
- if (v == null || v.length() == 0) {
+ if (v == null || v.isEmpty()) {
return defaultMissing;
}
try {
@@ -77,7 +77,7 @@ public class PropsUtil {
* @return parsed value
*/
public static Long getLong(String v, Long defaultMissing) {
- if (v == null || v.length() == 0) {
+ if (v == null || v.isEmpty()) {
return defaultMissing;
}
try {
@@ -111,7 +111,7 @@ public class PropsUtil {
* @see #getPath(String, Path)
*/
public static Path getPath(String v, Path defaultMissing) {
- if (v == null || v.length() == 0) {
+ if (v == null || v.isEmpty()) {
return defaultMissing;
}
//trim initial and final " if they exist
diff --git a/tika-batch/src/test/java/org/apache/tika/batch/fs/FSBatchTestBase.java b/tika-batch/src/test/java/org/apache/tika/batch/fs/FSBatchTestBase.java
index 86b807000..e65acea35 100644
--- a/tika-batch/src/test/java/org/apache/tika/batch/fs/FSBatchTestBase.java
+++ b/tika-batch/src/test/java/org/apache/tika/batch/fs/FSBatchTestBase.java
@@ -176,7 +176,7 @@ public abstract class FSBatchTestBase extends TikaTest {
}
public Path getInputRoot(String subdir) throws Exception {
- String path = (subdir == null || subdir.length() == 0) ? "/test-input" : "/test-input/" + subdir;
+ String path = (subdir == null || subdir.isEmpty()) ? "/test-input" : "/test-input/" + subdir;
return Paths.get(getResourceAsUri(path));
}
diff --git a/tika-core/src/main/java/org/apache/tika/io/FilenameUtils.java b/tika-core/src/main/java/org/apache/tika/io/FilenameUtils.java
index efaf07ca3..5178d3274 100644
--- a/tika-core/src/main/java/org/apache/tika/io/FilenameUtils.java
+++ b/tika-core/src/main/java/org/apache/tika/io/FilenameUtils.java
@@ -96,7 +96,7 @@ public class FilenameUtils {
*/
public static String getName(final String path) {
- if (path == null || path.length() == 0) {
+ if (path == null || path.isEmpty()) {
return StringUtils.EMPTY;
}
int unix = path.lastIndexOf("/");
diff --git a/tika-core/src/main/java/org/apache/tika/mime/MediaType.java b/tika-core/src/main/java/org/apache/tika/mime/MediaType.java
index 13ad6ed9c..23a8ea58d 100644
--- a/tika-core/src/main/java/org/apache/tika/mime/MediaType.java
+++ b/tika-core/src/main/java/org/apache/tika/mime/MediaType.java
@@ -294,7 +294,7 @@ public final class MediaType implements Comparable<MediaType>, Serializable {
}
private static Map<String, String> parseParameters(String string) {
- if (string.length() == 0) {
+ if (string.isEmpty()) {
return Collections.emptyMap();
}
diff --git a/tika-core/src/main/java/org/apache/tika/pipes/fetcher/FetcherManager.java b/tika-core/src/main/java/org/apache/tika/pipes/fetcher/FetcherManager.java
index 40121f9a7..d9c3676b5 100644
--- a/tika-core/src/main/java/org/apache/tika/pipes/fetcher/FetcherManager.java
+++ b/tika-core/src/main/java/org/apache/tika/pipes/fetcher/FetcherManager.java
@@ -48,7 +48,7 @@ public class FetcherManager extends ConfigBase {
public FetcherManager(List<Fetcher> fetchers) throws TikaConfigException {
for (Fetcher fetcher : fetchers) {
String name = fetcher.getName();
- if (name == null || name.trim().length() == 0) {
+ if (name == null || name.trim().isEmpty()) {
throw new TikaConfigException("fetcher name must not be blank");
}
if (fetcherMap.containsKey(fetcher.getName())) {
diff --git a/tika-core/src/main/java/org/apache/tika/pipes/fetcher/fs/FileSystemFetcher.java b/tika-core/src/main/java/org/apache/tika/pipes/fetcher/fs/FileSystemFetcher.java
index bc3c4cddd..3112f5c9f 100644
--- a/tika-core/src/main/java/org/apache/tika/pipes/fetcher/fs/FileSystemFetcher.java
+++ b/tika-core/src/main/java/org/apache/tika/pipes/fetcher/fs/FileSystemFetcher.java
@@ -155,7 +155,7 @@ public class FileSystemFetcher extends AbstractFetcher implements Initializable
@Override
public void checkInitialization(InitializableProblemHandler problemHandler)
throws TikaConfigException {
- if (basePath == null || basePath.toString().trim().length() == 0) {
+ if (basePath == null || basePath.toString().trim().isEmpty()) {
LOG.warn("'basePath' has not been set. " +
"This means that client code or clients can read from any file that this " +
"process has permissions to read. If you are running tika-server, make " +
diff --git a/tika-core/src/main/java/org/apache/tika/sax/DIFContentHandler.java b/tika-core/src/main/java/org/apache/tika/sax/DIFContentHandler.java
index b76c4d77b..f8f088d2a 100644
--- a/tika-core/src/main/java/org/apache/tika/sax/DIFContentHandler.java
+++ b/tika-core/src/main/java/org/apache/tika/sax/DIFContentHandler.java
@@ -118,7 +118,7 @@ public class DIFContentHandler extends DefaultHandler {
Stack<String> tempStack = (Stack<String>) this.treeStack.clone();
StringBuilder key = new StringBuilder();
while (!tempStack.isEmpty()) {
- if (key.length() == 0) {
+ if (key.isEmpty()) {
key = new StringBuilder(tempStack.pop());
} else {
key.insert(0, tempStack.pop() + "-");
diff --git a/tika-core/src/main/java/org/apache/tika/sax/ToXMLContentHandler.java b/tika-core/src/main/java/org/apache/tika/sax/ToXMLContentHandler.java
index 60ab35f3d..0a09f14b4 100755
--- a/tika-core/src/main/java/org/apache/tika/sax/ToXMLContentHandler.java
+++ b/tika-core/src/main/java/org/apache/tika/sax/ToXMLContentHandler.java
@@ -250,7 +250,7 @@ public class ToXMLContentHandler extends ToTextContentHandler {
return prefix;
} else if (parent != null) {
return parent.getPrefix(uri);
- } else if (uri == null || uri.length() == 0) {
+ } else if (uri == null || uri.isEmpty()) {
return "";
} else {
throw new SAXException("Namespace " + uri + " not declared");
diff --git a/tika-core/src/main/java/org/apache/tika/sax/xpath/XPathParser.java b/tika-core/src/main/java/org/apache/tika/sax/xpath/XPathParser.java
index ffa4ccd71..c169d5600 100644
--- a/tika-core/src/main/java/org/apache/tika/sax/xpath/XPathParser.java
+++ b/tika-core/src/main/java/org/apache/tika/sax/xpath/XPathParser.java
@@ -71,7 +71,7 @@ public class XPathParser {
new ChildMatcher(new SubtreeMatcher(NodeMatcher.INSTANCE)));
} else if (xpath.equals("/@*")) {
return AttributeMatcher.INSTANCE;
- } else if (xpath.length() == 0) {
+ } else if (xpath.isEmpty()) {
return ElementMatcher.INSTANCE;
} else if (xpath.startsWith("/@")) {
String name = xpath.substring(2);
diff --git a/tika-core/src/main/java/org/apache/tika/utils/RegexUtils.java b/tika-core/src/main/java/org/apache/tika/utils/RegexUtils.java
index 70d04119b..9c0736381 100644
--- a/tika-core/src/main/java/org/apache/tika/utils/RegexUtils.java
+++ b/tika-core/src/main/java/org/apache/tika/utils/RegexUtils.java
@@ -49,7 +49,7 @@ public class RegexUtils {
* @return List of urls within found in the plain text
*/
public static List<String> extractLinks(String content) {
- if (content == null || content.length() == 0) {
+ if (content == null || content.isEmpty()) {
return Collections.emptyList();
}
diff --git a/tika-core/src/main/java/org/apache/tika/utils/StringUtils.java b/tika-core/src/main/java/org/apache/tika/utils/StringUtils.java
index 462cceb17..b09963d46 100644
--- a/tika-core/src/main/java/org/apache/tika/utils/StringUtils.java
+++ b/tika-core/src/main/java/org/apache/tika/utils/StringUtils.java
@@ -37,11 +37,11 @@ public class StringUtils {
static int PAD_LIMIT = 10000;
public static boolean isEmpty(final CharSequence cs) {
- return cs == null || cs.length() == 0;
+ return cs == null || cs.isEmpty();
}
public static boolean isBlank(final String s) {
- return s == null || s.trim().length() == 0;
+ return s == null || s.isBlank();
}
/**
diff --git a/tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/db/JDBCUtil.java b/tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/db/JDBCUtil.java
index 3e14c35f3..d776e1ef1 100644
--- a/tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/db/JDBCUtil.java
+++ b/tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/db/JDBCUtil.java
@@ -49,7 +49,7 @@ public class JDBCUtil {
public JDBCUtil(String connectionString, String driverClass) {
this.connectionString = connectionString;
this.driverClass = driverClass;
- if (driverClass == null || driverClass.length() == 0) {
+ if (driverClass == null || driverClass.isEmpty()) {
if (System.getProperty("jdbc.drivers") != null) {
//user has specified it on the command line
//stop now
diff --git a/tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/db/MimeBuffer.java b/tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/db/MimeBuffer.java
index cdf47fdab..34cf18061 100644
--- a/tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/db/MimeBuffer.java
+++ b/tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/db/MimeBuffer.java
@@ -50,7 +50,7 @@ public class MimeBuffer extends AbstractDBBuffer {
st.setString(2, value);
try {
String ext = MimeUtil.getExtension(value, config);
- if (ext == null || ext.length() == 0) {
+ if (ext == null || ext.isEmpty()) {
st.setNull(3, Types.VARCHAR);
} else {
st.setString(3, ext);
@@ -110,7 +110,7 @@ public class MimeBuffer extends AbstractDBBuffer {
}
//special handling for text/html/xml
- if (ext.length() == 0) {
+ if (ext.isEmpty()) {
ext = tryTextyTypes(mime.getType());
}
return ext;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-cad-module/src/main/java/org/apache/tika/parser/dwg/DWGParser.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-cad-module/src/main/java/org/apache/tika/parser/dwg/DWGParser.java
index 87b945e25..a433cb258 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-cad-module/src/main/java/org/apache/tika/parser/dwg/DWGParser.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-cad-module/src/main/java/org/apache/tika/parser/dwg/DWGParser.java
@@ -251,7 +251,7 @@ public class DWGParser extends AbstractDWGParser {
private void handleHeader(int headerNumber, String value, Metadata metadata, XHTMLContentHandler xhtml)
throws SAXException {
- if (value == null || value.length() == 0) {
+ if (value == null || value.isEmpty()) {
return;
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/DataURISchemeUtil.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/DataURISchemeUtil.java
index 2c4839510..5a7e66d99 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/DataURISchemeUtil.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/DataURISchemeUtil.java
@@ -57,7 +57,7 @@ public class DataURISchemeUtil {
//strip out back slashes as you might have in css
dataString = (dataString != null) ? dataString.replaceAll("\\\\", " ") : dataString;
- if (dataString == null || dataString.length() == 0) {
+ if (dataString == null || dataString.isEmpty()) {
data = new byte[0];
} else if (isBase64 != null) {
data = base64.decode(dataString);
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/HtmlHandler.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/HtmlHandler.java
index f2bcba722..eb9c212aa 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/HtmlHandler.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/HtmlHandler.java
@@ -379,7 +379,7 @@ class HtmlHandler extends TextContentHandler {
private void writeScript() throws SAXException {
//don't write an attached macro if there is no content
//we may want to revisit this behavior
- if (script.toString().trim().length() == 0) {
+ if (script.toString().trim().isEmpty()) {
return;
}
//do anything with attrs?
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/TNEFParser.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/TNEFParser.java
index 98c6b1631..9cd09fea6 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/TNEFParser.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/TNEFParser.java
@@ -90,10 +90,10 @@ public class TNEFParser implements Parser {
// Recurse into each attachment in turn
for (Attachment attachment : msg.getAttachments()) {
String name = attachment.getLongFilename();
- if (name == null || name.length() == 0) {
+ if (name == null || name.isEmpty()) {
name = attachment.getFilename();
}
- if (name == null || name.length() == 0) {
+ if (name == null || name.isEmpty()) {
String ext = attachment.getExtension();
if (ext != null) {
name = "unknown" + ext;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmCommons.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmCommons.java
index bb0de014c..102a3691c 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmCommons.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmCommons.java
@@ -334,7 +334,7 @@ public class ChmCommons {
* This method is added because of supporting of Java 5
*/
public static boolean isEmpty(String str) {
- return str == null || str.length() == 0;
+ return str == null || str.isEmpty();
}
/**
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xps/XPSPageContentHandler.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xps/XPSPageContentHandler.java
index c6114ab23..75bfca7ca 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xps/XPSPageContentHandler.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/xps/XPSPageContentHandler.java
@@ -415,7 +415,7 @@ class XPSPageContentHandler extends DefaultHandler {
private static void sortRow(List<GlyphRun> row) {
boolean allRTL = true;
for (GlyphRun run : row) {
- if (run.unicodeString.trim().length() == 0) {
+ if (run.unicodeString.trim().isEmpty()) {
// ignore whitespace for all RTL check
continue;
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java
index 6ebc80760..3a74cabeb 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java
@@ -1020,7 +1020,7 @@ public class OOXMLParserTest extends MultiThreadedTikaTest {
System.setErr(origErr);
String err = errContent.toString(UTF_8.name());
- assertTrue(err.length() == 0);
+ assertTrue(err.isEmpty());
}
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/SXWPFExtractorTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/SXWPFExtractorTest.java
index edcc484d7..c2af46caf 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/SXWPFExtractorTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/ooxml/SXWPFExtractorTest.java
@@ -540,7 +540,7 @@ public class SXWPFExtractorTest extends TikaTest {
System.setErr(origErr);
String err = errContent.toString(UTF_8.name());
- assertTrue(err.length() == 0, "expected no error msg, but got >" +
+ assertTrue(err.isEmpty(), "expected no error msg, but got >" +
err + "<");
}
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/dif/DIFContentHandler.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/dif/DIFContentHandler.java
index 5a021e02d..077619315 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/dif/DIFContentHandler.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/dif/DIFContentHandler.java
@@ -117,7 +117,7 @@ public class DIFContentHandler extends DefaultHandler {
Stack<String> tempStack = (Stack<String>) this.treeStack.clone();
StringBuilder key = new StringBuilder();
while (!tempStack.isEmpty()) {
- if (key.length() == 0) {
+ if (key.isEmpty()) {
key = new StringBuilder(tempStack.pop());
} else {
key.insert(0, tempStack.pop() + "-");
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-news-module/src/main/java/org/apache/tika/parser/iptc/IptcAnpaParser.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-news-module/src/main/java/org/apache/tika/parser/iptc/IptcAnpaParser.java
index dac96295c..dfe38a995 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-news-module/src/main/java/org/apache/tika/parser/iptc/IptcAnpaParser.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-news-module/src/main/java/org/apache/tika/parser/iptc/IptcAnpaParser.java
@@ -424,7 +424,7 @@ public class IptcAnpaParser implements Parser {
// pull apart the envelope, getting the date and time
while (read < value.length) {
byte val_next = value[read++];
- if (hdr_date.length() == 0) {
+ if (hdr_date.isEmpty()) {
while (((val_next >= (byte) 0x30) && (val_next <= (byte) 0x39))
// consume all numerics and hyphens
|| (val_next == HY)) {
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/XFAExtractor.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/XFAExtractor.java
index f22a4ddd3..20d2e35ad 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/XFAExtractor.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/XFAExtractor.java
@@ -121,7 +121,7 @@ class XFAExtractor {
String fieldName = e.getKey();
XFAField field = e.getValue();
String displayFieldName =
- (field.toolTip == null || field.toolTip.trim().length() == 0) ? fieldName :
+ (field.toolTip == null || field.toolTip.trim().isEmpty()) ? fieldName :
field.toolTip;
String[] fieldValues = pdfObjRToValues.getValues(fieldName);
if (fieldValues.length == 0) {
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xml/AttributeDependantMetadataHandler.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xml/AttributeDependantMetadataHandler.java
index 1f6e1d700..b0a6fdce4 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xml/AttributeDependantMetadataHandler.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xml/AttributeDependantMetadataHandler.java
@@ -44,7 +44,7 @@ public class AttributeDependantMetadataHandler extends DefaultHandler {
}
public void addMetadata(String value) {
- if (name == null || name.length() == 0) {
+ if (name == null || name.isEmpty()) {
// We didn't find the attribute which holds the name
return;
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xml/ElementMetadataHandler.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xml/ElementMetadataHandler.java
index 1ff9c0dc6..b184fa3de 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xml/ElementMetadataHandler.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xml/ElementMetadataHandler.java
@@ -220,7 +220,7 @@ public class ElementMetadataHandler extends AbstractMetadataHandler {
LOG.trace("adding {}={}", name, value);
if (targetProperty != null && targetProperty.isMultiValuePermitted()) {
if ((value != null && value.length() > 0) || allowEmptyValues) {
- if (value == null || value.length() == 0 && allowEmptyValues) {
+ if (value == null || value.isEmpty() && allowEmptyValues) {
value = "";
}
String[] previous = metadata.getValues(name);
diff --git a/tika-xmp/src/main/java/org/apache/tika/xmp/XMPMetadata.java b/tika-xmp/src/main/java/org/apache/tika/xmp/XMPMetadata.java
index cd12cc117..888ca95e7 100644
--- a/tika-xmp/src/main/java/org/apache/tika/xmp/XMPMetadata.java
+++ b/tika-xmp/src/main/java/org/apache/tika/xmp/XMPMetadata.java
@@ -606,7 +606,7 @@ public class XMPMetadata extends Metadata {
* @return true if the key is valid otherwise false
*/
private void checkKey(String key) throws PropertyTypeException {
- if (key == null || key.length() == 0) {
+ if (key == null || key.isEmpty()) {
throw new PropertyTypeException("Key must not be null");
}