fixing review comments

Signed-off-by: salaboy <Salaboy@gmail.com>

Author: salaboy

pom.xml

@@ -62,6 +62,7 @@
     <commons-cli.version>1.9.0</commons-cli.version>
     <commons-io.version>2.14.0</commons-io.version>
     <zipkin.version>3.4.0</zipkin.version>
+    <microcks.version>0.3.1</microcks.version>
   </properties>
 
   <distributionManagement>

spring-boot-examples/workflows/pom.xml

@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.github.microcks</groupId>
       <artifactId>microcks-testcontainers</artifactId>
-      <version>0.3.1</version>
+      <version>${microcks.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

spring-boot-examples/workflows/src/main/java/io/dapr/springboot/examples/wfp/remoteendpoint/RemoteEndpointWorkflow.java

@@ -32,8 +32,8 @@ public WorkflowStub create() {
       Payload payload = ctx.getInput(Payload.class);
       payload = ctx.callActivity(CallRemoteEndpointActivity.class.getName(), payload ,
               new WorkflowTaskOptions(new WorkflowTaskRetryPolicy(5,
-                      Duration.ofSeconds(2), 1.0, Duration.ofSeconds(10), Duration.ofSeconds(20)))
-              ,Payload.class).await();
+                      Duration.ofSeconds(2), 1.0, Duration.ofSeconds(10), Duration.ofSeconds(20))),
+              Payload.class).await();
 
       ctx.getLogger().info("Workflow finished with result: " + payload);
       ctx.complete(payload);

spring-boot-examples/workflows/src/test/java/io/dapr/springboot/examples/wfp/DaprTestContainersConfig.java

@@ -23,11 +23,9 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.core.env.Environment;
 import org.springframework.test.context.DynamicPropertyRegistrar;
-import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.Network;
 
 import java.util.Collections;
-import java.util.List;
 
 import static io.dapr.testcontainers.DaprContainerConstants.DAPR_RUNTIME_IMAGE_TAG;
 
@@ -50,15 +48,9 @@ public DaprContainer daprContainer(Network network) {
 
   @Bean
   MicrocksContainersEnsemble microcksEnsemble(Network network) {
-//    DockerImageName nativeImage = DockerImageName.parse("quay.io/microcks/microcks-uber:1.11.2-native")
-//            .asCompatibleSubstituteFor("quay.io/microcks/microcks-uber:1.9.0");
-
-    //new MicrocksContainersEnsemble(network, nativeImage)
-    MicrocksContainersEnsemble ensemble = new MicrocksContainersEnsemble(network, "quay.io/microcks/microcks-uber:1.11.2")
+    return new MicrocksContainersEnsemble(network, "quay.io/microcks/microcks-uber:1.11.2")
             .withAccessToHost(true)   // We need this to access our webapp while it runs
             .withMainArtifacts("third-parties/remote-http-service.yaml");
-    return ensemble;
-
   }
 
   @Bean
@@ -72,9 +64,7 @@ public DynamicPropertyRegistrar endpointsProperties(MicrocksContainersEnsemble e
 
   @Bean
   public Network getDaprNetwork(Environment env) {
-    boolean reuse = env.getProperty("reuse", Boolean.class, false);
-    if (reuse) {
-      Network defaultDaprNetwork = new Network() {
+    return new Network() {
         @Override
         public String getId() {
           return "dapr-network";
@@ -90,18 +80,6 @@ public Statement apply(Statement base, Description description) {
           return null;
         }
       };
-
-      List<com.github.dockerjava.api.model.Network> networks = DockerClientFactory.instance().client().listNetworksCmd()
-              .withNameFilter("dapr-network").exec();
-      if (networks.isEmpty()) {
-        Network.builder().createNetworkCmdModifier(cmd -> cmd.withName("dapr-network")).build().getId();
-        return defaultDaprNetwork;
-      } else {
-        return defaultDaprNetwork;
-      }
-    } else {
-      return Network.newNetwork();
-    }
   }
 
 }