This is an automated email from the ASF dual-hosted git repository.
tallison pushed a change to branch TIKA-4545
in repository https://gitbox.apache.org/repos/asf/tika.git
from 42b5489ce TIKA-4545 -- add more annotations as needed
add 72035660a TIKA-4546 -- simplify metadata filtering (#2405)
add d1925ae01 Merge branch 'main' into TIKA-4545
No new revisions were added by this update.
Summary of changes:
CHANGES.txt | 18 ++++++-
.../tika/annotation/TikaComponentProcessor.java | 2 +-
.../src/main/java/org/apache/tika/cli/TikaCLI.java | 2 +-
.../src/main/java/org/apache/tika/gui/TikaGUI.java | 2 +-
.../java/org/apache/tika/config/TikaConfig.java | 11 ----
.../filter/CaptureGroupMetadataFilter.java | 5 +-
.../ClearByAttachmentTypeMetadataFilter.java | 9 ++--
.../metadata/filter/ClearByMimeMetadataFilter.java | 5 +-
.../metadata/filter/CompositeMetadataFilter.java | 7 +--
.../filter/DateNormalizingMetadataFilter.java | 6 +--
.../filter/ExcludeFieldMetadataFilter.java | 5 +-
.../metadata/filter/FieldNameMappingFilter.java | 5 +-
.../metadata/filter/GeoPointMetadataFilter.java | 5 +-
.../filter/IncludeFieldMetadataFilter.java | 5 +-
.../tika/metadata/filter/MetadataFilter.java | 21 ++++----
.../MetadataFilterBase.java} | 18 +++++--
.../apache/tika/metadata/filter/NoOpFilter.java | 7 ++-
.../listfilter/CompositeMetadataListFilter.java | 58 ----------------------
.../metadata/listfilter/MetadataListFilter.java | 51 -------------------
.../tika/sax/RecursiveParserWrapperHandler.java | 4 +-
.../AttachmentCountingListFilter.java | 4 +-
.../MetadataListFilterTest.java | 6 +--
.../tika/metadata/filter/MockUpperCaseFilter.java | 5 +-
.../tika/metadata/filter/TestMetadataFilter.java | 40 ++++++++-------
.../filter/metadatafilter-config.xml} | 6 ++-
.../listfilter/metadatalistfilter-config.xml | 22 --------
.../eval/core/metadata/TikaEvalMetadataFilter.java | 7 ++-
.../core/metadata/TikaEvalMetadataFilterTest.java | 4 +-
.../metadatafilter/OpenNLPMetadataFilter.java | 7 ++-
.../metadatafilter/OptimaizeMetadataFilter.java | 7 ++-
.../org/apache/tika/pipes/core/PassbackFilter.java | 4 +-
.../org/apache/tika/pipes/core/PipesServer.java | 26 ++--------
.../apache/tika/pipes/core/PipesClientTest.java | 12 ++---
.../pipes/emitter/solr/SolrEmitterDevTest.java | 3 +-
.../org/apache/tika/config/loader/TikaLoader.java | 8 +--
.../core/resource/RecursiveMetadataResource.java | 8 +--
.../tika/server/core/resource/TikaResource.java | 16 ++++--
37 files changed, 155 insertions(+), 276 deletions(-)
rename
tika-core/src/main/java/org/apache/tika/metadata/{listfilter/NoOpListFilter.java
=> filter/MetadataFilterBase.java} (60%)
delete mode 100644
tika-core/src/main/java/org/apache/tika/metadata/listfilter/CompositeMetadataListFilter.java
delete mode 100644
tika-core/src/main/java/org/apache/tika/metadata/listfilter/MetadataListFilter.java
rename tika-core/src/test/java/org/apache/tika/metadata/{listfilter =>
filter}/AttachmentCountingListFilter.java (91%)
rename tika-core/src/test/java/org/apache/tika/metadata/{listfilter =>
filter}/MetadataListFilterTest.java (86%)
copy
tika-core/src/test/resources/org/apache/tika/{config/TIKA-2732-xmlreaderutils.xml
=> metadata/filter/metadatafilter-config.xml} (85%)
delete mode 100644
tika-core/src/test/resources/org/apache/tika/metadata/listfilter/metadatalistfilter-config.xml
