Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
7c34dd87
Commit
7c34dd87
authored
May 12, 2016
by
Johnny Lim
Committed by
Stephane Nicoll
May 12, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish
Closes gh-5925
parent
afec397e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
7 deletions
+6
-7
spring-boot-features.adoc
spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
+3
-3
RedisStarterDeprecationWarningAutoConfiguration.java
...edis/RedisStarterDeprecationWarningAutoConfiguration.java
+2
-2
ContentContainingCondition.java
...st/autoconfigure/restdocs/ContentContainingCondition.java
+1
-2
No files found.
spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
View file @
7c34dd87
...
@@ -4900,9 +4900,9 @@ database you can use the `@AutoConfigureTestDatabase` annotation:
...
@@ -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
remove
s
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:
...
@@ -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() {
...
...
spring-boot-starters/spring-boot-starter-redis/src/main/java/org/springframework/boot/starter/redis/RedisStarterDepr
i
cationWarningAutoConfiguration.java
→
spring-boot-starters/spring-boot-starter-redis/src/main/java/org/springframework/boot/starter/redis/RedisStarterDepr
e
cationWarningAutoConfiguration.java
View file @
7c34dd87
...
@@ -33,10 +33,10 @@ import org.springframework.context.annotation.Configuration;
...
@@ -33,10 +33,10 @@ import org.springframework.context.annotation.Configuration;
*/
*/
@Configuration
@Configuration
@Deprecated
@Deprecated
public
class
RedisStarterDepr
i
cationWarningAutoConfiguration
{
public
class
RedisStarterDepr
e
cationWarningAutoConfiguration
{
private
static
final
Log
logger
=
LogFactory
private
static
final
Log
logger
=
LogFactory
.
getLog
(
RedisStarterDepr
i
cationWarningAutoConfiguration
.
class
);
.
getLog
(
RedisStarterDepr
e
cationWarningAutoConfiguration
.
class
);
@PostConstruct
@PostConstruct
public
void
logWarning
()
{
public
void
logWarning
()
{
...
...
spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/restdocs/ContentContainingCondition.java
View file @
7c34dd87
...
@@ -45,8 +45,7 @@ class ContentContainingCondition extends Condition<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
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment