diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8bc8e0f..36c2575 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,7 +5,7 @@ spring-dependency-management = "1.1.7" openapi-generator = "7.26.0" openapi-tools = "0.2.9" swagger = "3.0.0" -swagger-request-validator = "2.46.1" +swagger-request-validator = "3.0.0" jakarta-validation = "3.1.1" lombok = "1.18.46" commons-codec = "1.23.0" diff --git a/openapi-validation-core/src/main/java/com/getyourguide/openapi/validation/core/log/ThrottlingOpenApiViolationHandler.java b/openapi-validation-core/src/main/java/com/getyourguide/openapi/validation/core/log/ThrottlingOpenApiViolationHandler.java index a75fb06..559343b 100644 --- a/openapi-validation-core/src/main/java/com/getyourguide/openapi/validation/core/log/ThrottlingOpenApiViolationHandler.java +++ b/openapi-validation-core/src/main/java/com/getyourguide/openapi/validation/core/log/ThrottlingOpenApiViolationHandler.java @@ -2,17 +2,17 @@ import com.getyourguide.openapi.validation.api.log.OpenApiViolationHandler; import com.getyourguide.openapi.validation.api.model.OpenApiViolation; +import java.time.Instant; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import lombok.AllArgsConstructor; import lombok.NonNull; -import org.joda.time.DateTime; @AllArgsConstructor public class ThrottlingOpenApiViolationHandler implements OpenApiViolationHandler { private final OpenApiViolationHandler delegate; private final int waitSeconds; - private final Map loggedMessages = new ConcurrentHashMap<>(); + private final Map loggedMessages = new ConcurrentHashMap<>(); @Override public void onOpenApiViolation(OpenApiViolation violation) { @@ -25,13 +25,13 @@ public void onOpenApiViolation(OpenApiViolation violation) { } private void registerLoggedMessage(OpenApiViolation openApiViolation) { - loggedMessages.put(buildKey(openApiViolation), DateTime.now()); + loggedMessages.put(buildKey(openApiViolation), Instant.now()); } private boolean isThrottled(OpenApiViolation openApiViolation) { var key = buildKey(openApiViolation); var lastLoggedTime = loggedMessages.get(key); - return lastLoggedTime != null && lastLoggedTime.plusSeconds(waitSeconds).isAfterNow(); + return lastLoggedTime != null && lastLoggedTime.plusSeconds(waitSeconds).isAfter(Instant.now()); } @NonNull