Skip to content

Simplify code #18175

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Simplify code #18175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...oot-project/spring-boot/src/main/java/org/springframework/boot/convert/DurationStyle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion .../main/java/org/springframework/boot/web/embedded/jetty/JettyReactiveWebServerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ protected JettyResourceFactory getResourceFactory() {
}

protected Server createJettyServer(JettyHttpHandlerAdapter servlet) {
int port = (getPort() >= 0) ? getPort() : 0;
int port = Math.max(getPort(), 0);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the intention of the current code is clearer. We want to set the port to 0 if it's null or negative. My brain has to parse the .max so I am not keen to merge this change.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I prefer the proposed change. I find it no harder to read than what we currently have, with the advantage that getPort() is only called once so it doesn't make me pause and wonder if the value could change between calls.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm happy with the change as well

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks both. I am not feeling strongly against it so I'll go ahead and process with the merge.

InetSocketAddress address = new InetSocketAddress(getAddress(), port);
Server server = new Server(getThreadPool());
server.addConnector(createConnector(address, server));
Expand Down
2 changes: 1 addition & 1 deletion ...c/main/java/org/springframework/boot/web/embedded/jetty/JettyServletWebServerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion ...ain/java/org/springframework/boot/web/embedded/tomcat/TomcatReactiveWebServerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
2 changes: 1 addition & 1 deletion ...main/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
2 changes: 1 addition & 1 deletion ...pring-boot/src/test/java/org/springframework/boot/jackson/NameAndAgeJsonKeyComponent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()));
}

}
Expand Down