diff --git a/spring-boot/src/test/java/com/baeldung/beandefinitionoverrideexception/SpringBootBeanDefinitionOverrideExceptionIntegrationTest.java b/spring-boot/src/test/java/com/baeldung/beandefinitionoverrideexception/SpringBootBeanDefinitionOverrideExceptionIntegrationTest.java index 17787a86a8..c900bab26c 100644 --- a/spring-boot/src/test/java/com/baeldung/beandefinitionoverrideexception/SpringBootBeanDefinitionOverrideExceptionIntegrationTest.java +++ b/spring-boot/src/test/java/com/baeldung/beandefinitionoverrideexception/SpringBootBeanDefinitionOverrideExceptionIntegrationTest.java @@ -5,7 +5,6 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.ApplicationContext; -import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.Assertions.assertThat; diff --git a/spring-boot/src/test/java/com/baeldung/beandefinitionoverrideexception/TestConfiguration1.java b/spring-boot/src/test/java/com/baeldung/beandefinitionoverrideexception/TestConfiguration1.java index d22c4388ae..a0e8ea3028 100644 --- a/spring-boot/src/test/java/com/baeldung/beandefinitionoverrideexception/TestConfiguration1.java +++ b/spring-boot/src/test/java/com/baeldung/beandefinitionoverrideexception/TestConfiguration1.java @@ -1,11 +1,9 @@ package com.baeldung.beandefinitionoverrideexception; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; @Configuration -@ComponentScan() public class TestConfiguration1 { class TestBean1 { @@ -16,10 +14,13 @@ public class TestConfiguration1 { return name; } + public void setName(String name) { + this.name = name; + } } @Bean - public TestBean1 testBean(){ + public TestBean1 testBean() { return new TestBean1(); } diff --git a/spring-boot/src/test/java/com/baeldung/beandefinitionoverrideexception/TestConfiguration2.java b/spring-boot/src/test/java/com/baeldung/beandefinitionoverrideexception/TestConfiguration2.java index 1a96240002..842b84c866 100644 --- a/spring-boot/src/test/java/com/baeldung/beandefinitionoverrideexception/TestConfiguration2.java +++ b/spring-boot/src/test/java/com/baeldung/beandefinitionoverrideexception/TestConfiguration2.java @@ -2,7 +2,6 @@ package com.baeldung.beandefinitionoverrideexception; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.stereotype.Component; @Configuration public class TestConfiguration2 { @@ -15,10 +14,14 @@ public class TestConfiguration2 { return name; } + public void setName(String name) { + this.name = name; + } + } @Bean - public TestBean2 testBean(){ + public TestBean2 testBean() { return new TestBean2(); }