tidy up

Author: rmuir

plugins/repository-hdfs/src/main/java/org/elasticsearch/repositories/hdfs/HdfsBlobContainer.java

@@ -131,14 +131,14 @@ public Void run(FileContext fileContext) throws IOException {
     }
 
     @Override
-    public Map<String, BlobMetaData> listBlobsByPrefix(final @Nullable String blobNamePrefix) throws IOException {
+    public Map<String, BlobMetaData> listBlobsByPrefix(final @Nullable String prefix) throws IOException {
         FileStatus[] files = store.execute(new Operation<FileStatus[]>() {
             @Override
             public FileStatus[] run(FileContext fileContext) throws IOException {
                 return (fileContext.util().listStatus(path, new PathFilter() {
                     @Override
                     public boolean accept(Path path) {
-                        return path.getName().startsWith(blobNamePrefix);
+                        return prefix == null || path.getName().startsWith(prefix);
                     }
                 }));
             }
@@ -152,16 +152,6 @@ public boolean accept(Path path) {
 
     @Override
     public Map<String, BlobMetaData> listBlobs() throws IOException {
-        FileStatus[] files = store.execute(new Operation<FileStatus[]>() {
-            @Override
-            public FileStatus[] run(FileContext fileContext) throws IOException {
-                return fileContext.util().listStatus(path);
-            }
-        });
-        Map<String, BlobMetaData> map = new LinkedHashMap<String, BlobMetaData>();
-        for (FileStatus file : files) {
-            map.put(file.getPath().getName(), new PlainBlobMetaData(file.getPath().getName(), file.getLen()));
-        }
-        return Collections.unmodifiableMap(map);
+        return listBlobsByPrefix(null);
     }
 }

plugins/repository-hdfs/src/main/java/org/elasticsearch/repositories/hdfs/HdfsBlobStore.java

@@ -66,16 +66,6 @@ public Void run(FileContext fileContext) throws IOException {
         });
     }
 
-    @Override
-    public String toString() {
-        return root.toUri().toString();
-    }
-
-    @Override
-    public BlobContainer blobContainer(BlobPath path) {
-        return new HdfsBlobContainer(path, this, buildHdfsPath(path), bufferSize);
-    }
-
     @Override
     public void delete(BlobPath path) throws IOException {
         execute(new Operation<Void>() {
@@ -87,6 +77,16 @@ public Void run(FileContext fc) throws IOException {
         });
     }
 
+    @Override
+    public String toString() {
+        return root.toUri().toString();
+    }
+
+    @Override
+    public BlobContainer blobContainer(BlobPath path) {
+        return new HdfsBlobContainer(path, this, buildHdfsPath(path), bufferSize);
+    }
+
     private Path buildHdfsPath(BlobPath blobPath) {
         final Path path = translateToHdfsPath(blobPath);
         try {
@@ -107,7 +107,6 @@ private Path translateToHdfsPath(BlobPath blobPath) {
         return path;
     }
 
-    
     interface Operation<V> {
         V run(FileContext fileContext) throws IOException;
     }
@@ -122,7 +121,7 @@ <V> V execute(Operation<V> operation) throws IOException {
             sm.checkPermission(new SpecialPermission());
         }
         if (closed) {
-            throw new AlreadyClosedException("HdfsBlobStore is closed: " + root);
+            throw new AlreadyClosedException("HdfsBlobStore is closed: " + this);
         }
         try {
             return AccessController.doPrivileged(new PrivilegedExceptionAction<V>() {

plugins/repository-hdfs/src/test/java/org/elasticsearch/repositories/hdfs/HdfsTests.java

@@ -22,7 +22,6 @@
 import static org.hamcrest.Matchers.greaterThan;
 
 import java.util.Collection;
-import java.util.Collections;
 
 import org.elasticsearch.action.admin.cluster.repositories.put.PutRepositoryResponse;
 import org.elasticsearch.action.admin.cluster.snapshots.create.CreateSnapshotResponse;
@@ -34,9 +33,6 @@
 import org.elasticsearch.repositories.RepositoryException;
 import org.elasticsearch.repositories.hdfs.HdfsPlugin;
 import org.elasticsearch.snapshots.SnapshotState;
-import org.elasticsearch.test.ESIntegTestCase;
-import org.elasticsearch.test.ESIntegTestCase.ClusterScope;
-import org.elasticsearch.test.ESIntegTestCase.Scope;
 import org.elasticsearch.test.ESSingleNodeTestCase;
 
 public class HdfsTests extends ESSingleNodeTestCase {