This is an automated email from the ASF dual-hosted git repository. tallison pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tika.git
commit bf224dc2f09c029df3f93ae0b136eb294e2c233f Merge: 23329a6 4971e2e Author: tallison <[email protected]> AuthorDate: Fri Jul 17 13:02:26 2020 -0400 Merge remote-tracking branch 'origin/TIKA-3140' into main .../src/main/java/org/apache/tika/cli/TikaCLI.java | 4 +- .../batch/fs/RecursiveParserWrapperFSConsumer.java | 9 +- .../tika/batch/fs/StreamOutRPWFSConsumer.java | 20 ++- .../fs/builders/BasicTikaFSConsumersBuilder.java | 11 +- .../RecursiveParserWrapperFSConsumerTest.java | 5 +- .../main/java/org/apache/tika/config/Param.java | 70 +++++++-- .../java/org/apache/tika/config/TikaConfig.java | 115 +++++++++++++- .../metadata/filter/ClearByMimeMetadataFilter.java | 72 +++++++++ .../metadata/filter/CompositeMetadataFilter.java | 38 +++++ .../metadata/filter/DefaultMetadataFilter.java | 46 ++++++ .../filter/ExcludeFieldMetadataFilter.java | 52 +++++++ .../filter/IncludeFieldMetadataFilter.java | 56 +++++++ .../tika/metadata/filter/MetadataFilter.java | 33 ++++ .../apache/tika/metadata/filter/NoOpFilter.java | 34 +++++ .../tika/sax/RecursiveParserWrapperHandler.java | 31 +++- .../org.apache.tika.metadata.filter.MetadataFilter | 16 ++ .../java/org/apache/tika/config/ParamTest.java | 7 + .../org/apache/tika/config/TikaConfigTest.java | 2 + .../tika/metadata/filter/MockUpperCaseFilter.java | 39 +++++ .../tika/metadata/filter/TestMetadataFilter.java | 170 +++++++++++++++++++++ .../tika/parser/ParameterizedParserTest.java | 3 +- .../org/apache/tika/config/TIKA-3137-exclude.xml | 29 ++++ .../apache/tika/config/TIKA-3137-include-uc.xml | 30 ++++ .../org/apache/tika/config/TIKA-3137-include.xml | 29 ++++ .../org/apache/tika/config/TIKA-3137-mimes-uc.xml | 30 ++++ .../tika/eval/metadata/TikaEvalMetadataFilter.java | 104 +++++++++++++ .../eval/metadata/TikaEvalMetadataFilterTest.java | 51 +++++++ .../tika/parser/RecursiveParserWrapperTest.java | 43 ++++++ .../org/apache/tika/parser/TIKA-3137-include.xml | 38 +++++ .../server/resource/RecursiveMetadataResource.java | 3 +- .../java/org/apache/tika/server/CXFTestBase.java | 7 +- .../tika/server/RecursiveMetadataFilterTest.java | 108 +++++++++++++ .../org/apache/tika/server/TIKA-3137-include.xml | 38 +++++ 33 files changed, 1308 insertions(+), 35 deletions(-)
