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

Merge branch '2.1.x'

Browse Source
This commit is contained in:
Andy Wilkinson
2019-02-21 08:19:43 +00:00
parent 3d03c01bfc 53326695ea
commit f2e3e274a8
18 changed files with 37 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/orm/jpa/HibernateMetricsAutoConfiguration.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2018 the original author or authors.
* Copyright 2012-2019 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.
@@ -20,6 +20,7 @@ import java.util.Collections;
import java.util.Map;
import javax.persistence.EntityManagerFactory;
import javax.persistence.PersistenceException;
import io.micrometer.core.instrument.MeterRegistry;
import io.micrometer.core.instrument.binder.jpa.HibernateMetrics;
@@ -65,8 +66,14 @@ public class HibernateMetricsAutoConfiguration {
private void bindEntityManagerFactoryToRegistry(String beanName,
EntityManagerFactory entityManagerFactory, MeterRegistry registry) {
String entityManagerFactoryName = getEntityManagerFactoryName(beanName);
new HibernateMetrics(entityManagerFactory, entityManagerFactoryName,
Collections.emptyList()).bindTo(registry);
try {
new HibernateMetrics(entityManagerFactory.unwrap(SessionFactory.class),
entityManagerFactoryName, Collections.emptyList())
.bindTo(registry);
}
catch (PersistenceException ex) {
// Continue
}
}
/**

2
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/JerseyEndpointIntegrationTests.java
View File

@@ -56,7 +56,7 @@ public class JerseyEndpointIntegrationTests {
testJerseyEndpoints(new Class[] { EndpointsConfiguration.class });
}
protected void testJerseyEndpoints(Class[] userConfigurations) {
protected void testJerseyEndpoints(Class<?>[] userConfigurations) {
FilteredClassLoader classLoader = new FilteredClassLoader(
DispatcherServlet.class);
new WebApplicationContextRunner(

6
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MeterRegistryConfigurerIntegrationTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2018 the original author or authors.
* Copyright 2012-2019 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.
@@ -77,9 +77,7 @@ public class MeterRegistryConfigurerIntegrationTests {
@Bean
MeterRegistryCustomizer<?> testCustomizer() {
return (registry) -> {
registry.config().commonTags("testTag", "testValue");
};
return (registry) -> registry.config().commonTags("testTag", "testValue");
}
@Bean

1
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/elasticsearch/ElasticsearchJestHealthIndicatorTests.java
View File

@@ -62,6 +62,7 @@ public class ElasticsearchJestHealthIndicatorTests {
}
@Test
@SuppressWarnings("unchecked")
public void elasticsearchWithYellowStatusIsUp() throws IOException {
given(this.jestClient.execute(any(Action.class)))
.willReturn(createJestResult(200, true, "yellow"));

1
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/error/DefaultErrorWebExceptionHandler.java
View File

@@ -134,7 +134,6 @@ public class DefaultErrorWebExceptionHandler extends AbstractErrorWebExceptionHa
protected Mono<ServerResponse> renderErrorResponse(ServerRequest request) {
boolean includeStackTrace = isIncludeStackTrace(request, MediaType.ALL);
Map<String, Object> error = getErrorAttributes(request, includeStackTrace);
HttpStatus errorStatus = getHttpStatus(error);
return ServerResponse.status(getHttpStatus(error))
.contentType(MediaType.APPLICATION_JSON_UTF8)
.body(BodyInserters.fromObject(error));

6
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfigurationTests.java
View File

@@ -202,10 +202,8 @@ public class MessageSourceAutoConfigurationTests {
public void messageSourceWithNonStandardBeanNameIsIgnored() {
this.contextRunner.withPropertyValues("spring.messages.basename:test/messages")
.withUserConfiguration(CustomBeanNameMessageSourceConfiguration.class)
.run((context) -> {
assertThat(context.getMessage("foo", null, Locale.US))
.isEqualTo("bar");
});
.run((context) -> assertThat(context.getMessage("foo", null, Locale.US))
.isEqualTo("bar"));
}
@Configuration

5
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfigurationTests.java
View File

@@ -252,9 +252,8 @@ public class EmbeddedMongoAutoConfigurationTests {
@Bean
public DownloadConfigBuilderCustomizer testDownloadConfigBuilderCustomizer() {
return (downloadConfigBuilder) -> {
downloadConfigBuilder.userAgent("Test User Agent");
};
return (downloadConfigBuilder) -> downloadConfigBuilder
.userAgent("Test User Agent");
}
}

3
spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GroovyCompiler.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2018 the original author or authors.
* Copyright 2012-2019 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.
@@ -307,7 +307,6 @@ public class GroovyCompiler {
private static class MainClass {
@SuppressWarnings("unchecked")
public static ClassNode get(CompilationUnit source) {
return get(source.getAST().getClasses());
}

10
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/runner/AbstractApplicationContextRunnerTests.java
View File

@@ -152,13 +152,9 @@ public abstract class AbstractApplicationContextRunnerTests<T extends AbstractAp
@Test
public void runWithClassLoaderShouldSetClassLoaderOnContext() {
get().withClassLoader(new FilteredClassLoader(Gson.class.getPackage().getName()))
.run((context) -> {
assertThatExceptionOfType(ClassNotFoundException.class)
.isThrownBy(() -> {
ClassUtils.forName(Gson.class.getName(),
context.getClassLoader());
});
});
.run((context) -> assertThatExceptionOfType(ClassNotFoundException.class)
.isThrownBy(() -> ClassUtils.forName(Gson.class.getName(),
context.getClassLoader())));
}
@Test

5
spring-boot-project/spring-boot-tools/spring-boot-configuration-docs/src/main/java/org/springframework/boot/configurationdocs/ConfigurationMetadataDocumentWriter.java
View File

@@ -92,9 +92,8 @@ public class ConfigurationMetadataDocumentWriter {
List<String> matchingOverrides = overrides.keySet().stream()
.filter((overrideKey) -> overrideKey.startsWith(keyPrefix))
.collect(Collectors.toList());
matchingOverrides.forEach((match) -> {
table.addEntry(overrides.remove(match));
});
matchingOverrides.forEach((match) ->
table.addEntry(overrides.remove(match)));
}
List<String> matchingKeys = unmappedKeys.stream()
.filter((key) -> keyPrefixes.stream().anyMatch(key::startsWith))

3
spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/generic/AbstractGenericProperties.java
View File

@@ -22,6 +22,9 @@ import java.util.Map;
/**
* A base properties class with generics.
*
* @param <A> name type
* @param <B> mapping key type
* @param <C> mapping value type
* @author Stephane Nicoll
*/
public class AbstractGenericProperties<A, B, C> {

1
spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/generic/AbstractIntermediateGenericProperties.java
View File

@@ -19,6 +19,7 @@ package org.springframework.boot.configurationsample.generic;
/**
* An intermediate layer that resolves some of the generics from the parent but not all.
*
* @param <C> mapping value type
* @author Stephane Nicoll
*/
public abstract class AbstractIntermediateGenericProperties<C>

2
spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/generic/UnresolvedGenericProperties.java
View File

@@ -21,6 +21,8 @@ import org.springframework.boot.configurationsample.ConfigurationProperties;
/**
* Properties with unresolved generic information.
*
* @param <B> mapping key type
* @param <C> mapping value type
* @author Stephane Nicoll
*/
@ConfigurationProperties("generic")

5
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootJar.java
View File

@@ -55,9 +55,8 @@ public class BootJar extends Jar implements BootArchive {
getMainSpec().with(this.bootInf);
this.bootInf.into("classes", classpathFiles(File::isDirectory));
this.bootInf.into("lib", classpathFiles(File::isFile));
this.bootInf.filesMatching("module-info.class", (details) -> {
details.setRelativePath(details.getRelativeSourcePath());
});
this.bootInf.filesMatching("module-info.class",
(details) -> details.setRelativePath(details.getRelativeSourcePath()));
getRootSpec().eachFile((details) -> {
String pathString = details.getRelativePath().getPathString();
if (pathString.startsWith("BOOT-INF/lib/")

5
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootWar.java
View File

@@ -54,9 +54,8 @@ public class BootWar extends War implements BootArchive {
(copySpec) -> copySpec.from(
(Callable<Iterable<File>>) () -> (this.providedClasspath != null)
? this.providedClasspath : Collections.emptyList()));
getRootSpec().filesMatching("module-info.class", (details) -> {
details.setRelativePath(details.getRelativeSourcePath());
});
getRootSpec().filesMatching("module-info.class",
(details) -> details.setRelativePath(details.getRelativeSourcePath()));
getRootSpec().eachFile((details) -> {
String pathString = details.getRelativePath().getPathString();
if ((pathString.startsWith("WEB-INF/lib/")

2
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java
View File

@@ -80,6 +80,7 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo {
* @since 1.0
* @deprecated since version 2.2. Use agents instead.
*/
@Deprecated
@Parameter(property = "spring-boot.run.agent")
private File[] agent;
@@ -384,7 +385,6 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo {
}
}
@SuppressWarnings("deprecation")
private File[] determineAgents() {
return (this.agents != null) ? this.agents : this.agent;
}

1
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/LogFile.java
View File

@@ -128,7 +128,6 @@ public class LogFile {
* @return a {@link LogFile} or {@code null} if the environment didn't contain any
* suitable properties
*/
@SuppressWarnings("deprecation")
public static LogFile get(PropertyResolver propertyResolver) {
String file = getLogFileProperty(propertyResolver, FILE_NAME_PROPERTY,
FILE_PROPERTY);

4
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/DefaultApplicationArgumentsTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2018 the original author or authors.
* Copyright 2012-2019 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.
@@ -38,7 +38,7 @@ public class DefaultApplicationArgumentsTests {
@Test
public void argumentsMustNotBeNull() {
assertThatIllegalArgumentException()
.isThrownBy(() -> new DefaultApplicationArguments(null))
.isThrownBy(() -> new DefaultApplicationArguments((String[]) null))
.withMessageContaining("Args must not be null");
}