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

Polish

Browse Source 
See gh-17413
This commit is contained in:
Johnny Lim
2019-07-03 10:10:01 +09:00
committed by Stephane Nicoll
parent 939a247d87
commit 426ef749db
10 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/error/DefaultErrorAttributes.java
View File

@@ -46,7 +46,7 @@ import org.springframework.web.server.ServerWebExchange;
* <li>errors - Any {@link ObjectError}s from a {@link BindingResult} exception
* <li>trace - The exception stack trace</li>
* <li>path - The URL path when the exception was raised</li>
* <li>requestId - Unique Id associated with the current request</li>
* <li>requestId - Unique ID associated with the current request</li>
* </ul>
*
* @author Brian Clozel

4
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesScanTests.java
View File

@@ -19,7 +19,6 @@ package org.springframework.boot.context.properties;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import org.springframework.boot.context.properties.scan.valid.a.AScanConfiguration;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -29,6 +28,7 @@ import org.springframework.core.io.DefaultResourceLoader;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.BDDMockito.given;
import static org.mockito.BDDMockito.willCallRealMethod;
import static org.mockito.Mockito.mock;
/**
* Integration tests for {@link ConfigurationPropertiesScan @ConfigurationPropertiesScan}.
@@ -71,7 +71,7 @@ class ConfigurationPropertiesScanTests {
@Test
void scanImportBeanRegistrarShouldBeResourceLoaderAwareWithRequiredResource() {
DefaultResourceLoader resourceLoader = Mockito.mock(DefaultResourceLoader.class);
DefaultResourceLoader resourceLoader = mock(DefaultResourceLoader.class);
this.context.setResourceLoader(resourceLoader);
willCallRealMethod().given(resourceLoader).getClassLoader();
given(resourceLoader.getResource("test")).willReturn(new ByteArrayResource("test".getBytes()));

5
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/webservices/client/WebServiceTemplateBuilderTests.java
View File

@@ -26,7 +26,6 @@ import javax.xml.transform.sax.SAXTransformerFactory;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
import org.springframework.http.client.ClientHttpRequestFactory;
@@ -199,8 +198,8 @@ class WebServiceTemplateBuilderTests {
@Test
void additionalInterceptorsShouldAddToExistingWebServiceTemplate() {
ClientInterceptor f1 = Mockito.mock(ClientInterceptor.class);
ClientInterceptor f2 = Mockito.mock(ClientInterceptor.class);
ClientInterceptor f1 = mock(ClientInterceptor.class);
ClientInterceptor f2 = mock(ClientInterceptor.class);
WebServiceTemplate webServiceTemplate = new WebServiceTemplate();
webServiceTemplate.setInterceptors(new ClientInterceptor[] { f1 });
this.builder.additionalInterceptors(f2).configure(webServiceTemplate);