Skip to content

Commit 79c556f

Browse files
committed
Ensure that all requireNotNull calls are annotated
1 parent de128c3 commit 79c556f

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

src/main/java/org/radarbase/output/config/RestructureConfig.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ data class RestructureConfig(
8282
copyOnChange<T, String?>(
8383
null,
8484
modification = { System.getenv(key).takeIf { it.isNotEmpty() } },
85-
doCopy = { doCopy(requireNotNull(it)) }
85+
doCopy = { doCopy(requireNotNull(it) { "Environment variable $key is empty" }) },
8686
)
8787

8888
inline fun <T, V> T.copyOnChange(

src/main/java/org/radarbase/output/source/SourceStorageFactory.kt

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,20 @@ class SourceStorageFactory(
1111
private val tempPath: Path,
1212
) {
1313
private val s3SourceClient: MinioClient? = if (resourceConfig.sourceType == ResourceType.S3) {
14-
requireNotNull(resourceConfig.s3).createS3Client()
14+
requireNotNull(resourceConfig.s3) { "Missing S3 configuration" }
15+
.createS3Client()
1516
} else null
1617

1718
private val azureSourceClient: BlobServiceClient? =
1819
if (resourceConfig.sourceType == ResourceType.AZURE) {
19-
requireNotNull(resourceConfig.azure).createAzureClient()
20+
requireNotNull(resourceConfig.azure) { "Missing Azure configuration" }
21+
.createAzureClient()
2022
} else null
2123

2224
fun createSourceStorage() = when (resourceConfig.sourceType) {
2325
ResourceType.S3 -> {
24-
val s3Config = requireNotNull(resourceConfig.s3)
25-
val minioClient = requireNotNull(s3SourceClient)
26+
val s3Config = requireNotNull(resourceConfig.s3) { "Missing S3 configuration for source storage" }
27+
val minioClient = requireNotNull(s3SourceClient) { "Missing S3 client configuration for source storage" }
2628
S3SourceStorage(minioClient, s3Config, tempPath)
2729
}
2830
ResourceType.HDFS -> {
@@ -34,8 +36,8 @@ class SourceStorageFactory(
3436
createSourceStorage.invoke(factory) as SourceStorage
3537
}
3638
ResourceType.AZURE -> {
37-
val azureClient = requireNotNull(azureSourceClient)
38-
val azureConfig = requireNotNull(resourceConfig.azure)
39+
val azureClient = requireNotNull(azureSourceClient) { "Missing Azure client configuration for source storage" }
40+
val azureConfig = requireNotNull(resourceConfig.azure) { "Missing Azure configuration for source storage" }
3941
AzureSourceStorage(azureClient, azureConfig, tempPath)
4042
}
4143
else -> throw IllegalStateException("Cannot create kafka storage for type ${resourceConfig.sourceType}")

0 commit comments

Comments
 (0)