From b7ea226c5633428684afb915493f2141204c0174 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Wed, 31 Oct 2018 16:06:31 +0100 Subject: [PATCH] Bump "Error Prone" to 2.3.2 and gradle-errorprone-plugin to 0.6. --- build.gradle | 12 +++++---- .../smack/AbstractXMPPConnection.java | 4 +-- .../smack/SynchronizationPoint.java | 1 + .../smack/filter/StanzaIdFilter.java | 6 ++--- .../StandardExtensionElementProvider.java | 3 +-- .../proxy/Socks5ProxySocketConnection.java | 8 +++--- .../smack/sasl/core/SCRAMSHA1Mechanism.java | 2 +- .../sasl/core/ScramSha1PlusMechanism.java | 2 +- .../StandardExtensionElementParserTest.java | 5 ++-- .../smack/util/PacketParserUtilsTest.java | 2 +- .../smackx/hashes/element/HashElement.java | 5 +++- .../org/jivesoftware/smackx/iot/Thing.java | 1 + .../iot/discovery/IoTDiscoveryManager.java | 2 ++ .../jingle_filetransfer/element/Range.java | 5 +++- .../smackx/mam/element/MamQueryIQ.java | 2 +- .../smackx/mam/MamQueryIQProviderTest.java | 6 ++--- .../jivesoftware/smackx/mam/PagingTest.java | 2 +- .../ibb/InBandBytestreamManager.java | 2 +- .../socks5/Socks5BytestreamManager.java | 2 +- .../bytestreams/socks5/packet/Bytestream.java | 26 +++++++++---------- .../socks5/provider/BytestreamsProvider.java | 2 +- .../smackx/disco/packet/DiscoverInfo.java | 4 +-- .../filetransfer/FileTransferNegotiator.java | 7 ++--- .../element/JingleIBBTransport.java | 8 +++++- .../smackx/pubsub/PubSubManager.java | 2 +- .../smackx/vcardtemp/packet/VCard.java | 2 +- .../jivesoftware/smackx/xdata/FormField.java | 2 +- .../packet/ValidateElement.java | 24 ++++++++--------- .../jivesoftware/smackx/InitExtensions.java | 2 +- .../MessageCorrectExtensionTest.java | 4 +-- .../smack/roster/packet/RosterPacket.java | 6 ++--- .../jivesoftware/smack/im/InitSmackIm.java | 2 +- .../smack/roster/RosterVersioningTest.java | 5 ++-- .../smack/inttest/AbstractSmackIntTest.java | 1 + .../SmackIntegrationTestFramework.java | 5 ++-- .../jivesoftware/smackx/xdata/FormTest.java | 4 +-- .../util/stringencoder/java7/Base64.java | 3 +++ .../smackx/jingleold/ContentNegotiator.java | 4 +-- .../smackx/jingleold/JingleSession.java | 6 ++--- .../smackx/jingleold/media/PayloadType.java | 4 +-- .../mediaimpl/sshare/ScreenShareSession.java | 2 +- .../smackx/jingleold/nat/BridgedResolver.java | 2 +- .../smackx/jingleold/nat/ICECandidate.java | 2 +- .../smackx/jingleold/nat/ICEResolver.java | 10 +++---- .../smackx/jingleold/nat/RTPBridge.java | 2 +- .../jingleold/nat/TransportCandidate.java | 6 ++--- .../jingleold/nat/TransportNegotiator.java | 10 +++---- .../smackx/workgroup/agent/AgentSession.java | 6 ++--- .../ext/history/AgentChatHistory.java | 14 +++++----- .../workgroup/packet/AgentStatusRequest.java | 4 +-- .../workgroup/packet/MonitorPacket.java | 2 +- .../workgroup/packet/OccupantsInfo.java | 14 +++++----- .../smackx/workgroup/packet/QueueDetails.java | 4 +-- .../workgroup/packet/QueueOverview.java | 6 ++--- .../workgroup/settings/ChatSettings.java | 8 +++--- .../workgroup/settings/GenericSettings.java | 2 +- .../workgroup/settings/OfflineSettings.java | 8 +++--- .../workgroup/settings/SearchSettings.java | 4 +-- .../workgroup/settings/SoundSettings.java | 4 +-- .../settings/WorkgroupProperties.java | 6 ++--- .../smackx/workgroup/util/MetaDataUtils.java | 2 +- .../smackx/omemo/util/OmemoKeyUtil.java | 1 + .../omemo/util/OmemoMessageBuilder.java | 2 +- .../ox/element/PublicKeysListElement.java | 4 ++- .../provider/ParseStreamManagementTest.java | 2 +- 65 files changed, 173 insertions(+), 149 deletions(-) diff --git a/build.gradle b/build.gradle index 300ddbccd..feb054e02 100644 --- a/build.gradle +++ b/build.gradle @@ -10,12 +10,12 @@ buildscript { classpath 'org.kordamp:markdown-gradle-plugin:1.0.0' classpath 'org.kordamp.gradle:clirr-gradle-plugin:0.2.2' classpath "org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.3.1" - classpath 'net.ltgt.gradle:gradle-errorprone-plugin:0.0.13' } } plugins { id 'ru.vyarus.animalsniffer' version '1.4.5' + id 'net.ltgt.errorprone' version '0.6' } apply plugin: 'org.kordamp.gradle.markdown' @@ -156,9 +156,8 @@ allprojects { // e.g. JAVA7_HOME. See SMACK-651. '-Xlint:-options', '-Werror', - // Needed because since adding gradle-errorprone-plugin - // See https://github.com/tbroyer/gradle-errorprone-plugin/issues/15 - '-Xlint:-path', + ] + options.errorprone.errorproneArgs = [ // Disable errorprone checks '-Xep:TypeParameterUnusedInFormals:OFF', // Disable errorpone StringSplitter check, as it @@ -170,6 +169,8 @@ allprojects { // TODO: change sinttest so that it has it's own // BeforeClass and re-enable this check. '-Xep:JUnit4ClassAnnotationNonStatic:OFF', + // Disabled but should be re-enabled at some point + //'-Xep:InconsistentCapitalization:OFF', ] } @@ -211,7 +212,8 @@ allprojects { } dependencies { - errorprone 'com.google.errorprone:error_prone_core:2.2.0' + errorprone 'com.google.errorprone:error_prone_core:2.3.2' + errorproneJavac('com.google.errorprone:javac:9+181-r4173-1') } // Make all project's 'test' target depend on javadoc, so that diff --git a/smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java b/smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java index 017f2b489..64cddbe45 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java @@ -1128,8 +1128,8 @@ public abstract class AbstractXMPPConnection implements XMPPConnection { // If the IQ stanza is of type "get" or "set" with no registered IQ request handler, then answer an // IQ of type 'error' with condition 'service-unavailable'. - ErrorIQ errorIQ = IQ.createErrorResponse(iq, StanzaError.getBuilder(( - replyCondition))); + ErrorIQ errorIQ = IQ.createErrorResponse(iq, StanzaError.getBuilder( + replyCondition)); try { sendStanza(errorIQ); } diff --git a/smack-core/src/main/java/org/jivesoftware/smack/SynchronizationPoint.java b/smack-core/src/main/java/org/jivesoftware/smack/SynchronizationPoint.java index 54be30a36..9dfabfd49 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/SynchronizationPoint.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/SynchronizationPoint.java @@ -55,6 +55,7 @@ public class SynchronizationPoint { /** * Initialize (or reset) this synchronization point. */ + @SuppressWarnings("LockNotBeforeTry") public void init() { connectionLock.lock(); state = State.Initial; diff --git a/smack-core/src/main/java/org/jivesoftware/smack/filter/StanzaIdFilter.java b/smack-core/src/main/java/org/jivesoftware/smack/filter/StanzaIdFilter.java index b0387cf94..c0d507e50 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/filter/StanzaIdFilter.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/filter/StanzaIdFilter.java @@ -41,10 +41,10 @@ public class StanzaIdFilter implements StanzaFilter { /** * Creates a new stanza ID filter using the specified stanza ID. * - * @param stanzaID the stanza ID to filter for. + * @param stanzaId the stanza ID to filter for. */ - public StanzaIdFilter(String stanzaID) { - this.stanzaId = StringUtils.requireNotNullNorEmpty(stanzaID, "Stanza ID must not be null nor empty."); + public StanzaIdFilter(String stanzaId) { + this.stanzaId = StringUtils.requireNotNullNorEmpty(stanzaId, "Stanza ID must not be null nor empty."); } @Override diff --git a/smack-core/src/main/java/org/jivesoftware/smack/parsing/StandardExtensionElementProvider.java b/smack-core/src/main/java/org/jivesoftware/smack/parsing/StandardExtensionElementProvider.java index 6572cca01..8f9ec535d 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/parsing/StandardExtensionElementProvider.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/parsing/StandardExtensionElementProvider.java @@ -21,7 +21,6 @@ import java.util.LinkedHashMap; import java.util.Map; import org.jivesoftware.smack.packet.StandardExtensionElement; -import org.jivesoftware.smack.packet.StandardExtensionElement.Builder; import org.jivesoftware.smack.provider.ExtensionElementProvider; import org.jivesoftware.smack.util.ParserUtils; import org.jivesoftware.smack.util.StringUtils; @@ -46,7 +45,7 @@ public class StandardExtensionElementProvider extends ExtensionElementProvider attributes = new LinkedHashMap<>(namespaceCount + attributeCount); diff --git a/smack-core/src/main/java/org/jivesoftware/smack/proxy/Socks5ProxySocketConnection.java b/smack-core/src/main/java/org/jivesoftware/smack/proxy/Socks5ProxySocketConnection.java index 2380f3f86..de9cebe6f 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/proxy/Socks5ProxySocketConnection.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/proxy/Socks5ProxySocketConnection.java @@ -102,7 +102,7 @@ public class Socks5ProxySocketConnection implements ProxySocketConnection { fill(in, buf, 2); boolean check = false; - switch ((buf[1]) & 0xff) { + switch (buf[1] & 0xff) { case 0: // NO AUTHENTICATION REQUIRED check = true; break; @@ -132,13 +132,13 @@ public class Socks5ProxySocketConnection implements ProxySocketConnection { */ index = 0; buf[index++] = 1; - buf[index++] = (byte) (user.length()); + buf[index++] = (byte) user.length(); byte[] userBytes = user.getBytes(StringUtils.UTF8); System.arraycopy(userBytes, 0, buf, index, user.length()); index += user.length(); byte[] passwordBytes = passwd.getBytes(StringUtils.UTF8); - buf[index++] = (byte) (passwordBytes.length); + buf[index++] = (byte) passwordBytes.length; System.arraycopy(passwordBytes, 0, buf, index, passwd.length()); index += passwd.length(); @@ -207,7 +207,7 @@ public class Socks5ProxySocketConnection implements ProxySocketConnection { byte[] hostb = host.getBytes(StringUtils.UTF8); int len = hostb.length; buf[index++] = 3; // DOMAINNAME - buf[index++] = (byte) (len); + buf[index++] = (byte) len; System.arraycopy(hostb, 0, buf, index, len); index += len; buf[index++] = (byte) (port >>> 8); diff --git a/smack-core/src/main/java/org/jivesoftware/smack/sasl/core/SCRAMSHA1Mechanism.java b/smack-core/src/main/java/org/jivesoftware/smack/sasl/core/SCRAMSHA1Mechanism.java index 29d774dc3..0d4ba9ebf 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/sasl/core/SCRAMSHA1Mechanism.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/sasl/core/SCRAMSHA1Mechanism.java @@ -36,7 +36,7 @@ public class SCRAMSHA1Mechanism extends ScramMechanism { return MAC.hmacsha1(key, str); } }; - NAME = (new SCRAMSHA1Mechanism()).getName(); + NAME = new SCRAMSHA1Mechanism().getName(); } public static final String NAME; diff --git a/smack-core/src/main/java/org/jivesoftware/smack/sasl/core/ScramSha1PlusMechanism.java b/smack-core/src/main/java/org/jivesoftware/smack/sasl/core/ScramSha1PlusMechanism.java index 34de148bf..2c1ad955e 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/sasl/core/ScramSha1PlusMechanism.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/sasl/core/ScramSha1PlusMechanism.java @@ -21,7 +21,7 @@ import org.jivesoftware.smack.sasl.SASLMechanism; public class ScramSha1PlusMechanism extends ScramPlusMechanism { static { - NAME = (new ScramSha1PlusMechanism()).getName(); + NAME = new ScramSha1PlusMechanism().getName(); } public static final String NAME; diff --git a/smack-core/src/test/java/org/jivesoftware/smack/parsing/StandardExtensionElementParserTest.java b/smack-core/src/test/java/org/jivesoftware/smack/parsing/StandardExtensionElementParserTest.java index a1bd44987..69d5f7b6a 100644 --- a/smack-core/src/test/java/org/jivesoftware/smack/parsing/StandardExtensionElementParserTest.java +++ b/smack-core/src/test/java/org/jivesoftware/smack/parsing/StandardExtensionElementParserTest.java @@ -20,7 +20,6 @@ import static org.jivesoftware.smack.util.PacketParserUtils.getParserFor; import static org.junit.Assert.assertEquals; import org.jivesoftware.smack.packet.StandardExtensionElement; -import org.jivesoftware.smack.packet.StandardExtensionElement.Builder; import org.junit.Test; @@ -28,7 +27,7 @@ public class StandardExtensionElementParserTest { @Test public void buildAndParse() throws Exception { - Builder builder = StandardExtensionElement.builder("foo", "ns1"); + StandardExtensionElement.Builder builder = StandardExtensionElement.builder("foo", "ns1"); builder.addAttribute("attr1", "attr1-value"); builder.addElement(StandardExtensionElement.builder("bar", "ns2").addAttribute("attr2", "attr2-value").build()); builder.addElement("another-element", "another-element-text"); @@ -53,7 +52,7 @@ public class StandardExtensionElementParserTest { @Test public void buildWithAttrNamespacesAndParse() throws Exception { - Builder builder = StandardExtensionElement.builder("foo", "ns1-value"); + StandardExtensionElement.Builder builder = StandardExtensionElement.builder("foo", "ns1-value"); builder.addAttribute("xmlns:ns2", "ns2-value"); builder.addAttribute("ns2:bar", "bar-ns2-value"); final String elementString = builder.build().toXML(null).toString(); diff --git a/smack-core/src/test/java/org/jivesoftware/smack/util/PacketParserUtilsTest.java b/smack-core/src/test/java/org/jivesoftware/smack/util/PacketParserUtilsTest.java index 4b4ce0681..06093a468 100644 --- a/smack-core/src/test/java/org/jivesoftware/smack/util/PacketParserUtilsTest.java +++ b/smack-core/src/test/java/org/jivesoftware/smack/util/PacketParserUtilsTest.java @@ -813,7 +813,7 @@ public class PacketParserUtilsTest { final String stanza = ""; XmlPullParser parser = TestUtils.getParser(stanza, "iq"); CharSequence content = PacketParserUtils.parseContent(parser); - assertEquals("", content); + assertEquals("", content.toString()); } @Test diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/hashes/element/HashElement.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/hashes/element/HashElement.java index 03b4f32ee..6ff6d3c95 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/hashes/element/HashElement.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/hashes/element/HashElement.java @@ -112,7 +112,10 @@ public class HashElement implements ExtensionElement { if (other == null || !(other instanceof HashElement)) { return false; } - return this.hashCode() == other.hashCode(); + + HashElement otherHashElement = (HashElement) other; + return this.getAlgorithm() == otherHashElement.getAlgorithm() && + this.getHashB64().equals(otherHashElement.getHashB64()); } @Override diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/Thing.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/Thing.java index 6c15fa692..9b63b0109 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/Thing.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/Thing.java @@ -79,6 +79,7 @@ public final class Thing { private String toStringCache; + @SuppressWarnings("ObjectToString") @Override public String toString() { if (toStringCache == null) { diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/IoTDiscoveryManager.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/IoTDiscoveryManager.java index 121c4d6ee..73f7bbc94 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/IoTDiscoveryManager.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/IoTDiscoveryManager.java @@ -149,6 +149,8 @@ public final class IoTDiscoveryManager extends Manager { connection.registerIQRequestHandler(new AbstractIqRequestHandler(IoTDisowned.ELEMENT, IoTDisowned.NAMESPACE, IQ.Type.set, Mode.sync) { + + @SuppressWarnings("ObjectToString") @Override public IQ handleIQRequest(IQ iqRequest) { if (!isRegistry(iqRequest.getFrom())) { diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/element/Range.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/element/Range.java index db64d0466..76dc197ce 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/element/Range.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/element/Range.java @@ -125,7 +125,10 @@ public class Range implements NamedElement { return false; } - return this.hashCode() == other.hashCode(); + Range otherRange = (Range) other; + return this.getOffset() == otherRange.getOffset() && + this.getLength() == otherRange.getLength() && + this.getHash().equals(otherRange.getHash()); } @Override diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/element/MamQueryIQ.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/element/MamQueryIQ.java index 04db9a4f3..9204ce79b 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/element/MamQueryIQ.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/element/MamQueryIQ.java @@ -92,7 +92,7 @@ public class MamQueryIQ extends IQ { if (field == null) { throw new IllegalArgumentException("If a data form is given it must posses a hidden form type field"); } - if (!field.getValues().get(0).equals(MamElements.NAMESPACE)) { + if (!field.getValues().get(0).toString().equals(MamElements.NAMESPACE)) { throw new IllegalArgumentException( "Value of the hidden form type field must be '" + MamElements.NAMESPACE + "'"); } diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/MamQueryIQProviderTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/MamQueryIQProviderTest.java index 2c62f988b..e1d70b581 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/MamQueryIQProviderTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/MamQueryIQProviderTest.java @@ -63,8 +63,8 @@ public class MamQueryIQProviderTest { List fields1 = dataForm1.getFields(); Assert.assertEquals(fields1.get(0).getType(), FormField.Type.hidden); Assert.assertEquals(fields1.get(1).getType(), FormField.Type.text_single); - Assert.assertEquals(fields1.get(1).getValues().get(0), "Where arth thou, my Juliet?"); - Assert.assertEquals(fields1.get(2).getValues().get(0), "{http://jabber.org/protocol/mood}mood/lonely"); + Assert.assertEquals(fields1.get(1).getValues().get(0).toString(), "Where arth thou, my Juliet?"); + Assert.assertEquals(fields1.get(2).getValues().get(0).toString(), "{http://jabber.org/protocol/mood}mood/lonely"); // example2 IQ iq2 = PacketParserUtils.parseStanza(exampleMamQueryIQ2); @@ -77,7 +77,7 @@ public class MamQueryIQProviderTest { Assert.assertEquals(dataForm2.getType(), DataForm.Type.form); List fields2 = dataForm2.getFields(); - Assert.assertEquals(fields2.get(0).getValues().get(0), "urn:xmpp:mam:1"); + Assert.assertEquals(fields2.get(0).getValues().get(0).toString(), "urn:xmpp:mam:1"); Assert.assertTrue(fields2.get(0).getValues().size() == 1); Assert.assertEquals(fields2.get(1).getType(), FormField.Type.jid_single); Assert.assertEquals(fields2.get(2).getType(), FormField.Type.text_single); diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/PagingTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/PagingTest.java index fcbf395f8..635dcecb2 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/PagingTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/PagingTest.java @@ -45,7 +45,7 @@ public class PagingTest extends MamTest { mamQueryIQ.addExtension(rsmSet); Assert.assertEquals(mamQueryIQ.getDataForm(), dataForm); - Assert.assertEquals(mamQueryIQ.getDataForm().getFields().get(0).getValues().get(0), "urn:xmpp:mam:1"); + Assert.assertEquals(mamQueryIQ.getDataForm().getFields().get(0).getValues().get(0).toString(), "urn:xmpp:mam:1"); Assert.assertEquals(mamQueryIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString(), pagingStanza); } diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManager.java index 8cd93ca10..63dbadf58 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManager.java @@ -490,7 +490,7 @@ public final class InBandBytestreamManager extends Manager implements Bytestream private static String getNextSessionID() { StringBuilder buffer = new StringBuilder(); buffer.append(SESSION_ID_PREFIX); - buffer.append(Math.abs(randomGenerator.nextLong())); + buffer.append(randomGenerator.nextInt(Integer.MAX_VALUE) + randomGenerator.nextInt(Integer.MAX_VALUE)); return buffer.toString(); } diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java index e45ed98f6..fdce8b3f4 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java @@ -732,7 +732,7 @@ public final class Socks5BytestreamManager extends Manager implements Bytestream private static String getNextSessionID() { StringBuilder buffer = new StringBuilder(); buffer.append(SESSION_ID_PREFIX); - buffer.append(Math.abs(randomGenerator.nextLong())); + buffer.append(randomGenerator.nextInt(Integer.MAX_VALUE) + randomGenerator.nextInt(Integer.MAX_VALUE)); return buffer.toString(); } diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/packet/Bytestream.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/packet/Bytestream.java index 3546f7d52..4cf6d2d7d 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/packet/Bytestream.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/packet/Bytestream.java @@ -269,9 +269,9 @@ public class Bytestream extends IQ { public static String ELEMENTNAME = "streamhost"; - private final Jid JID; + private final Jid jid; - private final String addy; + private final String address; private final int port; @@ -282,13 +282,13 @@ public class Bytestream extends IQ { /** * Default constructor. * - * @param JID The JID of the stream host. + * @param jid The JID of the stream host. * @param address The internet address of the stream host. * @param port port of the stream host. */ - public StreamHost(final Jid JID, final String address, int port) { - this.JID = Objects.requireNonNull(JID, "StreamHost JID must not be null"); - this.addy = StringUtils.requireNotNullNorEmpty(address, "StreamHost address must not be null"); + public StreamHost(final Jid jid, final String address, int port) { + this.jid = Objects.requireNonNull(jid, "StreamHost JID must not be null"); + this.address = StringUtils.requireNotNullNorEmpty(address, "StreamHost address must not be null"); this.port = port; } @@ -298,7 +298,7 @@ public class Bytestream extends IQ { * @return Returns the JID of the stream host. */ public Jid getJID() { - return JID; + return jid; } /** @@ -307,7 +307,7 @@ public class Bytestream extends IQ { * @return Returns the internet address of the stream host. */ public String getAddress() { - return addy; + return address; } /** @@ -349,15 +349,15 @@ public class Bytestream extends IQ { public static String ELEMENTNAME = "streamhost-used"; - private final Jid JID; + private final Jid jid; /** * Default constructor. * - * @param JID The JID of the selected stream host. + * @param jid The JID of the selected stream host. */ - public StreamHostUsed(final Jid JID) { - this.JID = JID; + public StreamHostUsed(final Jid jid) { + this.jid = jid; } /** @@ -366,7 +366,7 @@ public class Bytestream extends IQ { * @return Returns the JID of the selected stream host. */ public Jid getJID() { - return JID; + return jid; } @Override diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/provider/BytestreamsProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/provider/BytestreamsProvider.java index 510d5f7d8..b7400cad2 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/provider/BytestreamsProvider.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/provider/BytestreamsProvider.java @@ -89,7 +89,7 @@ public class BytestreamsProvider extends IQProvider { if (mode == null) { toReturn.setMode(Mode.tcp); } else { - toReturn.setMode((Bytestream.Mode.fromName(mode))); + toReturn.setMode(Bytestream.Mode.fromName(mode)); } toReturn.setSessionID(id); return toReturn; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverInfo.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverInfo.java index 0a073185c..1f02a0edb 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverInfo.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverInfo.java @@ -268,7 +268,7 @@ public class DiscoverInfo extends IQ implements TypedCloneable { * attributes. * */ - public static class Identity implements Comparable, TypedCloneable { + public static final class Identity implements Comparable, TypedCloneable { private final String category; private final String type; @@ -482,7 +482,7 @@ public class DiscoverInfo extends IQ implements TypedCloneable { * as well as specific feature types of interest, if any (e.g., for the purpose of feature * negotiation). */ - public static class Feature implements TypedCloneable { + public static final class Feature implements TypedCloneable { private final String variable; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiator.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiator.java index 301638645..1eeda099e 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiator.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiator.java @@ -260,7 +260,7 @@ public final class FileTransferNegotiator extends Manager { public static String getNextStreamID() { StringBuilder buffer = new StringBuilder(); buffer.append(STREAM_INIT_PREFIX); - buffer.append(Math.abs(randomGenerator.nextLong())); + buffer.append(randomGenerator.nextInt(Integer.MAX_VALUE) + randomGenerator.nextInt(Integer.MAX_VALUE)); return buffer.toString(); } @@ -342,10 +342,11 @@ public final class FileTransferNegotiator extends Manager { boolean isByteStream = false; boolean isIBB = false; for (CharSequence variable : field.getValues()) { - if (variable.equals(Bytestream.NAMESPACE) && !IBB_ONLY) { + String variableString = variable.toString(); + if (variableString.equals(Bytestream.NAMESPACE) && !IBB_ONLY) { isByteStream = true; } - else if (variable.equals(DataPacketExtension.NAMESPACE)) { + else if (variableString.equals(DataPacketExtension.NAMESPACE)) { isIBB = true; } } diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_ibb/element/JingleIBBTransport.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_ibb/element/JingleIBBTransport.java index 4901cb7dd..981b6d9cf 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_ibb/element/JingleIBBTransport.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_ibb/element/JingleIBBTransport.java @@ -81,7 +81,13 @@ public class JingleIBBTransport extends JingleContentTransport { return false; } - return this == other || this.hashCode() == other.hashCode(); + if (this == other) { + return true; + } + + JingleIBBTransport otherTransport = (JingleIBBTransport) other; + return this.getSessionId().equals(otherTransport.getSessionId()) && + this.getBlockSize() == otherTransport.getBlockSize(); } @Override diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubManager.java index 465ebeb3d..77895035f 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubManager.java @@ -216,7 +216,7 @@ public final class PubSubManager extends Manager { FormField nodeTypeField = config.getField(ConfigureNodeFields.node_type.getFieldName()); if (nodeTypeField != null) - isLeafNode = nodeTypeField.getValues().get(0).equals(NodeType.leaf.toString()); + isLeafNode = nodeTypeField.getValues().get(0).toString().equals(NodeType.leaf.toString()); } // Errors will cause exceptions in getReply, so it only returns diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/packet/VCard.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/packet/VCard.java index 34a95b1fc..014e7d366 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/packet/VCard.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/packet/VCard.java @@ -84,7 +84,7 @@ import org.jxmpp.jid.EntityBareJid; * * @author Kirill Maximov (kir@maxkir.com) */ -public class VCard extends IQ { +public final class VCard extends IQ { public static final String ELEMENT = "vCard"; public static final String NAMESPACE = "vcard-temp"; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/FormField.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/FormField.java index 323d8cc16..b14be2ca5 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/FormField.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/FormField.java @@ -480,7 +480,7 @@ public class FormField implements NamedElement { * * @author Gaston Dombiak */ - public static class Option implements NamedElement { + public static final class Option implements NamedElement { public static final String ELEMENT = "option"; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdatavalidation/packet/ValidateElement.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdatavalidation/packet/ValidateElement.java index d397c803d..188e163ad 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdatavalidation/packet/ValidateElement.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdatavalidation/packet/ValidateElement.java @@ -133,11 +133,11 @@ public abstract class ValidateElement implements ExtensionElement { /** * Basic validate element constructor. - * @param dataType + * @param datatype * @see #getDatatype() */ - public BasicValidateElement(String dataType) { - super(dataType); + public BasicValidateElement(String datatype) { + super(datatype); } @Override @@ -176,11 +176,11 @@ public abstract class ValidateElement implements ExtensionElement { /** * Open validate element constructor. - * @param dataType + * @param datatype * @see #getDatatype() */ - public OpenValidateElement(String dataType) { - super(dataType); + public OpenValidateElement(String datatype) { + super(datatype); } @Override @@ -218,14 +218,14 @@ public abstract class ValidateElement implements ExtensionElement { /** * Range validate element constructor. - * @param dataType + * @param datatype * @param min the minimum allowable value. This attribute is OPTIONAL. The value depends on the datatype in use. * @param max the maximum allowable value. This attribute is OPTIONAL. The value depends on the datatype in use. * @see #getDatatype() * */ - public RangeValidateElement(String dataType, String min, String max) { - super(dataType); + public RangeValidateElement(String datatype, String min, String max) { + super(datatype); this.min = min; this.max = max; } @@ -283,12 +283,12 @@ public abstract class ValidateElement implements ExtensionElement { /** * Regex validate element. - * @param dataType + * @param datatype * @param regex * @see #getDatatype() */ - public RegexValidateElement(String dataType, String regex) { - super(dataType); + public RegexValidateElement(String datatype, String regex) { + super(datatype); this.regex = regex; } diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/InitExtensions.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/InitExtensions.java index 04ffdf126..d4c6b0350 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/InitExtensions.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/InitExtensions.java @@ -22,7 +22,7 @@ import org.jivesoftware.smack.test.util.SmackTestSuite; public class InitExtensions extends SmackTestSuite { static { - (new ExtensionsInitializer()).initialize(); + new ExtensionsInitializer().initialize(); } } diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/message_correct/MessageCorrectExtensionTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/message_correct/MessageCorrectExtensionTest.java index 956748c70..2cb16327b 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/message_correct/MessageCorrectExtensionTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/message_correct/MessageCorrectExtensionTest.java @@ -42,11 +42,11 @@ public class MessageCorrectExtensionTest { Message initialMessage = PacketParserUtils.parseStanza(initialMessageXml); MessageCorrectExtension messageCorrectExtension = new MessageCorrectExtension(idInitialMessage); - Assert.assertEquals(messageCorrectExtension.toXML(null).toString(), messageCorrectionXml); + Assert.assertEquals(messageCorrectExtension.toXML(null).toString(), messageCorrectionXml.toString()); initialMessage.addExtension(messageCorrectExtension); - Assert.assertEquals(initialMessage.toXML(null), expectedXml); + Assert.assertEquals(initialMessage.toXML(null), expectedXml.toString()); } } diff --git a/smack-im/src/main/java/org/jivesoftware/smack/roster/packet/RosterPacket.java b/smack-im/src/main/java/org/jivesoftware/smack/roster/packet/RosterPacket.java index 64ba4f713..66ed9c6d7 100644 --- a/smack-im/src/main/java/org/jivesoftware/smack/roster/packet/RosterPacket.java +++ b/smack-im/src/main/java/org/jivesoftware/smack/roster/packet/RosterPacket.java @@ -39,7 +39,7 @@ import org.jxmpp.jid.BareJid; * @author Matt Tucker * @author Florian Schmaus */ -public class RosterPacket extends IQ { +public final class RosterPacket extends IQ { public static final String ELEMENT = QUERY_ELEMENT; public static final String NAMESPACE = "jabber:iq:roster"; @@ -110,7 +110,7 @@ public class RosterPacket extends IQ { * the groups the roster item belongs to. */ // TODO Make this class immutable. - public static class Item implements NamedElement { + public static final class Item implements NamedElement { /** * The constant value "{@value}". @@ -295,7 +295,7 @@ public class RosterPacket extends IQ { final int prime = 31; int result = 1; result = prime * result + ((groupNames == null) ? 0 : groupNames.hashCode()); - result = prime * result + ((subscriptionPending) ? 0 : 1); + result = prime * result + (subscriptionPending ? 0 : 1); result = prime * result + ((itemType == null) ? 0 : itemType.hashCode()); result = prime * result + ((name == null) ? 0 : name.hashCode()); result = prime * result + ((jid == null) ? 0 : jid.hashCode()); diff --git a/smack-im/src/test/java/org/jivesoftware/smack/im/InitSmackIm.java b/smack-im/src/test/java/org/jivesoftware/smack/im/InitSmackIm.java index 5bfa34031..073ebd0c5 100644 --- a/smack-im/src/test/java/org/jivesoftware/smack/im/InitSmackIm.java +++ b/smack-im/src/test/java/org/jivesoftware/smack/im/InitSmackIm.java @@ -19,7 +19,7 @@ package org.jivesoftware.smack.im; public class InitSmackIm { static { - (new SmackImInitializer()).initialize(); + new SmackImInitializer().initialize(); } } diff --git a/smack-im/src/test/java/org/jivesoftware/smack/roster/RosterVersioningTest.java b/smack-im/src/test/java/org/jivesoftware/smack/roster/RosterVersioningTest.java index aaf717122..5b086f33a 100644 --- a/smack-im/src/test/java/org/jivesoftware/smack/roster/RosterVersioningTest.java +++ b/smack-im/src/test/java/org/jivesoftware/smack/roster/RosterVersioningTest.java @@ -26,7 +26,7 @@ import java.io.IOException; import java.util.Collection; import java.util.HashSet; -import org.jivesoftware.smack.ConnectionConfiguration.Builder; +import org.jivesoftware.smack.ConnectionConfiguration; import org.jivesoftware.smack.DummyConnection; import org.jivesoftware.smack.SmackException; import org.jivesoftware.smack.XMPPException; @@ -71,7 +71,7 @@ public class RosterVersioningTest { DirectoryRosterStore store = DirectoryRosterStore.init(tmpFolder.newFolder("store")); populateStore(store); - Builder builder = DummyConnection.getDummyConfigurationBuilder(); + ConnectionConfiguration.Builder builder = DummyConnection.getDummyConfigurationBuilder(); connection = new DummyConnection(builder.build()); connection.connect(); connection.login(); @@ -175,6 +175,7 @@ public class RosterVersioningTest { /** * Test roster versioning with roster pushes. */ + @SuppressWarnings("UndefinedEquals") @Test(timeout = 5000) public void testRosterVersioningWithCachedRosterAndPushes() throws Throwable { answerWithEmptyRosterResult(); diff --git a/smack-integration-test/src/main/java/org/igniterealtime/smack/inttest/AbstractSmackIntTest.java b/smack-integration-test/src/main/java/org/igniterealtime/smack/inttest/AbstractSmackIntTest.java index 3d6017cf5..3e39ad2ce 100644 --- a/smack-integration-test/src/main/java/org/igniterealtime/smack/inttest/AbstractSmackIntTest.java +++ b/smack-integration-test/src/main/java/org/igniterealtime/smack/inttest/AbstractSmackIntTest.java @@ -66,6 +66,7 @@ public abstract class AbstractSmackIntTest { } } + @SuppressWarnings("ThreadPriorityCheck") protected void waitUntilTrue(Condition condition) throws TimeoutException, NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException { final long deadline = System.currentTimeMillis() + timeout; do { diff --git a/smack-integration-test/src/main/java/org/igniterealtime/smack/inttest/SmackIntegrationTestFramework.java b/smack-integration-test/src/main/java/org/igniterealtime/smack/inttest/SmackIntegrationTestFramework.java index 8634ef91f..d6cdfbd2c 100644 --- a/smack-integration-test/src/main/java/org/igniterealtime/smack/inttest/SmackIntegrationTestFramework.java +++ b/smack-integration-test/src/main/java/org/igniterealtime/smack/inttest/SmackIntegrationTestFramework.java @@ -51,7 +51,6 @@ import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smack.debugger.ConsoleDebugger; import org.jivesoftware.smack.tcp.XMPPTCPConnection; import org.jivesoftware.smack.tcp.XMPPTCPConnectionConfiguration; -import org.jivesoftware.smack.tcp.XMPPTCPConnectionConfiguration.Builder; import org.jivesoftware.smack.util.StringUtils; import org.jivesoftware.smackx.debugger.EnhancedDebugger; @@ -221,7 +220,7 @@ public class SmackIntegrationTestFramework { continue; } Class retClass = method.getReturnType(); - if (!(retClass.equals(Void.TYPE))) { + if (!retClass.equals(Void.TYPE)) { LOGGER.warning("SmackIntegrationTest annotation on method that does not return void"); continue; } @@ -560,7 +559,7 @@ public class SmackIntegrationTestFramework { accountPassword = StringUtils.insecureRandomString(16); } - Builder builder = getConnectionConfigurationBuilder(config); + XMPPTCPConnectionConfiguration.Builder builder = getConnectionConfigurationBuilder(config); builder.setUsernameAndPassword(accountUsername, accountPassword) .setResource(middlefix + '-' + testRunResult.testRunId); diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/xdata/FormTest.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/xdata/FormTest.java index 4c2f0aa17..ffd8af0a4 100644 --- a/smack-integration-test/src/main/java/org/jivesoftware/smackx/xdata/FormTest.java +++ b/smack-integration-test/src/main/java/org/jivesoftware/smackx/xdata/FormTest.java @@ -148,11 +148,11 @@ public class FormTest extends AbstractSmackIntegrationTest { assertNotNull(completedForm.getField("name")); assertNotNull(completedForm.getField("description")); assertEquals( - completedForm.getField("name").getValues().get(0), + completedForm.getField("name").getValues().get(0).toString(), "Credit card number invalid"); assertNotNull(completedForm.getField("time")); assertNotNull(completedForm.getField("age")); - assertEquals("The age is bad", "20", completedForm.getField("age").getValues().get(0)); + assertEquals("The age is bad", "20", completedForm.getField("age").getValues().get(0).toString()); } finally { diff --git a/smack-java7/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/Base64.java b/smack-java7/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/Base64.java index ee0f5eef1..058dc67cf 100644 --- a/smack-java7/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/Base64.java +++ b/smack-java7/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/Base64.java @@ -375,6 +375,7 @@ public final class Base64 * @return the destination array * @since 1.3 */ + @SuppressWarnings("UnnecessaryParentheses") private static byte[] encode3to4( byte[] source, int srcOffset, int numSigBytes, byte[] destination, int destOffset, int options ) @@ -600,6 +601,7 @@ public final class Base64 * @see Base64#DONT_BREAK_LINES * @since 2.0 */ + @SuppressWarnings("UnnecessaryParentheses") public static String encodeBytes( byte[] source, int off, int len, int options ) { // Isolate options @@ -727,6 +729,7 @@ public final class Base64 * @return the number of decoded bytes converted * @since 1.3 */ + @SuppressWarnings("UnnecessaryParentheses") private static int decode4to3( byte[] source, int srcOffset, byte[] destination, int destOffset, int options ) { byte[] DECODABET = getDecodabet( options ); diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/ContentNegotiator.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/ContentNegotiator.java index e35654722..797ce194c 100644 --- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/ContentNegotiator.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/ContentNegotiator.java @@ -230,12 +230,12 @@ public class ContentNegotiator extends JingleNegotiator { boolean result = true; MediaNegotiator mediaNeg = getMediaNegotiator(); - if ((mediaNeg == null) || (!mediaNeg.isFullyEstablished())) { + if ((mediaNeg == null) || !mediaNeg.isFullyEstablished()) { result = false; } TransportNegotiator transNeg = getTransportNegotiator(); - if ((transNeg == null) || (!transNeg.isFullyEstablished())) { + if ((transNeg == null) || !transNeg.isFullyEstablished()) { result = false; } diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSession.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSession.java index c7f7b2683..1b3ee5e41 100644 --- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSession.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSession.java @@ -62,7 +62,7 @@ import org.jxmpp.jid.Jid; * @author Alvaro Saurin * @author Jeff Williams */ -public class JingleSession extends JingleNegotiator implements MediaReceivedListener { +public final class JingleSession extends JingleNegotiator implements MediaReceivedListener { private static final Logger LOGGER = Logger.getLogger(JingleSession.class.getName()); @@ -235,7 +235,7 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList * Generate a unique session ID. */ protected static String generateSessionId() { - return String.valueOf(Math.abs(randomGenerator.nextLong())); + return String.valueOf(randomGenerator.nextInt(Integer.MAX_VALUE) + randomGenerator.nextInt(Integer.MAX_VALUE)); } /** @@ -478,7 +478,7 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList // The the packet. // CHECKSTYLE:OFF - if ((getConnection() != null) && (getConnection().isConnected())) + if ((getConnection() != null) && getConnection().isConnected()) getConnection().sendStanza(jout); // CHECKSTYLE:ON } diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/PayloadType.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/PayloadType.java index ef8f6a04b..c7dd7b8e0 100644 --- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/PayloadType.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/PayloadType.java @@ -172,7 +172,7 @@ public class PayloadType { if (obj == null) { return false; } - if (getClass() != obj.getClass()) { + if (!(obj instanceof PayloadType)) { return false; } final PayloadType other = (PayloadType) obj; @@ -244,7 +244,7 @@ public class PayloadType { /** * Audio payload type. */ - public static class Audio extends PayloadType { + public static final class Audio extends PayloadType { private int clockRate; diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/ScreenShareSession.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/ScreenShareSession.java index 93cb9cf09..4af4a56c3 100644 --- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/ScreenShareSession.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/ScreenShareSession.java @@ -78,7 +78,7 @@ public class ScreenShareSession extends JingleMediaSession { public void initialize() { JingleSession session = getJingleSession(); - if ((session != null) && (session.getInitiator().equals(session.getConnection().getUser()))) { + if (session != null && session.getInitiator().equals(session.getConnection().getUser())) { // If the initiator of the jingle session is us then we transmit a screen share. try { InetAddress remote = InetAddress.getByName(getRemote().getIp()); diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/BridgedResolver.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/BridgedResolver.java index 56b76c5ce..4181e0a2e 100644 --- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/BridgedResolver.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/BridgedResolver.java @@ -73,7 +73,7 @@ public class BridgedResolver extends TransportResolver { clearCandidates(); - sid = Math.abs(random.nextLong()); + sid = random.nextInt(Integer.MAX_VALUE); RTPBridge rtpBridge = RTPBridge.getRTPBridge(connection, String.valueOf(sid)); diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/ICECandidate.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/ICECandidate.java index f5f05b4d3..0e329ea05 100644 --- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/ICECandidate.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/ICECandidate.java @@ -30,7 +30,7 @@ import java.util.logging.Logger; * * @author Thiago Camargo */ -public class ICECandidate extends TransportCandidate implements Comparable { +public final class ICECandidate extends TransportCandidate implements Comparable { private static final Logger LOGGER = Logger.getLogger(ICECandidate.class.getName()); diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/ICEResolver.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/ICEResolver.java index b4ce0bd6b..d47970893 100644 --- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/ICEResolver.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/ICEResolver.java @@ -145,7 +145,7 @@ public class ICEResolver extends TransportResolver { LOGGER.log(Level.WARNING, "exeption", e1); } - TransportCandidate transportCandidate = new ICECandidate(candidate.getAddress().getInetAddress().getHostAddress(), 1, nicNum, String.valueOf(Math.abs(random.nextLong())), candidate.getPort(), "1", candidate.getPriority(), iceType); + TransportCandidate transportCandidate = new ICECandidate(candidate.getAddress().getInetAddress().getHostAddress(), 1, nicNum, String.valueOf(random.nextInt(Integer.MAX_VALUE)), candidate.getPort(), "1", candidate.getPriority(), iceType); transportCandidate.setLocalIp(candidate.getBase().getAddress().getInetAddress().getHostAddress()); transportCandidate.setPort(getFreePort()); try { @@ -186,16 +186,16 @@ public class ICEResolver extends TransportResolver { network = 0; } - sid = Math.abs(random.nextLong()); + sid = random.nextInt(Integer.MAX_VALUE); RTPBridge rtpBridge = RTPBridge.getRTPBridge(connection, String.valueOf(sid)); TransportCandidate localCandidate = new ICECandidate( - rtpBridge.getIp(), 1, network, String.valueOf(Math.abs(random.nextLong())), rtpBridge.getPortA(), "1", 0, ICECandidate.Type.relay); + rtpBridge.getIp(), 1, network, String.valueOf(random.nextInt(Integer.MAX_VALUE)), rtpBridge.getPortA(), "1", 0, ICECandidate.Type.relay); localCandidate.setLocalIp(localIp); TransportCandidate remoteCandidate = new ICECandidate( - rtpBridge.getIp(), 1, network, String.valueOf(Math.abs(random.nextLong())), rtpBridge.getPortB(), "1", 0, ICECandidate.Type.relay); + rtpBridge.getIp(), 1, network, String.valueOf(random.nextInt(Integer.MAX_VALUE)), rtpBridge.getPortB(), "1", 0, ICECandidate.Type.relay); remoteCandidate.setLocalIp(localIp); localCandidate.setSymmetric(remoteCandidate); @@ -260,7 +260,7 @@ public class ICEResolver extends TransportResolver { if (!found) { try { TransportCandidate publicCandidate = new ICECandidate( - publicIp, 1, 0, String.valueOf(Math.abs(random.nextLong())), getFreePort(), "1", 0, ICECandidate.Type.srflx); + publicIp, 1, 0, String.valueOf(random.nextInt(Integer.MAX_VALUE)), getFreePort(), "1", 0, ICECandidate.Type.srflx); publicCandidate.setLocalIp(InetAddress.getLocalHost().getHostAddress()); try { diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/RTPBridge.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/RTPBridge.java index 335cfd29b..e8d4ca9fc 100644 --- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/RTPBridge.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/RTPBridge.java @@ -447,7 +447,7 @@ public class RTPBridge extends IQ { DiscoverInfo discoInfo = disco.discoverInfo(connection.getXMPPServiceDomain()); for (DiscoverInfo.Identity identity : discoInfo.getIdentities()) { - if ((identity.getName() != null) && (identity.getName().startsWith("rtpbridge"))) { + if (identity.getName() != null && identity.getName().startsWith("rtpbridge")) { return true; } } diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TransportCandidate.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TransportCandidate.java index 529c21fc3..233bdec59 100644 --- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TransportCandidate.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TransportCandidate.java @@ -309,7 +309,7 @@ public abstract class TransportCandidate { if (obj == null) { return false; } - if (getClass() != obj.getClass()) { + if (!(obj instanceof TransportCandidate)) { return false; } final TransportCandidate other = (TransportCandidate) obj; @@ -447,7 +447,7 @@ public abstract class TransportCandidate { /** * Type-safe enum for the transportElement protocol. */ - public static class Protocol { + public static final class Protocol { public static final Protocol UDP = new Protocol("udp"); @@ -584,7 +584,7 @@ public abstract class TransportCandidate { if (obj == null) { return false; } - if (getClass() != obj.getClass()) { + if (!(obj instanceof Channel)) { return false; } final Channel other = (Channel) obj; diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TransportNegotiator.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TransportNegotiator.java index d249fcc2e..2df06e3c1 100644 --- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TransportNegotiator.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TransportNegotiator.java @@ -317,8 +317,8 @@ public abstract class TransportNegotiator extends JingleNegotiator { TransportCandidate bestRemote = getBestRemoteCandidate(); // State state = getState(); - if ((bestRemote != null) - && ((getNegotiatorState() == JingleNegotiatorState.PENDING))) { + if (bestRemote != null + && getNegotiatorState() == JingleNegotiatorState.PENDING) { // Accepting the remote candidate if (!acceptedRemoteCandidates.contains(bestRemote)) { Jingle jout = new Jingle(JingleActionEnum.CONTENT_ACCEPT); @@ -335,7 +335,7 @@ public abstract class TransportNegotiator extends JingleNegotiator { } acceptedRemoteCandidates.add(bestRemote); } - if ((isEstablished()) && (getNegotiatorState() == JingleNegotiatorState.PENDING)) { + if (isEstablished() && getNegotiatorState() == JingleNegotiatorState.PENDING) { setNegotiatorState(JingleNegotiatorState.SUCCEEDED); try { triggerTransportEstablished(getAcceptedLocalCandidate(), bestRemote); @@ -409,8 +409,8 @@ public abstract class TransportNegotiator extends JingleNegotiator { bestRemote = getBestRemoteCandidate(); // State state = getState(); - if ((bestRemote != null) - && ((getNegotiatorState() == JingleNegotiatorState.PENDING))) { + if (bestRemote != null + && getNegotiatorState() == JingleNegotiatorState.PENDING) { if (!acceptedRemoteCandidates.contains(bestRemote)) { Jingle jout = new Jingle(JingleActionEnum.CONTENT_ACCEPT); JingleContent content = parentNegotiator.getJingleContent(); diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentSession.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentSession.java index 1696c40f7..be441bc4f 100644 --- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentSession.java +++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentSession.java @@ -276,7 +276,7 @@ public class AgentSession { synchronized (this.metaData) { List oldVals = metaData.get(key); - if ((oldVals == null) || (!oldVals.get(0).equals(val))) { + if (oldVals == null || !oldVals.get(0).equals(val)) { oldVals.set(0, val); setStatus(presenceMode, maxChats); @@ -635,7 +635,7 @@ public class AgentSession { } public Iterator getQueues() { - return Collections.unmodifiableMap((new HashMap<>(queues))).values().iterator(); + return Collections.unmodifiableMap(new HashMap<>(queues)).values().iterator(); } public void addQueueUsersListener(QueueUsersListener listener) { @@ -703,7 +703,7 @@ public class AgentSession { private void fireOfferRequestEvent(OfferRequestProvider.OfferRequestPacket requestPacket) { Offer offer = new Offer(this.connection, this, requestPacket.getUserID(), requestPacket.getUserJID(), this.getWorkgroupJID(), - new Date((new Date()).getTime() + (requestPacket.getTimeout() * 1000)), + new Date(new Date().getTime() + (requestPacket.getTimeout() * 1000)), requestPacket.getSessionID(), requestPacket.getMetaData(), requestPacket.getContent()); synchronized (offerListeners) { diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/history/AgentChatHistory.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/history/AgentChatHistory.java index b80032cb7..dd2843aaf 100644 --- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/history/AgentChatHistory.java +++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/history/AgentChatHistory.java @@ -103,7 +103,7 @@ public class AgentChatHistory extends IQ { boolean done = false; while (!done) { int eventType = parser.next(); - if ((eventType == XmlPullParser.START_TAG) && ("chat-session".equals(parser.getName()))) { + if (eventType == XmlPullParser.START_TAG && "chat-session".equals(parser.getName())) { agentChatHistory.addChatSession(parseChatSetting(parser)); } @@ -126,24 +126,24 @@ public class AgentChatHistory extends IQ { while (!done) { int eventType = parser.next(); - if ((eventType == XmlPullParser.START_TAG) && ("date".equals(parser.getName()))) { + if (eventType == XmlPullParser.START_TAG && "date".equals(parser.getName())) { String dateStr = parser.nextText(); long l = Long.valueOf(dateStr).longValue(); date = new Date(l); } - else if ((eventType == XmlPullParser.START_TAG) && ("duration".equals(parser.getName()))) { + else if (eventType == XmlPullParser.START_TAG && "duration".equals(parser.getName())) { duration = Long.valueOf(parser.nextText()).longValue(); } - else if ((eventType == XmlPullParser.START_TAG) && ("visitorsName".equals(parser.getName()))) { + else if (eventType == XmlPullParser.START_TAG && "visitorsName".equals(parser.getName())) { visitorsName = parser.nextText(); } - else if ((eventType == XmlPullParser.START_TAG) && ("visitorsEmail".equals(parser.getName()))) { + else if (eventType == XmlPullParser.START_TAG && "visitorsEmail".equals(parser.getName())) { visitorsEmail = parser.nextText(); } - else if ((eventType == XmlPullParser.START_TAG) && ("sessionID".equals(parser.getName()))) { + else if (eventType == XmlPullParser.START_TAG && "sessionID".equals(parser.getName())) { sessionID = parser.nextText(); } - else if ((eventType == XmlPullParser.START_TAG) && ("question".equals(parser.getName()))) { + else if (eventType == XmlPullParser.START_TAG && "question".equals(parser.getName())) { question = parser.nextText(); } else if (eventType == XmlPullParser.END_TAG && "chat-session".equals(parser.getName())) { diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentStatusRequest.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentStatusRequest.java index 6432d3679..1884a239f 100644 --- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentStatusRequest.java +++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentStatusRequest.java @@ -127,7 +127,7 @@ public class AgentStatusRequest extends IQ { boolean done = false; while (!done) { int eventType = parser.next(); - if ((eventType == XmlPullParser.START_TAG) && ("agent".equals(parser.getName()))) { + if (eventType == XmlPullParser.START_TAG && "agent".equals(parser.getName())) { statusRequest.agents.add(parseAgent(parser)); } else if (eventType == XmlPullParser.END_TAG && @@ -146,7 +146,7 @@ public class AgentStatusRequest extends IQ { String name = null; while (!done) { int eventType = parser.next(); - if ((eventType == XmlPullParser.START_TAG) && ("name".equals(parser.getName()))) { + if (eventType == XmlPullParser.START_TAG && "name".equals(parser.getName())) { name = parser.nextText(); } else if (eventType == XmlPullParser.END_TAG && diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/MonitorPacket.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/MonitorPacket.java index 5f97da4e6..f9549261e 100644 --- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/MonitorPacket.java +++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/MonitorPacket.java @@ -86,7 +86,7 @@ public class MonitorPacket extends IQ { while (!done) { int eventType = parser.next(); - if ((eventType == XmlPullParser.START_TAG) && ("isMonitor".equals(parser.getName()))) { + if (eventType == XmlPullParser.START_TAG && "isMonitor".equals(parser.getName())) { String value = parser.nextText(); if ("false".equalsIgnoreCase(value)) { packet.setMonitor(false); diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OccupantsInfo.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OccupantsInfo.java index 15e8868a7..bbc8e35c4 100644 --- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OccupantsInfo.java +++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OccupantsInfo.java @@ -142,8 +142,8 @@ public class OccupantsInfo extends IQ { boolean done = false; while (!done) { int eventType = parser.next(); - if ((eventType == XmlPullParser.START_TAG) && - ("occupant".equals(parser.getName()))) { + if (eventType == XmlPullParser.START_TAG && + "occupant".equals(parser.getName())) { occupantsInfo.occupants.add(parseOccupantInfo(parser)); } else if (eventType == XmlPullParser.END_TAG && ELEMENT_NAME.equals(parser.getName())) { @@ -161,13 +161,13 @@ public class OccupantsInfo extends IQ { Date joined = null; while (!done) { int eventType = parser.next(); - if ((eventType == XmlPullParser.START_TAG) && ("jid".equals(parser.getName()))) { + if (eventType == XmlPullParser.START_TAG && "jid".equals(parser.getName())) { jid = parser.nextText(); - } else if ((eventType == XmlPullParser.START_TAG) && - ("nickname".equals(parser.getName()))) { + } else if (eventType == XmlPullParser.START_TAG && + "nickname".equals(parser.getName())) { nickname = parser.nextText(); - } else if ((eventType == XmlPullParser.START_TAG) && - ("joined".equals(parser.getName()))) { + } else if (eventType == XmlPullParser.START_TAG && + "joined".equals(parser.getName())) { try { synchronized (UTC_FORMAT) { joined = UTC_FORMAT.parse(parser.nextText()); diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueDetails.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueDetails.java index d8bdf8171..f94d13ee5 100644 --- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueDetails.java +++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueDetails.java @@ -168,8 +168,8 @@ public final class QueueDetails implements ExtensionElement { } eventType = parser.next(); - while ((eventType != XmlPullParser.END_TAG) - || (!"user".equals(parser.getName()))) { + while (eventType != XmlPullParser.END_TAG + || !"user".equals(parser.getName())) { if ("position".equals(parser.getName())) { position = Integer.parseInt(parser.nextText()); } diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueOverview.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueOverview.java index 36b612869..29e74156c 100644 --- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueOverview.java +++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueOverview.java @@ -133,8 +133,8 @@ public class QueueOverview implements ExtensionElement { SimpleDateFormat dateFormat = new SimpleDateFormat(DATE_FORMAT); eventType = parser.next(); - while ((eventType != XmlPullParser.END_TAG) - || (!ELEMENT_NAME.equals(parser.getName()))) { + while (eventType != XmlPullParser.END_TAG + || !ELEMENT_NAME.equals(parser.getName())) { if ("count".equals(parser.getName())) { queueOverview.setUserCount(Integer.parseInt(parser.nextText())); } @@ -143,7 +143,7 @@ public class QueueOverview implements ExtensionElement { } else if ("oldest".equals(parser.getName())) { try { - queueOverview.setOldestEntry((dateFormat.parse(parser.nextText()))); + queueOverview.setOldestEntry(dateFormat.parse(parser.nextText())); } catch (ParseException e) { throw new SmackException(e); } diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/ChatSettings.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/ChatSettings.java index 554ee5bcc..1b00d5cd7 100644 --- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/ChatSettings.java +++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/ChatSettings.java @@ -136,7 +136,7 @@ public class ChatSettings extends IQ { boolean done = false; while (!done) { int eventType = parser.next(); - if ((eventType == XmlPullParser.START_TAG) && ("chat-setting".equals(parser.getName()))) { + if (eventType == XmlPullParser.START_TAG && "chat-setting".equals(parser.getName())) { chatSettings.addSetting(parseChatSetting(parser)); } @@ -156,13 +156,13 @@ public class ChatSettings extends IQ { while (!done) { int eventType = parser.next(); - if ((eventType == XmlPullParser.START_TAG) && ("key".equals(parser.getName()))) { + if (eventType == XmlPullParser.START_TAG && "key".equals(parser.getName())) { key = parser.nextText(); } - else if ((eventType == XmlPullParser.START_TAG) && ("value".equals(parser.getName()))) { + else if (eventType == XmlPullParser.START_TAG && "value".equals(parser.getName())) { value = parser.nextText(); } - else if ((eventType == XmlPullParser.START_TAG) && ("type".equals(parser.getName()))) { + else if (eventType == XmlPullParser.START_TAG && "type".equals(parser.getName())) { type = Integer.parseInt(parser.nextText()); } else if (eventType == XmlPullParser.END_TAG && "chat-setting".equals(parser.getName())) { diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/GenericSettings.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/GenericSettings.java index 057b61e55..23aa55e8f 100644 --- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/GenericSettings.java +++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/GenericSettings.java @@ -88,7 +88,7 @@ public class GenericSettings extends IQ { while (!done) { int eventType = parser.next(); - if ((eventType == XmlPullParser.START_TAG) && ("entry".equals(parser.getName()))) { + if (eventType == XmlPullParser.START_TAG && "entry".equals(parser.getName())) { eventType = parser.next(); String name = parser.nextText(); eventType = parser.next(); diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/OfflineSettings.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/OfflineSettings.java index 9ab40b5f4..77e6ade6a 100644 --- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/OfflineSettings.java +++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/OfflineSettings.java @@ -118,16 +118,16 @@ public class OfflineSettings extends SimpleIQ { while (!done) { int eventType = parser.next(); - if ((eventType == XmlPullParser.START_TAG) && ("redirectPage".equals(parser.getName()))) { + if (eventType == XmlPullParser.START_TAG && "redirectPage".equals(parser.getName())) { redirectPage = parser.nextText(); } - else if ((eventType == XmlPullParser.START_TAG) && ("subject".equals(parser.getName()))) { + else if (eventType == XmlPullParser.START_TAG && "subject".equals(parser.getName())) { subject = parser.nextText(); } - else if ((eventType == XmlPullParser.START_TAG) && ("offlineText".equals(parser.getName()))) { + else if (eventType == XmlPullParser.START_TAG && "offlineText".equals(parser.getName())) { offlineText = parser.nextText(); } - else if ((eventType == XmlPullParser.START_TAG) && ("emailAddress".equals(parser.getName()))) { + else if (eventType == XmlPullParser.START_TAG && "emailAddress".equals(parser.getName())) { emailAddress = parser.nextText(); } else if (eventType == XmlPullParser.END_TAG && "offline-settings".equals(parser.getName())) { diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/SearchSettings.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/SearchSettings.java index 2f0534742..660d3c106 100644 --- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/SearchSettings.java +++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/SearchSettings.java @@ -87,10 +87,10 @@ public class SearchSettings extends SimpleIQ { while (!done) { int eventType = parser.next(); - if ((eventType == XmlPullParser.START_TAG) && ("forums".equals(parser.getName()))) { + if (eventType == XmlPullParser.START_TAG && "forums".equals(parser.getName())) { forums = parser.nextText(); } - else if ((eventType == XmlPullParser.START_TAG) && ("kb".equals(parser.getName()))) { + else if ((eventType == XmlPullParser.START_TAG) && "kb".equals(parser.getName())) { kb = parser.nextText(); } else if (eventType == XmlPullParser.END_TAG && "search-settings".equals(parser.getName())) { diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/SoundSettings.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/SoundSettings.java index 680df2d7d..0e113ac5e 100644 --- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/SoundSettings.java +++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/SoundSettings.java @@ -76,10 +76,10 @@ public class SoundSettings extends SimpleIQ { while (!done) { int eventType = parser.next(); - if ((eventType == XmlPullParser.START_TAG) && ("outgoingSound".equals(parser.getName()))) { + if (eventType == XmlPullParser.START_TAG && "outgoingSound".equals(parser.getName())) { soundSettings.setOutgoingSound(parser.nextText()); } - else if ((eventType == XmlPullParser.START_TAG) && ("incomingSound".equals(parser.getName()))) { + else if ((eventType == XmlPullParser.START_TAG) && "incomingSound".equals(parser.getName())) { soundSettings.setIncomingSound(parser.nextText()); } else if (eventType == XmlPullParser.END_TAG && "sound-settings".equals(parser.getName())) { diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/WorkgroupProperties.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/WorkgroupProperties.java index c3b07c674..6bd5802b5 100644 --- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/WorkgroupProperties.java +++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/WorkgroupProperties.java @@ -103,13 +103,13 @@ public class WorkgroupProperties extends IQ { while (!done) { int eventType = parser.next(); - if ((eventType == XmlPullParser.START_TAG) && ("authRequired".equals(parser.getName()))) { + if (eventType == XmlPullParser.START_TAG && "authRequired".equals(parser.getName())) { props.setAuthRequired(Boolean.valueOf(parser.nextText()).booleanValue()); } - else if ((eventType == XmlPullParser.START_TAG) && ("email".equals(parser.getName()))) { + else if (eventType == XmlPullParser.START_TAG && "email".equals(parser.getName())) { props.setEmail(parser.nextText()); } - else if ((eventType == XmlPullParser.START_TAG) && ("name".equals(parser.getName()))) { + else if (eventType == XmlPullParser.START_TAG && "name".equals(parser.getName())) { props.setFullName(parser.nextText()); } else if (eventType == XmlPullParser.END_TAG && "workgroup-properties".equals(parser.getName())) { diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/util/MetaDataUtils.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/util/MetaDataUtils.java index 514bf21e0..b17da1211 100644 --- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/util/MetaDataUtils.java +++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/util/MetaDataUtils.java @@ -58,7 +58,7 @@ public class MetaDataUtils { // Keep parsing until we've gotten to end of meta-data. while ((eventType != XmlPullParser.END_TAG) - || (!parser.getName().equals(MetaData.ELEMENT_NAME))) { + || !parser.getName().equals(MetaData.ELEMENT_NAME)) { String name = parser.getAttributeValue(0); String value = parser.nextText(); diff --git a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/util/OmemoKeyUtil.java b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/util/OmemoKeyUtil.java index ba045cc2e..8fa56f071 100644 --- a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/util/OmemoKeyUtil.java +++ b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/util/OmemoKeyUtil.java @@ -40,6 +40,7 @@ import org.jivesoftware.smackx.omemo.trust.OmemoFingerprint; * @param Bundle class * @author Paul Schaub */ +@SuppressWarnings("InconsistentCapitalization") public abstract class OmemoKeyUtil { private static final Logger LOGGER = Logger.getLogger(OmemoKeyUtil.class.getName()); diff --git a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/util/OmemoMessageBuilder.java b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/util/OmemoMessageBuilder.java index 152926c35..8d254f44c 100644 --- a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/util/OmemoMessageBuilder.java +++ b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/util/OmemoMessageBuilder.java @@ -172,7 +172,7 @@ public class OmemoMessageBuilder