chore: Fix merge issues

Signed-off-by: Javier Aliaga <[email protected]>

Author: javier-aliaga

sdk-tests/src/test/java/io/dapr/it/testcontainers/workflows/TestWorkflowsConfiguration.java

@@ -50,47 +50,42 @@ public WorkflowRuntimeBuilder workflowRuntimeBuilder(
       @Value("${dapr.http.endpoint}") String daprHttpEndpoint,
       @Value("${dapr.grpc.endpoint}") String daprGrpcEndpoint
   ){
-    Map<String, String> overrides = Map.of(
-        "dapr.http.endpoint", daprHttpEndpoint,
-        "dapr.grpc.endpoint", daprGrpcEndpoint
-    );
-
-    WorkflowRuntimeBuilder builder = new WorkflowRuntimeBuilder(new Properties(overrides));
-
-    builder.registerWorkflow(TestWorkflow.class);
-    builder.registerWorkflow(TestExecutionKeysWorkflow.class);
-    builder.registerWorkflow(TestNamedActivitiesWorkflow.class);
-
-    builder.registerActivity(FirstActivity.class);
-    builder.registerActivity(SecondActivity.class);
-    builder.registerActivity(TaskExecutionIdActivity.class);
-    
-    
-    builder.registerActivity("a",FirstActivity.class);
-    builder.registerActivity("b",FirstActivity.class);
-    builder.registerActivity("c", new SecondActivity());
-    builder.registerActivity("d", new WorkflowActivity() {
-      @Override
-      public Object run(WorkflowActivityContext ctx) {
-        TestWorkflowPayload workflowPayload = ctx.getInput(TestWorkflowPayload.class);
-        workflowPayload.getPayloads().add("Anonymous Activity");
-        return workflowPayload;
-      }
-    });
-    builder.registerActivity("e", new WorkflowActivity() {
-      @Override
-      public Object run(WorkflowActivityContext ctx) {
-        TestWorkflowPayload workflowPayload = ctx.getInput(TestWorkflowPayload.class);
-        workflowPayload.getPayloads().add("Anonymous Activity 2");
-        return workflowPayload;
-      }
-    });
+      Map<String, String> overrides = Map.of(
+              "dapr.http.endpoint", daprHttpEndpoint,
+              "dapr.grpc.endpoint", daprGrpcEndpoint
+      );
 
+      WorkflowRuntimeBuilder builder = new WorkflowRuntimeBuilder(new Properties(overrides));
 
+      builder.registerWorkflow(TestWorkflow.class);
+      builder.registerWorkflow(TestExecutionKeysWorkflow.class);
+      builder.registerWorkflow(TestNamedActivitiesWorkflow.class);
 
-    builder.registerActivity(TaskExecutionKeyActivity.class);
+      builder.registerActivity(FirstActivity.class);
+      builder.registerActivity(SecondActivity.class);
+      builder.registerActivity(TaskExecutionIdActivity.class);
 
+      builder.registerActivity("a", FirstActivity.class);
+      builder.registerActivity("b", FirstActivity.class);
+      builder.registerActivity("c", new SecondActivity());
+      builder.registerActivity("d", new WorkflowActivity() {
+          @Override
+          public Object run(WorkflowActivityContext ctx) {
+              TestWorkflowPayload workflowPayload = ctx.getInput(TestWorkflowPayload.class);
+              workflowPayload.getPayloads().add("Anonymous Activity");
+              return workflowPayload;
+          }
+      });
+      builder.registerActivity("e", new WorkflowActivity() {
+          @Override
+          public Object run(WorkflowActivityContext ctx) {
+              TestWorkflowPayload workflowPayload = ctx.getInput(TestWorkflowPayload.class);
+              workflowPayload.getPayloads().add("Anonymous Activity 2");
+              return workflowPayload;
+          }
+      });
 
-    return builder;
+      builder.registerActivity(TaskExecutionIdActivity.class);
+      return builder;
   }
 }