root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5925 from izeye:polish-20160512 

* pr/5925:
  Polish
This commit is contained in:
Stephane Nicoll 2016-05-12 07:55:45 +02:00
parent afec397edd 7c34dd87c1
commit 4c95039b59
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
View File

@ -4900,9 +4900,9 @@ database you can use the `@AutoConfigureTestDatabase` annotation:
[[boot-features-testing-spring-boot-applications-testing-autoconfigured-rest-docs]] [[boot-features-testing-spring-boot-applications-testing-autoconfigured-rest-docs]]
==== Auto-configured Spring REST Docs tests ==== Auto-configured Spring REST Docs tests
Test `@AutoConfigureRestDocs` annotation can be used if you want to use Spring REST Docs `@AutoConfigureRestDocs` annotation can be used if you want to use Spring REST Docs
in your tests. It will automatically configure `MockMvc` to use Spring REST Docs and in your tests. It will automatically configure `MockMvc` to use Spring REST Docs and
removes the need for Spring REST Docs' JUnit rule. remove the need for Spring REST Docs' JUnit rule.
[source,java,indent=0] [source,java,indent=0]
---- ----
@ -4964,7 +4964,7 @@ automatically generate the default snippets:
[source,java,indent=0] [source,java,indent=0]
---- ----
@TestConfiguration @TestConfiguration
static class ResultHandlerConfiguration{ static class ResultHandlerConfiguration {
@Bean @Bean
public RestDocumentationResultHandler restDocumentation() { public RestDocumentationResultHandler restDocumentation() {

4
spring-boot-starters/spring-boot-starter-redis/src/main/java/org/springframework/boot/starter/redis/RedisStarterDepricationWarningAutoConfiguration.java → spring-boot-starters/spring-boot-starter-redis/src/main/java/org/springframework/boot/starter/redis/RedisStarterDeprecationWarningAutoConfiguration.java
View File

@ -33,10 +33,10 @@ import org.springframework.context.annotation.Configuration;
*/ */
@Configuration @Configuration
@Deprecated @Deprecated
public class RedisStarterDepricationWarningAutoConfiguration { public class RedisStarterDeprecationWarningAutoConfiguration {
private static final Log logger = LogFactory private static final Log logger = LogFactory
.getLog(RedisStarterDepricationWarningAutoConfiguration.class); .getLog(RedisStarterDeprecationWarningAutoConfiguration.class);
@PostConstruct @PostConstruct
public void logWarning() { public void logWarning() {

3
spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/restdocs/ContentContainingCondition.java
View File

@ -45,8 +45,7 @@ class ContentContainingCondition extends Condition<File> {
Reader reader = null; Reader reader = null;
try { try {
reader = new FileReader(value); reader = new FileReader(value);
String content = FileCopyUtils.copyToString(new FileReader(value)); String content = FileCopyUtils.copyToString(reader);
System.out.println(content);
return content.contains(this.toContain); return content.contains(this.toContain);
} }
catch (IOException ex) { catch (IOException ex) {