Skip to content

Commit 2d05157

Browse files
author
Luca Di Grazia
committed
Add @JsonProperty to AbstractServerFactory setters
A few setters were missing @JsonProperty, which makes deserialization fail if the ObjectMapper is configured to not look at setter names. Closes #2545
1 parent 1f86bae commit 2d05157

File tree

1 file changed

+1
-41
lines changed

1 file changed

+1
-41
lines changed

dataset/GitHub_Java/dropwizard.dropwizard/dropwizard-core/src/main/java/io/dropwizard/server/AbstractServerFactory.java

+1-41
Original file line numberDiff line numberDiff line change
@@ -204,20 +204,6 @@
204204
* method and request URI.
205205
* </td>
206206
* </tr>
207-
* <tr>
208-
* <td>{@code dumpAfterStart}</td>
209-
* <td>true</td>
210-
* <td>
211-
* Whether or not to dump jetty diagnostics after start.
212-
* </td>
213-
* </tr>
214-
* <tr>
215-
* <td>{@code dumpBeforeStop}</td>
216-
* <td>true</td>
217-
* <td>
218-
* Whether or not to dump jetty diagnostics before stop.
219-
* </td>
220-
* </tr>
221207
* </table>
222208
*
223209
* @see DefaultServerFactory
@@ -238,7 +224,7 @@ public abstract class AbstractServerFactory implements ServerFactory {
238224
@NotNull
239225
private ServerPushFilterFactory serverPush = new ServerPushFilterFactory();
240226

241-
@Min(4)
227+
@Min(2)
242228
private int maxThreads = 1024;
243229

244230
@Min(1)
@@ -288,10 +274,6 @@ public abstract class AbstractServerFactory implements ServerFactory {
288274

289275
private boolean enableThreadNameFilter = true;
290276

291-
private boolean dumpAfterStart = false;
292-
293-
private boolean dumpBeforeStop = false;
294-
295277
@JsonIgnore
296278
@ValidationMethod(message = "must have a smaller minThreads than maxThreads")
297279
public boolean isThreadPoolSizedCorrectly() {
@@ -518,26 +500,6 @@ public void setEnableThreadNameFilter(boolean enableThreadNameFilter) {
518500
this.enableThreadNameFilter = enableThreadNameFilter;
519501
}
520502

521-
@JsonProperty
522-
public boolean getDumpAfterStart() {
523-
return dumpAfterStart;
524-
}
525-
526-
@JsonProperty
527-
public void setDumpAfterStart(boolean dumpAfterStart) {
528-
this.dumpAfterStart = dumpAfterStart;
529-
}
530-
531-
@JsonProperty
532-
public boolean getDumpBeforeStop() {
533-
return dumpBeforeStop;
534-
}
535-
536-
@JsonProperty
537-
public void setDumpBeforeStop(boolean dumpBeforeStop) {
538-
this.dumpBeforeStop = dumpBeforeStop;
539-
}
540-
541503
protected Handler createAdminServlet(Server server,
542504
MutableServletContextHandler handler,
543505
MetricRegistry metrics,
@@ -615,8 +577,6 @@ protected Server buildServer(LifecycleEnvironment lifecycle,
615577
server.addBean(errorHandler);
616578
server.setStopAtShutdown(true);
617579
server.setStopTimeout(shutdownGracePeriod.toMilliseconds());
618-
server.setDumpAfterStart(dumpAfterStart);
619-
server.setDumpBeforeStop(dumpBeforeStop);
620580
return server;
621581
}
622582

0 commit comments

Comments
 (0)