Fixing style guidelines (#25)

* added project style file * reformat code
OpenMined · Jan 31, 2020 · 77e7c6f · 77e7c6f
1 parent 7f1c71d
commit 77e7c6f
Show file tree

Hide file tree

Showing 7 changed files with 192 additions and 34 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,6 @@
 *.iml
 local.properties
 .gradle/
-.idea
+.idea/*.xml
+.idea/caches
+.idea/libraries
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
diff --git a/syftlib/build.gradle b/syftlib/build.gradle
@@ -52,12 +52,12 @@ dependencies {
     implementation 'org.webrtc:google-webrtc:1.0.30039'
     implementation 'io.reactivex.rxjava2:rxjava:2.2.12'
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
-    implementation 'com.squareup.okhttp3:okhttp:3.14.4'
+    implementation 'com.squareup.okhttp3:okhttp:4.3.1'
 
     debugImplementation "org.mockito:mockito-junit-jupiter:3.2.4"
 
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.5.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.6.0'
     testImplementation "org.mockito:mockito-core:3.2.4"
 }
diff --git a/syftlib/src/main/java/org/openmined/syft/Syft.kt b/syftlib/src/main/java/org/openmined/syft/Syft.kt
@@ -2,8 +2,8 @@ package org.openmined.syft
 
 import io.reactivex.disposables.CompositeDisposable
 import kotlinx.serialization.ImplicitReflectionSerializer
-import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.json.JsonPrimitive
 import org.openmined.syft.network.NetworkMessage
 import org.openmined.syft.network.SignallingClient
 import org.openmined.syft.threading.ProcessSchedulers
@@ -28,33 +28,35 @@ class Syft(
         )
 
         val disposable = signallingClient.start()
-            .map {
-                // TODO Please excuse this terrible piece of code
-                when (it) {
-                    is NetworkMessage.SocketOpen -> {
-                        println("Socket open")
-                        send("And now that we are opened, I send a message")
+                .map {
+                    // TODO Please excuse this terrible piece of code
+                    when (it) {
+                        is NetworkMessage.SocketOpen -> {
+                            println("Socket open")
+                            send("And now that we are opened, I send a message")
+                        }
+                        is NetworkMessage.SocketClosed -> println("Socket was closed successfully")
+                        is NetworkMessage.SocketError -> println(it.throwable.message)
+                        is NetworkMessage.MessageReceived -> println(it)
+                        is NetworkMessage.MessageSent -> println("Message sent successfully")
                     }
-                    is NetworkMessage.SocketClosed -> println("Socket was closed successfully")
-                    is NetworkMessage.SocketError -> println(it.throwable.message)
-                    is NetworkMessage.MessageReceived -> println(it)
-                    is NetworkMessage.MessageSent -> println("Message sent successfully")
                 }
-            }
-            .subscribeOn(schedulers.computeThreadScheduler)
-            .observeOn(schedulers.calleeThreadScheduler)
-            .subscribe()
+                .subscribeOn(schedulers.computeThreadScheduler)
+                .observeOn(schedulers.calleeThreadScheduler)
+                .subscribe()
 
         compositeDisposable.add(disposable)
     }
 
     @ImplicitReflectionSerializer
     fun send(message: String) {
-        signallingClient.send("Personal", JsonObject(
-            mapOf(
-                "data" to Json.plain.toJson(message),
-                "workerId" to Json.plain.toJson("1234")
+        signallingClient.send(
+            "Personal", JsonObject(
+                mapOf(
+                    "data" to JsonPrimitive(message),
+                    "workerId" to JsonPrimitive("1234")
+                )
             )
-        ))
+        )
     }
 }
diff --git a/syftlib/src/main/java/org/openmined/syft/network/SignallingClient.kt b/syftlib/src/main/java/org/openmined/syft/network/SignallingClient.kt
@@ -5,11 +5,14 @@ import io.reactivex.processors.PublishProcessor
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.JsonPrimitive
 import kotlinx.serialization.json.json
-import okhttp3.*
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.Response
+import okhttp3.WebSocket
+import okhttp3.WebSocketListener
 import java.util.concurrent.TimeUnit
 
 private const val SOCKET_CLOSE_CLIENT = 1000
-private const val SOCKET_CLOSE_ERROR = 1001
 
 internal class SignallingClient(
     private val workerId: String,
@@ -22,15 +25,15 @@ internal class SignallingClient(
     private val syftSocketListener = SyftSocketListener()
 
     private val statusPublishProcessor: PublishProcessor<NetworkMessage> =
-        PublishProcessor.create<NetworkMessage>()
+            PublishProcessor.create<NetworkMessage>()
 
     fun start(): Flowable<NetworkMessage> {
         client = OkHttpClient.Builder()
-            .pingInterval(keepAliveTimeout.toLong(), TimeUnit.MILLISECONDS)
-            .build()
+                .pingInterval(keepAliveTimeout.toLong(), TimeUnit.MILLISECONDS)
+                .build()
         request = Request.Builder()
-            .url(url)
-            .build()
+                .url(url)
+                .build()
         connect()
         return statusPublishProcessor.onBackpressureBuffer()
     }
@@ -67,8 +70,8 @@ internal class SignallingClient(
             statusPublishProcessor.offer(NetworkMessage.SocketOpen)
         }
 
-        override fun onMessage(webSocket: WebSocket, message: String) {
-            statusPublishProcessor.offer(NetworkMessage.MessageReceived(message))
+        override fun onMessage(webSocket: WebSocket, text: String) {
+            statusPublishProcessor.offer(NetworkMessage.MessageReceived(text))
         }
 
         override fun onFailure(webSocket: WebSocket, t: Throwable, response: Response?) {

diff --git a/syftlib/src/main/java/org/openmined/syft/network/WebRTC.kt b/syftlib/src/main/java/org/openmined/syft/network/WebRTC.kt
@@ -89,7 +89,7 @@ internal class WebRTCClient(
             send(peers[to]!!.channel!!, message)
         else
             peers.filterValues { it.channel != null }
-                .forEach { (_, peer) -> send(peer.channel!!, message) }
+                    .forEach { (_, peer) -> send(peer.channel!!, message) }
     }
 
     /**
@@ -151,7 +151,13 @@ internal class WebRTCClient(
                 Log.d(TAG, "remote candidate received")
                 if (!peers.containsKey(newWorkerId))
                     createConnection(newWorkerId)
-                peers[newWorkerId]?.connection?.addIceCandidate(IceCandidate(null,-1,sessionDescription))
+                peers[newWorkerId]?.connection?.addIceCandidate(
+                    IceCandidate(
+                        null,
+                        -1,
+                        sessionDescription
+                    )
+                )
             }
             "offer" -> {
                 Log.d(TAG, "remote offer received")