From ab69a4f96cf1f534141a4c0b4c006ae53244f20b Mon Sep 17 00:00:00 2001 From: tvallin Date: Tue, 9 Aug 2022 16:14:11 +0200 Subject: [PATCH 1/2] Update timeout Signed-off-by: tvallin --- .../files/src/main/java/__pkg__/FtService.java.mustache | 2 +- .../files/src/test/java/__pkg__/FtServiceTest.java.mustache | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/archetypes/helidon/src/main/archetype/se/custom/files/src/main/java/__pkg__/FtService.java.mustache b/archetypes/helidon/src/main/archetype/se/custom/files/src/main/java/__pkg__/FtService.java.mustache index f2baf666d2e..1bb045eb4e3 100644 --- a/archetypes/helidon/src/main/archetype/se/custom/files/src/main/java/__pkg__/FtService.java.mustache +++ b/archetypes/helidon/src/main/archetype/se/custom/files/src/main/java/__pkg__/FtService.java.mustache @@ -44,7 +44,7 @@ public class FtService implements Service { this.retry = Retry.builder() .retryPolicy(Retry.DelayingRetryPolicy.noDelay(3)) .build(); - this.timeout = Timeout.create(Duration.ofMillis(100)); + this.timeout = Timeout.create(Duration.ofMillis(5000)); } @Override diff --git a/archetypes/helidon/src/main/archetype/se/custom/files/src/test/java/__pkg__/FtServiceTest.java.mustache b/archetypes/helidon/src/main/archetype/se/custom/files/src/test/java/__pkg__/FtServiceTest.java.mustache index 6c32849ac78..3bbf2559cb3 100644 --- a/archetypes/helidon/src/main/archetype/se/custom/files/src/test/java/__pkg__/FtServiceTest.java.mustache +++ b/archetypes/helidon/src/main/archetype/se/custom/files/src/test/java/__pkg__/FtServiceTest.java.mustache @@ -172,9 +172,9 @@ public class FtServiceTest { assertThat(response, is("Slept for 50 ms")); WebClientResponse clientResponse = client.get() - .path("/timeout/105") + .path("/timeout/10000") .request() - .await(1, TimeUnit.SECONDS); + .await(11, TimeUnit.SECONDS); response = clientResponse.content().as(String.class).await(1, TimeUnit.SECONDS); // error handler specified in Main From 9d5c03c28acab884d64da8bc1cf8bc9835a00dd9 Mon Sep 17 00:00:00 2001 From: tvallin Date: Mon, 15 Aug 2022 15:58:23 +0200 Subject: [PATCH 2/2] Apply review changes Signed-off-by: tvallin --- .../custom/files/src/main/java/__pkg__/FtService.java.mustache | 2 +- .../files/src/test/java/__pkg__/FtServiceTest.java.mustache | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/archetypes/helidon/src/main/archetype/se/custom/files/src/main/java/__pkg__/FtService.java.mustache b/archetypes/helidon/src/main/archetype/se/custom/files/src/main/java/__pkg__/FtService.java.mustache index 1bb045eb4e3..204f69abd4f 100644 --- a/archetypes/helidon/src/main/archetype/se/custom/files/src/main/java/__pkg__/FtService.java.mustache +++ b/archetypes/helidon/src/main/archetype/se/custom/files/src/main/java/__pkg__/FtService.java.mustache @@ -44,7 +44,7 @@ public class FtService implements Service { this.retry = Retry.builder() .retryPolicy(Retry.DelayingRetryPolicy.noDelay(3)) .build(); - this.timeout = Timeout.create(Duration.ofMillis(5000)); + this.timeout = Timeout.create(Duration.ofSeconds(5)); } @Override diff --git a/archetypes/helidon/src/main/archetype/se/custom/files/src/test/java/__pkg__/FtServiceTest.java.mustache b/archetypes/helidon/src/main/archetype/se/custom/files/src/test/java/__pkg__/FtServiceTest.java.mustache index 3bbf2559cb3..aa28349dca0 100644 --- a/archetypes/helidon/src/main/archetype/se/custom/files/src/test/java/__pkg__/FtServiceTest.java.mustache +++ b/archetypes/helidon/src/main/archetype/se/custom/files/src/test/java/__pkg__/FtServiceTest.java.mustache @@ -1,5 +1,6 @@ package {{package}}; +import java.time.Duration; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; @@ -174,7 +175,7 @@ public class FtServiceTest { WebClientResponse clientResponse = client.get() .path("/timeout/10000") .request() - .await(11, TimeUnit.SECONDS); + .await(Duration.ofSeconds(11)); response = clientResponse.content().as(String.class).await(1, TimeUnit.SECONDS); // error handler specified in Main