From 5346e5e181e120645ba1ca8a93f86c2ffad24353 Mon Sep 17 00:00:00 2001
From: Andrew Gaul <andrew@gaul.org>
Date: Mon, 11 Aug 2014 18:50:09 -0700
Subject: [PATCH] Address Checkstyle violations

---
 src/main/java/org/gaul/s3proxy/S3ProxyHandler.java | 10 +++++++---
 src/test/java/org/gaul/s3proxy/S3ProxyTest.java    |  3 ++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/gaul/s3proxy/S3ProxyHandler.java b/src/main/java/org/gaul/s3proxy/S3ProxyHandler.java
index 1b950f2..bccdb77 100644
--- a/src/main/java/org/gaul/s3proxy/S3ProxyHandler.java
+++ b/src/main/java/org/gaul/s3proxy/S3ProxyHandler.java
@@ -108,9 +108,13 @@ final class S3ProxyHandler extends AbstractHandler {
         if (identity != null) {
             String expectedAuthorization = createAuthorizationHeader(request,
                     identity, credential);
-            if (!expectedAuthorization.equals(request.getHeader(
-                    HttpHeaders.AUTHORIZATION)) &&
-                    !expectedAuthorization.equals("AWS " + request.getParameter("AWSAccessKeyId") + ":" + request.getParameter("Signature"))) {
+            String headerAuthorization = request.getHeader(
+                    HttpHeaders.AUTHORIZATION);
+            String queryStringAuthorization = "AWS " +
+                    request.getParameter("AWSAccessKeyId") + ":" +
+                    request.getParameter("Signature");
+            if (!expectedAuthorization.equals(headerAuthorization) &&
+                    !expectedAuthorization.equals(queryStringAuthorization)) {
                 sendSimpleErrorResponse(response,
                         HttpServletResponse.SC_FORBIDDEN,
                         "SignatureDoesNotMatch", "Forbidden");
diff --git a/src/test/java/org/gaul/s3proxy/S3ProxyTest.java b/src/test/java/org/gaul/s3proxy/S3ProxyTest.java
index 4cbeb80..2a86705 100644
--- a/src/test/java/org/gaul/s3proxy/S3ProxyTest.java
+++ b/src/test/java/org/gaul/s3proxy/S3ProxyTest.java
@@ -271,7 +271,8 @@ public final class S3ProxyTest {
         assertThat(putResponse.getStatusCode())
                 .isEqualTo(HttpServletResponse.SC_OK);
 
-        HttpRequest getRequest = signer.signGetBlob(containerName, blobName, 10);
+        HttpRequest getRequest = signer.signGetBlob(containerName, blobName,
+                10);
         HttpResponse getResponse = httpClient.invoke(getRequest);
         assertThat(getResponse.getStatusCode())
                 .isEqualTo(HttpServletResponse.SC_OK);