From 69de8be8705d41bc4a05915864e1caf9a69eeb35 Mon Sep 17 00:00:00 2001 From: Ikhun Um Date: Wed, 11 Dec 2024 12:00:53 +0900 Subject: [PATCH] move validateGreaterThanOrEqual --- .../com/linecorp/armeria/server/DefaultServerConfig.java | 8 -------- .../linecorp/armeria/server/GracefulShutdownBuilder.java | 9 ++++++++- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/core/src/main/java/com/linecorp/armeria/server/DefaultServerConfig.java b/core/src/main/java/com/linecorp/armeria/server/DefaultServerConfig.java index 93afcbdb24d..3d80aa66a9e 100644 --- a/core/src/main/java/com/linecorp/armeria/server/DefaultServerConfig.java +++ b/core/src/main/java/com/linecorp/armeria/server/DefaultServerConfig.java @@ -360,14 +360,6 @@ static Duration validateNonNegative(Duration duration, String fieldName) { return duration; } - static void validateGreaterThanOrEqual(Duration larger, String largerFieldName, - Duration smaller, String smallerFieldName) { - if (larger.compareTo(smaller) < 0) { - throw new IllegalArgumentException(largerFieldName + " must be greater than or equal to " + - smallerFieldName); - } - } - @Override public Server server() { if (server == null) { diff --git a/core/src/main/java/com/linecorp/armeria/server/GracefulShutdownBuilder.java b/core/src/main/java/com/linecorp/armeria/server/GracefulShutdownBuilder.java index c10daaf315a..3e4ee6c49a8 100644 --- a/core/src/main/java/com/linecorp/armeria/server/GracefulShutdownBuilder.java +++ b/core/src/main/java/com/linecorp/armeria/server/GracefulShutdownBuilder.java @@ -16,7 +16,6 @@ package com.linecorp.armeria.server; -import static com.linecorp.armeria.server.DefaultServerConfig.validateGreaterThanOrEqual; import static com.linecorp.armeria.server.DefaultServerConfig.validateNonNegative; import static java.util.Objects.requireNonNull; @@ -107,6 +106,14 @@ public GracefulShutdownBuilder toExceptionFunction( return this; } + private static void validateGreaterThanOrEqual(Duration larger, String largerFieldName, + Duration smaller, String smallerFieldName) { + if (larger.compareTo(smaller) < 0) { + throw new IllegalArgumentException(largerFieldName + " must be greater than or equal to " + + smallerFieldName); + } + } + /** * Builds a new {@link GracefulShutdown} with the configured parameters. */