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
74d2fe47
Commit
74d2fe47
authored
Sep 07, 2019
by
gaohanghang
Committed by
Stephane Nicoll
Sep 09, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Simplify code
See gh-18175
parent
41111ac9
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
6 additions
and
6 deletions
+6
-6
DurationStyle.java
.../java/org/springframework/boot/convert/DurationStyle.java
+1
-1
JettyReactiveWebServerFactory.java
...oot/web/embedded/jetty/JettyReactiveWebServerFactory.java
+1
-1
JettyServletWebServerFactory.java
...boot/web/embedded/jetty/JettyServletWebServerFactory.java
+1
-1
TomcatReactiveWebServerFactory.java
...t/web/embedded/tomcat/TomcatReactiveWebServerFactory.java
+1
-1
TomcatServletWebServerFactory.java
...ot/web/embedded/tomcat/TomcatServletWebServerFactory.java
+1
-1
NameAndAgeJsonKeyComponent.java
...ingframework/boot/jackson/NameAndAgeJsonKeyComponent.java
+1
-1
No files found.
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/convert/DurationStyle.java
View file @
74d2fe47
...
...
@@ -221,7 +221,7 @@ public enum DurationStyle {
}
public
Duration
parse
(
String
value
)
{
return
Duration
.
of
(
Long
.
valueOf
(
value
),
this
.
chronoUnit
);
return
Duration
.
of
(
Long
.
parseLong
(
value
),
this
.
chronoUnit
);
}
public
String
print
(
Duration
value
)
{
...
...
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyReactiveWebServerFactory.java
View file @
74d2fe47
...
...
@@ -167,7 +167,7 @@ public class JettyReactiveWebServerFactory extends AbstractReactiveWebServerFact
}
protected
Server
createJettyServer
(
JettyHttpHandlerAdapter
servlet
)
{
int
port
=
(
getPort
()
>=
0
)
?
getPort
()
:
0
;
int
port
=
Math
.
max
(
getPort
(),
0
)
;
InetSocketAddress
address
=
new
InetSocketAddress
(
getAddress
(),
port
);
Server
server
=
new
Server
(
getThreadPool
());
server
.
addConnector
(
createConnector
(
address
,
server
));
...
...
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyServletWebServerFactory.java
View file @
74d2fe47
...
...
@@ -137,7 +137,7 @@ public class JettyServletWebServerFactory extends AbstractServletWebServerFactor
@Override
public
WebServer
getWebServer
(
ServletContextInitializer
...
initializers
)
{
JettyEmbeddedWebAppContext
context
=
new
JettyEmbeddedWebAppContext
();
int
port
=
(
getPort
()
>=
0
)
?
getPort
()
:
0
;
int
port
=
Math
.
max
(
getPort
(),
0
)
;
InetSocketAddress
address
=
new
InetSocketAddress
(
getAddress
(),
port
);
Server
server
=
createServer
(
address
);
configureWebAppContext
(
context
,
initializers
);
...
...
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatReactiveWebServerFactory.java
View file @
74d2fe47
...
...
@@ -176,7 +176,7 @@ public class TomcatReactiveWebServerFactory extends AbstractReactiveWebServerFac
}
protected
void
customizeConnector
(
Connector
connector
)
{
int
port
=
(
getPort
()
>=
0
)
?
getPort
()
:
0
;
int
port
=
Math
.
max
(
getPort
(),
0
)
;
connector
.
setPort
(
port
);
if
(
StringUtils
.
hasText
(
this
.
getServerHeader
()))
{
connector
.
setAttribute
(
"server"
,
this
.
getServerHeader
());
...
...
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactory.java
View file @
74d2fe47
...
...
@@ -299,7 +299,7 @@ public class TomcatServletWebServerFactory extends AbstractServletWebServerFacto
// Needs to be protected so it can be used by subclasses
protected
void
customizeConnector
(
Connector
connector
)
{
int
port
=
(
getPort
()
>=
0
)
?
getPort
()
:
0
;
int
port
=
Math
.
max
(
getPort
(),
0
)
;
connector
.
setPort
(
port
);
if
(
StringUtils
.
hasText
(
this
.
getServerHeader
()))
{
connector
.
setAttribute
(
"server"
,
this
.
getServerHeader
());
...
...
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jackson/NameAndAgeJsonKeyComponent.java
View file @
74d2fe47
...
...
@@ -46,7 +46,7 @@ public class NameAndAgeJsonKeyComponent {
@Override
public
NameAndAge
deserializeKey
(
String
key
,
DeserializationContext
ctxt
)
throws
IOException
{
String
[]
keys
=
key
.
split
(
"is"
);
return
new
NameAndAge
(
keys
[
0
].
trim
(),
Integer
.
valueOf
(
keys
[
1
].
trim
()));
return
new
NameAndAge
(
keys
[
0
].
trim
(),
Integer
.
parseInt
(
keys
[
1
].
trim
()));
}
}
...
...
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