root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #38510 from quaff 

* gh-38510:
  Polish "Treat null as CloudPlatform.NONE"
  Treat null as CloudPlatform.NONE

Closes gh-38510
This commit is contained in:
Andy Wilkinson 2024-01-05 16:48:47 +00:00
parent 71a155677d c3a5e7695a
commit 77b533b5f3
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataProperties.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2023 the original author or authors. * Copyright 2012-2024 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.
@ -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,8 +119,8 @@ class ConfigDataProperties {
if (activationContext == null) { if (activationContext == null) {
return false; return false;
} }
boolean activate = true; CloudPlatform cloudPlatform = activationContext.getCloudPlatform();
activate = activate && isActive(activationContext.getCloudPlatform()); boolean activate = isActive((cloudPlatform != null) ? cloudPlatform : CloudPlatform.NONE);
activate = activate && isActive(activationContext.getProfiles()); activate = activate && isActive(activationContext.getProfiles());
return activate; return activate;
} }

10
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataPropertiesTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2023 the original author or authors. * Copyright 2012-2024 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.
@ -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 isActiveWhenNoneCloudPlatformAgainstNullCloudPlatform() {
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));