From d89153ed1f37719a8080124d09b563b4a920ef37 Mon Sep 17 00:00:00 2001
From: Andrew Gaul <andrew@gaul.org>
Date: Tue, 17 Jul 2012 07:11:53 -0700
Subject: [PATCH] Reduce filesystem and transient differences

---
 .../jclouds/filesystem/FilesystemAsyncBlobStore.java |  3 +--
 .../jclouds/blobstore/TransientAsyncBlobStore.java   | 12 ++++++------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/apis/filesystem/src/main/java/org/jclouds/filesystem/FilesystemAsyncBlobStore.java b/apis/filesystem/src/main/java/org/jclouds/filesystem/FilesystemAsyncBlobStore.java
index aad185533a..4b91c230f6 100644
--- a/apis/filesystem/src/main/java/org/jclouds/filesystem/FilesystemAsyncBlobStore.java
+++ b/apis/filesystem/src/main/java/org/jclouds/filesystem/FilesystemAsyncBlobStore.java
@@ -402,8 +402,7 @@ public class FilesystemAsyncBlobStore extends BaseAsyncBlobStore {
    }
 
    public static HttpResponseException returnResponseException(int code) {
-      HttpResponse response = null;
-      response = HttpResponse.builder().statusCode(code).build();
+      HttpResponse response = HttpResponse.builder().statusCode(code).build();
       return new HttpResponseException(new HttpCommand() {
 
          public int getRedirectCount() {
diff --git a/blobstore/src/main/java/org/jclouds/blobstore/TransientAsyncBlobStore.java b/blobstore/src/main/java/org/jclouds/blobstore/TransientAsyncBlobStore.java
index 430c205866..3598e1282b 100644
--- a/blobstore/src/main/java/org/jclouds/blobstore/TransientAsyncBlobStore.java
+++ b/blobstore/src/main/java/org/jclouds/blobstore/TransientAsyncBlobStore.java
@@ -115,33 +115,33 @@ public class TransientAsyncBlobStore extends BaseAsyncBlobStore {
 
    protected final DateService dateService;
    protected final Crypto crypto;
-   protected final Provider<UriBuilder> uriBuilders;
    protected final HttpGetOptionsListToGetOptions httpGetOptionsConverter;
+   protected final ContentMetadataCodec contentMetadataCodec;
    protected final IfDirectoryReturnNameStrategy ifDirectoryReturnName;
    protected final Factory blobFactory;
    protected final TransientStorageStrategy storageStrategy;
-   protected final ContentMetadataCodec contentMetadataCodec;
+   protected final Provider<UriBuilder> uriBuilders;
 
    @Inject
    protected TransientAsyncBlobStore(BlobStoreContext context,
          DateService dateService, Crypto crypto,
          HttpGetOptionsListToGetOptions httpGetOptionsConverter,
+         ContentMetadataCodec contentMetadataCodec,
          IfDirectoryReturnNameStrategy ifDirectoryReturnName,
          BlobUtils blobUtils,
          @Named(Constants.PROPERTY_USER_THREADS) ExecutorService service,
          Supplier<Location> defaultLocation,
          @Memoized Supplier<Set<? extends Location>> locations,
-         Factory blobFactory, Provider<UriBuilder> uriBuilders,
-         ContentMetadataCodec contentMetadataCodec) {
+         Factory blobFactory, Provider<UriBuilder> uriBuilders) {
       super(context, blobUtils, service, defaultLocation, locations);
       this.blobFactory = blobFactory;
       this.dateService = dateService;
       this.crypto = crypto;
-      this.uriBuilders = uriBuilders;
       this.httpGetOptionsConverter = httpGetOptionsConverter;
+      this.contentMetadataCodec = contentMetadataCodec;
       this.ifDirectoryReturnName = ifDirectoryReturnName;
       this.storageStrategy = new TransientStorageStrategy(defaultLocation);
-      this.contentMetadataCodec = contentMetadataCodec;
+      this.uriBuilders = uriBuilders;
    }
 
    /**