This is an automated email from the ASF dual-hosted git repository.
tilman pushed a commit to branch branch_3x
in repository https://gitbox.apache.org/repos/asf/tika.git
The following commit(s) were added to refs/heads/branch_3x by this push:
new e30440715 TIKA-4326: replace deprecated
e30440715 is described below
commit e30440715626ec20c369a0b6a8dd53ef757ce370
Author: Tilman Hausherr <[email protected]>
AuthorDate: Tue Jan 14 11:56:22 2025 +0100
TIKA-4326: replace deprecated
---
.../src/main/java/org/apache/tika/fork/MemoryURLStreamHandler.java | 6 ++++--
tika-core/src/test/java/org/apache/tika/config/ParamTest.java | 3 +--
.../test/java/org/apache/tika/parser/DummyParameterizedParser.java | 4 ++--
.../test/java/org/apache/tika/parser/geo/topic/GeoParserTest.java | 4 ++--
.../src/test/java/org/apache/tika/mime/TestMimeTypes.java | 3 ++-
5 files changed, 11 insertions(+), 9 deletions(-)
diff --git
a/tika-core/src/main/java/org/apache/tika/fork/MemoryURLStreamHandler.java
b/tika-core/src/main/java/org/apache/tika/fork/MemoryURLStreamHandler.java
index bfbb886c2..6f4b1435e 100644
--- a/tika-core/src/main/java/org/apache/tika/fork/MemoryURLStreamHandler.java
+++ b/tika-core/src/main/java/org/apache/tika/fork/MemoryURLStreamHandler.java
@@ -19,6 +19,8 @@ package org.apache.tika.fork;
import java.io.IOException;
import java.lang.ref.WeakReference;
import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLConnection;
import java.net.URLStreamHandler;
@@ -37,7 +39,7 @@ class MemoryURLStreamHandler extends URLStreamHandler {
public static URL createURL(byte[] data) {
try {
int i = counter.incrementAndGet();
- URL url = new URL("tika-in-memory", "localhost", "/" + i);
+ URL url = new URI("tika-in-memory", "localhost", "/" + i).toURL();
MemoryURLStreamRecord record = new MemoryURLStreamRecord();
record.url = new WeakReference<>(url);
@@ -45,7 +47,7 @@ class MemoryURLStreamHandler extends URLStreamHandler {
records.add(record);
return url;
- } catch (MalformedURLException e) {
+ } catch (MalformedURLException | URISyntaxException e) {
throw new RuntimeException(e);
}
}
diff --git a/tika-core/src/test/java/org/apache/tika/config/ParamTest.java
b/tika-core/src/test/java/org/apache/tika/config/ParamTest.java
index 5f5321d5d..d4d53b667 100644
--- a/tika-core/src/test/java/org/apache/tika/config/ParamTest.java
+++ b/tika-core/src/test/java/org/apache/tika/config/ParamTest.java
@@ -23,7 +23,6 @@ import java.io.ByteArrayOutputStream;
import java.io.File;
import java.math.BigInteger;
import java.net.URI;
-import java.net.URL;
import java.util.ArrayList;
import java.util.List;
@@ -40,7 +39,7 @@ public class ParamTest {
list.add("fox");
Object[] objects =
new Object[]{list, Integer.MAX_VALUE, 2.5f, 4000.57576, true,
false, Long.MAX_VALUE,
- "Hello this is a boring string", new
URL("http://apache.org";),
+ "Hello this is a boring string", new
URI("http://apache.org";).toURL(),
new URI("tika://org.apache.tika.ner.parser?impl=xyz"),
new BigInteger(Long.MAX_VALUE + "").add(
new BigInteger(Long.MAX_VALUE + "")), new
File("."),};
diff --git
a/tika-core/src/test/java/org/apache/tika/parser/DummyParameterizedParser.java
b/tika-core/src/test/java/org/apache/tika/parser/DummyParameterizedParser.java
index 548347492..c88c238e0 100644
---
a/tika-core/src/test/java/org/apache/tika/parser/DummyParameterizedParser.java
+++
b/tika-core/src/test/java/org/apache/tika/parser/DummyParameterizedParser.java
@@ -90,8 +90,8 @@ public class DummyParameterizedParser implements Parser {
public DummyParameterizedParser() {
try {
- xurl = new URL("http://tika.apache.org/url";);
- } catch (MalformedURLException e) {
+ xurl = new URI("http://tika.apache.org/url";).toURL();
+ } catch (MalformedURLException | URISyntaxException e) {
throw new IllegalArgumentException(e);
}
try {
diff --git
a/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/geo/topic/GeoParserTest.java
b/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/geo/topic/GeoParserTest.java
index 2dba9cedd..308dfdceb 100644
---
a/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/geo/topic/GeoParserTest.java
+++
b/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/geo/topic/GeoParserTest.java
@@ -25,7 +25,7 @@ import static org.junit.jupiter.api.Assertions.assertNull;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.net.URL;
+import java.net.URI;
import org.junit.jupiter.api.Test;
import org.xml.sax.SAXException;
@@ -111,6 +111,6 @@ public class GeoParserTest extends TikaTest {
assertNotNull(geoParser);
assertEquals("http://localhost/gazetteerRestEndpoint";,
geoParser.getGazetteerRestEndpoint());
- assertEquals(new URL("file:/ner/model/url"),
geoParser.getNerModelUrl());
+ assertEquals(new URI("file:/ner/model/url").toURL(),
geoParser.getNerModelUrl());
}
}
diff --git
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/mime/TestMimeTypes.java
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/mime/TestMimeTypes.java
index 0794cdc8e..f72f7abb7 100644
---
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/mime/TestMimeTypes.java
+++
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/mime/TestMimeTypes.java
@@ -27,6 +27,7 @@ import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+import java.net.URI;
import java.net.URL;
import org.junit.jupiter.api.BeforeEach;
@@ -53,7 +54,7 @@ public class TestMimeTypes {
TikaConfig config = TikaConfig.getDefaultConfig();
repo = config.getMimeRepository();
tika = new Tika(config);
- u = new URL("http://mydomain.com/x.pdf?x=y";);
+ u = new URI("http://mydomain.com/x.pdf?x=y";).toURL();
}
@Test
