JAMES-2013 Improving naming of rmeta for tika HTTP client

apache · Jun 8, 2017 · 15d9927 · 15d9927
1 parent cbaf67d
commit 15d9927
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/mailbox/tika/src/main/java/org/apache/james/mailbox/tika/TikaHttpClient.java b/mailbox/tika/src/main/java/org/apache/james/mailbox/tika/TikaHttpClient.java
@@ -22,5 +22,5 @@
 
 public interface TikaHttpClient {
 
-    InputStream rmetaAsJson(InputStream inputStream, String contentType) throws TikaException;
+    InputStream recursiveMetaDataAsJson(InputStream inputStream, String contentType) throws TikaException;
 }
diff --git a/mailbox/tika/src/main/java/org/apache/james/mailbox/tika/TikaHttpClientImpl.java b/mailbox/tika/src/main/java/org/apache/james/mailbox/tika/TikaHttpClientImpl.java
@@ -29,14 +29,14 @@
 
 public class TikaHttpClientImpl implements TikaHttpClient {
 
-    private static final String RMETA_AS_TEXT_ENDPOINT = "/rmeta/text";
+    private static final String RECURSIVE_METADATA_AS_TEXT_ENDPOINT = "/rmeta/text";
 
     private final TikaConfiguration tikaConfiguration;
-    private final URI rmeta;
+    private final URI recursiveMetaData;
 
     public TikaHttpClientImpl(TikaConfiguration tikaConfiguration) throws URISyntaxException {
         this.tikaConfiguration = tikaConfiguration;
-        this.rmeta = buildURI(tikaConfiguration).resolve(RMETA_AS_TEXT_ENDPOINT);
+        this.recursiveMetaData = buildURI(tikaConfiguration).resolve(RECURSIVE_METADATA_AS_TEXT_ENDPOINT);
     }
 
     private URI buildURI(TikaConfiguration tikaConfiguration) throws URISyntaxException {
@@ -48,9 +48,9 @@ private URI buildURI(TikaConfiguration tikaConfiguration) throws URISyntaxExcept
     }
 
     @Override
-    public InputStream rmetaAsJson(InputStream inputStream, String contentType) throws TikaException {
+    public InputStream recursiveMetaDataAsJson(InputStream inputStream, String contentType) throws TikaException {
         try {
-            return Request.Put(rmeta)
+            return Request.Put(recursiveMetaData)
                     .socketTimeout(tikaConfiguration.getTimeoutInMillis())
                     .bodyStream(inputStream, ContentType.create(contentType))
                     .execute()

diff --git a/mailbox/tika/src/main/java/org/apache/james/mailbox/tika/TikaTextExtractor.java b/mailbox/tika/src/main/java/org/apache/james/mailbox/tika/TikaTextExtractor.java
@@ -71,7 +71,7 @@ private ObjectMapper initializeObjectMapper() {
 
     @Override
     public ParsedContent extractContent(InputStream inputStream, String contentType) throws Exception {
-        ContentAndMetadata contentAndMetadata = convert(tikaHttpClient.rmetaAsJson(inputStream, contentType));
+        ContentAndMetadata contentAndMetadata = convert(tikaHttpClient.recursiveMetaDataAsJson(inputStream, contentType));
         return new ParsedContent(contentAndMetadata.getContent(), contentAndMetadata.getMetadata());
     }
 

diff --git a/mailbox/tika/src/test/java/org/apache/james/mailbox/tika/TikaTextExtractorTest.java b/mailbox/tika/src/test/java/org/apache/james/mailbox/tika/TikaTextExtractorTest.java
@@ -160,7 +160,7 @@ public void deserializerShouldThrowWhenMoreThanOneNode() throws Exception {
         TikaTextExtractor textExtractor = new TikaTextExtractor(new TikaHttpClient() {
 
             @Override
-            public InputStream rmetaAsJson(InputStream inputStream, String contentType) throws TikaException {
+            public InputStream recursiveMetaDataAsJson(InputStream inputStream, String contentType) throws TikaException {
                 return new ByteArrayInputStream("[{\"key1\":\"value1\"},{\"key2\":\"value2\"}]".getBytes(Charsets.UTF_8));
             }
         });
@@ -177,7 +177,7 @@ public void deserializerShouldThrowWhenNodeIsNotAnObject() throws Exception {
         TikaTextExtractor textExtractor = new TikaTextExtractor(new TikaHttpClient() {
 
             @Override
-            public InputStream rmetaAsJson(InputStream inputStream, String contentType) throws TikaException {
+            public InputStream recursiveMetaDataAsJson(InputStream inputStream, String contentType) throws TikaException {
                 return new ByteArrayInputStream("[\"value1\"]".getBytes(Charsets.UTF_8));
             }
         });