You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2017/06/08 02:46:44 UTC
[7/9] james-project git commit: JAMES-2013 Improving naming of rmeta
for tika HTTP client
JAMES-2013 Improving naming of rmeta for tika HTTP client
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/15d99275
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/15d99275
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/15d99275
Branch: refs/heads/master
Commit: 15d992758d72b3b2aed487c3dc5daf7b5426c99d
Parents: cbaf67d
Author: benwa <bt...@linagora.com>
Authored: Wed Jun 7 10:17:31 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Thu Jun 8 09:46:25 2017 +0700
----------------------------------------------------------------------
.../org/apache/james/mailbox/tika/TikaHttpClient.java | 2 +-
.../org/apache/james/mailbox/tika/TikaHttpClientImpl.java | 10 +++++-----
.../org/apache/james/mailbox/tika/TikaTextExtractor.java | 2 +-
.../apache/james/mailbox/tika/TikaTextExtractorTest.java | 4 ++--
4 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/15d99275/mailbox/tika/src/main/java/org/apache/james/mailbox/tika/TikaHttpClient.java
----------------------------------------------------------------------
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
index c00ab77..e736d72 100644
--- 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 @@ import java.io.InputStream;
public interface TikaHttpClient {
- InputStream rmetaAsJson(InputStream inputStream, String contentType) throws TikaException;
+ InputStream recursiveMetaDataAsJson(InputStream inputStream, String contentType) throws TikaException;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/15d99275/mailbox/tika/src/main/java/org/apache/james/mailbox/tika/TikaHttpClientImpl.java
----------------------------------------------------------------------
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
index 45a66c6..0d54038 100644
--- 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 @@ import org.apache.http.entity.ContentType;
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 @@ public class TikaHttpClientImpl implements TikaHttpClient {
}
@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()
http://git-wip-us.apache.org/repos/asf/james-project/blob/15d99275/mailbox/tika/src/main/java/org/apache/james/mailbox/tika/TikaTextExtractor.java
----------------------------------------------------------------------
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
index 7d4b7b0..3b290a0 100644
--- 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 @@ public class TikaTextExtractor implements TextExtractor {
@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());
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/15d99275/mailbox/tika/src/test/java/org/apache/james/mailbox/tika/TikaTextExtractorTest.java
----------------------------------------------------------------------
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
index 1adbb4c..a957dbe 100644
--- 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 class TikaTextExtractorTest {
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 class TikaTextExtractorTest {
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));
}
});
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org