embulk-output-gcs 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0d6f9617394f320742be74ac318d99ef0f93c06
-  data.tar.gz: af9f3a3679a2d76b5c2944fd7e8264ecab3b3a27
+  metadata.gz: 32dea7ae4556f71bef945eaf868b6a57721120c9
+  data.tar.gz: 48631287b5c928cc35f1d5c68a8ae6e2f60843b3
 SHA512:
-  metadata.gz: 086960d449e95821defa56b6860eaf2a45fe753db3c7d763272c694ae5fd87b07aba937bb170f748b6d779775e71145c9ff350528d12ea6d770e64d40b67f3ec
-  data.tar.gz: 99a7bc4c683d61b500780c316be1c7861181cccde8f20daf6b674e96068a2fc9414db5b830013c0f6c223b33d2cc7a4d164bc62536ed0082ba419754ac8a7980
+  metadata.gz: b34b7724fd0064692411f1f449e2e4930ba4b931e83a5c2cde1c4241de07f1897077cd8c73cba743508a358d37a842e907b4f9b791d6f406d057f7b91f9eabf7
+  data.tar.gz: f5c2b60c384b9bcff1cc124995bf6707c448fb02468dc8a5b024d6864a6a4ce88b6656e99db5d69e862b4e2a6255a25ccbf7c3da6a914c0c80e90be782464203

data/build.gradle

@@ -17,18 +17,18 @@ configurations {
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
-version = "0.4.2"
+version = "0.4.3"
 
 dependencies {
-    compile  "org.embulk:embulk-core:0.8.6"
-    provided "org.embulk:embulk-core:0.8.6"
+    compile  "org.embulk:embulk-core:0.9.11"
+    provided "org.embulk:embulk-core:0.9.11"
 
     compile "com.google.http-client:google-http-client-jackson2:1.19.0"
     compile ("com.google.apis:google-api-services-storage:v1-rev28-1.19.1") {exclude module: "guava-jdk5"}
 
     testCompile "junit:junit:4.12"
-    testCompile "org.embulk:embulk-core:0.8.6:tests"
-    testCompile "org.embulk:embulk-standards:0.8.6"
+    testCompile "org.embulk:embulk-core:0.9.11:tests"
+    testCompile "org.embulk:embulk-standards:0.9.11"
 }
 
 task classpath(type: Copy, dependsOn: ["jar"]) {

data/src/main/java/org/embulk/output/GcsAuthentication.java

@@ -11,7 +11,6 @@ import com.google.api.client.json.JsonFactory;
 import com.google.api.client.json.jackson2.JacksonFactory;
 import com.google.api.services.storage.Storage;
 import com.google.api.services.storage.StorageScopes;
-import com.google.common.base.Optional;
 import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableList;
 import org.embulk.config.ConfigException;
@@ -28,6 +27,7 @@ import java.io.IOException;
 import java.io.InterruptedIOException;
 import java.security.GeneralSecurityException;
 import java.util.Collections;
+import java.util.Optional;
 
 public class GcsAuthentication
 {
@@ -74,7 +74,7 @@ public class GcsAuthentication
         return new GoogleCredential.Builder()
                 .setTransport(httpTransport)
                 .setJsonFactory(jsonFactory)
-                .setServiceAccountId(serviceAccountEmail.orNull())
+                .setServiceAccountId(serviceAccountEmail.orElse(null))
                 .setServiceAccountScopes(
                         ImmutableList.of(
                                 StorageScopes.DEVSTORAGE_READ_WRITE

data/src/main/java/org/embulk/output/GcsOutputPlugin.java

@@ -1,8 +1,6 @@
 package org.embulk.output;
 
 import com.google.api.services.storage.Storage;
-import com.google.common.base.Function;
-import com.google.common.base.Optional;
 import com.google.common.base.Throwables;
 import org.embulk.config.ConfigDiff;
 import org.embulk.config.ConfigException;
@@ -17,6 +15,8 @@ import org.embulk.spi.unit.LocalFile;
 import java.io.IOException;
 import java.security.GeneralSecurityException;
 import java.util.List;
+import java.util.Optional;
+import java.util.function.Function;
 
 public class GcsOutputPlugin implements FileOutputPlugin
 {
@@ -84,8 +84,8 @@ public class GcsOutputPlugin implements FileOutputPlugin
             return new GcsAuthentication(
                     task.getAuthMethod().getString(),
                     task.getServiceAccountEmail(),
-                    task.getP12Keyfile().transform(localFileToPathString()),
-                    task.getJsonKeyfile().transform(localFileToPathString()),
+                    task.getP12Keyfile().map(localFileToPathString()),
+                    task.getJsonKeyfile().map(localFileToPathString()),
                     task.getApplicationName()
             );
         }

data/src/main/java/org/embulk/output/PluginTask.java

@@ -1,11 +1,12 @@
 package org.embulk.output;
 
-import com.google.common.base.Optional;
 import org.embulk.config.Config;
 import org.embulk.config.ConfigDefault;
 import org.embulk.config.Task;
 import org.embulk.spi.unit.LocalFile;
 
+import java.util.Optional;
+
 public interface PluginTask extends Task
 {
     @Config("bucket")

data/src/test/java/org/embulk/output/TestGcsAuthentication.java

@@ -2,7 +2,6 @@ package org.embulk.output;
 
 import com.google.api.client.googleapis.auth.oauth2.GoogleCredential;
 import com.google.api.services.storage.Storage;
-import com.google.common.base.Optional;
 
 import org.embulk.EmbulkTestRuntime;
 
@@ -18,6 +17,7 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.lang.reflect.Field;
 import java.security.GeneralSecurityException;
+import java.util.Optional;
 
 public class TestGcsAuthentication
 {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-gcs
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Kazuyuki Honda
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-07-31 00:00:00.000000000 Z
+date: 2018-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -73,9 +73,9 @@ files:
 - src/test/resources/sample_01.csv
 - src/test/resources/sample_02.csv
 - classpath/google-api-services-storage-v1-rev28-1.19.1.jar
+- classpath/embulk-output-gcs-0.4.3.jar
 - classpath/httpclient-4.0.1.jar
 - classpath/jsr305-1.3.9.jar
-- classpath/embulk-output-gcs-0.4.2.jar
 - classpath/commons-logging-1.1.1.jar
 - classpath/google-http-client-1.19.0.jar
 - classpath/google-api-client-1.19.1.jar