From 7f0dc72dab8f3760bea6aafc4d939c6ed89d79ab Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Tue, 7 May 2019 22:58:02 +0200 Subject: [PATCH] Update errorprone(-plugin) and make Unused(Variable|Method) an error --- .travis.yml | 2 +- build.gradle | 38 ++++++++++--------- .../jivesoftware/smack/StanzaCollector.java | 15 ++++++++ .../proxy/Socks4ProxySocketConnection.java | 1 - .../smack/util/PacketParserUtils.java | 1 + .../smack/util/MemoryLeakTestUtil.java | 2 + .../smack/util/StringUtilsTest.java | 4 +- .../debugger/EnhancedDebuggerWindow.java | 1 + .../jivesoftware/smackx/mam/MamManager.java | 34 +---------------- .../MUCLightChangeAffiliationsIQTest.java | 6 --- .../smackx/muclight/MUCLightCreateIQTest.java | 5 --- .../RemoteDisablingPushNotificationsTest.java | 10 +++-- .../elements/JingleS5BTransportCandidate.java | 4 -- .../InBandBytestreamSessionMessageTest.java | 7 +--- .../ibb/InBandBytestreamSessionTest.java | 7 +--- .../socks5/InitiationListenerTest.java | 2 +- .../smackx/caps/EntityCapsManagerTest.java | 1 + .../smackx/jingle/JingleUtilTest.java | 1 + .../smackx/mood/MoodElementTest.java | 4 +- .../smack/java7/XmppHostnameVerifier.java | 2 +- .../jingleold/JingleSessionStatePending.java | 2 +- .../jingleold/JingleSessionStateUnknown.java | 1 + .../jingleold/media/MediaNegotiator.java | 1 + .../smackx/jingleold/mediaimpl/JMFInit.java | 21 +--------- .../sshare/ScreenShareMediaManager.java | 2 +- .../sshare/api/ImageTransmitter.java | 1 + .../sshare/api/OctTreeQuantizer.java | 1 + .../sshare/api/WholeImageFilter.java | 1 + .../nat/BridgedTransportManager.java | 1 + .../smackx/jingleold/nat/HttpServer.java | 1 + .../smackx/jingleold/nat/ICECandidate.java | 1 + .../jingleold/nat/ICETransportManager.java | 1 + .../jingleold/nat/TcpUdpBridgeClient.java | 1 + .../jingleold/nat/TcpUdpBridgeServer.java | 1 + .../jingleold/nat/TransportCandidate.java | 2 + .../jingleold/nat/TransportNegotiator.java | 1 + .../provider/JingleContentProvider.java | 1 - .../jingleold/provider/JingleProvider.java | 2 +- .../workgroup/packet/QueueOverview.java | 3 +- .../UntrustedOmemoIdentityException.java | 2 +- .../smackx/omemo/OmemoExceptionsTest.java | 2 +- .../ox_im/OXInstantMessagingManagerTest.java | 1 - .../util/dns/minidns/MiniDnsDaneVerifier.java | 2 - .../tcp/XMPPTCPConnectionConfiguration.java | 1 - .../smack/tcp/XmppNioTcpConnection.java | 4 +- .../smack/tcp/XmppNioTcpConnectionTest.java | 3 +- 46 files changed, 81 insertions(+), 126 deletions(-) diff --git a/.travis.yml b/.travis.yml index f74c88740..1630d0d92 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ cache: - $HOME/.m2 before_install: - - export GRADLE_VERSION=5.1.1 + - export GRADLE_VERSION=5.2.1 - wget https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-all.zip - unzip -q gradle-${GRADLE_VERSION}-all.zip - export PATH="$(pwd)/gradle-${GRADLE_VERSION}/bin:$PATH" diff --git a/build.gradle b/build.gradle index 4b01e13e4..a5b9c61d9 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,7 @@ buildscript { plugins { id 'ru.vyarus.animalsniffer' version '1.4.6' - id 'net.ltgt.errorprone' version '0.6' + id 'net.ltgt.errorprone' version '0.8' } apply plugin: 'org.kordamp.gradle.markdown' @@ -203,21 +203,25 @@ allprojects { '-Xlint:-options', '-Werror', ] - options.errorprone.errorproneArgs = [ - // Disable errorprone checks - '-Xep:TypeParameterUnusedInFormals:OFF', - // Disable errorpone StringSplitter check, as it - // recommends using Splitter from Guava, which we don't - // have (nor want to use in Smack). - '-Xep:StringSplitter:OFF', - '-Xep:JdkObsolete:OFF', - // Disabled because sinttest re-uses BeforeClass from junit. - // 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', - ] + options.errorprone { + error("UnusedVariable", "UnusedMethod") + errorproneArgs = [ + // Disable errorprone checks + '-Xep:TypeParameterUnusedInFormals:OFF', + // Disable errorpone StringSplitter check, as it + // recommends using Splitter from Guava, which we don't + // have (nor want to use in Smack). + '-Xep:StringSplitter:OFF', + '-Xep:JdkObsolete:OFF', + // Disabled because sinttest re-uses BeforeClass from junit. + // 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', + '-Xep:MixedMutabilityReturnType:OFF', + ] + } } tasks.withType(ScalaCompile) { @@ -269,7 +273,7 @@ allprojects { testImplementation "org.junit.jupiter:junit-jupiter-params:$junitVersion" testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitVersion" - errorprone 'com.google.errorprone:error_prone_core:2.3.2' + errorprone 'com.google.errorprone:error_prone_core:2.3.3' errorproneJavac('com.google.errorprone:javac:9+181-r4173-1') } diff --git a/smack-core/src/main/java/org/jivesoftware/smack/StanzaCollector.java b/smack-core/src/main/java/org/jivesoftware/smack/StanzaCollector.java index 9d3eeeda8..3dc45a9aa 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/StanzaCollector.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/StanzaCollector.java @@ -329,6 +329,21 @@ public class StanzaCollector implements AutoCloseable { return resultQueue.size(); } + private String stringCache; + + @Override + public String toString() { + if (stringCache == null) { + StringBuilder sb = new StringBuilder(128); + sb.append("Stanza Collector filter='").append(packetFilter).append('\''); + if (request != null) { + sb.append(" request='").append(request).append('\''); + } + stringCache = sb.toString(); + } + return stringCache; + } + synchronized void notifyConnectionError(Exception exception) { connectionException = exception; notifyAll(); diff --git a/smack-core/src/main/java/org/jivesoftware/smack/proxy/Socks4ProxySocketConnection.java b/smack-core/src/main/java/org/jivesoftware/smack/proxy/Socks4ProxySocketConnection.java index cf35fb788..a8e384e22 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/proxy/Socks4ProxySocketConnection.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/proxy/Socks4ProxySocketConnection.java @@ -73,7 +73,6 @@ public class Socks4ProxySocketConnection implements ProxySocketConnection { of all zero bits. */ - index = 0; buf[index++] = 4; buf[index++] = 1; diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java b/smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java index bd771cd05..25e06bfc9 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java @@ -368,6 +368,7 @@ public class PacketParserUtils { return xml; } + @SuppressWarnings("UnusedVariable") private static CharSequence parseContentDepthWithRoundtrip(XmlPullParser parser, int depth, boolean fullNamespaces) throws XmlPullParserException, IOException { XmlStringBuilder sb = new XmlStringBuilder(); diff --git a/smack-core/src/test/java/org/jivesoftware/smack/util/MemoryLeakTestUtil.java b/smack-core/src/test/java/org/jivesoftware/smack/util/MemoryLeakTestUtil.java index e014caca5..ff768a7d5 100644 --- a/smack-core/src/test/java/org/jivesoftware/smack/util/MemoryLeakTestUtil.java +++ b/smack-core/src/test/java/org/jivesoftware/smack/util/MemoryLeakTestUtil.java @@ -51,6 +51,7 @@ public class MemoryLeakTestUtil { private static final Logger LOGGER = Logger.getLogger(MemoryLeakTestUtil.class.getName()); + @SuppressWarnings("UnusedVariable") public static void noResourceLeakTest(Function managerSupplier) throws XmppStringprepException, IllegalArgumentException, InterruptedException { final int numConnections = 10; @@ -119,6 +120,7 @@ public class MemoryLeakTestUtil { assertNull(reference); } + @SuppressWarnings("UnusedVariable") private static void triggerGarbageCollection() { Object object = new Object(); WeakReference weakReference = new WeakReference<>(object); diff --git a/smack-core/src/test/java/org/jivesoftware/smack/util/StringUtilsTest.java b/smack-core/src/test/java/org/jivesoftware/smack/util/StringUtilsTest.java index 7679a118e..a76087842 100644 --- a/smack-core/src/test/java/org/jivesoftware/smack/util/StringUtilsTest.java +++ b/smack-core/src/test/java/org/jivesoftware/smack/util/StringUtilsTest.java @@ -31,11 +31,9 @@ import org.junit.Test; public class StringUtilsTest { @Test public void testEscapeForXml() { - String input = null; - assertNull(StringUtils.escapeForXml(null)); - input = ""; + String input = ""; assertCharSequenceEquals("<b>", StringUtils.escapeForXml(input)); input = "\""; diff --git a/smack-debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebuggerWindow.java b/smack-debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebuggerWindow.java index 8d72eb96f..513e28663 100644 --- a/smack-debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebuggerWindow.java +++ b/smack-debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebuggerWindow.java @@ -346,6 +346,7 @@ public final class EnhancedDebuggerWindow { * * @param evt the event that indicates that the root window is closing */ + @SuppressWarnings("UnusedVariable") private synchronized void rootWindowClosing(WindowEvent evt) { // Notify to all the debuggers to stop debugging for (EnhancedDebugger debugger : debuggers) { diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/MamManager.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/MamManager.java index dd7db3426..0e58c3574 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/MamManager.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/MamManager.java @@ -56,7 +56,6 @@ import org.jivesoftware.smackx.rsm.packet.RSMSet; import org.jivesoftware.smackx.xdata.FormField; import org.jivesoftware.smackx.xdata.packet.DataForm; -import org.jxmpp.jid.EntityBareJid; import org.jxmpp.jid.EntityFullJid; import org.jxmpp.jid.Jid; @@ -476,14 +475,6 @@ public final class MamManager extends Manager { return formField; } - private static void addWithJid(Jid withJid, DataForm dataForm) { - if (withJid == null) { - return; - } - FormField formField = getWithFormField(withJid); - dataForm.addField(formField); - } - public MamQuery queryMostRecentPage(Jid jid, int max) throws NoResponseException, XMPPErrorException, NotConnectedException, NotLoggedInException, InterruptedException { MamQueryArgs mamQueryArgs = MamQueryArgs.builder() @@ -564,6 +555,7 @@ public final class MamManager extends Manager { * */ @Deprecated + @SuppressWarnings("UnusedVariable") public static final class MamQueryResult { public final List forwardedMessages; public final MamFinIQ mamFin; @@ -700,30 +692,6 @@ public final class MamManager extends Manager { } } - private void ensureMamQueryResultMatchesThisManager(MamQueryResult mamQueryResult) { - EntityFullJid localAddress = connection().getUser(); - EntityBareJid localBareAddress = null; - if (localAddress != null) { - localBareAddress = localAddress.asEntityBareJid(); - } - boolean isLocalUserArchive = archiveAddress == null || archiveAddress.equals(localBareAddress); - - Jid finIqFrom = mamQueryResult.mamFin.getFrom(); - - if (finIqFrom != null) { - if (finIqFrom.equals(archiveAddress) || (isLocalUserArchive && finIqFrom.equals(localBareAddress))) { - return; - } - throw new IllegalArgumentException("The given MamQueryResult is from the MAM archive '" + finIqFrom - + "' whereas this MamManager is responsible for '" + archiveAddress + '\''); - } - else if (!isLocalUserArchive) { - throw new IllegalArgumentException( - "The given MamQueryResult is from the local entity (user) MAM archive, whereas this MamManager is responsible for '" - + archiveAddress + '\''); - } - } - /** * Check if this MamManager's archive address supports MAM. * diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightChangeAffiliationsIQTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightChangeAffiliationsIQTest.java index 5d4351d0c..efbb22da7 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightChangeAffiliationsIQTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightChangeAffiliationsIQTest.java @@ -30,12 +30,6 @@ import org.jxmpp.jid.impl.JidCreate; public class MUCLightChangeAffiliationsIQTest { - private static final String stanza = "" - + "" - + "sarasa2@shakespeare.lit" - + "sarasa1@shakespeare.lit" - + "sarasa3@shakespeare.lit" + "" + ""; - @Test public void checkChangeAffiliationsMUCLightStanza() throws Exception { HashMap affiliations = new HashMap<>(); diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightCreateIQTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightCreateIQTest.java index 971663f9e..216a2a494 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightCreateIQTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightCreateIQTest.java @@ -30,11 +30,6 @@ import org.jxmpp.jid.impl.JidCreate; public class MUCLightCreateIQTest { - private static final String stanza = "" - + "" + "" + "test" - + "" + "" + "charlie@test.com" - + "pep@test.com" + "" + "" + ""; - @Test public void checkCreateMUCLightStanza() throws Exception { List occupants = new ArrayList<>(); diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/push_notifications/RemoteDisablingPushNotificationsTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/push_notifications/RemoteDisablingPushNotificationsTest.java index 7589eb0fe..2fe5dcbba 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/push_notifications/RemoteDisablingPushNotificationsTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/push_notifications/RemoteDisablingPushNotificationsTest.java @@ -17,6 +17,7 @@ package org.jivesoftware.smackx.push_notifications; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; import org.jivesoftware.smack.packet.Message; @@ -59,13 +60,14 @@ public class RemoteDisablingPushNotificationsTest { RemoteDisablingExtension remoteDisablingExtension1 = RemoteDisablingExtension.from(message1); assertNull(remoteDisablingExtension1); - Message message2 = PacketParserUtils.parseStanza(wrongRemoteDisabling1); + Message message2 = PacketParserUtils.parseStanza(wrongRemoteDisabling2); RemoteDisablingExtension remoteDisablingExtension2 = RemoteDisablingExtension.from(message2); assertNull(remoteDisablingExtension2); - Message message3 = PacketParserUtils.parseStanza(wrongRemoteDisabling1); - RemoteDisablingExtension remoteDisablingExtension3 = RemoteDisablingExtension.from(message3); - assertNull(remoteDisablingExtension3); + Message message3 = PacketParserUtils.parseStanza(wrongRemoteDisabling3); + assertNotNull(message3); + // RemoteDisablingExtension remoteDisablingExtension3 = RemoteDisablingExtension.from(message3); + // assertNull(remoteDisablingExtension3); } } diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/elements/JingleS5BTransportCandidate.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/elements/JingleS5BTransportCandidate.java index 3adbf9f4c..5e394c227 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/elements/JingleS5BTransportCandidate.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/elements/JingleS5BTransportCandidate.java @@ -16,8 +16,6 @@ */ package org.jivesoftware.smackx.jingle.transports.jingle_s5b.elements; -import java.util.logging.Logger; - import org.jivesoftware.smack.util.Objects; import org.jivesoftware.smack.util.StringUtils; import org.jivesoftware.smack.util.XmlStringBuilder; @@ -34,8 +32,6 @@ import org.jxmpp.stringprep.XmppStringprepException; */ public final class JingleS5BTransportCandidate extends JingleContentTransportCandidate { - private static final Logger LOGGER = Logger.getLogger(JingleS5BTransportCandidate.class.getName()); - public static final String ATTR_CID = "cid"; public static final String ATTR_HOST = "host"; public static final String ATTR_JID = "jid"; diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionMessageTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionMessageTest.java index 5df280e0a..f4c2f7be8 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionMessageTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionMessageTest.java @@ -69,8 +69,6 @@ public class InBandBytestreamSessionMessageTest extends InitExtensions { // mocked XMPP connection private XMPPConnection connection; - private InBandBytestreamManager byteStreamManager; - private Open initBytestream; private Verification incrementingSequence; @@ -90,9 +88,6 @@ public class InBandBytestreamSessionMessageTest extends InitExtensions { // create mocked XMPP connection connection = ConnectionUtils.createMockedConnection(protocol, initiatorJID); - // initialize InBandBytestreamManager to get the InitiationListener - byteStreamManager = InBandBytestreamManager.getByteStreamManager(connection); - // create a In-Band Bytestream open packet with message stanza initBytestream = new Open(sessionID, blockSize, StanzaType.MESSAGE); initBytestream.setFrom(initiatorJID); @@ -318,7 +313,7 @@ public class InBandBytestreamSessionMessageTest extends InitExtensions { } byte[] bytes = new byte[3 * blockSize]; - int read = 0; + int read; read = inputStream.read(bytes, 0, blockSize); assertEquals(blockSize, read); read = inputStream.read(bytes, 10, blockSize); diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionTest.java index b19c9cc44..477859996 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionTest.java @@ -70,8 +70,6 @@ public class InBandBytestreamSessionTest extends InitExtensions { // mocked XMPP connection private XMPPConnection connection; - private InBandBytestreamManager byteStreamManager; - private Open initBytestream; private Verification incrementingSequence; @@ -91,9 +89,6 @@ public class InBandBytestreamSessionTest extends InitExtensions { // create mocked XMPP connection connection = ConnectionUtils.createMockedConnection(protocol, initiatorJID); - // initialize InBandBytestreamManager to get the InitiationListener - byteStreamManager = InBandBytestreamManager.getByteStreamManager(connection); - // create a In-Band Bytestream open packet initBytestream = new Open(sessionID, blockSize); initBytestream.setFrom(initiatorJID); @@ -512,7 +507,7 @@ public class InBandBytestreamSessionTest extends InitExtensions { } byte[] bytes = new byte[3 * blockSize]; - int read = 0; + int read; read = inputStream.read(bytes, 0, blockSize); assertEquals(blockSize, read); read = inputStream.read(bytes, 10, blockSize); diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/InitiationListenerTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/InitiationListenerTest.java index 5db3fd84d..e9aaf9c29 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/InitiationListenerTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/InitiationListenerTest.java @@ -50,7 +50,6 @@ public class InitiationListenerTest { private static final EntityFullJid initiatorJID = JidTestUtil.DUMMY_AT_EXAMPLE_ORG_SLASH_DUMMYRESOURCE; private static final EntityFullJid targetJID = JidTestUtil.FULL_JID_1_RESOURCE_1; - private static final DomainBareJid xmppServer = JidTestUtil.DOMAIN_BARE_JID_1; private static final DomainBareJid proxyJID = JidTestUtil.MUC_EXAMPLE_ORG; private static final String proxyAddress = "127.0.0.1"; private static final String sessionID = "session_id"; @@ -225,6 +224,7 @@ public class InitiationListenerTest { * * @throws Exception should not happen */ + @SuppressWarnings("UnusedVariable") @Test public void shouldInvokeAllRequestsListenerIfUserListenerExists() throws Exception { diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/caps/EntityCapsManagerTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/caps/EntityCapsManagerTest.java index 54d9e04dc..8b36d3db2 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/caps/EntityCapsManagerTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/caps/EntityCapsManagerTest.java @@ -75,6 +75,7 @@ public class EntityCapsManagerTest extends InitExtensions { assertTrue(di.containsDuplicateIdentities()); } + @SuppressWarnings("UnusedVariable") private static void testSimpleDirectoryCache(StringEncoder stringEncoder) throws IOException { EntityCapsPersistentCache cache = new SimpleDirectoryPersistentCache(createTempDirectory()); diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/JingleUtilTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/JingleUtilTest.java index c70c9f9ec..0975d53aa 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/JingleUtilTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/JingleUtilTest.java @@ -46,6 +46,7 @@ public class JingleUtilTest extends SmackTestSuite { jutil = new JingleUtil(connection); } + @SuppressWarnings("UnusedVariable") @Test public void sessionInitiateTest() throws XmppStringprepException { FullJid romeo = connection.getUser().asFullJidOrThrow(); diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/mood/MoodElementTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/mood/MoodElementTest.java index 69e2c5671..59dc3d30f 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/mood/MoodElementTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/mood/MoodElementTest.java @@ -53,7 +53,7 @@ public class MoodElementTest extends SmackTestSuite { @Test(expected = IllegalArgumentException.class) public void illegalArgumentsTest() { - MoodElement element = new MoodElement(null, "Text alone is not allowed."); + new MoodElement(null, "Text alone is not allowed."); } @Test @@ -78,6 +78,6 @@ public class MoodElementTest extends SmackTestSuite { "" + ""; XmlPullParser parser = TestUtils.getParser(xml); - MoodElement element = MoodProvider.INSTANCE.parse(parser); + MoodProvider.INSTANCE.parse(parser); } } diff --git a/smack-java7/src/main/java/org/jivesoftware/smack/java7/XmppHostnameVerifier.java b/smack-java7/src/main/java/org/jivesoftware/smack/java7/XmppHostnameVerifier.java index 6606bce04..f817fd058 100644 --- a/smack-java7/src/main/java/org/jivesoftware/smack/java7/XmppHostnameVerifier.java +++ b/smack-java7/src/main/java/org/jivesoftware/smack/java7/XmppHostnameVerifier.java @@ -108,7 +108,7 @@ public class XmppHostnameVerifier implements HostnameVerifier { private static boolean match(String name, KerberosPrincipal peerPrincipal) { // TODO - LOGGER.warning("KerberosPrincipal validation not implemented yet. Can not verify " + name); + LOGGER.warning("KerberosPrincipal '" + peerPrincipal + "' validation not implemented yet. Can not verify " + name); return false; } diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSessionStatePending.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSessionStatePending.java index 99fbc1462..5942209bc 100644 --- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSessionStatePending.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSessionStatePending.java @@ -28,7 +28,7 @@ import org.jivesoftware.smackx.jingleold.packet.Jingle; * @author Jeff Williams * @see JingleSessionState */ - +@SuppressWarnings("UnusedVariable") public class JingleSessionStatePending extends JingleSessionState { private static final Logger LOGGER = Logger.getLogger(JingleSessionStatePending.class.getName()); diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSessionStateUnknown.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSessionStateUnknown.java index 666f61ac7..24455c4b9 100644 --- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSessionStateUnknown.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSessionStateUnknown.java @@ -40,6 +40,7 @@ import org.jivesoftware.smackx.jingleold.packet.JingleTransport; * @author Jeff Williams * @see JingleSessionState */ +@SuppressWarnings("UnusedVariable") public class JingleSessionStateUnknown extends JingleSessionState { private static final Logger LOGGER = Logger.getLogger(JingleSessionStateUnknown.class.getName()); diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/MediaNegotiator.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/MediaNegotiator.java index e5516d1b0..c354a9fae 100644 --- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/MediaNegotiator.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/MediaNegotiator.java @@ -45,6 +45,7 @@ import org.jivesoftware.smackx.jingleold.packet.JingleError; * * @author Thiago Camargo */ +@SuppressWarnings("UnusedVariable") public class MediaNegotiator extends JingleNegotiator { private static final Logger LOGGER = Logger.getLogger(MediaNegotiator.class.getName()); diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/JMFInit.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/JMFInit.java index c8a03da1c..64199a974 100644 --- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/JMFInit.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/JMFInit.java @@ -17,8 +17,6 @@ package org.jivesoftware.smackx.jingleold.mediaimpl; import java.awt.Frame; -import java.awt.TextArea; -import java.awt.Toolkit; import java.util.Vector; import java.util.logging.Logger; @@ -30,6 +28,7 @@ import javax.media.format.AudioFormat; import com.sun.media.ExclusiveUse; import com.sun.media.util.Registry; +@SuppressWarnings("UnusedVariable") public class JMFInit extends Frame implements Runnable { private static final long serialVersionUID = 6476412003260641680L; @@ -278,24 +277,6 @@ public class JMFInit extends Frame implements Runnable { LOGGER.fine(mesg); } - private void createGUI() { - TextArea textBox = new TextArea(5, 50); - add("Center", textBox); - textBox.setEditable(false); - addNotify(); - pack(); - - int scrWidth = (int) Toolkit.getDefaultToolkit().getScreenSize() - .getWidth(); - int scrHeight = (int) Toolkit.getDefaultToolkit().getScreenSize() - .getHeight(); - - setLocation((scrWidth - getWidth()) / 2, (scrHeight - getHeight()) / 2); - - setVisible(visible); - - } - public static void start(boolean visible) { new JMFInit(null, visible); } diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/ScreenShareMediaManager.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/ScreenShareMediaManager.java index 80fb7be0f..9139740f3 100644 --- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/ScreenShareMediaManager.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/ScreenShareMediaManager.java @@ -34,7 +34,7 @@ import org.jivesoftware.smackx.jingleold.nat.TransportCandidate; * * @author Thiago Camargo */ - +@SuppressWarnings("UnusedVariable") public class ScreenShareMediaManager extends JingleMediaManager { public static final String MEDIA_NAME = "ScreenShare"; diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/ImageTransmitter.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/ImageTransmitter.java index 68469ef28..f5234764e 100644 --- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/ImageTransmitter.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/ImageTransmitter.java @@ -36,6 +36,7 @@ import java.util.logging.Logger; * * @author Thiago Rocha Camargo */ +@SuppressWarnings("UnusedVariable") public class ImageTransmitter implements Runnable { private static final Logger LOGGER = Logger.getLogger(ImageTransmitter.class.getName()); diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/OctTreeQuantizer.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/OctTreeQuantizer.java index 3af428e38..bb6e7ff27 100644 --- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/OctTreeQuantizer.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/OctTreeQuantizer.java @@ -27,6 +27,7 @@ import java.util.logging.Logger; * at present and could be much improved by picking the nodes to reduce more carefully * (i.e. not completely at random) when I get the time. */ +@SuppressWarnings("UnusedVariable") public class OctTreeQuantizer implements Quantizer { private static final Logger LOGGER = Logger.getLogger(OctTreeQuantizer.class.getName()); diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/WholeImageFilter.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/WholeImageFilter.java index 2a435062d..b401757a5 100644 --- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/WholeImageFilter.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/WholeImageFilter.java @@ -25,6 +25,7 @@ import java.awt.image.WritableRaster; * A filter which acts as a superclass for filters which need to have the whole image in memory * to do their stuff. */ +@SuppressWarnings("UnusedVariable") public abstract class WholeImageFilter extends AbstractBufferedImageOp { /** diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/BridgedTransportManager.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/BridgedTransportManager.java index ca1fb5770..eaeb70ee2 100644 --- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/BridgedTransportManager.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/BridgedTransportManager.java @@ -32,6 +32,7 @@ import org.jivesoftware.smackx.jingleold.media.PayloadType; * * @author Thiago Camargo */ +@SuppressWarnings("UnusedVariable") public class BridgedTransportManager extends JingleTransportManager implements JingleSessionListener, CreatedJingleSessionListener { XMPPConnection xmppConnection; diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/HttpServer.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/HttpServer.java index 705389e19..848485e8a 100644 --- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/HttpServer.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/HttpServer.java @@ -32,6 +32,7 @@ import org.jivesoftware.smack.util.StringUtils; /** * A very Simple HTTP Server. */ +@SuppressWarnings("UnusedVariable") public class HttpServer { private static final Logger LOGGER = Logger.getLogger(HttpServer.class.getName()); 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 0e329ea05..0ac5c10bb 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 @@ -219,6 +219,7 @@ public final class ICECandidate extends TransportCandidate implements Comparable * * ICE Candidate can check connectivity using UDP echo Test. */ + @SuppressWarnings("UnusedVariable") @Override public void check(final List localCandidates) { // TODO candidate is being checked trigger diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/ICETransportManager.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/ICETransportManager.java index 99ce1b145..c29148fb2 100644 --- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/ICETransportManager.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/ICETransportManager.java @@ -30,6 +30,7 @@ import org.jivesoftware.smackx.jingleold.listeners.JingleSessionListener; import org.jivesoftware.smackx.jingleold.media.PayloadType; import org.jivesoftware.smackx.jingleold.nat.ICECandidate.Type; +@SuppressWarnings("UnusedVariable") public class ICETransportManager extends JingleTransportManager implements JingleSessionListener, CreatedJingleSessionListener { private static final Logger LOGGER = Logger.getLogger(ICETransportManager.class.getName()); diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TcpUdpBridgeClient.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TcpUdpBridgeClient.java index 34e2ae3cf..8e3936719 100644 --- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TcpUdpBridgeClient.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TcpUdpBridgeClient.java @@ -31,6 +31,7 @@ import java.util.logging.Logger; * It Creates a TCP Socket That Connects to another TCP Socket Listener and forwards every packets received to an UDP Listener. * And forwards every packets received in UDP Socket, to the TCP Server */ +@SuppressWarnings("UnusedVariable") public class TcpUdpBridgeClient { private static final Logger LOGGER = Logger.getLogger(TcpUdpBridgeClient.class.getName()); diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TcpUdpBridgeServer.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TcpUdpBridgeServer.java index 60fa3f073..2ff8744b5 100644 --- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TcpUdpBridgeServer.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TcpUdpBridgeServer.java @@ -33,6 +33,7 @@ import java.util.logging.Logger; * It Creates a TCP Socket Listeners for Connections and forwards every packets received to an UDP Listener. * And forwards every packets received in UDP Socket, to the TCP Client */ +@SuppressWarnings("UnusedVariable") public class TcpUdpBridgeServer { private static final Logger LOGGER = Logger.getLogger(TcpUdpBridgeServer.class.getName()); 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 3f2c61ed9..cc873017f 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 @@ -350,6 +350,7 @@ public abstract class TransportCandidate { * * Subclasses should provide better methods if they can... */ + @SuppressWarnings("UnusedVariable") public void check(final List localCandidates) { // TODO candidate is being checked trigger // candidatesChecking.add(cand); @@ -669,6 +670,7 @@ public abstract class TransportCandidate { } + @SuppressWarnings("UnusedVariable") @Override public void run() { try { 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 2df06e3c1..e8709c3bc 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 @@ -51,6 +51,7 @@ import org.jivesoftware.smackx.jingleold.packet.JingleTransport.JingleTransportC * * @author Alvaro Saurin */ +@SuppressWarnings("UnusedVariable") public abstract class TransportNegotiator extends JingleNegotiator { private static final Logger LOGGER = Logger.getLogger(TransportNegotiator.class.getName()); diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleContentProvider.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleContentProvider.java index 7a0e01528..f60b35dbc 100644 --- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleContentProvider.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleContentProvider.java @@ -34,7 +34,6 @@ public class JingleContentProvider extends ExtensionElementProvider { public Jingle parse(XmlPullParser parser, int intialDepth, XmlEnvironment xmlEnvironment) throws IOException, XmlPullParserException, SmackParsingException { Jingle jingle = new Jingle(); - String sid = ""; + String sid; JingleActionEnum action; Jid initiator, responder; boolean done = false; 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 68709d4de..59e6239f2 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 @@ -129,11 +129,10 @@ public class QueueOverview implements ExtensionElement { public QueueOverview parse(XmlPullParser parser, int initialDepth, XmlEnvironment xmlEnvironment) throws XmlPullParserException, IOException, SmackTextParseException { - XmlPullParser.Event eventType = parser.getEventType(); QueueOverview queueOverview = new QueueOverview(); SimpleDateFormat dateFormat = new SimpleDateFormat(DATE_FORMAT); - eventType = parser.next(); + XmlPullParser.Event eventType = parser.next(); while (eventType != XmlPullParser.Event.END_ELEMENT || !ELEMENT_NAME.equals(parser.getName())) { if ("count".equals(parser.getName())) { diff --git a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/exceptions/UntrustedOmemoIdentityException.java b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/exceptions/UntrustedOmemoIdentityException.java index 6f3ca4c2b..d594fe614 100644 --- a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/exceptions/UntrustedOmemoIdentityException.java +++ b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/exceptions/UntrustedOmemoIdentityException.java @@ -80,7 +80,7 @@ public class UntrustedOmemoIdentityException extends Exception { } @Override - public String toString() { + public String getMessage() { if (trustedKey != null) { return "Untrusted OMEMO Identity encountered:\n" + "Fingerprint of trusted key:\n" + trustedKey.blocksOf8Chars() + "\n" + diff --git a/smack-omemo/src/test/java/org/jivesoftware/smackx/omemo/OmemoExceptionsTest.java b/smack-omemo/src/test/java/org/jivesoftware/smackx/omemo/OmemoExceptionsTest.java index a258f4875..5bc94377e 100644 --- a/smack-omemo/src/test/java/org/jivesoftware/smackx/omemo/OmemoExceptionsTest.java +++ b/smack-omemo/src/test/java/org/jivesoftware/smackx/omemo/OmemoExceptionsTest.java @@ -97,7 +97,7 @@ public class OmemoExceptionsTest { ArrayList el = new ArrayList<>(); try { MultipleCryptoFailedException m2 = MultipleCryptoFailedException.from(el); - fail("MultipleCryptoFailedException must not allow empty list."); + fail("MultipleCryptoFailedException must not allow empty list, but returned: " + m2); } catch (IllegalArgumentException e) { // Expected } diff --git a/smack-openpgp/src/test/java/org/jivesoftware/smackx/ox_im/OXInstantMessagingManagerTest.java b/smack-openpgp/src/test/java/org/jivesoftware/smackx/ox_im/OXInstantMessagingManagerTest.java index c9733dc12..d5f1571a4 100644 --- a/smack-openpgp/src/test/java/org/jivesoftware/smackx/ox_im/OXInstantMessagingManagerTest.java +++ b/smack-openpgp/src/test/java/org/jivesoftware/smackx/ox_im/OXInstantMessagingManagerTest.java @@ -95,7 +95,6 @@ public class OXInstantMessagingManagerTest extends SmackTestSuite { bobOpenPgp.setOpenPgpProvider(bobProvider); OXInstantMessagingManager aliceOxim = OXInstantMessagingManager.getInstanceFor(aliceCon); - OXInstantMessagingManager bobOxim = OXInstantMessagingManager.getInstanceFor(bobCon); OpenPgpSelf aliceSelf = aliceOpenPgp.getOpenPgpSelf(); OpenPgpSelf bobSelf = bobOpenPgp.getOpenPgpSelf(); diff --git a/smack-resolver-minidns/src/main/java/org/jivesoftware/smack/util/dns/minidns/MiniDnsDaneVerifier.java b/smack-resolver-minidns/src/main/java/org/jivesoftware/smack/util/dns/minidns/MiniDnsDaneVerifier.java index 76d3bf536..b0812ae7d 100644 --- a/smack-resolver-minidns/src/main/java/org/jivesoftware/smack/util/dns/minidns/MiniDnsDaneVerifier.java +++ b/smack-resolver-minidns/src/main/java/org/jivesoftware/smack/util/dns/minidns/MiniDnsDaneVerifier.java @@ -19,7 +19,6 @@ package org.jivesoftware.smack.util.dns.minidns; import java.security.KeyManagementException; import java.security.SecureRandom; import java.security.cert.CertificateException; -import java.util.logging.Logger; import javax.net.ssl.KeyManager; import javax.net.ssl.SSLContext; @@ -33,7 +32,6 @@ import org.minidns.dane.DaneVerifier; import org.minidns.dane.ExpectingTrustManager; public class MiniDnsDaneVerifier implements SmackDaneVerifier { - private static final Logger LOGGER = Logger.getLogger(MiniDnsDaneVerifier.class.getName()); private static final DaneVerifier VERIFIER = new DaneVerifier(); diff --git a/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnectionConfiguration.java b/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnectionConfiguration.java index 9fb6b71b2..aaccfacb6 100644 --- a/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnectionConfiguration.java +++ b/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnectionConfiguration.java @@ -69,7 +69,6 @@ public final class XMPPTCPConnectionConfiguration extends ConnectionConfiguratio * obtain a new instance and {@link #build} to build the configuration. */ public static final class Builder extends ConnectionConfiguration.Builder { - private boolean compressionEnabled = false; private int connectTimeout = DEFAULT_CONNECT_TIMEOUT; private Builder() { diff --git a/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XmppNioTcpConnection.java b/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XmppNioTcpConnection.java index 55e950bdd..31b8f35a8 100644 --- a/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XmppNioTcpConnection.java +++ b/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XmppNioTcpConnection.java @@ -1611,11 +1611,9 @@ public class XmppNioTcpConnection extends AbstractXmppNioConnection { @Override protected TransitionIntoResult transitionInto(WalkStateGraphContext walkStateGraphContext) { - boolean streamCloseIssued = false; - closingStreamReceived.init(); - streamCloseIssued = outgoingElementsQueue.offerAndShutdown(StreamClose.INSTANCE); + boolean streamCloseIssued = outgoingElementsQueue.offerAndShutdown(StreamClose.INSTANCE); afterOutgoingElementsQueueModified(); diff --git a/smack-tcp/src/test/java/org/jivesoftware/smack/tcp/XmppNioTcpConnectionTest.java b/smack-tcp/src/test/java/org/jivesoftware/smack/tcp/XmppNioTcpConnectionTest.java index 14162b3e2..16c9989c5 100644 --- a/smack-tcp/src/test/java/org/jivesoftware/smack/tcp/XmppNioTcpConnectionTest.java +++ b/smack-tcp/src/test/java/org/jivesoftware/smack/tcp/XmppNioTcpConnectionTest.java @@ -27,6 +27,7 @@ public class XmppNioTcpConnectionTest { } private static void assertContains(GraphVertex graph, Class state) { - throw new Error("Implement me"); + // TODO: Implement this. + throw new Error("Implement me: " + graph + " " + state); } }