Commit 75639aa6 authored by Johnny Lim's avatar Johnny Lim Committed by Stephane Nicoll

Polish

Closes gh-13192
parent c271f8ef
...@@ -16,10 +16,10 @@ ...@@ -16,10 +16,10 @@
package org.springframework.boot.actuate.health; package org.springframework.boot.actuate.health;
import java.util.ArrayList;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors;
/** /**
* Base {@link HealthAggregator} implementation to allow subclasses to focus on * Base {@link HealthAggregator} implementation to allow subclasses to focus on
...@@ -33,8 +33,8 @@ public abstract class AbstractHealthAggregator implements HealthAggregator { ...@@ -33,8 +33,8 @@ public abstract class AbstractHealthAggregator implements HealthAggregator {
@Override @Override
public final Health aggregate(Map<String, Health> healths) { public final Health aggregate(Map<String, Health> healths) {
List<Status> statusCandidates = new ArrayList<>(); List<Status> statusCandidates = healths.values().stream()
healths.values().forEach((health) -> statusCandidates.add(health.getStatus())); .map(Health::getStatus).collect(Collectors.toList());
Status status = aggregateStatus(statusCandidates); Status status = aggregateStatus(statusCandidates);
Map<String, Object> details = aggregateDetails(healths); Map<String, Object> details = aggregateDetails(healths);
return new Health.Builder(status, details).build(); return new Health.Builder(status, details).build();
......
...@@ -333,9 +333,9 @@ ...@@ -333,9 +333,9 @@
<expandproperties /> <expandproperties />
</filterchain> </filterchain>
</copy> </copy>
<attachartifact file="${project.build.directory}/homebrew/springboot.rb" <attachartifact file="${project.build.directory}/homebrew/springboot.rb"
classifier="homebrew" type="rb" /> classifier="homebrew" type="rb" />
</target> </target>
</configuration> </configuration>
</execution> </execution>
<execution> <execution>
......
...@@ -1365,7 +1365,7 @@ use `setStatus(int)` rather `sendError(int)`. This prevents Jersey from committi ...@@ -1365,7 +1365,7 @@ use `setStatus(int)` rather `sendError(int)`. This prevents Jersey from committi
response before Spring Security has had an opportunity to report an authentication or response before Spring Security has had an opportunity to report an authentication or
authorization failure to the client. authorization failure to the client.
The `jersey.config.server.response.setStatusOverSendError` proeprty must be set to `true` The `jersey.config.server.response.setStatusOverSendError` property must be set to `true`
on the application's `ResourceConfig` bean, as shown in the following example: on the application's `ResourceConfig` bean, as shown in the following example:
[source,java,indent=0] [source,java,indent=0]
......
...@@ -68,7 +68,7 @@ import org.springframework.util.StringUtils; ...@@ -68,7 +68,7 @@ import org.springframework.util.StringUtils;
public class ModifiedClassPathRunner extends BlockJUnit4ClassRunner { public class ModifiedClassPathRunner extends BlockJUnit4ClassRunner {
private static final Pattern INTELLIJ_CLASSPATH_JAR_PATTERN = Pattern private static final Pattern INTELLIJ_CLASSPATH_JAR_PATTERN = Pattern
.compile(".*classpath(\\d+)?.jar"); .compile(".*classpath(\\d+)?\\.jar");
public ModifiedClassPathRunner(Class<?> testClass) throws InitializationError { public ModifiedClassPathRunner(Class<?> testClass) throws InitializationError {
super(testClass); super(testClass);
......
...@@ -28,6 +28,7 @@ import java.util.List; ...@@ -28,6 +28,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.Set; import java.util.Set;
import java.util.stream.Collectors;
import javax.servlet.Filter; import javax.servlet.Filter;
import javax.servlet.MultipartConfigElement; import javax.servlet.MultipartConfigElement;
...@@ -78,11 +79,9 @@ public class ServletContextInitializerBeans ...@@ -78,11 +79,9 @@ public class ServletContextInitializerBeans
this.initializers = new LinkedMultiValueMap<>(); this.initializers = new LinkedMultiValueMap<>();
addServletContextInitializerBeans(beanFactory); addServletContextInitializerBeans(beanFactory);
addAdaptableBeans(beanFactory); addAdaptableBeans(beanFactory);
List<ServletContextInitializer> sortedInitializers = new ArrayList<>(); List<ServletContextInitializer> sortedInitializers = this.initializers.values().stream()
this.initializers.values().forEach((contextInitializers) -> { .flatMap(value -> value.stream().sorted(AnnotationAwareOrderComparator.INSTANCE))
AnnotationAwareOrderComparator.sort(contextInitializers); .collect(Collectors.toList());
sortedInitializers.addAll(contextInitializers);
});
this.sortedList = Collections.unmodifiableList(sortedInitializers); this.sortedList = Collections.unmodifiableList(sortedInitializers);
} }
......
...@@ -107,12 +107,6 @@ public class MockConfigurationPropertySource ...@@ -107,12 +107,6 @@ public class MockConfigurationPropertySource
return MockConfigurationPropertySource.this.getConfigurationProperty(name); return MockConfigurationPropertySource.this.getConfigurationProperty(name);
} }
@Override
public ConfigurationPropertyState containsDescendantOf(
ConfigurationPropertyName name) {
return ConfigurationPropertyState.UNKNOWN;
}
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment