avoid warnings from unit tests by closing subscriber

10 files changed, 28 insertions, 15 deletions

diff --git a/document/src/test/java/com/yahoo/document/DocInDocTestCase.java b/document/src/test/java/com/yahoo/document/DocInDocTestCase.java
index f5b6b4ea9bf..57972d20509 100644
--- a/document/src/test/java/com/yahoo/document/DocInDocTestCase.java
+++ b/document/src/test/java/com/yahoo/document/DocInDocTestCase.java
@@ -21,8 +21,8 @@ public class DocInDocTestCase {
     @Test
     public void testDocInDoc() {
         DocumentTypeManager manager = new DocumentTypeManager();
-        DocumentTypeManagerConfigurer.configure(manager, "file:src/test/java/com/yahoo/document/documentmanager.docindoc.cfg");
-
+        var sub = DocumentTypeManagerConfigurer.configure(manager, "file:src/test/java/com/yahoo/document/documentmanager.docindoc.cfg");
+        sub.close();
         Document inner1 = new Document(manager.getDocumentType("docindoc"), "id:inner:docindoc::one");
         inner1.setFieldValue("name", new StringFieldValue("Donald Duck"));
         inner1.setFieldValue("content", new StringFieldValue("Lives in Duckburg"));
diff --git a/document/src/test/java/com/yahoo/document/DocumentTestCase.java b/document/src/test/java/com/yahoo/document/DocumentTestCase.java
index 144c7d62894..3d7eb49f1f9 100644
--- a/document/src/test/java/com/yahoo/document/DocumentTestCase.java
+++ b/document/src/test/java/com/yahoo/document/DocumentTestCase.java
@@ -95,7 +95,8 @@ public class DocumentTestCase extends DocumentTestCaseBase {
 
     static DocumentTypeManager setUpDocType(String filename) {
         DocumentTypeManager dcMan = new DocumentTypeManager();
-        DocumentTypeManagerConfigurer.configure(dcMan, filename);
+        var sub = DocumentTypeManagerConfigurer.configure(dcMan, filename);
+        sub.close();
         return dcMan;
     }
 
diff --git a/document/src/test/java/com/yahoo/document/DocumentTypeManagerTestCase.java b/document/src/test/java/com/yahoo/document/DocumentTypeManagerTestCase.java
index 3fa81dd8d5b..4040f3455da 100644
--- a/document/src/test/java/com/yahoo/document/DocumentTypeManagerTestCase.java
+++ b/document/src/test/java/com/yahoo/document/DocumentTypeManagerTestCase.java
@@ -217,8 +217,8 @@ public class DocumentTypeManagerTestCase {
         assertNull(banana.getField("newfield"));
         assertEquals(new Field("arrayfloat", 9489, new ArrayDataType(DataType.FLOAT, 99)), customtypes.getField("arrayfloat"));
 
-        DocumentTypeManagerConfigurer.configure(manager, "file:src/test/document/documentmanager.updated.cfg");
-
+        var sub = DocumentTypeManagerConfigurer.configure(manager, "file:src/test/document/documentmanager.updated.cfg");
+        sub.close();
         banana = manager.getDocumentType(new DataTypeName("banana"));
         customtypes = manager.getDocumentType(new DataTypeName("customtypes"));
 
@@ -513,7 +513,8 @@ search annotationsimplicitstruct {
 
     private static DocumentTypeManager createConfiguredManager(String configFilePath) {
         DocumentTypeManager manager = new DocumentTypeManager();
-        DocumentTypeManagerConfigurer.configure(manager, configFilePath);
+        var sub = DocumentTypeManagerConfigurer.configure(manager, configFilePath);
+        sub.close();
         return manager;
     }
 
diff --git a/document/src/test/java/com/yahoo/document/annotation/Bug4259784TestCase.java b/document/src/test/java/com/yahoo/document/annotation/Bug4259784TestCase.java
index 77f0e1a9c20..fcaf96a788f 100644
--- a/document/src/test/java/com/yahoo/document/annotation/Bug4259784TestCase.java
+++ b/document/src/test/java/com/yahoo/document/annotation/Bug4259784TestCase.java
@@ -23,7 +23,9 @@ public class Bug4259784TestCase {
     @Test
     public void testSerialize() {
         DocumentTypeManager manager = new DocumentTypeManager();
-        DocumentTypeManagerConfigurer.configure(manager, "file:src/test/java/com/yahoo/document/annotation/documentmanager.bug4259784.cfg");
+        var sub = DocumentTypeManagerConfigurer.configure
+            (manager, "file:src/test/java/com/yahoo/document/annotation/documentmanager.bug4259784.cfg");
+        sub.close();
 
         DocumentType type = manager.getDocumentType("blog");
         Document doc = new Document(type, "id:this:blog::is:a:test");
diff --git a/document/src/test/java/com/yahoo/document/annotation/Bug4261985TestCase.java b/document/src/test/java/com/yahoo/document/annotation/Bug4261985TestCase.java
index 7692d2643df..ae730ed8cb3 100644
--- a/document/src/test/java/com/yahoo/document/annotation/Bug4261985TestCase.java
+++ b/document/src/test/java/com/yahoo/document/annotation/Bug4261985TestCase.java
@@ -23,7 +23,9 @@ public class Bug4261985TestCase {
     @Test
     public void testAnnotate() {
         DocumentTypeManager manager = new DocumentTypeManager();
-        DocumentTypeManagerConfigurer.configure(manager, "file:src/test/java/com/yahoo/document/annotation/documentmanager.bug4261985.cfg");
+        var sub = DocumentTypeManagerConfigurer.configure
+            (manager, "file:src/test/java/com/yahoo/document/annotation/documentmanager.bug4261985.cfg");
+        sub.close();
 
         DocumentType type = manager.getDocumentType("blog");
         Document doc = new Document(type, "id:this:blog::is:a:test");
diff --git a/document/src/test/java/com/yahoo/document/annotation/Bug4475379TestCase.java b/document/src/test/java/com/yahoo/document/annotation/Bug4475379TestCase.java
index dbbe0cdfedf..69003ebd036 100755
--- a/document/src/test/java/com/yahoo/document/annotation/Bug4475379TestCase.java
+++ b/document/src/test/java/com/yahoo/document/annotation/Bug4475379TestCase.java
@@ -23,7 +23,9 @@ public class Bug4475379TestCase {
     @Test
     public void testClone() {
         DocumentTypeManager manager = new DocumentTypeManager();
-        DocumentTypeManagerConfigurer.configure(manager, "file:src/test/java/com/yahoo/document/annotation/documentmanager.bug4475379.cfg");
+        var sub = DocumentTypeManagerConfigurer.configure
+            (manager, "file:src/test/java/com/yahoo/document/annotation/documentmanager.bug4475379.cfg");
+        sub.close();
 
         DocumentType type = manager.getDocumentType("blog");
         Document doc = new Document(type, "id:this:blog::is:a:test");
diff --git a/document/src/test/java/com/yahoo/document/annotation/Bug6394548TestCase.java b/document/src/test/java/com/yahoo/document/annotation/Bug6394548TestCase.java
index 654965d1ee7..3ec858062be 100644
--- a/document/src/test/java/com/yahoo/document/annotation/Bug6394548TestCase.java
+++ b/document/src/test/java/com/yahoo/document/annotation/Bug6394548TestCase.java
@@ -19,7 +19,9 @@ public class Bug6394548TestCase {
     @Test
     public void testSerializeAndDeserializeMultipleAdjacentStructAnnotations() {
         DocumentTypeManager manager = new DocumentTypeManager();
-        DocumentTypeManagerConfigurer.configure(manager, "file:src/test/java/com/yahoo/document/annotation/documentmanager.6394548.cfg");
+        var sub = DocumentTypeManagerConfigurer.configure
+            (manager, "file:src/test/java/com/yahoo/document/annotation/documentmanager.6394548.cfg");
+        sub.close();
 
         AnnotationTypeRegistry registry = manager.getAnnotationTypeRegistry();
         AnnotationType featureSetType = registry.getType("morty.RICK_FEATURESET");
diff --git a/document/src/test/java/com/yahoo/document/annotation/SystemTestCase.java b/document/src/test/java/com/yahoo/document/annotation/SystemTestCase.java
index 9978fd1b014..678639c89d9 100755
--- a/document/src/test/java/com/yahoo/document/annotation/SystemTestCase.java
+++ b/document/src/test/java/com/yahoo/document/annotation/SystemTestCase.java
@@ -114,7 +114,9 @@ public class SystemTestCase {
     @Before
     public void setUp() {
         manager = new DocumentTypeManager();
-        DocumentTypeManagerConfigurer.configure(manager, "file:src/test/java/com/yahoo/document/annotation/documentmanager.systemtest.cfg");
+        var sub = DocumentTypeManagerConfigurer.configure
+            (manager, "file:src/test/java/com/yahoo/document/annotation/documentmanager.systemtest.cfg");
+        sub.close();
     }
 
     @Test
diff --git a/document/src/test/java/com/yahoo/document/serialization/SerializeAnnotationsTestCase.java b/document/src/test/java/com/yahoo/document/serialization/SerializeAnnotationsTestCase.java
index d27a4ed6326..9e58e2540a0 100644
--- a/document/src/test/java/com/yahoo/document/serialization/SerializeAnnotationsTestCase.java
+++ b/document/src/test/java/com/yahoo/document/serialization/SerializeAnnotationsTestCase.java
@@ -44,9 +44,9 @@ public class SerializeAnnotationsTestCase {
 
     @Before
     public void setUp() {
-        DocumentTypeManagerConfigurer.configure(docMan,
-                                                "file:src/tests/serialization/" +
-                                                "annotation.serialize.test.cfg");
+        var sub = DocumentTypeManagerConfigurer.configure
+            (docMan, "file:src/tests/serialization/annotation.serialize.test.cfg");
+        sub.close();
     }
 
     @Test
diff --git a/document/src/test/java/com/yahoo/vespaxmlparser/VespaXMLReaderTestCase.java b/document/src/test/java/com/yahoo/vespaxmlparser/VespaXMLReaderTestCase.java
index 769a73d536d..b2fa7014480 100644
--- a/document/src/test/java/com/yahoo/vespaxmlparser/VespaXMLReaderTestCase.java
+++ b/document/src/test/java/com/yahoo/vespaxmlparser/VespaXMLReaderTestCase.java
@@ -36,7 +36,8 @@ public class VespaXMLReaderTestCase {
 
     @Before
     public void setUp() {
-        DocumentTypeManagerConfigurer.configure(manager, "file:src/test/vespaxmlparser/documentmanager2.cfg");
+        var sub = DocumentTypeManagerConfigurer.configure(manager, "file:src/test/vespaxmlparser/documentmanager2.cfg");
+        sub.close();
     }
 
     @Test