From b0a29d683718f6103ac7f711a825bfd401991761 Mon Sep 17 00:00:00 2001
From: Robinson <robinson@dorkbox.com>
Date: Thu, 24 Mar 2022 01:27:01 +0100
Subject: [PATCH] Code cleanup

---
 src/dorkbox/network/connection/ConnectionManager.kt | 7 +++----
 src/dorkbox/network/connection/CryptoManagement.kt  | 1 -
 src/dorkbox/network/connection/ListenerManager.kt   | 2 +-
 src/dorkbox/network/rmi/RemoteObjectStorage.kt      | 4 ++--
 src/dorkbox/network/rmi/RmiManagerConnections.kt    | 2 +-
 5 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/dorkbox/network/connection/ConnectionManager.kt b/src/dorkbox/network/connection/ConnectionManager.kt
index 29ed2e38..669c1097 100644
--- a/src/dorkbox/network/connection/ConnectionManager.kt
+++ b/src/dorkbox/network/connection/ConnectionManager.kt
@@ -15,9 +15,9 @@
  */
 package dorkbox.network.connection
 
-import dorkbox.util.collections.ConcurrentEntry
-import dorkbox.util.collections.ConcurrentIterator
-import dorkbox.util.collections.ConcurrentIterator.headREF
+import dorkbox.collections.ConcurrentEntry
+import dorkbox.collections.ConcurrentIterator
+import dorkbox.collections.ConcurrentIterator.headREF
 
 // .equals() compares the identity on purpose,this because we cannot create two separate objects that are somehow equal to each other.
 @Suppress("UNCHECKED_CAST")
@@ -38,7 +38,6 @@ internal open class ConnectionManager<CONNECTION: Connection>() {
     /**
      * Removes a custom connection to the server.
      *
-     *
      * This should only be used in situations where there can be DIFFERENT types of connections (such as a 'web-based' connection) and
      * you want *this* server instance to manage listeners + message dispatch
      *
diff --git a/src/dorkbox/network/connection/CryptoManagement.kt b/src/dorkbox/network/connection/CryptoManagement.kt
index 8006b3a0..0ade3ab0 100644
--- a/src/dorkbox/network/connection/CryptoManagement.kt
+++ b/src/dorkbox/network/connection/CryptoManagement.kt
@@ -23,7 +23,6 @@ import dorkbox.network.serialization.AeronInput
 import dorkbox.network.serialization.AeronOutput
 import dorkbox.network.serialization.SettingsStore
 import dorkbox.util.entropy.Entropy
-import dorkbox.util.exceptions.SecurityException
 import mu.KLogger
 import java.math.BigInteger
 import java.net.InetAddress
diff --git a/src/dorkbox/network/connection/ListenerManager.kt b/src/dorkbox/network/connection/ListenerManager.kt
index 74ea7612..6f727e61 100644
--- a/src/dorkbox/network/connection/ListenerManager.kt
+++ b/src/dorkbox/network/connection/ListenerManager.kt
@@ -15,11 +15,11 @@
  */
 package dorkbox.network.connection
 
+import dorkbox.collections.IdentityMap
 import dorkbox.network.ipFilter.IpFilterRule
 import dorkbox.os.OS
 import dorkbox.util.classes.ClassHelper
 import dorkbox.util.classes.ClassHierarchy
-import dorkbox.util.collections.IdentityMap
 import kotlinx.atomicfu.atomic
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
diff --git a/src/dorkbox/network/rmi/RemoteObjectStorage.kt b/src/dorkbox/network/rmi/RemoteObjectStorage.kt
index d205d74f..d06c6a80 100644
--- a/src/dorkbox/network/rmi/RemoteObjectStorage.kt
+++ b/src/dorkbox/network/rmi/RemoteObjectStorage.kt
@@ -15,10 +15,10 @@
  */
 package dorkbox.network.rmi
 
-import dorkbox.util.collections.LockFreeIntBiMap
+import dorkbox.collections.LockFreeIntBiMap
 import mu.KLogger
 import org.agrona.collections.IntArrayList
-import java.util.concurrent.locks.ReentrantReadWriteLock
+import java.util.concurrent.locks.*
 import kotlin.concurrent.write
 
 /**
diff --git a/src/dorkbox/network/rmi/RmiManagerConnections.kt b/src/dorkbox/network/rmi/RmiManagerConnections.kt
index 25dc8d19..7ec06ae3 100644
--- a/src/dorkbox/network/rmi/RmiManagerConnections.kt
+++ b/src/dorkbox/network/rmi/RmiManagerConnections.kt
@@ -15,6 +15,7 @@
  */
 package dorkbox.network.rmi
 
+import dorkbox.collections.LockFreeIntMap
 import dorkbox.network.connection.Connection
 import dorkbox.network.connection.ListenerManager
 import dorkbox.network.rmi.messages.ConnectionObjectCreateRequest
@@ -23,7 +24,6 @@ import dorkbox.network.rmi.messages.ConnectionObjectDeleteRequest
 import dorkbox.network.rmi.messages.ConnectionObjectDeleteResponse
 import dorkbox.network.serialization.Serialization
 import dorkbox.util.classes.ClassHelper
-import dorkbox.util.collections.LockFreeIntMap
 import mu.KLogger
 
 class RmiManagerConnections<CONNECTION: Connection> internal constructor(