vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2025-09-10 17:49:38 +02:00
Code Issues Releases Wiki Activity

Bump jxmpp to 0.5.0-alpha4

Browse source
This commit is contained in:
Florian Schmaus 2015-05-27 19:29:51 +02:00
parent 8840236b72
commit c125a3b055
49 changed files with 208 additions and 208 deletions
Download patch file Download diff file Expand all files Collapse all files

8
smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java
View file

@ -82,7 +82,7 @@ import org.jivesoftware.smack.util.SmackExecutorThreadFactory;
import org.jivesoftware.smack.util.StringUtils;
import org.jivesoftware.smack.util.dns.HostAddress;
import org.jxmpp.jid.DomainBareJid;
import org.jxmpp.jid.FullJid;
import org.jxmpp.jid.EntityFullJid;
import org.jxmpp.jid.Jid;
import org.jxmpp.jid.parts.Resourcepart;
import org.jxmpp.util.XmppStringUtils;
@ -158,7 +158,7 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
* certificate.
* </p>
*/
protected FullJid user;
protected EntityFullJid user;
protected boolean connected = false;
@ -475,7 +475,7 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
}
@Override
public final FullJid getUser() {
public final EntityFullJid getUser() {
return user;
}
@ -1586,7 +1586,7 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
@Override
public final String toString() {
FullJid localEndpoint = getUser();
EntityFullJid localEndpoint = getUser();
String localEndpointString = (localEndpoint == null ? "not-authenticated" : localEndpoint.toString());
return getClass().getSimpleName() + '[' + localEndpointString + "] (" + getConnectionCounter() + ')';
}

4
smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java
View file

@ -27,7 +27,7 @@ import org.jivesoftware.smack.packet.Stanza;
import org.jivesoftware.smack.packet.ExtensionElement;
import org.jivesoftware.smack.packet.PlainStreamElement;
import org.jxmpp.jid.DomainBareJid;
import org.jxmpp.jid.FullJid;
import org.jxmpp.jid.EntityFullJid;
/**
* The XMPPConnection interface provides an interface for connections to an XMPP server and
@ -115,7 +115,7 @@ public interface XMPPConnection {
*
* @return the full XMPP address of the user logged in.
*/
public FullJid getUser();
public EntityFullJid getUser();
/**
* Returns the stream ID for this connection, which is the value set by the server

4
smack-core/src/main/java/org/jivesoftware/smack/debugger/AbstractDebugger.java
View file

@ -24,7 +24,7 @@ import org.jivesoftware.smack.util.ObservableReader;
import org.jivesoftware.smack.util.ObservableWriter;
import org.jivesoftware.smack.util.ReaderListener;
import org.jivesoftware.smack.util.WriterListener;
import org.jxmpp.jid.FullJid;
import org.jxmpp.jid.EntityFullJid;
import java.io.Reader;
import java.io.Writer;
@ -142,7 +142,7 @@ public abstract class AbstractDebugger implements SmackDebugger {
}
@Override
public void userHasLogged(FullJid user) {
public void userHasLogged(EntityFullJid user) {
String localpart = user.getLocalpart().toString();
boolean isAnonymous = "".equals(localpart);
String title =

4
smack-core/src/main/java/org/jivesoftware/smack/debugger/SmackDebugger.java
View file

@ -21,7 +21,7 @@ import java.io.Reader;
import java.io.Writer;
import org.jivesoftware.smack.StanzaListener;
import org.jxmpp.jid.FullJid;
import org.jxmpp.jid.EntityFullJid;
/**
* Interface that allows for implementing classes to debug XML traffic. That is a GUI window that
@ -41,7 +41,7 @@ public interface SmackDebugger {
*
* @param user the user@host/resource that has just logged in
*/
public abstract void userHasLogged(FullJid user);
public abstract void userHasLogged(EntityFullJid user);
/**
* Returns the special Reader that wraps the main Reader and logs data to the GUI.

4
smack-core/src/main/java/org/jivesoftware/smack/filter/IQReplyFilter.java
View file

@ -23,7 +23,7 @@ import org.jivesoftware.smack.XMPPConnection;
import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smack.packet.Stanza;
import org.jxmpp.jid.DomainBareJid;
import org.jxmpp.jid.FullJid;
import org.jxmpp.jid.EntityFullJid;
import org.jxmpp.jid.Jid;
/**
@ -55,7 +55,7 @@ public class IQReplyFilter implements StanzaFilter {
private final StanzaFilter iqAndIdFilter;
private final OrFilter fromFilter;
private final Jid to;
private final FullJid local;
private final EntityFullJid local;
private final DomainBareJid server;
private final String packetId;

10
smack-core/src/main/java/org/jivesoftware/smack/packet/Bind.java
View file

@ -17,7 +17,7 @@
package org.jivesoftware.smack.packet;
import org.jxmpp.jid.FullJid;
import org.jxmpp.jid.EntityFullJid;
import org.jxmpp.jid.parts.Resourcepart;
/**
@ -37,9 +37,9 @@ public class Bind extends IQ {
public static final String NAMESPACE = "urn:ietf:params:xml:ns:xmpp-bind";
private final Resourcepart resource;
private final FullJid jid;
private final EntityFullJid jid;
public Bind(Resourcepart resource, FullJid jid) {
public Bind(Resourcepart resource, EntityFullJid jid) {
super(ELEMENT, NAMESPACE);
this.resource = resource;
this.jid = jid;
@ -49,7 +49,7 @@ public class Bind extends IQ {
return resource;
}
public FullJid getJid() {
public EntityFullJid getJid() {
return jid;
}
@ -59,7 +59,7 @@ public class Bind extends IQ {
return bind;
}
public static Bind newResult(FullJid jid) {
public static Bind newResult(EntityFullJid jid) {
return new Bind(null, jid);
}

4
smack-core/src/main/java/org/jivesoftware/smack/provider/BindIQProvider.java
View file

@ -20,7 +20,7 @@ import java.io.IOException;
import org.jivesoftware.smack.SmackException;
import org.jivesoftware.smack.packet.Bind;
import org.jxmpp.jid.FullJid;
import org.jxmpp.jid.EntityFullJid;
import org.jxmpp.jid.impl.JidCreate;
import org.jxmpp.jid.parts.Resourcepart;
import org.xmlpull.v1.XmlPullParser;
@ -44,7 +44,7 @@ public class BindIQProvider extends IQProvider<Bind> {
bind = Bind.newSet(Resourcepart.from(resourceString));
break;
case "jid":
FullJid fullJid = JidCreate.fullFrom(parser.nextText());
EntityFullJid fullJid = JidCreate.fullFrom(parser.nextText());
bind = Bind.newResult(fullJid);
break;
}

6
smack-core/src/main/java/org/jivesoftware/smack/util/ParserUtils.java
View file

@ -23,7 +23,7 @@ import java.text.ParseException;
import java.util.Date;
import java.util.Locale;
import org.jxmpp.jid.BareJid;
import org.jxmpp.jid.EntityBareJid;
import org.jxmpp.jid.Jid;
import org.jxmpp.jid.impl.JidCreate;
import org.jxmpp.jid.parts.Resourcepart;
@ -67,11 +67,11 @@ public class ParserUtils {
return JidCreate.from(jidString);
}
public static BareJid getBareJidAttribute(XmlPullParser parser) throws XmppStringprepException {
public static EntityBareJid getBareJidAttribute(XmlPullParser parser) throws XmppStringprepException {
return getBareJidAttribute(parser, JID);
}
public static BareJid getBareJidAttribute(XmlPullParser parser, String name) throws XmppStringprepException {
public static EntityBareJid getBareJidAttribute(XmlPullParser parser, String name) throws XmppStringprepException {
final String jidString = parser.getAttributeValue("", name);
if (jidString == null) {
return null;

4
smack-core/src/test/java/org/jivesoftware/smack/DummyConnection.java
View file

@ -28,7 +28,7 @@ import org.jivesoftware.smack.packet.ExtensionElement;
import org.jivesoftware.smack.packet.Stanza;
import org.jivesoftware.smack.packet.PlainStreamElement;
import org.jivesoftware.smack.packet.TopLevelStreamElement;
import org.jxmpp.jid.FullJid;
import org.jxmpp.jid.EntityFullJid;
import org.jxmpp.jid.JidTestUtil;
import org.jxmpp.jid.impl.JidCreate;
import org.jxmpp.jid.parts.Resourcepart;
@ -65,7 +65,7 @@ public class DummyConnection extends AbstractXMPPConnection {
this(getDummyConfigurationBuilder().build());
}
private FullJid getUserJid() {
private EntityFullJid getUserJid() {
try {
return JidCreate.fullFrom(config.getUsername()
+ "@"

12
smack-core/src/test/java/org/jivesoftware/smack/filter/FromMatchesFilterTest.java
View file

@ -21,7 +21,7 @@ import static org.junit.Assert.assertFalse;
import org.jivesoftware.smack.packet.Stanza;
import org.junit.Test;
import org.jxmpp.jid.FullJid;
import org.jxmpp.jid.EntityFullJid;
import org.jxmpp.jid.Jid;
import org.jxmpp.jid.JidTestUtil;
@ -32,8 +32,8 @@ import org.jxmpp.jid.JidTestUtil;
*/
public class FromMatchesFilterTest {
private static final Jid BASE_JID1 = JidTestUtil.BARE_JID_1;
private static final FullJid FULL_JID1_R1 = JidTestUtil.FULL_JID_1_RESOURCE_1;
private static final FullJid FULL_JID1_R2 = JidTestUtil.FULL_JID_1_RESOURCE_2;
private static final EntityFullJid FULL_JID1_R1 = JidTestUtil.FULL_JID_1_RESOURCE_1;
private static final EntityFullJid FULL_JID1_R2 = JidTestUtil.FULL_JID_1_RESOURCE_2;
private static final Jid BASE_JID2 = JidTestUtil.BARE_JID_2;
private static final Jid FULL_JID2 = JidTestUtil.FULL_JID_2_RESOURCE_1;
@ -43,7 +43,7 @@ public class FromMatchesFilterTest {
private static final Jid SERVICE_JID2 = JidTestUtil.PUBSUB_EXAMPLE_ORG;
@Test
public void autoCompareMatchingFullJid()
public void autoCompareMatchingEntityFullJid()
{
FromMatchesFilter filter = FromMatchesFilter.create(FULL_JID1_R1);
Stanza packet = new Stanza() {
@ -124,7 +124,7 @@ public class FromMatchesFilterTest {
}
@Test
public void bareCompareMatchingFullJid()
public void bareCompareMatchingEntityFullJid()
{
FromMatchesFilter filter = FromMatchesFilter.createBare(FULL_JID1_R1);
Stanza packet = new Stanza() {
@ -205,7 +205,7 @@ public class FromMatchesFilterTest {
}
@Test
public void fullCompareMatchingFullJid()
public void fullCompareMatchingEntityFullJid()
{
FromMatchesFilter filter = FromMatchesFilter.createFull(FULL_JID1_R1);
Stanza packet = new Stanza() {