mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:26:12 +08:00
Fix ConditionalOnProperty when used in an aliased composed annotation
See gh-30505
This commit is contained in:
parent
09ec409184
commit
dc57ad54d5
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2012-2019 the original author or authors.
|
* Copyright 2012-2022 the original author or authors.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@ -17,20 +17,22 @@
|
|||||||
package org.springframework.boot.autoconfigure.condition;
|
package org.springframework.boot.autoconfigure.condition;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionMessage.Style;
|
import org.springframework.boot.autoconfigure.condition.ConditionMessage.Style;
|
||||||
import org.springframework.context.annotation.Condition;
|
import org.springframework.context.annotation.Condition;
|
||||||
import org.springframework.context.annotation.ConditionContext;
|
import org.springframework.context.annotation.ConditionContext;
|
||||||
import org.springframework.core.Ordered;
|
import org.springframework.core.Ordered;
|
||||||
import org.springframework.core.annotation.AnnotationAttributes;
|
import org.springframework.core.annotation.AnnotationAttributes;
|
||||||
|
import org.springframework.core.annotation.MergedAnnotation;
|
||||||
|
import org.springframework.core.annotation.MergedAnnotation.Adapt;
|
||||||
|
import org.springframework.core.annotation.MergedAnnotationPredicates;
|
||||||
import org.springframework.core.annotation.Order;
|
import org.springframework.core.annotation.Order;
|
||||||
import org.springframework.core.env.PropertyResolver;
|
import org.springframework.core.env.PropertyResolver;
|
||||||
import org.springframework.core.type.AnnotatedTypeMetadata;
|
import org.springframework.core.type.AnnotatedTypeMetadata;
|
||||||
import org.springframework.util.Assert;
|
import org.springframework.util.Assert;
|
||||||
import org.springframework.util.MultiValueMap;
|
|
||||||
import org.springframework.util.StringUtils;
|
import org.springframework.util.StringUtils;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -47,8 +49,12 @@ class OnPropertyCondition extends SpringBootCondition {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ConditionOutcome getMatchOutcome(ConditionContext context, AnnotatedTypeMetadata metadata) {
|
public ConditionOutcome getMatchOutcome(ConditionContext context, AnnotatedTypeMetadata metadata) {
|
||||||
List<AnnotationAttributes> allAnnotationAttributes = annotationAttributesFromMultiValueMap(
|
Adapt[] adaptations = Adapt.values(false, true);
|
||||||
metadata.getAllAnnotationAttributes(ConditionalOnProperty.class.getName()));
|
List<AnnotationAttributes> allAnnotationAttributes = metadata.getAnnotations()
|
||||||
|
.stream(ConditionalOnProperty.class.getName())
|
||||||
|
.filter(MergedAnnotationPredicates.unique(MergedAnnotation::getMetaTypes))
|
||||||
|
.map((annotation) -> annotation.asAnnotationAttributes(adaptations)).collect(Collectors.toList());
|
||||||
|
|
||||||
List<ConditionMessage> noMatch = new ArrayList<>();
|
List<ConditionMessage> noMatch = new ArrayList<>();
|
||||||
List<ConditionMessage> match = new ArrayList<>();
|
List<ConditionMessage> match = new ArrayList<>();
|
||||||
for (AnnotationAttributes annotationAttributes : allAnnotationAttributes) {
|
for (AnnotationAttributes annotationAttributes : allAnnotationAttributes) {
|
||||||
@ -61,29 +67,6 @@ class OnPropertyCondition extends SpringBootCondition {
|
|||||||
return ConditionOutcome.match(ConditionMessage.of(match));
|
return ConditionOutcome.match(ConditionMessage.of(match));
|
||||||
}
|
}
|
||||||
|
|
||||||
private List<AnnotationAttributes> annotationAttributesFromMultiValueMap(
|
|
||||||
MultiValueMap<String, Object> multiValueMap) {
|
|
||||||
List<Map<String, Object>> maps = new ArrayList<>();
|
|
||||||
multiValueMap.forEach((key, value) -> {
|
|
||||||
for (int i = 0; i < value.size(); i++) {
|
|
||||||
Map<String, Object> map;
|
|
||||||
if (i < maps.size()) {
|
|
||||||
map = maps.get(i);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
map = new HashMap<>();
|
|
||||||
maps.add(map);
|
|
||||||
}
|
|
||||||
map.put(key, value.get(i));
|
|
||||||
}
|
|
||||||
});
|
|
||||||
List<AnnotationAttributes> annotationAttributes = new ArrayList<>(maps.size());
|
|
||||||
for (Map<String, Object> map : maps) {
|
|
||||||
annotationAttributes.add(AnnotationAttributes.fromMap(map));
|
|
||||||
}
|
|
||||||
return annotationAttributes;
|
|
||||||
}
|
|
||||||
|
|
||||||
private ConditionOutcome determineOutcome(AnnotationAttributes annotationAttributes, PropertyResolver resolver) {
|
private ConditionOutcome determineOutcome(AnnotationAttributes annotationAttributes, PropertyResolver resolver) {
|
||||||
Spec spec = new Spec(annotationAttributes);
|
Spec spec = new Spec(annotationAttributes);
|
||||||
List<String> missingProperties = new ArrayList<>();
|
List<String> missingProperties = new ArrayList<>();
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2012-2021 the original author or authors.
|
* Copyright 2012-2022 the original author or authors.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@ -31,6 +31,7 @@ import org.springframework.boot.test.util.TestPropertyValues;
|
|||||||
import org.springframework.context.ConfigurableApplicationContext;
|
import org.springframework.context.ConfigurableApplicationContext;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
import org.springframework.context.annotation.Configuration;
|
||||||
|
import org.springframework.core.annotation.AliasFor;
|
||||||
import org.springframework.core.env.ConfigurableEnvironment;
|
import org.springframework.core.env.ConfigurableEnvironment;
|
||||||
import org.springframework.core.env.StandardEnvironment;
|
import org.springframework.core.env.StandardEnvironment;
|
||||||
|
|
||||||
@ -246,6 +247,25 @@ class ConditionalOnPropertyTests {
|
|||||||
assertThat(this.context.containsBean("foo")).isTrue();
|
assertThat(this.context.containsBean("foo")).isTrue();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void metaAnnotationWithAliasConditionMatchesWhenPropertyIsSet() {
|
||||||
|
load(MetaAnnotationWithAlias.class, "my.feature.enabled=true");
|
||||||
|
assertThat(this.context.containsBean("foo")).isTrue();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void metaAndDirectAnnotationWithAliasConditionDoesNotMatchWhenOnlyMetaPropertyIsSet() {
|
||||||
|
load(MetaAnnotationAndDirectAnnotationWithAlias.class, "my.feature.enabled=true");
|
||||||
|
assertThat(this.context.containsBean("foo")).isFalse();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void metaAndDirectAnnotationWithAliasConditionMatchesWhenBothPropertiesAreSet() {
|
||||||
|
load(MetaAnnotationAndDirectAnnotationWithAlias.class, "my.feature.enabled=true",
|
||||||
|
"my.other.feature.enabled=true");
|
||||||
|
assertThat(this.context.containsBean("foo")).isTrue();
|
||||||
|
}
|
||||||
|
|
||||||
private void load(Class<?> config, String... environment) {
|
private void load(Class<?> config, String... environment) {
|
||||||
TestPropertyValues.of(environment).applyTo(this.environment);
|
TestPropertyValues.of(environment).applyTo(this.environment);
|
||||||
this.context = new SpringApplicationBuilder(config).environment(this.environment).web(WebApplicationType.NONE)
|
this.context = new SpringApplicationBuilder(config).environment(this.environment).web(WebApplicationType.NONE)
|
||||||
@ -416,4 +436,37 @@ class ConditionalOnPropertyTests {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Configuration(proxyBeanMethods = false)
|
||||||
|
@ConditionalOnMyFeatureWithAlias("my.feature")
|
||||||
|
static class MetaAnnotationWithAlias {
|
||||||
|
|
||||||
|
@Bean
|
||||||
|
String foo() {
|
||||||
|
return "foo";
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Configuration(proxyBeanMethods = false)
|
||||||
|
@ConditionalOnMyFeatureWithAlias("my.feature")
|
||||||
|
@ConditionalOnProperty(prefix = "my.other.feature", name = "enabled", havingValue = "true")
|
||||||
|
static class MetaAnnotationAndDirectAnnotationWithAlias {
|
||||||
|
|
||||||
|
@Bean
|
||||||
|
String foo() {
|
||||||
|
return "foo";
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Retention(RetentionPolicy.RUNTIME)
|
||||||
|
@Target({ ElementType.TYPE, ElementType.METHOD })
|
||||||
|
@ConditionalOnProperty(name = "enabled", havingValue = "true")
|
||||||
|
@interface ConditionalOnMyFeatureWithAlias {
|
||||||
|
|
||||||
|
@AliasFor(annotation = ConditionalOnProperty.class, attribute = "prefix")
|
||||||
|
String value();
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user