mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge branch '1.5.x'
This commit is contained in:
commit
33bd7ccc91
@ -53,8 +53,8 @@ public @interface ConditionalOnSingleCandidate {
|
||||
* specified is contained in the {@link ApplicationContext} and a primary candidate
|
||||
* exists in case of multiple instances.
|
||||
* <p>
|
||||
* This attribute may <strong>not</strong> be used in conjunction with {@link #type()}
|
||||
* , but it may be used instead of {@link #type()}.
|
||||
* This attribute may <strong>not</strong> be used in conjunction with
|
||||
* {@link #type()}, but it may be used instead of {@link #type()}.
|
||||
* @return the class type of the bean to check
|
||||
*/
|
||||
Class<?> value() default Object.class;
|
||||
|
@ -28,10 +28,10 @@ import org.springframework.util.StringUtils;
|
||||
|
||||
/**
|
||||
* {@link PropertyResolver} for {@link AnsiStyle}, {@link AnsiColor} and
|
||||
* {@link AnsiBackground} elements. Supports properties of the form {@code AnsiStyle.BOLD}
|
||||
* , {@code AnsiColor.RED} or {@code AnsiBackground.GREEN}. Also supports a prefix of
|
||||
* {@code Ansi.} which is an aggregation of everything (with background colors prefixed
|
||||
* {@code BG_}).
|
||||
* {@link AnsiBackground} elements. Supports properties of the form
|
||||
* {@code AnsiStyle.BOLD}, {@code AnsiColor.RED} or {@code AnsiBackground.GREEN}. Also
|
||||
* supports a prefix of {@code Ansi.} which is an aggregation of everything (with
|
||||
* background colors prefixed {@code BG_}).
|
||||
*
|
||||
* @author Phillip Webb
|
||||
* @since 1.3.0
|
||||
|
Loading…
Reference in New Issue
Block a user