From de01e7aad4f5f88c670df299d4d898a9d7f6f4df Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Thu, 24 May 2018 00:01:19 +0900 Subject: [PATCH] Polish See gh-13243 --- .../metrics/orm/jpa/HibernateMetricsAutoConfiguration.java | 2 +- .../autoconfigure/metrics/orm/jpa/package-info.java | 2 +- .../orm/jpa/HibernateMetricsAutoConfigurationTests.java | 7 +++---- .../health/HealthWebEndpointResponseMapperTests.java | 4 ++-- .../src/main/asciidoc/production-ready-features.adoc | 2 +- .../org/springframework/boot/maven/AbstractRunMojo.java | 2 +- 6 files changed, 9 insertions(+), 10 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/orm/jpa/HibernateMetricsAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/orm/jpa/HibernateMetricsAutoConfiguration.java index 024e8278a06..4a7b1585b72 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/orm/jpa/HibernateMetricsAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/orm/jpa/HibernateMetricsAutoConfiguration.java @@ -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 * @return a name for the given entity manager factory */ diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/orm/jpa/package-info.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/orm/jpa/package-info.java index ecb62032914..42960c2cf8c 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/orm/jpa/package-info.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/orm/jpa/package-info.java @@ -15,6 +15,6 @@ */ /** - * Auto-configuration for JDBC metrics. + * Auto-configuration for JPA metrics. */ package org.springframework.boot.actuate.autoconfigure.metrics.orm.jpa; diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/orm/jpa/HibernateMetricsAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/orm/jpa/HibernateMetricsAutoConfigurationTests.java index fe123f35aae..cc207e72a1c 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/orm/jpa/HibernateMetricsAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/orm/jpa/HibernateMetricsAutoConfigurationTests.java @@ -128,7 +128,7 @@ public class HibernateMetricsAutoConfigurationTests { .withUserConfiguration( NonHibernateEntityManagerFactoryConfiguration.class) .run((context) -> { - // ensure EntityManagerFactory is not an Hibernate SessionFactory + // ensure EntityManagerFactory is not a Hibernate SessionFactory assertThatThrownBy(() -> context.getBean(EntityManagerFactory.class) .unwrap(SessionFactory.class)) .isInstanceOf(PersistenceException.class); @@ -178,9 +178,8 @@ public class HibernateMetricsAutoConfigurationTests { DataSource ds) { Map jpaProperties = new HashMap<>(); jpaProperties.put("hibernate.generate_statistics", "true"); - EntityManagerFactoryBuilder builder = new EntityManagerFactoryBuilder( - new HibernateJpaVendorAdapter(), jpaProperties, null); - return builder.dataSource(ds).packages(PACKAGE_CLASSES).build(); + return new EntityManagerFactoryBuilder(new HibernateJpaVendorAdapter(), + jpaProperties, null).dataSource(ds).packages(PACKAGE_CLASSES).build(); } } diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/HealthWebEndpointResponseMapperTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/HealthWebEndpointResponseMapperTests.java index 97884a9d2c2..7001ce84228 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/HealthWebEndpointResponseMapperTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/HealthWebEndpointResponseMapperTests.java @@ -46,7 +46,7 @@ public class HealthWebEndpointResponseMapperTests { private final HealthStatusHttpMapper statusHttpMapper = new HealthStatusHttpMapper(); - private Set autorizedRoles = Collections.singleton("ACTUATOR"); + private Set authorizedRoles = Collections.singleton("ACTUATOR"); @Test public void mapDetailsWithDisableDetailsDoesNotInvokeSupplier() { @@ -122,7 +122,7 @@ public class HealthWebEndpointResponseMapperTests { private HealthWebEndpointResponseMapper createMapper(ShowDetails showDetails) { return new HealthWebEndpointResponseMapper(this.statusHttpMapper, showDetails, - this.autorizedRoles); + this.authorizedRoles); } } diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc index 045c2604a0f..b002403a777 100644 --- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc +++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc @@ -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 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 in the following example: diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java index da9161a4f9f..14f1c6ef37e 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java @@ -318,7 +318,7 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo { /** * 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() { return new EnvVariables(this.environmentVariables);