From 6b331051a41f6e5fcd73f048bdbc0d0320c3d5d8 Mon Sep 17 00:00:00 2001
From: Robinson <robinson@dorkbox.com>
Date: Mon, 26 Apr 2021 15:01:51 +0200
Subject: [PATCH] Removed dependency

---
 src/dorkbox/netUtil/Common.kt |  4 ++--
 src/dorkbox/netUtil/IP.kt     | 22 ++++++----------------
 src/dorkbox/netUtil/Mac.kt    |  6 +++---
 3 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/src/dorkbox/netUtil/Common.kt b/src/dorkbox/netUtil/Common.kt
index c907a50..8fce260 100644
--- a/src/dorkbox/netUtil/Common.kt
+++ b/src/dorkbox/netUtil/Common.kt
@@ -2,7 +2,7 @@
 
 package dorkbox.netUtil
 
-import mu.KotlinLogging
+import org.slf4j.LoggerFactory
 import java.net.InetAddress
 import java.net.InetSocketAddress
 import java.security.AccessController
@@ -52,7 +52,7 @@ internal object Common {
     }
 
 
-    internal val logger = KotlinLogging.logger("NetworkUtils")
+    internal val logger = LoggerFactory.getLogger("NetworkUtils")
 
     fun getBoolean(property: String, defaultValue: Boolean): Boolean {
         var value: String = System.getProperty(property, defaultValue.toString()) ?: return defaultValue
diff --git a/src/dorkbox/netUtil/IP.kt b/src/dorkbox/netUtil/IP.kt
index 506cc66..20b9a47 100644
--- a/src/dorkbox/netUtil/IP.kt
+++ b/src/dorkbox/netUtil/IP.kt
@@ -34,12 +34,8 @@ object IP {
     val LOOPBACK_IF: NetworkInterface
 
     init {
-        logger.trace {
-            "-Djava.net.preferIPv4Stack: ${IPv4.isPreferred}"
-        }
-        logger.trace {
-            "-Djava.net.preferIPv6Addresses: ${IPv6.isPreferred}"
-        }
+        logger.trace("-Djava.net.preferIPv4Stack: ${IPv4.isPreferred}")
+        logger.trace("-Djava.net.preferIPv6Addresses: ${IPv6.isPreferred}")
 
         // Retrieve the list of available network interfaces.
         val netInterfaces = mutableListOf<NetworkInterface>()
@@ -103,18 +99,14 @@ object IP {
 
         if (loopbackIface != null) {
             // Found the loopback interface with an INET address.
-            logger.trace {
-                "Loopback interface: ${loopbackIface.name} (${loopbackIface.displayName}, ${loopbackAddr!!.hostAddress})"
-            }
+            logger.trace("Loopback interface: ${loopbackIface.name} (${loopbackIface.displayName}, ${loopbackAddr!!.hostAddress})")
         } else {
             // Could not find the loopback interface, but we can't leave LOCALHOST as null.
             // Use LOCALHOST6 or LOCALHOST4, preferably the IPv6 one.
             if (loopbackAddr == null) {
                 try {
                     if (NetworkInterface.getByInetAddress(IPv6.LOCALHOST) != null) {
-                        logger.debug {
-                            "Using hard-coded IPv6 localhost address: ${IPv6.LOCALHOST}"
-                        }
+                        logger.debug("Using hard-coded IPv6 localhost address: ${IPv6.LOCALHOST}")
 
                         loopbackAddr = IPv6.LOCALHOST
                     }
@@ -122,16 +114,14 @@ object IP {
 
                 }
                 if (loopbackAddr == null) {
-                    logger.debug {
-                        "Using hard-coded IPv4 localhost address: ${IPv4.LOCALHOST}"
-                    }
+                    logger.debug("Using hard-coded IPv4 localhost address: ${IPv4.LOCALHOST}")
                     loopbackAddr = IPv4.LOCALHOST
                 }
             }
         }
 
         LOOPBACK_IF = loopbackIface!!
-        LOCALHOST = loopbackAddr!!
+        LOCALHOST = loopbackAddr
     }
 
     /**
diff --git a/src/dorkbox/netUtil/Mac.kt b/src/dorkbox/netUtil/Mac.kt
index 062749e..4188ba9 100644
--- a/src/dorkbox/netUtil/Mac.kt
+++ b/src/dorkbox/netUtil/Mac.kt
@@ -3,7 +3,7 @@
 package dorkbox.netUtil
 
 import dorkbox.executor.Executor
-import mu.KLogger
+import org.slf4j.Logger
 import java.io.File
 import java.io.Writer
 import java.math.BigInteger
@@ -44,7 +44,7 @@ object Mac {
         synchronized(fakeMacsInUse) {}
     }
 
-    fun getMacAddress(ip: String, logger: KLogger? = null): String {
+    fun getMacAddress(ip: String, logger: Logger? = null): String {
         try {
             val mac = getMacAddressByte(ip, logger)
             if (mac == null) {
@@ -74,7 +74,7 @@ object Mac {
         return ""
     }
 
-    fun getMacAddressByte(ip: String, logger: KLogger? = null): ByteArray? {
+    fun getMacAddressByte(ip: String, logger: Logger? = null): ByteArray? {
         try {
             val addr = InetAddress.getByName(ip)
             val networkInterface = NetworkInterface.getByInetAddress(addr)