You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by le...@apache.org on 2022/02/06 02:08:21 UTC
[tika] branch main updated: TIKA-3649 fixes for static analysis report of module tika-translate (#486)
This is an automated email from the ASF dual-hosted git repository.
lewismc pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git
The following commit(s) were added to refs/heads/main by this push:
new dd01969 TIKA-3649 fixes for static analysis report of module tika-translate (#486)
dd01969 is described below
commit dd019698dac764a1a72cf799711cd9e4802da084
Author: dk2k <dk...@users.noreply.github.com>
AuthorDate: Sun Feb 6 05:08:16 2022 +0300
TIKA-3649 fixes for static analysis report of module tika-translate (#486)
* TIKA-3649 fixes for static analysis report of module tika-translate
* TIKA-3649 POM section for static analysis in the module tika-translate
Co-authored-by: dk2k <dk...@ya.ru>
---
tika-translate/pom.xml | 30 ++++++++++++++++++++++
.../language/translate/impl/GoogleTranslator.java | 16 +++++++-----
.../translate/impl/JoshuaNetworkTranslator.java | 15 ++++++-----
.../language/translate/impl/Lingo24Translator.java | 15 ++++++-----
.../language/translate/impl/YandexTranslator.java | 15 ++++++-----
5 files changed, 67 insertions(+), 24 deletions(-)
diff --git a/tika-translate/pom.xml b/tika-translate/pom.xml
index fb13169..852456e 100644
--- a/tika-translate/pom.xml
+++ b/tika-translate/pom.xml
@@ -187,6 +187,35 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.4</version>
+ <configuration>
+ <reportPlugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.8</version>
+ <reports>
+ <report>index</report>
+ </reports>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>3.0.5</version>
+ <configuration>
+ <argLine>-Xmx256m</argLine>
+ <argLine>-XX:MaxPermSize=256m</argLine>
+ <timeout>240000</timeout>
+ <effort>max</effort>
+ <failOnError>true</failOnError>
+ </configuration>
+ </plugin>
+ </reportPlugins>
+ </configuration>
+ </plugin>
</plugins>
<pluginManagement>
@@ -217,6 +246,7 @@
</lifecycleMappingMetadata>
</configuration>
</plugin>
+
</plugins>
</pluginManagement>
</build>
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 1790f8e..0ad75dc 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
@@ -84,12 +84,16 @@ public class GoogleTranslator extends AbstractTranslator {
Response response = client.accept(MediaType.APPLICATION_JSON)
.query("key", apiKey).query("source", sourceLanguage)
.query("target", targetLanguage).query("q", text).get();
- BufferedReader reader = new BufferedReader(new InputStreamReader(
- (InputStream) response.getEntity(), UTF_8));
- String line = null;
- StringBuffer responseText = new StringBuffer();
- while ((line = reader.readLine()) != null) {
- responseText.append(line);
+
+ StringBuilder responseText = new StringBuilder();
+ try (InputStreamReader inputStreamReader = new InputStreamReader(
+ (InputStream) response.getEntity(), UTF_8);
+ BufferedReader reader = new BufferedReader(inputStreamReader);
+ ) {
+ String line;
+ while ((line = reader.readLine()) != null) {
+ responseText.append(line);
+ }
}
ObjectMapper mapper = new ObjectMapper();
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 76d5d22..cfa8fba 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
@@ -148,14 +148,17 @@ public class JoshuaNetworkTranslator extends AbstractTranslator {
ObjectNode jsonNode = requestMapper.createObjectNode();
jsonNode.put("inputLanguage", sourceLanguage);
jsonNode.put("inputText", inputText);
- //make the reuest
+ //make the request
Response response = client.accept(MediaType.APPLICATION_JSON).type(MediaType.APPLICATION_JSON).post(jsonNode);
- BufferedReader reader = new BufferedReader(new InputStreamReader(
- (InputStream) response.getEntity(), UTF_8));
- String line;
StringBuilder responseText = new StringBuilder();
- while ((line = reader.readLine()) != null) {
- responseText.append(line);
+ try (InputStreamReader inputStreamReader = new InputStreamReader(
+ (InputStream) response.getEntity(), UTF_8);
+ BufferedReader reader = new BufferedReader(inputStreamReader);
+ ) {
+ String line;
+ while ((line = reader.readLine()) != null) {
+ responseText.append(line);
+ }
}
try {
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 d6d6b55..1107e4e 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
@@ -81,12 +81,15 @@ public class Lingo24Translator extends AbstractTranslator {
Response response = client.accept(MediaType.APPLICATION_JSON)
.query("user_key", userKey).query("source", sourceLanguage)
.query("target", targetLanguage).query("q", text).get();
- BufferedReader reader = new BufferedReader(new InputStreamReader(
- (InputStream) response.getEntity(), UTF_8));
- String line = null;
- StringBuffer responseText = new StringBuffer();
- while ((line = reader.readLine()) != null) {
- responseText.append(line);
+ StringBuilder responseText = new StringBuilder();
+ try (InputStreamReader inputStreamReader = new InputStreamReader(
+ (InputStream) response.getEntity(), UTF_8);
+ BufferedReader reader = new BufferedReader(inputStreamReader);
+ ) {
+ String line;
+ while ((line = reader.readLine()) != null) {
+ responseText.append(line);
+ }
}
ObjectMapper mapper = new ObjectMapper();
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 da64e4c..841d709 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
@@ -103,12 +103,15 @@ public class YandexTranslator implements Translator {
Response response = client.accept(MediaType.APPLICATION_JSON)
.query("key", this.apiKey).query("lang", langCode)
.query("text", text).get();
- BufferedReader reader = new BufferedReader(new InputStreamReader(
- (InputStream) response.getEntity(), UTF_8));
- String line = null;
- StringBuffer responseText = new StringBuffer();
- while ((line = reader.readLine()) != null) {
- responseText.append(line);
+ StringBuilder responseText = new StringBuilder();
+ try (InputStreamReader inputStreamReader = new InputStreamReader(
+ (InputStream) response.getEntity(), UTF_8);
+ BufferedReader reader = new BufferedReader(inputStreamReader);
+ ) {
+ String line;
+ while ((line = reader.readLine()) != null) {
+ responseText.append(line);
+ }
}
try {