Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
26bde10
Introduce ExtractionBackend interface
janhoy Sep 19, 2025
57d8d4e
Move some tika tests to new test file
janhoy Sep 19, 2025
dc151c5
ExtractingRequestHandler and ExtractingDocumentLoader not depend on T…
janhoy Sep 19, 2025
5a19251
Use a factory to create the backend to keep it DRY
janhoy Sep 19, 2025
35fef11
Add TikaServerExtractionBackend
janhoy Sep 19, 2025
196dcdc
Change testing to use TestContainers
janhoy Sep 19, 2025
11ea400
Draft docs
janhoy Sep 19, 2025
a3794ce
Use json response from Tika
janhoy Sep 19, 2025
cf97169
Allow testcontainers to read config
janhoy Sep 20, 2025
87cb45c
Disable JSM
epugh Sep 22, 2025
7ebed82
IntelliJ prompted me.. and I couldn't resist.
epugh Sep 22, 2025
f25631d
lint
epugh Sep 22, 2025
5aa381f
Split test in two sub classes
janhoy Sep 23, 2025
ef7850d
Some error handling
janhoy Sep 23, 2025
f297514
Properly skip test if Docker not available
janhoy Sep 23, 2025
b1840ee
Fix precommit
janhoy Sep 23, 2025
6ec9dda
Review feedback. ID -> NAME
janhoy Sep 23, 2025
902355d
Review feedback. Simplify metadata add code
janhoy Sep 23, 2025
1cfcce9
Error handling for factory
janhoy Sep 23, 2025
b769c06
More documentation
janhoy Sep 23, 2025
83296a9
* Refactor some logic back to ExtractingDocumentLoader
janhoy Sep 25, 2025
14b556b
Fix forbiddenAPI
janhoy Sep 25, 2025
45e7e41
better back-compat metadata logic
janhoy Sep 25, 2025
5ba9391
More tests pass
janhoy Sep 25, 2025
dbca234
Fix test testLiteralsOverride
janhoy Sep 25, 2025
e6ee706
Rewrite tests to use h1 instead of div
janhoy Sep 26, 2025
5863118
Add support for recursive parsing in TikaServer impl ("recursive=true…
janhoy Sep 26, 2025
d5fef5e
Attempt of a github workflow to run the extraction tests
janhoy Sep 26, 2025
413bcfd
Merge branch 'main' into refactor-extraction-handler-clone
janhoy Sep 26, 2025
488b6bc
Undeprecate handler, deprecate local backend
janhoy Sep 26, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions .github/workflows/gradle-extraction-check.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Gradle Extraction Check

on:
pull_request:
branches:
- '*'

jobs:
test:
name: gradle extraction test

runs-on: ubuntu-latest
timeout-minutes: 15

env:
DEVELOCITY_ACCESS_KEY: ${{ secrets.SOLR_DEVELOCITY_ACCESS_KEY }}

steps:
- name: Checkout code
uses: actions/checkout@v5

- uses: ./.github/actions/prepare-for-build

- name: Run extraction module tests
run: ./gradlew --no-daemon solr:modules:extraction:check
2 changes: 2 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@ squareup-okhttp3-okhttp = "4.12.0"
stephenc-jcip = "1.0-1"
swagger3 = "2.2.22"
tdunning-tdigest = "3.3"
testcontainers = "1.20.4"
thetaphi-forbiddenapis = "3.9"
thisptr-jacksonjq = "0.0.13"
threeten-bp = "1.6.8"
Expand Down Expand Up @@ -512,6 +513,7 @@ stephenc-jcip-annotations = { module = "com.github.stephenc.jcip:jcip-annotation
swagger3-annotations-jakarta = { module = "io.swagger.core.v3:swagger-annotations-jakarta", version.ref = "swagger3" }
swagger3-jaxrs2-jakarta = { module = "io.swagger.core.v3:swagger-jaxrs2-jakarta", version.ref = "swagger3" }
tdunning-tdigest = { module = "com.tdunning:t-digest", version.ref = "tdunning-tdigest" }
testcontainers = { module = "org.testcontainers:testcontainers", version.ref = "testcontainers" }
thisptr-jacksonjq = { module = "net.thisptr:jackson-jq", version.ref = "thisptr-jacksonjq" }
threeten-bp = { module = "org.threeten:threetenbp", version.ref = "threeten-bp" }
xerces-impl = { module = "xerces:xercesImpl", version.ref = "xerces" }
Expand Down
9 changes: 6 additions & 3 deletions gradle/testing/randomization/policies/solr-tests.policy
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ grant {
permission java.io.FilePermission "${java.io.tmpdir}", "read,write";
permission java.io.FilePermission "${java.io.tmpdir}${/}-", "read,write,delete";

// Allow Testcontainers to read user-level configuration
permission java.io.FilePermission "${user.home}${/}.testcontainers.properties", "read";

permission java.io.FilePermission "${tests.linedocsfile}", "read";
// DirectoryFactoryTest messes with these (wtf?)
permission java.io.FilePermission "/tmp/inst1/conf/solrcore.properties", "read";
Expand Down Expand Up @@ -130,11 +133,11 @@ grant {
permission javax.management.MBeanServerPermission "findMBeanServer";
permission javax.management.MBeanServerPermission "releaseMBeanServer";
permission javax.management.MBeanTrustPermission "register";

// needed by crossdc
permission javax.security.auth.AuthPermission "getLoginConfiguration";
permission javax.security.auth.AuthPermission "setLoginConfiguration";

// needed by benchmark
permission java.security.SecurityPermission "insertProvider";

Expand Down Expand Up @@ -206,7 +209,7 @@ grant {

// additional permissions based on system properties set by /bin/solr
// NOTE: if the property is not set, the permission entry is ignored.
grant {
grant {
permission java.io.FilePermission "${solr.jetty.keystore}", "read,write,delete,readlink";
permission java.io.FilePermission "${solr.jetty.keystore}${/}-", "read,write,delete,readlink";

Expand Down
176 changes: 176 additions & 0 deletions solr/licenses/docker-java-LICENSE-ASL.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,176 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS
7 changes: 7 additions & 0 deletions solr/licenses/docker-java-NOTICE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
This product includes software developed by the docker-java project.

Copyright (c) 2013-2025, docker-java project contributors

Project: https://github.com/docker-java/docker-java

Licensed under the Apache License, Version 2.0.
1 change: 1 addition & 0 deletions solr/licenses/docker-java-api-3.4.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9ef23dcc93693f15e69b64632be096c38e31bc44
1 change: 1 addition & 0 deletions solr/licenses/docker-java-transport-3.4.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c058705684d782effc4b2edfdef1a87544ba4af8
1 change: 1 addition & 0 deletions solr/licenses/docker-java-transport-zerodep-3.4.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c4ce6d8695cfdb0027872f99cc20f8f679f8a969
1 change: 1 addition & 0 deletions solr/licenses/duct-tape-1.0.8.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
92edc22a9ab2f3e17c9bf700aaee377d50e8b530
19 changes: 19 additions & 0 deletions solr/licenses/duct-tape-LICENSE-MIT.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
MIT License

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
1 change: 1 addition & 0 deletions solr/licenses/jna-5.13.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1200e7ebeedbe0d10062093f32925a912020e747
1 change: 1 addition & 0 deletions solr/licenses/testcontainers-1.20.4.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ee2fe3afc9fa6cb2e6a43233998f3633f761692f
19 changes: 19 additions & 0 deletions solr/licenses/testcontainers-LICENSE-MIT.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
MIT License

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
10 changes: 7 additions & 3 deletions solr/modules/extraction/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ apply plugin: 'java-library'

description = 'Solr Integration with Tika for extracting content from binary file formats such as Microsoft Word and Adobe PDF'

ext {
// Disable security manager for extraction module tests
useSecurityManager = false
}

dependencies {
implementation platform(project(':platform'))
implementation project(':solr:core')
Expand All @@ -35,11 +40,10 @@ dependencies {
exclude group: 'org.quartz-scheduler', module: 'quartz'
exclude group: 'xml-apis', module: 'xml-apis'
})
implementation (libs.xerces.impl, {
exclude group: 'xml-apis', module: 'xml-apis'
})

testImplementation project(':solr:test-framework')
testImplementation libs.apache.lucene.testframework
testImplementation libs.junit.junit
testImplementation libs.testcontainers
testImplementation libs.carrotsearch.randomizedtesting.runner
}
Loading
Loading