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

jeqo · web-flow · commit 9990341f61ea · 2023-07-19T15:55:23.000+03:00
Create config package
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/core/src/main/java/io/aiven/kafka/tieredstorage/config/KeyPairPaths.java b/core/src/main/java/io/aiven/kafka/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/core/src/main/java/io/aiven/kafka/tieredstorage/config/RemoteStorageManagerConfig.java b/core/src/main/java/io/aiven/kafka/tieredstorage/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/core/src/test/java/io/aiven/kafka/tieredstorage/config/NoopStorageBackend.java b/core/src/test/java/io/aiven/kafka/tieredstorage/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/core/src/test/java/io/aiven/kafka/tieredstorage/config/RemoteStorageManagerConfigTest.java b/core/src/test/java/io/aiven/kafka/tieredstorage/config/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;

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`* limitations under the License.`
`15`	`15`	`*/`
`16`	`16`
`17`		`-package io.aiven.kafka.tieredstorage;`
	`17`	`+package io.aiven.kafka.tieredstorage.config;`
`18`	`18`
`19`	`19`	`import java.nio.file.Path;`
`20`	`20`	`import java.time.Duration;`
`@@ -274,7 +274,7 @@ private static String privateKeyFileConfig(final String keyPairId) {`
`274`	`274`
`275`	`275`	`private final EncryptionConfig encryptionConfig;`
`276`	`276`
`277`		`- RemoteStorageManagerConfig(final Map<String, ?> props) {`
	`277`	`+ public RemoteStorageManagerConfig(final Map<String, ?> props) {`
`278`	`278`	`super(CONFIG, props);`
`279`	`279`	`encryptionConfig = encryptionEnabled() ? EncryptionConfig.create(props) : null;`
`280`	`280`	`validate();`
`@@ -291,57 +291,57 @@ private void validateCompression() {`
`291`	`291`	`}`
`292`	`292`	`}`
`293`	`293`
`294`		`- StorageBackend storage() {`
	`294`	`+ public StorageBackend storage() {`
`295`	`295`	`final Class<?> storageClass = getClass(STORAGE_BACKEND_CLASS_CONFIG);`
`296`	`296`	`final StorageBackend storage = Utils.newInstance(storageClass, StorageBackend.class);`
`297`	`297`	`storage.configure(this.originalsWithPrefix(STORAGE_PREFIX));`
`298`	`298`	`return storage;`
`299`	`299`	`}`
`300`	`300`
`301`		`- Optional<Long> segmentManifestCacheSize() {`
	`301`	`+ public Optional<Long> segmentManifestCacheSize() {`
`302`	`302`	`final long rawValue = getLong(SEGMENT_MANIFEST_CACHE_SIZE_CONFIG);`
`303`	`303`	`if (rawValue == -1) {`
`304`	`304`	`return Optional.empty();`
`305`	`305`	`}`
`306`	`306`	`return Optional.of(rawValue);`
`307`	`307`	`}`
`308`	`308`
`309`		`- Optional<Duration> segmentManifestCacheRetention() {`
	`309`	`+ public Optional<Duration> segmentManifestCacheRetention() {`
`310`	`310`	`final long rawValue = getLong(SEGMENT_MANIFEST_CACHE_RETENTION_MS_CONFIG);`
`311`	`311`	`if (rawValue == -1) {`
`312`	`312`	`return Optional.empty();`
`313`	`313`	`}`
`314`	`314`	`return Optional.of(Duration.ofMillis(rawValue));`
`315`	`315`	`}`
`316`	`316`
`317`		`- String keyPrefix() {`
	`317`	`+ public String keyPrefix() {`
`318`	`318`	`return getString(OBJECT_KEY_PREFIX_CONFIG);`
`319`	`319`	`}`
`320`	`320`
`321`		`- int chunkSize() {`
	`321`	`+ public int chunkSize() {`
`322`	`322`	`return getInt(CHUNK_SIZE_CONFIG);`
`323`	`323`	`}`
`324`	`324`
`325`		`- boolean compressionEnabled() {`
	`325`	`+ public boolean compressionEnabled() {`
`326`	`326`	`return getBoolean(COMPRESSION_ENABLED_CONFIG);`
`327`	`327`	`}`
`328`	`328`
`329`		`- boolean compressionHeuristicEnabled() {`
	`329`	`+ public boolean compressionHeuristicEnabled() {`
`330`	`330`	`return getBoolean(COMPRESSION_HEURISTIC_ENABLED_CONFIG);`
`331`	`331`	`}`
`332`	`332`
`333`		`- boolean encryptionEnabled() {`
	`333`	`+ public boolean encryptionEnabled() {`
`334`	`334`	`return getBoolean(ENCRYPTION_CONFIG);`
`335`	`335`	`}`
`336`	`336`
`337`		`- String encryptionKeyPairId() {`
	`337`	`+ public String encryptionKeyPairId() {`
`338`	`338`	`if (!encryptionEnabled()) {`
`339`	`339`	`return null;`
`340`	`340`	`}`
`341`	`341`	`return encryptionConfig.activeKeyPairId();`
`342`	`342`	`}`
`343`	`343`
`344`		`- Map<String, KeyPairPaths> encryptionKeyRing() {`
	`344`	`+ public Map<String, KeyPairPaths> encryptionKeyRing() {`
`345`	`345`	`if (!encryptionEnabled()) {`
`346`	`346`	`return null;`
`347`	`347`	`}`