From d20a2675a8f7d40c28d17a9b590dabc423257246 Mon Sep 17 00:00:00 2001
From: Florian Schmaus <flo@geekplace.eu>
Date: Wed, 8 May 2019 11:52:36 +0200
Subject: [PATCH] Make StanzaCollector final

---
 .../java/org/jivesoftware/smack/StanzaCollector.java   |  6 +++---
 .../org/jivesoftware/smack/StanzaCollectorTest.java    | 10 ++++------
 2 files changed, 7 insertions(+), 9 deletions(-)

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 3dc45a9aa..dcccd64a3 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/StanzaCollector.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/StanzaCollector.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright 2003-2007 Jive Software, 2016-2018 Florian Schmaus.
+ * Copyright 2003-2007 Jive Software, 2016-2019 Florian Schmaus.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,7 +41,7 @@ import org.jivesoftware.smack.packet.Stanza;
  * @see XMPPConnection#createStanzaCollector(StanzaFilter)
  * @author Matt Tucker
  */
-public class StanzaCollector implements AutoCloseable {
+public final class StanzaCollector implements AutoCloseable {
 
     private final StanzaFilter packetFilter;
 
@@ -69,7 +69,7 @@ public class StanzaCollector implements AutoCloseable {
      * @param connection the connection the collector is tied to.
      * @param configuration the configuration used to construct this collector
      */
-    protected StanzaCollector(XMPPConnection connection, Configuration configuration) {
+    StanzaCollector(XMPPConnection connection, Configuration configuration) {
         this.connection = connection;
         this.packetFilter = configuration.packetFilter;
         this.resultQueue = new ArrayDeque<>(configuration.size);
diff --git a/smack-core/src/test/java/org/jivesoftware/smack/StanzaCollectorTest.java b/smack-core/src/test/java/org/jivesoftware/smack/StanzaCollectorTest.java
index d2c1c3b0b..988cbafef 100644
--- a/smack-core/src/test/java/org/jivesoftware/smack/StanzaCollectorTest.java
+++ b/smack-core/src/test/java/org/jivesoftware/smack/StanzaCollectorTest.java
@@ -30,7 +30,7 @@ public class StanzaCollectorTest {
 
     @Test
     public void verifyRollover() throws InterruptedException {
-        TestStanzaCollector collector = new TestStanzaCollector(null, new OKEverything(), 5);
+        StanzaCollector collector = createTestStanzaCollector(null, new OKEverything(), 5);
 
         for (int i = 0; i < 6; i++) {
             Stanza testPacket = new TestPacket(i);
@@ -70,7 +70,7 @@ public class StanzaCollectorTest {
     @Test
     public void verifyThreadSafety() throws InterruptedException {
         final int insertCount = 500;
-        final TestStanzaCollector collector = new TestStanzaCollector(null, new OKEverything(), insertCount);
+        final StanzaCollector collector = createTestStanzaCollector(null, new OKEverything(), insertCount);
 
         final AtomicInteger consumer1Dequeued = new AtomicInteger();
         final AtomicInteger consumer2Dequeued = new AtomicInteger();
@@ -170,10 +170,8 @@ public class StanzaCollectorTest {
 
     }
 
-    static class TestStanzaCollector extends StanzaCollector {
-        protected TestStanzaCollector(XMPPConnection conection, StanzaFilter packetFilter, int size) {
-            super(conection, StanzaCollector.newConfiguration().setStanzaFilter(packetFilter).setSize(size));
-        }
+    private static StanzaCollector createTestStanzaCollector(XMPPConnection connection, StanzaFilter packetFilter, int size) {
+        return new StanzaCollector(connection, StanzaCollector.newConfiguration().setStanzaFilter(packetFilter).setSize(size));
     }
 
     static class TestPacket extends Stanza {