Skip to content

Commit 510a2b4

Browse files
committed
Convert loggers to kotlin
1 parent c3a31b3 commit 510a2b4

File tree

6 files changed

+14
-30
lines changed

6 files changed

+14
-30
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package okio.internal
2+
3+
class Logger(name: String) {
4+
private val logger: System.Logger = System.getLogger(name)
5+
fun warn(msg: String, e: Throwable): Unit = logger.log(System.Logger.Level.WARNING, msg, e)
6+
}

okio/src/jvmMain/java/okio/internal/Logger.java

-14
This file was deleted.

okio/src/jvmMain/java9/okio/internal/Logger.java

-14
This file was deleted.

okio/src/jvmMain/kotlin/okio/JvmOkio.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ import java.nio.file.Path as NioPath
3434
import java.security.MessageDigest
3535
import javax.crypto.Cipher
3636
import javax.crypto.Mac
37-
import okio.internal.ResourceFileSystem
3837
import okio.internal.Logger
38+
import okio.internal.ResourceFileSystem
3939

4040
/** Returns a sink that writes to `out`. */
4141
fun OutputStream.sink(): Sink = OutputStreamSink(this, Timeout())
@@ -138,7 +138,7 @@ fun Socket.source(): Source {
138138
return timeout.source(source)
139139
}
140140

141-
private val logger = Logger.getLogger("okio.Okio")
141+
private val logger = Logger("okio.Okio")
142142

143143
private class SocketAsyncTimeout(private val socket: Socket) : AsyncTimeout() {
144144
override fun newTimeoutException(cause: IOException?): IOException {
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package okio.internal
2+
3+
class Logger(name: String) {
4+
private val logger: java.util.logging.Logger = java.util.logging.Logger.getLogger(name)
5+
fun warn(msg: String, e: Throwable): Unit = logger.log(java.util.logging.Level.WARNING, msg, e)
6+
}

0 commit comments

Comments
 (0)