embulk-input-azure_blob_storage 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60cc4b85fafbfd719fdb70232f8c7b44c3153d9f
-  data.tar.gz: 50af2362a8edbc752bbc1116a36ede8a3f64aa84
+  metadata.gz: c8a820c0389e246171f6f0ccd9ff535ae4be3b56
+  data.tar.gz: 9a31f3ba0a98659a4745923cadb485b87507ad60
 SHA512:
-  metadata.gz: b11039548309b1d49bc7b87e54a6ff60eb36863e8f75127f087f71520a957d833aac197f577dbbf262ae0d68a656edd92b0c5fa5ed42fb7c90c62f8e5f551b15
-  data.tar.gz: ecb4b533a64440f78a07ebdb8e1a7b5a4dba91a79a4c7121e32463ecdb4e5746d26186078ae938dd73774273001d917ac09b914d20fa312690ccde91a49986d5
+  metadata.gz: d636e2392ad6c94b8d218e03ac84e9b1e95e29229bd30af937b9e0cd85a247f37588bea12c4ca336ea6d992ac89812a2a0d0834e087f3b3a342e92d897f3032e
+  data.tar.gz: aa4c141450109ad1dca6d04c1c9f7dfade3f471dbd5f821b5b87220971ea12387fa6278c4265622e70640d0ed2fbe699653b98146a1ca3093ce1fc7d92e9a04d

data/CHANGELOG.md

@@ -1,13 +1,17 @@
-## 0.1.5 - 2015-03-30
+## 0.1.6 - 2016-04-01
+
+* [maintenance] Small refactoring [#9](https://github.com/sakama/embulk-input-azure_blob_storage/pull/9)
+
+## 0.1.5 - 2016-03-30
 
 * [maintenance] Use RetryExecutor when retry is needed [#8](https://github.com/sakama/embulk-input-azure_blob_storage/pull/8)
 
-## 0.1.4 - 2015-03-22
+## 0.1.4 - 2016-03-22
 
 * [new feature] Support `last_path` option [#7](https://github.com/sakama/embulk-input-azure_blob_storage/pull/7)
 * [new feature] Support `path_match_pattern` option [#6](https://github.com/sakama/embulk-input-azure_blob_storage/pull/6)
 
-## 0.1.3 - 2015-03-16
+## 0.1.3 - 2016-03-16
 
 * [maintenance] Add unit test [#4](https://github.com/sakama/embulk-input-azure_blob_storage/pull/4)
 * [maintenance] Add retry logic [#3](https://github.com/sakama/embulk-input-azure_blob_storage/pull/3)

data/build.gradle

@@ -17,7 +17,7 @@ configurations {
 sourceCompatibility = 1.7
 targetCompatibility = 1.7
 
-version = "0.1.5"
+version = "0.1.6"
 
 dependencies {
     compile  "org.embulk:embulk-core:0.8.2"

data/src/main/java/org/embulk/input/azure_blob_storage/AzureBlobStorageFileInputPlugin.java

@@ -66,7 +66,7 @@ public class AzureBlobStorageFileInputPlugin
         int getMaxResults();
 
         @Config("max_connection_retry")
-        @ConfigDefault("10") // 10 times retry to connect sftp server if failed.
+        @ConfigDefault("10") // 10 times retry to connect Azure Blob Storage if failed.
         int getMaxConnectionRetry();
 
         FileList getFiles();
@@ -83,8 +83,7 @@ public class AzureBlobStorageFileInputPlugin
     {
         final PluginTask task = config.loadConfig(PluginTask.class);
 
-        CloudBlobClient blobClient = newAzureClient(task.getAccountName(), task.getAccountKey());
-        task.setFiles(listFiles(blobClient, task));
+        task.setFiles(listFiles(task));
 
         return resume(task.dump(), task.getFiles().getTaskCount(), control);
     }
@@ -122,18 +121,18 @@ public class AzureBlobStorageFileInputPlugin
         return account.createCloudBlobClient();
     }
 
-    private FileList listFiles(CloudBlobClient client, PluginTask task)
+    private FileList listFiles(PluginTask task)
     {
         if (task.getPathPrefix().equals("/")) {
             log.info("Listing files with prefix \"/\". This doesn't mean all files in a bucket. If you intend to read all files, use \"path_prefix: ''\" (empty string) instead.");
         }
         FileList.Builder builder = new FileList.Builder(task);
 
-        return listFilesWithPrefix(builder, client, task.getContainer(), task.getPathPrefix(),
+        return listFilesWithPrefix(builder, task.getAccountName(), task.getAccountKey(), task.getContainer(), task.getPathPrefix(),
                                     task.getLastPath(), task.getMaxResults(), task.getMaxConnectionRetry());
     }
 
-    private static FileList listFilesWithPrefix(final FileList.Builder builder, final CloudBlobClient client,
+    private static FileList listFilesWithPrefix(final FileList.Builder builder, final String accountName, final String accountKey,
                                                 final String containerName, final String prefix, final Optional<String> lastPath,
                                                 final int maxResults, final int maxConnectionRetry)
     {
@@ -147,6 +146,7 @@ public class AzureBlobStorageFileInputPlugin
                         @Override
                         public FileList call() throws StorageException, URISyntaxException, IOException
                         {
+                            CloudBlobClient client = newAzureClient(accountName, accountKey);
                             ResultContinuation token = null;
                             if (lastKey != null) {
                                 token = new ResultContinuation();

data/src/test/java/org/embulk/input/azure_blob_storage/TestAzureBlobStorageFileInputPlugin.java

@@ -3,7 +3,6 @@ package org.embulk.input.azure_blob_storage;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
-import com.microsoft.azure.storage.blob.CloudBlobClient;
 import org.embulk.EmbulkTestRuntime;
 import org.embulk.config.ConfigDiff;
 import org.embulk.config.ConfigException;
@@ -189,13 +188,9 @@ public class TestAzureBlobStorageFileInputPlugin
             }
         });
 
-        Method newAzureClient = AzureBlobStorageFileInputPlugin.class.getDeclaredMethod("newAzureClient", String.class, String.class);
-        newAzureClient.setAccessible(true);
-        CloudBlobClient client = (CloudBlobClient) newAzureClient.invoke(plugin, task.getAccountName(), task.getAccountKey());
-
-        Method listFiles = AzureBlobStorageFileInputPlugin.class.getDeclaredMethod("listFiles", CloudBlobClient.class, PluginTask.class);
+        Method listFiles = AzureBlobStorageFileInputPlugin.class.getDeclaredMethod("listFiles", PluginTask.class);
         listFiles.setAccessible(true);
-        FileList actual = (FileList) listFiles.invoke(plugin, client, task);
+        FileList actual = (FileList) listFiles.invoke(plugin, task);
         assertEquals(expected.get(0), actual.get(0).get(0));
         assertEquals(expected.get(1), actual.get(1).get(0));
         assertEquals(AZURE_CONTAINER_IMPORT_DIRECTORY + "sample_02.csv", configDiff.get(String.class, "last_path"));
@@ -208,13 +203,9 @@ public class TestAzureBlobStorageFileInputPlugin
         PluginTask task = config.loadConfig(PluginTask.class);
         runner.transaction(config, new Control());
 
-        Method newAzureClient = AzureBlobStorageFileInputPlugin.class.getDeclaredMethod("newAzureClient", String.class, String.class);
-        newAzureClient.setAccessible(true);
-        CloudBlobClient client = (CloudBlobClient) newAzureClient.invoke(plugin, task.getAccountName(), task.getAccountKey());
-
-        Method listFiles = AzureBlobStorageFileInputPlugin.class.getDeclaredMethod("listFiles", CloudBlobClient.class, PluginTask.class);
+        Method listFiles = AzureBlobStorageFileInputPlugin.class.getDeclaredMethod("listFiles", PluginTask.class);
         listFiles.setAccessible(true);
-        task.setFiles((FileList) listFiles.invoke(plugin, client, task));
+        task.setFiles((FileList) listFiles.invoke(plugin, task));
 
         assertRecords(config, output);
     }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-azure_blob_storage
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Satoshi Akama
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-03-30 00:00:00.000000000 Z
+date: 2016-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -64,7 +64,7 @@ files:
 - src/test/resources/sample_02.csv
 - classpath/azure-storage-4.0.0.jar
 - classpath/commons-lang3-3.4.jar
-- classpath/embulk-input-azure_blob_storage-0.1.5.jar
+- classpath/embulk-input-azure_blob_storage-0.1.6.jar
 - classpath/jackson-core-2.6.0.jar
 homepage: https://github.com/sakama/embulk-input-azure_blob_storage
 licenses: