This is an automated email from the ASF dual-hosted git repository.
tallison 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 e5bd0ab fix for TIKA-3402 contributed by kamaci (#443)
e5bd0ab is described below
commit e5bd0abd4d702a5457fac3cb447be8c29e36d6cf
Author: Furkan KAMACI <[email protected]>
AuthorDate: Mon May 17 20:20:48 2021 +0300
fix for TIKA-3402 contributed by kamaci (#443)
---
.../org/apache/tika/batch/DigestingAutoDetectParserFactory.java | 3 +--
tika-core/src/main/java/org/apache/tika/config/ServiceLoader.java | 3 +--
tika-core/src/main/java/org/apache/tika/parser/ParsingReader.java | 3 +--
.../main/java/org/apache/tika/pipes/async/AsyncClientConfig.java | 3 +--
.../src/main/java/org/apache/tika/sax/StandardOrganizations.java | 3 +--
tika-core/src/main/java/org/apache/tika/sax/StandardsText.java | 4 +---
.../src/main/java/org/apache/tika/utils/ServiceLoaderUtils.java | 5 +----
.../test/java/org/apache/tika/eval/app/db/AbstractBufferTest.java | 3 +--
.../src/main/java/org/apache/tika/example/CustomMimeInfo.java | 6 ++----
.../src/main/java/org/apache/tika/example/TIAParsingExample.java | 3 +--
.../src/main/java/org/apache/tika/parser/envi/EnviHeaderParser.java | 3 +--
.../src/main/java/org/apache/tika/parser/ctakes/CTAKESUtils.java | 6 ++----
.../src/main/java/org/apache/tika/parser/dwg/DWGParser.java | 3 +--
.../apache/tika/extractor/microsoft/MSEmbeddedStreamTranslator.java | 5 +----
.../src/main/java/org/apache/tika/parser/microsoft/ListManager.java | 4 +---
.../java/org/apache/tika/parser/microsoft/onenote/OneNotePtr.java | 3 +--
.../main/java/org/apache/tika/parser/hwp/HwpTextExtractorV5.java | 3 +--
.../src/main/java/org/apache/tika/parser/txt/CharsetRecog_mbcs.java | 3 +--
.../test/java/org/apache/tika/parser/strings/StringsParserTest.java | 3 +--
.../main/java/org/apache/tika/language/translate/RTGTranslator.java | 3 +--
20 files changed, 22 insertions(+), 50 deletions(-)
diff --git
a/tika-app/src/main/java/org/apache/tika/batch/DigestingAutoDetectParserFactory.java
b/tika-app/src/main/java/org/apache/tika/batch/DigestingAutoDetectParserFactory.java
index bb7a98c..9f5b0ca 100644
---
a/tika-app/src/main/java/org/apache/tika/batch/DigestingAutoDetectParserFactory.java
+++
b/tika-app/src/main/java/org/apache/tika/batch/DigestingAutoDetectParserFactory.java
@@ -33,8 +33,7 @@ public class DigestingAutoDetectParserFactory extends
ParserFactory {
if (digester == null) {
return p;
}
- DigestingParser d = new DigestingParser(p, digester);
- return d;
+ return new DigestingParser(p, digester);
}
public void setDigester(DigestingParser.Digester digester) {
diff --git a/tika-core/src/main/java/org/apache/tika/config/ServiceLoader.java
b/tika-core/src/main/java/org/apache/tika/config/ServiceLoader.java
index 5a31dbf..68674ec 100644
--- a/tika-core/src/main/java/org/apache/tika/config/ServiceLoader.java
+++ b/tika-core/src/main/java/org/apache/tika/config/ServiceLoader.java
@@ -229,8 +229,7 @@ public class ServiceLoader {
*/
public Enumeration<URL> findServiceResources(String filePattern) {
try {
- Enumeration<URL> resources = loader.getResources(filePattern);
- return resources;
+ return loader.getResources(filePattern);
} catch (IOException ignore) {
// We couldn't get the list of service resource files
List<URL> empty = Collections.emptyList();
diff --git a/tika-core/src/main/java/org/apache/tika/parser/ParsingReader.java
b/tika-core/src/main/java/org/apache/tika/parser/ParsingReader.java
index 5ff41e0..fe98e74 100644
--- a/tika-core/src/main/java/org/apache/tika/parser/ParsingReader.java
+++ b/tika-core/src/main/java/org/apache/tika/parser/ParsingReader.java
@@ -234,8 +234,7 @@ public class ParsingReader extends Reader {
} else if (throwable instanceof IOException) {
throw (IOException) throwable;
} else if (throwable != null) {
- IOException exception = new IOException("", throwable);
- throw exception;
+ throw new IOException("", throwable);
}
return reader.read(cbuf, off, len);
}
diff --git
a/tika-core/src/main/java/org/apache/tika/pipes/async/AsyncClientConfig.java
b/tika-core/src/main/java/org/apache/tika/pipes/async/AsyncClientConfig.java
index e12b7c1..1fe5159 100644
--- a/tika-core/src/main/java/org/apache/tika/pipes/async/AsyncClientConfig.java
+++ b/tika-core/src/main/java/org/apache/tika/pipes/async/AsyncClientConfig.java
@@ -26,9 +26,8 @@ class AsyncClientConfig {
private long maxFilesProcessed;
public static AsyncClientConfig load(Path p) throws IOException {
- AsyncClientConfig asyncConfig = new AsyncClientConfig();
- return asyncConfig;
+ return new AsyncClientConfig();
}
diff --git
a/tika-core/src/main/java/org/apache/tika/sax/StandardOrganizations.java
b/tika-core/src/main/java/org/apache/tika/sax/StandardOrganizations.java
index 070331a..c8e89a0 100644
--- a/tika-core/src/main/java/org/apache/tika/sax/StandardOrganizations.java
+++ b/tika-core/src/main/java/org/apache/tika/sax/StandardOrganizations.java
@@ -186,8 +186,7 @@ public class StandardOrganizations {
* organizations.
*/
public static String getOrganzationsRegex() {
- String regex = "(" + String.join("|", organizations.keySet()) + ")";
- return regex;
+ return "(" + String.join("|", organizations.keySet()) + ")";
}
}
diff --git a/tika-core/src/main/java/org/apache/tika/sax/StandardsText.java
b/tika-core/src/main/java/org/apache/tika/sax/StandardsText.java
index 18d9e61..4bb863e 100644
--- a/tika-core/src/main/java/org/apache/tika/sax/StandardsText.java
+++ b/tika-core/src/main/java/org/apache/tika/sax/StandardsText.java
@@ -97,9 +97,7 @@ public class StandardsText {
double threshold) {
Map<Integer, String> headers = findHeaders(text);
- ArrayList<StandardReference> standardReferences = findStandards(text,
headers, threshold);
-
- return standardReferences;
+ return findStandards(text, headers, threshold);
}
/**
diff --git
a/tika-core/src/main/java/org/apache/tika/utils/ServiceLoaderUtils.java
b/tika-core/src/main/java/org/apache/tika/utils/ServiceLoaderUtils.java
index 8819759..76afdb1 100644
--- a/tika-core/src/main/java/org/apache/tika/utils/ServiceLoaderUtils.java
+++ b/tika-core/src/main/java/org/apache/tika/utils/ServiceLoaderUtils.java
@@ -53,10 +53,7 @@ public class ServiceLoaderUtils {
*/
public static <T> T newInstance(String className, ClassLoader loader) {
try {
- Class loadedClass = Class.forName(className, true, loader);
- Class<T> castedClass = loadedClass;
- T instance = castedClass.newInstance();
- return instance;
+ return ((Class<T>) Class.forName(className, true,
loader)).newInstance();
} catch (ClassNotFoundException | InstantiationException |
IllegalAccessException e) {
throw new RuntimeException(e);
}
diff --git
a/tika-eval/tika-eval-app/src/test/java/org/apache/tika/eval/app/db/AbstractBufferTest.java
b/tika-eval/tika-eval-app/src/test/java/org/apache/tika/eval/app/db/AbstractBufferTest.java
index 2df0cec..c822073 100644
---
a/tika-eval/tika-eval-app/src/test/java/org/apache/tika/eval/app/db/AbstractBufferTest.java
+++
b/tika-eval/tika-eval-app/src/test/java/org/apache/tika/eval/app/db/AbstractBufferTest.java
@@ -119,8 +119,7 @@ public class AbstractBufferTest {
Integer val = dbBuffer.getId(k);
m.put(k, val);
}
- MyTestResult r = new MyTestResult(m);
- return r;
+ return new MyTestResult(m);
}
}
diff --git
a/tika-example/src/main/java/org/apache/tika/example/CustomMimeInfo.java
b/tika-example/src/main/java/org/apache/tika/example/CustomMimeInfo.java
index ba56a56..e832437 100755
--- a/tika-example/src/main/java/org/apache/tika/example/CustomMimeInfo.java
+++ b/tika-example/src/main/java/org/apache/tika/example/CustomMimeInfo.java
@@ -29,8 +29,7 @@ public class CustomMimeInfo {
String path = "file:///path/to/prescription-type.xml";
MimeTypes typeDatabase = MimeTypesFactory.create(new URL(path));
Tika tika = new Tika(typeDatabase);
- String type = tika.detect("/path/to/prescription.xpd");
- return type;
+ return tika.detect("/path/to/prescription.xpd");
}
public static String customCompositeDetector() throws Exception {
@@ -38,8 +37,7 @@ public class CustomMimeInfo {
MimeTypes typeDatabase = MimeTypesFactory.create(new URL(path));
Tika tika =
new Tika(new CompositeDetector(typeDatabase, new
EncryptedPrescriptionDetector()));
- String type = tika.detect("/path/to/tmp/prescription.xpd");
- return type;
+ return tika.detect("/path/to/tmp/prescription.xpd");
}
public static void main(String[] args) throws Exception {
diff --git
a/tika-example/src/main/java/org/apache/tika/example/TIAParsingExample.java
b/tika-example/src/main/java/org/apache/tika/example/TIAParsingExample.java
index ac0e5b9..5a9ee5d 100755
--- a/tika-example/src/main/java/org/apache/tika/example/TIAParsingExample.java
+++ b/tika-example/src/main/java/org/apache/tika/example/TIAParsingExample.java
@@ -108,8 +108,7 @@ public class TIAParsingExample {
public static File tikaInputStreamGetFile(String filename) throws
Exception {
try (InputStream stream = TikaInputStream.get(new File(filename))) {
TikaInputStream tikaInputStream = TikaInputStream.get(stream);
- File file = tikaInputStream.getFile();
- return file;
+ return tikaInputStream.getFile();
}
}
diff --git
a/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/src/main/java/org/apache/tika/parser/envi/EnviHeaderParser.java
b/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/src/main/java/org/apache/tika/parser/envi/EnviHeaderParser.java
index e17d04f..d735f46 100644
---
a/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/src/main/java/org/apache/tika/parser/envi/EnviHeaderParser.java
+++
b/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/src/main/java/org/apache/tika/parser/envi/EnviHeaderParser.java
@@ -153,8 +153,7 @@ public class EnviHeaderParser extends
AbstractEncodingDetectorParser {
mapInfoValueStringBuilder.append(mapInfoValue.charAt(i));
}
}
- String[] mapInfoValues =
mapInfoValueStringBuilder.toString().split(",");
- return mapInfoValues;
+ return mapInfoValueStringBuilder.toString().split(",");
}
// Conversion logic taken from
https://stackoverflow.com/questions/343865/how-to-convert-from-utm-to-latlng-in-python-or-javascript/344083#344083
diff --git
a/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ctakes/CTAKESUtils.java
b/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ctakes/CTAKESUtils.java
index c165895..593193c 100644
---
a/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ctakes/CTAKESUtils.java
+++
b/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/main/java/org/apache/tika/parser/ctakes/CTAKESUtils.java
@@ -103,9 +103,8 @@ public class CTAKESUtils {
}
// create AE
- AnalysisEngine ae = UIMAFramework.produceAnalysisEngine(aeSpecifier);
- return ae;
+ return UIMAFramework.produceAnalysisEngine(aeSpecifier);
}
/**
@@ -129,9 +128,8 @@ public class CTAKESUtils {
* are invalid.
*/
public static JCas getJCas(AnalysisEngine ae) throws
ResourceInitializationException {
- JCas jcas = ae.newJCas();
- return jcas;
+ return ae.newJCas();
}
/**
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 cf50a42..7a988ca 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
@@ -161,8 +161,7 @@ public class DWGParser extends AbstractParser {
if (stringData[stringLen - 1] == 0) {
stringLen--;
}
- String value = StringUtil.getFromCompressedUnicode(stringData, 0,
stringLen);
- return value;
+ return StringUtil.getFromCompressedUnicode(stringData, 0, stringLen);
}
/**
diff --git
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/extractor/microsoft/MSEmbeddedStreamTranslator.java
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/extractor/microsoft/MSEmbeddedStreamTranslator.java
index 7f2a68e..33f739e 100644
---
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/extractor/microsoft/MSEmbeddedStreamTranslator.java
+++
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/extractor/microsoft/MSEmbeddedStreamTranslator.java
@@ -72,10 +72,7 @@ public class MSEmbeddedStreamTranslator implements
EmbeddedStreamTranslator {
try {
Ole10Native ole =
Ole10Native.createFromEmbeddedOleObject(poifs);
if (ole.getDataSize() > 0) {
- String label = ole.getLabel();
-
- name = label;
-
+ name = ole.getLabel();
data = ole.getDataBuffer();
}
} catch (Ole10NativeException ex) {
diff --git
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ListManager.java
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ListManager.java
index 404d98a..793a572 100644
---
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ListManager.java
+++
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ListManager.java
@@ -148,9 +148,7 @@ public class ListManager extends AbstractListManager {
StringBuilder sb = new StringBuilder();
int last = 0;
- for (byte numberOffset : numberOffsets) {
- int offset = (int) numberOffset;
-
+ for (int offset : numberOffsets) {
if (offset == 0) {
break;
}
diff --git
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNotePtr.java
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNotePtr.java
index 03fb58e..09a6f9b 100644
---
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNotePtr.java
+++
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNotePtr.java
@@ -586,8 +586,7 @@ class OneNotePtr {
data.id ==
FndStructureConstants.CanRevise.ObjectDeclaration2RefCountFND ||
data.id ==
FndStructureConstants.CanRevise.ReadOnlyObjectDeclaration2RefCountFND) {
- long refCnt = deserializeLittleEndianChar();
- data.subType.objectDeclarationWithRefCount.cRef = refCnt;
+ data.subType.objectDeclarationWithRefCount.cRef =
deserializeLittleEndianChar();
} else {
data.subType.objectDeclarationWithRefCount.cRef =
deserializeLittleEndianInt();
}
diff --git
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/hwp/HwpTextExtractorV5.java
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/hwp/HwpTextExtractorV5.java
index 15d61b2..b68b1f6 100644
---
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/hwp/HwpTextExtractorV5.java
+++
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/hwp/HwpTextExtractorV5.java
@@ -339,8 +339,7 @@ public class HwpTextExtractorV5 implements Serializable {
int offset = 4 + (data[0] & 0xF); // 4 + (0~15) ?
byte[] key = Arrays.copyOfRange(data, offset, offset + 16);
- SecretKeySpec secretKey = new SecretKeySpec(key, "AES");
- return secretKey;
+ return new SecretKeySpec(key, "AES");
}
public InputStream createDecryptStream(InputStream input, Key key)
diff --git
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/CharsetRecog_mbcs.java
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/CharsetRecog_mbcs.java
index a2fc385..91a6902 100644
---
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/CharsetRecog_mbcs.java
+++
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/CharsetRecog_mbcs.java
@@ -173,8 +173,7 @@ abstract class CharsetRecog_mbcs extends CharsetRecognizer {
done = true;
return -1;
}
- int byteValue = (int) det.fRawInput[nextIndex++] & 0x00ff;
- return byteValue;
+ return (int) det.fRawInput[nextIndex++] & 0x00ff;
}
}
diff --git
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/test/java/org/apache/tika/parser/strings/StringsParserTest.java
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/test/java/org/apache/tika/parser/strings/StringsParserTest.java
index b153bdd..31d3629 100644
---
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/test/java/org/apache/tika/parser/strings/StringsParserTest.java
+++
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/test/java/org/apache/tika/parser/strings/StringsParserTest.java
@@ -37,8 +37,7 @@ import org.apache.tika.sax.BodyContentHandler;
public class StringsParserTest {
public static boolean canRun() {
String[] checkCmd = {new StringsParser().getStringsPath() +
getStringsProg(), "--version"};
- boolean hasStrings = ExternalParser.check(checkCmd);
- return hasStrings;
+ return ExternalParser.check(checkCmd);
}
@Test
diff --git
a/tika-translate/src/main/java/org/apache/tika/language/translate/RTGTranslator.java
b/tika-translate/src/main/java/org/apache/tika/language/translate/RTGTranslator.java
index 8ff363a..6c032a3 100644
---
a/tika-translate/src/main/java/org/apache/tika/language/translate/RTGTranslator.java
+++
b/tika-translate/src/main/java/org/apache/tika/language/translate/RTGTranslator.java
@@ -129,8 +129,7 @@ public class RTGTranslator extends AbstractTranslator {
JSONParser parser = new JSONParser();
JSONObject obj = (JSONObject) parser.parse(reader);
List<String> sentences = (List<String>) obj.get("translation");
- String output = String.join("\n", sentences);
- return output;
+ return String.join("\n", sentences);
} catch (ParseException e){
throw new IOException(e.getMessage(), e);
}
