Merge pull request #1215 from ashitsalesforce/master

refactor - use constant for "Sforce-Call-Options" Bulk v1/v2 header s…
forcedotcom · Aug 11, 2024 · 8ca6146 · 8ca6146
2 parents dd728db + 4a67f84
commit 8ca6146
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/src/main/java/com/salesforce/dataloader/action/visitor/BulkV1Connection.java b/src/main/java/com/salesforce/dataloader/action/visitor/BulkV1Connection.java
@@ -28,25 +28,25 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
+import com.salesforce.dataloader.client.ClientBase;
 import com.sforce.async.AsyncApiException;
 import com.sforce.async.BulkConnection;
 import com.sforce.ws.ConnectorConfig;
 
 public class BulkV1Connection extends BulkConnection {
-    private static final String SFORCE_CALL_OPTIONS_HEADER = "Sforce-Call-Options";
     private static Logger logger = LogManager.getLogger(BulkV1Connection.class);
 
     public BulkV1Connection(ConnectorConfig config) throws AsyncApiException {
         super(config);
 
         // This is needed to set the correct client name in Bulk V1 calls
-        addHeader(SFORCE_CALL_OPTIONS_HEADER, config.getRequestHeader("Sforce-Call-Options"));
+        addHeader(ClientBase.SFORCE_CALL_OPTIONS_HEADER, config.getRequestHeader(ClientBase.SFORCE_CALL_OPTIONS_HEADER));
     }
 
     public void addHeader(String headerName, String headerValue) {
         super.addHeader(headerName, headerValue);
-        if ("Sforce-Call-Options".equalsIgnoreCase(headerName)) {
-            logger.debug("Sforce-Call-Options : " + headerValue);
+        if (ClientBase.SFORCE_CALL_OPTIONS_HEADER.equalsIgnoreCase(headerName)) {
+            logger.debug(ClientBase.SFORCE_CALL_OPTIONS_HEADER + " : " + headerValue);
         }
     }
 }
diff --git a/src/main/java/com/salesforce/dataloader/action/visitor/BulkV2Connection.java b/src/main/java/com/salesforce/dataloader/action/visitor/BulkV2Connection.java
@@ -149,6 +149,7 @@ private static void writeTo(BufferedInputStream bis, BufferedOutputStream bos) t
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
+import com.salesforce.dataloader.client.ClientBase;
 import com.salesforce.dataloader.client.HttpTransportInterface;
 import com.salesforce.dataloader.controller.Controller;
 import com.salesforce.dataloader.exception.HttpClientTransportException;
@@ -179,7 +180,6 @@ public class BulkV2Connection extends BulkConnection {
     private static final String AUTH_HEADER = "Authorization";
     private static final String REQUEST_CONTENT_TYPE_HEADER = "Content-Type";
     private static final String ACCEPT_CONTENT_TYPES_HEADER = "ACCEPT";
-    private static final String SFORCE_CALL_OPTIONS_HEADER = "Sforce-Call-Options";
     private static final String AUTH_HEADER_VALUE_PREFIX = "Bearer ";
     private static final String UTF_8 = StandardCharsets.UTF_8.name();
     private static final String INGEST_RESULTS_SUCCESSFUL = "successfulResults";
@@ -501,8 +501,8 @@ private HashMap<String, String> getHeaders(String requestContentType, String acc
 	    newMap.put(REQUEST_CONTENT_TYPE_HEADER, requestContentType);
 	    newMap.put(ACCEPT_CONTENT_TYPES_HEADER, acceptContentType);
 	    newMap.put(AUTH_HEADER, authHeaderValue);
-	    newMap.put(SFORCE_CALL_OPTIONS_HEADER, getConfig().getRequestHeader("Sforce-Call-Options"));
-	    logger.debug("Sforce-Call-Options : " + getConfig().getRequestHeader("Sforce-Call-Options"));
+	    newMap.put(ClientBase.SFORCE_CALL_OPTIONS_HEADER, getConfig().getRequestHeader(ClientBase.SFORCE_CALL_OPTIONS_HEADER));
+	    logger.debug(ClientBase.SFORCE_CALL_OPTIONS_HEADER + " : " + getConfig().getRequestHeader(ClientBase.SFORCE_CALL_OPTIONS_HEADER));
 	    for (Map.Entry<String, String> entry : headers.entrySet()) {
             newMap.put(entry.getKey(), entry.getValue());
         }

diff --git a/src/main/java/com/salesforce/dataloader/client/ClientBase.java b/src/main/java/com/salesforce/dataloader/client/ClientBase.java
@@ -96,6 +96,7 @@ public final boolean connect(SessionInfo sess) {
     private static final String PARTNER_API_CLIENT_TYPE = "Partner";
     private static final String BATCH_CLIENT_STRING = "Batch";
     private static final String UI_CLIENT_STRING = "UI";
+    public static final String SFORCE_CALL_OPTIONS_HEADER = "Sforce-Call-Options";
 
     public static String getClientName(Config cfg) {
         String apiType = PARTNER_API_CLIENT_TYPE;
@@ -123,7 +124,7 @@ public ConnectorConfig getConnectorConfig() {
         ConnectorConfig cc = new ConnectorConfig();
         cc.setTransport(HttpClientTransport.class);
         cc.setSessionId(getSessionId());
-        cc.setRequestHeader("Sforce-Call-Options",
+        cc.setRequestHeader(SFORCE_CALL_OPTIONS_HEADER,
                 "client=" + ClientBase.getClientName(this.config));      
         // set authentication credentials
         // blank username is not acceptible