vanitasvitae
/
Smack
mirror of https://github.com/vanitasvitae/Smack.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Deprecate setServiceName in favor of setXmppDomain

This commit is contained in:
Florian Schmaus 2015-06-08 14:39:05 +02:00
parent 4d7279d036
commit bad52fad21
9 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
documentation/connections.md
View File

@ -32,7 +32,7 @@ Connect and Disconnect
XMPPTCPConnectionConfiguration.Builder configBuilder = XMPPTCPConnectionConfiguration.builder();
configBuilder.setUsernameAndPassword("username", "password");
configBuilder.setResource("SomeResource");
configBuilder.setServiceName("jabber.org");
configBuilder.setXmppDomain("jabber.org");
AbstractXMPPConnection connection = new XMPPTCPConnection(configBuilder.build());
// Connect to the server

2
documentation/gettingstarted.md
View File

@ -53,7 +53,7 @@ conn1.connect();
// Create a connection to the jabber.org server on a specific port.
XMPPTCPConnectionConfiguration config = XMPPTCPConnectionConfiguration.builder()
.setUsernameAndPassword("username", "password")
.setServiceName("jabber.org")
.setXmppDomain("jabber.org")
.setHost("earl.jabber.org")
.setPort("8222")
.build();

2
smack-bosh/src/main/java/org/jivesoftware/smack/bosh/XMPPBOSHConnection.java
View File

@ -118,7 +118,7 @@ public class XMPPBOSHConnection extends AbstractXMPPConnection {
*/
public XMPPBOSHConnection(String username, String password, boolean https, String host, int port, String filePath, DomainBareJid xmppServiceDomain) {
this(BOSHConfiguration.builder().setUseHttps(https).setHost(host)
.setPort(port).setFile(filePath).setServiceName(xmppServiceDomain)
.setPort(port).setFile(filePath).setXmppDomain(xmppServiceDomain)
.setUsernameAndPassword(username, password).build());
}

14
smack-core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java
View File

@ -464,9 +464,21 @@ public abstract class ConnectionConfiguration {
*
* @param serviceName the service name
* @return a reference to this builder.
* @deprecated use {@link #setXmppDomain(DomainBareJid)} instead.
*/
@Deprecated
public B setServiceName(DomainBareJid serviceName) {
this.xmppServiceDomain = serviceName;
return setXmppDomain(serviceName);
}
/**
* Set the service name of this XMPP service (i.e., the XMPP domain).
*
* @param xmppServiceDomain the service name
* @return a reference to this builder.
*/
public B setXmppDomain(DomainBareJid xmppServiceDomain) {
this.xmppServiceDomain = xmppServiceDomain;
return getThis();
}

2
smack-core/src/test/java/org/jivesoftware/smack/DummyConnection.java
View File

@ -57,7 +57,7 @@ public class DummyConnection extends AbstractXMPPConnection {
private final BlockingQueue<TopLevelStreamElement> queue = new LinkedBlockingQueue<TopLevelStreamElement>();
public static ConnectionConfiguration.Builder<?,?> getDummyConfigurationBuilder() {
return DummyConnectionConfiguration.builder().setServiceName(JidTestUtil.EXAMPLE_ORG).setUsernameAndPassword("dummy",
return DummyConnectionConfiguration.builder().setXmppDomain(JidTestUtil.EXAMPLE_ORG).setUsernameAndPassword("dummy",
"dummypass");
}

2
smack-integration-test/src/main/java/org/igniterealtime/smack/inttest/AbstractSmackLowLevelIntegrationTest.java
View File

@ -51,7 +51,7 @@ public abstract class AbstractSmackLowLevelIntegrationTest extends AbstractSmack
builder.setCustomSSLContext(sc);
}
builder.setSecurityMode(configuration.securityMode);
builder.setServiceName(service);
builder.setXmppDomain(service);
return builder;
}

4
smack-integration-test/src/main/java/org/igniterealtime/smack/inttest/SmackIntegrationTestFramework.java
View File

@ -516,7 +516,7 @@ public class SmackIntegrationTestFramework {
}
// @formatter:off
Builder builder = XMPPTCPConnectionConfiguration.builder()
.setServiceName(config.service)
.setXmppDomain(config.service)
.setUsernameAndPassword(accountUsername, accountPassword)
.setResource(middlefix + '-' + testRunResult.testRunId)
.setSecurityMode(config.securityMode);
@ -551,7 +551,7 @@ public class SmackIntegrationTestFramework {
builder.setCustomSSLContext(sc);
}
builder.setSecurityMode(config.securityMode);
builder.setServiceName(config.service);
builder.setXmppDomain(config.service);
XMPPTCPConnection connection = new XMPPTCPConnection(builder.build());
connection.connect();
UsernameAndPassword uap = IntTestUtil.registerAccount(connection);

2
smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java
View File

@ -337,7 +337,7 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
* @throws XmppStringprepException
*/
public XMPPTCPConnection(CharSequence username, String password, String serviceName) throws XmppStringprepException {
this(XMPPTCPConnectionConfiguration.builder().setUsernameAndPassword(username, password).setServiceName(
this(XMPPTCPConnectionConfiguration.builder().setUsernameAndPassword(username, password).setXmppDomain(
JidCreate.domainBareFrom(serviceName)).build());
}

2
smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnectionConfiguration.java
View File

@ -27,7 +27,7 @@ import org.jivesoftware.smack.ConnectionConfiguration;
* <pre>
* {@code
* XMPPTCPConnectionConfiguration conf = XMPPConnectionConfiguration.builder()
* .setServiceName("example.org").setUsernameAndPassword("user", "password")
* .setXmppDomain("example.org").setUsernameAndPassword("user", "password")
* .setCompressionEnabled(false).build();
* XMPPTCPConnection connection = new XMPPTCPConnection(conf);
* }