[#634] change Upload from URL to use HttpStreamingService

2 files changed, 32 insertions, 4 deletions

diff --git a/idrop-lite/pom.xml b/idrop-lite/pom.xml
index 5813a4c..587d0bb 100644
--- a/idrop-lite/pom.xml
+++ b/idrop-lite/pom.xml
@@ -11,6 +11,9 @@
     <packaging>jar</packaging>
     <name>idrop-lite</name>
     <version>1.0.0-SNAPSHOT</version>
+    <properties>
+        <jargon.version>3.0.0.2-SNAPSHOT</jargon.version>
+    </properties>
     <dependencies>
         <dependency>
             <groupId>junit</groupId>
@@ -24,10 +27,17 @@
         <dependency>
             <groupId>org.irods.jargon</groupId>
             <artifactId>jargon-core</artifactId>
+	    <version>${jargon.version}</version>
         </dependency>
         <dependency>
             <groupId>org.irods.jargon</groupId>
             <artifactId>jargon-data-utils</artifactId>
+	    <version>${jargon.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.irods.jargon</groupId>
+            <artifactId>jargon-httpstream</artifactId>
+	    <version>${jargon.version}</version>
         </dependency>
         <dependency>
             <groupId>org.netbeans.api</groupId>
diff --git a/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/PutTransferRunner.java b/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/PutTransferRunner.java
index 5ab508f..d14d91c 100644
--- a/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/PutTransferRunner.java
+++ b/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/PutTransferRunner.java
@@ -2,7 +2,11 @@ package org.irods.jargon.idrop.lite;
 
 import java.util.List;
 import org.irods.jargon.core.exception.JargonException;
+import org.irods.jargon.core.pub.io.IRODSFile;
+import org.irods.jargon.core.pub.io.IRODSFileFactory;
 import org.irods.jargon.core.transfer.TransferControlBlock;
+import org.irods.jargon.httpstream.HttpStreamingException;
+import org.irods.jargon.httpstream.HttpStreamingServiceImpl;
 import org.slf4j.LoggerFactory;
 
 public class PutTransferRunner implements Runnable {
@@ -92,21 +96,35 @@ public class PutTransferRunner implements Runnable {
 
         log.info("process a put from an url: {}", uploadData.getFileName());
         String localSourceAbsolutePath = uploadData.getFileName();
-        String sourceResource = idropGui.getIrodsAccount().getDefaultStorageResource();
 
 		// need to create new Transfer Control Block for each transfer since it needs to be reset
 		// on how many files there are to transfer and how many have been transferred so far
         log.info("initiating put transfer");
         try {
-           this.transferControlBlock =  idropGui.getiDropCore().getIrodsFileSystem().getIRODSAccessObjectFactory().buildDefaultTransferControlBlockBasedOnJargonProperties();
+           this.transferControlBlock =  idropGui.getiDropCore().getIrodsFileSystem()
+           		.getIRODSAccessObjectFactory().buildDefaultTransferControlBlockBasedOnJargonProperties();
            transferControlBlock.getTransferOptions().setIntraFileStatusCallbacks(true); 
            idropGui.getiDropCore().setTransferControlBlock(transferControlBlock);
-           idropGui.getiDropCore().getTransferManager().putOperationURL(localSourceAbsolutePath,
-                    targetIrodsFileAbsolutePath, sourceResource, idropGui, transferControlBlock);
+           
+           IRODSFileFactory irodsFileFactory = idropGui.getiDropCore().getIrodsFileSystem()
+           		.getIRODSFileFactory(idropGui.getiDropCore().getIrodsAccount());
+
+           IRODSFile destFile = irodsFileFactory.instanceIRODSFile(targetIrodsFileAbsolutePath);
+           
+           HttpStreamingServiceImpl httpStreamingService = new HttpStreamingServiceImpl(
+           		idropGui.getiDropCore().getIrodsFileSystem().getIRODSAccessObjectFactory(),
+           		idropGui.getiDropCore().getIrodsAccount());
+           httpStreamingService.streamHttpUrlContentsToIRODSFile(localSourceAbsolutePath, destFile,
+        		   idropGui, transferControlBlock);
+           
         } catch (JargonException ex) {
             java.util.logging.Logger.getLogger(LocalFileTree.class.getName()).log(
                     java.util.logging.Level.SEVERE, null, ex);
             idropGui.showIdropException(ex);
+        } catch (HttpStreamingException e) {
+        	java.util.logging.Logger.getLogger(LocalFileTree.class.getName()).log(
+                    java.util.logging.Level.SEVERE, null, e);
+            		idropGui.showIdropException(e);
         } finally {
             idropGui.getiDropCore().getIrodsFileSystem().closeAndEatExceptions();
         }