Skip to content

Commit e9b3d5d

Browse files
committed
CommonsExecWebServerFactoryBean.systemProperties(Consumer<Map<String,String>>)
Closes gh-33
1 parent a2d4f69 commit e9b3d5d

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

spring-boot-testjars/src/main/java/org/springframework/experimental/boot/server/exec/CommonsExecWebServerFactoryBean.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ public CommonsExecWebServerFactoryBean classpath(Consumer<ClasspathBuilder> conf
9494
return this;
9595
}
9696

97-
public CommonsExecWebServerFactoryBean addSystemProperties(Map<String, String> systemProperties) {
98-
this.systemProperties.putAll(systemProperties);
97+
public CommonsExecWebServerFactoryBean systemProperties(Consumer<Map<String, String>> systemProperties) {
98+
systemProperties.accept(this.systemProperties);
9999
return this;
100100
}
101101

spring-boot-testjars/src/test/java/org/springframework/experimental/boot/server/exec/CommonsExecWebServerFactoryBeanTests.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import java.util.ArrayList;
2424
import java.util.Arrays;
2525
import java.util.List;
26-
import java.util.Map;
2726

2827
import org.junit.jupiter.api.Test;
2928

@@ -107,7 +106,7 @@ void serverPortWhenSpecifiedThenNotOverridden() throws Exception {
107106
String expectedPort = "1234";
108107
String portSystemProperty = "server.port";
109108
CommonsExecWebServer server = CommonsExecWebServerFactoryBean.builder()
110-
.addSystemProperties(Map.of(portSystemProperty, expectedPort)).getObject();
109+
.systemProperties((props) -> props.put(portSystemProperty, expectedPort)).getObject();
111110
assertThat(server.getCommandLine().getArguments()).contains("-D" + portSystemProperty + "=" + expectedPort);
112111
}
113112

0 commit comments

Comments
 (0)