Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-12 18:59:06 +01:00
Code Issues Projects Releases Wiki Activity

Add unit test for WebSocketController

Browse Source 
Also move the controller into an event package
This commit is contained in:
Torsten Grote
2018-09-20 13:08:42 -03:00
parent e381f83512
commit 8d55911dab
9 changed files with 75 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
briar-headless/src/main/java/org/briarproject/briar/headless/HeadlessModule.kt
View File

@@ -24,6 +24,8 @@ import org.briarproject.bramble.plugin.tor.CircumventionProvider
import org.briarproject.bramble.plugin.tor.LinuxTorPluginFactory
import org.briarproject.bramble.system.JavaSystemModule
import org.briarproject.bramble.util.StringUtils.fromHexString
import org.briarproject.briar.headless.event.WebSocketController
import org.briarproject.briar.headless.event.WebSocketControllerImpl
import org.briarproject.briar.headless.messaging.MessagingModule
import java.io.File
import java.security.GeneralSecurityException
@@ -108,7 +110,8 @@ internal class HeadlessModule(private val appDir: File) {
@Provides
@Singleton
internal fun provideWebSocketHandler(
webSocketController: WebSocketControllerImpl): WebSocketController {
webSocketController: WebSocketControllerImpl
): WebSocketController {
return webSocketController
}

1
briar-headless/src/main/java/org/briarproject/briar/headless/Router.kt
View File

@@ -8,6 +8,7 @@ import io.javalin.core.util.ContextUtil
import io.javalin.core.util.Header
import org.briarproject.briar.headless.blogs.BlogController
import org.briarproject.briar.headless.contact.ContactController
import org.briarproject.briar.headless.event.WebSocketController
import org.briarproject.briar.headless.forums.ForumController
import org.briarproject.briar.headless.messaging.MessagingController
import java.lang.Runtime.getRuntime

13
briar-headless/src/main/java/org/briarproject/briar/headless/event/OutputEvent.kt Normal file
View File

@@ -0,0 +1,13 @@
package org.briarproject.briar.headless.event
import org.briarproject.briar.api.messaging.event.PrivateMessageReceivedEvent
import org.briarproject.briar.headless.messaging.output
import javax.annotation.concurrent.Immutable
@Immutable
internal class OutputEvent(val name: String, val data: Any) {
val type = "event"
}
internal fun PrivateMessageReceivedEvent<*>.output(body: String) =
messageHeader.output(contactId, body)

2
briar-headless/src/main/java/org/briarproject/briar/headless/WebSocketController.kt → briar-headless/src/main/java/org/briarproject/briar/headless/event/WebSocketController.kt
View File

@@ -1,4 +1,4 @@
package org.briarproject.briar.headless
package org.briarproject.briar.headless.event
import io.javalin.websocket.WsSession

15
briar-headless/src/main/java/org/briarproject/briar/headless/WebSocketControllerImpl.kt → briar-headless/src/main/java/org/briarproject/briar/headless/event/WebSocketControllerImpl.kt
View File

@@ -1,6 +1,6 @@
package org.briarproject.briar.headless
package org.briarproject.briar.headless.event
import io.javalin.json.JavalinJson
import io.javalin.json.JavalinJson.toJson
import io.javalin.websocket.WsSession
import java.util.concurrent.ConcurrentHashMap
import javax.annotation.concurrent.Immutable
@@ -9,21 +9,16 @@ import javax.inject.Singleton
@Immutable
@Singleton
internal class WebSocketControllerImpl @Inject constructor() : WebSocketController {
internal class WebSocketControllerImpl @Inject constructor() :
WebSocketController {
override val sessions: MutableSet<WsSession> = ConcurrentHashMap.newKeySet<WsSession>()
override fun sendEvent(name: String, obj: Any) {
sessions.forEach { session ->
val event = OutputEvent(name, obj)
val json = JavalinJson.toJsonMapper.map(event)
session.send(json)
session.send(toJson(event))
}
}
}
@Immutable
internal class OutputEvent(val name: String, val data: Any) {
val type = "event"
}

3
briar-headless/src/main/java/org/briarproject/briar/headless/messaging/MessagingControllerImpl.kt
View File

@@ -14,7 +14,8 @@ import org.briarproject.bramble.api.system.Clock
import org.briarproject.briar.api.messaging.*
import org.briarproject.briar.api.messaging.MessagingConstants.MAX_PRIVATE_MESSAGE_BODY_LENGTH
import org.briarproject.briar.api.messaging.event.PrivateMessageReceivedEvent
import org.briarproject.briar.headless.WebSocketController
import org.briarproject.briar.headless.event.WebSocketController
import org.briarproject.briar.headless.event.output
import java.util.concurrent.Executor
import javax.annotation.concurrent.Immutable
import javax.inject.Inject

4
briar-headless/src/main/java/org/briarproject/briar/headless/messaging/OutputPrivateMessage.kt
View File

@@ -3,7 +3,6 @@ package org.briarproject.briar.headless.messaging
import org.briarproject.bramble.api.contact.ContactId
import org.briarproject.briar.api.messaging.PrivateMessage
import org.briarproject.briar.api.messaging.PrivateMessageHeader
import org.briarproject.briar.api.messaging.event.PrivateMessageReceivedEvent
import javax.annotation.concurrent.Immutable
@Immutable
@@ -57,6 +56,3 @@ internal fun PrivateMessageHeader.output(
internal fun PrivateMessage.output(contactId: ContactId, body: String) =
OutputPrivateMessageHeader(this, contactId, body)
internal fun PrivateMessageReceivedEvent<*>.output(body: String) =
messageHeader.output(contactId, body)