Cleaned up adding and removing from array syntax

Author: dsrees

src/main/kotlin/org/phoenixframework/Push.kt

@@ -95,7 +95,7 @@ class Push(
 
     // If a previous hook for this status already exists. Just append the new hook. If not, then
     // create a new array of hooks if no previous hook is associated with status
-    receiveHooks[status] = receiveHooks[status]?.copyAndAdd(callback) ?: arrayListOf(callback)
+    receiveHooks[status] = receiveHooks[status]?.plus(callback) ?: arrayListOf(callback)
 
     return this
   }

src/main/kotlin/org/phoenixframework/Socket.kt

@@ -46,22 +46,22 @@ internal class StateChangeCallbacks {
 
   /** Safely adds an onOpen callback */
   fun onOpen(callback: () -> Unit) {
-    this.open = this.open.copyAndAdd(callback)
+    this.open = this.open + callback
   }
 
   /** Safely adds an onClose callback */
   fun onClose(callback: () -> Unit) {
-    this.close = this.close.copyAndAdd(callback)
+    this.close = this.close + callback
   }
 
   /** Safely adds an onError callback */
   fun onError(callback: (Throwable, Response?) -> Unit) {
-    this.error = this.error.copyAndAdd(callback)
+    this.error = this.error + callback
   }
 
   /** Safely adds an onMessage callback */
   fun onMessage(callback: (Message) -> Unit) {
-    this.message = this.message.copyAndAdd(callback)
+    this.message = this.message + callback
   }
 
   /** Clears all stored callbacks */
@@ -73,15 +73,6 @@ internal class StateChangeCallbacks {
   }
 }
 
-/** Converts the List to a MutableList, adds the value, and then returns as a read-only List */
-fun <T> List<T>.copyAndAdd(value: T): List<T> {
-  val temp = this.toMutableList()
-  temp.add(value)
-
-  return temp
-}
-
-
 /** RFC 6455: indicates a normal closure */
 const val WS_CLOSE_NORMAL = 1000
 
@@ -304,7 +295,7 @@ class Socket(
 
   fun channel(topic: String, params: Payload = mapOf()): Channel {
     val channel = Channel(topic, params, this)
-    this.channels = this.channels.copyAndAdd(channel)
+    this.channels = this.channels + channel
 
     return channel
   }

src/test/kotlin/org/phoenixframework/SocketTest.kt

@@ -19,7 +19,6 @@ import org.junit.jupiter.api.Nested
 import org.junit.jupiter.api.Test
 import org.mockito.Mock
 import org.mockito.MockitoAnnotations
-import org.phoenixframework.utilities.copyAndRemove
 import java.net.URL
 import java.util.concurrent.TimeUnit
 
@@ -756,8 +755,8 @@ class SocketTest {
       val spy = spy(channel)
 
       // Use the spy instance instead of the Channel instance
-      socket.channels = socket.channels.copyAndRemove(channel)
-      socket.channels = socket.channels.copyAndAdd(spy)
+      socket.channels = socket.channels.minus(channel)
+      socket.channels = socket.channels.plus(spy)
 
       spy.join()
       assertThat(spy.state).isEqualTo(Channel.State.JOINING)
@@ -772,8 +771,8 @@ class SocketTest {
       val spy = spy(channel)
 
       // Use the spy instance instead of the Channel instance
-      socket.channels = socket.channels.copyAndRemove(channel)
-      socket.channels = socket.channels.copyAndAdd(spy)
+      socket.channels = socket.channels.minus(channel)
+      socket.channels = socket.channels.plus(spy)
 
       spy.join().trigger("ok", emptyMap())
 
@@ -789,8 +788,8 @@ class SocketTest {
       val spy = spy(channel)
 
       // Use the spy instance instead of the Channel instance
-      socket.channels = socket.channels.copyAndRemove(channel)
-      socket.channels = socket.channels.copyAndAdd(spy)
+      socket.channels = socket.channels.minus(channel)
+      socket.channels = socket.channels.plus(spy)
 
       spy.join().trigger("ok", emptyMap())
       spy.leave()
@@ -828,8 +827,8 @@ class SocketTest {
       val spy = spy(channel)
 
       // Use the spy instance instead of the Channel instance
-      socket.channels = socket.channels.copyAndRemove(channel)
-      socket.channels = socket.channels.copyAndAdd(spy)
+      socket.channels = socket.channels.minus(channel)
+      socket.channels = socket.channels.plus(spy)
 
       spy.join()
       assertThat(spy.state).isEqualTo(Channel.State.JOINING)
@@ -844,8 +843,8 @@ class SocketTest {
       val spy = spy(channel)
 
       // Use the spy instance instead of the Channel instance
-      socket.channels = socket.channels.copyAndRemove(channel)
-      socket.channels = socket.channels.copyAndAdd(spy)
+      socket.channels = socket.channels.minus(channel)
+      socket.channels = socket.channels.plus(spy)
 
       spy.join().trigger("ok", emptyMap())
 
@@ -861,8 +860,8 @@ class SocketTest {
       val spy = spy(channel)
 
       // Use the spy instance instead of the Channel instance
-      socket.channels = socket.channels.copyAndRemove(channel)
-      socket.channels = socket.channels.copyAndAdd(spy)
+      socket.channels = socket.channels.minus(channel)
+      socket.channels = socket.channels.plus(spy)
 
       spy.join().trigger("ok", emptyMap())
       spy.leave()
@@ -886,8 +885,8 @@ class SocketTest {
       val otherChannel = mock<Channel>()
       whenever(otherChannel.isMember(any())).thenReturn(false)
 
-      socket.channels = socket.channels.copyAndAdd(targetChannel)
-      socket.channels = socket.channels.copyAndRemove(otherChannel)
+      socket.channels = socket.channels.plus(targetChannel)
+      socket.channels = socket.channels.minus(otherChannel)
 
       val rawMessage =
           "{\"topic\":\"topic\",\"event\":\"event\",\"payload\":{\"one\":\"two\"},\"status\":\"ok\"}"

src/test/kotlin/org/phoenixframework/utilities/TestUtilities.kt

@@ -5,12 +5,4 @@ import org.phoenixframework.Channel
 
 fun Channel.getBindings(event: String): List<Binding> {
   return bindings.toList().filter { it.event == event }
-}
-
-/** Converts the List to a MutableList, removes the value, and then returns as a read-only List */
-fun <T> List<T>.copyAndRemove(value: T): List<T> {
-  val temp = this.toMutableList()
-  temp.remove(value)
-
-  return temp
 }