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

Merge pull request #25875 from izeye

Browse Source 
* pr/25875:
  Polish contribution
  Polish

Closes gh-25875
This commit is contained in:
Stephane Nicoll
2021-04-04 11:17:01 +02:00
parent 0005263f76 db3dfffdca
commit 103155694f
9 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/servlet/AbstractWebMvcEndpointHandlerMapping.java
View File

@@ -402,8 +402,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 {

4
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionMessage.java
View File

@@ -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 {

4
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfiguration.java
View File

@@ -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.
@@ -161,7 +161,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 {

6
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java
View File

@@ -381,7 +381,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);
@@ -390,7 +390,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")
@@ -401,7 +401,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)));

2
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/client/AutoConfigureMockRestServiceServerWithRootUriIntegrationTests.java
View File

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

6
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/BootstrapRegistry.java
View File

@@ -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

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/InactiveConfigDataAccessException.java
View File

@@ -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

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/InvalidConfigDataPropertyException.java
View File

@@ -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.

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/RootUriTemplateHandler.java
View File

@@ -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