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

Polish 

See gh-13243
This commit is contained in:
Johnny Lim 2018-05-24 00:01:19 +09:00 committed by Stephane Nicoll
parent f91b53747a
commit de01e7aad4
6 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -71,7 +71,7 @@ public class HibernateMetricsAutoConfiguration {
} }
/** /**
* Get the name of a {@link EntityManagerFactory} based on its {@code beanName}. * Get the name of an {@link EntityManagerFactory} based on its {@code beanName}.
* @param beanName the name of the {@link EntityManagerFactory} bean * @param beanName the name of the {@link EntityManagerFactory} bean
* @return a name for the given entity manager factory * @return a name for the given entity manager factory
*/ */

2
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/orm/jpa/package-info.java
View File

@ -15,6 +15,6 @@
*/ */
/** /**
* Auto-configuration for JDBC metrics. * Auto-configuration for JPA metrics.
*/ */
package org.springframework.boot.actuate.autoconfigure.metrics.orm.jpa; package org.springframework.boot.actuate.autoconfigure.metrics.orm.jpa;

7
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/orm/jpa/HibernateMetricsAutoConfigurationTests.java
View File

@ -128,7 +128,7 @@ public class HibernateMetricsAutoConfigurationTests {
.withUserConfiguration( .withUserConfiguration(
NonHibernateEntityManagerFactoryConfiguration.class) NonHibernateEntityManagerFactoryConfiguration.class)
.run((context) -> { .run((context) -> {
// ensure EntityManagerFactory is not an Hibernate SessionFactory // ensure EntityManagerFactory is not a Hibernate SessionFactory
assertThatThrownBy(() -> context.getBean(EntityManagerFactory.class) assertThatThrownBy(() -> context.getBean(EntityManagerFactory.class)
.unwrap(SessionFactory.class)) .unwrap(SessionFactory.class))
.isInstanceOf(PersistenceException.class); .isInstanceOf(PersistenceException.class);
@ -178,9 +178,8 @@ public class HibernateMetricsAutoConfigurationTests {
DataSource ds) { DataSource ds) {
Map<String, String> jpaProperties = new HashMap<>(); Map<String, String> jpaProperties = new HashMap<>();
jpaProperties.put("hibernate.generate_statistics", "true"); jpaProperties.put("hibernate.generate_statistics", "true");
EntityManagerFactoryBuilder builder = new EntityManagerFactoryBuilder( return new EntityManagerFactoryBuilder(new HibernateJpaVendorAdapter(),
new HibernateJpaVendorAdapter(), jpaProperties, null); jpaProperties, null).dataSource(ds).packages(PACKAGE_CLASSES).build();
return builder.dataSource(ds).packages(PACKAGE_CLASSES).build();
} }
} }

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

@ -46,7 +46,7 @@ public class HealthWebEndpointResponseMapperTests {
private final HealthStatusHttpMapper statusHttpMapper = new HealthStatusHttpMapper(); private final HealthStatusHttpMapper statusHttpMapper = new HealthStatusHttpMapper();
private Set<String> autorizedRoles = Collections.singleton("ACTUATOR"); private Set<String> authorizedRoles = Collections.singleton("ACTUATOR");
@Test @Test
public void mapDetailsWithDisableDetailsDoesNotInvokeSupplier() { public void mapDetailsWithDisableDetailsDoesNotInvokeSupplier() {
@ -122,7 +122,7 @@ public class HealthWebEndpointResponseMapperTests {
private HealthWebEndpointResponseMapper createMapper(ShowDetails showDetails) { private HealthWebEndpointResponseMapper createMapper(ShowDetails showDetails) {
return new HealthWebEndpointResponseMapper(this.statusHttpMapper, showDetails, return new HealthWebEndpointResponseMapper(this.statusHttpMapper, showDetails,
this.autorizedRoles); this.authorizedRoles);
} }
} }

2
spring-boot-project/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc
View File

@ -1809,7 +1809,7 @@ Auto-configuration enables the instrumentation of all available Hibernate
Metrics are also tagged by the name of the `EntityManagerFactory` that is derived from Metrics are also tagged by the name of the `EntityManagerFactory` that is derived from
the bean name. the bean name.
To enable statistics, the standardJPA property `hibernate.generate_statistics` must be To enable statistics, the standard JPA property `hibernate.generate_statistics` must be
set to `true`. You can enable that on the auto-configured `EntityManagerFactory` as shown set to `true`. You can enable that on the auto-configured `EntityManagerFactory` as shown
in the following example: in the following example:

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

@ -318,7 +318,7 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo {
/** /**
* Resolve the environment variables to use. * Resolve the environment variables to use.
* @return a {@link EnvVariables} defining the environment variables * @return an {@link EnvVariables} defining the environment variables
*/ */
protected EnvVariables resolveEnvVariables() { protected EnvVariables resolveEnvVariables() {
return new EnvVariables(this.environmentVariables); return new EnvVariables(this.environmentVariables);