You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by kk...@apache.org on 2020/08/31 02:20:31 UTC
[tika] branch main updated: Refactor some code use method Math.max
This is an automated email from the ASF dual-hosted git repository.
kkrugler 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 e538494 Refactor some code use method Math.max
new 7af5657 Merge pull request #348 from PeterAlfredLee/useMathMax
e538494 is described below
commit e538494a43851af54807e4e55817fe742420adcf
Author: PeterAlfredLee <pe...@gmail.com>
AuthorDate: Sat Aug 29 16:23:01 2020 +0800
Refactor some code use method Math.max
---
.../org/apache/tika/batch/builders/AbstractConsumersBuilder.java | 2 +-
.../main/java/org/apache/tika/detect/TrainedModelDetector.java | 2 +-
.../src/main/java/org/apache/tika/io/CountingInputStream.java | 8 ++++++--
.../src/test/java/org/apache/tika/MultiThreadedTikaTest.java | 2 +-
4 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/tika-batch/src/main/java/org/apache/tika/batch/builders/AbstractConsumersBuilder.java b/tika-batch/src/main/java/org/apache/tika/batch/builders/AbstractConsumersBuilder.java
index bcb8e0b..a7cc678 100644
--- a/tika-batch/src/main/java/org/apache/tika/batch/builders/AbstractConsumersBuilder.java
+++ b/tika-batch/src/main/java/org/apache/tika/batch/builders/AbstractConsumersBuilder.java
@@ -28,7 +28,7 @@ public abstract class AbstractConsumersBuilder {
public static int getDefaultNumConsumers(){
int n = Runtime.getRuntime().availableProcessors()-1;
- return (n < 1) ? 1 : n;
+ return Math.max(n, 1);
}
public abstract ConsumersManager build(Node node, Map<String, String> runtimeAttributes,
diff --git a/tika-core/src/main/java/org/apache/tika/detect/TrainedModelDetector.java b/tika-core/src/main/java/org/apache/tika/detect/TrainedModelDetector.java
index ee19804..3133757 100644
--- a/tika-core/src/main/java/org/apache/tika/detect/TrainedModelDetector.java
+++ b/tika-core/src/main/java/org/apache/tika/detect/TrainedModelDetector.java
@@ -118,7 +118,7 @@ public abstract class TrainedModelDetector implements Detector {
} else {
histogram[idx]++;
}
- max = max < histogram[idx] ? histogram[idx] : max;
+ max = Math.max(max, histogram[idx]);
}
buf.clear(); // make buffer ready for writing
diff --git a/tika-core/src/main/java/org/apache/tika/io/CountingInputStream.java b/tika-core/src/main/java/org/apache/tika/io/CountingInputStream.java
index ffb4d6b..30632dc 100644
--- a/tika-core/src/main/java/org/apache/tika/io/CountingInputStream.java
+++ b/tika-core/src/main/java/org/apache/tika/io/CountingInputStream.java
@@ -56,7 +56,9 @@ public class CountingInputStream extends ProxyInputStream {
@Override
public int read(byte[] b) throws IOException {
int found = super.read(b);
- this.count += (found >= 0) ? found : 0;
+ if (found != -1) {
+ this.count += found;
+ }
return found;
}
@@ -74,7 +76,9 @@ public class CountingInputStream extends ProxyInputStream {
@Override
public int read(byte[] b, int off, int len) throws IOException {
int found = super.read(b, off, len);
- this.count += (found >= 0) ? found : 0;
+ if (found != -1) {
+ this.count += found;
+ }
return found;
}
diff --git a/tika-core/src/test/java/org/apache/tika/MultiThreadedTikaTest.java b/tika-core/src/test/java/org/apache/tika/MultiThreadedTikaTest.java
index 67f1ffd..981e94c 100644
--- a/tika-core/src/test/java/org/apache/tika/MultiThreadedTikaTest.java
+++ b/tika-core/src/test/java/org/apache/tika/MultiThreadedTikaTest.java
@@ -103,7 +103,7 @@ public class MultiThreadedTikaTest extends TikaTest {
for (Path testFile : truth.keySet()) {
testFiles[j++] = testFile;
}
- int actualThreadCount = numThreads + ((randomlyResizeSAXPool > 0) ? randomlyResizeSAXPool : 0);
+ int actualThreadCount = numThreads + Math.max(randomlyResizeSAXPool, 0);
ExecutorService ex = Executors.newFixedThreadPool(actualThreadCount);
try {
_testDetectorOnAll(detector, testFiles, numThreads, numIterations, truth, ex, randomlyResizeSAXPool);