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
bfdb49f2
Commit
bfdb49f2
authored
Jan 18, 2020
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Retry when findAvailableTcpPort returns an unavailable port
Closes gh-19801
parent
aeca44d3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
22 additions
and
8 deletions
+22
-8
NettyRSocketServerFactoryTests.java
...rk/boot/rsocket/netty/NettyRSocketServerFactoryTests.java
+22
-8
No files found.
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/rsocket/netty/NettyRSocketServerFactoryTests.java
View file @
bfdb49f2
/*
/*
* Copyright 2012-20
19
the original author or authors.
* Copyright 2012-20
20
the original author or authors.
*
*
* Licensed under the Apache License, Version 2.0 (the "License");
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* you may not use this file except in compliance with the License.
...
@@ -19,6 +19,7 @@ package org.springframework.boot.rsocket.netty;
...
@@ -19,6 +19,7 @@ package org.springframework.boot.rsocket.netty;
import
java.net.InetSocketAddress
;
import
java.net.InetSocketAddress
;
import
java.time.Duration
;
import
java.time.Duration
;
import
java.util.Arrays
;
import
java.util.Arrays
;
import
java.util.concurrent.Callable
;
import
io.netty.buffer.PooledByteBufAllocator
;
import
io.netty.buffer.PooledByteBufAllocator
;
import
io.rsocket.AbstractRSocket
;
import
io.rsocket.AbstractRSocket
;
...
@@ -87,10 +88,13 @@ class NettyRSocketServerFactoryTests {
...
@@ -87,10 +88,13 @@ class NettyRSocketServerFactoryTests {
@Test
@Test
void
specificPort
()
{
void
specificPort
()
{
NettyRSocketServerFactory
factory
=
getFactory
();
NettyRSocketServerFactory
factory
=
getFactory
();
int
specificPort
=
SocketUtils
.
findAvailableTcpPort
(
41000
);
int
specificPort
=
doWithRetry
(()
->
{
factory
.
setPort
(
specificPort
);
int
port
=
SocketUtils
.
findAvailableTcpPort
(
41000
);
this
.
server
=
factory
.
create
(
new
EchoRequestResponseAcceptor
());
factory
.
setPort
(
port
);
this
.
server
.
start
();
this
.
server
=
factory
.
create
(
new
EchoRequestResponseAcceptor
());
this
.
server
.
start
();
return
port
;
});
this
.
requester
=
createRSocketTcpClient
();
this
.
requester
=
createRSocketTcpClient
();
String
payload
=
"test payload"
;
String
payload
=
"test payload"
;
String
response
=
this
.
requester
.
route
(
"test"
).
data
(
payload
).
retrieveMono
(
String
.
class
).
block
(
TIMEOUT
);
String
response
=
this
.
requester
.
route
(
"test"
).
data
(
payload
).
retrieveMono
(
String
.
class
).
block
(
TIMEOUT
);
...
@@ -117,15 +121,12 @@ class NettyRSocketServerFactoryTests {
...
@@ -117,15 +121,12 @@ class NettyRSocketServerFactoryTests {
ReactorResourceFactory
resourceFactory
=
new
ReactorResourceFactory
();
ReactorResourceFactory
resourceFactory
=
new
ReactorResourceFactory
();
resourceFactory
.
afterPropertiesSet
();
resourceFactory
.
afterPropertiesSet
();
factory
.
setResourceFactory
(
resourceFactory
);
factory
.
setResourceFactory
(
resourceFactory
);
int
specificPort
=
SocketUtils
.
findAvailableTcpPort
(
41000
);
factory
.
setPort
(
specificPort
);
this
.
server
=
factory
.
create
(
new
EchoRequestResponseAcceptor
());
this
.
server
=
factory
.
create
(
new
EchoRequestResponseAcceptor
());
this
.
server
.
start
();
this
.
server
.
start
();
this
.
requester
=
createRSocketWebSocketClient
();
this
.
requester
=
createRSocketWebSocketClient
();
String
payload
=
"test payload"
;
String
payload
=
"test payload"
;
String
response
=
this
.
requester
.
route
(
"test"
).
data
(
payload
).
retrieveMono
(
String
.
class
).
block
(
TIMEOUT
);
String
response
=
this
.
requester
.
route
(
"test"
).
data
(
payload
).
retrieveMono
(
String
.
class
).
block
(
TIMEOUT
);
assertThat
(
response
).
isEqualTo
(
payload
);
assertThat
(
response
).
isEqualTo
(
payload
);
assertThat
(
this
.
server
.
address
().
getPort
()).
isEqualTo
(
specificPort
);
}
}
@Test
@Test
...
@@ -164,6 +165,19 @@ class NettyRSocketServerFactoryTests {
...
@@ -164,6 +165,19 @@ class NettyRSocketServerFactoryTests {
return
RSocketRequester
.
builder
().
rsocketStrategies
(
strategies
);
return
RSocketRequester
.
builder
().
rsocketStrategies
(
strategies
);
}
}
private
<
T
>
T
doWithRetry
(
Callable
<
T
>
action
)
{
Exception
lastFailure
=
null
;
for
(
int
i
=
0
;
i
<
10
;
i
++)
{
try
{
return
action
.
call
();
}
catch
(
Exception
ex
)
{
lastFailure
=
ex
;
}
}
throw
new
IllegalStateException
(
"Action was not successful in 10 attempts"
,
lastFailure
);
}
static
class
EchoRequestResponseAcceptor
implements
SocketAcceptor
{
static
class
EchoRequestResponseAcceptor
implements
SocketAcceptor
{
@Override
@Override
...
...
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