[incubator-gobblin] branch master updated: [GOBBLIN-778][GOBBLIN-551] Moving config creation to a separate method

[ibuenros]

This is an automated email from the ASF dual-hosted git repository.

ibuenros pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-gobblin.git


The following commit(s) were added to refs/heads/master by this push:
     new 2f82a64  [GOBBLIN-778][GOBBLIN-551] Moving config creation to a 
separate method
2f82a64 is described below

commit 2f82a6459b1c1d8b10326aaead3e9de6be34175f
Author: Monish Vachhani <mvachh...@linkedin.com>
AuthorDate: Wed May 22 11:45:52 2019 -0700

    [GOBBLIN-778][GOBBLIN-551] Moving config creation to a separate method
    
    Closes #2642 from mvachhani/master
---
 .../gobblin/salesforce/SalesforceExtractor.java    | 32 +++++++++++++++-------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git 
a/gobblin-salesforce/src/main/java/org/apache/gobblin/salesforce/SalesforceExtractor.java
 
b/gobblin-salesforce/src/main/java/org/apache/gobblin/salesforce/SalesforceExtractor.java
index 7064062..c665b1a 100644
--- 
a/gobblin-salesforce/src/main/java/org/apache/gobblin/salesforce/SalesforceExtractor.java
+++ 
b/gobblin-salesforce/src/main/java/org/apache/gobblin/salesforce/SalesforceExtractor.java
@@ -20,6 +20,7 @@ package org.apache.gobblin.salesforce;
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.io.FileNotFoundException;
 import java.io.InputStreamReader;
 import java.net.URI;
 import java.text.ParseException;
@@ -690,19 +691,10 @@ public class SalesforceExtractor extends RestApiExtractor 
{
       String soapEndpoint = partnerConfig.getServiceEndpoint();
       String restEndpoint = soapEndpoint.substring(0, 
soapEndpoint.indexOf("Soap/")) + "async/" + apiVersion;
 
-      ConnectorConfig config = new ConnectorConfig();
+      ConnectorConfig config = createConfig();
       config.setSessionId(partnerConfig.getSessionId());
       config.setRestEndpoint(restEndpoint);
-      config.setCompression(true);
-      config.setTraceFile("traceLogs.txt");
-      config.setTraceMessage(false);
-      config.setPrettyPrintXml(true);
 
-      if 
(super.workUnitState.contains(ConfigurationKeys.SOURCE_CONN_USE_PROXY_URL)
-          && 
!super.workUnitState.getProp(ConfigurationKeys.SOURCE_CONN_USE_PROXY_URL).isEmpty())
 {
-        
config.setProxy(super.workUnitState.getProp(ConfigurationKeys.SOURCE_CONN_USE_PROXY_URL),
-            
super.workUnitState.getPropAsInt(ConfigurationKeys.SOURCE_CONN_USE_PROXY_PORT));
-      }
 
       this.bulkConnection = new BulkConnection(config);
       success = true;
@@ -1036,6 +1028,26 @@ public class SalesforceExtractor extends 
RestApiExtractor {
     return batchInfo;
   }
 
+  //Moving config creation in a separate method for custom config parameters 
like setting up transport factory.
+  public ConnectorConfig createConfig() {
+    ConnectorConfig config = new ConnectorConfig();
+    config.setCompression(true);
+    try {
+      config.setTraceFile("traceLogs.txt");
+    } catch (FileNotFoundException e) {
+      e.printStackTrace();
+    }
+    config.setTraceMessage(false);
+    config.setPrettyPrintXml(true);
+
+    if 
(super.workUnitState.contains(ConfigurationKeys.SOURCE_CONN_USE_PROXY_URL)
+        && 
!super.workUnitState.getProp(ConfigurationKeys.SOURCE_CONN_USE_PROXY_URL).isEmpty())
 {
+      
config.setProxy(super.workUnitState.getProp(ConfigurationKeys.SOURCE_CONN_USE_PROXY_URL),
+          
super.workUnitState.getPropAsInt(ConfigurationKeys.SOURCE_CONN_USE_PROXY_PORT));
+    }
+    return config;
+  }
+
   @Data
   private static class BatchIdAndResultId {
     private final String batchId;