root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 16 Packages Projects Releases Wiki Activity

Simplify code 

See gh-18175
This commit is contained in:
gaohanghang 2019-09-07 17:11:53 +08:00 committed by Stephane Nicoll
parent 41111ac96f
commit 74d2fe472a
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/convert/DurationStyle.java
View File

@ -221,7 +221,7 @@ public enum DurationStyle {
} }
public Duration parse(String value) { 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) { public String print(Duration value) {

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyReactiveWebServerFactory.java
View File

@ -167,7 +167,7 @@ public class JettyReactiveWebServerFactory extends AbstractReactiveWebServerFact
} }
protected Server createJettyServer(JettyHttpHandlerAdapter servlet) { protected Server createJettyServer(JettyHttpHandlerAdapter servlet) {
int port = (getPort() >= 0) ? getPort() : 0; int port = Math.max(getPort(), 0);
InetSocketAddress address = new InetSocketAddress(getAddress(), port); InetSocketAddress address = new InetSocketAddress(getAddress(), port);
Server server = new Server(getThreadPool()); Server server = new Server(getThreadPool());
server.addConnector(createConnector(address, server)); server.addConnector(createConnector(address, server));

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyServletWebServerFactory.java
View File

@ -137,7 +137,7 @@ public class JettyServletWebServerFactory extends AbstractServletWebServerFactor
@Override @Override
public WebServer getWebServer(ServletContextInitializer... initializers) { public WebServer getWebServer(ServletContextInitializer... initializers) {
JettyEmbeddedWebAppContext context = new JettyEmbeddedWebAppContext(); JettyEmbeddedWebAppContext context = new JettyEmbeddedWebAppContext();
int port = (getPort() >= 0) ? getPort() : 0; int port = Math.max(getPort(), 0);
InetSocketAddress address = new InetSocketAddress(getAddress(), port); InetSocketAddress address = new InetSocketAddress(getAddress(), port);
Server server = createServer(address); Server server = createServer(address);
configureWebAppContext(context, initializers); configureWebAppContext(context, initializers);

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatReactiveWebServerFactory.java
View File

@ -176,7 +176,7 @@ public class TomcatReactiveWebServerFactory extends AbstractReactiveWebServerFac
} }
protected void customizeConnector(Connector connector) { protected void customizeConnector(Connector connector) {
int port = (getPort() >= 0) ? getPort() : 0; int port = Math.max(getPort(), 0);
connector.setPort(port); connector.setPort(port);
if (StringUtils.hasText(this.getServerHeader())) { if (StringUtils.hasText(this.getServerHeader())) {
connector.setAttribute("server", this.getServerHeader()); connector.setAttribute("server", this.getServerHeader());

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactory.java
View File

@ -299,7 +299,7 @@ public class TomcatServletWebServerFactory extends AbstractServletWebServerFacto
// Needs to be protected so it can be used by subclasses // Needs to be protected so it can be used by subclasses
protected void customizeConnector(Connector connector) { protected void customizeConnector(Connector connector) {
int port = (getPort() >= 0) ? getPort() : 0; int port = Math.max(getPort(), 0);
connector.setPort(port); connector.setPort(port);
if (StringUtils.hasText(this.getServerHeader())) { if (StringUtils.hasText(this.getServerHeader())) {
connector.setAttribute("server", this.getServerHeader()); connector.setAttribute("server", this.getServerHeader());

2
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jackson/NameAndAgeJsonKeyComponent.java
View File

@ -46,7 +46,7 @@ public class NameAndAgeJsonKeyComponent {
@Override @Override
public NameAndAge deserializeKey(String key, DeserializationContext ctxt) throws IOException { public NameAndAge deserializeKey(String key, DeserializationContext ctxt) throws IOException {
String[] keys = key.split("is"); 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()));
} }
} }