(tika) branch branch_3x updated: TIKA-4397: remove dead code

[tilman]

This is an automated email from the ASF dual-hosted git repository.

tilman pushed a commit to branch branch_3x
in repository https://gitbox.apache.org/repos/asf/tika.git


The following commit(s) were added to refs/heads/branch_3x by this push:
     new 7c7db7382 TIKA-4397: remove dead code
7c7db7382 is described below

commit 7c7db7382cc2ac6bd24472976e7c07ba316d0976
Author: Tilman Hausherr <til...@apache.org>
AuthorDate: Mon Mar 31 20:42:13 2025 +0200

    TIKA-4397: remove dead code
---
 .../main/java/org/apache/tika/config/TikaConfig.java | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/tika-core/src/main/java/org/apache/tika/config/TikaConfig.java 
b/tika-core/src/main/java/org/apache/tika/config/TikaConfig.java
index 2fbc89b5d..0f1aff73b 100644
--- a/tika-core/src/main/java/org/apache/tika/config/TikaConfig.java
+++ b/tika-core/src/main/java/org/apache/tika/config/TikaConfig.java
@@ -939,18 +939,16 @@ public class TikaConfig {
                                Map<String, Param> params, MimeTypes mimeTypes, 
ServiceLoader loader)
                 throws InvocationTargetException, IllegalAccessException, 
InstantiationException {
             Parser parser = null;
-            Constructor<? extends Parser> c = null;
+            Constructor<? extends Parser> c;
             MediaTypeRegistry registry = mimeTypes.getMediaTypeRegistry();
 
             // Try the possible default and composite parser constructors
-            if (parser == null) {
-                try {
-                    c = parserClass.getConstructor(MediaTypeRegistry.class, 
ServiceLoader.class,
-                            Collection.class, EncodingDetector.class, 
Renderer.class);
-                    parser = c.newInstance(registry, loader, excludeParsers, 
encodingDetector, renderer);
-                } catch (NoSuchMethodException me) {
-                    //swallow
-                }
+            try {
+                c = parserClass.getConstructor(MediaTypeRegistry.class, 
ServiceLoader.class,
+                        Collection.class, EncodingDetector.class, 
Renderer.class);
+                parser = c.newInstance(registry, loader, excludeParsers, 
encodingDetector, renderer);
+            } catch (NoSuchMethodException me) {
+                //swallow
             }
             if (parser == null) {
                 try {
@@ -1000,7 +998,7 @@ public class TikaConfig {
             // Create as a Parser Decorator
             if (parser == null && 
ParserDecorator.class.isAssignableFrom(parserClass)) {
                 try {
-                    CompositeParser cp = null;
+                    CompositeParser cp;
                     if (childParsers.size() == 1 && excludeParsers.isEmpty() &&
                             childParsers.get(0) instanceof CompositeParser) {
                         cp = (CompositeParser) childParsers.get(0);
@@ -1020,7 +1018,7 @@ public class TikaConfig {
         Parser newInstance(Class<? extends Parser> loadedClass)
                 throws IllegalAccessException, InstantiationException, 
NoSuchMethodException,
                 InvocationTargetException {
-            Parser parser = null;
+            Parser parser;
             if 
(AbstractEncodingDetectorParser.class.isAssignableFrom(loadedClass)) {
                 Constructor ctor = 
loadedClass.getConstructor(EncodingDetector.class);
                 parser = (Parser) ctor.newInstance(encodingDetector);