from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/config/HoodieLockConfig.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/config/HoodieWriteConfig.java"
   contains "import org.apache.hudi.common.util.ConfigUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/config/HoodieClusteringConfig.java"
   contains "import org.apache.hudi.common.util.ValidationUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/config/HoodieCleanConfig.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/config/HoodieIndexConfig.java"
   contains "import org.apache.hudi.common.util.StringUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-flink-client/src/main/java/org/apache/hudi/io/FlinkMergeHandle.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-flink-client/src/main/java/org/apache/hudi/io/FlinkMergeAndReplaceHandleWithChangeLog.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-flink-client/src/main/java/org/apache/hudi/io/FlinkMergeHandleWithChangeLog.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-flink-client/src/main/java/org/apache/hudi/io/FlinkCreateHandle.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-flink-client/src/main/java/org/apache/hudi/io/FlinkMergeAndReplaceHandle.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/io/HoodieMergeHandleWithChangeLog.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/io/HoodieAppendHandle.java"
   contains "import org.apache.hudi.common.util.DefaultSizeEstimator;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/io/IOUtils.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/io/HoodieReadHandle.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/io/HoodieUnboundedCreateHandle.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/io/HoodieWriteHandle.java"
   contains "import org.apache.hudi.common.util.HoodieTimer;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/io/HoodieSortedMergeHandle.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/io/HoodieConcatHandle.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/io/HoodieBootstrapHandle.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/io/HoodieKeyLookupHandle.java"
   contains "import org.apache.hudi.common.util.HoodieTimer;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/io/HoodieCDCLogger.java"
   contains "import org.apache.hudi.common.util.DefaultSizeEstimator;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/io/HoodieMergeHandleFactory.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/io/HoodieKeyLocationFetchHandle.java"
   contains "import org.apache.hudi.common.util.BaseFileUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/io/HoodieSortedMergeHandleWithChangeLog.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/io/HoodieMergeHandle.java"
   contains "import org.apache.hudi.common.util.DefaultSizeEstimator;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/io/HoodieMergedReadHandle.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/io/HoodieIOHandle.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/io/HoodieCreateHandle.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/async/AsyncClusteringService.java"
   contains "import org.apache.hudi.common.util.CustomizedThreadFactory;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/async/AsyncCompactService.java"
   contains "import org.apache.hudi.common.util.CustomizedThreadFactory;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/keygen/SimpleAvroKeyGenerator.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/keygen/TimestampBasedAvroKeyGenerator.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/keygen/KeyGenUtils.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/keygen/CustomAvroKeyGenerator.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/keygen/TimestampBasedKeyGenerator.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/keygen/UTF8StringPartitionPathFormatter.java"
   contains "import org.apache.hudi.common.util.PartitionPathEncodeUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/keygen/StringPartitionPathFormatter.java"
   contains "import org.apache.hudi.common.util.PartitionPathEncodeUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/keygen/PartitionPathFormatterBase.java"
   contains "import static org.apache.hudi.common.util.ValidationUtils.checkState;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/keygen/CustomKeyGenerator.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/keygen/SimpleKeyGenerator.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/keygen/BuiltinKeyGenerator.java"
   contains "import static org.apache.hudi.common.util.CollectionUtils.tail;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/index/functional/HoodieSparkFunctionalIndex.java"
   contains "import org.apache.hudi.common.util.CollectionUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/transaction/lock/FileSystemBasedLockProvider.java"
   contains "import org.apache.hudi.storage.StoragePath;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-flink-client/src/main/java/org/apache/hudi/metadata/FlinkHoodieBackedTableMetadataWriter.java"
   contains "import org.apache.hudi.common.metrics.Registry;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-java-client/src/main/java/org/apache/hudi/metadata/JavaHoodieBackedTableMetadataWriter.java"
   contains "import org.apache.hudi.common.metrics.Registry;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/metadata/SparkHoodieBackedTableMetadataWriter.java"
   contains "import org.apache.hudi.common.metrics.Registry;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-flink-client/src/main/java/org/apache/hudi/io/storage/row/HoodieRowDataParquetWriteSupport.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-flink-client/src/main/java/org/apache/hudi/io/storage/row/HoodieRowDataCreateHandle.java"
   contains "import org.apache.hudi.common.util.HoodieTimer;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/io/storage/row/HoodieRowParquetWriteSupport.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/io/storage/row/HoodieRowCreateHandle.java"
   contains "import org.apache.hudi.common.util.HoodieTimer;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/io/storage/row/HoodieInternalRowFileWriterFactory.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-flink-client/src/main/java/org/apache/hudi/io/storage/row/parquet/ParquetRowDataWriter.java"
   contains "import org.apache.hudi.common.util.ValidationUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/upgrade/TwoToThreeUpgradeHandler.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/upgrade/SixToFiveDowngradeHandler.java"
   contains "import org.apache.hudi.common.util.FileIOUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/upgrade/ThreeToFourUpgradeHandler.java"
   contains "import org.apache.hudi.common.util.StringUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/upgrade/TwoToOneDowngradeHandler.java"
   contains "import org.apache.hudi.common.util.MarkerUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/upgrade/ZeroToOneUpgradeHandler.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/upgrade/FourToFiveUpgradeHandler.java"
   contains "import static org.apache.hudi.common.util.PartitionPathEncodeUtils.DEFAULT_PARTITION_PATH;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-flink-client/src/main/java/org/apache/hudi/table/HoodieFlinkTable.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-flink-client/src/main/java/org/apache/hudi/table/HoodieFlinkMergeOnReadTable.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-flink-client/src/main/java/org/apache/hudi/table/HoodieFlinkCopyOnWriteTable.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-java-client/src/main/java/org/apache/hudi/table/HoodieJavaCopyOnWriteTable.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-java-client/src/main/java/org/apache/hudi/table/HoodieJavaTable.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-java-client/src/main/java/org/apache/hudi/table/HoodieJavaMergeOnReadTable.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/HoodieTable.java"
   contains "import org.apache.hudi.common.util.Functions;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/BucketIndexBulkInsertPartitioner.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/BulkInsertPartitioner.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/table/HoodieSparkTable.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/table/HoodieSparkMergeOnReadTable.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/table/HoodieSparkCopyOnWriteTable.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-flink-client/src/main/java/org/apache/hudi/table/action/commit/BaseFlinkCommitActionExecutor.java"
   contains "import org.apache.hudi.common.util.CommitUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-flink-client/src/main/java/org/apache/hudi/table/action/commit/FlinkDeletePartitionCommitActionExecutor.java"
   contains "import org.apache.hudi.common.util.HoodieTimer;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-java-client/src/main/java/org/apache/hudi/table/action/commit/JavaUpsertPartitioner.java"
   contains "import org.apache.hudi.common.util.NumericUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-java-client/src/main/java/org/apache/hudi/table/action/commit/JavaBulkInsertPreppedCommitActionExecutor.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-java-client/src/main/java/org/apache/hudi/table/action/commit/BaseJavaCommitActionExecutor.java"
   contains "import org.apache.hudi.common.util.CommitUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-java-client/src/main/java/org/apache/hudi/table/action/commit/JavaBulkInsertHelper.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-java-client/src/main/java/org/apache/hudi/table/action/commit/JavaBulkInsertCommitActionExecutor.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/action/commit/HoodieMergeHelper.java"
   contains "import org.apache.hudi.common.util.InternalSchemaCache;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/action/commit/BaseBulkInsertHelper.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/action/commit/BaseWriteHelper.java"
   contains "import org.apache.hudi.common.util.HoodieRecordUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/action/commit/BaseCommitActionExecutor.java"
   contains "import org.apache.hudi.common.util.ClusteringUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/table/action/commit/BaseSparkCommitActionExecutor.java"
   contains "import org.apache.hudi.common.util.CommitUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/table/action/commit/SparkInsertOverwriteCommitActionExecutor.java"
   contains "import org.apache.hudi.common.util.StringUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/table/action/commit/ConsistentBucketBulkInsertDataInternalWriterHelper.java"
   contains "import org.apache.hudi.common.util.ValidationUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/table/action/commit/SparkBucketIndexPartitioner.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/table/action/commit/SparkBulkInsertHelper.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/table/action/commit/SparkDeletePartitionCommitActionExecutor.java"
   contains "import org.apache.hudi.common.util.HoodieTimer;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/table/action/commit/SparkBulkInsertCommitActionExecutor.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/table/action/commit/BulkInsertDataInternalWriterHelper.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/table/action/commit/UpsertPartitioner.java"
   contains "import org.apache.hudi.common.util.CollectionUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/table/action/commit/SparkBulkInsertPreppedCommitActionExecutor.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/action/compact/HoodieCompactor.java"
   contains "import org.apache.hudi.common.util.CollectionUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/action/compact/CompactHelpers.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/action/compact/RunCompactionActionExecutor.java"
   contains "import org.apache.hudi.common.util.CompactionUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/action/compact/LogCompactionExecutionHelper.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/action/compact/CompactionExecutionHelper.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/action/compact/OperationResult.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/action/compact/ScheduleCompactionActionExecutor.java"
   contains "import org.apache.hudi.common.util.CompactionUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-flink-client/src/main/java/org/apache/hudi/execution/ExplicitWriteHandler.java"
   contains "import static org.apache.hudi.common.util.ValidationUtils.checkState;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-flink-client/src/main/java/org/apache/hudi/execution/FlinkLazyInsertIterable.java"
   contains "import static org.apache.hudi.common.util.ValidationUtils.checkState;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-java-client/src/main/java/org/apache/hudi/execution/JavaLazyInsertIterable.java"
   contains "import static org.apache.hudi.common.util.ValidationUtils.checkState;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/execution/CopyOnWriteInsertHandler.java"
   contains "import static org.apache.hudi.common.util.ValidationUtils.checkState;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-flink-client/src/main/java/org/apache/hudi/index/FlinkHoodieIndexFactory.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-java-client/src/main/java/org/apache/hudi/index/JavaHoodieIndexFactory.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/index/HoodieIndexUtils.java"
   contains "import org.apache.hudi.common.util.HoodieTimer;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/index/SparkMetadataTableRecordIndex.java"
   contains "import org.apache.hudi.common.util.ValidationUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/index/SparkHoodieIndexFactory.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/client/SparkRDDWriteClient.java"
   contains "import org.apache.hudi.common.metrics.Registry;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-flink-client/src/main/java/org/apache/hudi/client/HoodieFlinkTableServiceClient.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-flink-client/src/main/java/org/apache/hudi/client/HoodieFlinkWriteClient.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-flink-client/src/main/java/org/apache/hudi/client/FlinkTaskContextSupplier.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-java-client/src/main/java/org/apache/hudi/client/HoodieJavaTableServiceClient.java"
   contains "import org.apache.hudi.common.util.ClusteringUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-java-client/src/main/java/org/apache/hudi/client/HoodieJavaWriteClient.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/FailOnFirstErrorWriteStatus.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/BaseHoodieWriteClient.java"
   contains "import org.apache.hudi.common.util.CleanerUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/BaseHoodieClient.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/BaseHoodieTableServiceClient.java"
   contains "import org.apache.hudi.common.util.CleanerUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/CompactionAdminClient.java"
   contains "import org.apache.hudi.common.util.CompactionUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/WriteStatus.java"
   contains "import org.apache.hudi.common.util.DateTimeUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/HoodieTableServiceManagerClient.java"
   contains "import org.apache.hudi.common.util.ClusteringUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/client/SparkRDDReadClient.java"
   contains "import org.apache.hudi.common.util.CompactionUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/client/SparkTaskContextSupplier.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/client/HoodieSparkCompactor.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/client/HoodieSparkClusteringClient.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/client/SparkRDDTableServiceClient.java"
   contains "import org.apache.hudi.common.util.ClusteringUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-flink-client/src/main/java/org/apache/hudi/client/clustering/plan/strategy/FlinkSizeBasedClusteringPlanStrategyRecently.java"
   contains "import org.apache.hudi.common.util.CollectionUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-flink-client/src/main/java/org/apache/hudi/client/clustering/plan/strategy/FlinkSizeBasedClusteringPlanStrategy.java"
   contains "import org.apache.hudi.common.util.StringUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-java-client/src/main/java/org/apache/hudi/client/clustering/plan/strategy/JavaSizeBasedClusteringPlanStrategy.java"
   contains "import org.apache.hudi.common.util.StringUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/client/clustering/plan/strategy/SparkSizeBasedClusteringPlanStrategy.java"
   contains "import org.apache.hudi.common.util.StringUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-flink-client/src/main/java/org/apache/hudi/client/common/HoodieFlinkEngineContext.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-java-client/src/main/java/org/apache/hudi/client/common/JavaTaskContextSupplier.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-java-client/src/main/java/org/apache/hudi/client/common/HoodieJavaEngineContext.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/client/common/HoodieSparkEngineContext.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-java-client/src/main/java/org/apache/hudi/table/action/cluster/JavaExecuteClusteringCommitActionExecutor.java"
   contains "import org.apache.hudi.common.util.ClusteringUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/action/cluster/ClusteringPlanActionExecutor.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/table/action/cluster/SparkExecuteClusteringCommitActionExecutor.java"
   contains "import org.apache.hudi.common.util.ClusteringUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-java-client/src/main/java/org/apache/hudi/table/action/deltacommit/JavaUpsertPreppedDeltaCommitActionExecutor.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/table/action/deltacommit/SparkBulkInsertPreppedDeltaCommitActionExecutor.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/table/action/deltacommit/SparkBulkInsertDeltaCommitActionExecutor.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/table/action/deltacommit/BaseSparkDeltaCommitActionExecutor.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/execution/bulkinsert/RowRecordKeyExtractor.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/execution/bulkinsert/RDDSpatialCurveSortPartitioner.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/execution/bulkinsert/RDDConsistentBucketBulkInsertPartitioner.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/execution/bulkinsert/ConsistentBucketIndexBulkInsertPartitionerWithRows.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/execution/bulkinsert/RDDSimpleBucketBulkInsertPartitioner.java"
   contains "import org.apache.hudi.common.util.ValidationUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-java-client/src/main/java/org/apache/hudi/client/clustering/run/strategy/JavaExecutionStrategy.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/client/clustering/run/strategy/MultipleSparkJobExecutionStrategy.java"
   contains "import org.apache.hudi.common.util.CollectionUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/client/clustering/run/strategy/ExecutionStrategyUtil.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/client/clustering/run/strategy/SingleSparkJobExecutionStrategy.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/metrics/Metrics.java"
   contains "import org.apache.hudi.common.metrics.Registry;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/metrics/DistributedRegistry.java"
   contains "import org.apache.hudi.common.metrics.Registry;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/metrics/JmxReporterServer.java"
   contains "import org.apache.hudi.common.util.StringUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/metrics/HoodieMetrics.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/metrics/MetricsReporterFactory.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/metrics/MetricUtils.java"
   contains "import org.apache.hudi.common.util.StringUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/metrics/datadog/DatadogReporter.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/metrics/datadog/DatadogMetricsReporter.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/metrics/datadog/DatadogHttpClient.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/metrics/prometheus/PushGatewayMetricsReporter.java"
   contains "import org.apache.hudi.common.util.StringUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/metrics/prometheus/PrometheusReporter.java"
   contains "import org.apache.hudi.common.util.StringUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/config/metrics/HoodieMetricsConfig.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/keygen/parser/HoodieDateTimeParser.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/keygen/parser/BaseHoodieDateTimeParser.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/keygen/factory/HoodieAvroKeyGeneratorFactory.java"
   contains "import org.apache.hudi.common.util.StringUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/keygen/factory/HoodieSparkKeyGeneratorFactory.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/storage/HoodieConsistentBucketLayout.java"
   contains "import org.apache.hudi.common.util.CollectionUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/storage/HoodieSimpleBucketLayout.java"
   contains "import org.apache.hudi.common.util.CollectionUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/storage/HoodieStorageLayout.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/storage/HoodieDefaultLayout.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/action/cluster/util/ConsistentHashingUpdateStrategyUtils.java"
   contains "import org.apache.hudi.common.util.ClusteringUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/action/cluster/strategy/BaseConsistentHashingBucketClusteringPlanStrategy.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/action/cluster/strategy/PartitionAwareClusteringPlanStrategy.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/action/cluster/strategy/ClusteringPlanStrategy.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/action/compact/plan/generators/HoodieCompactionPlanGenerator.java"
   contains "import org.apache.hudi.common.util.CompactionUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/action/compact/plan/generators/HoodieLogCompactionPlanGenerator.java"
   contains "import org.apache.hudi.common.util.CompactionUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/action/compact/plan/generators/BaseHoodieCompactionPlanGenerator.java"
   contains "import org.apache.hudi.common.util.CollectionUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/action/compact/strategy/CompactionStrategy.java"
   contains "import org.apache.hudi.common.util.CompactionUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/action/bootstrap/HoodieBootstrapWriteMetadata.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/table/action/bootstrap/OrcBootstrapMetadataHandler.java"
   contains "import org.apache.hudi.common.util.AvroOrcUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/table/action/bootstrap/SparkBootstrapDeltaCommitActionExecutor.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/table/action/bootstrap/SparkBootstrapCommitActionExecutor.java"
   contains "import org.apache.hudi.common.util.CommitUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/table/action/bootstrap/ParquetBootstrapMetadataHandler.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/action/ttl/strategy/KeepByTimeStrategy.java"
   contains "import org.apache.hudi.common.util.HoodieTimer;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/action/ttl/strategy/HoodiePartitionTTLStrategyFactory.java"
   contains "import org.apache.hudi.common.util.ReflectionUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/action/ttl/strategy/KeepByCreationTimeStrategy.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/action/ttl/strategy/PartitionTTLStrategy.java"
   contains "import org.apache.hudi.common.util.HoodieTimer;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/action/BaseActionExecutor.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/action/HoodieWriteMetadata.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/action/clean/CleanPlanner.java"
   contains "import org.apache.hudi.common.util.CleanerUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/action/clean/CleanPlanActionExecutor.java"
   contains "import org.apache.hudi.common.util.CleanerUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/action/clean/CleanActionExecutor.java"
   contains "import org.apache.hudi.common.util.CleanerUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/action/index/RunIndexActionExecutor.java"
   contains "import org.apache.hudi.common.metrics.Registry;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/action/index/AbstractIndexingCatchupTask.java"
   contains "import org.apache.hudi.common.util.CleanerUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/action/index/ScheduleIndexActionExecutor.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/action/index/functional/BaseHoodieFunctionalIndexClient.java"
   contains "import org.apache.hudi.storage.StoragePath;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/action/savepoint/SavepointActionExecutor.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/action/savepoint/SavepointHelpers.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/action/rollback/BaseRollbackPlanActionExecutor.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/action/rollback/BaseRollbackActionExecutor.java"
   contains "import org.apache.hudi.common.util.ClusteringUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/action/rollback/CopyOnWriteRollbackActionExecutor.java"
   contains "import org.apache.hudi.common.util.HoodieTimer;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/action/rollback/MergeOnReadRollbackActionExecutor.java"
   contains "import org.apache.hudi.common.util.HoodieTimer;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/action/rollback/ListingBasedRollbackStrategy.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/action/rollback/ListingBasedRollbackRequest.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/action/rollback/RollbackUtils.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/action/rollback/RestorePlanActionExecutor.java"
   contains "import org.apache.hudi.common.util.ClusteringUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/action/restore/RestoreUtils.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/action/restore/BaseRestoreActionExecutor.java"
   contains "import org.apache.hudi.common.util.HoodieTimer;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/marker/WriteMarkersFactory.java"
   contains "import org.apache.hudi.storage.StorageSchemes;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/marker/SimpleDirectMarkerBasedDetectionStrategy.java"
   contains "import org.apache.hudi.common.util.MarkerUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/marker/TimelineServerBasedWriteMarkers.java"
   contains "import org.apache.hudi.common.util.HoodieTimer;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/marker/DirectWriteMarkers.java"
   contains "import org.apache.hudi.common.util.HoodieTimer;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/marker/WriteMarkers.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/marker/MarkerBasedRollbackUtils.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/repair/RepairUtils.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/index/bloom/HoodieBloomIndex.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/index/bloom/ListBasedHoodieBloomIndexHelper.java"
   contains "import org.apache.hudi.common.util.CollectionUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/index/bloom/BucketizedBloomCheckPartitioner.java"
   contains "import org.apache.hudi.common.util.NumericUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/index/bloom/HoodieFileProbingFunction.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/index/bloom/HoodieMetadataBloomFilterProbingFunction.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/index/simple/HoodieSimpleIndex.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/index/simple/HoodieGlobalSimpleIndex.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/index/inmemory/HoodieInMemoryHashIndex.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/index/bucket/ConsistentBucketIdentifier.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/index/bucket/HoodieSimpleBucketIndex.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/index/bucket/HoodieConsistentBucketIndex.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/index/bucket/ConsistentBucketIndexUtils.java"
   contains "import org.apache.hudi.common.util.FileIOUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/index/bucket/HoodieSparkConsistentBucketIndex.java"
   contains "import org.apache.hudi.common.util.ClusteringUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/index/hbase/SparkHoodieHBaseIndex.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/callback/util/HoodieCommitCallbackFactory.java"
   contains "import org.apache.hudi.common.util.ReflectionUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/callback/common/HoodieWriteCommitCallbackMessage.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/transaction/TransactionManager.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/transaction/ConcurrentOperation.java"
   contains "import org.apache.hudi.common.util.CommitUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/transaction/DirectMarkerTransactionManager.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/transaction/ConflictResolutionStrategy.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/transaction/SimpleConcurrentFileWritesConflictResolutionStrategy.java"
   contains "import org.apache.hudi.common.util.CollectionUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/transaction/PreferWriterConflictResolutionStrategy.java"
   contains "import org.apache.hudi.common.util.ClusteringUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/transaction/lock/metrics/HoodieLockMetrics.java"
   contains "import org.apache.hudi.common.util.HoodieTimer;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/bootstrap/BootstrapRecordPayload.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/client/bootstrap/HoodieSparkBootstrapSchemaProvider.java"
   contains "import org.apache.hudi.common.util.AvroOrcUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/bootstrap/translator/DecodedBootstrapPartitionPathTranslator.java"
   contains "import org.apache.hudi.common.util.PartitionPathEncodeUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/client/utils/SparkMetadataWriterUtils.java"
   contains "import org.apache.hudi.storage.StoragePath;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/utils/LegacyArchivedMetaEntryReader.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/utils/TransactionUtils.java"
   contains "import org.apache.hudi.common.util.CollectionUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/utils/MergingIterator.java"
   contains "import org.apache.hudi.common.util.ValidationUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/utils/ArchivalUtils.java"
   contains "import org.apache.hudi.common.util.CleanerUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/utils/ConcatenatingIterator.java"
   contains "import org.apache.hudi.common.util.ValidationUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/client/utils/SparkValidatorUtils.java"
   contains "import org.apache.hudi.common.util.ReflectionUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/client/utils/SparkPartitionUtils.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/client/utils/SparkInternalSchemaConverter.java"
   contains "import static org.apache.hudi.common.util.StringUtils.getUTF8Bytes;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/heartbeat/HoodieHeartbeatClient.java"
   contains "import org.apache.hudi.storage.StoragePath;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/heartbeat/HeartbeatUtils.java"
   contains "import org.apache.hudi.storage.StoragePath;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/timeline/LSMTimelineWriter.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/timeline/HoodieTimelineArchiver.java"
   contains "import org.apache.hudi.common.util.ClusteringUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/timeline/ActiveActionWithDetails.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/embedded/EmbeddedTimelineService.java"
   contains "import org.apache.hudi.common.metrics.Registry;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/embedded/EmbeddedTimelineServerHelper.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/sort/SpaceCurveSortingHelper.java"
   contains "import org.apache.hudi.common.util.BinaryUtil;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/data/HoodieJavaPairRDD.java"
   contains "import org.apache.hudi.common.util.Option;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/client/validator/SparkPreCommitValidator.java"
   contains "import org.apache.hudi.common.util.HoodieTimer;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/client/validator/SqlQueryPreCommitValidator.java"
   contains "import org.apache.hudi.common.util.StringUtils;"

from: hudi-client
to: hudi-io
evidence:
 - file: "hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/client/clustering/update/strategy/SparkConsistentBucketDuplicateUpdateStrategy.java"
   contains "import org.apache.hudi.common.util.Option;"