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
4262aab4
Commit
4262aab4
authored
Sep 25, 2019
by
dreis2211
Committed by
Andy Wilkinson
Sep 25, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix deprecation warnings caused by BodyInserters.fromObject
See gh-18349
parent
eb00ba74
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
DefaultErrorWebExceptionHandler.java
...e/web/reactive/error/DefaultErrorWebExceptionHandler.java
+1
-1
UndertowReactiveWebServerFactoryTests.java
...edded/undertow/UndertowReactiveWebServerFactoryTests.java
+1
-1
AbstractReactiveWebServerFactoryTests.java
...eactive/server/AbstractReactiveWebServerFactoryTests.java
+4
-4
No files found.
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/error/DefaultErrorWebExceptionHandler.java
View file @
4262aab4
...
@@ -143,7 +143,7 @@ public class DefaultErrorWebExceptionHandler extends AbstractErrorWebExceptionHa
...
@@ -143,7 +143,7 @@ public class DefaultErrorWebExceptionHandler extends AbstractErrorWebExceptionHa
boolean
includeStackTrace
=
isIncludeStackTrace
(
request
,
MediaType
.
ALL
);
boolean
includeStackTrace
=
isIncludeStackTrace
(
request
,
MediaType
.
ALL
);
Map
<
String
,
Object
>
error
=
getErrorAttributes
(
request
,
includeStackTrace
);
Map
<
String
,
Object
>
error
=
getErrorAttributes
(
request
,
includeStackTrace
);
return
ServerResponse
.
status
(
getHttpStatus
(
error
)).
contentType
(
MediaType
.
APPLICATION_JSON
)
return
ServerResponse
.
status
(
getHttpStatus
(
error
)).
contentType
(
MediaType
.
APPLICATION_JSON
)
.
body
(
BodyInserters
.
from
Object
(
error
));
.
body
(
BodyInserters
.
from
Value
(
error
));
}
}
/**
/**
...
...
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/undertow/UndertowReactiveWebServerFactoryTests.java
View file @
4262aab4
...
@@ -118,7 +118,7 @@ class UndertowReactiveWebServerFactoryTests extends AbstractReactiveWebServerFac
...
@@ -118,7 +118,7 @@ class UndertowReactiveWebServerFactoryTests extends AbstractReactiveWebServerFac
this
.
webServer
.
start
();
this
.
webServer
.
start
();
WebClient
client
=
getWebClient
().
build
();
WebClient
client
=
getWebClient
().
build
();
Mono
<
String
>
result
=
client
.
post
().
uri
(
"/test"
).
contentType
(
MediaType
.
TEXT_PLAIN
)
Mono
<
String
>
result
=
client
.
post
().
uri
(
"/test"
).
contentType
(
MediaType
.
TEXT_PLAIN
)
.
body
(
BodyInserters
.
from
Object
(
"Hello World"
)).
exchange
()
.
body
(
BodyInserters
.
from
Value
(
"Hello World"
)).
exchange
()
.
flatMap
((
response
)
->
response
.
bodyToMono
(
String
.
class
));
.
flatMap
((
response
)
->
response
.
bodyToMono
(
String
.
class
));
assertThat
(
result
.
block
(
Duration
.
ofSeconds
(
30
))).
isEqualTo
(
"Hello World"
);
assertThat
(
result
.
block
(
Duration
.
ofSeconds
(
30
))).
isEqualTo
(
"Hello World"
);
File
accessLog
=
new
File
(
accessLogDirectory
,
expectedFile
);
File
accessLog
=
new
File
(
accessLogDirectory
,
expectedFile
);
...
...
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/server/AbstractReactiveWebServerFactoryTests.java
View file @
4262aab4
...
@@ -94,7 +94,7 @@ public abstract class AbstractReactiveWebServerFactoryTests {
...
@@ -94,7 +94,7 @@ public abstract class AbstractReactiveWebServerFactoryTests {
this
.
webServer
=
factory
.
getWebServer
(
new
EchoHandler
());
this
.
webServer
=
factory
.
getWebServer
(
new
EchoHandler
());
this
.
webServer
.
start
();
this
.
webServer
.
start
();
Mono
<
String
>
result
=
getWebClient
().
build
().
post
().
uri
(
"/test"
).
contentType
(
MediaType
.
TEXT_PLAIN
)
Mono
<
String
>
result
=
getWebClient
().
build
().
post
().
uri
(
"/test"
).
contentType
(
MediaType
.
TEXT_PLAIN
)
.
body
(
BodyInserters
.
from
Object
(
"Hello World"
)).
exchange
()
.
body
(
BodyInserters
.
from
Value
(
"Hello World"
)).
exchange
()
.
flatMap
((
response
)
->
response
.
bodyToMono
(
String
.
class
));
.
flatMap
((
response
)
->
response
.
bodyToMono
(
String
.
class
));
assertThat
(
result
.
block
(
Duration
.
ofSeconds
(
30
))).
isEqualTo
(
"Hello World"
);
assertThat
(
result
.
block
(
Duration
.
ofSeconds
(
30
))).
isEqualTo
(
"Hello World"
);
assertThat
(
this
.
webServer
.
getPort
()).
isEqualTo
(
specificPort
);
assertThat
(
this
.
webServer
.
getPort
()).
isEqualTo
(
specificPort
);
...
@@ -122,7 +122,7 @@ public abstract class AbstractReactiveWebServerFactoryTests {
...
@@ -122,7 +122,7 @@ public abstract class AbstractReactiveWebServerFactoryTests {
WebClient
client
=
WebClient
.
builder
().
baseUrl
(
"https://localhost:"
+
this
.
webServer
.
getPort
())
WebClient
client
=
WebClient
.
builder
().
baseUrl
(
"https://localhost:"
+
this
.
webServer
.
getPort
())
.
clientConnector
(
connector
).
build
();
.
clientConnector
(
connector
).
build
();
Mono
<
String
>
result
=
client
.
post
().
uri
(
"/test"
).
contentType
(
MediaType
.
TEXT_PLAIN
)
Mono
<
String
>
result
=
client
.
post
().
uri
(
"/test"
).
contentType
(
MediaType
.
TEXT_PLAIN
)
.
body
(
BodyInserters
.
from
Object
(
"Hello World"
)).
exchange
()
.
body
(
BodyInserters
.
from
Value
(
"Hello World"
)).
exchange
()
.
flatMap
((
response
)
->
response
.
bodyToMono
(
String
.
class
));
.
flatMap
((
response
)
->
response
.
bodyToMono
(
String
.
class
));
assertThat
(
result
.
block
(
Duration
.
ofSeconds
(
30
))).
isEqualTo
(
"Hello World"
);
assertThat
(
result
.
block
(
Duration
.
ofSeconds
(
30
))).
isEqualTo
(
"Hello World"
);
}
}
...
@@ -176,7 +176,7 @@ public abstract class AbstractReactiveWebServerFactoryTests {
...
@@ -176,7 +176,7 @@ public abstract class AbstractReactiveWebServerFactoryTests {
WebClient
client
=
WebClient
.
builder
().
baseUrl
(
"https://localhost:"
+
this
.
webServer
.
getPort
())
WebClient
client
=
WebClient
.
builder
().
baseUrl
(
"https://localhost:"
+
this
.
webServer
.
getPort
())
.
clientConnector
(
clientConnector
).
build
();
.
clientConnector
(
clientConnector
).
build
();
Mono
<
String
>
result
=
client
.
post
().
uri
(
"/test"
).
contentType
(
MediaType
.
TEXT_PLAIN
)
Mono
<
String
>
result
=
client
.
post
().
uri
(
"/test"
).
contentType
(
MediaType
.
TEXT_PLAIN
)
.
body
(
BodyInserters
.
from
Object
(
"Hello World"
)).
exchange
()
.
body
(
BodyInserters
.
from
Value
(
"Hello World"
)).
exchange
()
.
flatMap
((
response
)
->
response
.
bodyToMono
(
String
.
class
));
.
flatMap
((
response
)
->
response
.
bodyToMono
(
String
.
class
));
assertThat
(
result
.
block
(
Duration
.
ofSeconds
(
30
))).
isEqualTo
(
"Hello World"
);
assertThat
(
result
.
block
(
Duration
.
ofSeconds
(
30
))).
isEqualTo
(
"Hello World"
);
}
}
...
@@ -209,7 +209,7 @@ public abstract class AbstractReactiveWebServerFactoryTests {
...
@@ -209,7 +209,7 @@ public abstract class AbstractReactiveWebServerFactoryTests {
WebClient
client
=
WebClient
.
builder
().
baseUrl
(
"https://localhost:"
+
this
.
webServer
.
getPort
())
WebClient
client
=
WebClient
.
builder
().
baseUrl
(
"https://localhost:"
+
this
.
webServer
.
getPort
())
.
clientConnector
(
clientConnector
).
build
();
.
clientConnector
(
clientConnector
).
build
();
Mono
<
String
>
result
=
client
.
post
().
uri
(
"/test"
).
contentType
(
MediaType
.
TEXT_PLAIN
)
Mono
<
String
>
result
=
client
.
post
().
uri
(
"/test"
).
contentType
(
MediaType
.
TEXT_PLAIN
)
.
body
(
BodyInserters
.
from
Object
(
"Hello World"
)).
exchange
()
.
body
(
BodyInserters
.
from
Value
(
"Hello World"
)).
exchange
()
.
flatMap
((
response
)
->
response
.
bodyToMono
(
String
.
class
));
.
flatMap
((
response
)
->
response
.
bodyToMono
(
String
.
class
));
StepVerifier
.
create
(
result
).
expectError
(
SSLException
.
class
).
verify
(
Duration
.
ofSeconds
(
10
));
StepVerifier
.
create
(
result
).
expectError
(
SSLException
.
class
).
verify
(
Duration
.
ofSeconds
(
10
));
}
}
...
...
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