Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #42049 from abc5259

Browse Source 
* pr/42049:
  Apply instanceof pattern matching

Closes gh-42049
This commit is contained in:
Phillip Webb
2024-09-01 19:08:22 -07:00
parent 53e7371ef5 d0fe5c24d2
commit af2474b7ad
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/builder/ParentContextApplicationContextInitializer.java
View File

@@ -72,8 +72,9 @@ public class ParentContextApplicationContextInitializer
@Override
public void onApplicationEvent(ContextRefreshedEvent event) {
ApplicationContext context = event.getApplicationContext();
if (context instanceof ConfigurableApplicationContext && context == event.getSource()) {
context.publishEvent(new ParentContextAvailableEvent((ConfigurableApplicationContext) context));
if (context instanceof ConfigurableApplicationContext configurableApplicationContext
&& context == event.getSource()) {
context.publishEvent(new ParentContextAvailableEvent(configurableApplicationContext));
}
}

3
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/cloud/CloudFoundryVcapEnvironmentPostProcessor.java
View File

@@ -201,9 +201,8 @@ public class CloudFoundryVcapEnvironmentPostProcessor implements EnvironmentPost
// Need a compound key
flatten(properties, (Map<String, Object>) value, name);
}
else if (value instanceof Collection) {
else if (value instanceof Collection<?> collection) {
// Need a compound key
Collection<Object> collection = (Collection<Object>) value;
properties.put(name, StringUtils.collectionToCommaDelimitedString(collection));
int count = 0;
for (Object item : collection) {