diff --git a/build.gradle b/build.gradle index 77f375da3..2c9ba38b2 100644 --- a/build.gradle +++ b/build.gradle @@ -203,7 +203,11 @@ allprojects { '-Werror', ] options.errorprone { - error("UnusedVariable", "UnusedMethod") + error( + "UnusedVariable", + "UnusedMethod", + "MethodCanBeStatic", + ) errorproneArgs = [ // Disable errorprone checks '-Xep:TypeParameterUnusedInFormals:OFF', diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/element/MUCLightBlockingIQ.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/element/MUCLightBlockingIQ.java index c519ab9bf..f3334b651 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/element/MUCLightBlockingIQ.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/element/MUCLightBlockingIQ.java @@ -86,7 +86,7 @@ public class MUCLightBlockingIQ extends IQ { return xml; } - private void parseBlocking(IQChildElementXmlStringBuilder xml, HashMap map, boolean isRoom) { + private static void parseBlocking(IQChildElementXmlStringBuilder xml, HashMap map, boolean isRoom) { Iterator> it = map.entrySet().iterator(); while (it.hasNext()) { Map.Entry pair = it.next(); diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/mediaelement/provider/MediaElementProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/mediaelement/provider/MediaElementProvider.java index c4b8616b5..432e40c49 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/mediaelement/provider/MediaElementProvider.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/mediaelement/provider/MediaElementProvider.java @@ -74,7 +74,7 @@ public class MediaElementProvider extends FormFieldChildElementProvider action. */ - private IQ receiveSessionTerminateAction(JingleSession session, Jingle jingle) { + private static IQ receiveSessionTerminateAction(JingleSession session, Jingle jingle) { // According to XEP-166 the only thing we can do is ack. IQ response = session.createAck(jingle); 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 5942209bc..1b905184c 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 @@ -103,7 +103,7 @@ public class JingleSessionStatePending extends JingleSessionState { /** * Receive and process the action. */ - private IQ receiveContentAcceptAction(Jingle inJingle) { + private static IQ receiveContentAcceptAction(Jingle inJingle) { // According to XEP-167 the only thing we can do is ack. // setSessionState(JingleSessionStateEnum.ACTIVE); @@ -116,7 +116,7 @@ public class JingleSessionStatePending extends JingleSessionState { /** * Receive and process the action. */ - private IQ receiveSessionAcceptAction(JingleSession session, Jingle inJingle) { + private static IQ receiveSessionAcceptAction(JingleSession session, Jingle inJingle) { // According to XEP-166 the only thing we can do is ack. session.setSessionState(JingleSessionStateActive.getInstance()); @@ -126,7 +126,7 @@ public class JingleSessionStatePending extends JingleSessionState { /** * Receive and process the action. */ - private IQ receiveSessionTerminateAction(JingleSession session, Jingle jingle) { + private static IQ receiveSessionTerminateAction(JingleSession session, Jingle jingle) { // According to XEP-166 the only thing we can do is ack. IQ response = session.createAck(jingle); 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 619458f29..87cb7ee4f 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 @@ -101,8 +101,8 @@ public class JingleSessionStateUnknown extends JingleSessionState { * @throws SmackException if Smack detected an exceptional situation. * @throws InterruptedException if the calling thread was interrupted. */ - - private IQ receiveSessionInitiateAction(JingleSession session, Jingle inJingle) throws SmackException, InterruptedException { + private static IQ receiveSessionInitiateAction(JingleSession session, Jingle inJingle) + throws SmackException, InterruptedException { IQ response; boolean shouldAck = true; @@ -208,7 +208,7 @@ public class JingleSessionStateUnknown extends JingleSessionState { /** * Receive and process the action. */ - private IQ receiveSessionTerminateAction(JingleSession session, Jingle jingle) { + private static IQ receiveSessionTerminateAction(JingleSession session, Jingle jingle) { // According to XEP-166 the only thing we can do is ack. IQ response = session.createAck(jingle); 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 eb461208c..67291fe9a 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 @@ -183,7 +183,7 @@ public class MediaNegotiator extends JingleNegotiator { /** * Process the ACK of our list of codecs (our offer). */ - private Jingle receiveResult(IQ iq) throws XMPPException { + private static Jingle receiveResult(IQ iq) throws XMPPException { Jingle response = null; // if (!remoteAudioPts.isEmpty()) { 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 64199a974..ed86a85de 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 @@ -58,7 +58,7 @@ public class JMFInit extends Frame implements Runnable { } catch (Exception e) { - message("Failed to commit to JMFRegistry!"); + LOGGER.fine("Failed to commit to JMFRegistry!"); } Thread detectThread = new Thread(this); @@ -89,28 +89,28 @@ public class JMFInit extends Frame implements Runnable { if (args != null && args.length > 0) { tempDir = args[0]; - message("Setting cache directory to " + tempDir); + LOGGER.fine("Setting cache directory to " + tempDir); try { Registry.set("secure.cacheDir", tempDir); Registry.commit(); - message("Updated registry"); + LOGGER.fine("Updated registry"); } catch (Exception e) { - message("Couldn't update registry!"); + LOGGER.fine("Couldn't update registry!"); } } } @SuppressWarnings("LiteralClassName") - private void detectCaptureDevices() { + private static void detectCaptureDevices() { // check if JavaSound capture is available - message("Looking for Audio capturer"); + LOGGER.fine("Looking for Audio capturer"); Class dsauto; try { dsauto = Class.forName("DirectSoundAuto"); dsauto.getConstructor().newInstance(); - message("Finished detecting DirectSound capturer"); + LOGGER.fine("Finished detecting DirectSound capturer"); } catch (ThreadDeath td) { throw td; @@ -123,13 +123,13 @@ public class JMFInit extends Frame implements Runnable { try { jsauto = Class.forName("JavaSoundAuto"); jsauto.getConstructor().newInstance(); - message("Finished detecting javasound capturer"); + LOGGER.fine("Finished detecting javasound capturer"); } catch (ThreadDeath td) { throw td; } catch (Throwable t) { - message("JavaSound capturer detection failed!"); + LOGGER.fine("JavaSound capturer detection failed!"); } /* @@ -182,7 +182,7 @@ public class JMFInit extends Frame implements Runnable { */ } - private void detectDirectAudio() { + private static void detectDirectAudio() { Class cls; int plType = PlugInManager.RENDERER; String dar = "com.sun.media.renderer.audio.DirectAudioRenderer"; @@ -229,7 +229,7 @@ public class JMFInit extends Frame implements Runnable { } } - private void detectS8DirectAudio() { + private static void detectS8DirectAudio() { Class cls; int plType = PlugInManager.RENDERER; String dar = "com.sun.media.renderer.audio.DirectAudioRenderer"; @@ -273,10 +273,6 @@ public class JMFInit extends Frame implements Runnable { } } - private void message(String mesg) { - LOGGER.fine(mesg); - } - public static void start(boolean visible) { new JMFInit(null, visible); } diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jmf/AudioChannel.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jmf/AudioChannel.java index 4d16933d0..f91263337 100644 --- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jmf/AudioChannel.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jmf/AudioChannel.java @@ -318,7 +318,7 @@ public class AudioChannel { * @return the best stanza size * @throws IllegalArgumentException if an illegal argument was given. */ - private int getPacketSize(Format codecFormat, int milliseconds) throws IllegalArgumentException { + private static int getPacketSize(Format codecFormat, int milliseconds) throws IllegalArgumentException { String encoding = codecFormat.getEncoding(); if (encoding.equalsIgnoreCase(AudioFormat.GSM) || encoding.equalsIgnoreCase(AudioFormat.GSM_RTP)) { diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/STUNResolver.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/STUNResolver.java index dd68939c0..0501621d4 100644 --- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/STUNResolver.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/STUNResolver.java @@ -252,7 +252,7 @@ public class STUNResolver extends TransportResolver { * * @return the best STUN server that can be used. */ - private STUNService bestSTUNServer(ArrayList listServers) { + private static STUNService bestSTUNServer(ArrayList listServers) { if (listServers.isEmpty()) { return null; } else { 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 678402fb3..c624f894b 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 @@ -115,8 +115,8 @@ public class AgentChatHistory extends IQ { return agentChatHistory; } - private AgentChatSession parseChatSetting(XmlPullParser parser) throws XmlPullParserException, IOException { - + private static AgentChatSession parseChatSetting(XmlPullParser parser) + throws XmlPullParserException, IOException { boolean done = false; Date date = null; long duration = 0; 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 a94042d23..8161896ad 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 @@ -131,7 +131,7 @@ public class AgentStatusRequest extends IQ { return statusRequest; } - private Item parseAgent(XmlPullParser parser) throws XmlPullParserException, IOException { + private static Item parseAgent(XmlPullParser parser) throws XmlPullParserException, IOException { boolean done = false; EntityBareJid jid = ParserUtils.getBareJidAttribute(parser); 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 bb10ed916..c60233339 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 @@ -154,8 +154,8 @@ public class OccupantsInfo extends IQ { return occupantsInfo; } - private OccupantInfo parseOccupantInfo(XmlPullParser parser) throws XmlPullParserException, IOException, SmackTextParseException { - + private static OccupantInfo parseOccupantInfo(XmlPullParser parser) + throws XmlPullParserException, IOException, SmackTextParseException { boolean done = false; String jid = null; String nickname = null; diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/TranscriptsProvider.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/TranscriptsProvider.java index eb701ee68..07c3c05ab 100644 --- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/TranscriptsProvider.java +++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/TranscriptsProvider.java @@ -69,8 +69,8 @@ public class TranscriptsProvider extends IQProvider { return new Transcripts(userID, summaries); } - private Transcripts.TranscriptSummary parseSummary(XmlPullParser parser) throws IOException, - XmlPullParserException { + private static Transcripts.TranscriptSummary parseSummary(XmlPullParser parser) + throws IOException, XmlPullParserException { String sessionID = parser.getAttributeValue("", "sessionID"); Date joinTime = null; Date leftTime = null; @@ -108,7 +108,8 @@ public class TranscriptsProvider extends IQProvider { return new Transcripts.TranscriptSummary(sessionID, joinTime, leftTime, agents); } - private List parseAgents(XmlPullParser parser) throws IOException, XmlPullParserException { + private static List parseAgents(XmlPullParser parser) + throws IOException, XmlPullParserException { List agents = new ArrayList<>(); String agentJID = null; Date joinTime = null;