diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/JingleFileTransferManager.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/JingleFileTransferManager.java index edc4761c2..686830cdc 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/JingleFileTransferManager.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/JingleFileTransferManager.java @@ -32,7 +32,7 @@ import org.jivesoftware.smackx.jingle.JingleSessionHandler; import org.jivesoftware.smackx.jingle.element.Jingle; import org.jivesoftware.smackx.jingle.element.JingleAction; import org.jivesoftware.smackx.jingle.element.JingleContent; -import org.jivesoftware.smackx.jingle.element.JingleContentDescriptionPayloadElement; +import org.jivesoftware.smackx.jingle.element.JingleContentDescriptionChildElement; import org.jivesoftware.smackx.jingle.element.JingleContentTransport; import org.jivesoftware.smackx.jingle.provider.JingleContentProviderManager; import org.jivesoftware.smackx.jingle_filetransfer.callback.IncomingJingleFileTransferCallback; @@ -131,7 +131,7 @@ public final class JingleFileTransferManager extends Manager implements JingleHa JingleFileTransferPayloadElement payload = new JingleFileTransferPayloadElement( lastModified, "A file", hashElement, "application/octet-stream", file.getName(), (int) file.length(), null); - ArrayList payloadTypes = new ArrayList<>(); + ArrayList payloadTypes = new ArrayList<>(); payloadTypes.add(payload); JingleContentDescriptionFileTransfer descriptionFileTransfer = new JingleContentDescriptionFileTransfer(payloadTypes); diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/element/JingleContentDescriptionFileTransfer.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/element/JingleContentDescriptionFileTransfer.java index 5d99a65ba..693976b60 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/element/JingleContentDescriptionFileTransfer.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/element/JingleContentDescriptionFileTransfer.java @@ -17,7 +17,7 @@ package org.jivesoftware.smackx.jingle_filetransfer.element; import org.jivesoftware.smackx.jingle.element.JingleContentDescription; -import org.jivesoftware.smackx.jingle.element.JingleContentDescriptionPayloadElement; +import org.jivesoftware.smackx.jingle.element.JingleContentDescriptionChildElement; import org.jivesoftware.smackx.jingle_filetransfer.JingleFileTransferManager; import java.util.List; @@ -27,7 +27,7 @@ import java.util.List; */ public class JingleContentDescriptionFileTransfer extends JingleContentDescription { - public JingleContentDescriptionFileTransfer(List payloadTypes) { + public JingleContentDescriptionFileTransfer(List payloadTypes) { super(payloadTypes); } diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/element/JingleFileTransferPayloadElement.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/element/JingleFileTransferPayloadElement.java index 82bb5d16f..c4cb32bd3 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/element/JingleFileTransferPayloadElement.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/element/JingleFileTransferPayloadElement.java @@ -18,7 +18,7 @@ package org.jivesoftware.smackx.jingle_filetransfer.element; import org.jivesoftware.smack.util.XmlStringBuilder; import org.jivesoftware.smackx.hash.element.HashElement; -import org.jivesoftware.smackx.jingle.element.JingleContentDescriptionPayloadElement; +import org.jivesoftware.smackx.jingle.element.JingleContentDescriptionChildElement; import java.io.File; import java.util.Date; @@ -26,7 +26,7 @@ import java.util.Date; /** * Content of type File. */ -public class JingleFileTransferPayloadElement extends JingleContentDescriptionPayloadElement { +public class JingleFileTransferPayloadElement extends JingleContentDescriptionChildElement { public static final String ELEMENT = "file"; public static final String ELEM_DATE = "date"; public static final String ELEM_DESC = "desc"; @@ -107,11 +107,6 @@ public class JingleFileTransferPayloadElement extends JingleContentDescriptionPa return new Builder(); } - @Override - public String getNamespace() { - return null; - } - public static final class Builder { private Date date; private String desc; diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/provider/JingleContentDescriptionFileTransferProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/provider/JingleContentDescriptionFileTransferProvider.java index 8850f40a3..590f393c6 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/provider/JingleContentDescriptionFileTransferProvider.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/provider/JingleContentDescriptionFileTransferProvider.java @@ -16,7 +16,7 @@ */ package org.jivesoftware.smackx.jingle_filetransfer.provider; -import org.jivesoftware.smackx.jingle.element.JingleContentDescriptionPayloadElement; +import org.jivesoftware.smackx.jingle.element.JingleContentDescriptionChildElement; import org.jivesoftware.smackx.jingle.provider.JingleContentDescriptionProvider; import org.jivesoftware.smackx.jingle_filetransfer.element.JingleContentDescriptionFileTransfer; import org.jivesoftware.smackx.jingle_filetransfer.element.JingleFileTransferPayloadElement; @@ -34,7 +34,7 @@ public class JingleContentDescriptionFileTransferProvider extends JingleContentDescriptionProvider { @Override public JingleContentDescriptionFileTransfer parse(XmlPullParser parser, int initialDepth) throws Exception { - ArrayList payloads = new ArrayList<>(); + ArrayList payloads = new ArrayList<>(); while (true) { int tag = parser.nextTag(); String name = parser.getName(); diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/jingle_filetransfer/JingleContentDescriptionFileTransferTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/jingle_filetransfer/JingleContentDescriptionFileTransferTest.java index 1bb461d47..ed85b00cb 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/jingle_filetransfer/JingleContentDescriptionFileTransferTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/jingle_filetransfer/JingleContentDescriptionFileTransferTest.java @@ -21,7 +21,6 @@ import org.jivesoftware.smack.test.util.TestUtils; import org.jivesoftware.smackx.hash.HashManager; import org.jivesoftware.smackx.hash.element.HashElement; import org.jivesoftware.smackx.jingle.element.JingleContentDescription; -import org.jivesoftware.smackx.jingle.element.JingleContentDescriptionPayloadElement; import org.jivesoftware.smackx.jingle_filetransfer.element.JingleFileTransferPayloadElement; import org.jivesoftware.smackx.jingle_filetransfer.element.JingleContentDescriptionFileTransfer; import org.jivesoftware.smackx.jingle_filetransfer.element.Range; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/JingleManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/JingleManager.java index 03fd4fe40..8b22f3f61 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/JingleManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/JingleManager.java @@ -16,15 +16,10 @@ */ package org.jivesoftware.smackx.jingle; -import java.util.Map; -import java.util.WeakHashMap; -import java.util.concurrent.ConcurrentHashMap; -import java.util.logging.Logger; - import org.jivesoftware.smack.Manager; import org.jivesoftware.smack.XMPPConnection; -import org.jivesoftware.smack.iqrequest.IQRequestHandler.Mode; import org.jivesoftware.smack.iqrequest.AbstractIqRequestHandler; +import org.jivesoftware.smack.iqrequest.IQRequestHandler.Mode; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.IQ.Type; import org.jivesoftware.smackx.jingle.element.Jingle; @@ -33,6 +28,11 @@ import org.jivesoftware.smackx.jingle.element.JingleContentDescription; import org.jxmpp.jid.FullJid; import org.jxmpp.jid.Jid; +import java.util.Map; +import java.util.WeakHashMap; +import java.util.concurrent.ConcurrentHashMap; +import java.util.logging.Logger; + public final class JingleManager extends Manager { private static final Logger LOGGER = Logger.getLogger(JingleManager.class.getName()); @@ -102,7 +102,7 @@ public final class JingleManager extends Manager { return jingleSessionHandlers.put(fullJidAndSessionId, sessionHandler); } - public JingleSessionHandler unregisterJingleSessionhandler(FullJid otherJid, String sessionId, JingleSessionHandler sessionHandler) { + public JingleSessionHandler unregisterJingleSessionHandler(FullJid otherJid, String sessionId, JingleSessionHandler sessionHandler) { FullJidAndSessionId fullJidAndSessionId = new FullJidAndSessionId(otherJid, sessionId); return jingleSessionHandlers.remove(fullJidAndSessionId); } diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleContentDescription.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleContentDescription.java index 68c3482b5..98097662e 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleContentDescription.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleContentDescription.java @@ -30,9 +30,9 @@ public abstract class JingleContentDescription implements ExtensionElement { public static final String ELEMENT = "description"; - private final List payloads; + private final List payloads; - protected JingleContentDescription(List payloads) { + protected JingleContentDescription(List payloads) { if (payloads != null) { this.payloads = Collections.unmodifiableList(payloads); } @@ -46,7 +46,7 @@ public abstract class JingleContentDescription implements ExtensionElement { return ELEMENT; } - public List getJinglePayloadTypes() { + public List getJinglePayloadTypes() { return payloads; } diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleContentDescriptionPayloadElement.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleContentDescriptionChildElement.java similarity index 85% rename from smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleContentDescriptionPayloadElement.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleContentDescriptionChildElement.java index 2d5613999..bb09f205d 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleContentDescriptionPayloadElement.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleContentDescriptionChildElement.java @@ -16,13 +16,13 @@ */ package org.jivesoftware.smackx.jingle.element; -import org.jivesoftware.smack.packet.ExtensionElement; +import org.jivesoftware.smack.packet.NamedElement; /** * An element found usually in 'description' elements. * */ -public abstract class JingleContentDescriptionPayloadElement implements ExtensionElement { +public abstract class JingleContentDescriptionChildElement implements NamedElement { public static final String ELEMENT = "payload-type"; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleContentTransport.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleContentTransport.java index c05ec2416..fd6663d0e 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleContentTransport.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleContentTransport.java @@ -63,12 +63,12 @@ public abstract class JingleContentTransport implements ExtensionElement { xml.closeEmptyElement(); } else { + xml.rightAngleBracket(); - xml.append(candidates); - xml.closeElement(this); } + return xml; } diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleError.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleError.java index f4000bf3a..3128484db 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleError.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleError.java @@ -39,7 +39,7 @@ public final class JingleError implements ExtensionElement { /** * Creates a new error with the specified code and errorName. * - * @param errorName name describing the error. + * @param errorName a name describing the error. */ private JingleError(final String errorName) { this.errorName = errorName; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentProviderManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentProviderManager.java index 892d57217..2144d1d01 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentProviderManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentProviderManager.java @@ -26,7 +26,7 @@ public class JingleContentProviderManager { private static final Map> jingleContentTransportProviders = new ConcurrentHashMap<>(); public static JingleContentDescriptionProvider addJingleContentDescriptionProvider(String namespace, - JingleContentDescriptionProvider provider) { + JingleContentDescriptionProvider provider) { return jingleContentDescriptionProviders.put(namespace, provider); } @@ -35,7 +35,7 @@ public class JingleContentProviderManager { } public static JingleContentTransportProvider addJingleContentTransportProvider(String namespace, - JingleContentTransportProvider provider) { + JingleContentTransportProvider provider) { return jingleContentTransportProviders.put(namespace, provider); }