honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix usage of deprecated apis

This commit is contained in:
javanna 2016-05-17 15:23:47 +02:00 committed by Luca Cavanna
parent c0a72c1686
commit 2d7a781195
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client/src/main/java/org/elasticsearch/client/RequestLogger.java
View File

@ -28,11 +28,14 @@ import org.apache.http.HttpHost;
import org.apache.http.HttpResponse; import org.apache.http.HttpResponse;
import org.apache.http.client.methods.HttpUriRequest; import org.apache.http.client.methods.HttpUriRequest;
import org.apache.http.entity.BufferedHttpEntity; import org.apache.http.entity.BufferedHttpEntity;
import org.apache.http.entity.ContentType;
import org.apache.http.util.EntityUtils; import org.apache.http.util.EntityUtils;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.IOException; import java.io.IOException;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
/** /**
* Helper class that exposes static methods to unify the way requests are logged. * Helper class that exposes static methods to unify the way requests are logged.
@ -118,7 +121,12 @@ public final class RequestLogger {
if (entity != null) { if (entity != null) {
entity = new BufferedHttpEntity(entity); entity = new BufferedHttpEntity(entity);
httpResponse.setEntity(entity); httpResponse.setEntity(entity);
try (BufferedReader reader = new BufferedReader(new InputStreamReader(entity.getContent()))) { ContentType contentType = ContentType.get(entity);
Charset charset = StandardCharsets.UTF_8;
if (contentType != null) {
charset = contentType.getCharset();
}
try (BufferedReader reader = new BufferedReader(new InputStreamReader(entity.getContent(), charset))) {
String line; String line;
while( (line = reader.readLine()) != null) { while( (line = reader.readLine()) != null) {
responseLine += "\n# " + line; responseLine += "\n# " + line;

6
client/src/test/java/org/elasticsearch/client/RequestLoggerTests.java
View File

@ -20,7 +20,6 @@
package org.elasticsearch.client; package org.elasticsearch.client;
import com.carrotsearch.randomizedtesting.generators.RandomInts; import com.carrotsearch.randomizedtesting.generators.RandomInts;
import org.apache.commons.codec.Charsets;
import org.apache.http.HttpEntityEnclosingRequest; import org.apache.http.HttpEntityEnclosingRequest;
import org.apache.http.HttpHost; import org.apache.http.HttpHost;
import org.apache.http.ProtocolVersion; import org.apache.http.ProtocolVersion;
@ -36,6 +35,7 @@ import org.apache.lucene.util.LuceneTestCase;
import java.io.IOException; import java.io.IOException;
import java.net.URI; import java.net.URI;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.nio.charset.StandardCharsets;
import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.equalTo;
@ -72,7 +72,7 @@ public class RequestLoggerTests extends LuceneTestCase {
if (request instanceof HttpEntityEnclosingRequest && random().nextBoolean()) { if (request instanceof HttpEntityEnclosingRequest && random().nextBoolean()) {
HttpEntityEnclosingRequest enclosingRequest = (HttpEntityEnclosingRequest) request; HttpEntityEnclosingRequest enclosingRequest = (HttpEntityEnclosingRequest) request;
String requestBody = "{ \"field\": \"value\" }"; String requestBody = "{ \"field\": \"value\" }";
enclosingRequest.setEntity(new StringEntity(requestBody, Charsets.UTF_8)); enclosingRequest.setEntity(new StringEntity(requestBody, StandardCharsets.UTF_8));
expected += " -d '" + requestBody + "'"; expected += " -d '" + requestBody + "'";
} }
@ -95,7 +95,7 @@ public class RequestLoggerTests extends LuceneTestCase {
expected += "\n#"; expected += "\n#";
if (random().nextBoolean()) { if (random().nextBoolean()) {
String responseBody = "{\n \"field\": \"value\"\n}"; String responseBody = "{\n \"field\": \"value\"\n}";
httpResponse.setEntity(new StringEntity(responseBody, Charsets.UTF_8)); httpResponse.setEntity(new StringEntity(responseBody, StandardCharsets.UTF_8));
expected += "\n# {"; expected += "\n# {";
expected += "\n# \"field\": \"value\""; expected += "\n# \"field\": \"value\"";
expected += "\n# }"; expected += "\n# }";