embulk-output-kintone 0.3.3 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7107e79ed02bf30d233e34a3606bc84851e65b04
-  data.tar.gz: 4c8c90cd5f2e3c72a3b1cb10f4b0f3373c626a06
+  metadata.gz: 4db580dd68dc408de335d4c115a01394b794e0b1
+  data.tar.gz: 420c0efc922b96404adce1f13e68611e12c7d6fa
 SHA512:
-  metadata.gz: ec15b3471eb9cca3b7804a62f3beed3242e6ef8c4b547d5995f826fb9840f0505e5705ae26856a27dea5653caf0500d9bde3e58de39e0f385ec51a428d024379
-  data.tar.gz: ab6ea4f392578a902bd778136e5b2b9972f93b0836aa515db48110001e6b984c867a11c7fb2cb08192afb3d8eda334b8e72ff007b7704984f98ea84cc4d91e08
+  metadata.gz: 03b503cff07e5b80f4fd0c1d57f81e74df997d5a07d710081e6058fcb3811492f1ba9e1e9b9ba1a3396727591445a6a1bc4f3684283c4d7bfaca099ad709f4a8
+  data.tar.gz: 6b0e6f9d6d0753b559fdffa57b53a24884fb68d1b6e8daa0e6cd5c1a0e62f3124a2e2e1008a873f2768216bd1b99f2e5f0af9f60bc0a38c168fe70ffbaca01ec

data/.github/workflows/ci.yml

@@ -3,14 +3,18 @@ name: main
 on:
   push:
     branches:
-      - 'master'
+      - "master"
     tags:
-      - '*'
+      - "*"
   pull_request:
     branches:
-      - 'master'
+      - "master"
     types: [opened, synchronize]
 
+permissions:
+  contents: read
+  packages: write
+
 jobs:
   main:
     runs-on: ubuntu-latest
@@ -21,6 +25,9 @@ jobs:
         with:
           java-version: 1.8
 
+      - name: Code format check by Spotless
+        run: ./gradlew spotlessCheck
+
       - name: Test
         run: ./gradlew test
 
@@ -57,4 +64,4 @@ jobs:
           gem push --otp="${OTP_TOKEN}" ./pkg/*.gem
         env:
           GEM_HOST_API_KEY: "${{secrets.RUBYGEMS_API_KEY}}"
-          OTP_SECRET: "${{secrets.RUBYGEMS_OTP_SECRET}}"
+          OTP_SECRET: "${{secrets.RUBYGEMS_OTP_SECRET}}"

data/build.gradle

@@ -5,6 +5,7 @@ plugins {
     id "java"
     id "checkstyle"
     id "com.palantir.git-version" version "0.12.3"
+    id "com.diffplug.spotless" version "6.13.0"
 }
 import com.github.jrubygradle.JRubyExec
 repositories {
@@ -116,3 +117,13 @@ end
     }
 }
 clean { delete "${project.name}.gemspec" }
+
+spotless {
+    java {
+        importOrder()
+        removeUnusedImports()
+        googleJavaFormat()
+        formatAnnotations()
+        toggleOffOn()
+    }
+}

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

@@ -1,25 +1,22 @@
 package org.embulk.output.kintone;
 
+import java.util.Optional;
 import org.embulk.config.Config;
 import org.embulk.config.ConfigDefault;
 import org.embulk.config.Task;
 
-import java.util.Optional;
-
-public interface KintoneColumnOption
-        extends Task
-{
-    @Config("type")
-    String getType();
+public interface KintoneColumnOption extends Task {
+  @Config("type")
+  String getType();
 
-    @Config("field_code")
-    String getFieldCode();
+  @Config("field_code")
+  String getFieldCode();
 
-    @Config("timezone")
-    @ConfigDefault("\"UTC\"")
-    Optional<String> getTimezone();
+  @Config("timezone")
+  @ConfigDefault("\"UTC\"")
+  Optional<String> getTimezone();
 
-    @Config("val_sep")
-    @ConfigDefault("\",\"")
-    String getValueSeparator();
+  @Config("val_sep")
+  @ConfigDefault("\",\"")
+  String getValueSeparator();
 }

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

@@ -12,222 +12,197 @@ import com.kintone.client.model.record.NumberFieldValue;
 import com.kintone.client.model.record.Record;
 import com.kintone.client.model.record.SingleLineTextFieldValue;
 import com.kintone.client.model.record.UpdateKey;
-import org.embulk.spi.Column;
-import org.embulk.spi.ColumnVisitor;
-import org.embulk.spi.PageReader;
-import org.embulk.spi.time.Timestamp;
-
 import java.math.BigDecimal;
 import java.time.Instant;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
+import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import org.embulk.spi.Column;
+import org.embulk.spi.ColumnVisitor;
+import org.embulk.spi.PageReader;
+import org.embulk.spi.time.Timestamp;
 
-public class KintoneColumnVisitor
-        implements ColumnVisitor
-{
-    private final PageReader pageReader;
-    private Record record;
-    private UpdateKey updateKey;
-    private final Map<String, KintoneColumnOption> columnOptions;
-    private String updateKeyName;
-
-    public KintoneColumnVisitor(PageReader pageReader,
-                                Map<String, KintoneColumnOption> columnOptions)
-    {
-        this.pageReader = pageReader;
-        this.columnOptions = columnOptions;
-    }
-
-    public KintoneColumnVisitor(PageReader pageReader,
-                                Map<String, KintoneColumnOption> columnOptions,
-                                String updateKeyName)
-    {
-        this.pageReader = pageReader;
-        this.columnOptions = columnOptions;
-        this.updateKeyName = updateKeyName;
-    }
-
-    public void setRecord(Record record)
-    {
-        this.record = record;
-    }
-
-    public void setUpdateKey(UpdateKey updateKey)
-    {
-        this.updateKey = updateKey;
-    }
-
-    private void setValue(String fieldCode, Object value, FieldType type, boolean isUpdateKey)
-    {
-        if (isUpdateKey && updateKey != null) {
-            updateKey
-                .setField(fieldCode)
-                .setValue(Objects.toString(value, ""));
-        }
-        String stringValue = Objects.toString(value, "");
-        FieldValue fieldValue;
-        switch (type) {
-            case NUMBER:
-                BigDecimal setValue = stringValue.equals("") ? null : new BigDecimal(stringValue);
-                fieldValue = new NumberFieldValue(setValue);
-                break;
-            case MULTI_LINE_TEXT:
-                fieldValue = new MultiLineTextFieldValue(stringValue);
-                break;
-            case DROP_DOWN:
-                fieldValue = new DropDownFieldValue(stringValue);
-                break;
-            case LINK:
-                fieldValue = new LinkFieldValue(stringValue);
-                break;
-            default:
-                fieldValue = new SingleLineTextFieldValue(stringValue);
-        }
-        record.putField(fieldCode, fieldValue);
-    }
-
-    private void setTimestampValue(String fieldCode, Instant instant, ZoneId zoneId, FieldType type)
-    {
-        FieldValue fieldValue = null;
-        ZonedDateTime datetime = instant.atZone(zoneId);
-        switch (type) {
-            case DATE:
-                fieldValue = new DateFieldValue(datetime.toLocalDate());
-                break;
-            case DATETIME:
-                fieldValue = new DateTimeFieldValue(datetime);
-        }
-        record.putField(fieldCode, fieldValue);
-    }
-
-    private void setCheckBoxValue(String fieldCode, Object value, String valueSeparator)
-    {
-        String str = String.valueOf(value);
-        record.putField(
-            fieldCode,
-            new CheckBoxFieldValue(str.split(valueSeparator, 0))
-        );
-    }
-
-    private FieldType getType(Column column, FieldType defaultType)
-    {
-        KintoneColumnOption option = columnOptions.get(column.getName());
-        if (option == null) {
-            return defaultType;
-        }
-        else {
-            return FieldType.valueOf(option.getType());
-        }
-    }
-
-    private String getFieldCode(Column column)
-    {
-        KintoneColumnOption option = columnOptions.get(column.getName());
-        if (option == null) {
-            return column.getName();
-        }
-        else {
-            return option.getFieldCode();
-        }
-    }
-
-    private ZoneId getZoneId(Column column)
-    {
-        KintoneColumnOption option = columnOptions.get(column.getName());
-        if (option == null) {
-            return ZoneId.of("UTC");
-        }
-        return ZoneId.of(option.getTimezone().orElse("UTC"));
-    }
-
-    private boolean isUpdateKey(Column column)
-    {
-        if (this.updateKeyName == null) {
-            return false;
-        }
-
-        return this.updateKeyName.equals(column.getName());
-    }
-
-    private String getValueSeparator(Column column)
-    {
-        KintoneColumnOption option = columnOptions.get(column.getName());
-        if (option == null) {
-            return ",";
-        }
-        return option.getValueSeparator();
-    }
-
-    @Override
-    public void booleanColumn(Column column)
-    {
-        String fieldCode = getFieldCode(column);
-        FieldType type = getType(column, FieldType.NUMBER);
-        setValue(fieldCode, pageReader.getBoolean(column), type, isUpdateKey(column));
-    }
-
-    @Override
-    public void longColumn(Column column)
-    {
-        String fieldCode = getFieldCode(column);
-        FieldType type = getType(column, FieldType.NUMBER);
-        if (pageReader.isNull(column)) {
-            setValue(fieldCode, null, type, isUpdateKey(column));
-        } else {
-            setValue(fieldCode, pageReader.getLong(column), type, isUpdateKey(column));
-        }
-    }
-
-    @Override
-    public void doubleColumn(Column column)
-    {
-        String fieldCode = getFieldCode(column);
-        FieldType type = getType(column, FieldType.NUMBER);
-        setValue(fieldCode, pageReader.getDouble(column), type, isUpdateKey(column));
-    }
-
-    @Override
-    public void stringColumn(Column column)
-    {
-        String fieldCode = getFieldCode(column);
-        FieldType type = getType(column, FieldType.MULTI_LINE_TEXT);
-        Object value = pageReader.getString(column);
-        if (type == FieldType.CHECK_BOX) {
-            String stringValue = Objects.toString(value, "");
-            if (stringValue == "") {
-                return;
-            } else {
-                setCheckBoxValue(fieldCode, value, getValueSeparator(column));
-            }
-            return;
-        }
-        setValue(fieldCode, value, type, isUpdateKey(column));
-    }
-
-    @Override
-    public void timestampColumn(Column column)
-    {
-        Timestamp value = pageReader.getTimestamp(column);
-        if (value == null) {
-            return;
-        }
-
-        String fieldCode = getFieldCode(column);
-        FieldType type = getType(column, FieldType.DATETIME);
-        ZoneId zoneId = getZoneId(column);
-        if (type == FieldType.DATETIME) {
-            zoneId = ZoneId.of("UTC");
-        }
-        setTimestampValue(fieldCode, value.getInstant(), zoneId, type);
-    }
-
-    @Override
-    public void jsonColumn(Column column)
-    {
-        String fieldCode = getFieldCode(column);
-        FieldType type = getType(column, FieldType.MULTI_LINE_TEXT);
-        setValue(fieldCode, pageReader.getJson(column), type, isUpdateKey(column));
-    }
+public class KintoneColumnVisitor implements ColumnVisitor {
+  private final PageReader pageReader;
+  private Record record;
+  private UpdateKey updateKey;
+  private final Map<String, KintoneColumnOption> columnOptions;
+  private String updateKeyName;
+
+  public KintoneColumnVisitor(
+      PageReader pageReader, Map<String, KintoneColumnOption> columnOptions) {
+    this.pageReader = pageReader;
+    this.columnOptions = columnOptions;
+  }
+
+  public KintoneColumnVisitor(
+      PageReader pageReader, Map<String, KintoneColumnOption> columnOptions, String updateKeyName) {
+    this.pageReader = pageReader;
+    this.columnOptions = columnOptions;
+    this.updateKeyName = updateKeyName;
+  }
+
+  public void setRecord(Record record) {
+    this.record = record;
+  }
+
+  public void setUpdateKey(UpdateKey updateKey) {
+    this.updateKey = updateKey;
+  }
+
+  private void setValue(String fieldCode, Object value, FieldType type, boolean isUpdateKey) {
+    if (isUpdateKey && updateKey != null) {
+      updateKey.setField(fieldCode).setValue(Objects.toString(value, ""));
+    }
+    String stringValue = Objects.toString(value, "");
+    FieldValue fieldValue;
+    switch (type) {
+      case NUMBER:
+        BigDecimal setValue = stringValue.equals("") ? null : new BigDecimal(stringValue);
+        fieldValue = new NumberFieldValue(setValue);
+        break;
+      case MULTI_LINE_TEXT:
+        fieldValue = new MultiLineTextFieldValue(stringValue);
+        break;
+      case DROP_DOWN:
+        fieldValue = new DropDownFieldValue(stringValue);
+        break;
+      case LINK:
+        fieldValue = new LinkFieldValue(stringValue);
+        break;
+      default:
+        fieldValue = new SingleLineTextFieldValue(stringValue);
+    }
+    record.putField(fieldCode, fieldValue);
+  }
+
+  private void setTimestampValue(String fieldCode, Instant instant, ZoneId zoneId, FieldType type) {
+    FieldValue fieldValue = null;
+    ZonedDateTime datetime = instant.atZone(zoneId);
+    switch (type) {
+      case DATE:
+        fieldValue = new DateFieldValue(datetime.toLocalDate());
+        break;
+      case DATETIME:
+        fieldValue = new DateTimeFieldValue(datetime);
+    }
+    record.putField(fieldCode, fieldValue);
+  }
+
+  private void setCheckBoxValue(String fieldCode, Object value, String valueSeparator) {
+    String str = String.valueOf(value);
+    CheckBoxFieldValue checkBoxFieldValue = new CheckBoxFieldValue();
+
+    if (str != null && !str.equals("")) {
+      List<String> values = Arrays.asList(str.split(valueSeparator, 0));
+      checkBoxFieldValue = new CheckBoxFieldValue(values);
+    }
+    record.putField(fieldCode, checkBoxFieldValue);
+  }
+
+  private FieldType getType(Column column, FieldType defaultType) {
+    KintoneColumnOption option = columnOptions.get(column.getName());
+    if (option == null) {
+      return defaultType;
+    } else {
+      return FieldType.valueOf(option.getType());
+    }
+  }
+
+  private String getFieldCode(Column column) {
+    KintoneColumnOption option = columnOptions.get(column.getName());
+    if (option == null) {
+      return column.getName();
+    } else {
+      return option.getFieldCode();
+    }
+  }
+
+  private ZoneId getZoneId(Column column) {
+    KintoneColumnOption option = columnOptions.get(column.getName());
+    if (option == null) {
+      return ZoneId.of("UTC");
+    }
+    return ZoneId.of(option.getTimezone().orElse("UTC"));
+  }
+
+  private boolean isUpdateKey(Column column) {
+    if (this.updateKeyName == null) {
+      return false;
+    }
+
+    return this.updateKeyName.equals(column.getName());
+  }
+
+  private String getValueSeparator(Column column) {
+    KintoneColumnOption option = columnOptions.get(column.getName());
+    if (option == null) {
+      return ",";
+    }
+    return option.getValueSeparator();
+  }
+
+  @Override
+  public void booleanColumn(Column column) {
+    String fieldCode = getFieldCode(column);
+    FieldType type = getType(column, FieldType.NUMBER);
+    setValue(fieldCode, pageReader.getBoolean(column), type, isUpdateKey(column));
+  }
+
+  @Override
+  public void longColumn(Column column) {
+    String fieldCode = getFieldCode(column);
+    FieldType type = getType(column, FieldType.NUMBER);
+    if (pageReader.isNull(column)) {
+      setValue(fieldCode, null, type, isUpdateKey(column));
+    } else {
+      setValue(fieldCode, pageReader.getLong(column), type, isUpdateKey(column));
+    }
+  }
+
+  @Override
+  public void doubleColumn(Column column) {
+    String fieldCode = getFieldCode(column);
+    FieldType type = getType(column, FieldType.NUMBER);
+    setValue(fieldCode, pageReader.getDouble(column), type, isUpdateKey(column));
+  }
+
+  @Override
+  public void stringColumn(Column column) {
+    String fieldCode = getFieldCode(column);
+    FieldType type = getType(column, FieldType.MULTI_LINE_TEXT);
+    Object value = pageReader.getString(column);
+    if (type == FieldType.CHECK_BOX) {
+      String stringValue = Objects.toString(value, "");
+      setCheckBoxValue(fieldCode, value, getValueSeparator(column));
+      return;
+    }
+    setValue(fieldCode, value, type, isUpdateKey(column));
+  }
+
+  @Override
+  public void timestampColumn(Column column) {
+    Timestamp value = pageReader.getTimestamp(column);
+    if (value == null) {
+      return;
+    }
+
+    String fieldCode = getFieldCode(column);
+    FieldType type = getType(column, FieldType.DATETIME);
+    ZoneId zoneId = getZoneId(column);
+    if (type == FieldType.DATETIME) {
+      zoneId = ZoneId.of("UTC");
+    }
+    setTimestampValue(fieldCode, value.getInstant(), zoneId, type);
+  }
+
+  @Override
+  public void jsonColumn(Column column) {
+    String fieldCode = getFieldCode(column);
+    FieldType type = getType(column, FieldType.MULTI_LINE_TEXT);
+    setValue(fieldCode, pageReader.getJson(column), type, isUpdateKey(column));
+  }
 }

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

@@ -2,30 +2,28 @@ package org.embulk.output.kintone;
 
 import org.embulk.config.ConfigException;
 
-public enum KintoneMode
-{
-    INSERT("insert"), UPDATE("update"), UPSERT("upsert");
+public enum KintoneMode {
+  INSERT("insert"),
+  UPDATE("update"),
+  UPSERT("upsert");
 
-    private final String value;
+  private final String value;
 
-    KintoneMode(String value)
-    {
-        this.value = value;
-    }
+  KintoneMode(String value) {
+    this.value = value;
+  }
 
-    @Override
-    public String toString()
-    {
-        return value;
-    }
+  @Override
+  public String toString() {
+    return value;
+  }
 
-    public static KintoneMode getKintoneModeByValue(String value)
-    {
-        for (KintoneMode mode : values()) {
-            if (mode.toString().equals(value)) {
-                return mode;
-            }
-        }
-        throw new ConfigException(String.format("Unknown mode '%s'", value));
+  public static KintoneMode getKintoneModeByValue(String value) {
+    for (KintoneMode mode : values()) {
+      if (mode.toString().equals(value)) {
+        return mode;
+      }
     }
+    throw new ConfigException(String.format("Unknown mode '%s'", value));
+  }
 }