follow review hints

Author: tasso94

data-migrator/core/src/main/java/io/camunda/migration/data/impl/clients/DbClient.java

@@ -177,7 +177,9 @@ public void listSkippedEntitiesByType(TYPE type) {
    * skipped entities, even when some are migrated (removed from skipped list) during processing.
    *
    * @param type the entity type to process
-   * @param callback function that processes an entity and returns true if migrated, false if skipped
+   * @param callback function that processes a skipped entity and returns {@code null} if it was
+   *     successfully migrated, or an {@link EntitySkippedException} if the entity remains skipped
+   * @return a list of {@link EntitySkippedException}s for all entities that could not be migrated
    */
   public List<EntitySkippedException> fetchAndHandleSkippedForType(TYPE type, Function<IdKeyDbModel, EntitySkippedException> callback) {
     int pageSize = properties.getPageSize();

data-migrator/core/src/main/java/io/camunda/migration/data/impl/logging/VariableServiceLogs.java

@@ -38,7 +38,7 @@ public class VariableServiceLogs {
   public static final String JSON_DESERIALIZATION_ERROR = "Error while deserializing JSON into Map type.";
 
   /**
-   * Logs a warning message for variable interceptor failure.
+   * Logs a debug message for variable interceptor failure.
    *
    * @param interceptorName the name of the failed interceptor
    * @param variableName the name of the variable being processed

data-migrator/distro/src/main/java/io/camunda/migration/data/app/MigratorApp.java

@@ -219,9 +219,7 @@ public static void migrateHistory(ConfigurableApplicationContext context, Applic
     // Extract entity type filters if --list-skipped is used
     if (mode == MigratorMode.LIST_SKIPPED) {
       List<IdKeyMapper.TYPE> entityTypeFilters = extractEntityTypeFilters(appArgs);
-      if (!entityTypeFilters.isEmpty()) {
-        historyMigrator.printSkippedHistoryEntities(entityTypeFilters);
-      }
+      historyMigrator.printSkippedHistoryEntities(entityTypeFilters);
     } else if (mode == MigratorMode.RETRY_SKIPPED) {
       historyMigrator.retry();
 

data-migrator/qa/integration-tests/src/test/java/io/camunda/migration/data/qa/history/entity/HistoryFlowNodeTest.java

@@ -136,9 +136,6 @@ public void shouldSetFlowNodeScopeKeyForFlowNodeInSubprocess() {
     // the flow node of start event ("start_insideSub") in subprocess can be processed before its parent flow node ("subprocess"),
     // causing the "start_insideSub" to be skipped
     historyMigrator.migrate();
-    // retry the skipped ones to ensure all flow nodes are migrated
-    historyMigrator.retry();
-    historyMigrator.migrate();
 
     // then
     List<ProcessInstanceEntity> processInstances = searchHistoricProcessInstances("subProcess");
@@ -182,9 +179,6 @@ public void shouldSetFlowNodeScopeKeyForFlowNodeInCalledProcess() {
 
     // when
     historyMigrator.migrate();
-    // need to run with retry to migrate child instances with flow node dependencies
-    historyMigrator.retry();
-    historyMigrator.migrate();
 
     // then
     List<ProcessInstanceEntity> parentProcessInstances = searchHistoricProcessInstances("callingProcessId");

data-migrator/qa/integration-tests/src/test/java/io/camunda/migration/data/qa/history/entity/HistoryIncidentTest.java

@@ -108,9 +108,6 @@ public void shouldMigrateIncidentForNestedProcessInstance() {
 
     // when
     historyMigrator.migrate();
-    // need to run with retry to migrate child instances with flow node dependencies
-    historyMigrator.retry();
-    historyMigrator.migrate();
 
     // then
 

data-migrator/qa/integration-tests/src/test/java/io/camunda/migration/data/qa/history/entity/HistoryProcessInstanceTest.java

@@ -107,9 +107,6 @@ public void shouldMigrateCallActivityAndSubprocess() {
 
     // when
     historyMigrator.migrate();
-    // need to run with retry to migrate child instances with flow node dependencies
-    historyMigrator.retry();
-    historyMigrator.migrate();
 
     // then
     List<ProcessInstanceEntity> parentProcessInstance = searchHistoricProcessInstances("callingProcessId");
@@ -185,9 +182,6 @@ public void shouldPopulateRootProcessInstanceKeyForCallActivity() {
 
     // when
     historyMigrator.migrate();
-    // need to run with retry to migrate child instances with flow node dependencies
-    historyMigrator.retry();
-    historyMigrator.migrate();
 
     // then
     List<ProcessInstanceEntity> parentProcessInstances = searchHistoricProcessInstances("callingProcessId");
@@ -240,9 +234,6 @@ public void shouldPopulateParentFlowNodeInstanceKeyForCallActivity() {
 
     // when
     historyMigrator.migrate();
-    // need to run with retry to migrate child instances with flow node dependencies
-    historyMigrator.retry();
-    historyMigrator.migrate();
 
     // then
     List<ProcessInstanceEntity> parentProcessInstances = searchHistoricProcessInstances("callingProcessId");

data-migrator/qa/integration-tests/src/test/java/io/camunda/migration/data/qa/runtime/SkipAndRetryProcessInstancesTest.java

@@ -24,7 +24,6 @@
 import io.camunda.search.entities.ProcessInstanceEntity;
 import io.camunda.search.query.ProcessInstanceQuery;
 import io.github.netmikey.logunit.api.LogCapturer;
-import io.netty.handler.logging.LogLevel;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Matcher;