TIKA-4545 -- propagate annotation through parsers and improve TikaLoader (#2404)

* TIKA-4545 -- baseline improvements to support integration
Generated-by: Claude Sonnet 4.5 (claude-sonnet-4-5-20250929)
Significant design and implementation on ConfigLoader with Claude

Other commits were fully human or with light assist

Author: tballison

tika-annotation-processor/pom.xml

@@ -37,15 +37,6 @@
   </description>
   <url>https://tika.apache.org</url>
 
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>tika-core</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-
   <build>
     <plugins>
       <plugin>

tika-annotation-processor/src/main/java/org/apache/tika/annotation/TikaComponentProcessor.java

@@ -19,6 +19,7 @@
 import java.io.IOException;
 import java.io.Writer;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
@@ -54,7 +55,7 @@
  * to avoid generating SPI files for utility interfaces like Serializable, Initializable, etc.
  */
 @SupportedAnnotationTypes("org.apache.tika.config.TikaComponent")
-@SupportedSourceVersion(SourceVersion.RELEASE_11)
+@SupportedSourceVersion(SourceVersion.RELEASE_17)
 public class TikaComponentProcessor extends AbstractProcessor {
 
     /**
@@ -145,7 +146,7 @@ private void processComponent(TypeElement element) {
                         .add(className);
             }
 
-            // Always add to index files (regardless of SPI setting)
+            // Always add to index files for name-based lookup, regardless of spi value
             String indexFileName = SERVICE_INTERFACES.get(serviceInterface);
             if (indexFileName != null) {
                 Map<String, String> index = indexFiles.computeIfAbsent(indexFileName,
@@ -219,14 +220,20 @@ private void writeServiceFiles() {
             String serviceInterface = entry.getKey();
             Set<String> implementations = entry.getValue();
 
+            // Sort implementations alphabetically for deterministic output
+            List<String> sortedImplementations = new ArrayList<>(implementations);
+            Collections.sort(sortedImplementations);
+
             try {
                 FileObject file = filer.createResource(StandardLocation.CLASS_OUTPUT, "",
                         "META-INF/services/" + serviceInterface);
 
                 try (Writer writer = file.openWriter()) {
+                    writeApacheLicenseHeader(writer);
+                    writer.write("\n\n");
                     writer.write("# Generated by TikaComponentProcessor\n");
                     writer.write("# Do not edit manually\n");
-                    for (String impl : implementations) {
+                    for (String impl : sortedImplementations) {
                         writer.write(impl);
                         writer.write("\n");
                     }
@@ -256,6 +263,7 @@ private void writeIndexFiles() {
                         "META-INF/tika/" + fileName + ".idx");
 
                 try (Writer writer = file.openWriter()) {
+                    writeApacheLicenseHeader(writer);
                     writer.write("# Generated by TikaComponentProcessor\n");
                     writer.write("# Do not edit manually\n");
                     writer.write("# Format: component-name=fully.qualified.ClassName\n");
@@ -277,4 +285,28 @@ private void writeIndexFiles() {
             }
         }
     }
+
+    /**
+     * Writes the Apache License 2.0 header to a file.
+     */
+    private void writeApacheLicenseHeader(Writer writer) throws IOException {
+        String header = """
+                #  Licensed to the Apache Software Foundation (ASF) under one or more
+                #  contributor license agreements.  See the NOTICE file distributed with
+                #  this work for additional information regarding copyright ownership.
+                #  The ASF licenses this file to You under the Apache License, Version 2.0
+                #  (the "License"); you may not use this file except in compliance with
+                #  the License.  You may obtain a copy of the License at
+                #
+                #       http://www.apache.org/licenses/LICENSE-2.0
+                #
+                #  Unless required by applicable law or agreed to in writing, software
+                #  distributed under the License is distributed on an "AS IS" BASIS,
+                #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+                #  See the License for the specific language governing permissions and
+                #  limitations under the License.
+
+                """;
+        writer.write(header);
+    }
 }

…rg/apache/tika/config/TikaComponent.java …rg/apache/tika/config/TikaComponent.javatika-core/src/main/java/org/apache/tika/config/TikaComponent.java renamed to tika-annotation-processor/src/main/java/org/apache/tika/config/TikaComponent.java tika-core/src/main/java/org/apache/tika/config/TikaComponent.java renamed to tika-annotation-processor/src/main/java/org/apache/tika/config/TikaComponent.java

@@ -34,6 +34,9 @@
  *   <li>Component index files (META-INF/tika/{type}.idx) for name-based lookup</li>
  * </ul>
  *
+ * <p>This annotation is only used at compile time by the annotation processor.
+ * It is retained in .class files for tooling but not loaded by the runtime JVM.
+ *
  * <p>Example usage:
  * <pre>
  * {@code @TikaComponent}
@@ -54,7 +57,7 @@
  *
  * @since 3.1.0
  */
-@Retention(RetentionPolicy.RUNTIME)
+@Retention(RetentionPolicy.CLASS)
 @Target(ElementType.TYPE)
 public @interface TikaComponent {
 

tika-core/pom.xml

@@ -64,6 +64,15 @@
       <scope>provided</scope>
     </dependency>
 
+    <!-- Annotation processor - contains @TikaComponent and ensures build order.
+         "provided" because it is only used at compile time -->
+    <dependency>
+      <groupId>org.apache.tika</groupId>
+      <artifactId>tika-annotation-processor</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+
     <!-- Test dependencies -->
     <dependency>
       <groupId>com.google.guava</groupId>
@@ -130,6 +139,19 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <annotationProcessorPaths>
+            <path>
+              <groupId>org.apache.tika</groupId>
+              <artifactId>tika-annotation-processor</artifactId>
+              <version>${project.version}</version>
+            </path>
+          </annotationProcessorPaths>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>

tika-core/src/main/java/org/apache/tika/parser/AutoDetectParser.java

@@ -90,6 +90,16 @@ public AutoDetectParser(Detector detector, Parser... parsers) {
         setAutoDetectParserConfig(AutoDetectParserConfig.DEFAULT);
     }
 
+    public AutoDetectParser(CompositeParser parser, Detector detector, AutoDetectParserConfig autoDetectParserConfig) {
+        super(parser);
+        setDetector(detector);
+        setAutoDetectParserConfig(autoDetectParserConfig);
+    }
+
+    public static Parser build(CompositeParser parser, Detector detector, AutoDetectParserConfig autoDetectParserConfig) {
+        return new AutoDetectParser(parser, detector, autoDetectParserConfig);
+    }
+
     public AutoDetectParser(TikaConfig config) {
         super(config.getMediaTypeRegistry(), getParser(config));
         setFallback(buildFallbackParser(config));

tika-core/src/main/java/org/apache/tika/parser/CompositeParser.java

@@ -97,6 +97,10 @@ public CompositeParser() {
         this(new MediaTypeRegistry());
     }
 
+    public CompositeParser(CompositeParser compositeParser) {
+        this(compositeParser.registry, compositeParser);
+    }
+
     public Map<MediaType, Parser> getParsers(ParseContext context) {
         Map<MediaType, Parser> map = new HashMap<>();
         for (Parser parser : parsers) {

tika-parsers/pom.xml

@@ -41,6 +41,14 @@
   </modules>
 
   <dependencies>
+    <!-- Annotation processor - contains @TikaComponent and ensures build order.
+     "provided" because it is only used at compile time -->
+    <dependency>
+      <groupId>org.apache.tika</groupId>
+      <artifactId>tika-annotation-processor</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
     <!-- test dependencies -->
     <dependency>
       <groupId>org.junit.jupiter</groupId>
@@ -93,6 +101,24 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <annotationProcessorPaths>
+            <path>
+              <groupId>org.apache.tika</groupId>
+              <artifactId>tika-annotation-processor</artifactId>
+              <version>${project.version}</version>
+            </path>
+            <path>
+              <groupId>org.apache.tika</groupId>
+              <artifactId>tika-core</artifactId>
+              <version>${project.version}</version>
+            </path>
+          </annotationProcessorPaths>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.apache.rat</groupId>
         <artifactId>apache-rat-plugin</artifactId>

tika-parsers/tika-parsers-extended/tika-parser-scientific-module/src/main/java/org/apache/tika/parser/envi/EnviHeaderParser.java

@@ -31,6 +31,7 @@
 import org.xml.sax.ContentHandler;
 import org.xml.sax.SAXException;
 
+import org.apache.tika.config.TikaComponent;
 import org.apache.tika.detect.AutoDetectReader;
 import org.apache.tika.detect.EncodingDetector;
 import org.apache.tika.exception.TikaException;
@@ -40,6 +41,7 @@
 import org.apache.tika.parser.ParseContext;
 import org.apache.tika.sax.XHTMLContentHandler;
 
+@TikaComponent
 public class EnviHeaderParser extends AbstractEncodingDetectorParser {
 
     public static final String ENVI_MIME_TYPE = "application/envi.hdr";

tika-parsers/tika-parsers-extended/tika-parser-scientific-module/src/main/java/org/apache/tika/parser/gdal/GDALParser.java

@@ -41,6 +41,7 @@
 import org.xml.sax.SAXException;
 
 import org.apache.tika.config.Field;
+import org.apache.tika.config.TikaComponent;
 import org.apache.tika.config.TikaTaskTimeout;
 import org.apache.tika.exception.TikaException;
 import org.apache.tika.io.TemporaryResources;
@@ -74,6 +75,7 @@
  * {@link ContentHandler} in the
  * {@link #parse(InputStream, ContentHandler, Metadata, ParseContext)} method.
  */
+@TikaComponent
 public class GDALParser implements Parser {
 
     private static final long serialVersionUID = -3869130527323941401L;

tika-parsers/tika-parsers-extended/tika-parser-scientific-module/src/main/java/org/apache/tika/parser/geoinfo/GeographicInformationParser.java

@@ -61,6 +61,7 @@
 import org.xml.sax.ContentHandler;
 import org.xml.sax.SAXException;
 
+import org.apache.tika.config.TikaComponent;
 import org.apache.tika.exception.TikaException;
 import org.apache.tika.io.TemporaryResources;
 import org.apache.tika.io.TikaInputStream;
@@ -71,7 +72,7 @@
 import org.apache.tika.sax.XHTMLContentHandler;
 import org.apache.tika.utils.DateUtils;
 
-
+@TikaComponent
 public class GeographicInformationParser implements Parser {
 
     public static final String geoInfoType = "text/iso19139+xml";