request timeout can be null but not negative

Kong · May 8, 2024 · 4c53737 · 4c53737
1 parent 06af301
commit 4c53737
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/unirest/src/main/java/kong/unirest/core/Config.java b/unirest/src/main/java/kong/unirest/core/Config.java
@@ -301,8 +301,8 @@ public Config connectTimeout(int inMillies) {
      * @return this builder
      * @throws IllegalArgumentException if the duration is non-positive
      */
-    public Config requestTimeout(int inMillies){
-        if(inMillies < 1){
+    public Config requestTimeout(Integer inMillies){
+        if(inMillies != null && inMillies < 1){
             throw new IllegalArgumentException("request timeout must be a positive integer");
         }
         this.requestTimeout = inMillies;

diff --git a/unirest/src/test/java/kong/unirest/core/ConfigTest.java b/unirest/src/test/java/kong/unirest/core/ConfigTest.java
@@ -25,10 +25,6 @@
 
 package kong.unirest.core;
 
-import kong.unirest.core.Client;
-import kong.unirest.core.Config;
-import kong.unirest.core.Proxy;
-import kong.unirest.core.UnirestConfigException;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
@@ -40,8 +36,7 @@
 import java.util.concurrent.TimeUnit;
 
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
-import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.mock;
 
 @ExtendWith(MockitoExtension.class)
 class ConfigTest {
@@ -138,6 +133,15 @@ void isRunningIfAsyncClientIsRunning() {
         assertTrue(config.isRunning());
     }
 
+    @Test
+    void requestTimeoutCannotBeNegative() {
+        config.requestTimeout(null);
+        config.requestTimeout(42);
+
+        assertThrows(IllegalArgumentException.class, () -> config.requestTimeout(0));
+        assertThrows(IllegalArgumentException.class, () -> config.requestTimeout(-5));
+    }
+
     private void assertProxy(String host, Integer port, String username, String password) {
         assertEquals(host, config.getProxy().getHost());
         assertEquals(port, config.getProxy().getPort());