rename shutdownError to toException

Author: ikhoon

core/src/main/java/com/linecorp/armeria/server/DefaultGracefulShutdown.java

@@ -28,13 +28,13 @@ final class DefaultGracefulShutdown implements GracefulShutdown {
 
     private final Duration quietPeriod;
     private final Duration timeout;
-    private final BiFunction<ServiceRequestContext, HttpRequest, Throwable> errorFunction;
+    private final BiFunction<ServiceRequestContext, HttpRequest, Throwable> toExceptionFunction;
 
     DefaultGracefulShutdown(Duration quietPeriod, Duration timeout,
-                            BiFunction<ServiceRequestContext, HttpRequest, Throwable> errorFunction) {
+                            BiFunction<ServiceRequestContext, HttpRequest, Throwable> toExceptionFunction) {
         this.quietPeriod = quietPeriod;
         this.timeout = timeout;
-        this.errorFunction = errorFunction;
+        this.toExceptionFunction = toExceptionFunction;
     }
 
     @Override
@@ -48,8 +48,8 @@ public Duration timeout() {
     }
 
     @Override
-    public Throwable shutdownError(ServiceRequestContext ctx, HttpRequest request) {
-        return errorFunction.apply(ctx, request);
+    public Throwable toException(ServiceRequestContext ctx, HttpRequest request) {
+        return toExceptionFunction.apply(ctx, request);
     }
 
     @Override
@@ -63,20 +63,20 @@ public boolean equals(Object o) {
         final DefaultGracefulShutdown that = (DefaultGracefulShutdown) o;
         return quietPeriod.equals(that.quietPeriod) &&
                timeout.equals(that.timeout) &&
-               errorFunction.equals(that.errorFunction);
+               toExceptionFunction.equals(that.toExceptionFunction);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(quietPeriod, timeout, errorFunction);
+        return Objects.hash(quietPeriod, timeout, toExceptionFunction);
     }
 
     @Override
     public String toString() {
         return MoreObjects.toStringHelper(this)
                           .add("quietPeriod", quietPeriod)
                           .add("timeout", timeout)
-                          .add("errorFunction", errorFunction)
+                          .add("toExceptionFunction", toExceptionFunction)
                           .toString();
     }
 }

core/src/main/java/com/linecorp/armeria/server/GracefulShutdown.java

@@ -64,5 +64,5 @@ static GracefulShutdown disabled() {
      * <p>If null is returned, the request will be terminated with {@link ShuttingDownException} that will be
      * converted to an {@link HttpStatus#SERVICE_UNAVAILABLE} response.
      */
-    Throwable shutdownError(ServiceRequestContext ctx, HttpRequest request);
+    Throwable toException(ServiceRequestContext ctx, HttpRequest request);
 }

core/src/main/java/com/linecorp/armeria/server/GracefulShutdownBuilder.java

@@ -44,7 +44,7 @@ public final class GracefulShutdownBuilder {
 
     private Duration quietPeriod = DEFAULT_GRACEFUL_SHUTDOWN_QUIET_PERIOD;
     private Duration timeout = DEFAULT_GRACEFUL_SHUTDOWN_TIMEOUT;
-    private BiFunction<ServiceRequestContext, HttpRequest, Throwable> errorFunction = DEFAULT_ERROR_FUNCTION;
+    private BiFunction<ServiceRequestContext, HttpRequest, Throwable> toException = DEFAULT_ERROR_FUNCTION;
 
     GracefulShutdownBuilder() {}
 
@@ -99,11 +99,11 @@ public GracefulShutdownBuilder timeoutMillis(long timeoutMillis) {
      * shutting down. If unspecified, the request will be terminated with {@link ShuttingDownException} that
      * will be converted to an {@link HttpStatus#SERVICE_UNAVAILABLE} response.
      */
-    public GracefulShutdownBuilder shutdownErrorFunction(
-            BiFunction<? super ServiceRequestContext, ? super HttpRequest, ? extends Throwable> errorFunction) {
-        requireNonNull(errorFunction, "errorFunction");
+    public GracefulShutdownBuilder toExceptionFunction(
+            BiFunction<? super ServiceRequestContext, ? super HttpRequest, ? extends Throwable> toException) {
+        requireNonNull(toException, "toException");
         //noinspection unchecked
-        this.errorFunction = (BiFunction<ServiceRequestContext, HttpRequest, Throwable>) errorFunction;
+        this.toException = (BiFunction<ServiceRequestContext, HttpRequest, Throwable>) toException;
         return this;
     }
 
@@ -112,6 +112,6 @@ public GracefulShutdownBuilder shutdownErrorFunction(
      */
     public GracefulShutdown build() {
         validateGreaterThanOrEqual(timeout, "timeout", quietPeriod, "quietPeriod");
-        return new DefaultGracefulShutdown(quietPeriod, timeout, errorFunction);
+        return new DefaultGracefulShutdown(quietPeriod, timeout, toException);
     }
 }

core/src/main/java/com/linecorp/armeria/server/HttpServerHandler.java

@@ -322,9 +322,9 @@ private Throwable shutdownError(DecodedHttpRequest req) {
             return null;
         }
         try {
-            return config.gracefulShutdown().shutdownError(ctx, req);
+            return config.gracefulShutdown().toException(ctx, req);
         } catch (Exception e) {
-            logger.warn("{} Unexpected exception from gracefulShutdown.shutdownError(): {}",
+            logger.warn("{} Unexpected exception from gracefulShutdown.toException(): {}",
                         ctx, config.gracefulShutdown(), e);
             return null;
         }

core/src/test/java/com/linecorp/armeria/GracefulShutdownBuilderTest.java

@@ -54,7 +54,7 @@ void testDefault() {
         final GracefulShutdown gracefulShutdown = GracefulShutdown.builder().build();
         assertThat(gracefulShutdown.quietPeriod()).isZero();
         assertThat(gracefulShutdown.timeout()).isZero();
-        assertThat(gracefulShutdown.shutdownError(null, null))
+        assertThat(gracefulShutdown.toException(null, null))
                 .isInstanceOf(ShuttingDownException.class);
     }
 
@@ -64,11 +64,11 @@ void testCustomValues() {
                 GracefulShutdown.builder()
                                 .quietPeriod(Duration.ofSeconds(1))
                                 .timeout(Duration.ofSeconds(2))
-                                .shutdownErrorFunction((ctx, req) -> new AnticipatedException("test"))
+                                .toExceptionFunction((ctx, req) -> new AnticipatedException("test"))
                                 .build();
         assertThat(gracefulShutdown.quietPeriod()).isEqualTo(Duration.ofSeconds(1));
         assertThat(gracefulShutdown.timeout()).isEqualTo(Duration.ofSeconds(2));
-        assertThat(gracefulShutdown.shutdownError(null, null))
+        assertThat(gracefulShutdown.toException(null, null))
                 .isInstanceOf(AnticipatedException.class);
     }
 }

core/src/test/java/com/linecorp/armeria/server/CustomGracefulShutDownTest.java

@@ -78,7 +78,7 @@ public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
                     GracefulShutdown.builder()
                                     .quietPeriod(Duration.ofMillis(500))
                                     .timeout(Duration.ofMillis(500))
-                                    .shutdownErrorFunction(
+                                    .toExceptionFunction(
                                             (ctx, req) -> new AnticipatedException())
                                     .build();