updated scope of beans in metadata and path clean up to overwrite (#190)

* updated scope of beans in metadata and path clean up to overwrite --------- Co-authored-by: jgreenstevens <jgreenstevens@expediagroup.com> Co-authored-by: Harold Jimenez <hjimenez@expediagroup.com>
ExpediaGroup · Jan 24, 2025 · 4887631 · 4887631
1 parent 1bc3846
commit 4887631
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,13 +4,26 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [3.6.1] - 2024-12-02
+
+## [3.5.13] - 2025-01-24
+## Added
+- Changed scope of beans to `public` in `beekeeper-metadata-cleanup` and `beekeeper-path-cleanup`.
+
+## [3.5.12] - 2025-01-22
+## Added
+- add support to schedule partitions that already exist in table metadata.
+
+## [3.5.11] - 2024-12-06
+## Fixed
+- Remove entity ID to force new entries to history table.
+
+## [3.5.10] - 2024-12-02
 ## Added
 - Added `maven-jar-plugin` in `beekeeper-integration-test`.
 ## Changed
 - Changed scope of attributes to `protected` in `beekeeper-integration-test`
 
-## [3.6.0] - 2024-11-29
+## [3.5.9] - 2024-11-29
 ## Added
 - Added a db migration file and implementation of `beekeeper-history` table to track beekeeper activity.
 

diff --git a/.../java/com/expediagroup/beekeeper/integration/BeekeeperMetadataCleanupIntegrationTest.java b/.../java/com/expediagroup/beekeeper/integration/BeekeeperMetadataCleanupIntegrationTest.java
@@ -133,7 +133,7 @@ public class BeekeeperMetadataCleanupIntegrationTest extends BeekeeperIntegratio
   }
 
   protected static AmazonS3 amazonS3;
-  private static final String S3_ENDPOINT = ContainerTestUtils.awsServiceEndpoint(S3_CONTAINER, S3);
+  protected static final String S3_ENDPOINT = ContainerTestUtils.awsServiceEndpoint(S3_CONTAINER, S3);
   protected final ExecutorService executorService = Executors.newFixedThreadPool(1);
 
   private static Map<String, String> metastoreProperties = ImmutableMap

diff --git a/...leanup/src/main/java/com/expediagroup/beekeeper/metadata/cleanup/context/CommonBeans.java b/...leanup/src/main/java/com/expediagroup/beekeeper/metadata/cleanup/context/CommonBeans.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2019-2021 Expedia, Inc.
+ * Copyright (C) 2019-2025 Expedia, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -82,7 +82,7 @@ public CloseableMetaStoreClientFactory metaStoreClientFactory() {
   }
 
   @Bean
-  Supplier<CloseableMetaStoreClient> metaStoreClientSupplier(
+  public Supplier<CloseableMetaStoreClient> metaStoreClientSupplier(
       CloseableMetaStoreClientFactory metaStoreClientFactory, HiveConf hiveConf) {
     String name = "beekeeper-metadata-cleanup";
     return new HiveMetaStoreClientSupplier(metaStoreClientFactory, hiveConf, name);
@@ -108,7 +108,7 @@ public DeletedMetadataReporter deletedMetadataReporter(
   }
 
   @Bean(name = "hiveTableCleaner")
-  MetadataCleaner metadataCleaner(
+  public MetadataCleaner metadataCleaner(
       DeletedMetadataReporter deletedMetadataReporter, IcebergValidator icebergValidator) {
     return new HiveMetadataCleaner(deletedMetadataReporter, icebergValidator);
   }
@@ -121,7 +121,7 @@ public AmazonS3 amazonS3() {
 
   @Bean
   @Profile("test")
-  AmazonS3 amazonS3Test() {
+  public AmazonS3 amazonS3Test() {
     String s3Endpoint = System.getProperty("aws.s3.endpoint");
     String region = System.getProperty("aws.region");
 
@@ -132,7 +132,7 @@ AmazonS3 amazonS3Test() {
   }
 
   @Bean
-  BytesDeletedReporter bytesDeletedReporter(
+  public BytesDeletedReporter bytesDeletedReporter(
       MeterRegistry meterRegistry,
       @Value("${properties.dry-run-enabled}") boolean dryRunEnabled) {
     return new BytesDeletedReporter(meterRegistry, dryRunEnabled);
@@ -144,7 +144,7 @@ public S3Client s3Client(AmazonS3 amazonS3, @Value("${properties.dry-run-enabled
   }
 
   @Bean(name = "s3PathCleaner")
-  PathCleaner pathCleaner(
+  public PathCleaner pathCleaner(
       S3Client s3Client,
       BytesDeletedReporter bytesDeletedReporter) {
     return new S3PathCleaner(s3Client, new S3SentinelFilesCleaner(s3Client), bytesDeletedReporter);
@@ -162,27 +162,27 @@ public ExpiredMetadataHandler expiredMetadataHandler(
   }
 
   @Bean
-  BeekeeperHistoryService beekeeperHistoryService(BeekeeperHistoryRepository beekeeperHistoryRepository) {
+  public BeekeeperHistoryService beekeeperHistoryService(BeekeeperHistoryRepository beekeeperHistoryRepository) {
     return new BeekeeperHistoryService(beekeeperHistoryRepository);
   }
 
   @Bean
-  CleanupService cleanupService(
+  public CleanupService cleanupService(
       List<MetadataHandler> metadataHandlers,
       @Value("${properties.cleanup-page-size}") int pageSize,
       @Value("${properties.dry-run-enabled}") boolean dryRunEnabled) {
     return new PagingMetadataCleanupService(metadataHandlers, pageSize, dryRunEnabled);
   }
 
   @Bean
-  RepositoryCleanupService repositoryCleanupService(
+  public RepositoryCleanupService repositoryCleanupService(
       HousekeepingMetadataRepository housekeepingMetadataRepository,
       @Value("${properties.old-data-retention-period-days}") int retentionPeriodInDays) {
     return new MetadataRepositoryCleanupService(housekeepingMetadataRepository, retentionPeriodInDays);
   }
 
   @Bean
-  DisableTablesService disableTablesService(
+  public DisableTablesService disableTablesService(
       HousekeepingMetadataRepository housekeepingMetadataRepository,
       CleanerClientFactory cleanerClientFactory,
       @Value("${properties.dry-run-enabled}") boolean dryRunEnabled) {

diff --git a/...th-cleanup/src/main/java/com/expediagroup/beekeeper/path/cleanup/context/CommonBeans.java b/...th-cleanup/src/main/java/com/expediagroup/beekeeper/path/cleanup/context/CommonBeans.java
@@ -62,7 +62,7 @@ public AmazonS3 amazonS3() {
 
   @Bean
   @Profile("test")
-  AmazonS3 amazonS3Test() {
+  public AmazonS3 amazonS3Test() {
     String s3Endpoint = System.getProperty("aws.s3.endpoint");
     String region = System.getProperty("aws.region");
 
@@ -73,7 +73,7 @@ AmazonS3 amazonS3Test() {
   }
 
   @Bean
-  BytesDeletedReporter bytesDeletedReporter(
+  public BytesDeletedReporter bytesDeletedReporter(
       MeterRegistry meterRegistry,
       @Value("${properties.dry-run-enabled}") boolean dryRunEnabled) {
     return new BytesDeletedReporter(meterRegistry, dryRunEnabled);
@@ -85,14 +85,14 @@ public S3Client s3Client(AmazonS3 amazonS3, @Value("${properties.dry-run-enabled
   }
 
   @Bean(name = "s3PathCleaner")
-  PathCleaner pathCleaner(
+  public PathCleaner pathCleaner(
       S3Client s3Client,
       BytesDeletedReporter bytesDeletedReporter) {
     return new S3PathCleaner(s3Client, new S3SentinelFilesCleaner(s3Client), bytesDeletedReporter);
   }
 
   @Bean
-  CleanupService cleanupService(
+  public CleanupService cleanupService(
       List<GenericPathHandler> pathHandlers,
       @Value("${properties.cleanup-page-size}") int pageSize,
       @Value("${properties.dry-run-enabled}") boolean dryRunEnabled) {
@@ -107,12 +107,12 @@ RepositoryCleanupService repositoryCleanupService(
   }
 
   @Bean
-  DisableTablesService disableTablesService() {
+  public DisableTablesService disableTablesService() {
     return () -> {};
   }
 
   @Bean
-  BeekeeperHistoryService beekeeperHistoryService(BeekeeperHistoryRepository beekeeperHistoryRepository) {
+  public BeekeeperHistoryService beekeeperHistoryService(BeekeeperHistoryRepository beekeeperHistoryRepository) {
     return new BeekeeperHistoryService(beekeeperHistoryRepository);
   }
 }