mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Treat null as CloudPlatform.NONE
See gh-38510
This commit is contained in:
parent
71a155677d
commit
01bb806672
@ -32,6 +32,7 @@ import org.springframework.util.ObjectUtils;
|
|||||||
*
|
*
|
||||||
* @author Phillip Webb
|
* @author Phillip Webb
|
||||||
* @author Madhura Bhave
|
* @author Madhura Bhave
|
||||||
|
* @author Yanming Zhou
|
||||||
*/
|
*/
|
||||||
class ConfigDataProperties {
|
class ConfigDataProperties {
|
||||||
|
|
||||||
@ -118,14 +119,14 @@ class ConfigDataProperties {
|
|||||||
if (activationContext == null) {
|
if (activationContext == null) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
boolean activate = true;
|
boolean activate = isActive(activationContext.getCloudPlatform());
|
||||||
activate = activate && isActive(activationContext.getCloudPlatform());
|
|
||||||
activate = activate && isActive(activationContext.getProfiles());
|
activate = activate && isActive(activationContext.getProfiles());
|
||||||
return activate;
|
return activate;
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean isActive(CloudPlatform cloudPlatform) {
|
private boolean isActive(CloudPlatform cloudPlatform) {
|
||||||
return this.onCloudPlatform == null || this.onCloudPlatform == cloudPlatform;
|
return this.onCloudPlatform == null || this.onCloudPlatform == CloudPlatform.NONE && cloudPlatform == null
|
||||||
|
|| this.onCloudPlatform == cloudPlatform;
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean isActive(Profiles profiles) {
|
private boolean isActive(Profiles profiles) {
|
||||||
|
@ -35,6 +35,7 @@ import static org.assertj.core.api.Assertions.assertThat;
|
|||||||
*
|
*
|
||||||
* @author Phillip Webb
|
* @author Phillip Webb
|
||||||
* @author Madhura Bhave
|
* @author Madhura Bhave
|
||||||
|
* @author Yanming Zhou
|
||||||
*/
|
*/
|
||||||
class ConfigDataPropertiesTests {
|
class ConfigDataPropertiesTests {
|
||||||
|
|
||||||
@ -98,6 +99,13 @@ class ConfigDataPropertiesTests {
|
|||||||
assertThat(properties.isActive(context)).isFalse();
|
assertThat(properties.isActive(context)).isFalse();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void isActiveWhenSpecificNoneCloudPlatformAgainstNullCloudPlatform() {
|
||||||
|
ConfigDataProperties properties = new ConfigDataProperties(NO_IMPORTS, new Activate(CloudPlatform.NONE, null));
|
||||||
|
ConfigDataActivationContext context = new ConfigDataActivationContext(NULL_CLOUD_PLATFORM, NULL_PROFILES);
|
||||||
|
assertThat(properties.isActive(context)).isTrue();
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void isActiveWhenNullProfilesAgainstNullProfiles() {
|
void isActiveWhenNullProfilesAgainstNullProfiles() {
|
||||||
ConfigDataProperties properties = new ConfigDataProperties(NO_IMPORTS, new Activate(null, null));
|
ConfigDataProperties properties = new ConfigDataProperties(NO_IMPORTS, new Activate(null, null));
|
||||||
|
Loading…
Reference in New Issue
Block a user