Basic filetransfer http delete implementation; Exceptions for IqPacketError added

11 files changed, 260 insertions, 12 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/xmpp/AbstractIqPacketParser.java b/src/main/java/de/thedevstack/conversationsplus/xmpp/IqPacketParser.java
index d777cb64..7c198ce9 100644
--- a/src/main/java/de/thedevstack/conversationsplus/xmpp/AbstractIqPacketParser.java
+++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/IqPacketParser.java
@@ -7,19 +7,23 @@ import de.thedevstack.conversationsplus.xmpp.exceptions.MissingRequiredElementEx
 /**
  *
  */
-public abstract class AbstractIqPacketParser {
-    protected static Element findRequiredChild(Element element, String elementName, String namespace) throws MissingRequiredElementException {
-        if (null == element) {
-            return null;
-        }
-        Element child = element.findChild(elementName, namespace);
+public abstract class IqPacketParser {
+    public static Element findRequiredChild(Element element, String elementName, String namespace) throws MissingRequiredElementException {
+        Element child = findChild(element, elementName, namespace);
         if (child == null) {
             throw new MissingRequiredElementException(elementName, namespace, element);
         }
         return child;
     }
 
-    protected static String findRequiredChildContent(Element element, String elementName) throws MissingRequiredContentException {
+    public static Element findChild(Element element, String elementName, String namespace) {
+        if (null == element) {
+            return null;
+        }
+        return element.findChild(elementName, namespace);
+    }
+
+    public static String findRequiredChildContent(Element element, String elementName) throws MissingRequiredContentException {
         if (null == element) {
             return null;
         }
@@ -30,14 +34,18 @@ public abstract class AbstractIqPacketParser {
         return childContent;
     }
 
-    protected static String findRequiredChildContent(Element element, String elementName, String namespace) throws MissingRequiredContentException {
-        if (null == element) {
-            return null;
-        }
-        String childContent = element.findChildContent(elementName, namespace);
+    public static String findRequiredChildContent(Element element, String elementName, String namespace) throws MissingRequiredContentException {
+        String childContent = findChildContent(element, elementName, namespace);
         if (null == childContent) {
             throw new MissingRequiredContentException(elementName, namespace, element);
         }
         return childContent;
     }
+
+    public static String findChildContent(Element element, String elementName, String namespace) {
+        if (null == element) {
+            return null;
+        }
+        return element.findChildContent(elementName, namespace);
+    }
 }
diff --git a/src/main/java/de/thedevstack/conversationsplus/xmpp/exceptions/BadRequestIqErrorException.java b/src/main/java/de/thedevstack/conversationsplus/xmpp/exceptions/BadRequestIqErrorException.java
new file mode 100644
index 00000000..69fb893b
--- /dev/null
+++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/exceptions/BadRequestIqErrorException.java
@@ -0,0 +1,17 @@
+package de.thedevstack.conversationsplus.xmpp.exceptions;
+
+import de.thedevstack.conversationsplus.xml.Element;
+
+/**
+ * Created by steckbrief on 22.08.2016.
+ */
+public class BadRequestIqErrorException extends IqPacketErrorException {
+    public BadRequestIqErrorException(Element context, String errorMessage) {
+        super(context, errorMessage);
+    }
+
+    @Override
+    public String getMessage() {
+        return "Bad Request: " + super.getMessage();
+    }
+}
diff --git a/src/main/java/de/thedevstack/conversationsplus/xmpp/exceptions/InternalServerErrorException.java b/src/main/java/de/thedevstack/conversationsplus/xmpp/exceptions/InternalServerErrorException.java
new file mode 100644
index 00000000..7925c423
--- /dev/null
+++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/exceptions/InternalServerErrorException.java
@@ -0,0 +1,17 @@
+package de.thedevstack.conversationsplus.xmpp.exceptions;
+
+import de.thedevstack.conversationsplus.xml.Element;
+
+/**
+ * Created by steckbrief on 22.08.2016.
+ */
+public class InternalServerErrorException extends IqPacketErrorException {
+    public InternalServerErrorException(Element packet, String errorText) {
+        super(packet, errorText);
+    }
+
+    @Override
+    public String getMessage() {
+        return "Internal Server Error: " + super.getMessage();
+    }
+}
diff --git a/src/main/java/de/thedevstack/conversationsplus/xmpp/exceptions/IqPacketErrorException.java b/src/main/java/de/thedevstack/conversationsplus/xmpp/exceptions/IqPacketErrorException.java
new file mode 100644
index 00000000..d4d932b7
--- /dev/null
+++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/exceptions/IqPacketErrorException.java
@@ -0,0 +1,20 @@
+package de.thedevstack.conversationsplus.xmpp.exceptions;
+
+import de.thedevstack.conversationsplus.xml.Element;
+
+/**
+ * Created by steckbrief on 22.08.2016.
+ */
+public class IqPacketErrorException extends XmppException {
+    private final String iqErrorText;
+
+    public IqPacketErrorException(Element context, String errorMessage) {
+        super(context);
+        this.iqErrorText = errorMessage;
+    }
+
+    @Override
+    public String getMessage() {
+        return this.iqErrorText + " in context: " + this.getContext();
+    }
+}
diff --git a/src/main/java/de/thedevstack/conversationsplus/xmpp/exceptions/ServiceUnavailableException.java b/src/main/java/de/thedevstack/conversationsplus/xmpp/exceptions/ServiceUnavailableException.java
new file mode 100644
index 00000000..7e503aa9
--- /dev/null
+++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/exceptions/ServiceUnavailableException.java
@@ -0,0 +1,17 @@
+package de.thedevstack.conversationsplus.xmpp.exceptions;
+
+import de.thedevstack.conversationsplus.xml.Element;
+
+/**
+ * Created by steckbrief on 22.08.2016.
+ */
+public class ServiceUnavailableException extends IqPacketErrorException {
+    public ServiceUnavailableException(Element context, String errorMessage) {
+        super(context, errorMessage);
+    }
+
+    @Override
+    public String getMessage() {
+        return "Service unavailable: " + super.getMessage();
+    }
+}
diff --git a/src/main/java/de/thedevstack/conversationsplus/xmpp/exceptions/UndefinedConditionException.java b/src/main/java/de/thedevstack/conversationsplus/xmpp/exceptions/UndefinedConditionException.java
new file mode 100644
index 00000000..38e1f6d2
--- /dev/null
+++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/exceptions/UndefinedConditionException.java
@@ -0,0 +1,17 @@
+package de.thedevstack.conversationsplus.xmpp.exceptions;
+
+import de.thedevstack.conversationsplus.xml.Element;
+
+/**
+ * Created by steckbrief on 22.08.2016.
+ */
+public class UndefinedConditionException extends IqPacketErrorException {
+    public UndefinedConditionException(Element packet, String errorText) {
+        super(packet, errorText);
+    }
+
+    @Override
+    public String getMessage() {
+        return "Undefined Condition: " + super.getMessage();
+    }
+}
diff --git a/src/main/java/de/thedevstack/conversationsplus/xmpp/filetransfer/http/DeleteSlotPacketParser.java b/src/main/java/de/thedevstack/conversationsplus/xmpp/filetransfer/http/DeleteSlotPacketParser.java
new file mode 100644
index 00000000..d7e136fc
--- /dev/null
+++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/filetransfer/http/DeleteSlotPacketParser.java
@@ -0,0 +1,28 @@
+package de.thedevstack.conversationsplus.xmpp.filetransfer.http;
+
+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;
+
+/**
+ * Created by steckbrief on 21.08.2016.
+ */
+public class DeleteSlotPacketParser extends IqPacketParser {
+    public static String parseDeleteToken(IqPacket packet) throws XmppException {
+        String deletetoken = null;
+        if (packet.getType() == IqPacket.TYPE.RESULT) {
+            Element slot = findRequiredChild(packet, "slot", FileTransferHttp.NAMESPACE);
+
+            deletetoken = findRequiredChildContent(slot, "deletetoken");
+        } else if (packet.getType() == IqPacket.TYPE.ERROR) {
+            ErrorIqPacketExceptionHelper.throwIqErrorException(packet);
+        } else {
+            throw new UnexpectedIqPacketTypeException(packet, packet.getType(), IqPacket.TYPE.RESULT, IqPacket.TYPE.ERROR);
+        }
+
+        return deletetoken;
+    }
+}
diff --git a/src/main/java/de/thedevstack/conversationsplus/xmpp/filetransfer/http/DeleteSlotRequestPacket.java b/src/main/java/de/thedevstack/conversationsplus/xmpp/filetransfer/http/DeleteSlotRequestPacket.java
new file mode 100644
index 00000000..6adc3aac
--- /dev/null
+++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/filetransfer/http/DeleteSlotRequestPacket.java
@@ -0,0 +1,33 @@
+package de.thedevstack.conversationsplus.xmpp.filetransfer.http;
+
+import de.thedevstack.conversationsplus.xml.Element;
+import de.thedevstack.conversationsplus.xmpp.stanzas.IqPacket;
+
+/**
+ * Created by steckbrief on 21.08.2016.
+ */
+public class DeleteSlotRequestPacket extends IqPacket {
+    public static final String ELEMENT_NAME = "request";
+    public static final String FILEURL_ELEMENT_NAME = "fileurl";
+    private Element requestElement;
+    private String fileurl;
+
+    private DeleteSlotRequestPacket() {
+        super(TYPE.GET);
+        this.requestElement = super.addChild(DeleteSlotRequestPacket.ELEMENT_NAME, FileTransferHttp.NAMESPACE);
+        this.requestElement.setAttribute("type", "delete");
+    }
+
+    public DeleteSlotRequestPacket(String fileurl) {
+        this();
+        this.setFileURL(fileurl);
+    }
+
+    public void setFileURL(String fileurl) {
+        if (null == fileurl || fileurl.isEmpty()) {
+            throw new IllegalArgumentException("fileurl must not be null or empty.");
+        }
+        this.fileurl = fileurl;
+        this.requestElement.addChild(FILEURL_ELEMENT_NAME).setContent(fileurl);
+    }
+}
diff --git a/src/main/java/de/thedevstack/conversationsplus/xmpp/filetransfer/http/FileTransferHttp.java b/src/main/java/de/thedevstack/conversationsplus/xmpp/filetransfer/http/FileTransferHttp.java
new file mode 100644
index 00000000..28f4f870
--- /dev/null
+++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/filetransfer/http/FileTransferHttp.java
@@ -0,0 +1,8 @@
+package de.thedevstack.conversationsplus.xmpp.filetransfer.http;
+
+/**
+ * Created by steckbrief on 21.08.2016.
+ */
+public interface FileTransferHttp {
+    String NAMESPACE = "urn:xmpp:filetransfer:http";
+}
diff --git a/src/main/java/de/thedevstack/conversationsplus/xmpp/filetransfer/http/FileTransferHttpDeleteSlotRequestPacketGenerator.java b/src/main/java/de/thedevstack/conversationsplus/xmpp/filetransfer/http/FileTransferHttpDeleteSlotRequestPacketGenerator.java
new file mode 100644
index 00000000..bc4380fe
--- /dev/null
+++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/filetransfer/http/FileTransferHttpDeleteSlotRequestPacketGenerator.java
@@ -0,0 +1,39 @@
+package de.thedevstack.conversationsplus.xmpp.filetransfer.http;
+
+import de.thedevstack.conversationsplus.xmpp.jid.Jid;
+import de.thedevstack.conversationsplus.xmpp.stanzas.IqPacket;
+
+/**
+ * Created by steckbrief on 21.08.2016.
+ */
+public final class FileTransferHttpDeleteSlotRequestPacketGenerator {
+    /**
+     * Generates the IqPacket to request a slot to delete a file previously uploaded via http upload.
+     * 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_01'
+     *     to='upload.montague.tld'
+     *     type='get'>
+     *   <request type='delete' xmlns='urn:xmpp:filetransfer:http'>
+     *     <fileurl>http://upload.montague.tld/files/1e56ee17-ee4c-4a9c-aedd-cb09cb3984a7/my_juliet.png</fileurl>
+     *   </request>
+     * </iq>
+     * </pre>
+     * @param host the jid of the host to request a slot from
+     * @param fileurl the URL of the file to be deleted
+     * @return the IqPacket
+     */
+    public static IqPacket generate(Jid host, String fileurl) {
+        DeleteSlotRequestPacket packet = new DeleteSlotRequestPacket(fileurl);
+        packet.setTo(host);
+        return packet;
+    }
+
+    /**
+     * Utility class - avoid instantiation
+     */
+    private FileTransferHttpDeleteSlotRequestPacketGenerator() {
+        // Helper class - avoid instantiation
+    }
+}
diff --git a/src/main/java/de/thedevstack/conversationsplus/xmpp/utils/ErrorIqPacketExceptionHelper.java b/src/main/java/de/thedevstack/conversationsplus/xmpp/utils/ErrorIqPacketExceptionHelper.java
new file mode 100644
index 00000000..f02d8d46
--- /dev/null
+++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/utils/ErrorIqPacketExceptionHelper.java
@@ -0,0 +1,44 @@
+package de.thedevstack.conversationsplus.xmpp.utils;
+
+import de.thedevstack.conversationsplus.xml.Element;
+import de.thedevstack.conversationsplus.xmpp.IqPacketParser;
+import de.thedevstack.conversationsplus.xmpp.exceptions.BadRequestIqErrorException;
+import de.thedevstack.conversationsplus.xmpp.exceptions.InternalServerErrorException;
+import de.thedevstack.conversationsplus.xmpp.exceptions.IqPacketErrorException;
+import de.thedevstack.conversationsplus.xmpp.exceptions.ServiceUnavailableException;
+import de.thedevstack.conversationsplus.xmpp.exceptions.UndefinedConditionException;
+
+/**
+ * Created by steckbrief on 22.08.2016.
+ */
+public final class ErrorIqPacketExceptionHelper {
+    private final static String ERROR_NAMESPACE = "urn:ietf:params:xml:ns:xmpp-stanzas";
+
+    public static void throwIqErrorException(Element packet) throws IqPacketErrorException {
+        if (hasErrorElement(packet, "bad-request")) {
+            throw new BadRequestIqErrorException(packet, getErrorText(packet));
+        }
+        if (hasErrorElement(packet, "service-unavailable")) {
+            throw new ServiceUnavailableException(packet, getErrorText(packet));
+        }
+        if (hasErrorElement(packet, "internal-server-error")) {
+            throw new InternalServerErrorException(packet, getErrorText(packet));
+        }
+        if (hasErrorElement(packet, "undefined-condition")) {
+            throw new UndefinedConditionException(packet, getErrorText(packet));
+        }
+        throw new IqPacketErrorException(packet, "Unknown error packet.");
+    }
+
+    private static boolean hasErrorElement(Element packet, String elementName) {
+        return null != IqPacketParser.findChild(packet, elementName, ERROR_NAMESPACE);
+    }
+
+    private static String getErrorText(Element packet) {
+        return IqPacketParser.findChildContent(packet, "text", ERROR_NAMESPACE);
+    }
+
+    private ErrorIqPacketExceptionHelper() {
+
+    }
+}