Refactored boundary variables to be static attributes.

googleapis · Apr 15, 2016 · 0b168fb · 0b168fb
1 parent 3eebaa8
commit 0b168fb
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 15 deletions.
diff --git a/gcloud-java-dns/src/main/java/com/google/cloud/dns/testing/LocalDnsHelper.java b/gcloud-java-dns/src/main/java/com/google/cloud/dns/testing/LocalDnsHelper.java
@@ -119,6 +119,15 @@ public class LocalDnsHelper {
   private static final ScheduledExecutorService EXECUTORS =
       Executors.newScheduledThreadPool(2, Executors.defaultThreadFactory());
   private static final String PROJECT_ID = "dummyprojectid";
+  private static final String responseBoundary = "____THIS_IS_HELPERS_BOUNDARY____";
+  private static final String responseSeparator = new StringBuilder("--")
+      .append(responseBoundary)
+      .append("\r\n")
+      .toString();
+  private static final String responseEnd = new StringBuilder("--")
+      .append(responseBoundary)
+      .append("--\r\n\r\n")
+      .toString();
 
   static {
     try {
@@ -356,15 +365,6 @@ private Response handleBatch(final HttpExchange exchange) throws IOException {
       String contentType = exchange.getRequestHeaders().getFirst("Content-type");
       if (contentType != null) {
         int port = server.getAddress().getPort();
-        String responseBoundary = "____THIS_IS_HELPERS_BOUNDARY____";
-        String responseSeparator = new StringBuilder("--")
-            .append(responseBoundary)
-            .append("\r\n")
-            .toString();
-        String responseEnd = new StringBuilder("--")
-            .append(responseBoundary)
-            .append("--\r\n\r\n")
-            .toString();
         HttpMediaType httpMediaType = new HttpMediaType(contentType);
         String boundary = httpMediaType.getParameter("boundary");
         MultipartStream multipartStream =
@@ -412,7 +412,7 @@ private Response handleBatch(final HttpExchange exchange) throws IOException {
           }
         }
         out.write(responseEnd.getBytes());
-        writeBatchResponse(exchange, out, responseBoundary);
+        writeBatchResponse(exchange, out);
       }
       return null;
     }
@@ -520,11 +520,10 @@ private static void writeResponse(HttpExchange exchange, Response response) {
     }
   }
 
-  private static void writeBatchResponse(HttpExchange exchange, ByteArrayOutputStream out,
-      String boundary) {
-    exchange.getResponseHeaders().set("Content-type", "multipart/mixed; boundary=" + boundary);
+  private static void writeBatchResponse(HttpExchange exchange, ByteArrayOutputStream out) {
+    exchange.getResponseHeaders().set(
+        "Content-type", "multipart/mixed; boundary=" + responseBoundary);
     try {
-      exchange.getResponseHeaders().add("Connection", "close");
       exchange.getResponseHeaders().add("Connection", "close");
       exchange.sendResponseHeaders(200, out.toByteArray().length);
       OutputStream responseBody = exchange.getResponseBody();

diff --git a/gcloud-java-dns/src/test/java/com/google/cloud/dns/testing/LocalDnsHelperTest.java b/gcloud-java-dns/src/test/java/com/google/cloud/dns/testing/LocalDnsHelperTest.java
@@ -2913,7 +2913,7 @@ public void onFailure(GoogleJsonError googleJsonError) {
     batch.addGetChangeRequest(created.getName(), "0", new RpcBatch.Callback<Change>() {
       @Override
       public void onSuccess(Change response) {
-        assertEquals(RPC.getChangeRequest(created.getName(), "0", EMPTY_RPC_OPTIONS),response);
+        assertEquals(RPC.getChangeRequest(created.getName(), "0", EMPTY_RPC_OPTIONS), response);
       }
 
       @Override