TIKA-4766: adapt to post-merge main APIs

TIKA-4794 changed HttpHeaders CONTENT_TYPE/CONTENT_LENGTH from String
constants to Property and renamed the X-TIKA: metadata prefix to tk:.
Use .getName() where a String key is needed and assert on
TikaCoreProperties.TIKA_CONTENT instead of a hardcoded key.

Author: krickert

tika-grpc-mapper/src/main/java/org/apache/tika/grpc/mapper/DocumentBuilder.java

@@ -77,7 +77,7 @@ public static Document build(Metadata primary, String docId, String pipesStatus,
         }
 
         // Keys the envelope maps below are consumed up front so the tagged tail never
-        // carries them a second time. X-TIKA:content is consumed without a typed home
+        // carries them a second time. tk:content is consumed without a typed home
         // yet: the reply's fields map still carries the flat content, and the structured
         // content tree is a planned additive follow-up -- duplicating the whole body
         // into `extra` as a string would defeat both.
@@ -87,7 +87,7 @@ public static Document build(Metadata primary, String docId, String pipesStatus,
         String contentType = primary.get(Metadata.CONTENT_TYPE);
         if (contentType != null && !contentType.isBlank()) {
             document.setContentType(contentType.trim());
-            consumed.add(Metadata.CONTENT_TYPE);
+            consumed.add(Metadata.CONTENT_TYPE.getName());
         }
 
         Instant now = Instant.now();
@@ -106,7 +106,7 @@ public static Document build(Metadata primary, String docId, String pipesStatus,
         if (contentLength != null && !contentLength.isBlank()) {
             try {
                 origin.setByteSize(Long.parseLong(contentLength.trim()));
-                consumed.add(Metadata.CONTENT_LENGTH);
+                consumed.add(Metadata.CONTENT_LENGTH.getName());
             } catch (NumberFormatException ignored) {
                 // leave unconsumed; falls through to the tagged tail
             }

tika-grpc-mapper/src/test/java/org/apache/tika/grpc/mapper/DocumentBuilderTest.java

@@ -57,7 +57,7 @@ void buildsTypedMetadataFromRealPdf() throws Exception {
     void mapsSourceDigestWhenThePipelineRecordedOne() {
         Metadata metadata = new Metadata();
         metadata.set(Metadata.CONTENT_TYPE, "text/plain");
-        // Reserved X-TIKA keys only accept Property writes (TIKA-4769); this mirrors how
+        // Reserved tk: keys only accept Property writes (TIKA-4769); this mirrors how
         // InputStreamDigester records the digest.
         metadata.set(Property.internalText(TikaCoreProperties.TIKA_META_PREFIX + "digest"
                 + TikaCoreProperties.NAMESPACE_PREFIX_DELIMITER + "SHA256"), "0a1b2c3d");
@@ -107,7 +107,7 @@ void envelopeKeysAndContentAreNotDuplicatedIntoTheTail() {
         assertEquals("text/plain", document.getContentType());
         assertEquals("sample.txt", document.getOrigin().getFilename());
         assertTrue(document.getExtraList().stream()
-                .noneMatch(f -> f.getKey().equals(Metadata.CONTENT_TYPE)
+                .noneMatch(f -> f.getKey().equals(Metadata.CONTENT_TYPE.getName())
                         || f.getKey().equals(TikaCoreProperties.RESOURCE_NAME_KEY.getName())
                         || f.getKey().equals(TikaCoreProperties.TIKA_CONTENT.getName())));
     }
@@ -143,7 +143,7 @@ void mapsContentLengthToByteSize() {
         Document document = DocumentBuilder.build(metadata, "d", "PARSE_SUCCESS", 1L);
         assertEquals(12345L, document.getOrigin().getByteSize());
         assertTrue(document.getExtraList().stream()
-                .noneMatch(f -> f.getKey().equals(Metadata.CONTENT_LENGTH)));
+                .noneMatch(f -> f.getKey().equals(Metadata.CONTENT_LENGTH.getName())));
     }
 
     /**
@@ -159,12 +159,12 @@ void malformedContentLengthFallsThroughToTheTail() {
         Document document = DocumentBuilder.build(metadata, "d", "PARSE_SUCCESS", 1L);
         assertEquals(0L, document.getOrigin().getByteSize());
         assertTrue(document.getExtraList().stream()
-                .anyMatch(f -> f.getKey().equals(Metadata.CONTENT_LENGTH)));
+                .anyMatch(f -> f.getKey().equals(Metadata.CONTENT_LENGTH.getName())));
     }
 
     /**
-     * parsers_used prefers the full set (X-TIKA:Parsed-By-Full-Set) but must not come
-     * back empty just because only X-TIKA:Parsed-By was recorded.
+     * parsers_used prefers the full set (tk:parsed-by-full-set) but must not come
+     * back empty just because only tk:parsed-by was recorded.
      */
     @Test
     void parsersUsedFallsBackWhenFullSetIsAbsent() {

tika-grpc/src/test/java/org/apache/tika/pipes/grpc/TikaGrpcServerTest.java

@@ -79,6 +79,7 @@
 import org.apache.tika.TikaGrpc;
 import org.apache.tika.grpc.v2.Document;
 import org.apache.tika.grpc.v2.TikaV2Grpc;
+import org.apache.tika.metadata.TikaCoreProperties;
 import org.apache.tika.pipes.api.PipesResult;
 import org.apache.tika.pipes.fetcher.fs.FileSystemFetcher;
 import org.apache.tika.serialization.config.JsonConfigHelper;
@@ -425,7 +426,8 @@ public void testFetchAndParseReturnsTypedDocument(Resources resources) throws Ex
                     .setFetchKey(fetchKey)
                     .build());
             assertEquals("PARSE_SUCCESS", v1Reply.getStatus());
-            String legacyContent = v1Reply.getFieldsMap().get("X-TIKA:content");
+            String legacyContent = v1Reply.getFieldsMap()
+                    .get(TikaCoreProperties.TIKA_CONTENT.getName());
             assertNotNull(legacyContent, "v1 fields map must keep working");
             assertTrue(legacyContent.contains("hello typed world"));
 
@@ -463,7 +465,7 @@ public void testFetchAndParseReturnsTypedDocument(Resources resources) throws Ex
             assertTrue(document.getExtraCount() > 0,
                     "unmapped keys should survive in the tagged tail");
             assertTrue(document.getExtraList().stream().noneMatch(f ->
-                            f.getKey().equals("X-TIKA:content")
+                            f.getKey().equals(TikaCoreProperties.TIKA_CONTENT.getName())
                                     || f.getKey().equals("Content-Type")
                                     || f.getKey().equals("dc:title")),
                     "typed/envelope keys must not duplicate into the tail");
@@ -653,7 +655,8 @@ public void onCompleted() {
             // v1 bi-stream replies keep the legacy fields-map contract
             for (FetchAndParseReply success : successes) {
                 assertEquals("PARSE_SUCCESS", success.getStatus());
-                assertNotNull(success.getFieldsMap().get("X-TIKA:content"),
+                assertNotNull(success.getFieldsMap()
+                                .get(TikaCoreProperties.TIKA_CONTENT.getName()),
                         "v1 reply should carry content in fields for " + success.getFetchKey());
             }