You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ta...@apache.org on 2023/09/14 16:59:39 UTC
[tika] branch TIKA-3948 updated: TIKA-3948 -- checkstyle fixes and a couple more updates -- server tests are a disaster, but this builds with -DskipTests ... LOL
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch TIKA-3948
in repository https://gitbox.apache.org/repos/asf/tika.git
The following commit(s) were added to refs/heads/TIKA-3948 by this push:
new 0fa578e9a TIKA-3948 -- checkstyle fixes and a couple more updates -- server tests are a disaster, but this builds with -DskipTests ... LOL
0fa578e9a is described below
commit 0fa578e9a56411b8517767187a158f5a48499f23
Author: tallison <ta...@apache.org>
AuthorDate: Thu Sep 14 12:59:21 2023 -0400
TIKA-3948 -- checkstyle fixes and a couple more updates -- server tests are a disaster, but this builds with -DskipTests ... LOL
---
.../langdetect/lingo24/Lingo24LangDetector.java | 6 +-
.../tika/langdetect/mitll/TextLangDetector.java | 2 +-
tika-parent/pom.xml | 29 +++--
.../tf/TensorflowRESTVideoRecogniser.java | 2 +-
.../server/core/CompositeParseContextConfig.java | 6 +-
.../server/core/DefaultInputStreamFactory.java | 1 +
.../tika/server/core/FetcherStreamFactory.java | 42 +++----
.../tika/server/core/InputStreamFactory.java | 6 +-
.../server/core/ProduceTypeResourceComparator.java | 78 ++++++------
.../tika/server/core/ServerStatusWatcher.java | 13 +-
.../apache/tika/server/core/TikaLoggingFilter.java | 2 +-
.../org/apache/tika/server/core/TikaServerCli.java | 7 +-
.../apache/tika/server/core/TikaServerConfig.java | 128 ++++++++++----------
.../core/TikaServerParseExceptionMapper.java | 1 +
.../apache/tika/server/core/TikaServerProcess.java | 126 +++++++++-----------
.../tika/server/core/TikaServerWatchDog.java | 62 +++++-----
.../org/apache/tika/server/core/TlsConfig.java | 15 ++-
.../server/core/config/DocumentSelectorConfig.java | 1 -
.../server/core/config/PasswordProviderConfig.java | 1 -
.../tika/server/core/resource/AsyncResource.java | 5 +-
.../server/core/resource/DetectorResource.java | 6 +-
.../server/core/resource/LanguageResource.java | 2 +-
.../server/core/resource/MetadataResource.java | 14 +--
.../tika/server/core/resource/PipesResource.java | 16 +--
.../core/resource/RecursiveMetadataResource.java | 41 +++----
.../tika/server/core/resource/TikaDetectors.java | 6 +-
.../tika/server/core/resource/TikaMimeTypes.java | 8 +-
.../tika/server/core/resource/TikaParsers.java | 8 +-
.../tika/server/core/resource/TikaResource.java | 132 ++++++++++-----------
.../server/core/resource/TikaServerStatus.java | 1 +
.../tika/server/core/resource/TikaWelcome.java | 5 +-
.../server/core/resource/TranslateResource.java | 4 +-
.../server/core/resource/UnpackerResource.java | 42 +++----
.../server/core/writer/CSVMessageBodyWriter.java | 2 +-
.../server/core/writer/JSONMessageBodyWriter.java | 4 +-
.../tika/server/core/writer/JSONObjWriter.java | 4 +-
.../core/writer/MetadataListMessageBodyWriter.java | 1 +
.../apache/tika/server/core/writer/TarWriter.java | 2 +-
.../server/core/writer/TextMessageBodyWriter.java | 1 +
.../apache/tika/server/core/writer/ZipWriter.java | 2 +-
.../tika/server/core/IntegrationTestBase.java | 4 +-
.../tika/server/core/LanguageResourceTest.java | 2 +-
.../server/core/RecursiveMetadataResourceTest.java | 2 +-
.../apache/tika/server/core/StackTraceOffTest.java | 2 +-
.../apache/tika/server/core/StackTraceTest.java | 2 +-
.../apache/tika/server/core/TikaMimeTypesTest.java | 2 +-
.../org/apache/tika/server/core/TikaPipesTest.java | 2 +-
.../tika/server/core/TikaResourceFetcherTest.java | 2 +-
.../core/TikaResourceMetadataFilterTest.java | 2 +-
.../tika/server/core/TikaResourceNoStackTest.java | 2 +-
.../apache/tika/server/core/TikaResourceTest.java | 2 +-
.../core/TikaServerAsyncIntegrationTest.java | 2 +-
.../server/core/TikaServerIntegrationTest.java | 4 +-
.../core/TikaServerPipesIntegrationTest.java | 4 +-
.../tika/server/core/TikaServerStatusTest.java | 2 +-
.../apache/tika/server/core/TikaVersionTest.java | 2 +-
.../apache/tika/server/core/TikaWelcomeTest.java | 2 +-
.../tika/server/core/TranslateResourceTest.java | 2 +-
.../apache/tika/server/eval/TikaEvalResource.java | 6 +-
.../tika/server/eval/TikaEvalResourceTest.java | 2 +-
tika-server/tika-server-standard/pom.xml | 2 +-
.../server/standard/config/PDFServerConfig.java | 2 +-
.../standard/config/TesseractServerConfig.java | 2 +-
.../standard/resource/XMPMetadataResource.java | 14 +--
.../standard/writer/XMPMessageBodyWriter.java | 1 +
.../tika/server/standard/DetectorResourceTest.java | 2 +-
.../apache/tika/server/standard/FetcherTest.java | 2 +-
.../tika/server/standard/MetadataResourceTest.java | 23 ++--
.../server/standard/OpenNLPMetadataFilterTest.java | 5 +-
.../standard/OptimaizeMetadataFilterTest.java | 5 +-
.../standard/RecursiveMetadataFilterTest.java | 2 +-
.../standard/RecursiveMetadataResourceTest.java | 16 +--
.../tika/server/standard/TikaDetectorsTest.java | 6 +-
.../tika/server/standard/TikaMimeTypesTest.java | 9 +-
.../tika/server/standard/TikaParsersTest.java | 6 +-
.../apache/tika/server/standard/TikaPipesTest.java | 40 +++----
.../tika/server/standard/TikaResourceTest.java | 28 +++--
.../tika/server/standard/UnpackerResourceTest.java | 8 +-
.../standard/UnpackerResourceWithConfigTest.java | 14 +--
tika-translate/pom.xml | 32 +----
.../language/translate/impl/GoogleTranslator.java | 4 +-
.../translate/impl/JoshuaNetworkTranslator.java | 6 +-
.../language/translate/impl/Lingo24Translator.java | 4 +-
.../language/translate/impl/RTGTranslator.java | 8 +-
.../language/translate/impl/YandexTranslator.java | 4 +-
85 files changed, 539 insertions(+), 590 deletions(-)
diff --git a/tika-langdetect/tika-langdetect-lingo24/src/main/java/org/apache/tika/langdetect/lingo24/Lingo24LangDetector.java b/tika-langdetect/tika-langdetect-lingo24/src/main/java/org/apache/tika/langdetect/lingo24/Lingo24LangDetector.java
index 17c816521..1fc32e35d 100644
--- a/tika-langdetect/tika-langdetect-lingo24/src/main/java/org/apache/tika/langdetect/lingo24/Lingo24LangDetector.java
+++ b/tika-langdetect/tika-langdetect-lingo24/src/main/java/org/apache/tika/langdetect/lingo24/Lingo24LangDetector.java
@@ -24,13 +24,13 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
-import jakarta.ws.rs.core.Form;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.Response;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.ws.rs.core.Form;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
import org.apache.cxf.jaxrs.client.WebClient;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/tika-langdetect/tika-langdetect-mitll-text/src/main/java/org/apache/tika/langdetect/mitll/TextLangDetector.java b/tika-langdetect/tika-langdetect-mitll-text/src/main/java/org/apache/tika/langdetect/mitll/TextLangDetector.java
index eebde7e4c..4d84fab2b 100644
--- a/tika-langdetect/tika-langdetect-mitll-text/src/main/java/org/apache/tika/langdetect/mitll/TextLangDetector.java
+++ b/tika-langdetect/tika-langdetect-mitll-text/src/main/java/org/apache/tika/langdetect/mitll/TextLangDetector.java
@@ -23,10 +23,10 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import jakarta.ws.rs.core.Response;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.ws.rs.core.Response;
import org.apache.cxf.jaxrs.client.WebClient;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml
index 3ea54e593..efb1c1f75 100644
--- a/tika-parent/pom.xml
+++ b/tika-parent/pom.xml
@@ -325,8 +325,7 @@
<commons.net.version>3.9.0</commons.net.version>
<commons.fileupload.version>1.5</commons.fileupload.version>
<ctakes.version>4.0.0.1</ctakes.version>
- <!-- can't update to 3.6.0, needs jdk11 ? -->
- <cxf.version>3.5.6</cxf.version>
+ <cxf.version>4.0.2</cxf.version>
<ddplist.version>1.27</ddplist.version>
<dl4j.version>1.0.0-M2.1</dl4j.version>
<fakeload.version>0.7.0</fakeload.version>
@@ -344,7 +343,7 @@
<jbig2.version>3.0.4</jbig2.version>
<jdom2.version>2.0.6.1</jdom2.version>
<jempbox.version>1.8.17</jempbox.version>
- <jetty.version>9.4.52.v20230823</jetty.version>
+ <jetty.version>11.0.15</jetty.version>
<jhighlight.version>1.1.0</jhighlight.version>
<jna.version>5.13.0</jna.version>
<json.simple.version>1.1.1</json.simple.version>
@@ -512,19 +511,9 @@
<version>1.82</version>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-json-provider</artifactId>
+ <groupId>com.fasterxml.jackson.jakarta.rs</groupId>
+ <artifactId>jackson-jakarta-rs-json-provider</artifactId>
<version>${jackson.version}</version>
- <exclusions>
- <exclusion>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jakarta.activation</groupId>
- <artifactId>jakarta.activation-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>com.github.albfernandez</groupId>
@@ -735,6 +724,16 @@
<artifactId>commons-math3</artifactId>
<version>${commons.math3.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-client</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
diff --git a/tika-parsers/tika-parsers-ml/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/recognition/tf/TensorflowRESTVideoRecogniser.java b/tika-parsers/tika-parsers-ml/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/recognition/tf/TensorflowRESTVideoRecogniser.java
index 6d16cbe9d..a568c6458 100644
--- a/tika-parsers/tika-parsers-ml/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/recognition/tf/TensorflowRESTVideoRecogniser.java
+++ b/tika-parsers/tika-parsers-ml/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/recognition/tf/TensorflowRESTVideoRecogniser.java
@@ -22,8 +22,8 @@ import java.util.Collections;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
-import jakarta.ws.rs.core.UriBuilder;
+import jakarta.ws.rs.core.UriBuilder;
import org.apache.http.HttpResponse;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.DefaultHttpClient;
diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/CompositeParseContextConfig.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/CompositeParseContextConfig.java
index 6250352ce..3158cf03f 100644
--- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/CompositeParseContextConfig.java
+++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/CompositeParseContextConfig.java
@@ -17,6 +17,7 @@
package org.apache.tika.server.core;
import java.util.List;
+
import jakarta.ws.rs.core.MultivaluedMap;
import org.apache.tika.config.ServiceLoader;
@@ -29,8 +30,9 @@ public class CompositeParseContextConfig implements ParseContextConfig {
final List<ParseContextConfig> configs;
public CompositeParseContextConfig() {
- configs = new ServiceLoader(CompositeParseContextConfig.class.getClassLoader())
- .loadServiceProviders(ParseContextConfig.class);
+ configs = new ServiceLoader(
+ CompositeParseContextConfig.class.getClassLoader()).loadServiceProviders(
+ ParseContextConfig.class);
}
@Override
diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/DefaultInputStreamFactory.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/DefaultInputStreamFactory.java
index 25c9aa9fb..0f380b8b4 100644
--- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/DefaultInputStreamFactory.java
+++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/DefaultInputStreamFactory.java
@@ -19,6 +19,7 @@ package org.apache.tika.server.core;
import java.io.IOException;
import java.io.InputStream;
+
import jakarta.ws.rs.core.HttpHeaders;
import jakarta.ws.rs.core.UriInfo;
diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/FetcherStreamFactory.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/FetcherStreamFactory.java
index aecd47edc..43e4e2910 100644
--- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/FetcherStreamFactory.java
+++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/FetcherStreamFactory.java
@@ -21,10 +21,10 @@ import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.nio.charset.StandardCharsets;
+
import jakarta.ws.rs.core.HttpHeaders;
import jakarta.ws.rs.core.MultivaluedMap;
import jakarta.ws.rs.core.UriInfo;
-
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -62,6 +62,20 @@ public class FetcherStreamFactory implements InputStreamFactory {
this.fetcherManager = fetcherManager;
}
+ /**
+ * Tries to parse a long out of the value. If the val is blank, it returns -1.
+ * Throws {@link NumberFormatException}
+ *
+ * @param val
+ * @return
+ */
+ private static long getLong(String val) {
+ if (StringUtils.isBlank(val)) {
+ return -1;
+ }
+ return Long.parseLong(val);
+ }
+
@Override
public InputStream getInputStream(InputStream is, Metadata metadata, HttpHeaders httpHeaders,
UriInfo uriInfo) throws IOException {
@@ -80,13 +94,13 @@ public class FetcherStreamFactory implements InputStreamFactory {
" fetcherName:" + fetcherName + " and fetchKey:" + fetchKey);
}
if (fetchRangeStart < 0 && fetchRangeEnd > -1) {
- throw new IllegalArgumentException("fetchRangeStart must be > -1 if a fetchRangeEnd " +
- "is specified");
+ throw new IllegalArgumentException(
+ "fetchRangeStart must be > -1 if a fetchRangeEnd " + "is specified");
}
if (fetchRangeStart > -1 && fetchRangeEnd < 0) {
- throw new IllegalArgumentException("fetchRangeEnd must be > -1 if a fetchRangeStart " +
- "is specified");
+ throw new IllegalArgumentException(
+ "fetchRangeEnd must be > -1 if a fetchRangeStart " + "is specified");
}
if (!StringUtils.isBlank(fetcherName)) {
@@ -124,11 +138,11 @@ public class FetcherStreamFactory implements InputStreamFactory {
}
private String getParam(String paramName, HttpHeaders httpHeaders, MultivaluedMap uriParams) {
- if (uriParams == null || ! uriParams.containsKey(paramName)) {
+ if (uriParams == null || !uriParams.containsKey(paramName)) {
return httpHeaders.getHeaderString(paramName);
}
- return (String)uriParams.getFirst(paramName);
+ return (String) uriParams.getFirst(paramName);
}
@Override
@@ -137,18 +151,4 @@ public class FetcherStreamFactory implements InputStreamFactory {
return getInputStream(is, metadata, httpHeaders, null);
}
-
- /**
- * Tries to parse a long out of the value. If the val is blank, it returns -1.
- * Throws {@link NumberFormatException}
- *
- * @param val
- * @return
- */
- private static long getLong(String val) {
- if (StringUtils.isBlank(val)) {
- return -1;
- }
- return Long.parseLong(val);
- }
}
diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/InputStreamFactory.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/InputStreamFactory.java
index b3b8c602c..e69e0e633 100644
--- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/InputStreamFactory.java
+++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/InputStreamFactory.java
@@ -19,6 +19,7 @@ package org.apache.tika.server.core;
import java.io.IOException;
import java.io.InputStream;
+
import jakarta.ws.rs.core.HttpHeaders;
import jakarta.ws.rs.core.UriInfo;
@@ -33,12 +34,12 @@ import org.apache.tika.metadata.Metadata;
public interface InputStreamFactory {
/**
- * @deprecated use {@link #getInputStream(InputStream, Metadata, HttpHeaders, UriInfo)}
* @param is
* @param metadata
* @param httpHeaders
* @return
* @throws IOException
+ * @deprecated use {@link #getInputStream(InputStream, Metadata, HttpHeaders, UriInfo)}
*/
@Deprecated
InputStream getInputStream(InputStream is, Metadata metadata, HttpHeaders httpHeaders)
@@ -46,7 +47,6 @@ public interface InputStreamFactory {
InputStream getInputStream(InputStream is, Metadata metadata, HttpHeaders httpHeaders,
- UriInfo uriInfo)
- throws IOException;
+ UriInfo uriInfo) throws IOException;
}
diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/ProduceTypeResourceComparator.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/ProduceTypeResourceComparator.java
index 56dcab443..267d83561 100644
--- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/ProduceTypeResourceComparator.java
+++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/ProduceTypeResourceComparator.java
@@ -19,8 +19,8 @@ package org.apache.tika.server.core;
import java.util.Arrays;
import java.util.List;
-import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MediaType;
import org.apache.cxf.jaxrs.ext.ResourceComparator;
import org.apache.cxf.jaxrs.model.ClassResourceInfo;
import org.apache.cxf.jaxrs.model.OperationResourceInfo;
@@ -35,23 +35,18 @@ import org.slf4j.LoggerFactory;
*/
public class ProduceTypeResourceComparator implements ResourceComparator {
- /**
- * The logger
- */
- private static final Logger LOG = LoggerFactory.getLogger(ProduceTypeResourceComparator.class);
-
/**
* The prioritized MediaType list.
* The lower in list (higher index value), the higher priority it has.
* In case of no matching in this list, it will be treated as media type all.
*/
public static final List<MediaType> PRIORITIZED_MEDIA_LIST =
- Arrays.asList(
- MediaType.TEXT_PLAIN_TYPE,
- MediaType.APPLICATION_JSON_TYPE,
- MediaType.TEXT_HTML_TYPE,
- MediaType.TEXT_XML_TYPE
- );
+ Arrays.asList(MediaType.TEXT_PLAIN_TYPE, MediaType.APPLICATION_JSON_TYPE,
+ MediaType.TEXT_HTML_TYPE, MediaType.TEXT_XML_TYPE);
+ /**
+ * The logger
+ */
+ private static final Logger LOG = LoggerFactory.getLogger(ProduceTypeResourceComparator.class);
/**
* Initiates the comparator.
@@ -63,8 +58,9 @@ public class ProduceTypeResourceComparator implements ResourceComparator {
/**
* Compares the class to handle.
* Nothing is handled here, and this is handed over to CXF default logic.
- * @param cri1 the first class resource info.
- * @param cri2 the second class resource info.
+ *
+ * @param cri1 the first class resource info.
+ * @param cri2 the second class resource info.
* @param message the message, for comparison context.
* @return value based on chosen class. (Always 0 is returned)
*/
@@ -77,8 +73,9 @@ public class ProduceTypeResourceComparator implements ResourceComparator {
* Compares the method to handle.
* Gets the maximum priority match for both handlers,
* and chooses the handler that has the maximum priority match.
- * @param oper1 the first resource handler info.
- * @param oper2 the second resource handler info.
+ *
+ * @param oper1 the first resource handler info.
+ * @param oper2 the second resource handler info.
* @param message the message, for comparison context.
* @return value based on chosen handler. Returns -1 if first, 1 if second and 0 if no decision.
*/
@@ -86,27 +83,25 @@ public class ProduceTypeResourceComparator implements ResourceComparator {
public int compare(OperationResourceInfo oper1, OperationResourceInfo oper2, Message message) {
// getting all message context data
final String httpMethod = (String) message.get(Message.HTTP_REQUEST_METHOD);
- final MediaType contentType = JAXRSUtils.toMediaType((String) message
- .get(Message.CONTENT_TYPE));
- final List<MediaType> acceptTypes = JAXRSUtils.parseMediaTypes((String) message.get(
- Message.ACCEPT_CONTENT_TYPE));
+ final MediaType contentType =
+ JAXRSUtils.toMediaType((String) message.get(Message.CONTENT_TYPE));
+ final List<MediaType> acceptTypes =
+ JAXRSUtils.parseMediaTypes((String) message.get(Message.ACCEPT_CONTENT_TYPE));
- LOG.debug("Message Method : " + httpMethod + ", ContentType : " + contentType + ", "
- + "Accept Types : " + acceptTypes);
+ LOG.debug("Message Method : " + httpMethod + ", ContentType : " + contentType + ", " +
+ "Accept Types : " + acceptTypes);
int result = compareProduceTypes(oper1, oper2, acceptTypes);
- String m1Name =
- oper1.getClassResourceInfo().getServiceClass().getName() + "#"
- + oper1.getMethodToInvoke().getName();
- String m2Name =
- oper2.getClassResourceInfo().getServiceClass().getName() + "#"
- + oper2.getMethodToInvoke().getName();
+ String m1Name = oper1.getClassResourceInfo().getServiceClass().getName() + "#" +
+ oper1.getMethodToInvoke().getName();
+ String m2Name = oper2.getClassResourceInfo().getServiceClass().getName() + "#" +
+ oper2.getMethodToInvoke().getName();
if (result != 0) {
String chosen = result == -1 ? m1Name : m2Name;
- LOG.debug("Between " + m1Name + " and " + m2Name + ", "
- + chosen + " is chosen for handling the current request");
+ LOG.debug("Between " + m1Name + " and " + m2Name + ", " + chosen +
+ " is chosen for handling the current request");
}
return result;
@@ -116,8 +111,9 @@ public class ProduceTypeResourceComparator implements ResourceComparator {
* Compares the method to handle.
* Gets the maximum priority match for both handlers,
* and chooses the handler that has the maximum priority match.
- * @param oper1 the first resource handler info.
- * @param oper2 the second resource handler info.
+ *
+ * @param oper1 the first resource handler info.
+ * @param oper2 the second resource handler info.
* @param acceptTypes the list acceptable response mime type, for the message.
* @return value based on chosen handler. Returns -1 if first, 1 if second and 0 if no decision.
*/
@@ -125,18 +121,16 @@ public class ProduceTypeResourceComparator implements ResourceComparator {
final List<MediaType> acceptTypes) {
// getting matched produce type for both handlers.
// this is required if a method can produce multiple types.
- List<MediaType> op1Matched = JAXRSUtils.intersectMimeTypes(acceptTypes,
- oper1.getProduceTypes(), true);
- List<MediaType> op2Matched = JAXRSUtils.intersectMimeTypes(acceptTypes,
- oper2.getProduceTypes(), true);
+ List<MediaType> op1Matched =
+ JAXRSUtils.intersectMimeTypes(acceptTypes, oper1.getProduceTypes(), true);
+ List<MediaType> op2Matched =
+ JAXRSUtils.intersectMimeTypes(acceptTypes, oper2.getProduceTypes(), true);
// calculate the max priority for both handlers
- int oper1Priority = op1Matched.stream()
- .mapToInt(PRIORITIZED_MEDIA_LIST::indexOf)
- .max().getAsInt();
- int oper2Priority = op2Matched.stream()
- .mapToInt(PRIORITIZED_MEDIA_LIST::indexOf)
- .max().getAsInt();
+ int oper1Priority =
+ op1Matched.stream().mapToInt(PRIORITIZED_MEDIA_LIST::indexOf).max().getAsInt();
+ int oper2Priority =
+ op2Matched.stream().mapToInt(PRIORITIZED_MEDIA_LIST::indexOf).max().getAsInt();
// final calculation
return oper1Priority == oper2Priority ? 0 : (oper1Priority > oper2Priority ? -1 : 1);
diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/ServerStatusWatcher.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/ServerStatusWatcher.java
index beabe1b6c..77b7b6416 100644
--- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/ServerStatusWatcher.java
+++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/ServerStatusWatcher.java
@@ -90,8 +90,8 @@ public class ServerStatusWatcher implements Runnable {
Instant started = Instant.now();
long elapsed = Duration.between(started, Instant.now()).toMillis();
- try (FileChannel channel = FileChannel
- .open(forkedStatusPath, StandardOpenOption.CREATE, StandardOpenOption.WRITE)) {
+ try (FileChannel channel = FileChannel.open(forkedStatusPath, StandardOpenOption.CREATE,
+ StandardOpenOption.WRITE)) {
while (elapsed < tikaServerConfig.getTaskTimeoutMillis()) {
try (FileLock lock = channel.tryLock()) {
if (lock != null) {
@@ -135,14 +135,15 @@ public class ServerStatusWatcher implements Runnable {
if (status.fileName.isPresent()) {
LOG.error("Timeout task {}, millis elapsed {}, timeoutMillis {}, file id {}" +
"consider increasing the allowable time with the " +
- "<taskTimeoutMillis/> parameter or the {} header", status.task.toString(),
- millisElapsed, status.timeoutMillis,
+ "<taskTimeoutMillis/> parameter or the {} header",
+ status.task.toString(), millisElapsed, status.timeoutMillis,
status.fileName.get(), TimeoutConfig.X_TIKA_TIMEOUT_MILLIS);
} else {
LOG.error("Timeout task {}, millis elapsed {}; " +
"consider increasing the allowable time with the " +
- "<taskTimeoutMillis/> parameter or the {} header", status.task.toString(),
- millisElapsed, TimeoutConfig.X_TIKA_TIMEOUT_MILLIS);
+ "<taskTimeoutMillis/> parameter or the {} header",
+ status.task.toString(), millisElapsed,
+ TimeoutConfig.X_TIKA_TIMEOUT_MILLIS);
}
}
}
diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TikaLoggingFilter.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TikaLoggingFilter.java
index 5c381c05f..93d68f1cd 100644
--- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TikaLoggingFilter.java
+++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TikaLoggingFilter.java
@@ -18,11 +18,11 @@
package org.apache.tika.server.core;
import java.io.IOException;
+
import jakarta.ws.rs.container.ContainerRequestContext;
import jakarta.ws.rs.container.ContainerRequestFilter;
import jakarta.ws.rs.container.PreMatching;
import jakarta.ws.rs.ext.Provider;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TikaServerCli.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TikaServerCli.java
index fe74035fc..85f5cd7a8 100644
--- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TikaServerCli.java
+++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TikaServerCli.java
@@ -133,7 +133,8 @@ public class TikaServerCli {
executorService.shutdownNow();
}
}
- public static void stop(String [] args) {
+
+ public static void stop(String[] args) {
if (PREVENT_STOP) {
LOG.info("preventStopMethod was set to true in the server config. I'm not stopping.");
}
@@ -180,8 +181,8 @@ public class TikaServerCli {
}
public static void noFork(TikaServerConfig tikaServerConfig) throws Exception {
- List<String> args = tikaServerConfig
- .getForkedProcessArgs(tikaServerConfig.getPort(), tikaServerConfig.getIdBase());
+ List<String> args = tikaServerConfig.getForkedProcessArgs(tikaServerConfig.getPort(),
+ tikaServerConfig.getIdBase());
args.add("--noFork");
TikaServerProcess.main(args.toArray(new String[0]));
}
diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TikaServerConfig.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TikaServerConfig.java
index cd38150bc..6fe158830 100644
--- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TikaServerConfig.java
+++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TikaServerConfig.java
@@ -46,10 +46,6 @@ import org.apache.tika.utils.XMLReaderUtils;
public class TikaServerConfig extends ConfigBase {
- private static final Logger LOG = LoggerFactory.getLogger(TikaServerConfig.class);
-
- private static Pattern SYS_PROPS = Pattern.compile("\\$\\{sys:([-_0-9A-Za-z]+)\\}");
-
public static final int DEFAULT_PORT = 9998;
public static final String DEFAULT_HOST = "localhost";
public static final Set<String> LOG_LEVELS = new HashSet<>(Arrays.asList("debug", "info"));
@@ -58,7 +54,6 @@ public class TikaServerConfig extends ConfigBase {
* etc.) before timing out and shutting down the forked process.
*/
public static final long DEFAULT_TASK_TIMEOUT_MILLIS = 300000;
-
/**
* Clients may not set a timeout less than this amount. This hinders
* malicious clients from setting the timeout to a very low value
@@ -66,7 +61,6 @@ public class TikaServerConfig extends ConfigBase {
* available to untrusted clients is dangerous.
*/
public static final long DEFAULT_MINIMUM_TIMEOUT_MILLIS = 30000;
-
/**
* How often to check to see that the task hasn't timed out
*/
@@ -75,6 +69,7 @@ public class TikaServerConfig extends ConfigBase {
* Number of milliseconds to wait for forked process to startup
*/
public static final long DEFAULT_FORKED_STARTUP_MILLIS = 120000;
+ private static final Logger LOG = LoggerFactory.getLogger(TikaServerConfig.class);
//used in fork mode -- restart after processing this many files
private static final long DEFAULT_MAX_FILES = 100000;
private static final int DEFAULT_DIGEST_MARK_LIMIT = 20 * 1024 * 1024;
@@ -88,24 +83,24 @@ public class TikaServerConfig extends ConfigBase {
" your emitter endpoints. See CVE-2015-3271.\n" +
"Please make sure you know what you are doing.";
private static final List<String> ONLY_IN_FORK_MODE = Arrays.asList(
- new String[]{"taskTimeoutMillis", "taskPulseMillis",
- "maxFiles", "javaPath", "maxRestarts", "numRestarts",
- "forkedStatusFile", "maxForkedStartupMillis", "tmpFilePrefix"});
-
- /*
- TODO: integrate these settings:
- * Number of milliseconds to wait to start forked process.
- public static final long DEFAULT_FORKED_PROCESS_STARTUP_MILLIS = 60000;
+ new String[]{"taskTimeoutMillis", "taskPulseMillis", "maxFiles", "javaPath",
+ "maxRestarts", "numRestarts", "forkedStatusFile", "maxForkedStartupMillis",
+ "tmpFilePrefix"});
+ private static Pattern SYS_PROPS = Pattern.compile("\\$\\{sys:([-_0-9A-Za-z]+)\\}");
+ /*
+TODO: integrate these settings:
+ * Number of milliseconds to wait to start forked process.
+public static final long DEFAULT_FORKED_PROCESS_STARTUP_MILLIS = 60000;
- * Maximum number of milliseconds to wait to shutdown forked process to allow
- * for current parses to complete.
- public static final long DEFAULT_FORKED_PROCESS_SHUTDOWN_MILLIS = 30000;
+ * Maximum number of milliseconds to wait to shutdown forked process to allow
+ * for current parses to complete.
+public static final long DEFAULT_FORKED_PROCESS_SHUTDOWN_MILLIS = 30000;
- private long forkedProcessStartupMillis = DEFAULT_FORKED_PROCESS_STARTUP_MILLIS;
+private long forkedProcessStartupMillis = DEFAULT_FORKED_PROCESS_STARTUP_MILLIS;
- private long forkedProcessShutdownMillis = DEFAULT_FORKED_PROCESS_SHUTDOWN_MILLIS;
+private long forkedProcessShutdownMillis = DEFAULT_FORKED_PROCESS_SHUTDOWN_MILLIS;
- */
+ */
private int maxRestarts = -1;
private long maxFiles = 100000;
private long taskTimeoutMillis = DEFAULT_TASK_TIMEOUT_MILLIS;
@@ -139,6 +134,7 @@ public class TikaServerConfig extends ConfigBase {
private boolean preventStopMethod = false;
private TlsConfig tlsConfig = new TlsConfig();
+
/**
* Config with only the defaults
*/
@@ -146,8 +142,7 @@ public class TikaServerConfig extends ConfigBase {
return new TikaServerConfig();
}
- public static TikaServerConfig load(CommandLine commandLine)
- throws IOException, TikaException {
+ public static TikaServerConfig load(CommandLine commandLine) throws IOException, TikaException {
TikaServerConfig config = null;
Set<String> settings = new HashSet<>();
@@ -192,8 +187,8 @@ public class TikaServerConfig extends ConfigBase {
return config;
}
- static TikaServerConfig load(Path p, CommandLine commandLine, Set<String> settings) throws IOException,
- TikaException {
+ static TikaServerConfig load(Path p, CommandLine commandLine, Set<String> settings)
+ throws IOException, TikaException {
try (InputStream is = Files.newInputStream(p)) {
TikaServerConfig config = TikaServerConfig.load(is, commandLine, settings);
if (config.getConfigPath() == null) {
@@ -205,8 +200,7 @@ public class TikaServerConfig extends ConfigBase {
}
private static TikaServerConfig load(InputStream is, CommandLine commandLine,
- Set<String> settings)
- throws IOException, TikaException {
+ Set<String> settings) throws IOException, TikaException {
TikaServerConfig tikaServerConfig = new TikaServerConfig();
Set<String> configSettings = tikaServerConfig.configure("server", is);
settings.addAll(configSettings);
@@ -244,9 +238,7 @@ public class TikaServerConfig extends ConfigBase {
}
}
- private static void loadSupported(Node compound,
- String itemName,
- Set<String> supported) {
+ private static void loadSupported(Node compound, String itemName, Set<String> supported) {
NodeList children = compound.getChildNodes();
for (int i = 0; i < children.getLength(); i++) {
Node child = children.item(i);
@@ -278,6 +270,35 @@ public class TikaServerConfig extends ConfigBase {
return null;
}
+ protected static List<String> interpolateSysProps(List<String> forkedJvmArgs) {
+ List<String> ret = new ArrayList<>();
+ for (String arg : forkedJvmArgs) {
+ if (arg.startsWith("-D")) {
+ String interpolated = interpolate(arg);
+ ret.add(interpolated);
+ } else {
+ ret.add(arg);
+ }
+ }
+ return ret;
+ }
+
+ private static String interpolate(String arg) {
+ StringBuffer sb = new StringBuffer();
+ Matcher m = SYS_PROPS.matcher(arg);
+ while (m.find()) {
+ String prop = System.getProperty(m.group(1));
+ LOG.debug("interpolating {} -> {}", m.group(1), prop);
+ if (prop == null) {
+ LOG.warn("no system property set for {}, falling back to {}", m.group(1), arg);
+ return arg;
+ }
+ m.appendReplacement(sb, Matcher.quoteReplacement(prop));
+ }
+ m.appendTail(sb);
+ return sb.toString();
+ }
+
public boolean isNoFork() {
return noFork;
}
@@ -407,7 +428,6 @@ public class TikaServerConfig extends ConfigBase {
this.forkedJvmArgs = new ArrayList<>(interpolateSysProps(forkedJvmArgs));
}
-
public String getTempFilePrefix() {
return tempFilePrefix;
}
@@ -438,7 +458,8 @@ public class TikaServerConfig extends ConfigBase {
}
}
//add headless if not already configured
- boolean foundHeadlessOption = forkedJvmArgs.stream().anyMatch(arg -> arg.contains("java.awt.headless"));
+ boolean foundHeadlessOption =
+ forkedJvmArgs.stream().anyMatch(arg -> arg.contains("java.awt.headless"));
//if user has already specified headless...don't modify
if (!foundHeadlessOption) {
forkedJvmArgs.add("-Djava.awt.headless=true");
@@ -539,12 +560,14 @@ public class TikaServerConfig extends ConfigBase {
this.returnStackTrace = returnStackTrace;
}
- public void setTlsConfig(TlsConfig tlsConfig) {
- this.tlsConfig = tlsConfig;
- }
public TlsConfig getTlsConfig() {
return tlsConfig;
}
+
+ public void setTlsConfig(TlsConfig tlsConfig) {
+ this.tlsConfig = tlsConfig;
+ }
+
public List<String> getEndpoints() {
return endpoints;
}
@@ -595,14 +618,14 @@ public class TikaServerConfig extends ConfigBase {
this.maxforkedStartupMillis = maxforkedStartupMillis;
}
- public void setPreventStopMethod(boolean preventStopMethod) {
- this.preventStopMethod = preventStopMethod;
- }
-
public boolean isPreventStopMethod() {
return preventStopMethod;
}
+ public void setPreventStopMethod(boolean preventStopMethod) {
+ this.preventStopMethod = preventStopMethod;
+ }
+
public int[] getPorts() {
return getPorts(port);
}
@@ -637,33 +660,4 @@ public class TikaServerConfig extends ConfigBase {
return supportedEmitters;
}
- protected static List<String> interpolateSysProps(List<String> forkedJvmArgs) {
- List<String> ret = new ArrayList<>();
- for (String arg : forkedJvmArgs) {
- if (arg.startsWith("-D")) {
- String interpolated = interpolate(arg);
- ret.add(interpolated);
- } else {
- ret.add(arg);
- }
- }
- return ret;
- }
-
- private static String interpolate(String arg) {
- StringBuffer sb = new StringBuffer();
- Matcher m = SYS_PROPS.matcher(arg);
- while (m.find()) {
- String prop = System.getProperty(m.group(1));
- LOG.debug("interpolating {} -> {}", m.group(1), prop);
- if (prop == null) {
- LOG.warn("no system property set for {}, falling back to {}", m.group(1), arg);
- return arg;
- }
- m.appendReplacement(sb, Matcher.quoteReplacement(prop));
- }
- m.appendTail(sb);
- return sb.toString();
- }
-
}
diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TikaServerParseExceptionMapper.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TikaServerParseExceptionMapper.java
index bcf2e0f3b..ea3280ef4 100644
--- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TikaServerParseExceptionMapper.java
+++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TikaServerParseExceptionMapper.java
@@ -21,6 +21,7 @@ import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.io.Writer;
+
import jakarta.ws.rs.WebApplicationException;
import jakarta.ws.rs.core.Response;
import jakarta.ws.rs.ext.ExceptionMapper;
diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TikaServerProcess.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TikaServerProcess.java
index a6ba72e81..f5c3cca3a 100644
--- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TikaServerProcess.java
+++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TikaServerProcess.java
@@ -95,10 +95,9 @@ public class TikaServerProcess {
public static final Set<String> LOG_LEVELS = new HashSet<>(Arrays.asList("debug", "info"));
+ public static final int BIND_EXCEPTION = 42;
private static final Logger LOG = LoggerFactory.getLogger(TikaServerProcess.class);
public static int DO_NOT_RESTART_EXIT_VALUE = -100;
- public static final int BIND_EXCEPTION = 42;
-
private static Options getOptions() {
Options options = new Options();
@@ -106,8 +105,7 @@ public class TikaServerProcess {
options.addOption("p", "port", true, "listen port");
options.addOption("c", "config", true,
"Tika Configuration file to override default config with.");
- options.addOption("i", "id", true,
- "id to use for server in server status endpoint");
+ options.addOption("i", "id", true, "id to use for server in server status endpoint");
options.addOption("?", "help", false, "this help message");
options.addOption("noFork", "noFork", false, "if launched in no fork mode");
options.addOption("forkedStatusFile", true,
@@ -116,9 +114,8 @@ public class TikaServerProcess {
"Should only be invoked by forking process.");
options.addOption("tmpFilePrefix", true,
"Not allowed in -noFork: prefix for temp file - for debugging only");
- options.addOption("numRestarts", true,
- "Not allowed in -noFork: number of times that " +
- "the forked server has had to be restarted.");
+ options.addOption("numRestarts", true, "Not allowed in -noFork: number of times that " +
+ "the forked server has had to be restarted.");
return options;
}
@@ -150,7 +147,8 @@ public class TikaServerProcess {
return isBindException(e.getCause());
}
- private static void startServer(ServerDetails serverDetails, TikaServerConfig tikaServerConfig) throws Exception {
+ private static void startServer(ServerDetails serverDetails, TikaServerConfig tikaServerConfig)
+ throws Exception {
try {
//start the server
@@ -163,7 +161,7 @@ public class TikaServerProcess {
System.exit(DO_NOT_RESTART_EXIT_VALUE);
}
- if (! tikaServerConfig.isNoFork()) {
+ if (!tikaServerConfig.isNoFork()) {
//redirect
InputStream in = System.in;
System.setIn(new ByteArrayInputStream(new byte[0]));
@@ -183,8 +181,8 @@ public class TikaServerProcess {
String host = tikaServerConfig.getHost();
int[] ports = tikaServerConfig.getPorts();
if (ports.length > 1) {
- throw new IllegalArgumentException("there must be only one port here! " +
- "I see: " + tikaServerConfig.getPort());
+ throw new IllegalArgumentException(
+ "there must be only one port here! " + "I see: " + tikaServerConfig.getPort());
}
int port = ports[0];
@@ -227,7 +225,7 @@ public class TikaServerProcess {
}
//TODO -- figure out how to turn this back on
//logFetchersAndEmitters(tikaServerConfig.isEnableUnsecureFeatures(), fetcherManager,
- // emitterManager);
+ // emitterManager);
String serverId = tikaServerConfig.getId();
LOG.debug("SERVER ID:" + serverId);
@@ -244,10 +242,7 @@ public class TikaServerProcess {
List<ResourceProvider> resourceProviders = new ArrayList<>();
List<Object> providers = new ArrayList<>();
- loadAllProviders(tikaServerConfig,
- serverStatus,
- resourceProviders,
- providers);
+ loadAllProviders(tikaServerConfig, serverStatus, resourceProviders, providers);
sf.setResourceProviders(resourceProviders);
@@ -316,8 +311,7 @@ public class TikaServerProcess {
List<ResourceProvider> resourceProviders,
List<Object> writers)
throws TikaException, SAXException, IOException {
- List<ResourceProvider> tmpCoreProviders =
- loadCoreProviders(tikaServerConfig, serverStatus);
+ List<ResourceProvider> tmpCoreProviders = loadCoreProviders(tikaServerConfig, serverStatus);
resourceProviders.addAll(tmpCoreProviders);
resourceProviders.add(new SingletonResourceProvider(new TikaWelcome(tmpCoreProviders)));
@@ -369,12 +363,11 @@ public class TikaServerProcess {
if (tikaServerConfig.getEndpoints().size() == 0) {
resourceProviders.add(new SingletonResourceProvider(new MetadataResource()));
resourceProviders.add(new SingletonResourceProvider(new RecursiveMetadataResource()));
- resourceProviders
- .add(new SingletonResourceProvider(new DetectorResource(serverStatus)));
+ resourceProviders.add(
+ new SingletonResourceProvider(new DetectorResource(serverStatus)));
resourceProviders.add(new SingletonResourceProvider(new LanguageResource()));
- resourceProviders
- .add(new SingletonResourceProvider(new TranslateResource(serverStatus,
- tikaServerConfig.getTaskTimeoutMillis())));
+ resourceProviders.add(new SingletonResourceProvider(
+ new TranslateResource(serverStatus, tikaServerConfig.getTaskTimeoutMillis())));
resourceProviders.add(new SingletonResourceProvider(new TikaResource()));
resourceProviders.add(new SingletonResourceProvider(new UnpackerResource()));
resourceProviders.add(new SingletonResourceProvider(new TikaMimeTypes()));
@@ -390,22 +383,25 @@ public class TikaServerProcess {
addAsyncResource = true;
addPipesResource = true;
}
- resourceProviders
- .add(new SingletonResourceProvider(new TikaServerStatus(serverStatus)));
+ resourceProviders.add(
+ new SingletonResourceProvider(new TikaServerStatus(serverStatus)));
}
} else {
for (String endPoint : tikaServerConfig.getEndpoints()) {
if ("meta".equals(endPoint)) {
resourceProviders.add(new SingletonResourceProvider(new MetadataResource()));
} else if ("rmeta".equals(endPoint)) {
- resourceProviders.add(new SingletonResourceProvider(new RecursiveMetadataResource()));
+ resourceProviders.add(
+ new SingletonResourceProvider(new RecursiveMetadataResource()));
} else if ("detect".equals(endPoint)) {
- resourceProviders.add(new SingletonResourceProvider(new DetectorResource(serverStatus)));
+ resourceProviders.add(
+ new SingletonResourceProvider(new DetectorResource(serverStatus)));
} else if ("language".equals(endPoint)) {
resourceProviders.add(new SingletonResourceProvider(new LanguageResource()));
} else if ("translate".equals(endPoint)) {
- resourceProviders.add(new SingletonResourceProvider(new TranslateResource(
- serverStatus, tikaServerConfig.getTaskTimeoutMillis())));
+ resourceProviders.add(new SingletonResourceProvider(
+ new TranslateResource(serverStatus,
+ tikaServerConfig.getTaskTimeoutMillis())));
} else if ("tika".equals(endPoint)) {
resourceProviders.add(new SingletonResourceProvider(new TikaResource()));
} else if ("unpack".equals(endPoint)) {
@@ -423,14 +419,16 @@ public class TikaServerProcess {
} else if ("async".equals(endPoint)) {
addAsyncResource = true;
} else if ("status".equals(endPoint)) {
- resourceProviders.add(new SingletonResourceProvider(new TikaServerStatus(serverStatus)));
+ resourceProviders.add(
+ new SingletonResourceProvider(new TikaServerStatus(serverStatus)));
}
}
}
if (addAsyncResource) {
- final AsyncResource localAsyncResource = new AsyncResource(
- tikaServerConfig.getConfigPath(), tikaServerConfig.getSupportedFetchers());
+ final AsyncResource localAsyncResource =
+ new AsyncResource(tikaServerConfig.getConfigPath(),
+ tikaServerConfig.getSupportedFetchers());
Runtime.getRuntime().addShutdownHook(new Thread(() -> {
try {
localAsyncResource.shutdownNow();
@@ -457,7 +455,8 @@ public class TikaServerProcess {
}
private static void logFetchersAndEmitters(boolean enableUnsecureFeatures,
- FetcherManager fetcherManager, EmitterManager emitterManager) {
+ FetcherManager fetcherManager,
+ EmitterManager emitterManager) {
if (enableUnsecureFeatures) {
StringBuilder sb = new StringBuilder();
Set<String> supportedFetchers = fetcherManager.getSupported();
@@ -465,9 +464,8 @@ public class TikaServerProcess {
if (supportedFetchers.size() == 0) {
sb.append("There are no fetchers specified in the TikaConfig");
} else {
- sb.append(
- "The following fetchers are available to whomever has " +
- "access to this server:\n");
+ sb.append("The following fetchers are available to whomever has " +
+ "access to this server:\n");
for (String p : supportedFetchers) {
sb.append(p).append("\n");
}
@@ -476,9 +474,8 @@ public class TikaServerProcess {
if (supportedFetchers.size() == 0) {
sb.append("There are no emitters specified in the TikaConfig");
} else {
- sb.append(
- "The following emitters are available to whomever has " +
- "access to this server:\n");
+ sb.append("The following emitters are available to whomever has " +
+ "access to this server:\n");
for (String e : emitters) {
sb.append(e).append("\n");
}
@@ -486,45 +483,40 @@ public class TikaServerProcess {
LOG.info(sb.toString());
} else {
if (emitterManager.getSupported().size() > 0) {
- String warn =
- "enableUnsecureFeatures has not been set to 'true' in the server " +
- "config file.\n" +
- "The " + emitterManager.getSupported().size() +
- " emitter(s) that you've\n" +
- "specified in TikaConfig will not be available on the /emit " +
- "or /async endpoints.\n" +
- "To enable your emitters, start tika-server with " +
- "<enableUnsecureFeatures>true</enableUnsecureFeatures> " +
- "parameter in " +
- "the TikaConfig\n\n";
+ String warn = "enableUnsecureFeatures has not been set to 'true' in the server " +
+ "config file.\n" + "The " + emitterManager.getSupported().size() +
+ " emitter(s) that you've\n" +
+ "specified in TikaConfig will not be available on the /emit " +
+ "or /async endpoints.\n" +
+ "To enable your emitters, start tika-server with " +
+ "<enableUnsecureFeatures>true</enableUnsecureFeatures> " + "parameter in " +
+ "the TikaConfig\n\n";
LOG.warn(warn);
}
if (emitterManager.getSupported().size() > 0) {
- String warn =
- "enableUnsecureFeatures has not been set to 'true' in the server " +
- "config file.\n" +
- "The " + emitterManager.getSupported().size() +
- " fetcher(s) that you've\n" +
- "specified in TikaConfig will not be available on the /emit " +
- "or /async endpoints.\n" +
- "To enable your emitters, start tika-server with " +
- "<enableUnsecureFeatures>true</enableUnsecureFeatures> " +
- "parameter in " +
- "the TikaConfig\n\n";
+ String warn = "enableUnsecureFeatures has not been set to 'true' in the server " +
+ "config file.\n" + "The " + emitterManager.getSupported().size() +
+ " fetcher(s) that you've\n" +
+ "specified in TikaConfig will not be available on the /emit " +
+ "or /async endpoints.\n" +
+ "To enable your emitters, start tika-server with " +
+ "<enableUnsecureFeatures>true</enableUnsecureFeatures> " + "parameter in " +
+ "the TikaConfig\n\n";
LOG.warn(warn);
}
}
}
- private static Collection<? extends ResourceProvider> loadResourceServices(ServerStatus serverStatus) {
+ private static Collection<? extends ResourceProvider> loadResourceServices(
+ ServerStatus serverStatus) {
List<TikaServerResource> resources =
- new ServiceLoader(TikaServerProcess.class.getClassLoader())
- .loadServiceProviders(TikaServerResource.class);
+ new ServiceLoader(TikaServerProcess.class.getClassLoader()).loadServiceProviders(
+ TikaServerResource.class);
List<ResourceProvider> providers = new ArrayList<>();
for (TikaServerResource r : resources) {
LOG.info("loading resource from SPI: " + r.getClass());
if (r instanceof ServerStatusResource) {
- ((ServerStatusResource)r).setServerStatus(serverStatus);
+ ((ServerStatusResource) r).setServerStatus(serverStatus);
}
providers.add(new SingletonResourceProvider(r));
}
@@ -532,8 +524,8 @@ public class TikaServerProcess {
}
private static Collection<?> loadWriterServices() {
- return new ServiceLoader(TikaServerProcess.class.getClassLoader())
- .loadServiceProviders(org.apache.tika.server.core.writer.TikaServerWriter.class);
+ return new ServiceLoader(TikaServerProcess.class.getClassLoader()).loadServiceProviders(
+ org.apache.tika.server.core.writer.TikaServerWriter.class);
}
private static class ServerDetails {
diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TikaServerWatchDog.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TikaServerWatchDog.java
index 9ca7c2218..72d78ad4b 100644
--- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TikaServerWatchDog.java
+++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TikaServerWatchDog.java
@@ -55,16 +55,6 @@ public class TikaServerWatchDog implements Callable<WatchDogResult> {
private static final Logger LOG = LoggerFactory.getLogger(TikaServerWatchDog.class);
private static Set<Process> PROCESSES = ConcurrentHashMap.newKeySet();
private static Set<ForkedProcess> FORKED_PROCESSES = ConcurrentHashMap.newKeySet();
- private final int port;
- private final String id;
- private final TikaServerConfig tikaServerConfig;
- private final Object[] forkedStatusLock = new Object[0];
- private volatile FORKED_STATUS forkedStatus = FORKED_STATUS.INITIALIZING;
- private volatile Instant lastPing = null;
- private ForkedProcess forkedProcess = null;
- private int restarts = 0;
- private volatile boolean shutDown = false;
-
static {
Thread shutdownHook = new Thread(() -> {
@@ -84,6 +74,16 @@ public class TikaServerWatchDog implements Callable<WatchDogResult> {
Runtime.getRuntime().addShutdownHook(shutdownHook);
}
+ private final int port;
+ private final String id;
+ private final TikaServerConfig tikaServerConfig;
+ private final Object[] forkedStatusLock = new Object[0];
+ private volatile FORKED_STATUS forkedStatus = FORKED_STATUS.INITIALIZING;
+ private volatile Instant lastPing = null;
+ private ForkedProcess forkedProcess = null;
+ private int restarts = 0;
+ private volatile boolean shutDown = false;
+
TikaServerWatchDog(int port, String id, TikaServerConfig tikaServerConfig) {
this.port = port;
this.id = id;
@@ -126,6 +126,15 @@ public class TikaServerWatchDog implements Callable<WatchDogResult> {
}
}
+ private static void closeForkedProcess(ForkedProcess forkedProcess)
+ throws DoNotRestartException, InterruptedException {
+ try {
+ forkedProcess.close();
+ } finally {
+ FORKED_PROCESSES.remove(forkedProcess);
+ }
+ }
+
@Override
public WatchDogResult call() throws Exception {
boolean mustRestart = true;
@@ -142,7 +151,7 @@ public class TikaServerWatchDog implements Callable<WatchDogResult> {
if (mustRestart) {
forkedProcess = startForkedProcess(restarts++);
if (forkedProcess == null) {
- if (! shutDown) {
+ if (!shutDown) {
throw new IllegalArgumentException("forked process should not be " +
"null when not in shutdown mode");
} else {
@@ -152,8 +161,9 @@ public class TikaServerWatchDog implements Callable<WatchDogResult> {
setForkedStatus(FORKED_STATUS.RUNNING);
mustRestart = false;
}
- boolean exited = forkedProcess.process
- .waitFor(tikaServerConfig.getTaskPulseMillis(), TimeUnit.MILLISECONDS);
+ boolean exited =
+ forkedProcess.process.waitFor(tikaServerConfig.getTaskPulseMillis(),
+ TimeUnit.MILLISECONDS);
if (exited) {
LOG.info("forked process exited with exit value {}",
forkedProcess.process.exitValue());
@@ -175,10 +185,9 @@ public class TikaServerWatchDog implements Callable<WatchDogResult> {
long elapsed = Duration.between(Instant.ofEpochMilli(status.timestamp),
Instant.now()).toMillis();
if (elapsed > tikaServerConfig.getTaskTimeoutMillis()) {
- LOG.info(
- "{} ms have elapsed since forked process " +
- "last updated status. " +
- "Shutting down and restarting.", elapsed);
+ LOG.info("{} ms have elapsed since forked process " +
+ "last updated status. " + "Shutting down and restarting.",
+ elapsed);
closeForkedProcess(forkedProcess);
mustRestart = true;
}
@@ -205,29 +214,20 @@ public class TikaServerWatchDog implements Callable<WatchDogResult> {
closeForkedProcess(forkedProcess);
}
- private static void closeForkedProcess(ForkedProcess forkedProcess)
- throws DoNotRestartException, InterruptedException {
- try {
- forkedProcess.close();
- } finally {
- FORKED_PROCESSES.remove(forkedProcess);
- }
- }
-
private synchronized ForkedProcess startForkedProcess(int restarts) throws Exception {
LOG.debug("attempting to start forked process on {} restarts", restarts);
int consecutiveRestarts = 0;
//if there's a bind exception, retry for 30 seconds to give the OS
//a chance to release the port
int maxBind = 30;
- while (consecutiveRestarts < maxBind && ! shutDown) {
+ while (consecutiveRestarts < maxBind && !shutDown) {
try {
ForkedProcess forkedProcess = new ForkedProcess(restarts);
FORKED_PROCESSES.add(forkedProcess);
return forkedProcess;
} catch (BindException e) {
- LOG.warn("WatchDog observes bind exception on retry {}. " +
- "Will retry {} times.", consecutiveRestarts, maxBind);
+ LOG.warn("WatchDog observes bind exception on retry {}. " + "Will retry {} times.",
+ consecutiveRestarts, maxBind);
consecutiveRestarts++;
Thread.sleep(1000);
if (consecutiveRestarts >= maxBind) {
@@ -396,8 +396,8 @@ public class TikaServerWatchDog implements Callable<WatchDogResult> {
List<String> jvmArgs = tikaServerConfig.getForkedJvmArgs();
List<String> forkedArgs = tikaServerConfig.getForkedProcessArgs(port, id);
forkedArgs.add("-forkedStatusFile");
- forkedArgs.add(ProcessUtils
- .escapeCommandLine(forkedStatusFile.toAbsolutePath().toString()));
+ forkedArgs.add(
+ ProcessUtils.escapeCommandLine(forkedStatusFile.toAbsolutePath().toString()));
argList.add(javaPath);
if (!jvmArgs.contains("-cp") && !jvmArgs.contains("--classpath")) {
diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TlsConfig.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TlsConfig.java
index 0a18ff4b3..c3922a5e4 100644
--- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TlsConfig.java
+++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TlsConfig.java
@@ -26,9 +26,9 @@ import org.apache.tika.utils.StringUtils;
public class TlsConfig implements Initializable {
- private boolean active = false;
//TODO make this configurable
private final boolean passwordsAESEncrypted = false;
+ private boolean active = false;
private String keyStoreType = null;
private String keyStorePassword = null;
private String keyStoreFile = null;
@@ -118,11 +118,11 @@ public class TlsConfig implements Initializable {
}
if (hasTrustStore()) {
if (StringUtils.isBlank(trustStoreType)) {
- throw new TikaConfigException("must initialize trustStoreType " +
- "if there's any trustStore info");
+ throw new TikaConfigException(
+ "must initialize trustStoreType " + "if there's any trustStore info");
} else if (StringUtils.isBlank(trustStoreFile)) {
- throw new TikaConfigException("must initialize trustStoreFile " +
- "if there's any trustStore info");
+ throw new TikaConfigException(
+ "must initialize trustStoreFile " + "if there's any trustStore info");
} else if (StringUtils.isBlank(trustStorePassword)) {
throw new TikaConfigException("must initialize trustStorePassword " +
"if there's any trustStore info");
@@ -164,8 +164,7 @@ public class TlsConfig implements Initializable {
}
public boolean hasTrustStore() {
- return ! StringUtils.isBlank(trustStoreType) &&
- ! StringUtils.isBlank(trustStorePassword) &&
- ! StringUtils.isBlank(trustStoreFile);
+ return !StringUtils.isBlank(trustStoreType) && !StringUtils.isBlank(trustStorePassword) &&
+ !StringUtils.isBlank(trustStoreFile);
}
}
diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/config/DocumentSelectorConfig.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/config/DocumentSelectorConfig.java
index 22f73d405..7e35a40eb 100644
--- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/config/DocumentSelectorConfig.java
+++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/config/DocumentSelectorConfig.java
@@ -17,7 +17,6 @@
package org.apache.tika.server.core.config;
import jakarta.ws.rs.core.MultivaluedMap;
-
import org.apache.commons.lang3.StringUtils;
import org.apache.tika.extractor.DocumentSelector;
diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/config/PasswordProviderConfig.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/config/PasswordProviderConfig.java
index 8feba8f26..0ea95ec39 100644
--- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/config/PasswordProviderConfig.java
+++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/config/PasswordProviderConfig.java
@@ -19,7 +19,6 @@ package org.apache.tika.server.core.config;
import static java.nio.charset.StandardCharsets.UTF_8;
import jakarta.ws.rs.core.MultivaluedMap;
-
import org.apache.commons.codec.binary.Base64;
import org.apache.tika.metadata.Metadata;
diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/AsyncResource.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/AsyncResource.java
index a26e9fc9c..2cc7b1294 100644
--- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/AsyncResource.java
+++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/AsyncResource.java
@@ -27,6 +27,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ArrayBlockingQueue;
+
import jakarta.ws.rs.BadRequestException;
import jakarta.ws.rs.POST;
import jakarta.ws.rs.Path;
@@ -34,7 +35,6 @@ import jakarta.ws.rs.Produces;
import jakarta.ws.rs.core.Context;
import jakarta.ws.rs.core.HttpHeaders;
import jakarta.ws.rs.core.UriInfo;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xml.sax.SAXException;
@@ -54,11 +54,10 @@ import org.apache.tika.pipes.fetcher.FetchKey;
public class AsyncResource {
private static final Logger LOG = LoggerFactory.getLogger(AsyncResource.class);
-
- long maxQueuePauseMs = 60000;
private final AsyncProcessor asyncProcessor;
private final Set<String> supportedFetchers;
private final EmitterManager emitterManager;
+ long maxQueuePauseMs = 60000;
private ArrayBlockingQueue<FetchEmitTuple> queue;
public AsyncResource(java.nio.file.Path tikaConfigPath, Set<String> supportedFetchers)
diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/DetectorResource.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/DetectorResource.java
index bb3495659..a8602a18f 100644
--- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/DetectorResource.java
+++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/DetectorResource.java
@@ -19,6 +19,7 @@ package org.apache.tika.server.core.resource;
import java.io.IOException;
import java.io.InputStream;
+
import jakarta.ws.rs.Consumes;
import jakarta.ws.rs.PUT;
import jakarta.ws.rs.Path;
@@ -26,7 +27,6 @@ import jakarta.ws.rs.Produces;
import jakarta.ws.rs.core.Context;
import jakarta.ws.rs.core.HttpHeaders;
import jakarta.ws.rs.core.UriInfo;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -62,8 +62,8 @@ public class DetectorResource {
long timeoutMillis = TikaResource.getTaskTimeout(parseContext);
long taskId = serverStatus.start(ServerStatus.TASK.DETECT, filename, timeoutMillis);
- try (TikaInputStream tis = TikaInputStream
- .get(TikaResource.getInputStream(is, met, httpHeaders, info))) {
+ try (TikaInputStream tis = TikaInputStream.get(
+ TikaResource.getInputStream(is, met, httpHeaders, info))) {
return TikaResource.getConfig().getDetector().detect(tis, met).toString();
} catch (IOException e) {
LOG.warn("Unable to detect MIME type for file. Reason: {} ({})", e.getMessage(),
diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/LanguageResource.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/LanguageResource.java
index a52cffcf9..54fdd339f 100644
--- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/LanguageResource.java
+++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/LanguageResource.java
@@ -21,12 +21,12 @@ import static java.nio.charset.StandardCharsets.UTF_8;
import java.io.IOException;
import java.io.InputStream;
+
import jakarta.ws.rs.Consumes;
import jakarta.ws.rs.POST;
import jakarta.ws.rs.PUT;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.Produces;
-
import org.apache.commons.io.IOUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/MetadataResource.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/MetadataResource.java
index e0316ee1e..467256946 100644
--- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/MetadataResource.java
+++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/MetadataResource.java
@@ -22,6 +22,7 @@ import static org.apache.tika.server.core.resource.TikaResource.fillParseContext
import java.io.IOException;
import java.io.InputStream;
+
import jakarta.ws.rs.Consumes;
import jakarta.ws.rs.POST;
import jakarta.ws.rs.PUT;
@@ -33,7 +34,6 @@ import jakarta.ws.rs.core.HttpHeaders;
import jakarta.ws.rs.core.MultivaluedMap;
import jakarta.ws.rs.core.Response;
import jakarta.ws.rs.core.UriInfo;
-
import org.apache.cxf.jaxrs.ext.multipart.Attachment;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -55,8 +55,9 @@ public class MetadataResource {
@Path("form")
public Response getMetadataFromMultipart(Attachment att, @Context UriInfo info)
throws Exception {
- return Response.ok(parseMetadata(att.getObject(InputStream.class), new Metadata(),
- att.getHeaders(), info)).build();
+ return Response.ok(
+ parseMetadata(att.getObject(InputStream.class), new Metadata(), att.getHeaders(),
+ info)).build();
}
@PUT
@@ -64,10 +65,9 @@ public class MetadataResource {
public Response getMetadata(InputStream is, @Context HttpHeaders httpHeaders,
@Context UriInfo info) throws Exception {
Metadata metadata = new Metadata();
- return Response
- .ok(parseMetadata(TikaResource.getInputStream(is, metadata, httpHeaders, info),
- metadata,
- httpHeaders.getRequestHeaders(), info)).build();
+ return Response.ok(
+ parseMetadata(TikaResource.getInputStream(is, metadata, httpHeaders, info),
+ metadata, httpHeaders.getRequestHeaders(), info)).build();
}
/**
diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/PipesResource.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/PipesResource.java
index 4c87bed35..333ffa6ce 100644
--- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/PipesResource.java
+++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/PipesResource.java
@@ -24,13 +24,13 @@ import java.io.Reader;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.Map;
+
import jakarta.ws.rs.POST;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.core.Context;
import jakarta.ws.rs.core.HttpHeaders;
import jakarta.ws.rs.core.UriInfo;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -51,6 +51,7 @@ public class PipesResource {
private static final Logger LOG = LoggerFactory.getLogger(PipesResource.class);
private final PipesParser pipesParser;
+
public PipesResource(java.nio.file.Path tikaConfig) throws TikaConfigException, IOException {
PipesConfig pipesConfig = PipesConfig.load(tikaConfig);
//this has to be zero. everything must be emitted through the PipesServer
@@ -98,8 +99,8 @@ public class PipesResource {
PipesResult pipesResult = pipesParser.parse(fetchEmitTuple);
switch (pipesResult.getStatus()) {
case CLIENT_UNAVAILABLE_WITHIN_MS:
- throw new IllegalStateException("client not available within " +
- "allotted amount of time");
+ throw new IllegalStateException(
+ "client not available within " + "allotted amount of time");
case EMIT_EXCEPTION:
return returnEmitException(pipesResult.getMessage());
case PARSE_SUCCESS:
@@ -110,8 +111,8 @@ public class PipesResource {
case EMIT_SUCCESS_PARSE_EXCEPTION:
return parseException(pipesResult.getMessage(), true);
case PARSE_EXCEPTION_EMIT:
- throw new IllegalArgumentException("Should have tried to emit in forked " +
- "process?!");
+ throw new IllegalArgumentException(
+ "Should have tried to emit in forked " + "process?!");
case PARSE_EXCEPTION_NO_EMIT:
return parseException(pipesResult.getMessage(), false);
case TIMEOUT:
@@ -125,8 +126,9 @@ public class PipesResource {
fetchEmitTuple.getEmitKey().getEmitterName());
}
default:
- throw new IllegalArgumentException("I'm sorry, I don't yet handle a status of " +
- "this type: " + pipesResult.getStatus());
+ throw new IllegalArgumentException(
+ "I'm sorry, I don't yet handle a status of " + "this type: " +
+ pipesResult.getStatus());
}
}
diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/RecursiveMetadataResource.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/RecursiveMetadataResource.java
index 93aa63f1b..574c74aa8 100644
--- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/RecursiveMetadataResource.java
+++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/RecursiveMetadataResource.java
@@ -22,6 +22,7 @@ import static org.apache.tika.server.core.resource.TikaResource.fillParseContext
import java.io.InputStream;
import java.util.List;
+
import jakarta.ws.rs.Consumes;
import jakarta.ws.rs.POST;
import jakarta.ws.rs.PUT;
@@ -34,7 +35,6 @@ import jakarta.ws.rs.core.HttpHeaders;
import jakarta.ws.rs.core.MultivaluedMap;
import jakarta.ws.rs.core.Response;
import jakarta.ws.rs.core.UriInfo;
-
import org.apache.cxf.jaxrs.ext.multipart.Attachment;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -91,6 +91,24 @@ public class RecursiveMetadataResource {
return handler.getMetadataList();
}
+ static HandlerConfig buildHandlerConfig(MultivaluedMap<String, String> httpHeaders,
+ String handlerTypeName,
+ HandlerConfig.PARSE_MODE parseMode) {
+ int writeLimit = -1;
+ if (httpHeaders.containsKey("writeLimit")) {
+ writeLimit = Integer.parseInt(httpHeaders.getFirst("writeLimit"));
+ }
+
+ int maxEmbeddedResources = -1;
+ if (httpHeaders.containsKey("maxEmbeddedResources")) {
+ maxEmbeddedResources = Integer.parseInt(httpHeaders.getFirst("maxEmbeddedResources"));
+ }
+ return new HandlerConfig(
+ BasicContentHandlerFactory.parseHandlerType(handlerTypeName, DEFAULT_HANDLER_TYPE),
+ parseMode, writeLimit, maxEmbeddedResources,
+ TikaResource.getThrowOnWriteLimitReached(httpHeaders));
+ }
+
/**
* Returns an InputStream that can be deserialized as a list of
* {@link Metadata} objects.
@@ -122,30 +140,13 @@ public class RecursiveMetadataResource {
public Response getMetadataFromMultipart(Attachment att, @Context UriInfo info,
@PathParam(HANDLER_TYPE_PARAM) String handlerTypeName)
throws Exception {
- return Response
- .ok(parseMetadataToMetadataList(att.getObject(InputStream.class), new Metadata(),
+ return Response.ok(
+ parseMetadataToMetadataList(att.getObject(InputStream.class), new Metadata(),
att.getHeaders(), info,
buildHandlerConfig(att.getHeaders(), handlerTypeName,
HandlerConfig.PARSE_MODE.RMETA))).build();
}
- static HandlerConfig buildHandlerConfig(MultivaluedMap<String, String> httpHeaders,
- String handlerTypeName, HandlerConfig.PARSE_MODE parseMode) {
- int writeLimit = -1;
- if (httpHeaders.containsKey("writeLimit")) {
- writeLimit = Integer.parseInt(httpHeaders.getFirst("writeLimit"));
- }
-
- int maxEmbeddedResources = -1;
- if (httpHeaders.containsKey("maxEmbeddedResources")) {
- maxEmbeddedResources = Integer.parseInt(httpHeaders.getFirst("maxEmbeddedResources"));
- }
- return new HandlerConfig(
- BasicContentHandlerFactory.parseHandlerType(handlerTypeName, DEFAULT_HANDLER_TYPE),
- parseMode,
- writeLimit, maxEmbeddedResources, TikaResource.getThrowOnWriteLimitReached(httpHeaders));
- }
-
/**
* Returns an InputStream that can be deserialized as a list of
* {@link Metadata} objects.
diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TikaDetectors.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TikaDetectors.java
index ba42a4b8b..1cc0071be 100644
--- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TikaDetectors.java
+++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TikaDetectors.java
@@ -21,12 +21,12 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.Produces;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
import org.apache.tika.detect.CompositeDetector;
import org.apache.tika.detect.Detector;
import org.apache.tika.server.core.HTMLHelper;
@@ -75,7 +75,7 @@ public class TikaDetectors {
}
@GET
- @Produces(javax.ws.rs.core.MediaType.APPLICATION_JSON)
+ @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON)
public String getDetectorsJSON() throws IOException {
Map<String, Object> details = new HashMap<>();
detectorAsMap(TikaResource.getConfig().getDetector(), details);
diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TikaMimeTypes.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TikaMimeTypes.java
index 41b99bf03..198ce7a9e 100644
--- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TikaMimeTypes.java
+++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TikaMimeTypes.java
@@ -24,14 +24,14 @@ import java.util.List;
import java.util.Map;
import java.util.SortedMap;
import java.util.TreeMap;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.NotFoundException;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.PathParam;
import jakarta.ws.rs.Produces;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
import org.apache.tika.config.TikaConfig;
import org.apache.tika.mime.MediaType;
import org.apache.tika.mime.MediaTypeRegistry;
@@ -174,7 +174,7 @@ public class TikaMimeTypes {
}
@GET
- @Produces(javax.ws.rs.core.MediaType.APPLICATION_JSON)
+ @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON)
public String getMimeTypesJSON() throws IOException {
Map<String, Object> details = new HashMap<>();
@@ -197,7 +197,7 @@ public class TikaMimeTypes {
@GET
@Path("/{type}/{subtype}")
- @Produces(javax.ws.rs.core.MediaType.APPLICATION_JSON)
+ @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON)
public String getMimeTypeDetailsJSON(@PathParam("type") String typePart,
@PathParam("subtype") String subtype) throws IOException {
MediaTypeDetails type = getMediaType(typePart, subtype);
diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TikaParsers.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TikaParsers.java
index 6d664c305..32da8036b 100644
--- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TikaParsers.java
+++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TikaParsers.java
@@ -25,12 +25,12 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.Produces;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
import org.apache.tika.mime.MediaType;
import org.apache.tika.parser.CompositeParser;
import org.apache.tika.parser.ParseContext;
@@ -117,13 +117,13 @@ public class TikaParsers {
@GET
@Path("/details")
- @Produces(javax.ws.rs.core.MediaType.APPLICATION_JSON)
+ @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON)
public String getParserDetailsJSON() throws IOException {
return getParsersJSON(true);
}
@GET
- @Produces(javax.ws.rs.core.MediaType.APPLICATION_JSON)
+ @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON)
public String getParsersJSON() throws IOException {
return getParsersJSON(false);
}
diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TikaResource.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TikaResource.java
index 90f033b43..c2342fa01 100644
--- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TikaResource.java
+++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TikaResource.java
@@ -32,6 +32,12 @@ import java.util.Locale;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.sax.SAXTransformerFactory;
+import javax.xml.transform.sax.TransformerHandler;
+import javax.xml.transform.stream.StreamResult;
+
import jakarta.ws.rs.Consumes;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.POST;
@@ -46,12 +52,6 @@ import jakarta.ws.rs.core.MultivaluedMap;
import jakarta.ws.rs.core.Response;
import jakarta.ws.rs.core.StreamingOutput;
import jakarta.ws.rs.core.UriInfo;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.sax.SAXTransformerFactory;
-import javax.xml.transform.sax.TransformerHandler;
-import javax.xml.transform.stream.StreamResult;
-
import org.apache.commons.lang3.StringUtils;
import org.apache.cxf.attachment.ContentDisposition;
import org.apache.cxf.jaxrs.ext.multipart.Attachment;
@@ -122,7 +122,8 @@ public class TikaResource {
if (DIGESTER != null) {
boolean skipContainer = false;
if (TIKA_CONFIG.getAutoDetectParserConfig().getDigesterFactory() != null &&
- TIKA_CONFIG.getAutoDetectParserConfig().getDigesterFactory().isSkipContainerDocument()) {
+ TIKA_CONFIG.getAutoDetectParserConfig().getDigesterFactory()
+ .isSkipContainerDocument()) {
skipContainer = true;
}
return new DigestingParser(parser, DIGESTER, skipContainer);
@@ -158,8 +159,8 @@ public class TikaResource {
PARSE_CONTEXT_CONFIG.configure(httpHeaders, metadata, parseContext);
}
- public static InputStream getInputStream(InputStream is, Metadata metadata,
- HttpHeaders headers, UriInfo uriInfo) {
+ public static InputStream getInputStream(InputStream is, Metadata metadata, HttpHeaders headers,
+ UriInfo uriInfo) {
try {
return INPUTSTREAM_FACTORY.getInputStream(is, metadata, headers, uriInfo);
} catch (IOException e) {
@@ -299,15 +300,15 @@ public class TikaResource {
}
String contentTypeHeader = httpHeaders.getFirst(HttpHeaders.CONTENT_TYPE);
- javax.ws.rs.core.MediaType mediaType =
+ jakarta.ws.rs.core.MediaType mediaType =
(contentTypeHeader == null || "*/*".equals(contentTypeHeader)) ? null :
- javax.ws.rs.core.MediaType.valueOf(contentTypeHeader);
+ jakarta.ws.rs.core.MediaType.valueOf(contentTypeHeader);
if (mediaType != null && "xml".equals(mediaType.getSubtype())) {
mediaType = null;
}
if (mediaType != null &&
- mediaType.equals(javax.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM_TYPE)) {
+ mediaType.equals(jakarta.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM_TYPE)) {
mediaType = null;
}
@@ -361,7 +362,7 @@ public class TikaResource {
logger.warn("{}: Encrypted document ({})", path, fileName, e);
throw new TikaServerParseException(e);
} catch (Exception e) {
- if (! WriteLimitReachedException.isWriteLimitReached(e)) {
+ if (!WriteLimitReachedException.isWriteLimitReached(e)) {
logger.warn("{}: Text extraction failed ({})", path, fileName, e);
}
throw new TikaServerParseException(e);
@@ -382,17 +383,18 @@ public class TikaResource {
if (tikaTaskTimeout != null) {
if (tikaTaskTimeout.getTimeoutMillis() > TIKA_SERVER_CONFIG.getTaskTimeoutMillis()) {
- throw new IllegalArgumentException("Can't request a timeout ( " +
- tikaTaskTimeout.getTimeoutMillis() +
- "ms) greater than the taskTimeoutMillis set in the server config (" +
- TIKA_SERVER_CONFIG.getTaskTimeoutMillis() + "ms)");
+ throw new IllegalArgumentException(
+ "Can't request a timeout ( " + tikaTaskTimeout.getTimeoutMillis() +
+ "ms) greater than the taskTimeoutMillis set in the server config (" +
+ TIKA_SERVER_CONFIG.getTaskTimeoutMillis() + "ms)");
}
timeoutMillis = tikaTaskTimeout.getTimeoutMillis();
if (timeoutMillis < TIKA_SERVER_CONFIG.getMinimumTimeoutMillis()) {
- throw new WebApplicationException(
- new IllegalArgumentException("taskTimeoutMillis must be > " +
- "minimumTimeoutMillis, currently set to (" + TIKA_SERVER_CONFIG.getMinimumTimeoutMillis() +
- "ms)"), Response.Status.BAD_REQUEST);
+ throw new WebApplicationException(new IllegalArgumentException(
+ "taskTimeoutMillis must be > " +
+ "minimumTimeoutMillis, currently set to (" +
+ TIKA_SERVER_CONFIG.getMinimumTimeoutMillis() + "ms)"),
+ Response.Status.BAD_REQUEST);
}
}
return timeoutMillis;
@@ -415,6 +417,21 @@ public class TikaResource {
}
}
+ public static boolean getThrowOnWriteLimitReached(MultivaluedMap<String, String> httpHeaders) {
+ if (httpHeaders.containsKey("throwOnWriteLimitReached")) {
+ String val = httpHeaders.getFirst("throwOnWriteLimitReached");
+ if ("true".equalsIgnoreCase(val)) {
+ return true;
+ } else if ("false".equalsIgnoreCase(val)) {
+ return false;
+ } else {
+ throw new IllegalArgumentException(
+ "'throwOnWriteLimitReached' must be either 'true' or 'false'");
+ }
+ }
+ return HandlerConfig.DEFAULT_HANDLER_CONFIG.isThrowOnWriteLimitReached();
+ }
+
@GET
@Produces("text/plain")
public String getMessage() {
@@ -426,8 +443,7 @@ public class TikaResource {
@Consumes("multipart/form-data")
@Produces("text/plain")
@Path("form")
- public StreamingOutput getTextFromMultipart(Attachment att,
- @Context HttpHeaders httpHeaders,
+ public StreamingOutput getTextFromMultipart(Attachment att, @Context HttpHeaders httpHeaders,
@Context final UriInfo info) {
return produceText(att.getObject(InputStream.class), new Metadata(),
preparePostHeaderMap(att, httpHeaders), info);
@@ -476,7 +492,6 @@ public class TikaResource {
};
}
-
@PUT
@Consumes("*/*")
@Produces("text/plain")
@@ -501,8 +516,7 @@ public class TikaResource {
return outputStream -> {
Writer writer = new OutputStreamWriter(outputStream, UTF_8);
- BodyContentHandler body =
- new BodyContentHandler(new RichTextContentHandler(writer));
+ BodyContentHandler body = new BodyContentHandler(new RichTextContentHandler(writer));
parse(parser, LOG, info.getPath(), is, body, metadata, context);
};
@@ -512,8 +526,7 @@ public class TikaResource {
@Consumes("multipart/form-data")
@Produces("text/html")
@Path("form")
- public StreamingOutput getHTMLFromMultipart(Attachment att,
- @Context HttpHeaders httpHeaders,
+ public StreamingOutput getHTMLFromMultipart(Attachment att, @Context HttpHeaders httpHeaders,
@Context final UriInfo info) {
return produceOutput(att.getObject(InputStream.class), new Metadata(),
preparePostHeaderMap(att, httpHeaders), info, "html");
@@ -533,11 +546,10 @@ public class TikaResource {
@Consumes("multipart/form-data")
@Produces("text/xml")
@Path("form")
- public StreamingOutput getXMLFromMultipart(Attachment att,
- @Context HttpHeaders httpHeaders,
+ public StreamingOutput getXMLFromMultipart(Attachment att, @Context HttpHeaders httpHeaders,
@Context final UriInfo info) {
- return produceOutput(att.getObject(InputStream.class),
- new Metadata(), preparePostHeaderMap(att, httpHeaders), info, "xml");
+ return produceOutput(att.getObject(InputStream.class), new Metadata(),
+ preparePostHeaderMap(att, httpHeaders), info, "xml");
}
@PUT
@@ -554,15 +566,13 @@ public class TikaResource {
@Consumes("multipart/form-data")
@Produces("application/json")
@Path("form{" + HANDLER_TYPE_PARAM + " : (\\w+)?}")
- public Metadata getJsonFromMultipart(Attachment att,
- @Context HttpHeaders httpHeaders,
- @Context final UriInfo info,
- @PathParam(HANDLER_TYPE_PARAM)
- String handlerTypeName)
+ public Metadata getJsonFromMultipart(Attachment att, @Context HttpHeaders httpHeaders,
+ @Context final UriInfo info,
+ @PathParam(HANDLER_TYPE_PARAM) String handlerTypeName)
throws IOException, TikaException {
Metadata metadata = new Metadata();
- parseToMetadata(getInputStream(
- att.getObject(InputStream.class), metadata, httpHeaders, info),
+ parseToMetadata(
+ getInputStream(att.getObject(InputStream.class), metadata, httpHeaders, info),
metadata, preparePostHeaderMap(att, httpHeaders), info, handlerTypeName);
TikaResource.getConfig().getMetadataFilter().filter(metadata);
return metadata;
@@ -572,10 +582,9 @@ public class TikaResource {
@Consumes("*/*")
@Produces("application/json")
@Path("{" + HANDLER_TYPE_PARAM + " : (\\w+)?}")
- public Metadata getJson(final InputStream is, @Context
- HttpHeaders httpHeaders,
- @Context final UriInfo info, @PathParam(HANDLER_TYPE_PARAM)
- String handlerTypeName)
+ public Metadata getJson(final InputStream is, @Context HttpHeaders httpHeaders,
+ @Context final UriInfo info,
+ @PathParam(HANDLER_TYPE_PARAM) String handlerTypeName)
throws IOException, TikaException {
Metadata metadata = new Metadata();
parseToMetadata(getInputStream(is, metadata, httpHeaders, info), metadata,
@@ -584,10 +593,9 @@ public class TikaResource {
return metadata;
}
- private void parseToMetadata(InputStream inputStream,
- Metadata metadata,
- MultivaluedMap<String, String> httpHeaders,
- UriInfo info, String handlerTypeName) throws IOException {
+ private void parseToMetadata(InputStream inputStream, Metadata metadata,
+ MultivaluedMap<String, String> httpHeaders, UriInfo info,
+ String handlerTypeName) throws IOException {
final Parser parser = createParser();
final ParseContext context = new ParseContext();
@@ -603,8 +611,8 @@ public class TikaResource {
BasicContentHandlerFactory.HANDLER_TYPE type =
BasicContentHandlerFactory.parseHandlerType(handlerTypeName, DEFAULT_HANDLER_TYPE);
- BasicContentHandlerFactory fact = new BasicContentHandlerFactory(type, writeLimit,
- throwOnWriteLimitReached, context);
+ BasicContentHandlerFactory fact =
+ new BasicContentHandlerFactory(type, writeLimit, throwOnWriteLimitReached, context);
ContentHandler contentHandler = fact.getNewContentHandler();
try {
@@ -624,7 +632,7 @@ public class TikaResource {
metadata.add(TikaCoreProperties.CONTAINER_EXCEPTION,
ExceptionUtils.getStackTrace(e));
}
- } else if (! writeLimitReached) {
+ } else if (!writeLimitReached) {
throw e;
}
} catch (OutOfMemoryError e) {
@@ -639,20 +647,6 @@ public class TikaResource {
}
}
- public static boolean getThrowOnWriteLimitReached(MultivaluedMap<String, String> httpHeaders) {
- if (httpHeaders.containsKey("throwOnWriteLimitReached")) {
- String val = httpHeaders.getFirst("throwOnWriteLimitReached");
- if ("true".equalsIgnoreCase(val)) {
- return true;
- } else if ("false".equalsIgnoreCase(val)) {
- return false;
- } else {
- throw new IllegalArgumentException("'throwOnWriteLimitReached' must be either 'true' or 'false'");
- }
- }
- return HandlerConfig.DEFAULT_HANDLER_CONFIG.isThrowOnWriteLimitReached();
- }
-
private StreamingOutput produceOutput(final InputStream is, Metadata metadata,
final MultivaluedMap<String, String> httpHeaders,
final UriInfo info, final String format) {
@@ -689,15 +683,17 @@ public class TikaResource {
/**
* Prepares a multivalued map, combining attachment headers and request headers.
* Gives priority to attachment headers.
- * @param att the attachment.
+ *
+ * @param att the attachment.
* @param httpHeaders the http headers, fetched from context.
* @return the case insensitive MetadataMap containing combined headers.
*/
private MetadataMap<String, String> preparePostHeaderMap(Attachment att,
HttpHeaders httpHeaders) {
- if (att == null && httpHeaders == null) return null;
- MetadataMap<String, String> finalHeaders = new MetadataMap<>(false,
- true);
+ if (att == null && httpHeaders == null) {
+ return null;
+ }
+ MetadataMap<String, String> finalHeaders = new MetadataMap<>(false, true);
if (httpHeaders != null && httpHeaders.getRequestHeaders() != null) {
finalHeaders.putAll(httpHeaders.getRequestHeaders());
}
diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TikaServerStatus.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TikaServerStatus.java
index 54fba86d3..dd8ac68f3 100644
--- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TikaServerStatus.java
+++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TikaServerStatus.java
@@ -18,6 +18,7 @@ package org.apache.tika.server.core.resource;
import java.util.LinkedHashMap;
import java.util.Map;
+
import jakarta.ws.rs.GET;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.Produces;
diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TikaWelcome.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TikaWelcome.java
index 543cc4dd3..2105492de 100644
--- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TikaWelcome.java
+++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TikaWelcome.java
@@ -28,6 +28,7 @@ import java.util.List;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+
import jakarta.ws.rs.DELETE;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.HEAD;
@@ -36,7 +37,6 @@ import jakarta.ws.rs.POST;
import jakarta.ws.rs.PUT;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.Produces;
-
import org.apache.cxf.jaxrs.lifecycle.ResourceProvider;
import org.apache.tika.Tika;
@@ -49,8 +49,7 @@ import org.apache.tika.server.core.HTMLHelper;
public class TikaWelcome {
private static final String DOCS_URL = "https://wiki.apache.org/tika/TikaJAXRS";
- private static final Map<Class<? extends Annotation>, String> HTTP_METHODS =
- new HashMap<>();
+ private static final Map<Class<? extends Annotation>, String> HTTP_METHODS = new HashMap<>();
static {
HTTP_METHODS.put(DELETE.class, "DELETE");
diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TranslateResource.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TranslateResource.java
index b7f33a0f6..ff6e07d0e 100644
--- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TranslateResource.java
+++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TranslateResource.java
@@ -22,13 +22,13 @@ import static java.nio.charset.StandardCharsets.UTF_8;
import java.io.IOException;
import java.io.InputStream;
import java.util.List;
+
import jakarta.ws.rs.Consumes;
import jakarta.ws.rs.POST;
import jakarta.ws.rs.PUT;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.PathParam;
import jakarta.ws.rs.Produces;
-
import org.apache.commons.io.IOUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -45,9 +45,9 @@ import org.apache.tika.server.core.ServerStatus;
public class TranslateResource {
private static final Logger LOG = LoggerFactory.getLogger(TranslateResource.class);
private final ServerStatus serverStatus;
+ private final long timeoutMillis;
private Translator defaultTranslator;
private ServiceLoader loader;
- private final long timeoutMillis;
public TranslateResource(ServerStatus serverStatus, long timeoutMillis) {
this.loader =
diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/UnpackerResource.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/UnpackerResource.java
index b3d6e92d4..2d251ab11 100644
--- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/UnpackerResource.java
+++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/UnpackerResource.java
@@ -30,6 +30,7 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
+
import jakarta.ws.rs.PUT;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.Produces;
@@ -38,7 +39,6 @@ import jakarta.ws.rs.core.Context;
import jakarta.ws.rs.core.HttpHeaders;
import jakarta.ws.rs.core.Response;
import jakarta.ws.rs.core.UriInfo;
-
import org.apache.commons.csv.CSVFormat;
import org.apache.commons.csv.CSVPrinter;
import org.apache.commons.io.FilenameUtils;
@@ -100,8 +100,7 @@ public class UnpackerResource {
public Map<String, byte[]> unpack(InputStream is, @Context HttpHeaders httpHeaders,
@Context UriInfo info) throws Exception {
return process(TikaResource.getInputStream(is, new Metadata(), httpHeaders, info),
- httpHeaders,
- info, false);
+ httpHeaders, info, false);
}
@Path("/all{id:(/.*)?}")
@@ -110,8 +109,7 @@ public class UnpackerResource {
public Map<String, byte[]> unpackAll(InputStream is, @Context HttpHeaders httpHeaders,
@Context UriInfo info) throws Exception {
return process(TikaResource.getInputStream(is, new Metadata(), httpHeaders, info),
- httpHeaders,
- info, true);
+ httpHeaders, info, true);
}
private Map<String, byte[]> process(InputStream is, @Context HttpHeaders httpHeaders,
@@ -119,12 +117,13 @@ public class UnpackerResource {
Metadata metadata = new Metadata();
ParseContext pc = new ParseContext();
long unpackMaxBytes = DEFAULT_MAX_ATTACHMENT_BYTES;
- String unpackMaxBytesString = httpHeaders.getRequestHeaders().getFirst(UNPACK_MAX_BYTES_KEY);
+ String unpackMaxBytesString =
+ httpHeaders.getRequestHeaders().getFirst(UNPACK_MAX_BYTES_KEY);
if (!StringUtils.isBlank(unpackMaxBytesString)) {
unpackMaxBytes = Long.parseLong(unpackMaxBytesString);
if (unpackMaxBytes > Integer.MAX_VALUE) {
- throw new IllegalArgumentException("Can't request value > than Integer" +
- ".MAX_VALUE : " + unpackMaxBytes);
+ throw new IllegalArgumentException(
+ "Can't request value > than Integer" + ".MAX_VALUE : " + unpackMaxBytes);
} else if (unpackMaxBytes < 0) {
throw new IllegalArgumentException("Can't request value < 0: " + unpackMaxBytes);
}
@@ -154,7 +153,8 @@ public class UnpackerResource {
Map<String, byte[]> files = new HashMap<>();
MutableInt count = new MutableInt();
- pc.set(EmbeddedDocumentExtractor.class, new MyEmbeddedDocumentExtractor(count, files, unpackMaxBytes));
+ pc.set(EmbeddedDocumentExtractor.class,
+ new MyEmbeddedDocumentExtractor(count, files, unpackMaxBytes));
TikaResource.parse(parser, LOG, info.getPath(), is, ch, metadata, pc);
@@ -165,7 +165,8 @@ public class UnpackerResource {
if (saveAll) {
files.put(TEXT_FILENAME, text.toByteArray());
- UnsynchronizedByteArrayOutputStream metaStream = new UnsynchronizedByteArrayOutputStream();
+ UnsynchronizedByteArrayOutputStream metaStream =
+ new UnsynchronizedByteArrayOutputStream();
metadataToCsv(metadata, metaStream);
files.put(META_FILENAME, metaStream.toByteArray());
@@ -182,7 +183,8 @@ public class UnpackerResource {
private final EmbeddedStreamTranslator embeddedStreamTranslator =
new DefaultEmbeddedStreamTranslator();
- MyEmbeddedDocumentExtractor(MutableInt count, Map<String, byte[]> zout, long unpackMaxBytes) {
+ MyEmbeddedDocumentExtractor(MutableInt count, Map<String, byte[]> zout,
+ long unpackMaxBytes) {
this.count = count;
this.zout = zout;
this.unpackMaxBytes = unpackMaxBytes;
@@ -199,12 +201,11 @@ public class UnpackerResource {
BoundedInputStream bis = new BoundedInputStream(unpackMaxBytes, inputStream);
IOUtils.copy(bis, bos);
if (bis.hasHitBound()) {
- throw new IOException(
- new TikaMemoryLimitException("An attachment is longer than " +
- "'unpackMaxBytes' (default=100MB, actual=" + unpackMaxBytes + "). " +
- "If you need to increase this " +
- "limit, add a header to your request, such as: unpackMaxBytes: " +
- "1073741824. There is a hard limit of 2GB."));
+ throw new IOException(new TikaMemoryLimitException("An attachment is longer than " +
+ "'unpackMaxBytes' (default=100MB, actual=" + unpackMaxBytes + "). " +
+ "If you need to increase this " +
+ "limit, add a header to your request, such as: unpackMaxBytes: " +
+ "1073741824. There is a hard limit of 2GB."));
}
byte[] data = bos.toByteArray();
@@ -229,9 +230,10 @@ public class UnpackerResource {
}
try (InputStream is = new UnsynchronizedByteArrayInputStream(data)) {
if (embeddedStreamTranslator.shouldTranslate(is, metadata)) {
- InputStream translated = embeddedStreamTranslator
- .translate(new UnsynchronizedByteArrayInputStream(data), metadata);
- UnsynchronizedByteArrayOutputStream bos2 = new UnsynchronizedByteArrayOutputStream();
+ InputStream translated = embeddedStreamTranslator.translate(
+ new UnsynchronizedByteArrayInputStream(data), metadata);
+ UnsynchronizedByteArrayOutputStream bos2 =
+ new UnsynchronizedByteArrayOutputStream();
IOUtils.copy(translated, bos2);
data = bos2.toByteArray();
}
diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/CSVMessageBodyWriter.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/CSVMessageBodyWriter.java
index e05e2be5c..384250832 100644
--- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/CSVMessageBodyWriter.java
+++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/CSVMessageBodyWriter.java
@@ -26,13 +26,13 @@ import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.Arrays;
+
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.WebApplicationException;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.MultivaluedMap;
import jakarta.ws.rs.ext.MessageBodyWriter;
import jakarta.ws.rs.ext.Provider;
-
import org.apache.commons.csv.CSVFormat;
import org.apache.commons.csv.CSVPrinter;
diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/JSONMessageBodyWriter.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/JSONMessageBodyWriter.java
index 695c58a00..66676bdb5 100644
--- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/JSONMessageBodyWriter.java
+++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/JSONMessageBodyWriter.java
@@ -25,6 +25,7 @@ import java.io.OutputStreamWriter;
import java.io.Writer;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
+
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.WebApplicationException;
import jakarta.ws.rs.core.MediaType;
@@ -52,8 +53,7 @@ public class JSONMessageBodyWriter implements MessageBodyWriter<Metadata> {
@Override
public void writeTo(Metadata metadata, Class<?> type, Type genericType,
Annotation[] annotations, MediaType mediaType,
- MultivaluedMap<String, Object> httpHeaders,
- OutputStream entityStream)
+ MultivaluedMap<String, Object> httpHeaders, OutputStream entityStream)
throws IOException, WebApplicationException {
try (Writer writer = new OutputStreamWriter(entityStream, UTF_8)) {
JsonMetadata.toJson(metadata, writer);
diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/JSONObjWriter.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/JSONObjWriter.java
index d0a5df44c..0243f2884 100644
--- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/JSONObjWriter.java
+++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/JSONObjWriter.java
@@ -26,6 +26,8 @@ import java.io.Writer;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
import java.util.Map;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.WebApplicationException;
import jakarta.ws.rs.core.MediaType;
@@ -33,8 +35,6 @@ import jakarta.ws.rs.core.MultivaluedMap;
import jakarta.ws.rs.ext.MessageBodyWriter;
import jakarta.ws.rs.ext.Provider;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
import org.apache.tika.metadata.Metadata;
@Provider
diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/MetadataListMessageBodyWriter.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/MetadataListMessageBodyWriter.java
index 59f77d44d..4e6814847 100644
--- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/MetadataListMessageBodyWriter.java
+++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/MetadataListMessageBodyWriter.java
@@ -25,6 +25,7 @@ import java.io.OutputStreamWriter;
import java.io.Writer;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
+
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.WebApplicationException;
import jakarta.ws.rs.core.MediaType;
diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/TarWriter.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/TarWriter.java
index 3972afe16..a5a3d9388 100644
--- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/TarWriter.java
+++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/TarWriter.java
@@ -22,13 +22,13 @@ import java.io.OutputStream;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
import java.util.Map;
+
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.WebApplicationException;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.MultivaluedMap;
import jakarta.ws.rs.ext.MessageBodyWriter;
import jakarta.ws.rs.ext.Provider;
-
import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/TextMessageBodyWriter.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/TextMessageBodyWriter.java
index e923cec1a..46b4bc98c 100644
--- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/TextMessageBodyWriter.java
+++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/TextMessageBodyWriter.java
@@ -25,6 +25,7 @@ import java.io.OutputStreamWriter;
import java.io.Writer;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
+
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.WebApplicationException;
import jakarta.ws.rs.core.MediaType;
diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/ZipWriter.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/ZipWriter.java
index 9e637dc07..923f15059 100644
--- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/ZipWriter.java
+++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/writer/ZipWriter.java
@@ -27,13 +27,13 @@ import java.util.zip.CRC32;
import java.util.zip.ZipEntry;
import java.util.zip.ZipException;
import java.util.zip.ZipOutputStream;
+
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.WebApplicationException;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.MultivaluedMap;
import jakarta.ws.rs.ext.MessageBodyWriter;
import jakarta.ws.rs.ext.Provider;
-
import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream;
diff --git a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/IntegrationTestBase.java b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/IntegrationTestBase.java
index ad22b7cc9..858f15243 100644
--- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/IntegrationTestBase.java
+++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/IntegrationTestBase.java
@@ -27,8 +27,8 @@ import java.util.Arrays;
import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
-import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.jaxrs.client.WebClient;
import org.junit.jupiter.api.AfterEach;
@@ -120,7 +120,7 @@ public class IntegrationTestBase extends TikaTest {
LOG.debug("tika test client failed to connect to server with status: {}",
response.getStatus());
- } catch (javax.ws.rs.ProcessingException e) {
+ } catch (jakarta.ws.rs.ProcessingException e) {
LOG.debug("tika test client failed to connect to server", e);
}
diff --git a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/LanguageResourceTest.java b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/LanguageResourceTest.java
index 03098734f..0ed0df06b 100644
--- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/LanguageResourceTest.java
+++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/LanguageResourceTest.java
@@ -23,8 +23,8 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
-import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
diff --git a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/RecursiveMetadataResourceTest.java b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/RecursiveMetadataResourceTest.java
index 370aecbc7..7b5d15d9f 100644
--- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/RecursiveMetadataResourceTest.java
+++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/RecursiveMetadataResourceTest.java
@@ -25,8 +25,8 @@ import java.io.InputStreamReader;
import java.io.Reader;
import java.util.ArrayList;
import java.util.List;
-import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
diff --git a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/StackTraceOffTest.java b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/StackTraceOffTest.java
index 84d563d0e..32fe5f957 100644
--- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/StackTraceOffTest.java
+++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/StackTraceOffTest.java
@@ -22,9 +22,9 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
+
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
-
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.lifecycle.ResourceProvider;
diff --git a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/StackTraceTest.java b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/StackTraceTest.java
index ebe7c37d0..f95f71f26 100644
--- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/StackTraceTest.java
+++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/StackTraceTest.java
@@ -23,9 +23,9 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
+
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
-
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.lifecycle.ResourceProvider;
diff --git a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaMimeTypesTest.java b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaMimeTypesTest.java
index 6fe5ec1be..31492afce 100644
--- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaMimeTypesTest.java
+++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaMimeTypesTest.java
@@ -18,8 +18,8 @@
package org.apache.tika.server.core;
import java.io.InputStream;
-import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
diff --git a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaPipesTest.java b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaPipesTest.java
index e91754f24..b96e1d2f1 100644
--- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaPipesTest.java
+++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaPipesTest.java
@@ -34,10 +34,10 @@ import java.nio.file.Path;
import java.nio.file.StandardCopyOption;
import java.util.ArrayList;
import java.util.List;
-import jakarta.ws.rs.core.Response;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.ws.rs.core.Response;
import org.apache.commons.io.FileUtils;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.WebClient;
diff --git a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaResourceFetcherTest.java b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaResourceFetcherTest.java
index 7f4b2fcbc..f7475e546 100644
--- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaResourceFetcherTest.java
+++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaResourceFetcherTest.java
@@ -25,10 +25,10 @@ import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.List;
+
import jakarta.ws.rs.core.MultivaluedHashMap;
import jakarta.ws.rs.core.MultivaluedMap;
import jakarta.ws.rs.core.Response;
-
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
diff --git a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaResourceMetadataFilterTest.java b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaResourceMetadataFilterTest.java
index 7155baccb..1786a0a7e 100644
--- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaResourceMetadataFilterTest.java
+++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaResourceMetadataFilterTest.java
@@ -25,8 +25,8 @@ import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
-import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
diff --git a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaResourceNoStackTest.java b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaResourceNoStackTest.java
index 6b7896029..b28c5e2bb 100644
--- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaResourceNoStackTest.java
+++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaResourceNoStackTest.java
@@ -25,8 +25,8 @@ import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
-import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
diff --git a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaResourceTest.java b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaResourceTest.java
index 68195b87b..535c40d39 100644
--- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaResourceTest.java
+++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaResourceTest.java
@@ -25,10 +25,10 @@ import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
+
import jakarta.ws.rs.core.MultivaluedHashMap;
import jakarta.ws.rs.core.MultivaluedMap;
import jakarta.ws.rs.core.Response;
-
import org.apache.cxf.attachment.AttachmentUtil;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.WebClient;
diff --git a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerAsyncIntegrationTest.java b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerAsyncIntegrationTest.java
index 3542c863f..5cc1e22c8 100644
--- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerAsyncIntegrationTest.java
+++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerAsyncIntegrationTest.java
@@ -30,10 +30,10 @@ import java.nio.file.Path;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
-import jakarta.ws.rs.core.Response;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.ws.rs.core.Response;
import org.apache.commons.io.FileUtils;
import org.apache.cxf.jaxrs.client.WebClient;
import org.junit.jupiter.api.BeforeAll;
diff --git a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerIntegrationTest.java b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerIntegrationTest.java
index d02084cd6..e9c3704db 100644
--- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerIntegrationTest.java
+++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerIntegrationTest.java
@@ -34,11 +34,11 @@ import java.util.List;
import java.util.Random;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
-import jakarta.ws.rs.ProcessingException;
-import jakarta.ws.rs.core.Response;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.ws.rs.ProcessingException;
+import jakarta.ws.rs.core.Response;
import org.apache.commons.io.IOUtils;
import org.apache.cxf.configuration.jsse.TLSClientParameters;
import org.apache.cxf.configuration.jsse.TLSParameterJaxBUtils;
diff --git a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerPipesIntegrationTest.java b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerPipesIntegrationTest.java
index 1fab6f1fb..658f9a7e8 100644
--- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerPipesIntegrationTest.java
+++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerPipesIntegrationTest.java
@@ -28,11 +28,11 @@ import java.io.InputStreamReader;
import java.io.Reader;
import java.nio.file.Files;
import java.nio.file.Path;
-import jakarta.ws.rs.ProcessingException;
-import jakarta.ws.rs.core.Response;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.ws.rs.ProcessingException;
+import jakarta.ws.rs.core.Response;
import org.apache.commons.io.FileUtils;
import org.apache.cxf.jaxrs.client.WebClient;
import org.junit.jupiter.api.AfterEach;
diff --git a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerStatusTest.java b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerStatusTest.java
index 9579b5536..665f2ee8a 100644
--- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerStatusTest.java
+++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerStatusTest.java
@@ -23,10 +23,10 @@ import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
-import jakarta.ws.rs.core.Response;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.ws.rs.core.Response;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
diff --git a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaVersionTest.java b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaVersionTest.java
index 67d9cc6ea..b1a81f230 100644
--- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaVersionTest.java
+++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaVersionTest.java
@@ -20,8 +20,8 @@ package org.apache.tika.server.core;
import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.InputStream;
-import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
diff --git a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaWelcomeTest.java b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaWelcomeTest.java
index 42252dfbc..3c97d329c 100644
--- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaWelcomeTest.java
+++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaWelcomeTest.java
@@ -20,8 +20,8 @@ package org.apache.tika.server.core;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
-import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.lifecycle.ResourceProvider;
diff --git a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TranslateResourceTest.java b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TranslateResourceTest.java
index 188d47e3e..20b67b52b 100644
--- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TranslateResourceTest.java
+++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TranslateResourceTest.java
@@ -23,8 +23,8 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
-import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
diff --git a/tika-server/tika-server-eval/src/main/java/org/apache/tika/server/eval/TikaEvalResource.java b/tika-server/tika-server-eval/src/main/java/org/apache/tika/server/eval/TikaEvalResource.java
index d0ece4ae9..73430f292 100644
--- a/tika-server/tika-server-eval/src/main/java/org/apache/tika/server/eval/TikaEvalResource.java
+++ b/tika-server/tika-server-eval/src/main/java/org/apache/tika/server/eval/TikaEvalResource.java
@@ -32,14 +32,14 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
import jakarta.ws.rs.Consumes;
import jakarta.ws.rs.PUT;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.Produces;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
import org.apache.tika.eval.core.langid.LanguageIDWrapper;
import org.apache.tika.eval.core.metadata.TikaEvalMetadataFilter;
import org.apache.tika.eval.core.textstats.BasicTokenCountStatsCalculator;
diff --git a/tika-server/tika-server-eval/src/test/java/org/apache/tika/server/eval/TikaEvalResourceTest.java b/tika-server/tika-server-eval/src/test/java/org/apache/tika/server/eval/TikaEvalResourceTest.java
index d531638eb..7c436fd2d 100644
--- a/tika-server/tika-server-eval/src/test/java/org/apache/tika/server/eval/TikaEvalResourceTest.java
+++ b/tika-server/tika-server-eval/src/test/java/org/apache/tika/server/eval/TikaEvalResourceTest.java
@@ -29,11 +29,11 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import jakarta.ws.rs.core.Response;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.ws.rs.core.Response;
import org.apache.cxf.binding.BindingFactoryManager;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.jaxrs.JAXRSBindingFactory;
diff --git a/tika-server/tika-server-standard/pom.xml b/tika-server/tika-server-standard/pom.xml
index bf926cc83..2d61772a4 100644
--- a/tika-server/tika-server-standard/pom.xml
+++ b/tika-server/tika-server-standard/pom.xml
@@ -163,7 +163,7 @@
<exclude>com.sun.istack:istack-commons-runtime:jar:</exclude>
<exclude>com.sun.activation:jakarta.activation:jar:</exclude> <!-- NOT SURA these coordinates are correcte -->
<exclude>com.fasterxml.jackson.core:jackson-core:jar:</exclude>
- <exclude>com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:jar:</exclude>
+ <exclude>com.fasterxml.jackson.jaxrs:jackson-jakarta-rs-json-provider:jar:</exclude>
<exclude>com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:jar:</exclude>
<exclude>com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:</exclude>
<exclude>com.fasterxml.jackson.core:jackson-annotations:jar:</exclude>
diff --git a/tika-server/tika-server-standard/src/main/java/org/apache/tika/server/standard/config/PDFServerConfig.java b/tika-server/tika-server-standard/src/main/java/org/apache/tika/server/standard/config/PDFServerConfig.java
index 2bcf9e2fc..ee8aa8685 100644
--- a/tika-server/tika-server-standard/src/main/java/org/apache/tika/server/standard/config/PDFServerConfig.java
+++ b/tika-server/tika-server-standard/src/main/java/org/apache/tika/server/standard/config/PDFServerConfig.java
@@ -20,8 +20,8 @@ import static org.apache.tika.server.core.resource.TikaResource.processHeaderCon
import java.util.List;
import java.util.Map;
-import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.MultivaluedMap;
import org.apache.commons.lang3.StringUtils;
import org.apache.tika.metadata.Metadata;
diff --git a/tika-server/tika-server-standard/src/main/java/org/apache/tika/server/standard/config/TesseractServerConfig.java b/tika-server/tika-server-standard/src/main/java/org/apache/tika/server/standard/config/TesseractServerConfig.java
index fad383b3a..cdf1b5d1a 100644
--- a/tika-server/tika-server-standard/src/main/java/org/apache/tika/server/standard/config/TesseractServerConfig.java
+++ b/tika-server/tika-server-standard/src/main/java/org/apache/tika/server/standard/config/TesseractServerConfig.java
@@ -20,8 +20,8 @@ import static org.apache.tika.server.core.resource.TikaResource.processHeaderCon
import java.util.List;
import java.util.Map;
-import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.MultivaluedMap;
import org.apache.commons.lang3.StringUtils;
import org.apache.tika.metadata.Metadata;
diff --git a/tika-server/tika-server-standard/src/main/java/org/apache/tika/server/standard/resource/XMPMetadataResource.java b/tika-server/tika-server-standard/src/main/java/org/apache/tika/server/standard/resource/XMPMetadataResource.java
index 0a39fbfec..3879f5c0a 100644
--- a/tika-server/tika-server-standard/src/main/java/org/apache/tika/server/standard/resource/XMPMetadataResource.java
+++ b/tika-server/tika-server-standard/src/main/java/org/apache/tika/server/standard/resource/XMPMetadataResource.java
@@ -17,6 +17,7 @@
package org.apache.tika.server.standard.resource;
import java.io.InputStream;
+
import jakarta.ws.rs.Consumes;
import jakarta.ws.rs.POST;
import jakarta.ws.rs.PUT;
@@ -27,7 +28,6 @@ import jakarta.ws.rs.core.Context;
import jakarta.ws.rs.core.HttpHeaders;
import jakarta.ws.rs.core.Response;
import jakarta.ws.rs.core.UriInfo;
-
import org.apache.cxf.jaxrs.ext.multipart.Attachment;
import org.apache.tika.metadata.Metadata;
@@ -53,8 +53,9 @@ public class XMPMetadataResource extends MetadataResource implements TikaServerR
@Path("form")
public Response getMetadataFromMultipart(Attachment att, @Context UriInfo info)
throws Exception {
- return Response.ok(parseMetadata(att.getObject(InputStream.class), new Metadata(),
- att.getHeaders(), info)).build();
+ return Response.ok(
+ parseMetadata(att.getObject(InputStream.class), new Metadata(), att.getHeaders(),
+ info)).build();
}
@PUT
@@ -62,9 +63,8 @@ public class XMPMetadataResource extends MetadataResource implements TikaServerR
public Response getMetadata(InputStream is, @Context HttpHeaders httpHeaders,
@Context UriInfo info) throws Exception {
Metadata metadata = new Metadata();
- return Response
- .ok(parseMetadata(TikaResource.getInputStream(is, metadata, httpHeaders, info),
- metadata,
- httpHeaders.getRequestHeaders(), info)).build();
+ return Response.ok(
+ parseMetadata(TikaResource.getInputStream(is, metadata, httpHeaders, info),
+ metadata, httpHeaders.getRequestHeaders(), info)).build();
}
}
diff --git a/tika-server/tika-server-standard/src/main/java/org/apache/tika/server/standard/writer/XMPMessageBodyWriter.java b/tika-server/tika-server-standard/src/main/java/org/apache/tika/server/standard/writer/XMPMessageBodyWriter.java
index 14ec3afc6..8a330fd08 100644
--- a/tika-server/tika-server-standard/src/main/java/org/apache/tika/server/standard/writer/XMPMessageBodyWriter.java
+++ b/tika-server/tika-server-standard/src/main/java/org/apache/tika/server/standard/writer/XMPMessageBodyWriter.java
@@ -25,6 +25,7 @@ import java.io.OutputStreamWriter;
import java.io.Writer;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
+
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.WebApplicationException;
import jakarta.ws.rs.core.MediaType;
diff --git a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/DetectorResourceTest.java b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/DetectorResourceTest.java
index 87497ed2c..f3f51ecd1 100644
--- a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/DetectorResourceTest.java
+++ b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/DetectorResourceTest.java
@@ -23,8 +23,8 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
-import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
diff --git a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/FetcherTest.java b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/FetcherTest.java
index 81b967f63..79fc3e81d 100644
--- a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/FetcherTest.java
+++ b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/FetcherTest.java
@@ -25,8 +25,8 @@ import java.io.InputStreamReader;
import java.io.Reader;
import java.util.ArrayList;
import java.util.List;
-import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.WebClient;
diff --git a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/MetadataResourceTest.java b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/MetadataResourceTest.java
index 13b5ba3f7..a66ecfae5 100644
--- a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/MetadataResourceTest.java
+++ b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/MetadataResourceTest.java
@@ -28,9 +28,9 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
-
import org.apache.commons.csv.CSVFormat;
import org.apache.commons.csv.CSVParser;
import org.apache.commons.csv.CSVRecord;
@@ -93,29 +93,32 @@ public class MetadataResourceTest extends CXFTestBase {
assertNotNull(metadata.get(TikaCoreProperties.CREATOR.getName()));
assertEquals("Maxim Valyanskiy", metadata.get(TikaCoreProperties.CREATOR.getName()));
- assertEquals("f8be45c34e8919eedba48cc8d207fbf0", metadata.get("X-TIKA:digest:MD5"), "X-TIKA:digest:MD5");
+ assertEquals("f8be45c34e8919eedba48cc8d207fbf0", metadata.get("X-TIKA:digest:MD5"),
+ "X-TIKA:digest:MD5");
}
@Test
public void testPasswordProtected() throws Exception {
Response response = WebClient.create(endPoint + META_PATH).type("application/vnd.ms-excel")
- .accept("text/csv").put(ClassLoader
- .getSystemResourceAsStream(TikaResourceTest.TEST_PASSWORD_PROTECTED));
+ .accept("text/csv").put(ClassLoader.getSystemResourceAsStream(
+ TikaResourceTest.TEST_PASSWORD_PROTECTED));
// Won't work, no password given
assertEquals(500, response.getStatus());
// Try again, this time with the wrong password
response = WebClient.create(endPoint + META_PATH).type("application/vnd.ms-excel")
- .accept("text/csv").header("Password", "wrong password").put(ClassLoader
- .getSystemResourceAsStream(TikaResourceTest.TEST_PASSWORD_PROTECTED));
+ .accept("text/csv").header("Password", "wrong password")
+ .put(ClassLoader.getSystemResourceAsStream(
+ TikaResourceTest.TEST_PASSWORD_PROTECTED));
assertEquals(500, response.getStatus());
// Try again, this time with the password
response = WebClient.create(endPoint + META_PATH).type("application/vnd.ms-excel")
- .accept("text/csv").header("Password", "password").put(ClassLoader
- .getSystemResourceAsStream(TikaResourceTest.TEST_PASSWORD_PROTECTED));
+ .accept("text/csv").header("Password", "password")
+ .put(ClassLoader.getSystemResourceAsStream(
+ TikaResourceTest.TEST_PASSWORD_PROTECTED));
// Will work
assertEquals(200, response.getStatus());
@@ -203,8 +206,8 @@ public class MetadataResourceTest extends CXFTestBase {
.type("application/msword").accept(MediaType.APPLICATION_JSON)
.put(copy(stream, 12000));
assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
- Metadata metadata = JsonMetadata
- .fromJson(new InputStreamReader((InputStream) response.getEntity(), UTF_8));
+ Metadata metadata = JsonMetadata.fromJson(
+ new InputStreamReader((InputStream) response.getEntity(), UTF_8));
assertEquals("Maxim Valyanskiy", metadata.get(TikaCoreProperties.CREATOR));
assertEquals(1, metadata.names().length);
}
diff --git a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/OpenNLPMetadataFilterTest.java b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/OpenNLPMetadataFilterTest.java
index e42744428..43f967e03 100644
--- a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/OpenNLPMetadataFilterTest.java
+++ b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/OpenNLPMetadataFilterTest.java
@@ -25,8 +25,8 @@ import java.io.InputStreamReader;
import java.io.Reader;
import java.util.ArrayList;
import java.util.List;
-import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
@@ -69,8 +69,7 @@ public class OpenNLPMetadataFilterTest extends CXFTestBase {
@Override
protected InputStream getTikaConfigInputStream() {
- return getClass().getResourceAsStream(
- "/config/tika-config-langdetect-opennlp-filter.xml");
+ return getClass().getResourceAsStream("/config/tika-config-langdetect-opennlp-filter.xml");
}
@Test
diff --git a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/OptimaizeMetadataFilterTest.java b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/OptimaizeMetadataFilterTest.java
index 5697a2f6b..d79e429b0 100644
--- a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/OptimaizeMetadataFilterTest.java
+++ b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/OptimaizeMetadataFilterTest.java
@@ -25,8 +25,8 @@ import java.io.InputStreamReader;
import java.io.Reader;
import java.util.ArrayList;
import java.util.List;
-import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
@@ -69,7 +69,8 @@ public class OptimaizeMetadataFilterTest extends CXFTestBase {
@Override
protected InputStream getTikaConfigInputStream() {
- return getClass().getResourceAsStream("/config/tika-config-langdetect-optimaize-filter.xml");
+ return getClass().getResourceAsStream(
+ "/config/tika-config-langdetect-optimaize-filter.xml");
}
@Test
diff --git a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/RecursiveMetadataFilterTest.java b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/RecursiveMetadataFilterTest.java
index f1d119927..cdc271150 100644
--- a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/RecursiveMetadataFilterTest.java
+++ b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/RecursiveMetadataFilterTest.java
@@ -29,8 +29,8 @@ import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.WebClient;
diff --git a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/RecursiveMetadataResourceTest.java b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/RecursiveMetadataResourceTest.java
index 791007721..fde709e4e 100644
--- a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/RecursiveMetadataResourceTest.java
+++ b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/RecursiveMetadataResourceTest.java
@@ -28,10 +28,10 @@ import java.io.InputStreamReader;
import java.io.Reader;
import java.util.ArrayList;
import java.util.List;
+
import jakarta.ws.rs.core.MultivaluedHashMap;
import jakarta.ws.rs.core.MultivaluedMap;
import jakarta.ws.rs.core.Response;
-
import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.WebClient;
@@ -159,8 +159,8 @@ public class RecursiveMetadataResourceTest extends CXFTestBase {
@Test
public void testPasswordProtected() throws Exception {
Response response = WebClient.create(endPoint + META_PATH).type("application/vnd.ms-excel")
- .accept("application/json").put(ClassLoader
- .getSystemResourceAsStream(TikaResourceTest.TEST_PASSWORD_PROTECTED));
+ .accept("application/json").put(ClassLoader.getSystemResourceAsStream(
+ TikaResourceTest.TEST_PASSWORD_PROTECTED));
// Won't work, no password given
assertEquals(200, response.getStatus());
@@ -173,8 +173,9 @@ public class RecursiveMetadataResourceTest extends CXFTestBase {
metadataList.get(0).get(TikaCoreProperties.CONTAINER_EXCEPTION));
// Try again, this time with the password
response = WebClient.create(endPoint + META_PATH).type("application/vnd.ms-excel")
- .accept("application/json").header("Password", "password").put(ClassLoader
- .getSystemResourceAsStream(TikaResourceTest.TEST_PASSWORD_PROTECTED));
+ .accept("application/json").header("Password", "password")
+ .put(ClassLoader.getSystemResourceAsStream(
+ TikaResourceTest.TEST_PASSWORD_PROTECTED));
// Will work
assertEquals(200, response.getStatus());
@@ -387,8 +388,9 @@ public class RecursiveMetadataResourceTest extends CXFTestBase {
public void testWriteLimitInPDF() throws Exception {
int writeLimit = 10;
Response response = WebClient.create(endPoint + META_PATH).accept("application/json")
- .header("writeLimit", Integer.toString(writeLimit)).put(ClassLoader
- .getSystemResourceAsStream("test-documents/testPDFTwoTextBoxes" + ".pdf"));
+ .header("writeLimit", Integer.toString(writeLimit))
+ .put(ClassLoader.getSystemResourceAsStream(
+ "test-documents/testPDFTwoTextBoxes" + ".pdf"));
assertEquals(200, response.getStatus());
Reader reader = new InputStreamReader((InputStream) response.getEntity(), UTF_8);
diff --git a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/TikaDetectorsTest.java b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/TikaDetectorsTest.java
index 3327c7c05..9ff0474f5 100644
--- a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/TikaDetectorsTest.java
+++ b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/TikaDetectorsTest.java
@@ -23,9 +23,9 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.InputStream;
import java.util.List;
import java.util.Map;
-import jakarta.ws.rs.core.Response;
import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.ws.rs.core.Response;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
@@ -91,8 +91,8 @@ public class TikaDetectorsTest extends CXFTestBase {
@SuppressWarnings("unchecked")
public void testGetJSON() throws Exception {
Response response = WebClient.create(endPoint + DETECTORS_PATH)
- .type(javax.ws.rs.core.MediaType.APPLICATION_JSON)
- .accept(javax.ws.rs.core.MediaType.APPLICATION_JSON).get();
+ .type(jakarta.ws.rs.core.MediaType.APPLICATION_JSON)
+ .accept(jakarta.ws.rs.core.MediaType.APPLICATION_JSON).get();
String jsonStr = getStringFromInputStream((InputStream) response.getEntity());
Map<String, Object> json = new ObjectMapper().readerFor(Map.class).readValue(jsonStr);
diff --git a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/TikaMimeTypesTest.java b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/TikaMimeTypesTest.java
index fa900a9ec..db9d441ea 100644
--- a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/TikaMimeTypesTest.java
+++ b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/TikaMimeTypesTest.java
@@ -23,9 +23,9 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.InputStream;
import java.util.List;
import java.util.Map;
-import jakarta.ws.rs.core.Response;
import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.ws.rs.core.Response;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
@@ -54,8 +54,8 @@ public class TikaMimeTypesTest extends CXFTestBase {
@SuppressWarnings("unchecked")
public void testGetJSON() throws Exception {
Response response = WebClient.create(endPoint + MIMETYPES_PATH)
- .type(javax.ws.rs.core.MediaType.APPLICATION_JSON)
- .accept(javax.ws.rs.core.MediaType.APPLICATION_JSON).get();
+ .type(jakarta.ws.rs.core.MediaType.APPLICATION_JSON)
+ .accept(jakarta.ws.rs.core.MediaType.APPLICATION_JSON).get();
String jsonStr = getStringFromInputStream((InputStream) response.getEntity());
Map<String, Map<String, Object>> json =
@@ -76,8 +76,7 @@ public class TikaMimeTypesTest extends CXFTestBase {
String whichParser = bmp.get("parser").toString();
assertTrue(whichParser.equals("org.apache.tika.parser.ocr.TesseractOCRParser") ||
- whichParser.equals("org.apache.tika.parser.image.ImageParser"),
- "Which parser");
+ whichParser.equals("org.apache.tika.parser.image.ImageParser"), "Which parser");
Map<String, Object> ogm = json.get("video/x-ogm");
assertEquals("video/ogg", ogm.get("supertype"));
diff --git a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/TikaParsersTest.java b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/TikaParsersTest.java
index 0be7b5675..4a87ee358 100644
--- a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/TikaParsersTest.java
+++ b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/TikaParsersTest.java
@@ -23,9 +23,9 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.InputStream;
import java.util.List;
import java.util.Map;
-import jakarta.ws.rs.core.Response;
import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.ws.rs.core.Response;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
@@ -124,8 +124,8 @@ public class TikaParsersTest extends CXFTestBase {
public void testGetJSON() throws Exception {
for (boolean details : new boolean[]{false, true}) {
Response response = WebClient.create(endPoint + getPath(details))
- .type(javax.ws.rs.core.MediaType.APPLICATION_JSON)
- .accept(javax.ws.rs.core.MediaType.APPLICATION_JSON).get();
+ .type(jakarta.ws.rs.core.MediaType.APPLICATION_JSON)
+ .accept(jakarta.ws.rs.core.MediaType.APPLICATION_JSON).get();
String jsonStr = getStringFromInputStream((InputStream) response.getEntity());
Map<String, Map<String, Object>> json =
diff --git a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/TikaPipesTest.java b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/TikaPipesTest.java
index 28ae9c122..7f41e065c 100644
--- a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/TikaPipesTest.java
+++ b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/TikaPipesTest.java
@@ -30,8 +30,8 @@ import java.nio.file.Path;
import java.nio.file.StandardCopyOption;
import java.util.ArrayList;
import java.util.List;
-import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.lifecycle.ResourceProvider;
@@ -67,17 +67,14 @@ import org.apache.tika.utils.ProcessUtils;
public class TikaPipesTest extends CXFTestBase {
private static final String PIPES_PATH = "/pipes";
-
+ private static final String TEST_RECURSIVE_DOC = "test_recursive_embedded.docx";
@TempDir
private static Path TMP_WORKING_DIR;
-
private static Path TMP_OUTPUT_DIR;
-
private static Path TMP_OUTPUT_FILE;
private static Path TIKA_PIPES_LOG4j2_PATH;
private static Path TIKA_CONFIG_PATH;
private static String TIKA_CONFIG_XML;
- private static final String TEST_RECURSIVE_DOC = "test_recursive_embedded.docx";
private static FetcherManager FETCHER_MANAGER;
@BeforeAll
@@ -101,23 +98,19 @@ public class TikaPipesTest extends CXFTestBase {
TIKA_CONFIG_XML =
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + "<properties>" + "<fetchers>" +
"<fetcher class=\"org.apache.tika.pipes.fetcher.fs.FileSystemFetcher\">" +
- "<params>" + "<name>fsf</name>" +
- "<basePath>" + inputDir.toAbsolutePath() +
+ "<params>" + "<name>fsf</name>" + "<basePath>" + inputDir.toAbsolutePath() +
"</basePath>" + "</params>" + "</fetcher>" + "</fetchers>" + "<emitters>" +
"<emitter class=\"org.apache.tika.pipes.emitter.fs.FileSystemEmitter\">" +
- "<params>" + "<name>fse</name>" +
- "<basePath>" +
+ "<params>" + "<name>fse</name>" + "<basePath>" +
TMP_OUTPUT_DIR.toAbsolutePath() + "</basePath>" + "</params>" +
- "</emitter>" +
- "</emitters>" + "<pipes><params><tikaConfig>" +
- ProcessUtils.escapeCommandLine(TIKA_CONFIG_PATH.toAbsolutePath().toString()) +
- "</tikaConfig><numClients>10</numClients>" +
- "<forkedJvmArgs>" +
- "<arg>-Xmx256m</arg>" +
- "<arg>-Dlog4j.configurationFile=file:" +
- ProcessUtils.escapeCommandLine(TIKA_PIPES_LOG4j2_PATH.toAbsolutePath().toString()) + "</arg>" +
- "</forkedJvmArgs>" +
- "</params></pipes>" + "</properties>";
+ "</emitter>" + "</emitters>" + "<pipes><params><tikaConfig>" +
+ ProcessUtils.escapeCommandLine(
+ TIKA_CONFIG_PATH.toAbsolutePath().toString()) +
+ "</tikaConfig><numClients>10</numClients>" + "<forkedJvmArgs>" +
+ "<arg>-Xmx256m</arg>" + "<arg>-Dlog4j.configurationFile=file:" +
+ ProcessUtils.escapeCommandLine(
+ TIKA_PIPES_LOG4j2_PATH.toAbsolutePath().toString()) + "</arg>" +
+ "</forkedJvmArgs>" + "</params></pipes>" + "</properties>";
Files.write(TIKA_CONFIG_PATH, TIKA_CONFIG_XML.getBytes(StandardCharsets.UTF_8));
}
@@ -166,8 +159,7 @@ public class TikaPipesTest extends CXFTestBase {
public void testBasic() throws Exception {
FetchEmitTuple t =
- new FetchEmitTuple("myId",
- new FetchKey("fsf", "test_recursive_embedded.docx"),
+ new FetchEmitTuple("myId", new FetchKey("fsf", "test_recursive_embedded.docx"),
new EmitKey("fse", ""));
StringWriter writer = new StringWriter();
JsonFetchEmitTuple.toJson(t, writer);
@@ -190,10 +182,8 @@ public class TikaPipesTest extends CXFTestBase {
public void testConcatenated() throws Exception {
FetchEmitTuple t =
- new FetchEmitTuple("myId",
- new FetchKey("fsf", "test_recursive_embedded.docx"),
- new EmitKey("fse", ""),
- new Metadata(),
+ new FetchEmitTuple("myId", new FetchKey("fsf", "test_recursive_embedded.docx"),
+ new EmitKey("fse", ""), new Metadata(),
new HandlerConfig(BasicContentHandlerFactory.HANDLER_TYPE.TEXT,
HandlerConfig.PARSE_MODE.CONCATENATE, -1, -1000, true),
FetchEmitTuple.ON_PARSE_EXCEPTION.EMIT);
diff --git a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/TikaResourceTest.java b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/TikaResourceTest.java
index 4b1cf914e..6d9d7cc2b 100644
--- a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/TikaResourceTest.java
+++ b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/TikaResourceTest.java
@@ -31,10 +31,10 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Locale;
+
import jakarta.ws.rs.ProcessingException;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
-
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream;
import org.apache.cxf.attachment.AttachmentUtil;
@@ -351,8 +351,8 @@ public class TikaResourceTest extends CXFTestBase {
response =
WebClient.create(endPoint + TIKA_PATH).type("application/pdf").accept("text/plain")
- .header(TesseractServerConfig.X_TIKA_OCR_HEADER_PREFIX
- .toLowerCase(Locale.ROOT) + "skipocr", "true")
+ .header(TesseractServerConfig.X_TIKA_OCR_HEADER_PREFIX.toLowerCase(
+ Locale.ROOT) + "skipocr", "true")
.put(ClassLoader.getSystemResourceAsStream("test-documents/testOCR.pdf"));
responseMsg = getStringFromInputStream((InputStream) response.getEntity());
@@ -393,8 +393,8 @@ public class TikaResourceTest extends CXFTestBase {
response =
WebClient.create(endPoint + TIKA_PATH).type("application/pdf").accept("text/plain")
.header(PDFServerConfig.X_TIKA_PDF_HEADER_PREFIX + "sortByPosition",
- "false").put(ClassLoader
- .getSystemResourceAsStream("test-documents/testPDFTwoTextBoxes.pdf"));
+ "false").put(ClassLoader.getSystemResourceAsStream(
+ "test-documents/testPDFTwoTextBoxes.pdf"));
responseMsg = getStringFromInputStream((InputStream) response.getEntity());
responseMsg = responseMsg.replaceAll("[\r\n ]+", " ").trim();
assertEquals(
@@ -487,8 +487,9 @@ public class TikaResourceTest extends CXFTestBase {
final String encoded =
new Base64().encodeAsString(password.getBytes(StandardCharsets.UTF_8));
Response response = WebClient.create(endPoint + TIKA_PATH).accept("text/plain")
- .header(PasswordProviderConfig.PASSWORD_BASE64_UTF8, encoded).put(ClassLoader
- .getSystemResourceAsStream("test-documents/testPassword4Spaces.pdf"));
+ .header(PasswordProviderConfig.PASSWORD_BASE64_UTF8, encoded)
+ .put(ClassLoader.getSystemResourceAsStream(
+ "test-documents/testPassword4Spaces.pdf"));
String responseMsg = getStringFromInputStream((InputStream) response.getEntity());
assertContains("Just some text.", responseMsg);
}
@@ -501,8 +502,9 @@ public class TikaResourceTest extends CXFTestBase {
final String encoded =
new Base64().encodeAsString(password.getBytes(StandardCharsets.UTF_8));
Response response = WebClient.create(endPoint + TIKA_PATH).accept("text/plain")
- .header(PasswordProviderConfig.PASSWORD_BASE64_UTF8, encoded).put(ClassLoader
- .getSystemResourceAsStream("test-documents/testUnicodePassword.pdf"));
+ .header(PasswordProviderConfig.PASSWORD_BASE64_UTF8, encoded)
+ .put(ClassLoader.getSystemResourceAsStream(
+ "test-documents/testUnicodePassword.pdf"));
String responseMsg = getStringFromInputStream((InputStream) response.getEntity());
assertContains("Just some text.", responseMsg);
}
@@ -600,8 +602,7 @@ public class TikaResourceTest extends CXFTestBase {
public void testJsonNoThrowWriteLimitEmbedded() throws Exception {
Response response =
WebClient.create(endPoint + TIKA_PATH + "/html").accept("application/json")
- .header("writeLimit", "500")
- .header("throwOnWriteLimitReached", "false")
+ .header("writeLimit", "500").header("throwOnWriteLimitReached", "false")
.put(ClassLoader.getSystemResourceAsStream(TEST_RECURSIVE_DOC));
Metadata metadata = JsonMetadata.fromJson(
new InputStreamReader(((InputStream) response.getEntity()),
@@ -620,8 +621,9 @@ public class TikaResourceTest extends CXFTestBase {
public void testWriteLimitInPDF() throws Exception {
int writeLimit = 10;
Response response = WebClient.create(endPoint + TIKA_PATH).accept("application/json")
- .header("writeLimit", Integer.toString(writeLimit)).put(ClassLoader
- .getSystemResourceAsStream("test-documents/testPDFTwoTextBoxes.pdf"));
+ .header("writeLimit", Integer.toString(writeLimit))
+ .put(ClassLoader.getSystemResourceAsStream(
+ "test-documents/testPDFTwoTextBoxes.pdf"));
assertEquals(200, response.getStatus());
Reader reader = new InputStreamReader((InputStream) response.getEntity(), UTF_8);
diff --git a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/UnpackerResourceTest.java b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/UnpackerResourceTest.java
index d8d6216d1..c99ade885 100644
--- a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/UnpackerResourceTest.java
+++ b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/UnpackerResourceTest.java
@@ -30,8 +30,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import javax.imageio.ImageIO;
-import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.WebClient;
@@ -265,10 +265,8 @@ public class UnpackerResourceTest extends CXFTestBase {
break;
}
}
- assertEquals("image/png",
- TikaConfig.getDefaultConfig().getDetector()
- .detect(new ByteArrayInputStream(renderedImage), new Metadata()).toString()
- );
+ assertEquals("image/png", TikaConfig.getDefaultConfig().getDetector()
+ .detect(new ByteArrayInputStream(renderedImage), new Metadata()).toString());
try (InputStream is = new ByteArrayInputStream(renderedImage)) {
BufferedImage image = ImageIO.read(is);
diff --git a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/UnpackerResourceWithConfigTest.java b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/UnpackerResourceWithConfigTest.java
index 32c296d3f..bb636b5b4 100644
--- a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/UnpackerResourceWithConfigTest.java
+++ b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/UnpackerResourceWithConfigTest.java
@@ -28,8 +28,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import javax.imageio.ImageIO;
-import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
@@ -90,10 +90,8 @@ public class UnpackerResourceWithConfigTest extends CXFTestBase {
break;
}
}
- assertEquals("image/tiff",
- TikaConfig.getDefaultConfig().getDetector()
- .detect(new ByteArrayInputStream(renderedImage), new Metadata()).toString()
- );
+ assertEquals("image/tiff", TikaConfig.getDefaultConfig().getDetector()
+ .detect(new ByteArrayInputStream(renderedImage), new Metadata()).toString());
try (InputStream is = new ByteArrayInputStream(renderedImage)) {
BufferedImage image = ImageIO.read(is);
@@ -144,10 +142,8 @@ public class UnpackerResourceWithConfigTest extends CXFTestBase {
break;
}
}
- assertEquals("image/jpeg",
- TikaConfig.getDefaultConfig().getDetector()
- .detect(new ByteArrayInputStream(renderedImage), new Metadata()).toString()
- );
+ assertEquals("image/jpeg", TikaConfig.getDefaultConfig().getDetector()
+ .detect(new ByteArrayInputStream(renderedImage), new Metadata()).toString());
try (InputStream is = new ByteArrayInputStream(renderedImage)) {
BufferedImage image = ImageIO.read(is);
diff --git a/tika-translate/pom.xml b/tika-translate/pom.xml
index b31975099..7590f2496 100644
--- a/tika-translate/pom.xml
+++ b/tika-translate/pom.xml
@@ -55,41 +55,17 @@
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
</dependency>
- <!-- for java 10
- See TIKA-2778 for why we need to do this now.
- May the gods of dependency management fix this in the future.
- -->
- <dependency>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>jaxb-runtime</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-client</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>jaxb-runtime</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-json-provider</artifactId>
- <exclusions>
- <exclusion>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jakarta.activation</groupId>
- <artifactId>jakarta.activation-api</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>com.fasterxml.jackson.jakarta.rs</groupId>
+ <artifactId>jackson-jakarta-rs-json-provider</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
@@ -108,9 +84,7 @@
<dependency>
<groupId>org.glassfish.tyrus.bundles</groupId>
<artifactId>tyrus-standalone-client</artifactId>
- <!-- update to 2.0.3 not possible with jdk8,
- "class file has wrong version 55.0, should be 52.0" -->
- <version>2.0.2</version>
+ <version>2.1.3</version>
</dependency>
</dependencies>
<reporting>
diff --git a/tika-translate/src/main/java/org/apache/tika/language/translate/impl/GoogleTranslator.java b/tika-translate/src/main/java/org/apache/tika/language/translate/impl/GoogleTranslator.java
index 97b01b4ee..b9db911fd 100644
--- a/tika-translate/src/main/java/org/apache/tika/language/translate/impl/GoogleTranslator.java
+++ b/tika-translate/src/main/java/org/apache/tika/language/translate/impl/GoogleTranslator.java
@@ -24,11 +24,11 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.Properties;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.Response;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
import org.apache.cxf.jaxrs.client.WebClient;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/tika-translate/src/main/java/org/apache/tika/language/translate/impl/JoshuaNetworkTranslator.java b/tika-translate/src/main/java/org/apache/tika/language/translate/impl/JoshuaNetworkTranslator.java
index a28084ee7..4676954f9 100644
--- a/tika-translate/src/main/java/org/apache/tika/language/translate/impl/JoshuaNetworkTranslator.java
+++ b/tika-translate/src/main/java/org/apache/tika/language/translate/impl/JoshuaNetworkTranslator.java
@@ -28,14 +28,14 @@ import java.net.URL;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.Response;
import com.fasterxml.jackson.core.JsonParseException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
+import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
import org.apache.cxf.jaxrs.client.WebClient;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/tika-translate/src/main/java/org/apache/tika/language/translate/impl/Lingo24Translator.java b/tika-translate/src/main/java/org/apache/tika/language/translate/impl/Lingo24Translator.java
index cc650d5c6..970c17d1f 100644
--- a/tika-translate/src/main/java/org/apache/tika/language/translate/impl/Lingo24Translator.java
+++ b/tika-translate/src/main/java/org/apache/tika/language/translate/impl/Lingo24Translator.java
@@ -24,11 +24,11 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.Properties;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.Response;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
import org.apache.cxf.jaxrs.client.WebClient;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/tika-translate/src/main/java/org/apache/tika/language/translate/impl/RTGTranslator.java b/tika-translate/src/main/java/org/apache/tika/language/translate/impl/RTGTranslator.java
index a878bece7..7a36499ef 100644
--- a/tika-translate/src/main/java/org/apache/tika/language/translate/impl/RTGTranslator.java
+++ b/tika-translate/src/main/java/org/apache/tika/language/translate/impl/RTGTranslator.java
@@ -28,10 +28,10 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
+
+import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
-
-import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
import org.apache.cxf.jaxrs.client.WebClient;
import org.json.simple.JSONObject;
import org.json.simple.parser.JSONParser;
@@ -48,7 +48,7 @@ import org.apache.tika.exception.TikaException;
* <a href="https://isi-nlp.github.io/rtg/#_rtg_serve">
* REST-based RTG server</a>.</p>
* To get Docker image:
- * https://hub.docker.com/repository/docker/tgowda/rtg-model <br/>
+ * https://hub.docker.com/repository/docker/tgowda/rtg-model <br/>
* <pre>
* {code
* # without GPU
@@ -68,7 +68,7 @@ import org.apache.tika.exception.TikaException;
* http://localhost:6060/translate
* }
* </pre>
- *
+ * <p>
* RTG requires input to be pre-formatted into sentences, one per line,
* so this translation implementation takes care of that.
*/
diff --git a/tika-translate/src/main/java/org/apache/tika/language/translate/impl/YandexTranslator.java b/tika-translate/src/main/java/org/apache/tika/language/translate/impl/YandexTranslator.java
index dbe24f752..c83c59102 100644
--- a/tika-translate/src/main/java/org/apache/tika/language/translate/impl/YandexTranslator.java
+++ b/tika-translate/src/main/java/org/apache/tika/language/translate/impl/YandexTranslator.java
@@ -24,12 +24,12 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.Properties;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.Response;
import com.fasterxml.jackson.core.JsonParseException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
import org.apache.cxf.jaxrs.client.WebClient;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;