moved attribute compression to IppMessage

gmuth · Dec 12, 2024 · 57e7253 · 57e7253
1 parent 389e4d0
commit 57e7253
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 17 deletions.
diff --git a/src/main/kotlin/de/gmuth/ipp/core/IppMessage.kt b/src/main/kotlin/de/gmuth/ipp/core/IppMessage.kt
@@ -4,14 +4,13 @@ package de.gmuth.ipp.core
  * Copyright (c) 2020-2024 Gerhard Muth
  */
 
+import de.gmuth.ipp.attributes.Compression
 import de.gmuth.ipp.core.IppTag.*
 import java.io.*
 import java.util.logging.Level
 import java.util.logging.Level.INFO
 import java.util.logging.Logger
 import java.util.logging.Logger.getLogger
-import java.util.zip.DeflaterOutputStream
-import java.util.zip.GZIPOutputStream
 import java.nio.charset.Charset as javaCharset
 
 abstract class IppMessage() {
@@ -88,6 +87,9 @@ abstract class IppMessage() {
     val requestingUserName: String
         get() = operationGroup.getValueAsString("requesting-user-name")
 
+    val compression: Compression
+        get() = Compression.fromString(operationGroup.getValue("compression"))
+
     // --------
     // ENCODING
     // --------
@@ -154,7 +156,7 @@ abstract class IppMessage() {
             // write documentBytes? take care of compression!
         } else {
             val outputStream = if (operationGroup.containsKey("compression")) {
-                getCompressingOutputStream(notCompressingOutputStream)
+                compression.getCompressingOutputStream(notCompressingOutputStream)
             } else {
                 notCompressingOutputStream
             }
@@ -164,16 +166,6 @@ abstract class IppMessage() {
         }
     }
 
-    private fun getCompressingOutputStream(uncompressedOutputStream: OutputStream) =
-        with(operationGroup.getValueAsString("compression")) {
-            when (this) {
-                "none" -> uncompressedOutputStream
-                "gzip" -> GZIPOutputStream(uncompressedOutputStream)
-                "deflate" -> DeflaterOutputStream(uncompressedOutputStream)
-                else -> throw NotImplementedError("compression '$this'")
-            }
-        }
-
     private fun copyUnconsumedDocumentInputStream(outputStream: OutputStream): Long {
         if (hasDocument() && documentInputStreamIsConsumed) {
             throw IppException("documentInputStream is consumed")
@@ -194,7 +186,7 @@ abstract class IppMessage() {
 
     fun saveDocumentBytes(file: File) = file.run {
         if (documentBytes == null || documentBytes!!.isEmpty()) throw IppException("No documentBytes available. You should enable flag IppMessage.keepDocumentCopy.")
-        outputStream().use { ByteArrayInputStream(documentBytes).copyTo(it)}
+        outputStream().use { ByteArrayInputStream(documentBytes).copyTo(it) }
         logger.info { "Saved ${length()} document bytes to $path" }
     }
 

diff --git a/src/main/kotlin/de/gmuth/ipp/core/IppRequest.kt b/src/main/kotlin/de/gmuth/ipp/core/IppRequest.kt
@@ -40,9 +40,6 @@ class IppRequest : IppMessage {
     val requestedAttributes: List<String>
         get() = operationGroup.getValues("requested-attributes")
 
-    val compression: Compression
-        get() = Compression.fromString(operationGroup.getValueAsString("compression"))
-
     constructor() : super()
 
     constructor(