spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-17 12:09:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '4.0.x' into 4.1.x

Browse Source 
Closes gh-51584
This commit is contained in:
Andy Wilkinson
2026-09-04 12:58:36 +01:00
parent 14536633ec 3d731beaa1
commit 61a62d56d8
3 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/spring-boot/src/main/java/org/springframework/boot/support/SpringApplicationJsonEnvironmentPostProcessor.java
+1 -1
View File
@@ -128,7 +128,7 @@ public class SpringApplicationJsonEnvironmentPostProcessor implements Environmen
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
private void extract(String name, Map<String, Object> result, Object value) { private void extract(String name, Map<String, Object> result, @Nullable Object value) {
if (value instanceof Map<?, ?> map) { if (value instanceof Map<?, ?> map) {
if (CollectionUtils.isEmpty(map)) { if (CollectionUtils.isEmpty(map)) {
result.put(name, value); result.put(name, value);
module/spring-boot-cloudfoundry/src/main/java/org/springframework/boot/cloudfoundry/autoconfigure/actuate/endpoint/reactive/SecurityService.java
+1
View File
@@ -153,6 +153,7 @@ class SecurityService {
Assert.state(keys != null, "'keys' must not be null"); Assert.state(keys != null, "'keys' must not be null");
for (Object key : keys) { for (Object key : keys) {
Map<?, ?> tokenKey = (Map<?, ?>) key; Map<?, ?> tokenKey = (Map<?, ?>) key;
Assert.state(tokenKey != null, "'tokenKey' must not be null");
tokenKeys.put((String) tokenKey.get("kid"), (String) tokenKey.get("value")); tokenKeys.put((String) tokenKey.get("kid"), (String) tokenKey.get("value"));
} }
return tokenKeys; return tokenKeys;
module/spring-boot-cloudfoundry/src/main/java/org/springframework/boot/cloudfoundry/autoconfigure/actuate/endpoint/servlet/SecurityService.java
+1
View File
@@ -118,6 +118,7 @@ class SecurityService {
Assert.state(keys != null, "'keys' must not be null"); Assert.state(keys != null, "'keys' must not be null");
for (Object key : keys) { for (Object key : keys) {
Map<?, ?> tokenKey = (Map<?, ?>) key; Map<?, ?> tokenKey = (Map<?, ?>) key;
Assert.state(tokenKey != null, "'tokenKey' must not be null");
tokenKeys.put((String) tokenKey.get("kid"), (String) tokenKey.get("value")); tokenKeys.put((String) tokenKey.get("kid"), (String) tokenKey.get("value"));
} }
return tokenKeys; return tokenKeys;