This is an automated email from the ASF dual-hosted git repository. tallison pushed a commit to branch branch_1x in repository https://gitbox.apache.org/repos/asf/tika.git
commit 096a4ad7f6ca7098a513138f5fc6338858efe07f Author: tallison <[email protected]> AuthorDate: Fri Jul 17 12:56:35 2020 -0400 TIKA-3137 add a list type for Param/configuration to avoid the comma-delimited lists which will get huge and ugly and were a bad idea. --- .../resources/org/apache/tika/parser/TIKA-3137-include.xml | 6 +++++- .../org/apache/tika/server/RecursiveMetadataFilterTest.java | 1 + .../resources/org/apache/tika/server/TIKA-3137-include.xml | 11 +++++++++-- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/tika-parsers/src/test/resources/org/apache/tika/parser/TIKA-3137-include.xml b/tika-parsers/src/test/resources/org/apache/tika/parser/TIKA-3137-include.xml index aae2f43..b99af0b 100644 --- a/tika-parsers/src/test/resources/org/apache/tika/parser/TIKA-3137-include.xml +++ b/tika-parsers/src/test/resources/org/apache/tika/parser/TIKA-3137-include.xml @@ -19,7 +19,11 @@ <metadataFilters> <metadataFilter class="org.apache.tika.metadata.filter.IncludeFieldMetadataFilter"> <params> - <param name="include" type="string">X-TIKA:content,extended-properties:Application,Content-Type</param> + <param name="include" type="list"> + <string>X-TIKA:content</string> + <string>extended-properties:Application</string> + <string>Content-Type</string> + </param> </params> </metadataFilter> <metadataFilter class="org.apache.tika.metadata.filter.ClearByMimeMetadataFilter"> diff --git a/tika-server/src/test/java/org/apache/tika/server/RecursiveMetadataFilterTest.java b/tika-server/src/test/java/org/apache/tika/server/RecursiveMetadataFilterTest.java index 748ee77..9799f8b 100644 --- a/tika-server/src/test/java/org/apache/tika/server/RecursiveMetadataFilterTest.java +++ b/tika-server/src/test/java/org/apache/tika/server/RecursiveMetadataFilterTest.java @@ -59,6 +59,7 @@ public class RecursiveMetadataFilterTest extends CXFTestBase { protected InputStream getTikaConfigInputStream() { return getClass().getResourceAsStream("TIKA-3137-include.xml"); } + @Override protected void setUpResources(JAXRSServerFactoryBean sf) { sf.setResourceClasses(RecursiveMetadataResource.class); diff --git a/tika-server/src/test/resources/org/apache/tika/server/TIKA-3137-include.xml b/tika-server/src/test/resources/org/apache/tika/server/TIKA-3137-include.xml index 765bc11..b99af0b 100644 --- a/tika-server/src/test/resources/org/apache/tika/server/TIKA-3137-include.xml +++ b/tika-server/src/test/resources/org/apache/tika/server/TIKA-3137-include.xml @@ -19,12 +19,19 @@ <metadataFilters> <metadataFilter class="org.apache.tika.metadata.filter.IncludeFieldMetadataFilter"> <params> - <param name="include" type="string">X-TIKA:content,extended-properties:Application,Content-Type</param> + <param name="include" type="list"> + <string>X-TIKA:content</string> + <string>extended-properties:Application</string> + <string>Content-Type</string> + </param> </params> </metadataFilter> <metadataFilter class="org.apache.tika.metadata.filter.ClearByMimeMetadataFilter"> <params> - <param name="mimes" type="string">image/emf,text/plain</param> + <param name="mimes" type="list"> + <string>image/emf</string> + <string>text/plain</string> + </param> </params> </metadataFilter> </metadataFilters>
