Merge pull request #1442 from ashitsalesforce/master

move transport layer classes to a different package for readability
forcedotcom · Jan 12, 2025 · 69d9a88 · 69d9a88
2 parents e44c303 + cba8037
commit 69d9a88
Show file tree

Hide file tree

Showing 21 changed files with 28 additions and 26 deletions.
diff --git a/src/main/java/com/salesforce/dataloader/action/visitor/AbstractQueryVisitor.java b/src/main/java/com/salesforce/dataloader/action/visitor/AbstractQueryVisitor.java
@@ -28,7 +28,7 @@
 
 import com.salesforce.dataloader.action.AbstractExtractAction;
 import com.salesforce.dataloader.action.progress.ILoaderProgress;
-import com.salesforce.dataloader.client.HttpTransportImpl;
+import com.salesforce.dataloader.client.transport.HttpTransportImpl;
 import com.salesforce.dataloader.config.AppConfig;
 import com.salesforce.dataloader.config.Messages;
 import com.salesforce.dataloader.controller.Controller;

diff --git a/src/main/java/com/salesforce/dataloader/action/visitor/bulk/BulkV1Connection.java b/src/main/java/com/salesforce/dataloader/action/visitor/bulk/BulkV1Connection.java
@@ -35,8 +35,8 @@
 import org.apache.logging.log4j.Logger;
 
 import com.salesforce.dataloader.client.ClientBase;
-import com.salesforce.dataloader.client.HttpTransportImpl;
-import com.salesforce.dataloader.client.HttpTransportInterface;
+import com.salesforce.dataloader.client.transport.HttpTransportImpl;
+import com.salesforce.dataloader.client.transport.HttpTransportInterface;
 import com.salesforce.dataloader.config.AppConfig;
 import com.salesforce.dataloader.exception.HttpClientTransportException;
 import com.salesforce.dataloader.util.AppUtil;

diff --git a/src/main/java/com/salesforce/dataloader/action/visitor/bulk/BulkV2Connection.java b/src/main/java/com/salesforce/dataloader/action/visitor/bulk/BulkV2Connection.java
@@ -151,8 +151,8 @@ private static void writeTo(BufferedInputStream bis, BufferedOutputStream bos) t
 import org.apache.logging.log4j.Logger;
 
 import com.salesforce.dataloader.client.ClientBase;
-import com.salesforce.dataloader.client.HttpTransportImpl;
-import com.salesforce.dataloader.client.HttpTransportInterface;
+import com.salesforce.dataloader.client.transport.HttpTransportImpl;
+import com.salesforce.dataloader.client.transport.HttpTransportInterface;
 import com.salesforce.dataloader.controller.Controller;
 import com.salesforce.dataloader.exception.HttpClientTransportException;
 import com.salesforce.dataloader.util.AppUtil;

diff --git a/src/main/java/com/salesforce/dataloader/action/visitor/rest/RESTConnection.java b/src/main/java/com/salesforce/dataloader/action/visitor/rest/RESTConnection.java
@@ -41,10 +41,10 @@
 import org.apache.logging.log4j.Logger;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.salesforce.dataloader.client.HttpTransportImpl;
-import com.salesforce.dataloader.client.HttpTransportInterface;
 import com.salesforce.dataloader.client.SessionInfo;
 import com.salesforce.dataloader.client.CompositeRESTClient.ACTION_ENUM;
+import com.salesforce.dataloader.client.transport.HttpTransportImpl;
+import com.salesforce.dataloader.client.transport.HttpTransportInterface;
 import com.salesforce.dataloader.config.AppConfig;
 import com.salesforce.dataloader.config.Messages;
 import com.salesforce.dataloader.controller.Controller;

diff --git a/src/main/java/com/salesforce/dataloader/client/ClientBase.java b/src/main/java/com/salesforce/dataloader/client/ClientBase.java
@@ -30,6 +30,7 @@
 import org.apache.logging.log4j.Logger;
 
 import com.salesforce.dataloader.client.SessionInfo.NotLoggedInException;
+import com.salesforce.dataloader.client.transport.TransportFactoryImpl;
 import com.salesforce.dataloader.config.AppConfig;
 import com.salesforce.dataloader.config.Messages;
 import com.salesforce.dataloader.controller.Controller;

diff --git a/...aloader/client/HttpClientTransportv1.java → ...ient/transport/HttpClientTransportv1.java b/...aloader/client/HttpClientTransportv1.java → ...ient/transport/HttpClientTransportv1.java
@@ -23,7 +23,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package com.salesforce.dataloader.client;
+package com.salesforce.dataloader.client.transport;
 
 import java.io.*;
 import java.net.*;

diff --git a/.../dataloader/client/HttpTransportImpl.java → ...r/client/transport/HttpTransportImpl.java b/.../dataloader/client/HttpTransportImpl.java → ...r/client/transport/HttpTransportImpl.java
@@ -23,7 +23,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package com.salesforce.dataloader.client;
+package com.salesforce.dataloader.client.transport;
 
 import java.io.*;
 import java.net.*;
@@ -55,6 +55,7 @@
 import org.apache.http.entity.ContentType;
 import org.apache.http.entity.InputStreamEntity;
 
+import com.salesforce.dataloader.client.ClientBase;
 import com.salesforce.dataloader.config.AppConfig;
 import com.salesforce.dataloader.exception.HttpClientTransportException;
 import com.salesforce.dataloader.util.AppUtil;

diff --git a/...loader/client/HttpTransportInterface.java → ...ent/transport/HttpTransportInterface.java b/...loader/client/HttpTransportInterface.java → ...ent/transport/HttpTransportInterface.java
@@ -24,7 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.salesforce.dataloader.client;
+package com.salesforce.dataloader.client.transport;
 
 import java.io.OutputStream;
 import java.io.InputStream;

diff --git a/...ader/client/HttpTransportInterfacev1.java → ...t/transport/HttpTransportInterfacev1.java b/...ader/client/HttpTransportInterfacev1.java → ...t/transport/HttpTransportInterfacev1.java
@@ -24,7 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.salesforce.dataloader.client;
+package com.salesforce.dataloader.client.transport;
 
 import java.io.OutputStream;
 import java.net.HttpURLConnection;

diff --git a/.../dataloader/client/SimplePostFactory.java → ...r/client/transport/SimplePostFactory.java b/.../dataloader/client/SimplePostFactory.java → ...r/client/transport/SimplePostFactory.java
@@ -23,7 +23,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package com.salesforce.dataloader.client;
+package com.salesforce.dataloader.client.transport;
 
 import com.salesforce.dataloader.config.AppConfig;
 import org.apache.http.message.BasicNameValuePair;

diff --git a/...rce/dataloader/client/SimplePostImpl.java → ...ader/client/transport/SimplePostImpl.java b/...rce/dataloader/client/SimplePostImpl.java → ...ader/client/transport/SimplePostImpl.java
@@ -24,7 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.salesforce.dataloader.client;
+package com.salesforce.dataloader.client.transport;
 
 import com.salesforce.dataloader.config.AppConfig;
 import com.salesforce.dataloader.exception.ParameterLoadException;

diff --git a/...ataloader/client/SimplePostInterface.java → ...client/transport/SimplePostInterface.java b/...ataloader/client/SimplePostInterface.java → ...client/transport/SimplePostInterface.java
@@ -23,7 +23,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package com.salesforce.dataloader.client;
+package com.salesforce.dataloader.client.transport;
 
 import com.salesforce.dataloader.exception.ParameterLoadException;
 

diff --git a/...taloader/client/TransportFactoryImpl.java → ...lient/transport/TransportFactoryImpl.java b/...taloader/client/TransportFactoryImpl.java → ...lient/transport/TransportFactoryImpl.java
@@ -23,7 +23,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package com.salesforce.dataloader.client;
+package com.salesforce.dataloader.client.transport;
 
 import com.sforce.ws.transport.Transport;
 import com.sforce.ws.transport.TransportFactory;

diff --git a/src/main/java/com/salesforce/dataloader/controller/Controller.java b/src/main/java/com/salesforce/dataloader/controller/Controller.java
@@ -31,10 +31,10 @@
 import com.salesforce.dataloader.client.BulkV1Client;
 import com.salesforce.dataloader.client.BulkV2Client;
 import com.salesforce.dataloader.client.ClientBase;
-import com.salesforce.dataloader.client.HttpTransportImpl;
 import com.salesforce.dataloader.client.PartnerClient;
 import com.salesforce.dataloader.client.CompositeRESTClient;
 import com.salesforce.dataloader.client.ReferenceEntitiesDescribeMap;
+import com.salesforce.dataloader.client.transport.HttpTransportImpl;
 import com.salesforce.dataloader.config.AppConfig;
 import com.salesforce.dataloader.config.Messages;
 import com.salesforce.dataloader.dao.DataAccessObject;

diff --git a/src/main/java/com/salesforce/dataloader/oauth/OAuthSecretFlowUtil.java b/src/main/java/com/salesforce/dataloader/oauth/OAuthSecretFlowUtil.java
@@ -35,8 +35,8 @@
 
 import org.apache.http.message.BasicNameValuePair;
 
-import com.salesforce.dataloader.client.SimplePostInterface;
-import com.salesforce.dataloader.client.SimplePostFactory;
+import com.salesforce.dataloader.client.transport.SimplePostFactory;
+import com.salesforce.dataloader.client.transport.SimplePostInterface;
 import com.salesforce.dataloader.config.AppConfig;
 import com.salesforce.dataloader.exception.ParameterLoadException;
 import com.salesforce.dataloader.util.OAuthBrowserLoginRunner;

diff --git a/src/main/java/com/salesforce/dataloader/process/DataLoaderRunner.java b/src/main/java/com/salesforce/dataloader/process/DataLoaderRunner.java
@@ -54,7 +54,7 @@
 import org.eclipse.swt.widgets.Shell;
 
 import com.salesforce.dataloader.action.progress.ILoaderProgress;
-import com.salesforce.dataloader.client.HttpTransportImpl;
+import com.salesforce.dataloader.client.transport.HttpTransportImpl;
 import com.salesforce.dataloader.config.AppConfig;
 import com.salesforce.dataloader.controller.Controller;
 

diff --git a/src/main/java/com/salesforce/dataloader/ui/AuthenticationRunner.java b/src/main/java/com/salesforce/dataloader/ui/AuthenticationRunner.java
@@ -26,7 +26,7 @@
 
 package com.salesforce.dataloader.ui;
 
-import com.salesforce.dataloader.client.HttpTransportInterface;
+import com.salesforce.dataloader.client.transport.HttpTransportInterface;
 import com.salesforce.dataloader.config.AppConfig;
 import com.salesforce.dataloader.controller.Controller;
 import com.salesforce.dataloader.model.LoginCriteria;

diff --git a/src/main/java/com/salesforce/dataloader/ui/OAuthSecretFlow.java b/src/main/java/com/salesforce/dataloader/ui/OAuthSecretFlow.java
@@ -25,7 +25,7 @@
  */
 package com.salesforce.dataloader.ui;
 
-import com.salesforce.dataloader.client.SimplePostInterface;
+import com.salesforce.dataloader.client.transport.SimplePostInterface;
 import com.salesforce.dataloader.config.AppConfig;
 import com.salesforce.dataloader.exception.ParameterLoadException;
 import com.salesforce.dataloader.oauth.OAuthSecretFlowUtil;

diff --git a/src/main/java/com/salesforce/dataloader/util/OAuthBrowserLoginRunner.java b/src/main/java/com/salesforce/dataloader/util/OAuthBrowserLoginRunner.java
@@ -48,8 +48,8 @@
 import com.google.gson.FieldNamingPolicy;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import com.salesforce.dataloader.client.SimplePostInterface;
-import com.salesforce.dataloader.client.SimplePostFactory;
+import com.salesforce.dataloader.client.transport.SimplePostFactory;
+import com.salesforce.dataloader.client.transport.SimplePostInterface;
 import com.salesforce.dataloader.config.AppConfig;
 import com.salesforce.dataloader.config.Messages;
 import com.salesforce.dataloader.exception.OAuthBrowserLoginRunnerException;

diff --git a/src/test/java/com/salesforce/dataloader/oauth/OAuthSecretFlowUtilTests.java b/src/test/java/com/salesforce/dataloader/oauth/OAuthSecretFlowUtilTests.java
@@ -29,8 +29,8 @@
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.salesforce.dataloader.ConfigTestBase;
-import com.salesforce.dataloader.client.SimplePostInterface;
-import com.salesforce.dataloader.client.SimplePostFactory;
+import com.salesforce.dataloader.client.transport.SimplePostFactory;
+import com.salesforce.dataloader.client.transport.SimplePostInterface;
 import com.salesforce.dataloader.config.AppConfig;
 import com.salesforce.dataloader.exception.ParameterLoadException;
 import com.salesforce.dataloader.model.OAuthToken;

diff --git a/src/test/java/com/salesforce/dataloader/process/ProcessTestBase.java b/src/test/java/com/salesforce/dataloader/process/ProcessTestBase.java
@@ -45,8 +45,8 @@
 import com.salesforce.dataloader.*;
 import com.salesforce.dataloader.action.OperationInfo;
 import com.salesforce.dataloader.action.progress.ILoaderProgress;
-import com.salesforce.dataloader.client.HttpTransportImpl;
 import com.salesforce.dataloader.client.PartnerClient;
+import com.salesforce.dataloader.client.transport.HttpTransportImpl;
 import com.salesforce.dataloader.config.AppConfig;
 import com.salesforce.dataloader.controller.Controller;
 import com.salesforce.dataloader.dao.DataAccessObjectFactory;