From 47d39831d3c73c30a692d0ce3f8291f86521c8c6 Mon Sep 17 00:00:00 2001 From: Athou Date: Thu, 15 Aug 2024 09:05:56 +0200 Subject: [PATCH] use Duration for query timeout --- .../main/java/com/commafeed/CommaFeedConfiguration.java | 2 +- .../main/java/com/commafeed/backend/dao/GenericDAO.java | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/commafeed-server/src/main/java/com/commafeed/CommaFeedConfiguration.java b/commafeed-server/src/main/java/com/commafeed/CommaFeedConfiguration.java index de0224a0..1188d517 100644 --- a/commafeed-server/src/main/java/com/commafeed/CommaFeedConfiguration.java +++ b/commafeed-server/src/main/java/com/commafeed/CommaFeedConfiguration.java @@ -131,7 +131,7 @@ public interface CommaFeedConfiguration { * 0 to disable. */ @WithDefault("0") - int queryTimeout(); + Duration queryTimeout(); Cleanup cleanup(); diff --git a/commafeed-server/src/main/java/com/commafeed/backend/dao/GenericDAO.java b/commafeed-server/src/main/java/com/commafeed/backend/dao/GenericDAO.java index 8041295b..850144c8 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/dao/GenericDAO.java +++ b/commafeed-server/src/main/java/com/commafeed/backend/dao/GenericDAO.java @@ -1,5 +1,6 @@ package com.commafeed.backend.dao; +import java.time.Duration; import java.util.Collection; import org.hibernate.Session; @@ -57,9 +58,9 @@ public abstract class GenericDAO { return objects.size(); } - protected void setTimeout(JPAQuery query, int timeoutMs) { - if (timeoutMs > 0) { - query.setHint(SpecHints.HINT_SPEC_QUERY_TIMEOUT, timeoutMs); + protected void setTimeout(JPAQuery query, Duration timeout) { + if (!timeout.isZero()) { + query.setHint(SpecHints.HINT_SPEC_QUERY_TIMEOUT, timeout.toMillis()); } }