minor repackaging

create sub-packages in action.visitor package for bulk, partner (soap), and rest api flavors for ease of navigating through code.
forcedotcom · Aug 11, 2024 · bdf2eb8 · bdf2eb8
1 parent b709f3d
commit bdf2eb8
Show file tree

Hide file tree

Showing 32 changed files with 40 additions and 35 deletions.
diff --git a/src/main/java/com/salesforce/dataloader/action/BulkExtractAction.java b/src/main/java/com/salesforce/dataloader/action/BulkExtractAction.java
@@ -27,9 +27,9 @@
 package com.salesforce.dataloader.action;
 
 import com.salesforce.dataloader.action.progress.ILoaderProgress;
-import com.salesforce.dataloader.action.visitor.BulkV1QueryVisitor;
-import com.salesforce.dataloader.action.visitor.BulkV2QueryVisitor;
 import com.salesforce.dataloader.action.visitor.IVisitor;
+import com.salesforce.dataloader.action.visitor.bulk.BulkV1QueryVisitor;
+import com.salesforce.dataloader.action.visitor.bulk.BulkV2QueryVisitor;
 import com.salesforce.dataloader.controller.Controller;
 import com.salesforce.dataloader.exception.DataAccessObjectInitializationException;
 

diff --git a/src/main/java/com/salesforce/dataloader/action/BulkLoadAction.java b/src/main/java/com/salesforce/dataloader/action/BulkLoadAction.java
@@ -29,8 +29,8 @@
 import java.util.List;
 
 import com.salesforce.dataloader.action.progress.ILoaderProgress;
-import com.salesforce.dataloader.action.visitor.BulkLoadVisitor;
 import com.salesforce.dataloader.action.visitor.DAOLoadVisitor;
+import com.salesforce.dataloader.action.visitor.bulk.BulkLoadVisitor;
 import com.salesforce.dataloader.controller.Controller;
 import com.salesforce.dataloader.exception.DataAccessObjectInitializationException;
 import com.salesforce.dataloader.mapping.LoadMapper;

diff --git a/src/main/java/com/salesforce/dataloader/action/DeleteAction.java b/src/main/java/com/salesforce/dataloader/action/DeleteAction.java
@@ -29,8 +29,8 @@
 
 import com.salesforce.dataloader.action.progress.ILoaderProgress;
 import com.salesforce.dataloader.action.visitor.DAOLoadVisitor;
-import com.salesforce.dataloader.action.visitor.PartnerDeleteVisitor;
-import com.salesforce.dataloader.action.visitor.RESTDeleteVisitor;
+import com.salesforce.dataloader.action.visitor.partner.PartnerDeleteVisitor;
+import com.salesforce.dataloader.action.visitor.rest.RESTDeleteVisitor;
 import com.salesforce.dataloader.config.Config;
 import com.salesforce.dataloader.controller.Controller;
 import com.salesforce.dataloader.exception.DataAccessObjectException;

diff --git a/src/main/java/com/salesforce/dataloader/action/InsertAction.java b/src/main/java/com/salesforce/dataloader/action/InsertAction.java
@@ -28,7 +28,7 @@
 
 import com.salesforce.dataloader.action.progress.ILoaderProgress;
 import com.salesforce.dataloader.action.visitor.DAOLoadVisitor;
-import com.salesforce.dataloader.action.visitor.PartnerInsertVisitor;
+import com.salesforce.dataloader.action.visitor.partner.PartnerInsertVisitor;
 import com.salesforce.dataloader.controller.Controller;
 import com.salesforce.dataloader.exception.DataAccessObjectException;
 

diff --git a/src/main/java/com/salesforce/dataloader/action/PartnerExtractAction.java b/src/main/java/com/salesforce/dataloader/action/PartnerExtractAction.java
@@ -28,7 +28,7 @@
 
 import com.salesforce.dataloader.action.progress.ILoaderProgress;
 import com.salesforce.dataloader.action.visitor.IQueryVisitor;
-import com.salesforce.dataloader.action.visitor.PartnerQueryVisitor;
+import com.salesforce.dataloader.action.visitor.partner.PartnerQueryVisitor;
 import com.salesforce.dataloader.controller.Controller;
 import com.salesforce.dataloader.exception.DataAccessObjectInitializationException;
 

diff --git a/src/main/java/com/salesforce/dataloader/action/PartnerExtractAllAction.java b/src/main/java/com/salesforce/dataloader/action/PartnerExtractAllAction.java
@@ -28,7 +28,7 @@
 
 import com.salesforce.dataloader.action.progress.ILoaderProgress;
 import com.salesforce.dataloader.action.visitor.IVisitor;
-import com.salesforce.dataloader.action.visitor.PartnerQueryAllVisitor;
+import com.salesforce.dataloader.action.visitor.partner.PartnerQueryAllVisitor;
 import com.salesforce.dataloader.controller.Controller;
 import com.salesforce.dataloader.exception.DataAccessObjectInitializationException;
 

diff --git a/src/main/java/com/salesforce/dataloader/action/UndeleteAction.java b/src/main/java/com/salesforce/dataloader/action/UndeleteAction.java
@@ -29,7 +29,7 @@
 
 import com.salesforce.dataloader.action.progress.ILoaderProgress;
 import com.salesforce.dataloader.action.visitor.DAOLoadVisitor;
-import com.salesforce.dataloader.action.visitor.PartnerUndeleteVisitor;
+import com.salesforce.dataloader.action.visitor.partner.PartnerUndeleteVisitor;
 import com.salesforce.dataloader.controller.Controller;
 import com.salesforce.dataloader.exception.DataAccessObjectException;
 

diff --git a/src/main/java/com/salesforce/dataloader/action/UpdateAction.java b/src/main/java/com/salesforce/dataloader/action/UpdateAction.java
@@ -27,8 +27,8 @@
 
 import com.salesforce.dataloader.action.progress.ILoaderProgress;
 import com.salesforce.dataloader.action.visitor.DAOLoadVisitor;
-import com.salesforce.dataloader.action.visitor.RESTUpdateVisitor;
-import com.salesforce.dataloader.action.visitor.PartnerUpdateVisitor;
+import com.salesforce.dataloader.action.visitor.partner.PartnerUpdateVisitor;
+import com.salesforce.dataloader.action.visitor.rest.RESTUpdateVisitor;
 import com.salesforce.dataloader.controller.Controller;
 import com.salesforce.dataloader.exception.DataAccessObjectException;
 

diff --git a/src/main/java/com/salesforce/dataloader/action/UpsertAction.java b/src/main/java/com/salesforce/dataloader/action/UpsertAction.java
@@ -28,7 +28,7 @@
 package com.salesforce.dataloader.action;
 
 import com.salesforce.dataloader.action.progress.ILoaderProgress;
-import com.salesforce.dataloader.action.visitor.PartnerUpsertVisitor;
+import com.salesforce.dataloader.action.visitor.partner.PartnerUpsertVisitor;
 import com.salesforce.dataloader.controller.Controller;
 import com.salesforce.dataloader.exception.DataAccessObjectException;
 

diff --git a/src/main/java/com/salesforce/dataloader/action/visitor/AbstractQueryVisitor.java b/src/main/java/com/salesforce/dataloader/action/visitor/AbstractQueryVisitor.java
@@ -64,7 +64,7 @@
  * @author Colin Jarvis
  * @since 21.0
  */
-abstract class AbstractQueryVisitor extends AbstractVisitor implements IQueryVisitor {
+public abstract class AbstractQueryVisitor extends AbstractVisitor implements IQueryVisitor {
 
     private final DataWriter queryWriter;
     private final String soql;

diff --git a/...ion/visitor/AbstractBulkQueryVisitor.java → ...isitor/bulk/AbstractBulkQueryVisitor.java b/...ion/visitor/AbstractBulkQueryVisitor.java → ...isitor/bulk/AbstractBulkQueryVisitor.java
@@ -24,7 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.salesforce.dataloader.action.visitor;
+package com.salesforce.dataloader.action.visitor.bulk;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -36,6 +36,7 @@
 
 import com.salesforce.dataloader.action.AbstractExtractAction;
 import com.salesforce.dataloader.action.progress.ILoaderProgress;
+import com.salesforce.dataloader.action.visitor.AbstractQueryVisitor;
 import com.salesforce.dataloader.config.Config;
 import com.salesforce.dataloader.controller.Controller;
 import com.salesforce.dataloader.dao.DataWriter;

diff --git a/...er/action/visitor/BulkApiVisitorUtil.java → ...tion/visitor/bulk/BulkApiVisitorUtil.java b/...er/action/visitor/BulkApiVisitorUtil.java → ...tion/visitor/bulk/BulkApiVisitorUtil.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.action.visitor;
+package com.salesforce.dataloader.action.visitor.bulk;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;

diff --git a/...oader/action/visitor/BulkLoadVisitor.java → .../action/visitor/bulk/BulkLoadVisitor.java b/...oader/action/visitor/BulkLoadVisitor.java → .../action/visitor/bulk/BulkLoadVisitor.java
@@ -24,7 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.salesforce.dataloader.action.visitor;
+package com.salesforce.dataloader.action.visitor.bulk;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -57,6 +57,7 @@
 import org.apache.logging.log4j.LogManager;
 
 import com.salesforce.dataloader.action.progress.ILoaderProgress;
+import com.salesforce.dataloader.action.visitor.DAOLoadVisitor;
 import com.salesforce.dataloader.client.DescribeRefObject;
 import com.salesforce.dataloader.config.Config;
 import com.salesforce.dataloader.config.Messages;

diff --git a/...ader/action/visitor/BulkV1Connection.java → ...action/visitor/bulk/BulkV1Connection.java b/...ader/action/visitor/BulkV1Connection.java → ...action/visitor/bulk/BulkV1Connection.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.action.visitor;
+package com.salesforce.dataloader.action.visitor.bulk;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

diff --git a/...er/action/visitor/BulkV1QueryVisitor.java → ...tion/visitor/bulk/BulkV1QueryVisitor.java b/...er/action/visitor/BulkV1QueryVisitor.java → ...tion/visitor/bulk/BulkV1QueryVisitor.java
@@ -24,7 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.salesforce.dataloader.action.visitor;
+package com.salesforce.dataloader.action.visitor.bulk;
 
 import java.io.ByteArrayInputStream;
 

diff --git a/...ader/action/visitor/BulkV2Connection.java → ...action/visitor/bulk/BulkV2Connection.java b/...ader/action/visitor/BulkV2Connection.java → ...action/visitor/bulk/BulkV2Connection.java
@@ -129,7 +129,7 @@ private static void writeTo(BufferedInputStream bis, BufferedOutputStream bos) t
 }
  **************************/
 
-package com.salesforce.dataloader.action.visitor;
+package com.salesforce.dataloader.action.visitor.bulk;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;

diff --git a/...er/action/visitor/BulkV2QueryVisitor.java → ...tion/visitor/bulk/BulkV2QueryVisitor.java b/...er/action/visitor/BulkV2QueryVisitor.java → ...tion/visitor/bulk/BulkV2QueryVisitor.java
@@ -24,7 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.salesforce.dataloader.action.visitor;
+package com.salesforce.dataloader.action.visitor.bulk;
 
 import java.io.IOException;
 import java.io.InputStream;

diff --git a/.../action/visitor/PartnerDeleteVisitor.java → ...visitor/partner/PartnerDeleteVisitor.java b/.../action/visitor/PartnerDeleteVisitor.java → ...visitor/partner/PartnerDeleteVisitor.java
@@ -24,7 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.salesforce.dataloader.action.visitor;
+package com.salesforce.dataloader.action.visitor.partner;
 
 import java.util.List;
 

diff --git a/.../action/visitor/PartnerInsertVisitor.java → ...visitor/partner/PartnerInsertVisitor.java b/.../action/visitor/PartnerInsertVisitor.java → ...visitor/partner/PartnerInsertVisitor.java
@@ -24,7 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.salesforce.dataloader.action.visitor;
+package com.salesforce.dataloader.action.visitor.partner;
 
 import java.util.List;
 

diff --git a/...er/action/visitor/PartnerLoadVisitor.java → ...n/visitor/partner/PartnerLoadVisitor.java b/...er/action/visitor/PartnerLoadVisitor.java → ...n/visitor/partner/PartnerLoadVisitor.java
@@ -24,7 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.salesforce.dataloader.action.visitor;
+package com.salesforce.dataloader.action.visitor.partner;
 
 import java.util.List;
 
@@ -33,6 +33,7 @@
 
 import com.salesforce.dataloader.action.OperationInfo;
 import com.salesforce.dataloader.action.progress.ILoaderProgress;
+import com.salesforce.dataloader.action.visitor.DAOLoadVisitor;
 import com.salesforce.dataloader.client.PartnerClient;
 import com.salesforce.dataloader.config.*;
 import com.salesforce.dataloader.controller.Controller;

diff --git a/...ction/visitor/PartnerQueryAllVisitor.java → ...sitor/partner/PartnerQueryAllVisitor.java b/...ction/visitor/PartnerQueryAllVisitor.java → ...sitor/partner/PartnerQueryAllVisitor.java
@@ -24,7 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.salesforce.dataloader.action.visitor;
+package com.salesforce.dataloader.action.visitor.partner;
 
 import com.salesforce.dataloader.action.AbstractExtractAction;
 import com.salesforce.dataloader.action.progress.ILoaderProgress;

diff --git a/...r/action/visitor/PartnerQueryVisitor.java → .../visitor/partner/PartnerQueryVisitor.java b/...r/action/visitor/PartnerQueryVisitor.java → .../visitor/partner/PartnerQueryVisitor.java
@@ -24,7 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.salesforce.dataloader.action.visitor;
+package com.salesforce.dataloader.action.visitor.partner;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -34,6 +34,7 @@
 import org.apache.logging.log4j.Logger;
 
 import com.salesforce.dataloader.action.progress.ILoaderProgress;
+import com.salesforce.dataloader.action.visitor.AbstractQueryVisitor;
 import com.salesforce.dataloader.config.Config;
 import com.salesforce.dataloader.config.Messages;
 import com.salesforce.dataloader.controller.Controller;

diff --git a/...ction/visitor/PartnerUndeleteVisitor.java → ...sitor/partner/PartnerUndeleteVisitor.java b/...ction/visitor/PartnerUndeleteVisitor.java → ...sitor/partner/PartnerUndeleteVisitor.java
@@ -24,7 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.salesforce.dataloader.action.visitor;
+package com.salesforce.dataloader.action.visitor.partner;
 
 import java.util.List;
 

diff --git a/.../action/visitor/PartnerUpdateVisitor.java → ...visitor/partner/PartnerUpdateVisitor.java b/.../action/visitor/PartnerUpdateVisitor.java → ...visitor/partner/PartnerUpdateVisitor.java
@@ -24,7 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.salesforce.dataloader.action.visitor;
+package com.salesforce.dataloader.action.visitor.partner;
 
 import java.util.List;
 

diff --git a/.../action/visitor/PartnerUpsertVisitor.java → ...visitor/partner/PartnerUpsertVisitor.java b/.../action/visitor/PartnerUpsertVisitor.java → ...visitor/partner/PartnerUpsertVisitor.java
@@ -24,7 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.salesforce.dataloader.action.visitor;
+package com.salesforce.dataloader.action.visitor.partner;
 
 import java.util.List;
 

diff --git a/...loader/action/visitor/RESTConnection.java → ...r/action/visitor/rest/RESTConnection.java b/...loader/action/visitor/RESTConnection.java → ...r/action/visitor/rest/RESTConnection.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.action.visitor;
+package com.salesforce.dataloader.action.visitor.rest;
 
 import com.salesforce.dataloader.controller.Controller;
 import com.sforce.async.AsyncApiException;

diff --git a/...der/action/visitor/RESTDeleteVisitor.java → ...ction/visitor/rest/RESTDeleteVisitor.java b/...der/action/visitor/RESTDeleteVisitor.java → ...ction/visitor/rest/RESTDeleteVisitor.java
@@ -24,7 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.salesforce.dataloader.action.visitor;
+package com.salesforce.dataloader.action.visitor.rest;
 
 import java.util.List;
 

diff --git a/...oader/action/visitor/RESTLoadVisitor.java → .../action/visitor/rest/RESTLoadVisitor.java b/...oader/action/visitor/RESTLoadVisitor.java → .../action/visitor/rest/RESTLoadVisitor.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.action.visitor;
+package com.salesforce.dataloader.action.visitor.rest;
 
 
 import java.util.List;
@@ -32,6 +32,7 @@
 
 import com.salesforce.dataloader.action.OperationInfo;
 import com.salesforce.dataloader.action.progress.ILoaderProgress;
+import com.salesforce.dataloader.action.visitor.DAOLoadVisitor;
 import com.salesforce.dataloader.client.CompositeRESTClient;
 import com.salesforce.dataloader.config.Config;
 import com.salesforce.dataloader.config.Messages;

diff --git a/...der/action/visitor/RESTUpdateVisitor.java → ...ction/visitor/rest/RESTUpdateVisitor.java b/...der/action/visitor/RESTUpdateVisitor.java → ...ction/visitor/rest/RESTUpdateVisitor.java
@@ -24,7 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.salesforce.dataloader.action.visitor;
+package com.salesforce.dataloader.action.visitor.rest;
 
 import java.util.List;
 

diff --git a/src/main/java/com/salesforce/dataloader/client/BulkV1Client.java b/src/main/java/com/salesforce/dataloader/client/BulkV1Client.java
@@ -29,7 +29,7 @@
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
 
-import com.salesforce.dataloader.action.visitor.BulkV1Connection;
+import com.salesforce.dataloader.action.visitor.bulk.BulkV1Connection;
 import com.salesforce.dataloader.config.Messages;
 import com.salesforce.dataloader.controller.Controller;
 import com.sforce.async.AsyncApiException;

diff --git a/src/main/java/com/salesforce/dataloader/client/BulkV2Client.java b/src/main/java/com/salesforce/dataloader/client/BulkV2Client.java
@@ -28,7 +28,7 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import com.salesforce.dataloader.action.visitor.BulkV2Connection;
+import com.salesforce.dataloader.action.visitor.bulk.BulkV2Connection;
 import com.salesforce.dataloader.config.Messages;
 import com.salesforce.dataloader.controller.Controller;
 import com.sforce.async.AsyncApiException;

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