From 74862d73211ccae8200da715bb38e9af15165ffd Mon Sep 17 00:00:00 2001
From: Andrew Gaul <andrew@gaul.org>
Date: Mon, 19 Mar 2012 18:51:21 -0700
Subject: [PATCH] Prefer ImmutableCollection over mutable array

Also static.
---
 .../org/jclouds/s3/filters/RequestAuthorizeSignature.java  | 7 ++++---
 .../azure/storage/filters/SharedKeyLiteAuthentication.java | 6 ++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/apis/s3/src/main/java/org/jclouds/s3/filters/RequestAuthorizeSignature.java b/apis/s3/src/main/java/org/jclouds/s3/filters/RequestAuthorizeSignature.java
index 9ac17f1c77..5255c1e7a9 100644
--- a/apis/s3/src/main/java/org/jclouds/s3/filters/RequestAuthorizeSignature.java
+++ b/apis/s3/src/main/java/org/jclouds/s3/filters/RequestAuthorizeSignature.java
@@ -62,6 +62,7 @@ import org.jclouds.s3.Bucket;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Predicate;
+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Ordering;
@@ -85,9 +86,9 @@ public class RequestAuthorizeSignature implements HttpRequestFilter, RequestSign
       }
    };
 
-   private final String[] firstHeadersToSign = new String[] { HttpHeaders.DATE };
+   private static final Collection<String> FIRST_HEADERS_TO_SIGN = ImmutableList.of(HttpHeaders.DATE);
 
-   public static Set<String> SIGNED_PARAMETERS = ImmutableSet.of("acl", "torrent", "logging", "location", "policy",
+   private static final Set<String> SIGNED_PARAMETERS = ImmutableSet.of("acl", "torrent", "logging", "location", "policy",
             "requestPayment", "versioning", "versions", "versionId", "notification", "uploadId", "uploads",
             "partNumber", "website", "response-content-type", "response-content-language", "response-expires",
             "response-cache-control", "response-content-disposition", "response-content-encoding");
@@ -209,7 +210,7 @@ public class RequestAuthorizeSignature implements HttpRequestFilter, RequestSign
       buffer.append(
                utils.valueOrEmpty(request.getPayload() == null ? request.getFirstHeaderOrNull(HttpHeaders.CONTENT_TYPE)
                         : request.getPayload().getContentMetadata().getContentType())).append("\n");
-      for (String header : firstHeadersToSign)
+      for (String header : FIRST_HEADERS_TO_SIGN)
          buffer.append(valueOrEmpty(request.getHeaders().get(header))).append("\n");
    }
 
diff --git a/common/azure/src/main/java/org/jclouds/azure/storage/filters/SharedKeyLiteAuthentication.java b/common/azure/src/main/java/org/jclouds/azure/storage/filters/SharedKeyLiteAuthentication.java
index 101755c33b..aa967571a0 100644
--- a/common/azure/src/main/java/org/jclouds/azure/storage/filters/SharedKeyLiteAuthentication.java
+++ b/common/azure/src/main/java/org/jclouds/azure/storage/filters/SharedKeyLiteAuthentication.java
@@ -20,6 +20,7 @@ package org.jclouds.azure.storage.filters;
 
 import static org.jclouds.util.Patterns.NEWLINE_PATTERN;
 
+import java.util.Collection;
 import java.util.Set;
 import java.util.TreeSet;
 
@@ -45,6 +46,7 @@ import org.jclouds.logging.Logger;
 import org.jclouds.util.Strings2;
 
 import com.google.common.annotations.VisibleForTesting;
+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMap.Builder;
 import com.google.common.collect.Multimaps;
@@ -58,7 +60,7 @@ import com.google.common.collect.Multimaps;
  */
 @Singleton
 public class SharedKeyLiteAuthentication implements HttpRequestFilter {
-   private final String[] firstHeadersToSign = new String[] { HttpHeaders.DATE };
+   private static final Collection<String> FIRST_HEADERS_TO_SIGN = ImmutableList.of(HttpHeaders.DATE);
 
    private final SignatureWire signatureWire;
    private final String identity;
@@ -163,7 +165,7 @@ public class SharedKeyLiteAuthentication implements HttpRequestFilter {
    }
 
    private void appendHttpHeaders(HttpRequest request, StringBuilder toSign) {
-      for (String header : firstHeadersToSign)
+      for (String header : FIRST_HEADERS_TO_SIGN)
          toSign.append(utils.valueOrEmpty(request.getHeaders().get(header))).append("\n");
    }