You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by pe...@apache.org on 2020/12/14 01:42:16 UTC
[tika] branch main updated: Simplify some bool statement
This is an automated email from the ASF dual-hosted git repository.
peterlee pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git
The following commit(s) were added to refs/heads/main by this push:
new f23d377 Simplify some bool statement
f23d377 is described below
commit f23d3777120dd86e1a5e8c1cd43f6f178f1ec956
Author: PeterAlfredLee <pe...@gmail.com>
AuthorDate: Sat Nov 28 11:17:17 2020 +0800
Simplify some bool statement
---
tika-core/src/main/java/org/apache/tika/utils/SystemUtils.java | 2 +-
tika-core/src/test/java/org/apache/tika/parser/mock/MockParser.java | 2 +-
.../main/java/org/apache/tika/eval/core/tokens/TokenStatistics.java | 2 +-
.../main/java/org/apache/tika/parser/microsoft/chm/ChmCommons.java | 5 ++---
4 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/tika-core/src/main/java/org/apache/tika/utils/SystemUtils.java b/tika-core/src/main/java/org/apache/tika/utils/SystemUtils.java
index 889f62c..6ccdc5e 100644
--- a/tika-core/src/main/java/org/apache/tika/utils/SystemUtils.java
+++ b/tika-core/src/main/java/org/apache/tika/utils/SystemUtils.java
@@ -50,7 +50,7 @@ public class SystemUtils {
}
static boolean isOSNameMatch(String osName, String osNamePrefix) {
- return osName == null ? false : osName.startsWith(osNamePrefix);
+ return osName != null && osName.startsWith(osNamePrefix);
}
static {
diff --git a/tika-core/src/test/java/org/apache/tika/parser/mock/MockParser.java b/tika-core/src/test/java/org/apache/tika/parser/mock/MockParser.java
index a039e76..8d29f3c 100644
--- a/tika-core/src/test/java/org/apache/tika/parser/mock/MockParser.java
+++ b/tika-core/src/test/java/org/apache/tika/parser/mock/MockParser.java
@@ -195,7 +195,7 @@ public class MockParser extends AbstractParser {
private void print(Node action, String name) throws IOException {
String content = action.getTextContent();
- boolean isStatic = (action.getAttributes().getNamedItem("static") == null) ? false : true;
+ boolean isStatic = (action.getAttributes().getNamedItem("static") != null);
Node rand = action.getAttributes().getNamedItem("random");
int randLength = -1;
if (rand != null) {
diff --git a/tika-eval/tika-eval-core/src/main/java/org/apache/tika/eval/core/tokens/TokenStatistics.java b/tika-eval/tika-eval-core/src/main/java/org/apache/tika/eval/core/tokens/TokenStatistics.java
index a1a9759..f24606c 100644
--- a/tika-eval/tika-eval-core/src/main/java/org/apache/tika/eval/core/tokens/TokenStatistics.java
+++ b/tika-eval/tika-eval-core/src/main/java/org/apache/tika/eval/core/tokens/TokenStatistics.java
@@ -120,7 +120,7 @@ public class TokenStatistics {
}
private static boolean doubleEquals(double a, double b, double epsilon) {
- return a == b ? true : Math.abs(a - b) < epsilon;
+ return a == b || Math.abs(a - b) < epsilon;
}
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmCommons.java b/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmCommons.java
index 8c061f0..1dc3593 100644
--- a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmCommons.java
+++ b/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/chm/ChmCommons.java
@@ -192,9 +192,8 @@ public class ChmCommons {
* @return boolean
*/
public static boolean hasSkip(DirectoryListingEntry directoryListingEntry) {
- return (directoryListingEntry.getName().startsWith("/$")
- || directoryListingEntry.getName().startsWith("/#") || directoryListingEntry
- .getName().startsWith("::")) ? true : false;
+ String name = directoryListingEntry.getName();
+ return name.startsWith("/$") || name.startsWith("/#") || name.startsWith("::");
}
/**