From e1655aa344f0edef9c8077e22b1a14edd86d6246 Mon Sep 17 00:00:00 2001 From: vanitasvitae Date: Wed, 16 Aug 2017 15:36:49 +0200 Subject: [PATCH] Cleanup code --- .../smackx/ciphers/AesGcmNoPadding.java | 6 ++-- .../smackx/jet/component/JetSecurity.java | 16 ++++----- .../jet/element/JetSecurityElement.java | 2 +- .../JingleFileTransferManager.java | 1 + .../component/AbstractJingleFileOffer.java | 2 +- .../component/AbstractJingleFileRequest.java | 2 +- .../component/JingleFileTransfer.java | 9 +++-- .../component/JingleFileTransferFile.java | 4 +-- .../IncomingFileOfferController.java | 2 ++ .../IncomingFileRequestController.java | 2 +- .../JingleFileTransferController.java | 2 ++ .../OutgoingFileOfferController.java | 2 +- .../OutgoingFileRequestController.java | 1 + .../element/ChecksumElement.java | 1 + .../JingleFileTransferChildElement.java | 5 +-- .../provider/ChecksumProvider.java | 1 + .../smackx/jet/JetElementTest.java | 2 +- .../jingle/callbacks/JingleCallback.java | 33 ------------------- .../jingle/component/JingleContent.java | 30 +++++++++-------- .../jingle/component/JingleSession.java | 2 +- .../smackx/jingle/element/JingleAction.java | 4 +-- .../jingle/element/JingleErrorElement.java | 8 ++--- .../jingle/element/JingleReasonElement.java | 6 ++-- .../jingle/provider/JingleProvider.java | 2 +- .../jingle_s5b/JingleS5BTransport.java | 12 +++---- .../JingleS5BTransportCandidate.java | 16 ++++----- .../jingle_s5b/JingleS5BTransportManager.java | 20 +++++------ .../jingle_s5b/S5BTransportException.java | 4 +-- .../JingleS5BTransportInfoElement.java | 2 +- .../JingleFileTransferIntegrationTest.java | 2 +- 30 files changed, 92 insertions(+), 109 deletions(-) delete mode 100644 smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/callbacks/JingleCallback.java diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/ciphers/AesGcmNoPadding.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/ciphers/AesGcmNoPadding.java index a49b37396..c09b1a45a 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/ciphers/AesGcmNoPadding.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/ciphers/AesGcmNoPadding.java @@ -35,9 +35,9 @@ public abstract class AesGcmNoPadding { private final int length; protected final Cipher cipher; - protected final byte[] key, iv, keyAndIv; + private final byte[] key, iv, keyAndIv; - protected AesGcmNoPadding(int bits, int MODE) throws NoSuchAlgorithmException, NoSuchProviderException, + AesGcmNoPadding(int bits, int MODE) throws NoSuchAlgorithmException, NoSuchProviderException, NoSuchPaddingException, InvalidAlgorithmParameterException, InvalidKeyException { this.length = bits; int bytes = bits / 8; @@ -136,7 +136,7 @@ public abstract class AesGcmNoPadding { public abstract String getNamespace(); - public static byte[] copyOfRange(byte[] source, int start, int end) { + static byte[] copyOfRange(byte[] source, int start, int end) { byte[] copy = new byte[end - start]; System.arraycopy(source, start, copy, 0, end - start); return copy; diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/component/JetSecurity.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/component/JetSecurity.java index ac94dd6bd..0397dbaeb 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/component/JetSecurity.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/component/JetSecurity.java @@ -52,19 +52,19 @@ public class JetSecurity extends JingleSecurity { private final String methodNamespace; private AesGcmNoPadding aesKey; - private ExtensionElement child; - private String cipherName; - private String name; + private final ExtensionElement child; + private final String cipherName; + private final String contentName; public JetSecurity(JetSecurityElement element) { super(); this.child = element.getChild(); this.methodNamespace = element.getMethodNamespace(); - this.name = element.getName(); + this.contentName = element.getContentName(); this.cipherName = element.getCipherName(); } - public JetSecurity(JingleEncryptionMethod method, FullJid recipient, String name, String cipherName) + public JetSecurity(JingleEncryptionMethod method, FullJid recipient, String contentName, String cipherName) throws NoSuchAlgorithmException, NoSuchProviderException, NoSuchPaddingException, InvalidAlgorithmParameterException, InvalidKeyException, InterruptedException, JingleEncryptionMethod.JingleEncryptionException, SmackException.NotConnectedException, @@ -73,11 +73,11 @@ public class JetSecurity extends JingleSecurity { this.methodNamespace = method.getNamespace(); this.aesKey = AesGcmNoPadding.createEncryptionKey(cipherName); this.child = method.encryptJingleTransfer(recipient, aesKey.getKeyAndIv()); - this.name = name; + this.contentName = contentName; this.cipherName = cipherName; } - public void decryptEncryptionKey(JingleEncryptionMethod method, FullJid sender) + private void decryptEncryptionKey(JingleEncryptionMethod method, FullJid sender) throws InterruptedException, JingleEncryptionMethod.JingleEncryptionException, XMPPException.XMPPErrorException, SmackException.NotConnectedException, SmackException.NoResponseException, NoSuchAlgorithmException, InvalidAlgorithmParameterException, NoSuchProviderException, InvalidKeyException, NoSuchPaddingException { @@ -87,7 +87,7 @@ public class JetSecurity extends JingleSecurity { @Override public JetSecurityElement getElement() { - return new JetSecurityElement(name, cipherName, child); + return new JetSecurityElement(contentName, cipherName, child); } @Override diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/element/JetSecurityElement.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/element/JetSecurityElement.java index ebfef2968..98df7589c 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/element/JetSecurityElement.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/element/JetSecurityElement.java @@ -71,7 +71,7 @@ public class JetSecurityElement extends JingleContentSecurityElement { return child; } - public String getName() { + public String getContentName() { return name; } diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/JingleFileTransferManager.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/JingleFileTransferManager.java index a2e9aaba5..8b0486c31 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/JingleFileTransferManager.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/JingleFileTransferManager.java @@ -60,6 +60,7 @@ import org.jxmpp.jid.FullJid; * Created by vanitas on 22.07.17. */ public final class JingleFileTransferManager extends Manager implements JingleDescriptionManager { + private static final Logger LOGGER = Logger.getLogger(JingleFileTransferManager.class.getName()); private static final WeakHashMap INSTANCES = new WeakHashMap<>(); diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/component/AbstractJingleFileOffer.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/component/AbstractJingleFileOffer.java index 4146ca85a..0d2b7b959 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/component/AbstractJingleFileOffer.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/component/AbstractJingleFileOffer.java @@ -21,7 +21,7 @@ package org.jivesoftware.smackx.jingle_filetransfer.component; */ public abstract class AbstractJingleFileOffer extends JingleFileTransfer { - public AbstractJingleFileOffer(D fileTransferFile) { + AbstractJingleFileOffer(D fileTransferFile) { super(fileTransferFile); } diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/component/AbstractJingleFileRequest.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/component/AbstractJingleFileRequest.java index f5142d4f5..6a783d049 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/component/AbstractJingleFileRequest.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/component/AbstractJingleFileRequest.java @@ -21,7 +21,7 @@ package org.jivesoftware.smackx.jingle_filetransfer.component; */ public abstract class AbstractJingleFileRequest extends JingleFileTransfer { - public AbstractJingleFileRequest(D fileTransferFile) { + AbstractJingleFileRequest(D fileTransferFile) { super(fileTransferFile); } diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/component/JingleFileTransfer.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/component/JingleFileTransfer.java index fd6d1a6df..9dc4c0e77 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/component/JingleFileTransfer.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/component/JingleFileTransfer.java @@ -39,9 +39,9 @@ public abstract class JingleFileTransfer extends JingleDescription progressListeners = Collections.synchronizedList(new ArrayList()); + private final List progressListeners = Collections.synchronizedList(new ArrayList()); - public JingleFileTransfer(JingleFileTransferFile file) { + JingleFileTransfer(JingleFileTransferFile file) { this.file = file; } @@ -56,6 +56,11 @@ public abstract class JingleFileTransfer extends JingleDescription { + @Override public ChecksumElement parse(XmlPullParser parser, int initialDepth) throws Exception { JingleContentElement.Creator creator = null; diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/jet/JetElementTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/jet/JetElementTest.java index d0952ab9b..1fd7e31c4 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/jet/JetElementTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/jet/JetElementTest.java @@ -45,7 +45,7 @@ public class JetElementTest extends SmackTestSuite { assertEquals(SecurityStub.NAMESPACE, security.getMethodNamespace()); assertEquals(Aes128GcmNoPadding.NAMESPACE, element.getCipherName()); assertEquals(SecurityStub.NAMESPACE, element.getMethodNamespace()); - assertEquals("content1", element.getName()); + assertEquals("content1", element.getContentName()); String xml = " { - - JingleDescriptionController accept(P parameters); - - void decline(); - - class Parameters { - - } -} diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/component/JingleContent.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/component/JingleContent.java index 13d9bd47e..f82050be3 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/component/JingleContent.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/component/JingleContent.java @@ -56,8 +56,8 @@ public class JingleContent implements JingleTransportCallback, JingleSecurityCal private JingleSession parent; private JingleContentElement.Creator creator; - private String name; - private String disposition; + private final String name; + private final String disposition; private JingleContentElement.Senders senders; private JingleDescription description; private JingleTransport transport; @@ -120,6 +120,10 @@ public class JingleContent implements JingleTransportCallback, JingleSecurityCal return new JingleContent(description, transport, security, content.getName(), content.getDisposition(), content.getCreator(), content.getSenders()); } + public void setSenders(JingleContentElement.Senders senders) { + this.senders = senders; + } + /* HANDLE_XYZ */ public IQ handleJingleRequest(JingleElement request, XMPPConnection connection) { @@ -145,12 +149,12 @@ public class JingleContent implements JingleTransportCallback, JingleSecurityCal } } - public void handleContentAccept(JingleElement request, XMPPConnection connection) { + void handleContentAccept(JingleElement request, XMPPConnection connection) { start(connection); } - public IQ handleSessionAccept(JingleElement request, XMPPConnection connection) { + IQ handleSessionAccept(JingleElement request, XMPPConnection connection) { LOGGER.log(Level.INFO, "RECEIVED SESSION ACCEPT!"); JingleContentElement contentElement = null; for (JingleContentElement c : request.getContents()) { @@ -169,26 +173,26 @@ public class JingleContent implements JingleTransportCallback, JingleSecurityCal return IQ.createResultIQ(request); } - public IQ handleContentModify(JingleElement request, XMPPConnection connection) { + private IQ handleContentModify(JingleElement request, XMPPConnection connection) { return IQ.createErrorResponse(request, XMPPError.Condition.feature_not_implemented); } - public IQ handleDescriptionInfo(JingleElement request, XMPPConnection connection) { + private IQ handleDescriptionInfo(JingleElement request, XMPPConnection connection) { return IQ.createErrorResponse(request, XMPPError.Condition.feature_not_implemented); } public void handleContentRemove(JingleSession session, XMPPConnection connection) { } - public IQ handleSecurityInfo(JingleElement request, XMPPConnection connection) { + private IQ handleSecurityInfo(JingleElement request, XMPPConnection connection) { return IQ.createErrorResponse(request, XMPPError.Condition.feature_not_implemented); } - public IQ handleSessionInfo(JingleElement request, XMPPConnection connection) { + private IQ handleSessionInfo(JingleElement request, XMPPConnection connection) { return IQ.createResultIQ(request); } - public IQ handleTransportAccept(JingleElement request, XMPPConnection connection) { + private IQ handleTransportAccept(JingleElement request, XMPPConnection connection) { if (pendingReplacingTransport == null) { LOGGER.log(Level.WARNING, "Received transport-accept, but apparently we did not try to replace the transport."); @@ -203,14 +207,14 @@ public class JingleContent implements JingleTransportCallback, JingleSecurityCal return IQ.createResultIQ(request); } - public IQ handleTransportInfo(JingleElement request, XMPPConnection connection) { + private IQ handleTransportInfo(JingleElement request, XMPPConnection connection) { assert request.getContents().size() == 1; JingleContentElement content = request.getContents().get(0); return transport.handleTransportInfo(content.getTransport().getInfo(), request); } - public IQ handleTransportReject(JingleElement request, XMPPConnection connection) { + private IQ handleTransportReject(JingleElement request, XMPPConnection connection) { if (pendingReplacingTransport == null) { throw new AssertionError("We didn't try to replace the transport."); } @@ -224,7 +228,7 @@ public class JingleContent implements JingleTransportCallback, JingleSecurityCal return IQ.createResultIQ(request); } - public IQ handleTransportReplace(final JingleElement request, final XMPPConnection connection) { + private IQ handleTransportReplace(final JingleElement request, final XMPPConnection connection) { //Tie Break? if (pendingReplacingTransport != null) { Async.go(new Runnable() { @@ -490,7 +494,7 @@ public class JingleContent implements JingleTransportCallback, JingleSecurityCal connection.createStanzaCollectorAndSend(transportReplace).nextResultOrThrow(); } - public static String randomName() { + private static String randomName() { return "cont-" + StringUtils.randomString(16); } } diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/component/JingleSession.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/component/JingleSession.java index 272c0d1e8..33abe2f12 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/component/JingleSession.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/component/JingleSession.java @@ -370,7 +370,7 @@ public class JingleSession { return content; } - private JingleContent getSoleProposedContentOrThrow(JingleElement request) { + private static JingleContent getSoleProposedContentOrThrow(JingleElement request) { if (request.getContents().size() != 1) { throw new AssertionError("More/less than 1 content in request!"); } diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleAction.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleAction.java index edd2e8033..7b1beb719 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleAction.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleAction.java @@ -44,7 +44,7 @@ public enum JingleAction { transport_replace, ; - private static final Map map = new HashMap( + private static final Map map = new HashMap<>( JingleAction.values().length); static { for (JingleAction jingleAction : JingleAction.values()) { @@ -54,7 +54,7 @@ public enum JingleAction { private final String asString; - private JingleAction() { + JingleAction() { asString = this.name().replace('_', '-'); } diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleErrorElement.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleErrorElement.java index f3081ab69..848385ce6 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleErrorElement.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleErrorElement.java @@ -26,13 +26,13 @@ public final class JingleErrorElement implements ExtensionElement { public static String NAMESPACE = "urn:xmpp:jingle:errors:1"; - public static final JingleErrorElement OUT_OF_ORDER = new JingleErrorElement("out-of-order"); + static final JingleErrorElement OUT_OF_ORDER = new JingleErrorElement("out-of-order"); - public static final JingleErrorElement TIE_BREAK = new JingleErrorElement("tie-break"); + static final JingleErrorElement TIE_BREAK = new JingleErrorElement("tie-break"); - public static final JingleErrorElement UNKNOWN_SESSION = new JingleErrorElement("unknown-session"); + static final JingleErrorElement UNKNOWN_SESSION = new JingleErrorElement("unknown-session"); - public static final JingleErrorElement UNSUPPORTED_INFO = new JingleErrorElement("unsupported-info"); + static final JingleErrorElement UNSUPPORTED_INFO = new JingleErrorElement("unsupported-info"); private final String errorName; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleReasonElement.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleReasonElement.java index d8629f26a..2f94b9fda 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleReasonElement.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleReasonElement.java @@ -131,7 +131,7 @@ public class JingleReasonElement implements NamedElement { public static class AlternativeSession extends JingleReasonElement { - public static final String SID = "sid"; + public static final String ATTR_SID = "sid"; private final String sessionId; public AlternativeSession(String sessionId) { @@ -148,9 +148,9 @@ public class JingleReasonElement implements NamedElement { xml.rightAngleBracket(); xml.openElement(reason.asString); - xml.openElement(SID); + xml.openElement(ATTR_SID); xml.append(sessionId); - xml.closeElement(SID); + xml.closeElement(ATTR_SID); xml.closeElement(reason.asString); xml.closeElement(this); diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleProvider.java index f7f735562..3b64e8cfb 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleProvider.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleProvider.java @@ -99,7 +99,7 @@ public class JingleProvider extends IQProvider { return builder.build(); } - public static JingleContentElement parseJingleContent(XmlPullParser parser, final int initialDepth) + private static JingleContentElement parseJingleContent(XmlPullParser parser, final int initialDepth) throws Exception { JingleContentElement.Builder builder = JingleContentElement.getBuilder(); diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/JingleS5BTransport.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/JingleS5BTransport.java index 804d289e5..225260882 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/JingleS5BTransport.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/JingleS5BTransport.java @@ -18,7 +18,6 @@ package org.jivesoftware.smackx.jingle.transport.jingle_s5b; import java.io.IOException; import java.util.Collections; -import java.util.Iterator; import java.util.List; import java.util.concurrent.TimeoutException; import java.util.logging.Level; @@ -234,7 +233,7 @@ public class JingleS5BTransport extends JingleTransport> ourCandidates = getOurCandidates().iterator(); - while (ourCandidates.hasNext()) { - JingleS5BTransportCandidate candidate = (JingleS5BTransportCandidate) ourCandidates.next(); + for (JingleTransportCandidate jingleTransportCandidate : getOurCandidates()) { + JingleS5BTransportCandidate candidate = (JingleS5BTransportCandidate) jingleTransportCandidate; if (candidate.getCandidateId().equals(candidateId)) { theirSelectedCandidate = candidate; } diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/JingleS5BTransportCandidate.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/JingleS5BTransportCandidate.java index 9fabcaa96..b377fd2d1 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/JingleS5BTransportCandidate.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/JingleS5BTransportCandidate.java @@ -45,14 +45,14 @@ public class JingleS5BTransportCandidate extends JingleTransportCandidate> collectCandidates() { + List> collectCandidates() { List> candidates = new ArrayList<>(); //Local host @@ -156,21 +156,21 @@ public final class JingleS5BTransportManager extends Manager implements JingleTr return socks5BytestreamManager.getLocalStreamHost(); } - public List getServersStreamHosts() throws XMPPException.XMPPErrorException, SmackException.NotConnectedException, InterruptedException, SmackException.NoResponseException { + private List getServersStreamHosts() throws XMPPException.XMPPErrorException, SmackException.NotConnectedException, InterruptedException, SmackException.NoResponseException { if (availableStreamHosts == null) { availableStreamHosts = queryServersStreamHosts(); } return availableStreamHosts; } - public List getLocalStreamHosts() { + private List getLocalStreamHosts() { if (localStreamHosts == null) { localStreamHosts = queryLocalStreamHosts(); } return localStreamHosts; } - public List determineStreamHostInfo(List proxies) { + private List determineStreamHostInfo(List proxies) { List streamHosts = new ArrayList<>(); Iterator iterator = proxies.iterator(); @@ -192,7 +192,7 @@ public final class JingleS5BTransportManager extends Manager implements JingleTr return streamHosts; } - private JingleElement createTransportInfo(JingleS5BTransport transport, JingleS5BTransportInfoElement info) { + private static JingleElement createTransportInfo(JingleS5BTransport transport, JingleS5BTransportInfoElement info) { JingleContent content = transport.getParent(); JingleSession session = content.getParent(); @@ -222,19 +222,19 @@ public final class JingleS5BTransportManager extends Manager implements JingleTr return jingle; } - JingleElement createCandidateUsed(JingleS5BTransport transport, JingleS5BTransportCandidate candidate) { + static JingleElement createCandidateUsed(JingleS5BTransport transport, JingleS5BTransportCandidate candidate) { return createTransportInfo(transport, new JingleS5BTransportInfoElement.CandidateUsed(candidate.getCandidateId())); } - JingleElement createCandidateError(JingleS5BTransport transport) { + static JingleElement createCandidateError(JingleS5BTransport transport) { return createTransportInfo(transport, JingleS5BTransportInfoElement.CandidateError.INSTANCE); } - JingleElement createProxyError(JingleS5BTransport transport) { + static JingleElement createProxyError(JingleS5BTransport transport) { return createTransportInfo(transport, JingleS5BTransportInfoElement.ProxyError.INSTANCE); } - JingleElement createCandidateActivated(JingleS5BTransport transport, JingleS5BTransportCandidate candidate) { + static JingleElement createCandidateActivated(JingleS5BTransport transport, JingleS5BTransportCandidate candidate) { return createTransportInfo(transport, new JingleS5BTransportInfoElement.CandidateActivated(candidate.getCandidateId())); } @@ -259,7 +259,7 @@ public final class JingleS5BTransportManager extends Manager implements JingleTr return getPriority() > other.getPriority() ? 1 : -1; } - private ConnectionListener connectionListener = new ConnectionListener() { + private final ConnectionListener connectionListener = new ConnectionListener() { @Override public void connected(XMPPConnection connection) { diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/S5BTransportException.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/S5BTransportException.java index cd26ba2cb..cb9714d33 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/S5BTransportException.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/S5BTransportException.java @@ -32,7 +32,7 @@ public class S5BTransportException extends FailedTransportException { public static class CandidateError extends S5BTransportException { protected static final long serialVersionUID = 1L; - public CandidateError(Throwable throwable) { + CandidateError(Throwable throwable) { super(throwable); } } @@ -40,7 +40,7 @@ public class S5BTransportException extends FailedTransportException { public static class ProxyError extends S5BTransportException { protected static final long serialVersionUID = 1L; - public ProxyError(Throwable throwable) { + ProxyError(Throwable throwable) { super(throwable); } } diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/element/JingleS5BTransportInfoElement.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/element/JingleS5BTransportInfoElement.java index fae52b1fd..e9fef6ea9 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/element/JingleS5BTransportInfoElement.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/element/JingleS5BTransportInfoElement.java @@ -29,7 +29,7 @@ public abstract class JingleS5BTransportInfoElement extends JingleContentTranspo private final String candidateId; - protected JingleS5BCandidateTransportInfoElement(String candidateId) { + JingleS5BCandidateTransportInfoElement(String candidateId) { this.candidateId = candidateId; } diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/JingleFileTransferIntegrationTest.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/JingleFileTransferIntegrationTest.java index d4967183c..5a41968dc 100644 --- a/smack-integration-test/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/JingleFileTransferIntegrationTest.java +++ b/smack-integration-test/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/JingleFileTransferIntegrationTest.java @@ -172,7 +172,7 @@ public class JingleFileTransferIntegrationTest extends AbstractSmackIntegrationT } @AfterClass - public void cleanup() { + public static void cleanup() { Socks5Proxy.getSocks5Proxy().stop(); } }