Skip to content

Commit 5c61375

Browse files
committed
Makes ErrorHandling not optional in ListenerConfig by specifying a create method.
1 parent de8377e commit 5c61375

File tree

3 files changed

+9
-22
lines changed

3 files changed

+9
-22
lines changed

webserver/http2/src/main/java/io/helidon/webserver/http2/Http2ServerStream.java

+3-10
Original file line numberDiff line numberDiff line change
@@ -312,23 +312,16 @@ public void run() {
312312
// gather error handling properties
313313
ErrorHandling errorHandling = ctx.listenerContext()
314314
.config()
315-
.errorHandling()
316-
.orElse(null);
317-
boolean includeEntity = false;
318-
boolean logAllMessages = false;
319-
if (errorHandling != null) {
320-
includeEntity = errorHandling.includeEntity();
321-
logAllMessages = errorHandling.logAllMessages();
322-
}
315+
.errorHandling();
323316

324317
// log message in DEBUG mode
325-
if (LOGGER.isLoggable(DEBUG) && (e.safeMessage() || logAllMessages)) {
318+
if (LOGGER.isLoggable(DEBUG) && (e.safeMessage() || errorHandling.logAllMessages())) {
326319
LOGGER.log(DEBUG, e);
327320
}
328321

329322
// create message to return based on settings
330323
String message = null;
331-
if (includeEntity) {
324+
if (errorHandling.includeEntity()) {
332325
message = e.safeMessage() ? e.getMessage() : "Bad request, see server log for more information";
333326
}
334327

webserver/webserver/src/main/java/io/helidon/webserver/ListenerConfigBlueprint.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -403,8 +403,9 @@ default void configureSocket(ServerSocket socket) {
403403
/**
404404
* Configuration for this listener's error handling.
405405
*
406-
* @return optional error handling
406+
* @return error handling
407407
*/
408408
@Option.Configured
409-
Optional<ErrorHandling> errorHandling();
409+
@Option.DefaultMethod("create")
410+
ErrorHandling errorHandling();
410411
}

webserver/webserver/src/main/java/io/helidon/webserver/http1/Http1Connection.java

+3-10
Original file line numberDiff line numberDiff line change
@@ -648,23 +648,16 @@ private void handleRequestException(RequestException e) {
648648
// gather error handling properties
649649
ErrorHandling errorHandling = ctx.listenerContext()
650650
.config()
651-
.errorHandling()
652-
.orElse(null);
653-
boolean includeEntity = false;
654-
boolean logAllMessages = false;
655-
if (errorHandling != null) {
656-
includeEntity = errorHandling.includeEntity();
657-
logAllMessages = errorHandling.logAllMessages();
658-
}
651+
.errorHandling();
659652

660653
// log message in DEBUG mode
661-
if (LOGGER.isLoggable(DEBUG) && (e.safeMessage() || logAllMessages)) {
654+
if (LOGGER.isLoggable(DEBUG) && (e.safeMessage() || errorHandling.logAllMessages())) {
662655
LOGGER.log(DEBUG, e);
663656
}
664657

665658
// create message to return based on settings
666659
String message = null;
667-
if (includeEntity) {
660+
if (errorHandling.includeEntity()) {
668661
message = e.safeMessage() ? e.getMessage() : "Bad request, see server log for more information";
669662
}
670663

0 commit comments

Comments
 (0)