xmpp.httpupload moved to new namespace xmpp.filetransfer.http.upload; delete parts of xmpp.filetransfer.http moved to .delete package

8 files changed, 165 insertions, 3 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/xmpp/filetransfer/http/DeleteSlotPacketParser.java b/src/main/java/de/thedevstack/conversationsplus/xmpp/filetransfer/http/delete/DeleteSlotPacketParser.java
index d7e136fc..7c011449 100644
--- a/src/main/java/de/thedevstack/conversationsplus/xmpp/filetransfer/http/DeleteSlotPacketParser.java
+++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/filetransfer/http/delete/DeleteSlotPacketParser.java
@@ -1,9 +1,10 @@
-package de.thedevstack.conversationsplus.xmpp.filetransfer.http;
+package de.thedevstack.conversationsplus.xmpp.filetransfer.http.delete;
 
 import de.thedevstack.conversationsplus.xml.Element;
 import de.thedevstack.conversationsplus.xmpp.IqPacketParser;
 import de.thedevstack.conversationsplus.xmpp.exceptions.UnexpectedIqPacketTypeException;
 import de.thedevstack.conversationsplus.xmpp.exceptions.XmppException;
+import de.thedevstack.conversationsplus.xmpp.filetransfer.http.FileTransferHttp;
 import de.thedevstack.conversationsplus.xmpp.stanzas.IqPacket;
 import de.thedevstack.conversationsplus.xmpp.utils.ErrorIqPacketExceptionHelper;
 
diff --git a/src/main/java/de/thedevstack/conversationsplus/xmpp/filetransfer/http/DeleteSlotRequestPacket.java b/src/main/java/de/thedevstack/conversationsplus/xmpp/filetransfer/http/delete/DeleteSlotRequestPacket.java
index 6adc3aac..e389d851 100644
--- a/src/main/java/de/thedevstack/conversationsplus/xmpp/filetransfer/http/DeleteSlotRequestPacket.java
+++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/filetransfer/http/delete/DeleteSlotRequestPacket.java
@@ -1,6 +1,7 @@
-package de.thedevstack.conversationsplus.xmpp.filetransfer.http;
+package de.thedevstack.conversationsplus.xmpp.filetransfer.http.delete;
 
 import de.thedevstack.conversationsplus.xml.Element;
+import de.thedevstack.conversationsplus.xmpp.filetransfer.http.FileTransferHttp;
 import de.thedevstack.conversationsplus.xmpp.stanzas.IqPacket;
 
 /**
diff --git a/src/main/java/de/thedevstack/conversationsplus/xmpp/filetransfer/http/FileTransferHttpDeleteSlotRequestPacketGenerator.java b/src/main/java/de/thedevstack/conversationsplus/xmpp/filetransfer/http/delete/FileTransferHttpDeleteSlotRequestPacketGenerator.java
index bc4380fe..ac7de74e 100644
--- a/src/main/java/de/thedevstack/conversationsplus/xmpp/filetransfer/http/FileTransferHttpDeleteSlotRequestPacketGenerator.java
+++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/filetransfer/http/delete/FileTransferHttpDeleteSlotRequestPacketGenerator.java
@@ -1,4 +1,4 @@
-package de.thedevstack.conversationsplus.xmpp.filetransfer.http;
+package de.thedevstack.conversationsplus.xmpp.filetransfer.http.delete;
 
 import de.thedevstack.conversationsplus.xmpp.jid.Jid;
 import de.thedevstack.conversationsplus.xmpp.stanzas.IqPacket;
diff --git a/src/main/java/de/thedevstack/conversationsplus/xmpp/filetransfer/http/upload/HttpUpload.java b/src/main/java/de/thedevstack/conversationsplus/xmpp/filetransfer/http/upload/HttpUpload.java
new file mode 100644
index 00000000..3bcbd219
--- /dev/null
+++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/filetransfer/http/upload/HttpUpload.java
@@ -0,0 +1,9 @@
+package de.thedevstack.conversationsplus.xmpp.filetransfer.http.upload;
+
+/**
+ *
+ */
+public interface HttpUpload {
+    String NAMESPACE = "urn:xmpp:http:upload";
+    String DEFAULT_MIME_TYPE = "application/octet-stream";
+}
diff --git a/src/main/java/de/thedevstack/conversationsplus/xmpp/filetransfer/http/upload/HttpUploadRequestSlotPacketGenerator.java b/src/main/java/de/thedevstack/conversationsplus/xmpp/filetransfer/http/upload/HttpUploadRequestSlotPacketGenerator.java
new file mode 100644
index 00000000..eaa90ab0
--- /dev/null
+++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/filetransfer/http/upload/HttpUploadRequestSlotPacketGenerator.java
@@ -0,0 +1,46 @@
+package de.thedevstack.conversationsplus.xmpp.filetransfer.http.upload;
+
+import de.thedevstack.conversationsplus.xmpp.jid.Jid;
+import de.thedevstack.conversationsplus.xmpp.stanzas.IqPacket;
+
+/**
+ * Generates the IQ Packets for requesting a http upload slot
+ * as defined in XEP-0363.
+ * @see <a href="http://xmpp.org/extensions/xep-0363.html">http://xmpp.org/extensions/xep-0363.html</a>
+ */
+public final class HttpUploadRequestSlotPacketGenerator {
+    /**
+     * Generates the IqPacket to request a http upload slot.
+     * The attributes from and id are not set in here - this is added while sending the packet.
+     * <pre>
+     * <iq from='romeo@montague.tld/garden'
+     *     id='step_03'
+     *     to='upload.montague.tld'
+     *     type='get'>
+     *   <request xmlns='urn:xmpp:http:upload'>
+     *     <filename>my_juliet.png</filename>
+     *     <size>23456</size>
+     *     <content-type>image/jpeg</content-type>
+     *   </request>
+     * </iq>
+     * </pre>
+     * @param host the jid of the host to request a slot from
+     * @param filename the filename of the file which will be transferred
+     * @param filesize the filesize of the file which will be transferred
+     * @param mime the mime type of the file which will be transferred - <code>optional</code> and therefore nullable
+     * @return the IqPacket
+     */
+    public static IqPacket generate(Jid host, String filename, long filesize, String mime) {
+        SlotRequestPacket packet = new SlotRequestPacket(filename, filesize);
+        packet.setTo(host);
+        packet.setMime((mime == null) ? HttpUpload.DEFAULT_MIME_TYPE : mime);
+        return packet;
+    }
+
+    /**
+     * Utility class - avoid instantiation
+     */
+    private HttpUploadRequestSlotPacketGenerator() {
+        // Helper class - avoid instantiation
+    }
+}
diff --git a/src/main/java/de/thedevstack/conversationsplus/xmpp/filetransfer/http/upload/HttpUploadSlot.java b/src/main/java/de/thedevstack/conversationsplus/xmpp/filetransfer/http/upload/HttpUploadSlot.java
new file mode 100644
index 00000000..1e320afe
--- /dev/null
+++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/filetransfer/http/upload/HttpUploadSlot.java
@@ -0,0 +1,22 @@
+package de.thedevstack.conversationsplus.xmpp.filetransfer.http.upload;
+
+/**
+ *
+ */
+public class HttpUploadSlot {
+    private final String getUrl;
+    private final String putUrl;
+
+    public HttpUploadSlot(String getUrl, String putUrl) {
+        this.getUrl = getUrl;
+        this.putUrl = putUrl;
+    }
+
+    public String getGetUrl() {
+        return this.getUrl;
+    }
+
+    public String getPutUrl() {
+        return this.putUrl;
+    }
+}
diff --git a/src/main/java/de/thedevstack/conversationsplus/xmpp/filetransfer/http/upload/SlotPacketParser.java b/src/main/java/de/thedevstack/conversationsplus/xmpp/filetransfer/http/upload/SlotPacketParser.java
new file mode 100644
index 00000000..85d11b6b
--- /dev/null
+++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/filetransfer/http/upload/SlotPacketParser.java
@@ -0,0 +1,30 @@
+package de.thedevstack.conversationsplus.xmpp.filetransfer.http.upload;
+
+import de.thedevstack.conversationsplus.xml.Element;
+import de.thedevstack.conversationsplus.xmpp.IqPacketParser;
+import de.thedevstack.conversationsplus.xmpp.exceptions.UnexpectedIqPacketTypeException;
+import de.thedevstack.conversationsplus.xmpp.exceptions.XmppException;
+import de.thedevstack.conversationsplus.xmpp.stanzas.IqPacket;
+import de.thedevstack.conversationsplus.xmpp.utils.ErrorIqPacketExceptionHelper;
+
+/**
+ *
+ */
+public final class SlotPacketParser extends IqPacketParser {
+    public static HttpUploadSlot parseGetAndPutUrl(IqPacket packet) throws XmppException {
+        HttpUploadSlot httpUploadSlot = null;
+        if (packet.getType() == IqPacket.TYPE.RESULT) {
+            Element slot = findRequiredChild(packet, "slot", HttpUpload.NAMESPACE);
+
+            String getUrl = findRequiredChildContent(slot, "get");
+            String putUrl = findRequiredChildContent(slot, "put");
+
+            httpUploadSlot = new HttpUploadSlot(getUrl, putUrl);
+        } else if (packet.getType() == IqPacket.TYPE.ERROR) {
+            ErrorIqPacketExceptionHelper.throwIqErrorException(packet);
+        } else {
+            throw new UnexpectedIqPacketTypeException(packet, packet.getType(), IqPacket.TYPE.RESULT, IqPacket.TYPE.ERROR);
+        }
+        return httpUploadSlot;
+    }
+}
diff --git a/src/main/java/de/thedevstack/conversationsplus/xmpp/filetransfer/http/upload/SlotRequestPacket.java b/src/main/java/de/thedevstack/conversationsplus/xmpp/filetransfer/http/upload/SlotRequestPacket.java
new file mode 100644
index 00000000..d0866508
--- /dev/null
+++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/filetransfer/http/upload/SlotRequestPacket.java
@@ -0,0 +1,53 @@
+package de.thedevstack.conversationsplus.xmpp.filetransfer.http.upload;
+
+import de.thedevstack.conversationsplus.xml.Element;
+import de.thedevstack.conversationsplus.xmpp.stanzas.IqPacket;
+
+/**
+ *
+ */
+public class SlotRequestPacket extends IqPacket {
+    public static final String ELEMENT_NAME = "request";
+    public static final String FILENAME_ELEMENT_NAME = "filename";
+    public static final String FILESIZE_ELEMENT_NAME = "size";
+    public static final String MIME_ELEMENT_NAME = "content-type";
+    private Element requestElement;
+    private String filename;
+    private long filesize;
+    private String mime;
+
+    private SlotRequestPacket() {
+        super(TYPE.GET);
+        this.requestElement = super.addChild(SlotRequestPacket.ELEMENT_NAME, HttpUpload.NAMESPACE);
+    }
+
+    public SlotRequestPacket(String filename, long filesize) {
+        this();
+        this.setFilename(filename);
+        this.setFilesize(filesize);
+    }
+
+    public void setFilename(String filename) {
+        if (null == filename || filename.isEmpty()) {
+            throw new IllegalArgumentException("filename must not be null or empty.");
+        }
+        this.filename = filename;
+        this.requestElement.addChild(FILENAME_ELEMENT_NAME).setContent(filename);
+    }
+
+    public void setFilesize(long filesize) {
+        if (0 >= filesize) {
+            throw new IllegalArgumentException("filesize must not be null or empty.");
+        }
+        this.filesize = filesize;
+        this.requestElement.addChild(FILESIZE_ELEMENT_NAME).setContent(String.valueOf(filesize));
+    }
+
+    public void setMime(String mime) {
+        if (null == mime || mime.isEmpty()) {
+            throw new IllegalArgumentException("mime type must not be null or empty.");
+        }
+        this.mime = mime;
+        this.requestElement.addChild(MIME_ELEMENT_NAME).setContent(mime);
+    }
+}