embulk-output-kintone 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2004bfc2e202eeb6c57f3149bc7311f90343a67e
-  data.tar.gz: 86e036bc863ac7d8ca632488d0eb84c645658c43
+  metadata.gz: 29cb270e92a0d79d50c33b6e4e6622d7bab0c6b9
+  data.tar.gz: 8ea4ec1c7e157a99aaf364d8adf0e17387e5c363
 SHA512:
-  metadata.gz: 723f4b6b9e5341a7e0bef48c6de38528860985d46d9a139c2d3e133c59ab867c9a4507b0c98a431b5b654f332178f90038168bc0143d9d9dcb2916dfe1956e44
-  data.tar.gz: 84441877b034060e5876ae67d8afd1d01f15a91d1aab8a76065bd4549a85c7de1639b0557a814482edc8312bbc11cbcbdc0565fa87aedfb794493966064201b7
+  metadata.gz: 9ee3d4c0d1e8a015064a5c4683bc5ee23c06c4da172315a068c715abca55b865f2481e0a2aca5d094b9a35ed3f07118be7d23064995073b54e33c39b64017afa
+  data.tar.gz: 30bc14642e24cadd7af74b7ffb5fe7b03d5be8f93989ea496f9577587f18066342ddf2c9c5e2b93b03f1f0087662fd5554cb268efab5c0bc08ad2cd767d5e3f4

data/build.gradle

@@ -14,7 +14,7 @@ configurations {
     provided
 }
 
-version = "0.3.0"
+version = "0.3.1"
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8

data/src/main/java/org/embulk/output/kintone/KintoneColumnOption.java

@@ -10,16 +10,16 @@ public interface KintoneColumnOption
         extends Task
 {
     @Config("type")
-    public String getType();
+    String getType();
 
     @Config("field_code")
-    public String getFieldCode();
+    String getFieldCode();
 
     @Config("timezone")
     @ConfigDefault("\"UTC\"")
-    public Optional<String> getTimezone();
+    Optional<String> getTimezone();
 
     @Config("val_sep")
     @ConfigDefault("\",\"")
-    public String getValueSeparator();
+    String getValueSeparator();
 }

data/src/main/java/org/embulk/output/kintone/KintoneColumnVisitor.java

@@ -27,10 +27,10 @@ import java.util.Objects;
 public class KintoneColumnVisitor
         implements ColumnVisitor
 {
-    private PageReader pageReader;
+    private final PageReader pageReader;
     private Record record;
     private UpdateKey updateKey;
-    private Map<String, KintoneColumnOption> columnOptions;
+    private final Map<String, KintoneColumnOption> columnOptions;
     private String updateKeyName;
 
     public KintoneColumnVisitor(PageReader pageReader,
@@ -136,7 +136,10 @@ public class KintoneColumnVisitor
     private ZoneId getZoneId(Column column)
     {
         KintoneColumnOption option = columnOptions.get(column.getName());
-        return ZoneId.of(option.getTimezone().get());
+        if (option == null) {
+            return ZoneId.of("UTC");
+        }
+        return ZoneId.of(option.getTimezone().orElse("UTC"));
     }
 
     private boolean isUpdateKey(Column column)

data/src/main/java/org/embulk/output/kintone/KintoneOutputPlugin.java

@@ -10,7 +10,6 @@ import org.embulk.spi.OutputPlugin;
 import org.embulk.spi.Schema;
 import org.embulk.spi.TransactionalPageOutput;
 
-import java.util.Collection;
 import java.util.List;
 
 public class KintoneOutputPlugin
@@ -46,7 +45,6 @@ public class KintoneOutputPlugin
     public TransactionalPageOutput open(TaskSource taskSource, Schema schema, int taskIndex)
     {
         PluginTask task = taskSource.loadTask(PluginTask.class);
-        Collection<KintoneColumnOption> options = task.getColumnOptions().values();
 
         KintoneMode mode = KintoneMode.getKintoneModeByValue(task.getMode());
         switch (mode) {

data/src/main/java/org/embulk/output/kintone/KintonePageOutput.java

@@ -16,7 +16,7 @@ import org.embulk.spi.Schema;
 import org.embulk.spi.TransactionalPageOutput;
 
 import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -25,8 +25,8 @@ public class KintonePageOutput
 {
     public static final int UPSERT_BATCH_SIZE = 10000;
     public static final int CHUNK_SIZE = 100;
-    private PageReader pageReader;
-    private PluginTask task;
+    private final PageReader pageReader;
+    private final PluginTask task;
     private KintoneClient client;
 
     public KintonePageOutput(PluginTask task, Schema schema)
@@ -90,14 +90,14 @@ public class KintonePageOutput
 
     public interface Consumer<T>
     {
-        public void accept(T t);
+        void accept(T t);
     }
 
     public void connect(final PluginTask task)
     {
         KintoneClientBuilder builder = KintoneClientBuilder.create("https://" + task.getDomain());
         if (task.getGuestSpaceId().isPresent()) {
-            builder.setGuestSpaceId(task.getGuestSpaceId().or(-1));
+            builder.setGuestSpaceId(task.getGuestSpaceId().orElse(-1));
         }
         if (task.getBasicAuthUsername().isPresent() && task.getBasicAuthPassword().isPresent()) {
             builder.withBasicAuth(task.getBasicAuthUsername().get(),
@@ -157,16 +157,12 @@ public class KintonePageOutput
     {
         execute(client -> {
             try {
-                if (!task.getUpdateKeyName().isPresent()) {
-                    // already validated in KintoneOutputPlugin.open()
-                    throw new RuntimeException("unreachable error");
-                }
                 ArrayList<RecordForUpdate> updateRecords = new ArrayList<>();
                 pageReader.setPage(page);
 
                 KintoneColumnVisitor visitor = new KintoneColumnVisitor(pageReader,
                         task.getColumnOptions(),
-                        task.getUpdateKeyName().get());
+                        task.getUpdateKeyName().orElseThrow(() -> new RuntimeException("unreachable"))); // Already validated
                 while (pageReader.nextRecord()) {
                     Record record = new Record();
                     UpdateKey updateKey = new UpdateKey();
@@ -201,17 +197,13 @@ public class KintonePageOutput
     {
         execute(client -> {
             try {
-                if (!task.getUpdateKeyName().isPresent()) {
-                    // already validated in KintoneOutputPlugin.open()
-                    throw new RuntimeException("unreachable error");
-                }
                 ArrayList<Record> records = new ArrayList<>();
                 ArrayList<UpdateKey> updateKeys = new ArrayList<>();
                 pageReader.setPage(page);
 
                 KintoneColumnVisitor visitor = new KintoneColumnVisitor(pageReader,
                         task.getColumnOptions(),
-                        task.getUpdateKeyName().get());
+                        task.getUpdateKeyName().orElseThrow(() -> new RuntimeException("unreachable"))); // Already validated
                 while (pageReader.nextRecord()) {
                     Record record = new Record();
                     UpdateKey updateKey = new UpdateKey();
@@ -294,7 +286,7 @@ public class KintonePageOutput
         }
         String cursorId = client.record().createCursor(
             task.getAppId(),
-            Arrays.asList(fieldCode),
+            Collections.singletonList(fieldCode),
             fieldCode + " in (" + String.join(",", queryValues) + ")"
         );
         while (true) {

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

@@ -1,11 +1,11 @@
 package org.embulk.output.kintone;
 
-import com.google.common.base.Optional;
 import org.embulk.config.Config;
 import org.embulk.config.ConfigDefault;
 import org.embulk.config.Task;
 
 import java.util.Map;
+import java.util.Optional;
 
 public interface PluginTask
         extends Task
@@ -42,11 +42,11 @@ public interface PluginTask
 
     @Config("column_options")
     @ConfigDefault("{}")
-    public Map<String, KintoneColumnOption> getColumnOptions();
+    Map<String, KintoneColumnOption> getColumnOptions();
 
     @Config("mode")
     @ConfigDefault("insert")
-    public String getMode();
+    String getMode();
 
     @Config("update_key")
     @ConfigDefault("null")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-kintone
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - takeshi fujita
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-17 00:00:00.000000000 Z
+date: 2022-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -52,7 +52,7 @@ files:
 - README.md
 - Rakefile
 - build.gradle
-- classpath/embulk-output-kintone-0.3.0.jar
+- classpath/embulk-output-kintone-0.3.1.jar
 - config/checkstyle/checkstyle.xml
 - config/checkstyle/default.xml
 - gradle/wrapper/gradle-wrapper.jar