removed interface IppExchange

src/main/kotlin/de/gmuth/ipp/client/IppClient.kt

@@ -27,7 +27,7 @@ import javax.net.ssl.HttpsURLConnection
 
 typealias IppResponseInterceptor = (request: IppRequest, response: IppResponse) -> Unit
 
-open class IppClient(val config: IppConfig = IppConfig()) : IppExchange {
+open class IppClient(val config: IppConfig = IppConfig()) {
     protected val logger: Logger = getLogger(javaClass.name)
 
     var responseInterceptor: IppResponseInterceptor? = null
@@ -72,7 +72,7 @@ open class IppClient(val config: IppConfig = IppConfig()) : IppExchange {
     // Exchange IppRequest for IppResponse
     //------------------------------------
 
-    override fun exchange(request: IppRequest) = with(request) {
+    fun exchange(request: IppRequest) = with(request) {
         logger.fine { "Send '$operation' request to $printerOrJobUri" }
         httpPost(toHttpUri(printerOrJobUri), request).also {
             logger.finer { "Req #${request.requestId} @${printerOrJobUri.host}: $request => $it" }

src/main/kotlin/de/gmuth/ipp/client/IppJob.kt

@@ -24,7 +24,7 @@ import java.util.logging.Logger.getLogger
 class IppJob(
     val printer: IppPrinter,
     val attributes: IppAttributesGroup,
-) : IppExchange by printer {
+) {
 
     private val logger = getLogger(javaClass.name)
     var subscription: IppSubscription? = null
@@ -362,6 +362,8 @@ class IppJob(
             }
         }
 
+    private fun exchange(request: IppRequest) = printer.exchange(request)
+
     // -------
     // Logging
     // -------

src/main/kotlin/de/gmuth/ipp/client/IppPrinter.kt

@@ -31,7 +31,7 @@ class IppPrinter(
     internal val ippClient: IppClient = IppClient(ippConfig),
     getPrinterAttributesOnInit: Boolean = true,
     requestedAttributesOnInit: List<String>? = null
-) : IppExchange {
+) {
 
     private val logger = getLogger(javaClass.name)
     var workDirectory: File = createTempDirectory().toFile()
@@ -534,11 +534,12 @@ class IppPrinter(
     ) = ippClient
         .ippRequest(operation, printerUri, requestedAttributes, userName)
 
-    override fun exchange(request: IppRequest) = ippClient.exchange(request.apply {
+    fun exchange(request: IppRequest): IppResponse = request.run {
         checkIfValueIsSupported("ipp-versions", version!!, true)
         checkIfValueIsSupported("operations", code!!.toInt(), true)
         checkIfValueIsSupported("charset", attributesCharset, true)
-    })
+        ippClient.exchange(this)
+    }
 
     private fun exchangeForIppJob(request: IppRequest) =
         IppJob(this, exchange(request)).apply {

src/main/kotlin/de/gmuth/ipp/client/IppSubscription.kt

@@ -5,10 +5,8 @@ package de.gmuth.ipp.client
  */
 
 import de.gmuth.ipp.client.IppOperationException.ClientErrorNotFoundException
-import de.gmuth.ipp.core.IppAttributesGroup
-import de.gmuth.ipp.core.IppOperation
+import de.gmuth.ipp.core.*
 import de.gmuth.ipp.core.IppOperation.*
-import de.gmuth.ipp.core.IppString
 import de.gmuth.ipp.core.IppTag.EventNotification
 import de.gmuth.ipp.core.IppTag.Integer
 import java.time.Duration
@@ -24,7 +22,7 @@ class IppSubscription(
     val printer: IppPrinter,
     val attributes: IppAttributesGroup,
     startLease: Boolean = true
-) : IppExchange by printer {
+) {
 
     private val logger = getLogger(javaClass.name)
     private var lastSequenceNumber: Int = 0
@@ -122,6 +120,8 @@ class IppSubscription(
         printer.ippRequest(operation, requestedAttributes = requestedAttributes)
             .apply { operationGroup.attribute("notify-subscription-id", Integer, id) }
 
+    private fun exchange(request: IppRequest) = printer.exchange(request)
+
     //------------------------------------
     // Poll and handle event notifications
     //------------------------------------