Merge pull request #1036 from Netflix/chengw/fix-for-sbn

Change some constructors to public to simplify the nfpriam spring boot migration
Netflix · Mar 30, 2023 · 3f7bc1b · 3f7bc1b
2 parents 36321c4 + f48fc9e
commit 3f7bc1b
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 9 deletions.
diff --git a/priam/src/main/java/com/netflix/priam/backup/BackupDynamicRateLimiter.java b/priam/src/main/java/com/netflix/priam/backup/BackupDynamicRateLimiter.java
@@ -16,7 +16,7 @@ public class BackupDynamicRateLimiter implements DynamicRateLimiter {
     private final RateLimiter rateLimiter;
 
     @Inject
-    BackupDynamicRateLimiter(IConfiguration config, Clock clock, DirectorySize dirSize) {
+    public BackupDynamicRateLimiter(IConfiguration config, Clock clock, DirectorySize dirSize) {
         this.clock = clock;
         this.config = config;
         this.dirSize = dirSize;

diff --git a/priam/src/main/java/com/netflix/priam/backup/BackupVerification.java b/priam/src/main/java/com/netflix/priam/backup/BackupVerification.java
@@ -46,7 +46,7 @@ public class BackupVerification {
     private BackupVerificationResult latestResult;
 
     @Inject
-    BackupVerification(
+    public BackupVerification(
             @Named("v1") IMetaProxy metaV1Proxy,
             @Named("v2") IMetaProxy metaV2Proxy,
             IBackupStatusMgr backupStatusMgr,

diff --git a/priam/src/main/java/com/netflix/priam/backupv2/MetaFileWriterBuilder.java b/priam/src/main/java/com/netflix/priam/backupv2/MetaFileWriterBuilder.java
@@ -52,7 +52,7 @@ public class MetaFileWriterBuilder {
     private static final Logger logger = LoggerFactory.getLogger(MetaFileWriterBuilder.class);
 
     @Inject
-    MetaFileWriterBuilder(MetaFileWriter metaFileWriter) {
+    public MetaFileWriterBuilder(MetaFileWriter metaFileWriter) {
         this.metaFileWriter = metaFileWriter;
     }
 
@@ -93,7 +93,7 @@ public static class MetaFileWriter implements StartStep, DataStep, UploadStep {
         private Path metaFilePath;
 
         @Inject
-        private MetaFileWriter(
+        public MetaFileWriter(
                 IConfiguration configuration,
                 InstanceIdentity instanceIdentity,
                 Provider<AbstractBackupPath> pathFactory,

diff --git a/priam/src/main/java/com/netflix/priam/backupv2/MetaV1Proxy.java b/priam/src/main/java/com/netflix/priam/backupv2/MetaV1Proxy.java
@@ -41,7 +41,7 @@ public class MetaV1Proxy implements IMetaProxy {
     private final IBackupFileSystem fs;
 
     @Inject
-    MetaV1Proxy(IConfiguration configuration, IFileSystemContext backupFileSystemCtx) {
+    public MetaV1Proxy(IConfiguration configuration, IFileSystemContext backupFileSystemCtx) {
         fs = backupFileSystemCtx.getFileStrategy(configuration);
     }
 

diff --git a/priam/src/main/java/com/netflix/priam/backupv2/MetaV2Proxy.java b/priam/src/main/java/com/netflix/priam/backupv2/MetaV2Proxy.java
@@ -45,7 +45,7 @@ public class MetaV2Proxy implements IMetaProxy {
     private final Provider<AbstractBackupPath> abstractBackupPathProvider;
 
     @Inject
-    MetaV2Proxy(
+    public MetaV2Proxy(
             IConfiguration configuration,
             IFileSystemContext backupFileSystemCtx,
             Provider<AbstractBackupPath> abstractBackupPathProvider) {

diff --git a/priam/src/main/java/com/netflix/priam/backupv2/SnapshotMetaTask.java b/priam/src/main/java/com/netflix/priam/backupv2/SnapshotMetaTask.java
@@ -103,7 +103,7 @@ private enum MetaStep {
     private MetaStep metaStep = MetaStep.META_GENERATION;
 
     @Inject
-    SnapshotMetaTask(
+    public SnapshotMetaTask(
             IConfiguration config,
             BackupHelper backupHelper,
             MetaFileWriterBuilder metaFileWriter,

diff --git a/priam/src/main/java/com/netflix/priam/health/InstanceState.java b/priam/src/main/java/com/netflix/priam/health/InstanceState.java
@@ -53,7 +53,7 @@ public class InstanceState {
     private final RestoreStatus restoreStatus;
 
     @Inject
-    InstanceState(RestoreStatus restoreStatus) {
+    public InstanceState(RestoreStatus restoreStatus) {
         this.restoreStatus = restoreStatus;
     }
 

diff --git a/priam/src/main/java/com/netflix/priam/notification/INotificationService.java b/priam/src/main/java/com/netflix/priam/notification/INotificationService.java
@@ -19,7 +19,7 @@
 
 /** Service to notify of a message. Created by vinhn on 11/3/16. */
 @ImplementedBy(AWSSnsNotificationService.class)
-interface INotificationService {
+public interface INotificationService {
     /**
      * Notify the message.
      *