Skip to content

Commit dd01969

Browse files
authored
TIKA-3649 fixes for static analysis report of module tika-translate (apache#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 <dk2k@ya.ru>
1 parent 64647bb commit dd01969

File tree

5 files changed

+67
-24
lines changed

5 files changed

+67
-24
lines changed

tika-translate/pom.xml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,35 @@
187187
</execution>
188188
</executions>
189189
</plugin>
190+
<plugin>
191+
<groupId>org.apache.maven.plugins</groupId>
192+
<artifactId>maven-site-plugin</artifactId>
193+
<version>3.4</version>
194+
<configuration>
195+
<reportPlugins>
196+
<plugin>
197+
<groupId>org.apache.maven.plugins</groupId>
198+
<artifactId>maven-project-info-reports-plugin</artifactId>
199+
<version>2.8</version>
200+
<reports>
201+
<report>index</report>
202+
</reports>
203+
</plugin>
204+
<plugin>
205+
<groupId>org.codehaus.mojo</groupId>
206+
<artifactId>findbugs-maven-plugin</artifactId>
207+
<version>3.0.5</version>
208+
<configuration>
209+
<argLine>-Xmx256m</argLine>
210+
<argLine>-XX:MaxPermSize=256m</argLine>
211+
<timeout>240000</timeout>
212+
<effort>max</effort>
213+
<failOnError>true</failOnError>
214+
</configuration>
215+
</plugin>
216+
</reportPlugins>
217+
</configuration>
218+
</plugin>
190219
</plugins>
191220

192221
<pluginManagement>
@@ -217,6 +246,7 @@
217246
</lifecycleMappingMetadata>
218247
</configuration>
219248
</plugin>
249+
220250
</plugins>
221251
</pluginManagement>
222252
</build>

tika-translate/src/main/java/org/apache/tika/language/translate/impl/GoogleTranslator.java

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,16 @@ public String translate(String text, String sourceLanguage,
8484
Response response = client.accept(MediaType.APPLICATION_JSON)
8585
.query("key", apiKey).query("source", sourceLanguage)
8686
.query("target", targetLanguage).query("q", text).get();
87-
BufferedReader reader = new BufferedReader(new InputStreamReader(
88-
(InputStream) response.getEntity(), UTF_8));
89-
String line = null;
90-
StringBuffer responseText = new StringBuffer();
91-
while ((line = reader.readLine()) != null) {
92-
responseText.append(line);
87+
88+
StringBuilder responseText = new StringBuilder();
89+
try (InputStreamReader inputStreamReader = new InputStreamReader(
90+
(InputStream) response.getEntity(), UTF_8);
91+
BufferedReader reader = new BufferedReader(inputStreamReader);
92+
) {
93+
String line;
94+
while ((line = reader.readLine()) != null) {
95+
responseText.append(line);
96+
}
9397
}
9498

9599
ObjectMapper mapper = new ObjectMapper();

tika-translate/src/main/java/org/apache/tika/language/translate/impl/JoshuaNetworkTranslator.java

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -148,14 +148,17 @@ public String translate(String text, String sourceLanguage,
148148
ObjectNode jsonNode = requestMapper.createObjectNode();
149149
jsonNode.put("inputLanguage", sourceLanguage);
150150
jsonNode.put("inputText", inputText);
151-
//make the reuest
151+
//make the request
152152
Response response = client.accept(MediaType.APPLICATION_JSON).type(MediaType.APPLICATION_JSON).post(jsonNode);
153-
BufferedReader reader = new BufferedReader(new InputStreamReader(
154-
(InputStream) response.getEntity(), UTF_8));
155-
String line;
156153
StringBuilder responseText = new StringBuilder();
157-
while ((line = reader.readLine()) != null) {
158-
responseText.append(line);
154+
try (InputStreamReader inputStreamReader = new InputStreamReader(
155+
(InputStream) response.getEntity(), UTF_8);
156+
BufferedReader reader = new BufferedReader(inputStreamReader);
157+
) {
158+
String line;
159+
while ((line = reader.readLine()) != null) {
160+
responseText.append(line);
161+
}
159162
}
160163

161164
try {

tika-translate/src/main/java/org/apache/tika/language/translate/impl/Lingo24Translator.java

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,15 @@ public String translate(String text, String sourceLanguage,
8181
Response response = client.accept(MediaType.APPLICATION_JSON)
8282
.query("user_key", userKey).query("source", sourceLanguage)
8383
.query("target", targetLanguage).query("q", text).get();
84-
BufferedReader reader = new BufferedReader(new InputStreamReader(
85-
(InputStream) response.getEntity(), UTF_8));
86-
String line = null;
87-
StringBuffer responseText = new StringBuffer();
88-
while ((line = reader.readLine()) != null) {
89-
responseText.append(line);
84+
StringBuilder responseText = new StringBuilder();
85+
try (InputStreamReader inputStreamReader = new InputStreamReader(
86+
(InputStream) response.getEntity(), UTF_8);
87+
BufferedReader reader = new BufferedReader(inputStreamReader);
88+
) {
89+
String line;
90+
while ((line = reader.readLine()) != null) {
91+
responseText.append(line);
92+
}
9093
}
9194

9295
ObjectMapper mapper = new ObjectMapper();

tika-translate/src/main/java/org/apache/tika/language/translate/impl/YandexTranslator.java

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,12 +103,15 @@ public String translate(String text, String sourceLanguage,
103103
Response response = client.accept(MediaType.APPLICATION_JSON)
104104
.query("key", this.apiKey).query("lang", langCode)
105105
.query("text", text).get();
106-
BufferedReader reader = new BufferedReader(new InputStreamReader(
107-
(InputStream) response.getEntity(), UTF_8));
108-
String line = null;
109-
StringBuffer responseText = new StringBuffer();
110-
while ((line = reader.readLine()) != null) {
111-
responseText.append(line);
106+
StringBuilder responseText = new StringBuilder();
107+
try (InputStreamReader inputStreamReader = new InputStreamReader(
108+
(InputStream) response.getEntity(), UTF_8);
109+
BufferedReader reader = new BufferedReader(inputStreamReader);
110+
) {
111+
String line;
112+
while ((line = reader.readLine()) != null) {
113+
responseText.append(line);
114+
}
112115
}
113116

114117
try {

0 commit comments

Comments
 (0)