This is an automated email from the ASF dual-hosted git repository.
tilman pushed a commit to branch branch_2x
in repository https://gitbox.apache.org/repos/asf/tika.git
The following commit(s) were added to refs/heads/branch_2x by this push:
new 3b6b5ed49 TIKA-4238: replace deprecated
3b6b5ed49 is described below
commit 3b6b5ed4983b93a065a66d335a0bcb1016a41f6e
Author: Tilman Hausherr <[email protected]>
AuthorDate: Sat Apr 6 12:27:58 2024 +0200
TIKA-4238: replace deprecated
---
.../captioning/tf/TensorflowRESTCaptioner.java | 20 +++++++++-----------
.../recognition/tf/TensorflowRESTRecogniser.java | 18 ++++++++----------
.../tf/TensorflowRESTVideoRecogniser.java | 14 +++++++-------
3 files changed, 24 insertions(+), 28 deletions(-)
diff --git
a/tika-parsers/tika-parsers-ml/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/captioning/tf/TensorflowRESTCaptioner.java
b/tika-parsers/tika-parsers-ml/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/captioning/tf/TensorflowRESTCaptioner.java
index f36576d44..6e5541ae3 100644
---
a/tika-parsers/tika-parsers-ml/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/captioning/tf/TensorflowRESTCaptioner.java
+++
b/tika-parsers/tika-parsers-ml/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/captioning/tf/TensorflowRESTCaptioner.java
@@ -36,7 +36,8 @@ import org.apache.http.HttpResponse;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.ByteArrayEntity;
-import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
import org.json.simple.parser.JSONParser;
@@ -104,13 +105,12 @@ public class TensorflowRESTCaptioner implements
ObjectRecogniser {
@Override
public void initialize(Map<String, Param> params) throws
TikaConfigException {
- try {
- healthUri = URI.create(apiBaseUri + "/ping");
- apiUri = URI.create(apiBaseUri + String.format(Locale.getDefault(),
- "/caption/image?beam_size=%1$d&max_caption_length=%2$d",
captions,
- maxCaptionLength));
+ healthUri = URI.create(apiBaseUri + "/ping");
+ apiUri = URI.create(apiBaseUri + String.format(Locale.getDefault(),
+ "/caption/image?beam_size=%1$d&max_caption_length=%2$d",
captions,
+ maxCaptionLength));
- DefaultHttpClient client = new DefaultHttpClient();
+ try (CloseableHttpClient client = HttpClientBuilder.create().build()) {
HttpResponse response = client.execute(new HttpGet(healthUri));
available = response.getStatusLine().getStatusCode() == 200;
@@ -133,12 +133,10 @@ public class TensorflowRESTCaptioner implements
ObjectRecogniser {
Metadata metadata, ParseContext
context)
throws IOException, SAXException, TikaException {
List<CaptionObject> capObjs = new ArrayList<>();
- try {
- DefaultHttpClient client = new DefaultHttpClient();
-
+ try (CloseableHttpClient client = HttpClientBuilder.create().build()) {
HttpPost request = new HttpPost(getApiUri(metadata));
- try (UnsynchronizedByteArrayOutputStream byteStream = new
UnsynchronizedByteArrayOutputStream()) {
+ try (UnsynchronizedByteArrayOutputStream byteStream =
UnsynchronizedByteArrayOutputStream.builder().get()) {
//TODO: convert this to stream, this might cause OOM issue
// InputStreamEntity is not working
// request.setEntity(new InputStreamEntity(stream, -1));
diff --git
a/tika-parsers/tika-parsers-ml/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/recognition/tf/TensorflowRESTRecogniser.java
b/tika-parsers/tika-parsers-ml/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/recognition/tf/TensorflowRESTRecogniser.java
index d7734ca06..822defee6 100644
---
a/tika-parsers/tika-parsers-ml/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/recognition/tf/TensorflowRESTRecogniser.java
+++
b/tika-parsers/tika-parsers-ml/tika-parser-advancedmedia-module/src/main/java/org/apache/tika/parser/recognition/tf/TensorflowRESTRecogniser.java
@@ -38,7 +38,8 @@ import org.apache.http.HttpResponse;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.ByteArrayEntity;
-import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xml.sax.ContentHandler;
@@ -106,12 +107,11 @@ public class TensorflowRESTRecogniser implements
ObjectRecogniser {
@Override
public void initialize(Map<String, Param> params) throws
TikaConfigException {
- try {
- healthUri = URI.create(apiBaseUri + "/ping");
- apiUri = URI.create(apiBaseUri + String.format(Locale.getDefault(),
- "/classify/image?topn=%1$d&min_confidence=%2$f", topN,
minConfidence));
+ healthUri = URI.create(apiBaseUri + "/ping");
+ apiUri = URI.create(apiBaseUri + String.format(Locale.getDefault(),
+ "/classify/image?topn=%1$d&min_confidence=%2$f", topN,
minConfidence));
- DefaultHttpClient client = new DefaultHttpClient();
+ try (CloseableHttpClient client = HttpClientBuilder.create().build()) {
HttpResponse response = client.execute(new HttpGet(healthUri));
available = response.getStatusLine().getStatusCode() == 200;
@@ -134,12 +134,10 @@ public class TensorflowRESTRecogniser implements
ObjectRecogniser {
Metadata metadata, ParseContext
context)
throws IOException, SAXException, TikaException {
List<RecognisedObject> recObjs = new ArrayList<>();
- try {
- DefaultHttpClient client = new DefaultHttpClient();
-
+ try (CloseableHttpClient client = HttpClientBuilder.create().build()) {
HttpPost request = new HttpPost(getApiUri(metadata));
- try (UnsynchronizedByteArrayOutputStream byteStream = new
UnsynchronizedByteArrayOutputStream()) {
+ try (UnsynchronizedByteArrayOutputStream byteStream =
UnsynchronizedByteArrayOutputStream.builder().get()) {
//TODO: convert this to stream, this might cause OOM issue
// InputStreamEntity is not working
// request.setEntity(new InputStreamEntity(stream, -1));
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 f42145d2a..77a3fb10b 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
@@ -26,7 +26,8 @@ import javax.ws.rs.core.UriBuilder;
import org.apache.http.HttpResponse;
import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -74,13 +75,12 @@ public class TensorflowRESTVideoRecogniser extends
TensorflowRESTRecogniser {
@Override
public void initialize(Map<String, Param> params) throws
TikaConfigException {
- try {
- healthUri = URI.create(apiBaseUri + "/ping");
- apiUri = URI.create(apiBaseUri + String.format(Locale.getDefault(),
- "/classify/video?topn=%1$d&min_confidence=%2$f&mode=%3$s",
topN, minConfidence,
- mode));
+ healthUri = URI.create(apiBaseUri + "/ping");
+ apiUri = URI.create(apiBaseUri + String.format(Locale.getDefault(),
+ "/classify/video?topn=%1$d&min_confidence=%2$f&mode=%3$s",
topN, minConfidence,
+ mode));
- DefaultHttpClient client = new DefaultHttpClient();
+ try (CloseableHttpClient client = HttpClientBuilder.create().build()) {
HttpResponse response = client.execute(new HttpGet(healthUri));
available = response.getStatusLine().getStatusCode() == 200;
