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
a695e062
Commit
a695e062
authored
Aug 15, 2019
by
Stephane Nicoll
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #17864 from succezlijunyi
* pr/17864: Delete redundant variables Closes gh-17864
parents
ba4c5be2
64344214
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
9 deletions
+5
-9
ValidationBindHandlerTests.java
...roperties/bind/validation/ValidationBindHandlerTests.java
+1
-2
JsonObjectDeserializerTests.java
...ngframework/boot/jackson/JsonObjectDeserializerTests.java
+2
-3
ServletWebServerMvcIntegrationTests.java
.../servlet/context/ServletWebServerMvcIntegrationTests.java
+1
-2
AbstractServletWebServerFactoryTests.java
.../servlet/server/AbstractServletWebServerFactoryTests.java
+1
-2
No files found.
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/validation/ValidationBindHandlerTests.java
View file @
a695e062
...
@@ -198,8 +198,7 @@ class ValidationBindHandlerTests {
...
@@ -198,8 +198,7 @@ class ValidationBindHandlerTests {
action
.
run
();
action
.
run
();
}
}
catch
(
BindException
ex
)
{
catch
(
BindException
ex
)
{
BindValidationException
cause
=
(
BindValidationException
)
ex
.
getCause
();
return
(
BindValidationException
)
ex
.
getCause
();
return
cause
;
}
}
throw
new
IllegalStateException
(
"Did not throw"
);
throw
new
IllegalStateException
(
"Did not throw"
);
}
}
...
...
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jackson/JsonObjectDeserializerTests.java
View file @
a695e062
...
@@ -176,9 +176,8 @@ class JsonObjectDeserializerTests {
...
@@ -176,9 +176,8 @@ class JsonObjectDeserializerTests {
@Test
@Test
void
getRequiredNodeWhenNodeIsFoundShouldReturnNode
()
{
void
getRequiredNodeWhenNodeIsFoundShouldReturnNode
()
{
JsonNode
node
=
mock
(
JsonNode
.
class
);
JsonNode
node
=
mock
(
JsonNode
.
class
);
JsonNode
tree
=
node
;
given
(
node
.
get
(
"test"
)).
willReturn
(
node
);
given
(
tree
.
get
(
"test"
)).
willReturn
(
node
);
assertThat
(
this
.
testDeserializer
.
testGetRequiredNode
(
node
,
"test"
)).
isEqualTo
(
node
);
assertThat
(
this
.
testDeserializer
.
testGetRequiredNode
(
tree
,
"test"
)).
isEqualTo
(
node
);
}
}
static
class
TestJsonObjectDeserializer
<
T
>
extends
JsonObjectDeserializer
<
T
>
{
static
class
TestJsonObjectDeserializer
<
T
>
extends
JsonObjectDeserializer
<
T
>
{
...
...
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/context/ServletWebServerMvcIntegrationTests.java
View file @
a695e062
...
@@ -187,9 +187,8 @@ class ServletWebServerMvcIntegrationTests {
...
@@ -187,9 +187,8 @@ class ServletWebServerMvcIntegrationTests {
@Bean
@Bean
DispatcherServlet
dispatcherServlet
()
{
DispatcherServlet
dispatcherServlet
()
{
DispatcherServlet
dispatcherServlet
=
new
DispatcherServlet
();
// Can configure dispatcher servlet here as would usually do via init-params
// Can configure dispatcher servlet here as would usually do via init-params
return
dispatcherServlet
;
return
new
DispatcherServlet
()
;
}
}
@Bean
@Bean
...
...
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java
View file @
a695e062
...
@@ -1084,8 +1084,7 @@ public abstract class AbstractServletWebServerFactoryTests {
...
@@ -1084,8 +1084,7 @@ public abstract class AbstractServletWebServerFactoryTests {
String
[]
parts
=
header
.
split
(
":"
);
String
[]
parts
=
header
.
split
(
":"
);
request
.
getHeaders
().
add
(
parts
[
0
],
parts
[
1
]);
request
.
getHeaders
().
add
(
parts
[
0
],
parts
[
1
]);
}
}
ClientHttpResponse
response
=
request
.
execute
();
return
request
.
execute
();
return
response
;
}
}
protected
void
assertForwardHeaderIsUsed
(
ServletWebServerFactory
factory
)
throws
IOException
,
URISyntaxException
{
protected
void
assertForwardHeaderIsUsed
(
ServletWebServerFactory
factory
)
throws
IOException
,
URISyntaxException
{
...
...
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