Stephane Nicoll
commit
dd916f908f
|
|
@ -405,8 +405,8 @@ public abstract class AbstractWebMvcEndpointHandlerMapping extends RequestMappin
|
|||
}
|
||||
|
||||
/**
|
||||
* Nested exception used to wrap a {@link InvalidEndpointRequestException} and provide
|
||||
* a {@link HttpStatus#BAD_REQUEST} status.
|
||||
* Nested exception used to wrap an {@link InvalidEndpointRequestException} and
|
||||
* provide a {@link HttpStatus#BAD_REQUEST} status.
|
||||
*/
|
||||
private static class InvalidEndpointBadRequestException extends ResponseStatusException {
|
||||
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ import org.springframework.util.MimeTypeUtils;
|
|||
public enum TextOutputFormat implements Producible<TextOutputFormat> {
|
||||
|
||||
/**
|
||||
* Openmetrics text version 1.0.0.
|
||||
* OpenMetrics text version 1.0.0.
|
||||
*/
|
||||
CONTENT_TYPE_OPENMETRICS_100(TextFormat.CONTENT_TYPE_OPENMETRICS_100) {
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright 2012-2020 the original author or authors.
|
||||
* Copyright 2012-2021 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.
|
||||
|
|
@ -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 {
|
||||
|
||||
|
|
|
|||
|
|
@ -206,7 +206,7 @@ public class IntegrationAutoConfiguration {
|
|||
protected static class IntegrationRSocketConfiguration {
|
||||
|
||||
/**
|
||||
* Check if either a {@link IntegrationRSocketEndpoint} or
|
||||
* Check if either an {@link IntegrationRSocketEndpoint} or
|
||||
* {@link RSocketOutboundGateway} bean is available.
|
||||
*/
|
||||
static class AnyRSocketChannelAdapterAvailable extends AnyNestedCondition {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright 2012-2020 the original author or authors.
|
||||
* Copyright 2012-2021 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.
|
||||
|
|
@ -21,7 +21,7 @@ import de.flapdoodle.embed.process.config.store.ImmutableDownloadConfig;
|
|||
|
||||
/**
|
||||
* Callback interface that can be implemented by beans wishing to customize the
|
||||
* {@link DownloadConfig} via a {@link ImmutableDownloadConfig.Builder} whilst retaining
|
||||
* {@link DownloadConfig} via an {@link ImmutableDownloadConfig.Builder} whilst retaining
|
||||
* default auto-configuration.
|
||||
*
|
||||
* @author Michael Gmeiner
|
||||
|
|
|
|||
|
|
@ -409,7 +409,7 @@ class HibernateJpaAutoConfigurationTests extends AbstractJpaAutoConfigurationTes
|
|||
}
|
||||
|
||||
@Test
|
||||
void vendorPropertiesWithDdlAutoPropertyIsSet() {
|
||||
void vendorPropertiesWhenDdlAutoPropertyIsSet() {
|
||||
contextRunner().withPropertyValues("spring.jpa.hibernate.ddl-auto=update")
|
||||
.run(vendorProperties((vendorProperties) -> {
|
||||
assertThat(vendorProperties).doesNotContainKeys(AvailableSettings.HBM2DDL_DATABASE_ACTION);
|
||||
|
|
@ -418,7 +418,7 @@ class HibernateJpaAutoConfigurationTests extends AbstractJpaAutoConfigurationTes
|
|||
}
|
||||
|
||||
@Test
|
||||
void vendorPropertiesWithDdlAutoPropertyAndHibernatePropertiesAreSet() {
|
||||
void vendorPropertiesWhenDdlAutoPropertyAndHibernatePropertiesAreSet() {
|
||||
contextRunner()
|
||||
.withPropertyValues("spring.jpa.hibernate.ddl-auto=update",
|
||||
"spring.jpa.properties.hibernate.hbm2ddl.auto=create-drop")
|
||||
|
|
@ -429,7 +429,7 @@ class HibernateJpaAutoConfigurationTests extends AbstractJpaAutoConfigurationTes
|
|||
}
|
||||
|
||||
@Test
|
||||
void vendorPropertiesWithDdlAutoPropertyIsSetToNone() {
|
||||
void vendorPropertiesWhenDdlAutoPropertyIsSetToNone() {
|
||||
contextRunner().withPropertyValues("spring.jpa.hibernate.ddl-auto=none")
|
||||
.run(vendorProperties((vendorProperties) -> assertThat(vendorProperties).doesNotContainKeys(
|
||||
AvailableSettings.HBM2DDL_DATABASE_ACTION, AvailableSettings.HBM2DDL_AUTO)));
|
||||
|
|
|
|||
|
|
@ -2359,7 +2359,7 @@ Each metric is tagged by the name of the Pool (can be controlled with `spring.da
|
|||
|
||||
[[production-ready-metrics-hibernate]]
|
||||
==== Hibernate Metrics
|
||||
If `org.hibernate:hibernate-micrometer` is on the classpath, all available Hibernate `EntityManagerFactory` instances that have statistics enabled with a metric named `hibernate` are instrumented.
|
||||
If `org.hibernate:hibernate-micrometer` is on the classpath, 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.
|
||||
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ import static org.springframework.test.web.client.response.MockRestResponseCreat
|
|||
*
|
||||
* @author Andy Wilkinson
|
||||
*/
|
||||
@SpringBootTest(properties = "debug=true")
|
||||
@SpringBootTest
|
||||
@AutoConfigureMockRestServiceServer
|
||||
class AutoConfigureMockRestServiceServerWithRootUriIntegrationTests {
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright 2012-2020 the original author or authors.
|
||||
* Copyright 2012-2021 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.
|
||||
|
|
@ -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.
|
||||
* @param <T> the instance type
|
||||
* @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}.
|
||||
* @param <T> the instance type
|
||||
* @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.
|
||||
* @param contributor the contributor 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
|
||||
* is logged if the property is still supported, but not recommended. An error is
|
||||
* 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
|
||||
* {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
|
||||
* @return the new handler
|
||||
* @since 2.3.10
|
||||
|
|
|
|||
Loading…
Reference in New Issue