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

Polish "Iterate map by using lambda function"

Browse Source 
See gh-12528
This commit is contained in:
Phillip Webb
2018-03-19 08:00:36 -04:00
parent ffc883b005
commit 78534a753d
9 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/AbstractHealthAggregator.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2017 the original author or authors.
* Copyright 2012-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -34,7 +34,7 @@ public abstract class AbstractHealthAggregator implements HealthAggregator {
@Override
public final Health aggregate(Map<String, Health> healths) {
List<Status> statusCandidates = new ArrayList<>();
healths.values().forEach(health -> statusCandidates.add(health.getStatus()));
healths.values().forEach((health) -> statusCandidates.add(health.getStatus()));
Status status = aggregateStatus(statusCandidates);
Map<String, Object> details = aggregateDetails(healths);
return new Health.Builder(status, details).build();

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

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2017 the original author or authors.
* Copyright 2012-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -196,39 +196,39 @@ public class CloudFoundryVcapEnvironmentPostProcessor
@SuppressWarnings("unchecked")
private void flatten(Properties properties, Map<String, Object> input, String path) {
input.forEach((entryKey, value) -> {
String key = getFullKey(path, entryKey);
input.forEach((key, value) -> {
String name = getPropertyName(path, key);
if (value instanceof Map) {
// Need a compound key
flatten(properties, (Map<String, Object>) value, key);
flatten(properties, (Map<String, Object>) value, name);
}
else if (value instanceof Collection) {
// Need a compound key
Collection<Object> collection = (Collection<Object>) value;
properties.put(key,
properties.put(name,
StringUtils.collectionToCommaDelimitedString(collection));
int count = 0;
for (Object item : collection) {
String itemKey = "[" + (count++) + "]";
flatten(properties, Collections.singletonMap(itemKey, item), key);
flatten(properties, Collections.singletonMap(itemKey, item), name);
}
}
else if (value instanceof String) {
properties.put(key, value);
properties.put(name, value);
}
else if (value instanceof Number) {
properties.put(key, value.toString());
properties.put(name, value.toString());
}
else if (value instanceof Boolean) {
properties.put(key, value.toString());
properties.put(name, value.toString());
}
else {
properties.put(key, value == null ? "" : value);
properties.put(name, value == null ? "" : value);
}
});
}
private String getFullKey(String path, String key) {
private String getPropertyName(String path, String key) {
if (!StringUtils.hasText(path)) {
return key;
}

4
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyServletWebServerFactory.java
View File

@@ -246,8 +246,8 @@ public class JettyServletWebServerFactory extends AbstractServletWebServerFactor
}
private void addLocaleMappings(WebAppContext context) {
getLocaleCharsetMappings().forEach((locale, charset) ->
context.addLocaleEncoding(locale.toString(), charset.toString()));
getLocaleCharsetMappings().forEach((locale, charset) -> context
.addLocaleEncoding(locale.toString(), charset.toString()));
}
private File getTempDirectory() {

5
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactory.java
View File

@@ -232,8 +232,9 @@ public class TomcatServletWebServerFactory extends AbstractServletWebServerFacto
}
private void addLocaleMappings(TomcatEmbeddedContext context) {
getLocaleCharsetMappings().forEach((locale, charset) ->
context.addLocaleEncodingMappingParameter(locale.toString(), charset.toString()));
getLocaleCharsetMappings()
.forEach((locale, charset) -> context.addLocaleEncodingMappingParameter(
locale.toString(), charset.toString()));
}
private void configureTldSkipPatterns(TomcatEmbeddedContext context) {

6
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/FileSessionPersistence.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2017 the original author or authors.
* Copyright 2012-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -69,8 +69,8 @@ class FileSessionPersistence implements SessionPersistenceManager {
private void save(Map<String, PersistentSession> sessionData,
ObjectOutputStream stream) throws IOException {
Map<String, Serializable> session = new LinkedHashMap<>();
sessionData.forEach((key, value) ->
session.put(key, new SerializablePersistentSession(value)));
sessionData.forEach((key, value) -> session.put(key,
new SerializablePersistentSession(value)));
stream.writeObject(session);
}

4
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowServletWebServerFactory.java
View File

@@ -328,8 +328,8 @@ public class UndertowServletWebServerFactory extends AbstractServletWebServerFac
}
private void addLocaleMappings(DeploymentInfo deployment) {
getLocaleCharsetMappings().forEach((locale, charset) ->
deployment.addLocaleCharsetMapping(locale.toString(), charset.toString()));
getLocaleCharsetMappings().forEach((locale, charset) -> deployment
.addLocaleCharsetMapping(locale.toString(), charset.toString()));
}
private void registerServletContainerInitializerToDriveServletContextInitializers(

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/MimeMappings.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2017 the original author or authors.
* Copyright 2012-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletContextInitializerBeans.java
View File

@@ -79,7 +79,7 @@ public class ServletContextInitializerBeans
addServletContextInitializerBeans(beanFactory);
addAdaptableBeans(beanFactory);
List<ServletContextInitializer> sortedInitializers = new ArrayList<>();
this.initializers.values().forEach(contextInitializers -> {
this.initializers.values().forEach((contextInitializers) -> {
AnnotationAwareOrderComparator.sort(contextInitializers);
sortedInitializers.addAll(contextInitializers);
});

2
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/SystemEnvironmentPropertySourceEnvironmentPostProcessorTests.java vendored
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2017 the original author or authors.
* Copyright 2012-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.