Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-22 22:32:06 +01:00
Code Issues Releases Wiki Activity

Merge pull request #138 from vanitasvitae/JingleReason

Browse source 
Create alternative-session JingleReason
This commit is contained in:
Florian Schmaus 2017-06-16 23:19:14 +02:00 committed by GitHub
commit a33d596756
3 changed files with 97 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/Jingle.java
View file

@ -198,6 +198,11 @@ public final class Jingle extends IQ {
return this; return this;
} }
public Builder setReason(JingleReason reason) {
this.reason = reason;
return this;
}
public Jingle build() { public Jingle build() {
return new Jingle(sid, action, initiator, responder, reason, contents); return new Jingle(sid, action, initiator, responder, reason, contents);
} }

61
smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleReason.java
View file

@ -20,6 +20,7 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
import org.jivesoftware.smack.packet.NamedElement; import org.jivesoftware.smack.packet.NamedElement;
import org.jivesoftware.smack.util.StringUtils;
import org.jivesoftware.smack.util.XmlStringBuilder; import org.jivesoftware.smack.util.XmlStringBuilder;
/** /**
@ -32,6 +33,27 @@ public class JingleReason implements NamedElement {
public static final String ELEMENT = "reason"; public static final String ELEMENT = "reason";
public static AlternativeSession AlternativeSession(String sessionId) {
return new AlternativeSession(sessionId);
}
public static final JingleReason Busy = new JingleReason(Reason.busy);
public static final JingleReason Cancel = new JingleReason(Reason.cancel);
public static final JingleReason ConnectivityError = new JingleReason(Reason.connectivity_error);
public static final JingleReason Decline = new JingleReason(Reason.decline);
public static final JingleReason Expired = new JingleReason(Reason.expired);
public static final JingleReason FailedApplication = new JingleReason(Reason.failed_application);
public static final JingleReason FailedTransport = new JingleReason(Reason.failed_transport);
public static final JingleReason GeneralError = new JingleReason(Reason.general_error);
public static final JingleReason Gone = new JingleReason(Reason.gone);
public static final JingleReason IncompatibleParameters = new JingleReason(Reason.incompatible_parameters);
public static final JingleReason MediaError = new JingleReason(Reason.media_error);
public static final JingleReason SecurityError = new JingleReason(Reason.security_error);
public static final JingleReason Success = new JingleReason(Reason.success);
public static final JingleReason Timeout = new JingleReason(Reason.timeout);
public static final JingleReason UnsupportedApplications = new JingleReason(Reason.unsupported_applications);
public static final JingleReason UnsupportedTransports = new JingleReason(Reason.unsupported_transports);
public enum Reason { public enum Reason {
alternative_session, alternative_session,
busy, busy,
@ -52,7 +74,7 @@ public class JingleReason implements NamedElement {
unsupported_transports, unsupported_transports,
; ;
private static final Map<String, Reason> LUT = new HashMap<>(Reason.values().length); protected static final Map<String, Reason> LUT = new HashMap<>(Reason.values().length);
static { static {
for (Reason reason : Reason.values()) { for (Reason reason : Reason.values()) {
@ -60,9 +82,9 @@ public class JingleReason implements NamedElement {
} }
} }
private final String asString; protected final String asString;
private Reason() { Reason() {
asString = name().replace('_', '-'); asString = name().replace('_', '-');
} }
@ -80,9 +102,9 @@ public class JingleReason implements NamedElement {
} }
} }
private final Reason reason; protected final Reason reason;
public JingleReason(Reason reason) { protected JingleReason(Reason reason) {
this.reason = reason; this.reason = reason;
} }
@ -102,4 +124,33 @@ public class JingleReason implements NamedElement {
return xml; return xml;
} }
public static class AlternativeSession extends JingleReason {
public static final String SID = "sid";
private final String sessionId;
public AlternativeSession(String sessionId) {
super(Reason.alternative_session);
if (StringUtils.isNullOrEmpty(sessionId)) {
throw new NullPointerException("SessionID must not be null or empty.");
}
this.sessionId = sessionId;
}
@Override
public XmlStringBuilder toXML() {
XmlStringBuilder xml = new XmlStringBuilder(this);
xml.rightAngleBracket();
xml.openElement(reason.asString);
xml.openElement(SID);
xml.append(sessionId);
xml.closeElement(SID);
xml.closeElement(reason.asString);
xml.closeElement(this);
return xml;
}
}
} }

56
smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/JingleReasonTest.java
View file

@ -16,13 +16,13 @@
*/ */
package org.jivesoftware.smackx.jingle; package org.jivesoftware.smackx.jingle;
import static junit.framework.TestCase.assertEquals;
import static junit.framework.TestCase.fail;
import org.jivesoftware.smack.test.util.SmackTestSuite; import org.jivesoftware.smack.test.util.SmackTestSuite;
import org.jivesoftware.smackx.jingle.element.JingleReason; import org.jivesoftware.smackx.jingle.element.JingleReason;
import org.junit.Test; import org.junit.Test;
import static junit.framework.TestCase.assertEquals;
import static junit.framework.TestCase.fail;
/** /**
* Test JingleReason functionality. * Test JingleReason functionality.
*/ */
@ -31,38 +31,54 @@ public class JingleReasonTest extends SmackTestSuite {
@Test @Test
public void parserTest() { public void parserTest() {
assertEquals("<reason><success/></reason>", assertEquals("<reason><success/></reason>",
new JingleReason(JingleReason.Reason.success).toXML().toString()); JingleReason.Success.toXML().toString());
assertEquals("<reason><busy/></reason>", assertEquals("<reason><busy/></reason>",
new JingleReason(JingleReason.Reason.busy).toXML().toString()); JingleReason.Busy.toXML().toString());
assertEquals("<reason><cancel/></reason>", assertEquals("<reason><cancel/></reason>",
new JingleReason(JingleReason.Reason.cancel).toXML().toString()); JingleReason.Cancel.toXML().toString());
assertEquals("<reason><connectivity-error/></reason>", assertEquals("<reason><connectivity-error/></reason>",
new JingleReason(JingleReason.Reason.connectivity_error).toXML().toString()); JingleReason.ConnectivityError.toXML().toString());
assertEquals("<reason><decline/></reason>", assertEquals("<reason><decline/></reason>",
new JingleReason(JingleReason.Reason.decline).toXML().toString()); JingleReason.Decline.toXML().toString());
assertEquals("<reason><expired/></reason>", assertEquals("<reason><expired/></reason>",
new JingleReason(JingleReason.Reason.expired).toXML().toString()); JingleReason.Expired.toXML().toString());
assertEquals("<reason><unsupported-transports/></reason>", assertEquals("<reason><unsupported-transports/></reason>",
new JingleReason(JingleReason.Reason.unsupported_transports).toXML().toString()); JingleReason.UnsupportedTransports.toXML().toString());
assertEquals("<reason><failed-transport/></reason>", assertEquals("<reason><failed-transport/></reason>",
new JingleReason(JingleReason.Reason.failed_transport).toXML().toString()); JingleReason.FailedTransport.toXML().toString());
assertEquals("<reason><general-error/></reason>", assertEquals("<reason><general-error/></reason>",
new JingleReason(JingleReason.Reason.general_error).toXML().toString()); JingleReason.GeneralError.toXML().toString());
assertEquals("<reason><gone/></reason>", assertEquals("<reason><gone/></reason>",
new JingleReason(JingleReason.Reason.gone).toXML().toString()); JingleReason.Gone.toXML().toString());
assertEquals("<reason><media-error/></reason>", assertEquals("<reason><media-error/></reason>",
new JingleReason(JingleReason.Reason.media_error).toXML().toString()); JingleReason.MediaError.toXML().toString());
assertEquals("<reason><security-error/></reason>", assertEquals("<reason><security-error/></reason>",
new JingleReason(JingleReason.Reason.security_error).toXML().toString()); JingleReason.SecurityError.toXML().toString());
assertEquals("<reason><unsupported-applications/></reason>", assertEquals("<reason><unsupported-applications/></reason>",
new JingleReason(JingleReason.Reason.unsupported_applications).toXML().toString()); JingleReason.UnsupportedApplications.toXML().toString());
assertEquals("<reason><timeout/></reason>", assertEquals("<reason><timeout/></reason>",
new JingleReason(JingleReason.Reason.timeout).toXML().toString()); JingleReason.Timeout.toXML().toString());
assertEquals("<reason><failed-application/></reason>", assertEquals("<reason><failed-application/></reason>",
new JingleReason(JingleReason.Reason.failed_application).toXML().toString()); JingleReason.FailedApplication.toXML().toString());
assertEquals("<reason><incompatible-parameters/></reason>", assertEquals("<reason><incompatible-parameters/></reason>",
new JingleReason(JingleReason.Reason.incompatible_parameters).toXML().toString()); JingleReason.IncompatibleParameters.toXML().toString());
assertEquals(JingleReason.Reason.alternative_session, JingleReason.Reason.fromString("alternative-session")); assertEquals("<reason><alternative-session><sid>1234</sid></alternative-session></reason>",
JingleReason.AlternativeSession("1234").toXML().toString());
// Alternative sessionID must not be empty
try {
JingleReason.AlternativeSession("");
fail();
} catch (NullPointerException e) {
// Expected
}
// Alternative sessionID must not be null
try {
JingleReason.AlternativeSession(null);
fail();
} catch (NullPointerException e) {
// Expected
}
try { try {
JingleReason.Reason nonExistent = JingleReason.Reason.fromString("illegal-reason"); JingleReason.Reason nonExistent = JingleReason.Reason.fromString("illegal-reason");
fail(); fail();