reformat code

OpenMined · Feb 11, 2020 · 67fffa7 · 67fffa7
1 parent 30522f2
commit 67fffa7
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 18 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -38,7 +38,7 @@ script:
   - ./gradlew build check
 
 deploy:
-    provider: script
-    script: ./gradlew final
-    on:
-      branch: master
+  provider: script
+  script: ./gradlew final
+  on:
+    branch: master
diff --git a/build.gradle b/build.gradle
@@ -25,7 +25,7 @@ allprojects {
         google()
         jcenter()
         maven {
-            url  "https://dl.bintray.com/openmined/KotlinSyft"
+            url "https://dl.bintray.com/openmined/KotlinSyft"
         }
     }
 }

diff --git a/demo-app/src/main/java/org/openmined/syft/demo/StandaloneDemo.kt b/demo-app/src/main/java/org/openmined/syft/demo/StandaloneDemo.kt
@@ -2,10 +2,9 @@ package org.openmined.syft.demo
 
 import io.reactivex.Scheduler
 import io.reactivex.schedulers.Schedulers
-import kotlinx.serialization.ImplicitReflectionSerializer
 import org.openmined.syft.Syft
-import org.openmined.syft.networking.requests.Protocol
 import org.openmined.syft.networking.clients.SignallingClient
+import org.openmined.syft.networking.requests.Protocol
 import org.openmined.syft.threading.ProcessSchedulers
 
 @ExperimentalUnsignedTypes
@@ -15,10 +14,10 @@ fun main() {
         "echo.websocket.org",
         2000u
     ), object : ProcessSchedulers {
-            override val computeThreadScheduler: Scheduler
-                get() = Schedulers.computation()
-            override val calleeThreadScheduler: Scheduler
-                get() = Schedulers.single()
-        }
+        override val computeThreadScheduler: Scheduler
+            get() = Schedulers.computation()
+        override val calleeThreadScheduler: Scheduler
+            get() = Schedulers.single()
+    }
     )
 }
diff --git a/syftlib/build.gradle b/syftlib/build.gradle
@@ -49,7 +49,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.core:core-ktx:1.2.0'
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.14.0"
-    
+
     implementation 'org.webrtc:google-webrtc:1.0.30039'
     implementation 'io.reactivex.rxjava2:rxjava:2.2.12'
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'

diff --git a/syftlib/src/main/java/org/openmined/syft/Syft.kt b/syftlib/src/main/java/org/openmined/syft/Syft.kt
@@ -43,7 +43,7 @@ class Syft private constructor(
                             TAG,
                             "Socket was closed successfully"
                         )
-                        is NetworkMessage.SocketError -> Log.e(TAG,"socket error",it.throwable)
+                        is NetworkMessage.SocketError -> Log.e(TAG, "socket error", it.throwable)
                         is NetworkMessage.MessageReceived -> handleResponse(
                             CommunicationDataFactory.deserializeSocket(
                                 it.message

diff --git a/syftlib/src/main/java/org/openmined/syft/SyftJob.kt b/syftlib/src/main/java/org/openmined/syft/SyftJob.kt
@@ -9,7 +9,7 @@ class SyftJob(val modelName: String, val version: String? = null) {
     /**
      * create a worker job
      */
-    fun start(){
+    fun start() {
 
     }
 

diff --git a/syftlib/src/main/java/org/openmined/syft/networking/clients/SignallingClient.kt b/syftlib/src/main/java/org/openmined/syft/networking/clients/SignallingClient.kt
@@ -48,7 +48,7 @@ class SignallingClient(
     fun send(type: MessageType, data: JsonObject? = null) {
         val message = json {
             TYPE to type.value
-            if (data!=null)
+            if (data != null)
                 DATA to data
         }.toString()
 

diff --git a/syftlib/src/main/java/org/openmined/syft/networking/clients/WebRTC.kt b/syftlib/src/main/java/org/openmined/syft/networking/clients/WebRTC.kt
@@ -24,6 +24,7 @@ private const val TAG = "WebRTCClient"
 internal class WebRTCClient(
     private val peerConnectionFactory: PeerConnectionFactory,
     private val peerConfig: PeerConnection.RTCConfiguration,
+    @ExperimentalUnsignedTypes
     private val signallingClient: SignallingClient
 ) {
 
@@ -184,7 +185,7 @@ internal class WebRTCClient(
                 }
             }
             else -> {
-                Log.d(TAG,"unknown message type received")
+                Log.d(TAG, "unknown message type received")
             }
         }
 

diff --git a/syftlib/src/test/java/org/openmined/syft/SyftTest.kt b/syftlib/src/test/java/org/openmined/syft/SyftTest.kt
@@ -6,7 +6,6 @@ import com.nhaarman.mockitokotlin2.verify
 import com.nhaarman.mockitokotlin2.whenever
 import io.reactivex.Flowable
 import io.reactivex.schedulers.Schedulers
-import kotlinx.serialization.ImplicitReflectionSerializer
 import org.junit.jupiter.api.Test
 import org.openmined.syft.networking.clients.NetworkMessage
 import org.openmined.syft.networking.clients.SignallingClient

diff --git a/syftlib/src/test/java/org/openmined/syft/networking/WebRTCClientTest.kt b/syftlib/src/test/java/org/openmined/syft/networking/WebRTCClientTest.kt
@@ -32,6 +32,7 @@ class WebRTCClientTest {
     fun setUp() {
         MockitoAnnotations.initMocks(this)
     }
+
     @Test
     @ExperimentalUnsignedTypes
     fun `Given a workerId and a scopeId when the client starts it sends it through the socket`() {