From f8bca01e115aba99343f64de30282c25c13ea045 Mon Sep 17 00:00:00 2001 From: Joe Pill Date: Mon, 8 Jan 2024 15:34:49 -0600 Subject: [PATCH] fix: update timeout to 60s --- CHANGELOG.md | 6 ++++++ README.md | 2 +- pom.xml | 2 +- src/main/java/com/shipengine/Config.java | 4 ++-- src/test/java/com/shipengine/ShipEngineTest.java | 6 +++--- 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0af3ac7..ab2d9f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,3 +9,9 @@ * Fixed bug in deriveUserAgent method in the InternalClient now reads sdk version from resources/project.properties instead of version.txt. ([2aa3d13](https://github.com/ShipEngine/shipengine-java/commit/2aa3d133756cfb311beb10bec3474dfad91bffef)) * Testing and linting working CI ([748d2ce](https://github.com/ShipEngine/shipengine-java/commit/748d2ceced376e0d66f895f5251ba166e70d9c5f)) * Updated pom.xml settings to fix JaCoCo coverage reporting bug. ([a91ef99](https://github.com/ShipEngine/shipengine-java/commit/a91ef99f29adf74e99478cc248291731be38ddff)) + +## 1.0.3 + +### Changes + +* increase default timeout to 60s \ No newline at end of file diff --git a/README.md b/README.md index dc44d75..06250d8 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ public class ShipEngineDemo { put("apiKey", ""); put("pageSize", 75); put("retries", 3); - put("timeout", 8000); + put("timeout", 60000); }}); } } diff --git a/pom.xml b/pom.xml index aabdc4f..ac5ad49 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.shipengine shipengine - 1.0.2 + 1.0.3 ShipEngine SDK The official Java SDK for ShipEngine API. diff --git a/src/main/java/com/shipengine/Config.java b/src/main/java/com/shipengine/Config.java index 00a3538..ad68b68 100644 --- a/src/main/java/com/shipengine/Config.java +++ b/src/main/java/com/shipengine/Config.java @@ -24,7 +24,7 @@ public void setBaseUrl(String baseUrl) { /** * Client timeout in milliseconds. */ - private int timeout = 5000; + private int timeout = 60000; public Config(Map config) { if (config.containsKey("apiKey")) { @@ -114,7 +114,7 @@ public void setApiKey(String apiKey) throws ValidationException { * The maximum amount of time (in milliseconds) to wait for a response from the * ShipEngine server. * - * Defaults to 5000 (5 seconds). + * Defaults to 60000 (60 seconds). */ public int getTimeout() { return timeout; diff --git a/src/test/java/com/shipengine/ShipEngineTest.java b/src/test/java/com/shipengine/ShipEngineTest.java index 3ddf7a1..de116ae 100644 --- a/src/test/java/com/shipengine/ShipEngineTest.java +++ b/src/test/java/com/shipengine/ShipEngineTest.java @@ -42,7 +42,7 @@ public class ShipEngineTest { "apiKey", Constants.API_KEY, "baseUrl", Constants.TEST_URL, "retries", 8, - "timeout", 8000 + "timeout", 60000 ); @Before @@ -77,10 +77,10 @@ public void successfulInstantiationWithStringAPIKey() { @Test(timeout = 1500) public void successfulInstantiationWithIndividualArgs() { - ShipEngine shipengine = new ShipEngine(stubApiKey, 8000, 3, 75); + ShipEngine shipengine = new ShipEngine(stubApiKey, 60000, 3, 75); assertEquals(stubApiKey, shipengine.getConfig().getApiKey()); assertEquals(3, shipengine.getConfig().getRetries()); - assertEquals(8000, shipengine.getConfig().getTimeout()); + assertEquals(60000, shipengine.getConfig().getTimeout()); assertEquals(75, shipengine.getConfig().getPageSize()); }