Merge pull request #18175 from gaohanghang

* pr/18175: Simplify code Closes gh-18175
spring-projects · Sep 9, 2019 · cd8fab8 · cd8fab8
2 parents 41111ac + 74d2fe4
commit cd8fab8
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/...oot-project/spring-boot/src/main/java/org/springframework/boot/convert/DurationStyle.java b/...oot-project/spring-boot/src/main/java/org/springframework/boot/convert/DurationStyle.java
@@ -221,7 +221,7 @@ enum Unit {
 		}
 
 		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) {

diff --git a/.../main/java/org/springframework/boot/web/embedded/jetty/JettyReactiveWebServerFactory.java b/.../main/java/org/springframework/boot/web/embedded/jetty/JettyReactiveWebServerFactory.java
@@ -167,7 +167,7 @@ protected JettyResourceFactory getResourceFactory() {
 	}
 
 	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));

diff --git a/...c/main/java/org/springframework/boot/web/embedded/jetty/JettyServletWebServerFactory.java b/...c/main/java/org/springframework/boot/web/embedded/jetty/JettyServletWebServerFactory.java
@@ -137,7 +137,7 @@ public JettyServletWebServerFactory(String contextPath, int port) {
 	@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);

diff --git a/...ain/java/org/springframework/boot/web/embedded/tomcat/TomcatReactiveWebServerFactory.java b/...ain/java/org/springframework/boot/web/embedded/tomcat/TomcatReactiveWebServerFactory.java
@@ -176,7 +176,7 @@ protected void configureContext(Context context) {
 	}
 
 	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());

diff --git a/...main/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactory.java b/...main/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactory.java
@@ -299,7 +299,7 @@ private void addJasperInitializer(TomcatEmbeddedContext context) {
 
 	// 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());

diff --git a/...pring-boot/src/test/java/org/springframework/boot/jackson/NameAndAgeJsonKeyComponent.java b/...pring-boot/src/test/java/org/springframework/boot/jackson/NameAndAgeJsonKeyComponent.java
@@ -46,7 +46,7 @@ static class Deserializer extends KeyDeserializer {
 		@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()));
 		}
 
 	}