embulk-output-salesforce 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3d02cc5822121c62af4ba8512b32674eb5b045f
-  data.tar.gz: d6fb63e23ab436d9fc844934e3b4dc6634f4915c
+  metadata.gz: 29d21f4cf7365b79ed58cbd012c48bf59b31d7ae
+  data.tar.gz: 77f464e7f1dbfb7aa3d5b9cfc7b27904e3d73688
 SHA512:
-  metadata.gz: 448501ddd1046cf41372854c03cc4fc07919f4c9969cdfa9cbcd2ddf8df436a5eb0573eb8fb6339c32e7f519a3e5769d95e6aea944e98cc482f80db094a4dd43
-  data.tar.gz: 667291613516bc25a989d4740d3d99a3b7a585a4ee140399208ef767f0457181ef68ad2751d64f42228b2f5c8a9735d6c0264d8c6770c6e9baf86b32bf124aa3
+  metadata.gz: 06b13aea4bdcc54b1e654788814db4178766b7b7e169b109095acd8ec91c7778827b75fd105fa507993498b6b113f91bb62e3c71a8d51741036e6810e3da8d10
+  data.tar.gz: 661a287aa359c72769d9a8bf5820db0ef19b50bc3f405fcd999dc9c1f34561d7873cc41ef5f2cf56d585ce2b92aec59fd30fd0489029fbc0460eec23b3a53de7

data/README.md

@@ -17,8 +17,8 @@ Embulk output plugin to load into Salesforce.com.
 - **login_endpoint**: login endpoint (string, default: https://login.salesforce.com)
 - **sobject**: salesforce object API name (string, required)
 - **upsert_key**: upsert API field name (string, default: null)
-- **action**: output action that is "insert", "update", "upsert" or "delete" (string, required)
-- **result_dir**: directory for resulting csv(success and error file) (string, default: "./target")
+- **action**: output action that is "insert", "update", "upsert" or "delete" (string, default: insert)
+- **result_dir**: directory for resulting csv(success and error file). If the directory is not exist, the plugin show error. If not specified, resulting csv is not created. (string, default: null)
 - **version**: API version (string, default: "34.0")
 
 ## Example
@@ -28,6 +28,7 @@ out:
   type: salesforce
   username: hoge@example.com
   password: fuga
+  sobject: Account
   action: insert
 ```
 

data/build.gradle

@@ -12,7 +12,7 @@ configurations {
     provided
 }
 
-version = "0.1.0"
+version = "0.1.1"
 
 dependencies {
     compile  "org.embulk:embulk-core:0.6.11"

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

@@ -10,6 +10,7 @@ import com.sforce.soap.partner.UpsertResult;
 import com.sforce.soap.partner.sobject.SObject;
 import com.sforce.ws.ConnectionException;
 import com.sforce.ws.ConnectorConfig;
+import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
@@ -55,7 +56,7 @@ public class SalesforceOutputPlugin
         public String getPassword();
 
         @Config("login_endpoint")
-        @ConfigDefault("https://login.salesforce.com")
+        @ConfigDefault("\"https://login.salesforce.com\"")
         public Optional<String> getLoginEndpoint();
         
         @Config("sobject")
@@ -78,7 +79,7 @@ public class SalesforceOutputPlugin
         public Optional<String> getVersion();
         
         @Config("result_dir")
-        @ConfigDefault("\"./target\"")
+        @ConfigDefault("null")
         public Optional<String> getResultDir();
     }
 
@@ -89,6 +90,15 @@ public class SalesforceOutputPlugin
     {
         PluginTask task = config.loadConfig(PluginTask.class);
         logger = Exec.getLogger(getClass());
+        
+        if (task.getResultDir().isPresent() && task.getResultDir().get() != null) {
+            File resultDir = new File(task.getResultDir().get());
+            if (!resultDir.exists() || !resultDir.isDirectory()) {
+                logger.error("{} is not exist or is not directory.", task.getResultDir().get());
+                throw new RuntimeException(task.getResultDir().get() + " is not exist or is not directory.");
+            }
+        }
+        
         final String username = task.getUsername();
         final String password = task.getPassword();
         final String loginEndpoint = task.getLoginEndpoint().get();
@@ -145,7 +155,7 @@ public class SalesforceOutputPlugin
     public class SalesforcePageOutput
             implements TransactionalPageOutput
     {
-        private final String datePostFix = new SimpleDateFormat("yyyyMMddhhmmssSSS").format(new Date());
+        private final String dateSuffix = new SimpleDateFormat("yyyyMMddhhmmssSSS").format(new Date());
     
         private final PageReader pageReader;
         private final PartnerConnection client;
@@ -348,16 +358,22 @@ public class SalesforceOutputPlugin
             ICsvListWriter successListWriter = null;
             ICsvListWriter errorListWriter = null;
             try {
-                String successFileName = this.resultDir + "/success_" + datePostFix + ".csv";
+                String successFileName = this.resultDir + "/success_" + dateSuffix + ".csv";
+                Boolean isExistSuccessFile = new File(successFileName).exists();
                 successListWriter = new CsvListWriter(new FileWriter(successFileName, true), 
                         CsvPreference.STANDARD_PREFERENCE);
-                //successListWriter.write(createSuccessHeader());
+                if (!isExistSuccessFile) {
+                    successListWriter.write(createSuccessHeader());
+                }
                 
-                String errorFileName = this.resultDir + "/error_" + datePostFix + ".csv";
+                String errorFileName = this.resultDir + "/error_" + dateSuffix + ".csv";
+                Boolean isExistErrorFile = new File(errorFileName).exists();
                 errorListWriter = new CsvListWriter(new FileWriter(errorFileName, true), 
                         CsvPreference.STANDARD_PREFERENCE);
-                //errorListWriter.write(createErrorHeader());
-
+                if (!isExistErrorFile) {
+                    errorListWriter.write(createErrorHeader());
+                }
+                    
                 CellProcessor[] processors = new CellProcessor[pageReader.getSchema().getColumns().size() + 1];
                 ArrayList<ArrayList<String>> errorValues = new ArrayList<>();
                 for (Integer i = 0, imax = records.size(); i < imax; i++) {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-salesforce
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Makoto Tajitsu
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-06-21 00:00:00.000000000 Z
+date: 2015-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,7 +58,7 @@ files:
 - lib/partner.jar
 - src/main/java/org/embulk/output/SalesforceOutputPlugin.java
 - src/test/java/org/embulk/output/TestSalesforceOutputPlugin.java
-- classpath/embulk-output-salesforce-0.1.0.jar
+- classpath/embulk-output-salesforce-0.1.1.jar
 - classpath/force-wsc-34.0.jar
 - classpath/partner.jar
 - classpath/super-csv-2.3.1.jar