Merge branch 'master' of https://github.com/siri-varma/java-sdk

Author: siri-varma

daprdocs/content/en/java-sdk-docs/spring-boot/_index.md

@@ -53,6 +53,18 @@ private DaprClient daprClient;
 
 This will connect to the default Dapr gRPC endpoint `localhost:50001`, requiring you to start Dapr outside of your application. 
 
+{{% alert title="Note" color="primary" %}}
+By default, the following properties are preconfigured for `DaprClient` and `DaprWorkflowClient`:
+```properties
+dapr.client.http-endpoint=http://localhost
+dapr.client.http-port=3500
+dapr.client.grpc-endpoint=localhost
+dapr.client.grpc-port=50001
+dapr.client.api-token=<Your Remote App API Token>
+```
+These values are used by default, but you can override them in your `application.properties` file to suit your environment.
+{{% /alert %}}
+
 You can use the `DaprClient` to interact with the Dapr APIs anywhere in your application, for example from inside a REST endpoint: 
 
 ```java 

spring-boot-examples/consumer-app/src/test/java/io/dapr/springboot/examples/consumer/DaprTestContainersConfig.java

@@ -97,6 +97,7 @@ public DaprContainer daprContainer(Network daprNetwork, RabbitMQContainer rabbit
         .withLogConsumer(outputFrame -> System.out.println(outputFrame.getUtf8String()))
         .withAppPort(8081).withAppChannelAddress("host.testcontainers.internal")
         .withReusablePlacement(reuse)
+        .withReusableScheduler(reuse)
         .withAppHealthCheckPath("/actuator/health")
         .dependsOn(rabbitMQContainer);
   }

testcontainers-dapr/src/main/java/io/dapr/testcontainers/DaprContainer.java

@@ -77,6 +77,9 @@ public class DaprContainer extends GenericContainer<DaprContainer> {
   private String appName;
   private Integer appPort;
   private String appHealthCheckPath;
+  private Integer appHealthCheckProbeInterval = 5; //default from docs
+  private Integer appHealthCheckProbeTimeout = 500; //default from docs
+  private Integer appHealthCheckThreshold = 3; //default from docs
   private boolean shouldReusePlacement;
   private boolean shouldReuseScheduler;
 
@@ -133,6 +136,21 @@ public DaprContainer withAppHealthCheckPath(String appHealthCheckPath) {
     return this;
   }
 
+  public DaprContainer withAppHealthCheckProbeInterval(Integer appHealthCheckProbeInterval) {
+    this.appHealthCheckProbeInterval = appHealthCheckProbeInterval;
+    return this;
+  }
+
+  public DaprContainer withAppHealthCheckProbeTimeout(Integer appHealthCheckProbeTimeout) {
+    this.appHealthCheckProbeTimeout = appHealthCheckProbeTimeout;
+    return this;
+  }
+
+  public DaprContainer withAppHealthCheckThreshold(Integer appHealthCheckThreshold) {
+    this.appHealthCheckThreshold = appHealthCheckThreshold;
+    return this;
+  }
+
   public DaprContainer withConfiguration(Configuration configuration) {
     this.configuration = configuration;
     return this;
@@ -193,7 +211,7 @@ public DaprContainer withReusablePlacement(boolean shouldReusePlacement) {
     return this;
   }
 
-  public DaprContainer withReuseScheduler(boolean shouldReuseScheduler) {
+  public DaprContainer withReusableScheduler(boolean shouldReuseScheduler) {
     this.shouldReuseScheduler = shouldReuseScheduler;
     return this;
   }
@@ -311,6 +329,16 @@ protected void configure() {
       cmds.add("--enable-app-health-check");
       cmds.add("--app-health-check-path");
       cmds.add(appHealthCheckPath);
+
+      cmds.add("--app-health-probe-interval");
+      cmds.add(Integer.toString(appHealthCheckProbeInterval));
+
+      cmds.add("--app-health-probe-timeout");
+      cmds.add(Integer.toString(appHealthCheckProbeTimeout));
+
+      cmds.add("--app-health-threshold");
+      cmds.add(Integer.toString(appHealthCheckThreshold));
+
     }
 
     if (configuration != null) {
@@ -385,6 +413,22 @@ public Integer getAppPort() {
     return appPort;
   }
 
+  public String getAppHealthCheckPath() {
+    return appHealthCheckPath;
+  }
+
+  public Integer getAppHealthCheckProbeInterval() {
+    return appHealthCheckProbeInterval;
+  }
+
+  public Integer getAppHealthCheckProbeTimeout() {
+    return appHealthCheckProbeTimeout;
+  }
+
+  public Integer getAppHealthCheckThreshold() {
+    return appHealthCheckThreshold;
+  }
+
   public String getAppChannelAddress() {
     return appChannelAddress;
   }

testcontainers-dapr/src/test/java/io/dapr/testcontainers/DaprContainerTest.java

@@ -44,4 +44,38 @@ public void schedulerAndPlacementCustomImagesStringTest() {
     assertEquals("daprio/scheduler:" + DAPR_VERSION, dapr.getSchedulerDockerImageName().asCanonicalNameString());
 
   }
+
+  @Test
+  public void appHealthParametersTest(){
+    DaprContainer dapr = new DaprContainer(DAPR_RUNTIME_IMAGE_TAG)
+            .withAppName("dapr-app")
+            .withAppPort(8081)
+            .withAppHealthCheckPath("/test")
+            .withAppHealthCheckProbeInterval(10)
+            .withAppHealthCheckProbeTimeout(600)
+            .withAppHealthCheckThreshold(7);
+
+    dapr.configure();
+
+    assertEquals(10, dapr.getAppHealthCheckProbeInterval());
+    assertEquals(600, dapr.getAppHealthCheckProbeTimeout());
+    assertEquals(7, dapr.getAppHealthCheckThreshold());
+    assertEquals("/test", dapr.getAppHealthCheckPath());
+
+  }
+
+  @Test
+  public void appHealthParametersDefaultsTest(){
+    //Check that the defaults are set by default
+    DaprContainer dapr2 = new DaprContainer(DAPR_RUNTIME_IMAGE_TAG)
+            .withAppName("dapr2-app")
+            .withAppPort(8082);
+
+    dapr2.configure();
+
+    assertEquals(5, dapr2.getAppHealthCheckProbeInterval());
+    assertEquals(500, dapr2.getAppHealthCheckProbeTimeout());
+    assertEquals(3, dapr2.getAppHealthCheckThreshold());
+
+  }
 }