updated with the new changes of TIKA-1508
Project: http://git-wip-us.apache.org/repos/asf/tika/repo Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/31cf12d5 Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/31cf12d5 Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/31cf12d5 Branch: refs/heads/TIKA-1508 Commit: 31cf12d51539c1ec01c12d73f96e7eadfd2339f0 Parents: 027625d Author: Thamme Gowda <[email protected]> Authored: Wed Jun 15 14:49:32 2016 -0700 Committer: Thamme Gowda <[email protected]> Committed: Wed Jun 15 14:49:32 2016 -0700 ---------------------------------------------------------------------- .../java/org/apache/tika/utils/AnnotationUtils.java | 2 ++ .../tika/parser/recognition/ObjectRecogniser.java | 12 +++++++----- .../parser/recognition/ObjectRecognitionParser.java | 12 +++++++----- .../parser/recognition/tf/TensorflowImageRecParser.java | 5 +++-- .../recognition/tf/TensorflowImageRecParserTest.java | 4 +++- 5 files changed, 22 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tika/blob/31cf12d5/tika-core/src/main/java/org/apache/tika/utils/AnnotationUtils.java ---------------------------------------------------------------------- diff --git a/tika-core/src/main/java/org/apache/tika/utils/AnnotationUtils.java b/tika-core/src/main/java/org/apache/tika/utils/AnnotationUtils.java index fc21c9a..9c85e60 100644 --- a/tika-core/src/main/java/org/apache/tika/utils/AnnotationUtils.java +++ b/tika-core/src/main/java/org/apache/tika/utils/AnnotationUtils.java @@ -29,9 +29,11 @@ import java.security.PrivilegedAction; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.Set; /** * This class contains utilities for dealing with tika annotations http://git-wip-us.apache.org/repos/asf/tika/blob/31cf12d5/tika-parsers/src/main/java/org/apache/tika/parser/recognition/ObjectRecogniser.java ---------------------------------------------------------------------- diff --git a/tika-parsers/src/main/java/org/apache/tika/parser/recognition/ObjectRecogniser.java b/tika-parsers/src/main/java/org/apache/tika/parser/recognition/ObjectRecogniser.java index 3776c1e..52c064f 100644 --- a/tika-parsers/src/main/java/org/apache/tika/parser/recognition/ObjectRecogniser.java +++ b/tika-parsers/src/main/java/org/apache/tika/parser/recognition/ObjectRecogniser.java @@ -16,7 +16,8 @@ */ package org.apache.tika.parser.recognition; -import org.apache.tika.base.Configurable; +import org.apache.tika.config.Initializable; +import org.apache.tika.config.Param; import org.apache.tika.exception.TikaConfigException; import org.apache.tika.exception.TikaException; import org.apache.tika.metadata.Metadata; @@ -29,13 +30,14 @@ import org.xml.sax.SAXException; import java.io.IOException; import java.io.InputStream; import java.util.List; +import java.util.Map; import java.util.Set; /** * This is a contract for object recognisers used by {@link ObjectRecognitionParser} * @see {@link TensorflowImageRecParser} for an example */ -public interface ObjectRecogniser extends Configurable { +public interface ObjectRecogniser extends Initializable { /** * The mimes supported by this recogniser @@ -51,15 +53,15 @@ public interface ObjectRecogniser extends Configurable { /** * This is the hook for configuring the recogniser - * @param context configuration instance in the form of context + * @param params configuration instance in the form of context * @throws TikaConfigException when there is an issue with configuration */ - void configure(ParseContext context) throws TikaConfigException; + void initialize(Map<String, Param> params) throws TikaConfigException; /** * Recognise the objects in the stream * @param stream content stream - * @param handler tika's content handle + * @param handler tika's content handler * @param metadata metadata instance * @param context parser context * @return List of {@link RecognisedObject}s http://git-wip-us.apache.org/repos/asf/tika/blob/31cf12d5/tika-parsers/src/main/java/org/apache/tika/parser/recognition/ObjectRecognitionParser.java ---------------------------------------------------------------------- diff --git a/tika-parsers/src/main/java/org/apache/tika/parser/recognition/ObjectRecognitionParser.java b/tika-parsers/src/main/java/org/apache/tika/parser/recognition/ObjectRecognitionParser.java index 4d5c14b..c3262f9 100644 --- a/tika-parsers/src/main/java/org/apache/tika/parser/recognition/ObjectRecognitionParser.java +++ b/tika-parsers/src/main/java/org/apache/tika/parser/recognition/ObjectRecognitionParser.java @@ -17,6 +17,8 @@ package org.apache.tika.parser.recognition; import org.apache.tika.config.Field; +import org.apache.tika.config.Initializable; +import org.apache.tika.config.Param; import org.apache.tika.exception.TikaConfigException; import org.apache.tika.exception.TikaException; import org.apache.tika.metadata.Metadata; @@ -38,6 +40,7 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; import java.util.Locale; +import java.util.Map; import java.util.Set; @@ -63,7 +66,7 @@ import java.util.Set; * * @since Apache Tika 1.14 */ -public class ObjectRecognitionParser extends AbstractParser { +public class ObjectRecognitionParser extends AbstractParser implements Initializable { public static final Logger LOG = LoggerFactory.getLogger(ObjectRecognitionParser.class); public static final String MD_KEY = "OBJECT"; @@ -89,10 +92,9 @@ public class ObjectRecognitionParser extends AbstractParser { } @Override - public void configure(ParseContext context) throws TikaConfigException { - super.configure(context); - AnnotationUtils.assignFieldParams(recogniser, context.getParams()); - recogniser.configure(context); + public void initialize(Map<String, Param> params) throws TikaConfigException { + AnnotationUtils.assignFieldParams(recogniser, params); + recogniser.initialize(params); LOG.info("minConfidence = {}, topN={}", minConfidence, topN); LOG.info("Recogniser = {}", recogniser.getClass().getName()); LOG.info("Recogniser Available = {}", recogniser.isAvailable()); http://git-wip-us.apache.org/repos/asf/tika/blob/31cf12d5/tika-parsers/src/main/java/org/apache/tika/parser/recognition/tf/TensorflowImageRecParser.java ---------------------------------------------------------------------- diff --git a/tika-parsers/src/main/java/org/apache/tika/parser/recognition/tf/TensorflowImageRecParser.java b/tika-parsers/src/main/java/org/apache/tika/parser/recognition/tf/TensorflowImageRecParser.java index 735de54..c47a105 100644 --- a/tika-parsers/src/main/java/org/apache/tika/parser/recognition/tf/TensorflowImageRecParser.java +++ b/tika-parsers/src/main/java/org/apache/tika/parser/recognition/tf/TensorflowImageRecParser.java @@ -17,6 +17,7 @@ package org.apache.tika.parser.recognition.tf; import org.apache.tika.config.Field; +import org.apache.tika.config.Param; import org.apache.tika.exception.TikaConfigException; import org.apache.tika.exception.TikaException; import org.apache.tika.io.IOUtils; @@ -40,6 +41,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.Set; import java.util.regex.Pattern; @@ -94,8 +96,7 @@ public class TensorflowImageRecParser extends ExternalParser implements ObjectRe } @Override - public void configure(ParseContext context) throws TikaConfigException { - super.configure(context); + public void initialize(Map<String, Param> params) throws TikaConfigException { try { if (!modelFile.exists()) { modelFile.getParentFile().mkdirs(); http://git-wip-us.apache.org/repos/asf/tika/blob/31cf12d5/tika-parsers/src/test/java/org/apache/tika/parser/recognition/tf/TensorflowImageRecParserTest.java ---------------------------------------------------------------------- diff --git a/tika-parsers/src/test/java/org/apache/tika/parser/recognition/tf/TensorflowImageRecParserTest.java b/tika-parsers/src/test/java/org/apache/tika/parser/recognition/tf/TensorflowImageRecParserTest.java index 038f2d3..ff88d77 100644 --- a/tika-parsers/src/test/java/org/apache/tika/parser/recognition/tf/TensorflowImageRecParserTest.java +++ b/tika-parsers/src/test/java/org/apache/tika/parser/recognition/tf/TensorflowImageRecParserTest.java @@ -17,6 +17,7 @@ package org.apache.tika.parser.recognition.tf; +import org.apache.tika.config.Param; import org.apache.tika.metadata.Metadata; import org.apache.tika.parser.ParseContext; import org.apache.tika.parser.recognition.RecognisedObject; @@ -26,6 +27,7 @@ import org.junit.Test; import org.xml.sax.helpers.DefaultHandler; import java.io.InputStream; +import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -37,7 +39,7 @@ public class TensorflowImageRecParserTest { @Test public void recognise() throws Exception { TensorflowImageRecParser recogniser = new TensorflowImageRecParser(); - recogniser.configure(new ParseContext()); + recogniser.initialize(new HashMap<String, Param>()); try (InputStream stream = getClass().getClassLoader().getResourceAsStream("test-documents/testJPEG.jpg")) { List<RecognisedObject> objects = recogniser.recognise(stream, new DefaultHandler(), new Metadata(), new ParseContext()); Assert.assertTrue(5 == objects.size());
