Skip to content

Commit cc63bb5

Browse files
committed
Kotlin: Change how we handle not supporting Brotli
This removes the potential for impossible cases.
1 parent c365f45 commit cc63bb5

File tree

1 file changed

+4
-10
lines changed

1 file changed

+4
-10
lines changed

java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,11 @@ class KotlinExtractorExtension(
110110
} else {
111111
try {
112112
@OptIn(kotlin.ExperimentalStdlibApi::class) // Annotation required by kotlin versions < 1.5
113-
val requested_compression = Compression.valueOf(compression_option.uppercase())
114-
if (requested_compression == Compression.BROTLI) {
113+
val compression_option_upper = compression_option.uppercase()
114+
if (compression_option_upper == "BROTLI") {
115115
Pair(Compression.GZIP, "Kotlin extractor doesn't support Brotli compression. Using GZip instead.")
116116
} else {
117-
Pair(requested_compression, null)
117+
Pair(Compression.valueOf(compression_option_upper), null)
118118
}
119119
} catch (e: IllegalArgumentException) {
120120
Pair(defaultCompression,
@@ -361,18 +361,12 @@ private fun doFile(
361361
}
362362
}
363363

364-
enum class Compression { NONE, GZIP, BROTLI }
364+
enum class Compression { NONE, GZIP }
365365

366366
private fun getTrapFileWriter(compression: Compression, logger: FileLogger, trapFileName: String): TrapFileWriter {
367367
return when (compression) {
368368
Compression.NONE -> NonCompressedTrapFileWriter(logger, trapFileName)
369369
Compression.GZIP -> GZipCompressedTrapFileWriter(logger, trapFileName)
370-
Compression.BROTLI -> {
371-
// Brotli should have been replaced with gzip earlier, but
372-
// if we somehow manage to get here then keep going
373-
logger.error("Impossible Brotli compression requested. Using Gzip instead.")
374-
getTrapFileWriter(Compression.GZIP, logger, trapFileName)
375-
}
376370
}
377371
}
378372

0 commit comments

Comments
 (0)