Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified .DS_Store
Binary file not shown.
4 changes: 2 additions & 2 deletions 3.5/demo-app/src/main/java/com/example/demo/AppConfig.java
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package com.example.demo;

import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

import java.util.List;

@AutoConfiguration
@Configuration(proxyBeanMethods = false)
public class AppConfig {

@Bean
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,14 @@

import com.example.library.Bar;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

@AutoConfiguration(before = AppConfig.class, afterName = "com.example.library.BarAutoConfiguration")
@ConditionalOnClass(Bar.class)
@ConditionalOnBean(Bar.class)
public class FooConfig {
public class FooAutoConfiguration {

@Bean
public Foo foo(Bar bar) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
com.example.demo.AppConfig
com.example.demo.FooConfig
com.example.demo.FooAutoConfiguration
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
package com.example.demo;

import com.example.library.Bar;
import com.example.library.EnableBarTest;
import com.example.library.BarAutoConfiguration;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;

import static org.assertj.core.api.AssertionsForClassTypes.assertThat;

@SpringBootTest(classes = {AppConfig.class, FooConfig.class}, properties = {"debug=true"})
@EnableBarTest
@SpringBootTest(classes = AppConfig.class, properties = {"debug=true"})
@ImportAutoConfiguration({BarAutoConfiguration.class, FooAutoConfiguration.class})
public class FooConsumerTest {

@MockitoSpyBean
Expand Down