test: migrate to MockitoBean#types feature

timonback · timonback · commit 45d45c5858c8 · 2025-12-29T13:12:42.000+01:00
diff --git a/springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/springwolf/plugins/amqp/configuration/SpringwolfAmqpProducerConfigurationIntegrationTest.java b/springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/springwolf/plugins/amqp/configuration/SpringwolfAmqpProducerConfigurationIntegrationTest.java
@@ -40,8 +40,18 @@ public class SpringwolfAmqpProducerConfigurationIntegrationTest {
                 "springwolf.docket.servers.test-protocol.host=some-server:1234",
                 "springwolf.plugin.amqp.publishing.enabled=true"
             })
+    @MockitoBean(
+            types = {
+                SpringwolfClassScanner.class,
+                ComponentsService.class,
+                HeaderClassExtractor.class,
+                PayloadMethodParameterService.class,
+                StringValueResolver.class,
+                AsyncApiService.class,
+                RabbitTemplate.class
+            })
     @Nested
-    class AmqpProducerWillBeCreatedIfEnabledTest extends MockBeanConfiguration {
+    class AmqpProducerWillBeCreatedIfEnabledTest {
         @Autowired
         private Optional<SpringwolfAmqpProducer> springwolfAmqpProducer;
 
@@ -71,8 +81,18 @@ void springwolfAmqpProducerShouldBePresentInSpringContext() {
                 "springwolf.docket.servers.test-protocol.host=some-server:1234",
                 "springwolf.plugin.amqp.publishing.enabled=false"
             })
+    @MockitoBean(
+            types = {
+                SpringwolfClassScanner.class,
+                ComponentsService.class,
+                HeaderClassExtractor.class,
+                PayloadMethodParameterService.class,
+                StringValueResolver.class,
+                AsyncApiService.class,
+                RabbitTemplate.class
+            })
     @Nested
-    class AmqpProducerWillNotBeCreatedIfDisabledTest extends MockBeanConfiguration {
+    class AmqpProducerWillNotBeCreatedIfDisabledTest {
         @Autowired
         private Optional<SpringwolfAmqpProducer> springwolfAmqpProducer;
 
@@ -85,32 +105,4 @@ void springwolfAmqpProducerShouldNotBePresentInSpringContext() {
             assertThat(springwolfAmqpController).isNotPresent();
         }
     }
-
-    /**
-     * Introduced due to migration of spring boot 3.3 -> 3.4 and @MockBean deprecation
-     *
-     * feature request: https://github.com/spring-projects/spring-framework/issues/33925
-     */
-    class MockBeanConfiguration {
-        @MockitoBean
-        private SpringwolfClassScanner springwolfClassScanner;
-
-        @MockitoBean
-        private ComponentsService componentsService;
-
-        @MockitoBean
-        private HeaderClassExtractor headerClassExtractor;
-
-        @MockitoBean
-        private PayloadMethodParameterService payloadMethodParameterService;
-
-        @MockitoBean
-        private StringValueResolver stringValueResolver;
-
-        @MockitoBean
-        private AsyncApiService asyncApiService;
-
-        @MockitoBean
-        private RabbitTemplate rabbitTemplate;
-    }
 }
diff --git a/springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/springwolf/plugins/jms/configuration/SpringwolfJmsProducerConfigurationIntegrationTest.java b/springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/springwolf/plugins/jms/configuration/SpringwolfJmsProducerConfigurationIntegrationTest.java
@@ -39,8 +39,17 @@ public class SpringwolfJmsProducerConfigurationIntegrationTest {
                 "springwolf.docket.servers.test-protocol.host=some-server:1234",
                 "springwolf.plugin.jms.publishing.enabled=true"
             })
+    @MockitoBean(
+            types = {
+                SpringwolfClassScanner.class,
+                ComponentsService.class,
+                HeaderClassExtractor.class,
+                PayloadMethodParameterService.class,
+                StringValueResolver.class,
+                JmsTemplate.class
+            })
     @Nested
-    class JmsProducerWillBeCreatedIfEnabledTest extends MockBeanConfiguration {
+    class JmsProducerWillBeCreatedIfEnabledTest {
         @Autowired
         private Optional<SpringwolfJmsProducer> springwolfJmsProducer;
 
@@ -70,8 +79,17 @@ void springwolfJmsProducerShouldBePresentInSpringContext() {
                 "springwolf.docket.servers.test-protocol.host=some-server:1234",
                 "springwolf.plugin.jms.publishing.enabled=false"
             })
+    @MockitoBean(
+            types = {
+                SpringwolfClassScanner.class,
+                ComponentsService.class,
+                HeaderClassExtractor.class,
+                PayloadMethodParameterService.class,
+                StringValueResolver.class,
+                JmsTemplate.class
+            })
     @Nested
-    class JmsProducerWillNotBeCreatedIfDisabledTest extends MockBeanConfiguration {
+    class JmsProducerWillNotBeCreatedIfDisabledTest {
         @Autowired
         private Optional<SpringwolfJmsProducer> springwolfJmsProducer;
 
@@ -84,29 +102,4 @@ void springwolfJmsProducerShouldNotBePresentInSpringContext() {
             assertThat(springwolfJmsController).isNotPresent();
         }
     }
-
-    /**
-     * Introduced due to migration of spring boot 3.3 -> 3.4 and @MockBean deprecation
-     *
-     * feature request: https://github.com/spring-projects/spring-framework/issues/33925
-     */
-    class MockBeanConfiguration {
-        @MockitoBean
-        private SpringwolfClassScanner springwolfClassScanner;
-
-        @MockitoBean
-        private ComponentsService componentsService;
-
-        @MockitoBean
-        private HeaderClassExtractor headerClassExtractor;
-
-        @MockitoBean
-        private PayloadMethodParameterService payloadMethodParameterService;
-
-        @MockitoBean
-        private StringValueResolver stringValueResolver;
-
-        @MockitoBean
-        private JmsTemplate jmsTemplate;
-    }
 }
diff --git a/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/springwolf/plugins/kafka/configuration/SpringwolfKafkaProducerConfigurationIntegrationTest.java b/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/springwolf/plugins/kafka/configuration/SpringwolfKafkaProducerConfigurationIntegrationTest.java
@@ -22,7 +22,6 @@
 
 public class SpringwolfKafkaProducerConfigurationIntegrationTest {
 
-    @Nested
     @SpringJUnitConfig(
             classes = {
                 SpringwolfKafkaAutoConfiguration.class,
@@ -39,7 +38,16 @@ public class SpringwolfKafkaProducerConfigurationIntegrationTest {
                 "springwolf.docket.servers.test-protocol.host=some-server:1234",
                 "springwolf.plugin.kafka.publishing.enabled=true"
             })
-    class KafkaProducerWillBeCreatedIfEnabledTest extends MockBeanConfiguration {
+    @MockitoBean(
+            types = {
+                SpringwolfClassScanner.class,
+                ComponentsService.class,
+                HeaderClassExtractor.class,
+                PayloadMethodParameterService.class,
+                StringValueResolver.class
+            })
+    @Nested
+    class KafkaProducerWillBeCreatedIfEnabledTest {
         @Autowired
         private Optional<SpringwolfKafkaProducer> springwolfKafkaProducer;
 
@@ -53,7 +61,6 @@ void springwolfKafkaTemplateShouldBePresentInSpringContext() {
         }
     }
 
-    @Nested
     @SpringJUnitConfig(
             classes = {
                 SpringwolfKafkaAutoConfiguration.class,
@@ -70,7 +77,16 @@ void springwolfKafkaTemplateShouldBePresentInSpringContext() {
                 "springwolf.docket.servers.test-protocol.host=some-server:1234",
                 "springwolf.plugin.kafka.publishing.enabled=false"
             })
-    class KafkaProducerWillNotBeCreatedIfDisabledTest extends MockBeanConfiguration {
+    @MockitoBean(
+            types = {
+                SpringwolfClassScanner.class,
+                ComponentsService.class,
+                HeaderClassExtractor.class,
+                PayloadMethodParameterService.class,
+                StringValueResolver.class
+            })
+    @Nested
+    class KafkaProducerWillNotBeCreatedIfDisabledTest {
         @Autowired
         private Optional<SpringwolfKafkaProducer> springwolfKafkaProducer;
 
@@ -83,26 +99,4 @@ void springwolfKafkaTemplateShouldNotBePresentInSpringContext() {
             assertThat(springwolfKafkaController).isNotPresent();
         }
     }
-
-    /**
-     * Introduced due to migration of spring boot 3.3 -> 3.4 and @MockBean deprecation
-     *
-     * feature request: https://github.com/spring-projects/spring-framework/issues/33925
-     */
-    class MockBeanConfiguration {
-        @MockitoBean
-        private SpringwolfClassScanner springwolfClassScanner;
-
-        @MockitoBean
-        private ComponentsService componentsService;
-
-        @MockitoBean
-        private HeaderClassExtractor headerClassExtractor;
-
-        @MockitoBean
-        private PayloadMethodParameterService payloadMethodParameterService;
-
-        @MockitoBean
-        private StringValueResolver stringValueResolver;
-    }
 }
diff --git a/springwolf-plugins/springwolf-sns-plugin/src/test/java/io/github/springwolf/plugins/sns/configuration/SpringwolfSnsProducerConfigurationIntegrationTest.java b/springwolf-plugins/springwolf-sns-plugin/src/test/java/io/github/springwolf/plugins/sns/configuration/SpringwolfSnsProducerConfigurationIntegrationTest.java
@@ -39,8 +39,17 @@ public class SpringwolfSnsProducerConfigurationIntegrationTest {
                 "springwolf.docket.servers.test-protocol.host=some-server:1234",
                 "springwolf.plugin.sns.publishing.enabled=true"
             })
+    @MockitoBean(
+            types = {
+                SpringwolfClassScanner.class,
+                ComponentsService.class,
+                HeaderClassExtractor.class,
+                PayloadMethodParameterService.class,
+                StringValueResolver.class,
+                SnsTemplate.class
+            })
     @Nested
-    class SqsProducerWillBeCreatedIfEnabledTest extends MockBeanConfiguration {
+    class SqsProducerWillBeCreatedIfEnabledTest {
         @Autowired
         private Optional<SpringwolfSnsProducer> springwolfSqsProducer;
 
@@ -70,8 +79,17 @@ void springwolfSqsProducerShouldBePresentInSpringContext() {
                 "springwolf.docket.servers.test-protocol.host=some-server:1234",
                 "springwolf.plugin.sns.publishing.enabled=false"
             })
+    @MockitoBean(
+            types = {
+                SpringwolfClassScanner.class,
+                ComponentsService.class,
+                HeaderClassExtractor.class,
+                PayloadMethodParameterService.class,
+                StringValueResolver.class,
+                SnsTemplate.class
+            })
     @Nested
-    class SqsProducerWillNotBeCreatedIfDisabledTest extends MockBeanConfiguration {
+    class SqsProducerWillNotBeCreatedIfDisabledTest {
         @Autowired
         private Optional<SpringwolfSnsProducer> springwolfSqsProducer;
 
@@ -84,29 +102,4 @@ void springwolfSqsProducerShouldNotBePresentInSpringContext() {
             assertThat(springwolfSqsController).isNotPresent();
         }
     }
-
-    /**
-     * Introduced due to migration of spring boot 3.3 -> 3.4 and @MockBean deprecation
-     *
-     * feature request: https://github.com/spring-projects/spring-framework/issues/33925
-     */
-    class MockBeanConfiguration {
-        @MockitoBean
-        private SpringwolfClassScanner springwolfClassScanner;
-
-        @MockitoBean
-        private ComponentsService componentsService;
-
-        @MockitoBean
-        private HeaderClassExtractor headerClassExtractor;
-
-        @MockitoBean
-        private PayloadMethodParameterService payloadMethodParameterService;
-
-        @MockitoBean
-        private StringValueResolver stringValueResolver;
-
-        @MockitoBean
-        private SnsTemplate snsTemplate;
-    }
 }
diff --git a/springwolf-plugins/springwolf-sqs-plugin/src/test/java/io/github/springwolf/plugins/sqs/configuration/SpringwolfSqsProducerConfigurationIntegrationTest.java b/springwolf-plugins/springwolf-sqs-plugin/src/test/java/io/github/springwolf/plugins/sqs/configuration/SpringwolfSqsProducerConfigurationIntegrationTest.java
@@ -39,8 +39,9 @@ public class SpringwolfSqsProducerConfigurationIntegrationTest {
                 "springwolf.docket.servers.test-protocol.host=some-server:1234",
                 "springwolf.plugin.sqs.publishing.enabled=true"
             })
+    @MockitoBean(types = {SpringwolfClassScanner.class, ComponentService.class, HeaderClassExtractor.class, PayloadMethodParameterService.class, StringValueResolver.class, SqsTemplate.class})
     @Nested
-    class SqsProducerWillBeCreatedIfEnabledTest extends MockBeanConfiguration {
+    class SqsProducerWillBeCreatedIfEnabledTest {
         @Autowired
         private Optional<SpringwolfSqsProducer> springwolfSqsProducer;
 
@@ -70,8 +71,9 @@ void springwolfSqsProducerShouldBePresentInSpringContext() {
                 "springwolf.docket.servers.test-protocol.host=some-server:1234",
                 "springwolf.plugin.sqs.publishing.enabled=false"
             })
+    @MockitoBean(types = {SpringwolfClassScanner.class, ComponentService.class, HeaderClassExtractor.class, PayloadMethodParameterService.class, StringValueResolver.class, SqsTemplate.class})
     @Nested
-    class SqsProducerWillNotBeCreatedIfDisabledTest extends MockBeanConfiguration {
+    class SqsProducerWillNotBeCreatedIfDisabledTest {
         @Autowired
         private Optional<SpringwolfSqsProducer> springwolfSqsProducer;
 
@@ -85,28 +87,4 @@ void springwolfSqsProducerShouldNotBePresentInSpringContext() {
         }
     }
 
-    /**
-     * Introduced due to migration of spring boot 3.3 -> 3.4 and @MockBean deprecation
-     *
-     * feature request: https://github.com/spring-projects/spring-framework/issues/33925
-     */
-    class MockBeanConfiguration {
-        @MockitoBean
-        private SpringwolfClassScanner springwolfClassScanner;
-
-        @MockitoBean
-        private ComponentsService componentsService;
-
-        @MockitoBean
-        private HeaderClassExtractor headerClassExtractor;
-
-        @MockitoBean
-        private PayloadMethodParameterService payloadMethodParameterService;
-
-        @MockitoBean
-        private StringValueResolver stringValueResolver;
-
-        @MockitoBean
-        private SqsTemplate sqsTemplate;
-    }
 }
