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

Merge branch '2.4.x'

This commit is contained in:
Phillip Webb 2020-12-15 19:49:15 -08:00
parent f855256687 4fba7d0c60
commit 308c2042ee
6 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryWebEndpointServletHandlerMapping.java
View File

@ -25,6 +25,9 @@ import java.util.stream.Collectors;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.boot.actuate.autoconfigure.cloudfoundry.AccessLevel;
import org.springframework.boot.actuate.autoconfigure.cloudfoundry.SecurityResponse;
import org.springframework.boot.actuate.endpoint.EndpointId;
@ -51,6 +54,8 @@ import org.springframework.web.servlet.mvc.method.RequestMappingInfoHandlerMappi
*/
class CloudFoundryWebEndpointServletHandlerMapping extends AbstractWebMvcEndpointHandlerMapping {
private static final Log logger = LogFactory.getLog(CloudFoundryWebEndpointServletHandlerMapping.class);
private final CloudFoundrySecurityInterceptor securityInterceptor;
private final EndpointLinksResolver linksResolver;

4
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/MockedDriverConfiguration.java
View File

@ -16,7 +16,7 @@
package org.springframework.boot.autoconfigure.data.neo4j;
import org.mockito.Mockito;
import org.mockito.ArgumentMatchers;
import org.neo4j.driver.Driver;
import org.neo4j.driver.Session;
import org.neo4j.driver.SessionConfig;
@ -43,7 +43,7 @@ class MockedDriverConfiguration {
TypeSystem typeSystem = mock(TypeSystem.class);
Session session = mock(Session.class);
given(driver.defaultTypeSystem()).willReturn(typeSystem);
given(driver.session(Mockito.any(SessionConfig.class))).willReturn(session);
given(driver.session(ArgumentMatchers.any(SessionConfig.class))).willReturn(session);
return driver;
}

2
spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/AbstractPackagerTests.java
View File

@ -644,7 +644,7 @@ abstract class AbstractPackagerTests<P extends Packager> {
private static final Layer DEFAULT_LAYER = new Layer("default");
private Set<Layer> layers = new LinkedHashSet<Layer>();
private Set<Layer> layers = new LinkedHashSet<>();
private Map<String, Layer> libraries = new HashMap<>();

2
spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/JarFileTests.java
View File

@ -643,7 +643,7 @@ class JarFileTests {
@Test
void iterator() {
Iterator<JarEntry> iterator = this.jarFile.iterator();
List<String> names = new ArrayList<String>();
List<String> names = new ArrayList<>();
while (iterator.hasNext()) {
names.add(iterator.next().getName());
}

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

@ -82,7 +82,7 @@ public abstract class AbstractServletWebServerFactory extends AbstractConfigurab
private final StaticResourceJars staticResourceJars = new StaticResourceJars();
private final Set<String> webListenerClassNames = new HashSet<String>();
private final Set<String> webListenerClassNames = new HashSet<>();
/**
* Create a new {@link AbstractServletWebServerFactory} instance.

2
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/source/ConfigurationPropertySourcesTests.java
View File

@ -203,7 +203,7 @@ class ConfigurationPropertySourcesTests {
}
private static Map<String, Object> createProperties(int index) {
Map<String, Object> map = new LinkedHashMap<String, Object>();
Map<String, Object> map = new LinkedHashMap<>();
for (int i = 0; i < 1000; i++) {
String name = "test-" + index + "-property-" + i;
String value = name + "-value";