Move HandlersConfigurerTestWrapper to test scope.

3 files changed, 1 insertions, 2 deletions

diff --git a/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java b/container-search/src/test/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java
index 62d36ec34ec..e895343c4b1 100644
--- a/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java
+++ b/container-search/src/test/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java
@@ -111,8 +111,7 @@ public class HandlersConfigurerTestWrapper {
 
     private ComponentDeconstructor getTestDeconstructor() {
         return (generation, components, bundles) -> components.forEach(component -> {
-            if (component instanceof AbstractComponent) {
-                AbstractComponent abstractComponent = (AbstractComponent) component;
+            if (component instanceof AbstractComponent abstractComponent) {
                 if (abstractComponent.isDeconstructable()) abstractComponent.deconstruct();
             }
             if (! bundles.isEmpty()) throw new IllegalArgumentException("This test should not use bundles");
diff --git a/container-core/src/main/java/com/yahoo/container/core/config/testutil/MockOsgiWrapper.java b/container-search/src/test/java/com/yahoo/container/core/config/testutil/MockOsgiWrapper.java
index 7539369f551..7539369f551 100644
--- a/container-core/src/main/java/com/yahoo/container/core/config/testutil/MockOsgiWrapper.java
+++ b/container-search/src/test/java/com/yahoo/container/core/config/testutil/MockOsgiWrapper.java
diff --git a/container-core/src/main/java/com/yahoo/container/core/config/testutil/MockZoneInfo.java b/container-search/src/test/java/com/yahoo/container/core/config/testutil/MockZoneInfo.java
index 11c14f8e581..11c14f8e581 100644
--- a/container-core/src/main/java/com/yahoo/container/core/config/testutil/MockZoneInfo.java
+++ b/container-search/src/test/java/com/yahoo/container/core/config/testutil/MockZoneInfo.java