Merge pull request #327 from aiven/ivanyu/config-package

Create config package
Aiven-Open · Jul 19, 2023 · 9990341 · 9990341
2 parents 6700ae0 + f1414cf
commit 9990341
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 19 deletions.
diff --git a/core/src/main/java/io/aiven/kafka/tieredstorage/RemoteStorageManager.java b/core/src/main/java/io/aiven/kafka/tieredstorage/RemoteStorageManager.java
@@ -42,6 +42,7 @@
 
 import io.aiven.kafka.tieredstorage.chunkmanager.ChunkManager;
 import io.aiven.kafka.tieredstorage.chunkmanager.ChunkManagerFactory;
+import io.aiven.kafka.tieredstorage.config.RemoteStorageManagerConfig;
 import io.aiven.kafka.tieredstorage.manifest.SegmentEncryptionMetadata;
 import io.aiven.kafka.tieredstorage.manifest.SegmentEncryptionMetadataV1;
 import io.aiven.kafka.tieredstorage.manifest.SegmentManifest;
@@ -78,9 +79,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static io.aiven.kafka.tieredstorage.RemoteStorageManagerConfig.METRICS_NUM_SAMPLES_CONFIG;
-import static io.aiven.kafka.tieredstorage.RemoteStorageManagerConfig.METRICS_RECORDING_LEVEL_CONFIG;
-import static io.aiven.kafka.tieredstorage.RemoteStorageManagerConfig.METRICS_SAMPLE_WINDOW_MS_CONFIG;
+import static io.aiven.kafka.tieredstorage.config.RemoteStorageManagerConfig.METRICS_NUM_SAMPLES_CONFIG;
+import static io.aiven.kafka.tieredstorage.config.RemoteStorageManagerConfig.METRICS_RECORDING_LEVEL_CONFIG;
+import static io.aiven.kafka.tieredstorage.config.RemoteStorageManagerConfig.METRICS_SAMPLE_WINDOW_MS_CONFIG;
 import static org.apache.kafka.server.log.remote.storage.RemoteStorageManager.IndexType.LEADER_EPOCH;
 import static org.apache.kafka.server.log.remote.storage.RemoteStorageManager.IndexType.OFFSET;
 import static org.apache.kafka.server.log.remote.storage.RemoteStorageManager.IndexType.PRODUCER_SNAPSHOT;

diff --git a/...ven/kafka/tieredstorage/KeyPairPaths.java → ...ka/tieredstorage/config/KeyPairPaths.java b/...ven/kafka/tieredstorage/KeyPairPaths.java → ...ka/tieredstorage/config/KeyPairPaths.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.aiven.kafka.tieredstorage;
+package io.aiven.kafka.tieredstorage.config;
 
 import java.nio.file.Path;
 import java.util.Objects;
@@ -23,7 +23,7 @@ public class KeyPairPaths {
     public final Path publicKey;
     public final Path privateKey;
 
-    public KeyPairPaths(final Path publicKey, final Path privateKey) {
+    KeyPairPaths(final Path publicKey, final Path privateKey) {
         this.publicKey = Objects.requireNonNull(publicKey, "publicKey cannot be null");
         this.privateKey = Objects.requireNonNull(privateKey, "privateKey cannot be null");
     }

diff --git a/...edstorage/RemoteStorageManagerConfig.java → ...ge/config/RemoteStorageManagerConfig.java b/...edstorage/RemoteStorageManagerConfig.java → ...ge/config/RemoteStorageManagerConfig.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.aiven.kafka.tieredstorage;
+package io.aiven.kafka.tieredstorage.config;
 
 import java.nio.file.Path;
 import java.time.Duration;
@@ -274,7 +274,7 @@ private static String privateKeyFileConfig(final String keyPairId) {
 
     private final EncryptionConfig encryptionConfig;
 
-    RemoteStorageManagerConfig(final Map<String, ?> props) {
+    public RemoteStorageManagerConfig(final Map<String, ?> props) {
         super(CONFIG, props);
         encryptionConfig = encryptionEnabled() ? EncryptionConfig.create(props) : null;
         validate();
@@ -291,57 +291,57 @@ private void validateCompression() {
         }
     }
 
-    StorageBackend storage() {
+    public StorageBackend storage() {
         final Class<?> storageClass = getClass(STORAGE_BACKEND_CLASS_CONFIG);
         final StorageBackend storage = Utils.newInstance(storageClass, StorageBackend.class);
         storage.configure(this.originalsWithPrefix(STORAGE_PREFIX));
         return storage;
     }
 
-    Optional<Long> segmentManifestCacheSize() {
+    public Optional<Long> segmentManifestCacheSize() {
         final long rawValue = getLong(SEGMENT_MANIFEST_CACHE_SIZE_CONFIG);
         if (rawValue == -1) {
             return Optional.empty();
         }
         return Optional.of(rawValue);
     }
 
-    Optional<Duration> segmentManifestCacheRetention() {
+    public Optional<Duration> segmentManifestCacheRetention() {
         final long rawValue = getLong(SEGMENT_MANIFEST_CACHE_RETENTION_MS_CONFIG);
         if (rawValue == -1) {
             return Optional.empty();
         }
         return Optional.of(Duration.ofMillis(rawValue));
     }
 
-    String keyPrefix() {
+    public String keyPrefix() {
         return getString(OBJECT_KEY_PREFIX_CONFIG);
     }
 
-    int chunkSize() {
+    public int chunkSize() {
         return getInt(CHUNK_SIZE_CONFIG);
     }
 
-    boolean compressionEnabled() {
+    public boolean compressionEnabled() {
         return getBoolean(COMPRESSION_ENABLED_CONFIG);
     }
 
-    boolean compressionHeuristicEnabled() {
+    public boolean compressionHeuristicEnabled() {
         return getBoolean(COMPRESSION_HEURISTIC_ENABLED_CONFIG);
     }
 
-    boolean encryptionEnabled() {
+    public boolean encryptionEnabled() {
         return getBoolean(ENCRYPTION_CONFIG);
     }
 
-    String encryptionKeyPairId() {
+    public String encryptionKeyPairId() {
         if (!encryptionEnabled()) {
             return null;
         }
         return encryptionConfig.activeKeyPairId();
     }
 
-    Map<String, KeyPairPaths> encryptionKeyRing() {
+    public Map<String, KeyPairPaths> encryptionKeyRing() {
         if (!encryptionEnabled()) {
             return null;
         }

diff --git a/...fka/tieredstorage/NoopStorageBackend.java → ...redstorage/config/NoopStorageBackend.java b/...fka/tieredstorage/NoopStorageBackend.java → ...redstorage/config/NoopStorageBackend.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.aiven.kafka.tieredstorage;
+package io.aiven.kafka.tieredstorage.config;
 
 import java.io.InputStream;
 import java.util.Map;

diff --git a/...orage/RemoteStorageManagerConfigTest.java → ...onfig/RemoteStorageManagerConfigTest.java b/...orage/RemoteStorageManagerConfigTest.java → ...onfig/RemoteStorageManagerConfigTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.aiven.kafka.tieredstorage;
+package io.aiven.kafka.tieredstorage.config;
 
 import java.nio.file.Path;
 import java.time.Duration;