fixed invalid predefined mimetype for HP-PCL

gmuth · Apr 27, 2024 · 720a95f · 720a95f
1 parent af3f2ff
commit 720a95f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/src/main/kotlin/de/gmuth/ipp/attributes/DocumentFormat.kt b/src/main/kotlin/de/gmuth/ipp/attributes/DocumentFormat.kt
@@ -13,6 +13,7 @@ class DocumentFormat(val mediaMimeType: String) : IppAttributeBuilder {
 
     companion object {
         // application
+
         @JvmField
         val OCTET_STREAM = DocumentFormat("application/octet-stream")
 
@@ -22,7 +23,13 @@ class DocumentFormat(val mediaMimeType: String) : IppAttributeBuilder {
         @JvmField
         val PDF = DocumentFormat("application/pdf")
 
+        // application/vnd
+
+        @JvmField
+        val HP_PCL = DocumentFormat("application/vnd.hp-PCL")
+
         // image
+
         @JvmField
         val PWG_RASTER = DocumentFormat("image/pwg-raster")
 
@@ -35,9 +42,6 @@ class DocumentFormat(val mediaMimeType: String) : IppAttributeBuilder {
         @JvmField
         val PNG = DocumentFormat("image/png")
 
-        // vnd
-        @JvmField
-        val HP_PCL = DocumentFormat("vnd.hp-PCL")
     }
 
     override fun buildIppAttribute(printerAttributes: IppAttributesGroup) =

diff --git a/src/main/kotlin/de/gmuth/ipp/attributes/Marker.kt b/src/main/kotlin/de/gmuth/ipp/attributes/Marker.kt
@@ -32,7 +32,7 @@ class Marker(
         BLACK("#000000"),
         YELLOW("#FFFF00"),
         MAGENTA("#FF00FF"),
-        TRI_COLOR("#00FFFF#FF00FF#FFFF00"), // Cyan, Magenta, Yellow
+        CYAN_MAGENTA_YELLOW("#00FFFF#FF00FF#FFFF00"),
         UNKNOWN("#?");
 
         companion object {

diff --git a/src/main/kotlin/de/gmuth/ipp/client/IppClient.kt b/src/main/kotlin/de/gmuth/ipp/client/IppClient.kt
@@ -159,7 +159,7 @@ open class IppClient(val config: IppConfig = IppConfig()) : IppExchange {
     private fun HttpURLConnection.validateHttpResponse(
         request: IppRequest,
         contentStream: InputStream?,
-        cause: Exception? = null
+        exception: Exception? = null
     ) = when {
         responseCode == 401 && request.operationGroup.containsKey("requesting-user-name") -> with(request) {
             "User \"$requestingUserName\" is not authorized for operation $operation on $printerOrJobUri"
@@ -169,8 +169,8 @@ open class IppClient(val config: IppConfig = IppConfig()) : IppExchange {
         responseCode == 426 -> "HTTP status $responseCode, $responseMessage, Try ipps://${request.printerOrJobUri.host}"
         responseCode != 200 -> "HTTP request failed: $responseCode, $responseMessage"
         contentType != null && !contentType.startsWith(APPLICATION_IPP) -> "Invalid Content-Type: $contentType"
-        cause != null -> cause.message
-        else -> null
+        exception != null -> exception.message
+        else -> null // no issues found
     }?.let {
         throw IppExchangeException(
             request,
@@ -179,7 +179,7 @@ open class IppClient(val config: IppConfig = IppConfig()) : IppExchange {
             httpHeaderFields = headerFields,
             httpStream = contentStream,
             message = it,
-            cause = cause
+            cause = exception
         )
     }