mirror of
https://github.com/vanitasvitae/Smack.git
synced 2025-09-09 09:09:38 +02:00
Fixes spelling (includes one API change)
Mostly benign changes. Added one new method to replace a method with a spelling mistake in its name. Kept the old method, marked as 'deprecated'.
This commit is contained in:
Guus der Kinderen
parent
38c6dd21b4
commit
c85bcadd81
140 changed files with 270 additions and 265 deletions
|
|
@ -100,8 +100,8 @@ public class XmppConnectionStressTest {
|
|||
|
||||
for (int c = 0; c < payloadChunkCount; c++) {
|
||||
int payloadChunkSize = random.nextInt(configuration.maxPayloadChunkSize) + 1;
|
||||
String payloadCunk = StringUtils.randomString(payloadChunkSize, random);
|
||||
JivePropertiesManager.addProperty(messageBuilder, "payload-chunk-" + c, payloadCunk);
|
||||
String payloadChunk = StringUtils.randomString(payloadChunkSize, random);
|
||||
JivePropertiesManager.addProperty(messageBuilder, "payload-chunk-" + c, payloadChunk);
|
||||
}
|
||||
|
||||
JivePropertiesManager.addProperty(messageBuilder, MESSAGE_NUMBER_PROPERTY, i);
|
||||
|
|
@ -184,7 +184,7 @@ public class XmppConnectionStressTest {
|
|||
Exception exception = new Exception(exceptionMessage.toString());
|
||||
receiveExceptions.put(connection, exception);
|
||||
// TODO: Current Smack design does not guarantee that the listener won't be invoked again.
|
||||
// This is because the decission to invoke a sync listeners is done at a different place
|
||||
// This is because the decision to invoke a sync listeners is done at a different place
|
||||
// then invoking the listener.
|
||||
connection.removeSyncStanzaListener(this);
|
||||
receivedSemaphore.release();
|
||||
|
|
@ -338,7 +338,7 @@ public class XmppConnectionStressTest {
|
|||
sb.append("Exceptions while sending and/or receiving.");
|
||||
|
||||
if (!sendExceptions.isEmpty()) {
|
||||
sb.append(" Send exxceptions: ");
|
||||
sb.append(" Send exceptions: ");
|
||||
for (Map.Entry<XMPPConnection, Exception> entry : sendExceptions.entrySet()) {
|
||||
sb.append(entry.getKey()).append(": ").append(entry.getValue()).append(';');
|
||||
}
|
||||
|
|
|
|||
|
|
@ -432,7 +432,7 @@ public class SmackIntegrationTestFramework {
|
|||
final Class<?>[] parameterTypes = method.getParameterTypes();
|
||||
if (parameterTypes.length > 0) {
|
||||
throw new IllegalStateException(
|
||||
"SmackIntegrationTest annotaton on " + method + " that takes arguments ");
|
||||
"SmackIntegrationTest annotation on " + method + " that takes arguments ");
|
||||
}
|
||||
break;
|
||||
case LowLevel:
|
||||
|
|
|
|||
|
|
@ -155,7 +155,7 @@ public final class XmppConnectionDescriptor<
|
|||
|
||||
return XmppConnectionDescriptor.buildWith(ModularXmppClientToServerConnection.class, ModularXmppClientToServerConnectionConfiguration.class, ModularXmppClientToServerConnectionConfiguration.Builder.class)
|
||||
.withNickname(nickname)
|
||||
.applyExtraConfguration(cb -> {
|
||||
.applyExtraConfiguration(cb -> {
|
||||
cb.removeAllModules();
|
||||
ModularXmppClientToServerConnectionModuleDescriptor webSocketModuleDescriptor =
|
||||
XmppWebSocketTransportModuleDescriptor.getBuilder(cb)
|
||||
|
|
@ -184,7 +184,13 @@ public final class XmppConnectionDescriptor<
|
|||
nickname = connectionClass.getSimpleName();
|
||||
}
|
||||
|
||||
// TODO Remove in Smack 4.6
|
||||
@Deprecated // Replaced by applyExtraConfiguration(Consumer<CCB> extraBuilder)
|
||||
public Builder<C, CC, CCB> applyExtraConfguration(Consumer<CCB> extraBuilder) {
|
||||
return applyExtraConfiguration(extraBuilder);
|
||||
}
|
||||
|
||||
public Builder<C, CC, CCB> applyExtraConfiguration(Consumer<CCB> extraBuilder) {
|
||||
this.extraBuilder = extraBuilder;
|
||||
return this;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -85,7 +85,7 @@ public class XmppConnectionManager {
|
|||
addConnectionDescriptor(
|
||||
XmppConnectionDescriptor.buildWith(ModularXmppClientToServerConnection.class, ModularXmppClientToServerConnectionConfiguration.class, ModularXmppClientToServerConnectionConfiguration.Builder.class)
|
||||
.withNickname("modular-nocompress")
|
||||
.applyExtraConfguration(cb -> cb.removeModule(CompressionModuleDescriptor.class))
|
||||
.applyExtraConfiguration(cb -> cb.removeModule(CompressionModuleDescriptor.class))
|
||||
.build()
|
||||
);
|
||||
addConnectionDescriptor(
|
||||
|
|
|
|||
|
|
@ -145,7 +145,7 @@
|
|||
* </tr>
|
||||
* <tr>
|
||||
* <td>disabledSpecifications</td>
|
||||
* <td>List of specificatinos for which to disable tests</td>
|
||||
* <td>List of specifications for which to disable tests</td>
|
||||
* </tr>
|
||||
* <tr>
|
||||
* <td>defaultConnection</td>
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ public class LoginIntegrationTest extends AbstractSmackLowLevelIntegrationTest {
|
|||
* @throws IOException if an I/O error occurred.
|
||||
* @throws SmackException if Smack detected an exceptional situation.
|
||||
* @throws NoSuchAlgorithmException if no such algorithm is available.
|
||||
* @throws KeyManagementException if there was a key mangement error.
|
||||
* @throws KeyManagementException if there was a key management error.
|
||||
*/
|
||||
@SmackIntegrationTest
|
||||
public void testInvalidLogin(UnconnectedConnectionSource unconnectedConnectionSource) throws SmackException, IOException, XMPPException,
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ public class LowLevelRosterIntegrationTest extends AbstractSmackLowLevelIntegrat
|
|||
rosterOne.addPresenceEventListener(presenceEventListener);
|
||||
|
||||
try {
|
||||
// Disconnect conTwo, this should cause an 'unavailable' presence to be send from conTwo to
|
||||
// Disconnect conTwo, this should cause an 'unavailable' presence to be sent from conTwo to
|
||||
// conOne.
|
||||
conTwo.disconnect();
|
||||
|
||||
|
|
|
|||
|
|
@ -185,7 +185,7 @@ public abstract class AbstractMultiUserChatIntegrationTest extends AbstractSmack
|
|||
* <p>From XEP-0045 § 10.1.3:</p>
|
||||
* <blockquote>
|
||||
* Note: The _whois configuration option specifies whether the room is non-anonymous (a value of "anyone"),
|
||||
* semi-anonymous (a value of "moderators"), or fully anonmyous (a value of "none", not shown here).
|
||||
* semi-anonymous (a value of "moderators"), or fully anonymous (a value of "none", not shown here).
|
||||
* </blockquote>
|
||||
*/
|
||||
static void createNonAnonymousMuc(MultiUserChat muc, Resourcepart resourceName) throws SmackException.NoResponseException, XMPPException.XMPPErrorException, InterruptedException, MultiUserChatException.MucAlreadyJoinedException, SmackException.NotConnectedException, MultiUserChatException.MissingMucCreationAcknowledgeException, MultiUserChatException.NotAMucServiceException {
|
||||
|
|
@ -202,7 +202,7 @@ public abstract class AbstractMultiUserChatIntegrationTest extends AbstractSmack
|
|||
* <p>From XEP-0045 § 10.1.3:</p>
|
||||
* <blockquote>
|
||||
* Note: The _whois configuration option specifies whether the room is non-anonymous (a value of "anyone"),
|
||||
* semi-anonymous (a value of "moderators"), or fully anonmyous (a value of "none", not shown here).
|
||||
* semi-anonymous (a value of "moderators"), or fully anonymous (a value of "none", not shown here).
|
||||
* </blockquote>
|
||||
*/
|
||||
static void createSemiAnonymousMuc(MultiUserChat muc, Resourcepart resourceName) throws SmackException.NoResponseException, XMPPException.XMPPErrorException, InterruptedException, MultiUserChatException.MucAlreadyJoinedException, SmackException.NotConnectedException, MultiUserChatException.MissingMucCreationAcknowledgeException, MultiUserChatException.NotAMucServiceException {
|
||||
|
|
|
|||
|
|
@ -219,7 +219,7 @@ public class MultiUserChatRolesAffiliationsPrivilegesIntegrationTest extends Abs
|
|||
}
|
||||
|
||||
/**
|
||||
* Asserts that a user in an unmoderated room who undergoes an afilliation change receives that change as a presence update.
|
||||
* Asserts that a user in an unmoderated room who undergoes an affiliation change receives that change as a presence update.
|
||||
*
|
||||
* @throws Exception when errors occur
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -113,7 +113,7 @@ public class PubSubIntegrationTest extends AbstractSmackIntegrationTest {
|
|||
// Add a dummy payload. If there is no payload, but just an item ID, then ejabberd will *not* return an error,
|
||||
// which I believe to be non-compliant behavior (although, granted, the XEP is not very clear about this). A user
|
||||
// which sends an empty item with ID to an node that is configured to be notification-only and transient probably
|
||||
// does something wrong, as the item's ID will never appear anywhere. Hence it would be nice if the user would be
|
||||
// does something wrong, as the item's ID will never appear anywhere. Hence, it would be nice if the user would be
|
||||
// made aware of this issue by returning an error. Sadly ejabberd does not do so.
|
||||
// See also https://github.com/processone/ejabberd/issues/2864#issuecomment-500741915
|
||||
final StandardExtensionElement dummyPayload = StandardExtensionElement.builder("dummy-payload",
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ public class SmackIntegrationTestXmppConnectionManagerTest {
|
|||
ModularXmppClientToServerConnection.class,
|
||||
ModularXmppClientToServerConnectionConfiguration.class,
|
||||
ModularXmppClientToServerConnectionConfiguration.Builder.class)
|
||||
.applyExtraConfguration(b -> b.removeAllModules().addModule(XmppTcpTransportModuleDescriptor.class))
|
||||
.applyExtraConfiguration(b -> b.removeAllModules().addModule(XmppTcpTransportModuleDescriptor.class))
|
||||
.build();
|
||||
|
||||
Configuration sinttestConfiguration = Configuration.builder().setService("example.org").build();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue