This is an automated email from the ASF dual-hosted git repository.
tallison pushed a change to branch spotless-take3
in repository https://gitbox.apache.org/repos/asf/tika.git
omit 56267549f TIKA-4251 -- add exclusions
omit 4831c2ce3 TIKA-4251 -- fix header
omit 4eb653bd2 TIKA-4251 -- mv comment
omit 17ed91ace TIKA-4251 -- mv comment
omit 1666dd212 TIKA-4251 -- remove comments from imports
omit 9197fc252 TIKA-4251 -- fix
omit 8d5889de9 TIKA-4251 -- fix
omit e6513e242 TIKA-4251 -- update windows builds
omit 1067c9798 TIKA-4251 -- use spotless for imports and license headers
omit 661500f9b Merge branch 'main' into spotless-take3
omit b55cbf211 spotless -- take 3, further refinements
omit f513f273d spotless -- take 3
add 0f7cad307 TIKA-4545 - simplify parsecontext serialization and apply
json configuration throughout (#2418)
add f963fc4ca TIKA-4251 -- use spotless for imports and license headers
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (56267549f)
\
N -- N -- N refs/heads/spotless-take3 (f963fc4ca)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
.../tika/annotation/TikaComponentProcessor.java | 3 +-
.../main/java/org/apache/tika/cli/AsyncHelper.java | 2 +
.../src/main/java/org/apache/tika/cli/TikaCLI.java | 15 +-
.../resources/tika-config-default-single-file.json | 29 ++
.../java/org/apache/tika/cli/AsyncHelperTest.java | 4 +-
.../java/org/apache/tika/cli/TikaCLIAsyncTest.java | 20 +-
.../test/resources/configs/config-template.json | 1 -
tika-core/pom.xml | 4 +
.../java/org/apache/tika/config/ConfigBase.java | 41 +-
.../org/apache/tika/config/ConfigContainer.java | 17 +-
.../org/apache/tika/config/ConfigDeserializer.java | 112 ++++++
.../config/{package-info.java => JsonConfig.java} | 22 +-
.../org/apache/tika/config/ParseContextConfig.java | 161 ++++++++
.../java/org/apache/tika/detect/EmptyDetector.java | 2 +
.../apache/tika/detect/FileCommandDetector.java | 2 +
.../java/org/apache/tika/detect/MagicDetector.java | 2 +
...Detector.java => OverrideEncodingDetector.java} | 52 ++-
.../tika/extractor/RUnpackExtractorFactory.java | 35 +-
.../filter/CaptureGroupMetadataFilter.java | 49 +++
.../ClearByAttachmentTypeMetadataFilter.java | 33 ++
.../metadata/filter/ClearByMimeMetadataFilter.java | 31 ++
.../filter/DateNormalizingMetadataFilter.java | 33 ++
.../filter/ExcludeFieldMetadataFilter.java | 31 ++
.../metadata/filter/FieldNameMappingFilter.java | 35 ++
.../metadata/filter/GeoPointMetadataFilter.java | 33 ++
.../filter/IncludeFieldMetadataFilter.java | 31 ++
.../apache/tika/metadata/filter/NoOpFilter.java | 2 +
.../writefilter/StandardWriteFilterFactory.java | 9 +-
.../main/java/org/apache/tika/mime/MimeTypes.java | 2 +
.../org/apache/tika/parser/AutoDetectParser.java | 32 +-
.../apache/tika/parser/AutoDetectParserConfig.java | 12 +-
.../java/org/apache/tika/parser/ParseContext.java | 20 +-
.../src/test/java/org/apache/tika/TikaTest.java | 6 +-
.../apache/tika/config/ParseContextConfigTest.java | 127 +++++++
.../tika/config/TikaConfigSerializerTest.java | 2 +-
.../tika/metadata/filter/TestMetadataFilter.java | 2 +-
.../org/apache/tika/config/TIKA-1762-executors.xml | 2 +-
.../tika/example/PickBestTextEncodingParser.java | 4 +-
.../org/apache/tika/pipes/grpc/TikaGrpcServer.java | 4 +-
.../apache/tika/pipes/grpc/TikaGrpcServerImpl.java | 6 +-
.../apache/tika/pipes/grpc/TikaGrpcServerTest.java | 4 +-
.../tika/pipes/kafka/tests/TikaPipesKafkaTest.java | 28 +-
.../src/test/resources/kafka/plugins-template.json | 41 +-
.../pipes/opensearch/tests/OpenSearchTest.java | 43 +--
.../resources/opensearch/plugins-template.json | 20 +-
...s-template.json => tika-config-opensearch.json} | 43 ++-
.../opensearch/tika-config-opensearch.xml | 65 ----
.../tika/pipes/s3/tests/S3PipeIntegrationTest.java | 16 +-
.../src/test/resources/s3/plugins-template.json | 1 -
.../src/test/resources/s3/tika-config-s3.json | 52 +++
.../pipes/solr/tests/TikaPipesSolrTestBase.java | 39 +-
.../src/test/resources/solr/plugins-template.json | 41 +-
.../src/test/resources/tika-config-solr-urls.json | 100 +++++
tika-langdetect/tika-langdetect-opennlp/pom.xml | 28 ++
.../tika/langdetect/opennlp/OpenNLPDetector.java | 2 +
.../metadatafilter/OpenNLPMetadataFilter.java | 2 +
tika-langdetect/tika-langdetect-optimaize/pom.xml | 28 ++
.../optimaize/OptimaizeLangDetector.java | 2 +
.../metadatafilter/OptimaizeMetadataFilter.java | 2 +
...rg.apache.tika.language.detect.LanguageDetector | 16 -
.../tika-parser-audiovideo-module/pom.xml | 18 +-
.../java/org/apache/tika/parser/mp3/Mp3Parser.java | 2 +-
.../java/org/apache/tika/parser/mp4/MP4Parser.java | 2 +-
.../tika/parser/html/HtmlEncodingDetector.java | 35 ++
.../org/apache/tika/parser/html/JSoupParser.java | 32 +-
.../org/apache/tika/parser/mail/RFC822Parser.java | 33 +-
.../detect/microsoft/POIFSContainerDetector.java | 34 ++
.../parser/microsoft/AbstractOfficeParser.java | 11 +-
.../apache/tika/parser/microsoft/OfficeParser.java | 13 +
.../tika/parser/microsoft/ooxml/OOXMLParser.java | 14 +
.../tika/parser/odf/FlatOpenDocumentParser.java | 31 ++
.../apache/tika/parser/odf/OpenDocumentParser.java | 31 ++
.../apache/tika/parser/ocr/TesseractOCRConfig.java | 122 +++---
.../apache/tika/parser/ocr/TesseractOCRParser.java | 101 +++--
.../tika/parser/ocr/TesseractOCRConfigTest.java | 29 +-
.../tika/parser/ocr/TesseractOCRParserTest.java | 37 +-
.../org/apache/tika/parser/pdf/AccessChecker.java | 16 +-
.../java/org/apache/tika/parser/pdf/PDFParser.java | 56 ++-
.../apache/tika/parser/pdf/PDFParserConfig.java | 110 ++----
.../pdf/image/ImageGraphicsEngineFactory.java | 20 +
.../tika/renderer/pdf/mutool/MuPDFRenderer.java | 2 +
.../tika/renderer/pdf/pdfbox/PDFBoxRenderer.java | 2 +
.../org/apache/tika/parser/pdf/PDFParserTest.java | 11 +-
.../detect/gzip/GZipSpecializationDetector.java | 2 +-
.../apache/tika/parser/pkg/CompressorParser.java | 32 ++
.../tika/parser/txt/Icu4jEncodingDetector.java | 101 +++--
.../tika/parser/txt/UniversalEncodingDetector.java | 35 ++
.../detect/zip/DefaultZipContainerDetector.java | 19 +
.../tika-parsers-standard-package/pom.xml | 17 -
.../java/org/apache/tika/TikaLoaderHelper.java | 31 +-
.../config/ComponentRegistryIntegrationTest.java | 27 +-
.../tika/config/TikaConfigSerializerTest.java | 31 +-
.../apache/tika/config/TikaDetectorConfigTest.java | 25 +-
.../tika/config/TikaEncodingDetectorTest.java | 70 ++--
.../apache/tika/config/TikaParserConfigTest.java | 26 ++
.../tika/detect/TestContainerAwareDetector.java | 54 +--
.../apache/tika/detect/TestDetectorLoading.java | 4 +-
.../org/apache/tika/detect/TestZipDetector.java | 16 -
.../java/org/apache/tika/mime/TestMimeTypes.java | 8 +-
.../tika/parser/AutoDetectParserConfigTest.java | 67 +---
.../apache/tika/parser/AutoDetectParserTest.java | 23 +-
.../apache/tika/parser/DigestingParserTest.java | 8 +-
.../tika/parser/RecursiveParserWrapperTest.java | 15 +-
.../java/org/apache/tika/parser/TestParsers.java | 6 +-
.../apache/tika/parser/html/HtmlParserTest.java | 50 ++-
.../apache/tika/parser/image/JpegParserTest.java | 18 +-
.../apache/tika/parser/mail/RFC822ParserTest.java | 12 +-
.../tika/parser/ocr/TesseractOCRParserTest.java | 133 ++++++-
.../org/apache/tika/parser/odf/ODFParserTest.java | 13 +-
.../org/apache/tika/parser/pdf/PDFParserTest.java | 91 +++--
.../org/apache/tika/parser/pkg/GzipParserTest.java | 8 +-
.../UpcasingContentHandlerDecoratorFactory.java | 2 +
.../configs/TIKA-1702-detector-exclude.json | 16 +
.../configs/TIKA-1708-detector-default.json | 17 +
...2273-encoding-detector-outside-static-init.json | 17 +
...IKA-2273-exclude-encoding-detector-default.json | 15 +
.../TIKA-2273-no-icu4j-encoding-detector.json | 11 +
...TIKA-2273-non-detecting-params-bad-charset.json | 10 +
.../TIKA-2273-override-detector-params.json | 9 +
.../TIKA-2273-parameterize-encoding-detector.json | 12 +
.../TIKA-2485-encoding-detector-mark-limits.json | 19 +
.../test/resources/configs/TIKA-3137-include.json | 21 ++
.../configs/test-default-with-exclusions.json | 2 +-
.../test/resources/configs/tika-4424-config.json | 12 +
.../src/test/resources/configs/tika-4441-120.json | 29 ++
.../test/resources/configs/tika-4441-12000000.json | 29 ++
.../src/test/resources/configs/tika-4441-neg1.json | 29 ++
.../src/test/resources/configs/tika-4533.json | 13 +
.../configs/tika-config-digests-pdf-only.json | 21 ++
.../tika-config-digests-skip-container.json | 13 +
.../resources/configs/tika-config-digests.json | 12 +
...a-config-doubling-custom-handler-decorator.json | 9 +
.../configs/tika-config-extract-scripts.json | 12 +
.../tika-config-geo-point-metadata-filter.json | 9 +
.../test/resources/configs/tika-config-macros.json | 17 +
.../resources/configs/tika-config-no-names.json | 12 +
.../resources/configs/tika-config-no-names.xml | 29 --
.../resources/configs/tika-config-ocr-for-pdf.json | 18 +
.../tika-config-rfc822-extract-alternatives.json | 12 +
.../configs/tika-config-tesseract-arbitrary.json | 12 +
.../configs/tika-config-tesseract-arbitrary.xml | 30 --
...a-config-upcasing-custom-handler-decorator.json | 54 +++
...ka-config-upcasing-custom-handler-decorator.xml | 27 --
.../resources/configs/tika-config-with-names.json | 11 +
.../resources/configs/tika-config-with-names.xml | 29 --
.../configs/tika-gz-decompress-concatenated.json | 12 +
.../configs/tika-rendering-mupdf-config.json | 17 +
.../configs/tika-rendering-mupdf-config.xml | 25 --
.../configs/tika-xml-profiler-config.json | 10 +
.../tika/config/TIKA-1708-detector-default.xml | 26 --
...TIKA-2273-exclude-encoding-detector-default.xml | 2 +-
.../TIKA-2273-non-detecting-params-bad-charset.xml | 2 +-
.../tika/config/TIKA-2273-non-detecting-params.xml | 2 +-
.../TIKA-2273-parameterize-encoding-detector.xml | 2 +-
.../apache/tika/parser/odf/tika-config-macros.xml | 32 --
.../org/apache/tika/async/cli/PluginsWriter.java | 11 +-
.../apache/tika/async/cli/SimpleAsyncConfig.java | 9 +-
.../org/apache/tika/async/cli/TikaAsyncCLI.java | 36 +-
.../src/main/resources/config-template.json | 25 ++
.../apache/tika/async/cli/AsyncProcessorTest.java | 11 +-
.../tika/async/cli/TikaConfigAsyncWriterTest.java | 6 +-
.../test/resources/configs/TIKA-4508-parsers.json | 27 ++
.../test/resources/configs/TIKA-4508-parsers.xml | 49 ---
.../test/resources/configs/config-template.json | 1 -
.../test/resources/configs/tika-config-broken.json | 7 +
.../test/resources/configs/tika-config-broken.xml | 25 --
.../test/resources/configs/tika-config-default.xml | 21 --
.../org/apache/tika/pipes/core/PipesClient.java | 7 +-
.../org/apache/tika/pipes/core/PipesConfig.java | 193 ++++++++--
.../apache/tika/pipes/core/PipesConfigBase.java | 197 ----------
.../org/apache/tika/pipes/core/PipesServer.java | 35 +-
.../apache/tika/pipes/core/async/AsyncConfig.java | 4 +-
.../tika/pipes/core/async/AsyncProcessor.java | 16 +-
.../core/serialization/JsonFetchEmitTuple.java | 2 +
.../core/serialization/JsonFetchEmitTupleList.java | 2 +
tika-pipes/tika-pipes-integration-tests/pom.xml | 6 +
.../apache/tika/pipes/core/PassbackFilterTest.java | 33 +-
.../apache/tika/pipes/core/PipesClientTest.java | 10 +-
.../apache/tika/pipes/core/PipesServerTest.java | 33 +-
.../apache/tika/pipes/core/PluginsTestHelper.java | 23 +-
.../pipes/core/async/AsyncChaosMonkeyTest.java | 17 +-
.../tika/pipes/core/async/MockDigesterFactory.java | 2 +
.../test/resources/configs/TIKA-4207-emitter.xml | 35 --
...tchers-emitters.json => tika-config-basic.json} | 10 +-
.../test/resources/configs/tika-config-broken.xml | 32 --
...ers-emitters.json => tika-config-passback.json} | 12 +-
...ers-emitters.json => tika-config-truncate.json} | 15 +-
.../org/apache/tika/config/TIKA-3865-params.xml | 29 --
.../org/apache/tika/pipes/core/TIKA-3941.xml | 24 --
.../tika/pipes/core/TIKA-4207-limit-bytes.xml | 28 --
.../org/apache/tika/pipes/core/TIKA-4207.xml | 24 --
.../org/apache/tika/pipes/core/async/TIKA-3507.xml | 27 --
.../org/apache/tika/pipes/core/async/TIKA-3865.xml | 27 --
.../apache/tika/pipes/core/tika-emit-config.xml | 35 --
.../apache/tika/pipes/core/tika-sample-config.xml | 35 --
.../pipesiterator/csv/TestCSVPipesIterator.java | 131 -------
.../tika/pipes/emitter/azblob/AZBlobEmitter.java | 2 +-
.../tika/pipes/fetcher/azblob/AZBlobFetcher.java | 2 +-
.../pipes/iterator/azblob/AZBlobPipesIterator.java | 2 +-
.../tika/pipes/iterator/csv/CSVPipesIterator.java | 2 +-
.../tika/pipes/emitter/fs/FileSystemEmitter.java | 8 +-
.../tika/pipes/fetcher/fs/FileSystemFetcher.java | 9 +-
.../pipes/iterator/fs/FileSystemPipesIterator.java | 2 +-
.../reporter/fs/FileSystemStatusReporter.java | 2 +-
.../apache/tika/pipes/emitter/gcs/GCSEmitter.java | 2 +-
.../apache/tika/pipes/fetcher/gcs/GCSFetcher.java | 2 +-
.../tika/pipes/iterator/gcs/GCSPipesIterator.java | 2 +-
.../tika/pipes/fetcher/http/HttpFetcher.java | 7 +-
.../tika/pipes/emitter/jdbc/JDBCEmitter.java | 2 +-
.../pipes/iterator/jdbc/JDBCPipesIterator.java | 2 +-
.../pipes/reporter/jdbc/JDBCPipesReporter.java | 2 +-
.../pipesiterator/json/JsonPipesIterator.java | 2 +-
.../tika/pipes/emitter/kafka/KafkaEmitter.java | 2 +-
.../pipes/iterator/kafka/KafkaPipesIterator.java | 2 +-
.../microsoftgraph/MicrosoftGraphFetcher.java | 2 +-
.../emitter/opensearch/OpenSearchEmitter.java | 2 +-
.../opensearch/OpenSearchPipesReporter.java | 2 +-
.../apache/tika/pipes/emitter/s3/S3Emitter.java | 2 +-
.../apache/tika/pipes/fetcher/s3/S3Fetcher.java | 2 +-
.../tika/pipes/iterator/s3/S3PipesIterator.java | 2 +-
.../tika/pipes/emitter/solr/SolrEmitter.java | 2 +-
.../pipes/iterator/solr/SolrPipesIterator.java | 2 +-
.../org/apache/tika/plugins/ExtensionConfig.java | 6 +-
.../java/org/apache/tika/plugins/TikaConfigs.java | 3 +-
.../tika/plugins/PluginComponentLoaderTest.java | 4 +-
.../org/apache/tika/config/GlobalSettings.java | 175 +++++++++
.../tika/config/loader/ComponentInstance.java | 67 ----
.../tika/config/loader/ComponentRegistry.java | 33 ++
.../config/loader/CompositeComponentLoader.java | 59 ++-
.../apache/tika/config/loader/ConfigLoader.java | 69 ++--
.../apache/tika/config/loader/DetectorLoader.java | 263 +++++++++++++
.../tika/config/loader/EncodingDetectorLoader.java | 252 +++++++++++++
.../apache/tika/config/loader/FrameworkConfig.java | 16 +-
.../apache/tika/config/loader/ParserLoader.java | 75 +++-
.../loader/PolymorphicObjectMapperFactory.java | 155 ++++++++
.../apache/tika/config/loader/TikaJsonConfig.java | 43 +--
.../org/apache/tika/config/loader/TikaLoader.java | 218 +++++++++--
.../tika/serialization/ConfigDeserializer.java | 134 +++++++
.../apache/tika/serialization/JsonMetadata.java | 6 +-
.../tika/serialization/JsonMetadataList.java | 8 +-
.../serialization/ParseContextDeserializer.java | 72 ++--
.../tika/serialization/ParseContextSerializer.java | 64 +++-
.../tika/serialization/TikaJsonDeserializer.java | 412 ---------------------
.../tika/serialization/TikaJsonSerializer.java | 271 --------------
.../tika/config/loader/ConfigLoaderTest.java | 4 +-
.../tika/config/loader/ConfigurableTestParser.java | 5 +-
.../tika/config/loader/FallbackTestParser.java | 5 +-
.../tika/config/loader/FrameworkConfigTest.java | 4 +-
.../tika/serialization/ConfigDeserializerTest.java | 305 +++++++++++++++
.../CustomClassSerializationTest.java | 161 ++++++++
.../tika/serialization/JsonMetadataListTest.java | 9 +-
.../tika/serialization/JsonMetadataTest.java | 9 +-
.../TestParseContextSerialization.java | 228 +++++++++++-
.../serialization/TikaJsonSerializationTest.java | 49 ---
.../apache/tika/serialization/mocks/ClassA.java | 156 --------
.../apache/tika/serialization/mocks/ClassB.java | 96 -----
.../apache/tika/serialization/mocks/ClassC.java | 50 ---
.../test/resources/configs/tika-config-json.json | 3 +
.../test/resources/configs/tika-config-json.xml | 20 -
tika-server/tika-server-core/pom.xml | 4 +
.../apache/tika/server/core/TikaServerConfig.java | 49 +--
.../apache/tika/server/core/TikaServerProcess.java | 44 +--
.../tika/server/core/resource/AsyncResource.java | 6 +-
.../server/core/resource/DetectorResource.java | 7 +-
.../server/core/resource/MetadataResource.java | 4 +-
.../tika/server/core/resource/PipesResource.java | 8 +-
.../core/resource/RecursiveMetadataResource.java | 8 +-
.../tika/server/core/resource/TikaDetectors.java | 19 +-
.../tika/server/core/resource/TikaMimeTypes.java | 25 +-
.../tika/server/core/resource/TikaParsers.java | 31 +-
.../tika/server/core/resource/TikaResource.java | 69 ++--
.../tika/server/core/resource/TikaVersion.java | 2 +-
.../tika/server/core/resource/TikaWelcome.java | 2 +-
.../server/core/resource/TranslateResource.java | 7 +-
.../server/core/resource/UnpackerResource.java | 5 +-
.../org/apache/tika/server/core/CXFTestBase.java | 80 ++--
.../org/apache/tika/server/core/TikaPipesTest.java | 25 +-
.../tika/server/core/TikaResourceFetcherTest.java | 2 +-
.../core/TikaResourceMetadataFilterTest.java | 2 +-
.../core/TikaServerAsyncIntegrationTest.java | 21 +-
.../tika/server/core/TikaServerConfigTest.java | 26 +-
.../server/core/TikaServerIntegrationTest.java | 32 +-
.../core/TikaServerPipesIntegrationTest.java | 32 +-
.../tika/server/core/TranslateResourceTest.java | 2 +
.../resources/configs/cxf-test-base-template.json | 57 +++
.../resources/configs/metadata-filter-include.json | 13 +
.../resources/configs/metadata-filter-include.xml | 28 --
.../configs/tika-config-server-badjvmargs.xml | 27 --
.../configs/tika-config-server-basic.json | 12 +
.../resources/configs/tika-config-server-basic.xml | 29 --
.../configs/tika-config-server-emitter.json | 13 +
.../configs/tika-config-server-emitter.xml | 30 --
.../tika-config-server-fetcher-template.json | 11 +
.../tika-config-server-fetcher-template.xml | 28 --
...n => tika-config-server-fetchers-emitters.json} | 9 +
.../tika-config-server-fetchers-emitters.xml | 28 --
.../configs/tika-config-server-timeout-10000.xml | 24 --
.../configs/tika-config-server-timeout-5000.json | 7 +
.../tika-config-server-tls-one-way-template.json | 19 +
.../tika-config-server-tls-one-way-template.xml | 36 --
.../tika-config-server-tls-two-way-template.json | 22 ++
.../tika-config-server-tls-two-way-template.xml | 39 --
.../resources/configs/tika-config-server-tls.json | 38 ++
.../resources/configs/tika-config-server-tls.xml | 38 --
...a-pipes-config.json => tika-config-server.json} | 10 +
.../test/resources/configs/tika-config-server.xml | 29 --
.../standard/config/TesseractServerConfig.java | 4 +
.../apache/tika/server/standard/FetcherTest.java | 2 +-
.../server/standard/JsonMaxFieldLengthTest.java | 2 +-
.../tika/server/standard/MetadataResourceTest.java | 1 +
.../server/standard/OpenNLPMetadataFilterTest.java | 2 +-
.../standard/OptimaizeMetadataFilterTest.java | 4 +-
.../standard/RecursiveMetadataFilterTest.java | 2 +-
.../standard/RecursiveMetadataResourceTest.java | 7 +-
.../tika/server/standard/TikaParsersTest.java | 71 ++--
.../apache/tika/server/standard/TikaPipesTest.java | 31 +-
.../tika/server/standard/TikaResourceTest.java | 4 +-
.../standard/UnpackerResourceWithConfigTest.java | 4 +-
.../test/resources/config/TIKA-3137-include.xml | 38 --
.../config/tika-config-for-server-tests.xml | 29 --
.../src/test/resources/config/tika-config-json.xml | 20 -
.../tika-config-langdetect-opennlp-filter.xml | 32 --
.../tika-config-langdetect-optimaize-filter.xml | 32 --
.../test/resources/config/tika-config-unpacker.xml | 32 --
.../test/resources/configs/TIKA-3137-include.json | 21 ++
.../resources/configs/cxf-test-base-template.json | 57 +++
.../configs/tika-config-for-server-tests.json | 22 ++
.../test/resources/configs/tika-config-json.json | 3 +
.../tika-config-langdetect-opennlp-filter.json | 27 ++
.../tika-config-langdetect-optimaize-filter.json | 27 ++
.../resources/configs/tika-config-unpacker.json | 17 +
.../tika-config-url-fetcher.xml | 0
332 files changed, 6148 insertions(+), 4280 deletions(-)
create mode 100644
tika-app/src/main/resources/tika-config-default-single-file.json
create mode 100644
tika-core/src/main/java/org/apache/tika/config/ConfigDeserializer.java
copy tika-core/src/main/java/org/apache/tika/config/{package-info.java =>
JsonConfig.java} (64%)
create mode 100644
tika-core/src/main/java/org/apache/tika/config/ParseContextConfig.java
rename
tika-core/src/main/java/org/apache/tika/detect/{NonDetectingEncodingDetector.java
=> OverrideEncodingDetector.java} (53%)
create mode 100644
tika-core/src/test/java/org/apache/tika/config/ParseContextConfigTest.java
copy
tika-integration-tests/tika-pipes-opensearch-integration-tests/src/test/resources/opensearch/{plugins-template.json
=> tika-config-opensearch.json} (69%)
delete mode 100644
tika-integration-tests/tika-pipes-opensearch-integration-tests/src/test/resources/opensearch/tika-config-opensearch.xml
create mode 100644
tika-integration-tests/tika-pipes-s3-integration-tests/src/test/resources/s3/tika-config-s3.json
create mode 100644
tika-integration-tests/tika-pipes-solr-integration-tests/src/test/resources/tika-config-solr-urls.json
delete mode 100644
tika-langdetect/tika-langdetect-optimaize/src/main/resources/META-INF/services/org.apache.tika.language.detect.LanguageDetector
copy
tika-server/tika-server-client/src/main/java/org/apache/tika/server/client/TikaAsyncHttpClient.java
=>
tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/TikaLoaderHelper.java
(59%)
create mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/resources/configs/TIKA-1702-detector-exclude.json
create mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/resources/configs/TIKA-1708-detector-default.json
create mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/resources/configs/TIKA-2273-encoding-detector-outside-static-init.json
create mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/resources/configs/TIKA-2273-exclude-encoding-detector-default.json
create mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/resources/configs/TIKA-2273-no-icu4j-encoding-detector.json
create mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/resources/configs/TIKA-2273-non-detecting-params-bad-charset.json
create mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/resources/configs/TIKA-2273-override-detector-params.json
create mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/resources/configs/TIKA-2273-parameterize-encoding-detector.json
create mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/resources/configs/TIKA-2485-encoding-detector-mark-limits.json
create mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/resources/configs/TIKA-3137-include.json
create mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/resources/configs/tika-4424-config.json
create mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/resources/configs/tika-4441-120.json
create mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/resources/configs/tika-4441-12000000.json
create mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/resources/configs/tika-4441-neg1.json
create mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/resources/configs/tika-4533.json
create mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/resources/configs/tika-config-digests-pdf-only.json
create mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/resources/configs/tika-config-digests-skip-container.json
create mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/resources/configs/tika-config-digests.json
create mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/resources/configs/tika-config-doubling-custom-handler-decorator.json
create mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/resources/configs/tika-config-extract-scripts.json
create mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/resources/configs/tika-config-geo-point-metadata-filter.json
create mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/resources/configs/tika-config-macros.json
create mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/resources/configs/tika-config-no-names.json
delete mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/resources/configs/tika-config-no-names.xml
create mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/resources/configs/tika-config-ocr-for-pdf.json
create mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/resources/configs/tika-config-rfc822-extract-alternatives.json
create mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/resources/configs/tika-config-tesseract-arbitrary.json
delete mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/resources/configs/tika-config-tesseract-arbitrary.xml
create mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/resources/configs/tika-config-upcasing-custom-handler-decorator.json
delete mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/resources/configs/tika-config-upcasing-custom-handler-decorator.xml
create mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/resources/configs/tika-config-with-names.json
delete mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/resources/configs/tika-config-with-names.xml
create mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/resources/configs/tika-gz-decompress-concatenated.json
create mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/resources/configs/tika-rendering-mupdf-config.json
delete mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/resources/configs/tika-rendering-mupdf-config.xml
create mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/resources/configs/tika-xml-profiler-config.json
delete mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/resources/org/apache/tika/config/TIKA-1708-detector-default.xml
delete mode 100644
tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/resources/org/apache/tika/parser/odf/tika-config-macros.xml
create mode 100644
tika-pipes/tika-async-cli/src/test/resources/configs/TIKA-4508-parsers.json
delete mode 100644
tika-pipes/tika-async-cli/src/test/resources/configs/TIKA-4508-parsers.xml
create mode 100644
tika-pipes/tika-async-cli/src/test/resources/configs/tika-config-broken.json
delete mode 100644
tika-pipes/tika-async-cli/src/test/resources/configs/tika-config-broken.xml
delete mode 100644
tika-pipes/tika-async-cli/src/test/resources/configs/tika-config-default.xml
delete mode 100644
tika-pipes/tika-pipes-core/src/main/java/org/apache/tika/pipes/core/PipesConfigBase.java
delete mode 100644
tika-pipes/tika-pipes-integration-tests/src/test/resources/configs/TIKA-4207-emitter.xml
copy
tika-pipes/tika-pipes-integration-tests/src/test/resources/configs/{fetchers-emitters.json
=> tika-config-basic.json} (81%)
delete mode 100644
tika-pipes/tika-pipes-integration-tests/src/test/resources/configs/tika-config-broken.xml
copy
tika-pipes/tika-pipes-integration-tests/src/test/resources/configs/{fetchers-emitters.json
=> tika-config-passback.json} (79%)
rename
tika-pipes/tika-pipes-integration-tests/src/test/resources/configs/{fetchers-emitters.json
=> tika-config-truncate.json} (71%)
delete mode 100644
tika-pipes/tika-pipes-integration-tests/src/test/resources/org/apache/tika/config/TIKA-3865-params.xml
delete mode 100644
tika-pipes/tika-pipes-integration-tests/src/test/resources/org/apache/tika/pipes/core/TIKA-3941.xml
delete mode 100644
tika-pipes/tika-pipes-integration-tests/src/test/resources/org/apache/tika/pipes/core/TIKA-4207-limit-bytes.xml
delete mode 100644
tika-pipes/tika-pipes-integration-tests/src/test/resources/org/apache/tika/pipes/core/TIKA-4207.xml
delete mode 100644
tika-pipes/tika-pipes-integration-tests/src/test/resources/org/apache/tika/pipes/core/async/TIKA-3507.xml
delete mode 100644
tika-pipes/tika-pipes-integration-tests/src/test/resources/org/apache/tika/pipes/core/async/TIKA-3865.xml
delete mode 100644
tika-pipes/tika-pipes-integration-tests/src/test/resources/org/apache/tika/pipes/core/tika-emit-config.xml
delete mode 100644
tika-pipes/tika-pipes-integration-tests/src/test/resources/org/apache/tika/pipes/core/tika-sample-config.xml
delete mode 100644
tika-pipes/tika-pipes-iterators/tika-pipes-iterator-csv/src/test/java/org/apache/tika/pipes/pipesiterator/csv/TestCSVPipesIterator.java
create mode 100644
tika-serialization/src/main/java/org/apache/tika/config/GlobalSettings.java
delete mode 100644
tika-serialization/src/main/java/org/apache/tika/config/loader/ComponentInstance.java
create mode 100644
tika-serialization/src/main/java/org/apache/tika/config/loader/DetectorLoader.java
create mode 100644
tika-serialization/src/main/java/org/apache/tika/config/loader/EncodingDetectorLoader.java
create mode 100644
tika-serialization/src/main/java/org/apache/tika/config/loader/PolymorphicObjectMapperFactory.java
create mode 100644
tika-serialization/src/main/java/org/apache/tika/serialization/ConfigDeserializer.java
delete mode 100644
tika-serialization/src/main/java/org/apache/tika/serialization/TikaJsonDeserializer.java
delete mode 100644
tika-serialization/src/main/java/org/apache/tika/serialization/TikaJsonSerializer.java
create mode 100644
tika-serialization/src/test/java/org/apache/tika/serialization/ConfigDeserializerTest.java
create mode 100644
tika-serialization/src/test/java/org/apache/tika/serialization/CustomClassSerializationTest.java
delete mode 100644
tika-serialization/src/test/java/org/apache/tika/serialization/TikaJsonSerializationTest.java
delete mode 100644
tika-serialization/src/test/java/org/apache/tika/serialization/mocks/ClassA.java
delete mode 100644
tika-serialization/src/test/java/org/apache/tika/serialization/mocks/ClassB.java
delete mode 100644
tika-serialization/src/test/java/org/apache/tika/serialization/mocks/ClassC.java
create mode 100644
tika-serialization/src/test/resources/configs/tika-config-json.json
delete mode 100644
tika-serialization/src/test/resources/configs/tika-config-json.xml
create mode 100644
tika-server/tika-server-core/src/test/resources/configs/cxf-test-base-template.json
create mode 100644
tika-server/tika-server-core/src/test/resources/configs/metadata-filter-include.json
delete mode 100644
tika-server/tika-server-core/src/test/resources/configs/metadata-filter-include.xml
delete mode 100644
tika-server/tika-server-core/src/test/resources/configs/tika-config-server-badjvmargs.xml
create mode 100644
tika-server/tika-server-core/src/test/resources/configs/tika-config-server-basic.json
delete mode 100644
tika-server/tika-server-core/src/test/resources/configs/tika-config-server-basic.xml
create mode 100644
tika-server/tika-server-core/src/test/resources/configs/tika-config-server-emitter.json
delete mode 100644
tika-server/tika-server-core/src/test/resources/configs/tika-config-server-emitter.xml
create mode 100644
tika-server/tika-server-core/src/test/resources/configs/tika-config-server-fetcher-template.json
delete mode 100644
tika-server/tika-server-core/src/test/resources/configs/tika-config-server-fetcher-template.xml
copy
tika-server/tika-server-core/src/test/resources/configs/{tika-pipes-config.json
=> tika-config-server-fetchers-emitters.json} (66%)
delete mode 100644
tika-server/tika-server-core/src/test/resources/configs/tika-config-server-fetchers-emitters.xml
delete mode 100644
tika-server/tika-server-core/src/test/resources/configs/tika-config-server-timeout-10000.xml
create mode 100644
tika-server/tika-server-core/src/test/resources/configs/tika-config-server-timeout-5000.json
create mode 100644
tika-server/tika-server-core/src/test/resources/configs/tika-config-server-tls-one-way-template.json
delete mode 100644
tika-server/tika-server-core/src/test/resources/configs/tika-config-server-tls-one-way-template.xml
create mode 100644
tika-server/tika-server-core/src/test/resources/configs/tika-config-server-tls-two-way-template.json
delete mode 100644
tika-server/tika-server-core/src/test/resources/configs/tika-config-server-tls-two-way-template.xml
create mode 100644
tika-server/tika-server-core/src/test/resources/configs/tika-config-server-tls.json
delete mode 100644
tika-server/tika-server-core/src/test/resources/configs/tika-config-server-tls.xml
copy
tika-server/tika-server-core/src/test/resources/configs/{tika-pipes-config.json
=> tika-config-server.json} (62%)
delete mode 100644
tika-server/tika-server-core/src/test/resources/configs/tika-config-server.xml
delete mode 100644
tika-server/tika-server-standard/src/test/resources/config/TIKA-3137-include.xml
delete mode 100644
tika-server/tika-server-standard/src/test/resources/config/tika-config-for-server-tests.xml
delete mode 100644
tika-server/tika-server-standard/src/test/resources/config/tika-config-json.xml
delete mode 100644
tika-server/tika-server-standard/src/test/resources/config/tika-config-langdetect-opennlp-filter.xml
delete mode 100644
tika-server/tika-server-standard/src/test/resources/config/tika-config-langdetect-optimaize-filter.xml
delete mode 100644
tika-server/tika-server-standard/src/test/resources/config/tika-config-unpacker.xml
create mode 100644
tika-server/tika-server-standard/src/test/resources/configs/TIKA-3137-include.json
create mode 100644
tika-server/tika-server-standard/src/test/resources/configs/cxf-test-base-template.json
create mode 100644
tika-server/tika-server-standard/src/test/resources/configs/tika-config-for-server-tests.json
create mode 100644
tika-server/tika-server-standard/src/test/resources/configs/tika-config-json.json
create mode 100644
tika-server/tika-server-standard/src/test/resources/configs/tika-config-langdetect-opennlp-filter.json
create mode 100644
tika-server/tika-server-standard/src/test/resources/configs/tika-config-langdetect-optimaize-filter.json
create mode 100644
tika-server/tika-server-standard/src/test/resources/configs/tika-config-unpacker.json
rename tika-server/tika-server-standard/src/test/resources/{config =>
configs}/tika-config-url-fetcher.xml (100%)
