See gh-25875
pull/25882/head
izeye 4 years ago committed by Stephane Nicoll
parent 0005263f76
commit 852e5778a3

@ -402,8 +402,8 @@ public abstract class AbstractWebMvcEndpointHandlerMapping extends RequestMappin
} }
/** /**
* Nested exception used to wrap a {@link InvalidEndpointRequestException} and provide * Nested exception used to wrap an {@link InvalidEndpointRequestException} and
* a {@link HttpStatus#BAD_REQUEST} status. * provide a {@link HttpStatus#BAD_REQUEST} status.
*/ */
private static class InvalidEndpointBadRequestException extends ResponseStatusException { private static class InvalidEndpointBadRequestException extends ResponseStatusException {

@ -306,7 +306,7 @@ public final class ConditionMessage {
} }
/** /**
* Builder used to create a {@link ItemsBuilder} for a condition. * Builder used to create an {@link ItemsBuilder} for a condition.
*/ */
public final class ItemsBuilder { public final class ItemsBuilder {

@ -161,7 +161,7 @@ public class IntegrationAutoConfiguration {
protected static class IntegrationRSocketConfiguration { protected static class IntegrationRSocketConfiguration {
/** /**
* Check if either a {@link IntegrationRSocketEndpoint} or * Check if either an {@link IntegrationRSocketEndpoint} or
* {@link RSocketOutboundGateway} bean is available. * {@link RSocketOutboundGateway} bean is available.
*/ */
static class AnyRSocketChannelAdapterAvailable extends AnyNestedCondition { static class AnyRSocketChannelAdapterAvailable extends AnyNestedCondition {

@ -21,7 +21,7 @@ import de.flapdoodle.embed.process.config.store.IDownloadConfig;
/** /**
* Callback interface that can be implemented by beans wishing to customize the * Callback interface that can be implemented by beans wishing to customize the
* {@link IDownloadConfig} via a {@link DownloadConfigBuilder} whilst retaining default * {@link IDownloadConfig} via an {@link DownloadConfigBuilder} whilst retaining default
* auto-configuration. * auto-configuration.
* *
* @author Michael Gmeiner * @author Michael Gmeiner

@ -381,7 +381,7 @@ class HibernateJpaAutoConfigurationTests extends AbstractJpaAutoConfigurationTes
} }
@Test @Test
void vendorPropertiesWithDdlAutoPropertyIsSet() { void vendorPropertiesWhenDdlAutoPropertyIsSet() {
contextRunner().withPropertyValues("spring.jpa.hibernate.ddl-auto=update") contextRunner().withPropertyValues("spring.jpa.hibernate.ddl-auto=update")
.run(vendorProperties((vendorProperties) -> { .run(vendorProperties((vendorProperties) -> {
assertThat(vendorProperties).doesNotContainKeys(AvailableSettings.HBM2DDL_DATABASE_ACTION); assertThat(vendorProperties).doesNotContainKeys(AvailableSettings.HBM2DDL_DATABASE_ACTION);
@ -390,7 +390,7 @@ class HibernateJpaAutoConfigurationTests extends AbstractJpaAutoConfigurationTes
} }
@Test @Test
void vendorPropertiesWithDdlAutoPropertyAndHibernatePropertiesAreSet() { void vendorPropertiesWhenDdlAutoPropertyAndHibernatePropertiesAreSet() {
contextRunner() contextRunner()
.withPropertyValues("spring.jpa.hibernate.ddl-auto=update", .withPropertyValues("spring.jpa.hibernate.ddl-auto=update",
"spring.jpa.properties.hibernate.hbm2ddl.auto=create-drop") "spring.jpa.properties.hibernate.hbm2ddl.auto=create-drop")
@ -401,7 +401,7 @@ class HibernateJpaAutoConfigurationTests extends AbstractJpaAutoConfigurationTes
} }
@Test @Test
void vendorPropertiesWithDdlAutoPropertyIsSetToNone() { void vendorPropertiesWhenDdlAutoPropertyIsSetToNone() {
contextRunner().withPropertyValues("spring.jpa.hibernate.ddl-auto=none") contextRunner().withPropertyValues("spring.jpa.hibernate.ddl-auto=none")
.run(vendorProperties((vendorProperties) -> assertThat(vendorProperties).doesNotContainKeys( .run(vendorProperties((vendorProperties) -> assertThat(vendorProperties).doesNotContainKeys(
AvailableSettings.HBM2DDL_DATABASE_ACTION, AvailableSettings.HBM2DDL_AUTO))); AvailableSettings.HBM2DDL_DATABASE_ACTION, AvailableSettings.HBM2DDL_AUTO)));

@ -2343,7 +2343,7 @@ Each metric is tagged by the name of the Pool (can be controlled with `spring.da
[[production-ready-metrics-hibernate]] [[production-ready-metrics-hibernate]]
==== Hibernate Metrics ==== Hibernate Metrics
Auto-configuration enables the instrumentation of all available Hibernate `EntityManagerFactory` instances that have statistics enabled with a metric named `hibernate`. Auto-configuration enables the instrumentation of all available Hibernate `EntityManagerFactory` instances that have statistics enabled are instrumented with a metric named `hibernate`.
Metrics are also tagged by the name of the `EntityManagerFactory` that is derived from the bean name. Metrics are also tagged by the name of the `EntityManagerFactory` that is derived from the bean name.

@ -42,7 +42,7 @@ import static org.springframework.test.web.client.response.MockRestResponseCreat
* *
* @author Andy Wilkinson * @author Andy Wilkinson
*/ */
@SpringBootTest(properties = "debug=true") @SpringBootTest
@AutoConfigureMockRestServiceServer @AutoConfigureMockRestServiceServer
class AutoConfigureMockRestServiceServerWithRootUriIntegrationTests { class AutoConfigureMockRestServiceServerWithRootUriIntegrationTests {

@ -139,7 +139,7 @@ public interface BootstrapRegistry {
} }
/** /**
* Factory method that can be used to create a {@link InstanceSupplier} for a * Factory method that can be used to create an {@link InstanceSupplier} for a
* given instance. * given instance.
* @param <T> the instance type * @param <T> the instance type
* @param instance the instance * @param instance the instance
@ -150,7 +150,7 @@ public interface BootstrapRegistry {
} }
/** /**
* Factory method that can be used to create a {@link InstanceSupplier} from a * Factory method that can be used to create an {@link InstanceSupplier} from a
* {@link Supplier}. * {@link Supplier}.
* @param <T> the instance type * @param <T> the instance type
* @param supplier the supplier that will provide the instance * @param supplier the supplier that will provide the instance

@ -111,7 +111,7 @@ public class InactiveConfigDataAccessException extends ConfigDataException {
} }
/** /**
* Throw a {@link InactiveConfigDataAccessException} if the given * Throw an {@link InactiveConfigDataAccessException} if the given
* {@link ConfigDataEnvironmentContributor} contains the property. * {@link ConfigDataEnvironmentContributor} contains the property.
* @param contributor the contributor to check * @param contributor the contributor to check
* @param name the name to check * @param name the name to check

@ -101,7 +101,7 @@ public class InvalidConfigDataPropertyException extends ConfigDataException {
} }
/** /**
* Throw a {@link InvalidConfigDataPropertyException} or log a warning if the given * Throw an {@link InvalidConfigDataPropertyException} or log a warning if the given
* {@link ConfigDataEnvironmentContributor} contains any invalid property. A warning * {@link ConfigDataEnvironmentContributor} contains any invalid property. A warning
* is logged if the property is still supported, but not recommended. An error is * is logged if the property is still supported, but not recommended. An error is
* thrown if the property is completely unsupported. * thrown if the property is completely unsupported.

@ -87,7 +87,7 @@ public class RootUriTemplateHandler implements UriTemplateHandler {
/** /**
* Derives a new {@code RootUriTemplateHandler} from this one, wrapping its delegate * Derives a new {@code RootUriTemplateHandler} from this one, wrapping its delegate
* {link UriTemplateHandler} by applying the given {@code wrapper}. * {@link UriTemplateHandler} by applying the given {@code wrapper}.
* @param wrapper the wrapper to apply to the delegate URI template handler * @param wrapper the wrapper to apply to the delegate URI template handler
* @return the new handler * @return the new handler
* @since 2.3.10 * @since 2.3.10

Loading…
Cancel
Save