You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2018/07/28 13:10:49 UTC
svn commit: r1836900 -
/pdfbox/trunk/examples/src/test/java/org/apache/wink/client/MockHttpServer.java
Author: tilman
Date: Sat Jul 28 13:10:48 2018
New Revision: 1836900
URL: http://svn.apache.org/viewvc?rev=1836900&view=rev
Log:
PDFBOX-4281: small code cleanup
Modified:
pdfbox/trunk/examples/src/test/java/org/apache/wink/client/MockHttpServer.java
Modified: pdfbox/trunk/examples/src/test/java/org/apache/wink/client/MockHttpServer.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/test/java/org/apache/wink/client/MockHttpServer.java?rev=1836900&r1=1836899&r2=1836900&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/test/java/org/apache/wink/client/MockHttpServer.java (original)
+++ pdfbox/trunk/examples/src/test/java/org/apache/wink/client/MockHttpServer.java Sat Jul 28 13:10:48 2018
@@ -31,6 +31,7 @@ import java.net.ServerSocket;
import java.net.Socket;
import java.net.SocketException;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -51,7 +52,7 @@ public class MockHttpServer extends Thre
// mock response data
private int mockResponseCode = 200;
- private Map<String, String> mockResponseHeaders = new HashMap<String, String>();
+ private final Map<String, String> mockResponseHeaders = new HashMap<>();
private byte[] mockResponseContent = "received message".getBytes();
private String mockResponseContentType = "text/plain;charset=utf-8";
private boolean mockResponseContentEchoRequest;
@@ -118,11 +119,9 @@ public class MockHttpServer extends Thre
// request data
private String requestMethod = null;
private String requestUrl = null;
- private Map<String, List<String>> requestHeaders =
- new HashMap<String, List<String>>();
+ private Map<String, List<String>> requestHeaders = new HashMap<>();
private ByteArrayOutputStream requestContent = new ByteArrayOutputStream();
- private List<MockHttpServerResponse> mockHttpServerResponses =
- new ArrayList<MockHttpServerResponse>();
+ private List<MockHttpServerResponse> mockHttpServerResponses = new ArrayList<>();
private int responseCounter = 0;
public MockHttpServer(int serverPort) {
@@ -179,6 +178,7 @@ public class MockHttpServer extends Thre
}
}
+ @Override
public void run() {
serverThread = Thread.currentThread();
executeLoop();
@@ -238,7 +238,7 @@ public class MockHttpServer extends Thre
private class HttpProcessor {
- private Socket socket;
+ private final Socket socket;
public HttpProcessor(Socket socket) throws SocketException {
// set the read timeout (5 seconds by default)
@@ -341,7 +341,7 @@ public class MockHttpServer extends Thre
private void processChunkedContent(InputStream is) throws IOException {
requestContent.write("".getBytes());
- byte[] chunk = null;
+ byte[] chunk;
byte[] line = null;
boolean lastChunk = false;
// we should exit this loop only after we get to the end of stream
@@ -421,7 +421,7 @@ public class MockHttpServer extends Thre
String[] parts = line.split(": ");
List<String> values = requestHeaders.get(parts[0]);
if (values == null) {
- values = new ArrayList<String>();
+ values = new ArrayList<>();
requestHeaders.put(parts[0], values);
}
values.add(parts[1]);
@@ -529,9 +529,7 @@ public class MockHttpServer extends Thre
public void setMockHttpServerResponses(MockHttpServerResponse... responses) {
mockHttpServerResponses.clear();
- for (int i = 0; i < responses.length; i++) {
- mockHttpServerResponses.add(responses[i]);
- }
+ mockHttpServerResponses.addAll(Arrays.asList(responses));
}
public List<MockHttpServerResponse> getMockHttpServerResponses() {