mirror of
https://code.briarproject.org/briar/briar.git
synced 2026-02-22 15:49:53 +01:00
Fix Kotlin coding style
This commit is contained in:
7
.idea/codeStyles/Project.xml
generated
7
.idea/codeStyles/Project.xml
generated
@@ -33,6 +33,7 @@
|
|||||||
</option>
|
</option>
|
||||||
<option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
|
<option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
|
||||||
<option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
|
<option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
|
||||||
|
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
|
||||||
</JetCodeStyleSettings>
|
</JetCodeStyleSettings>
|
||||||
<XML>
|
<XML>
|
||||||
<option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
|
<option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
|
||||||
@@ -185,5 +186,11 @@
|
|||||||
</rules>
|
</rules>
|
||||||
</arrangement>
|
</arrangement>
|
||||||
</codeStyleSettings>
|
</codeStyleSettings>
|
||||||
|
<codeStyleSettings language="kotlin">
|
||||||
|
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
|
||||||
|
<indentOptions>
|
||||||
|
<option name="CONTINUATION_INDENT_SIZE" value="4" />
|
||||||
|
</indentOptions>
|
||||||
|
</codeStyleSettings>
|
||||||
</code_scheme>
|
</code_scheme>
|
||||||
</component>
|
</component>
|
||||||
@@ -3,7 +3,11 @@ package org.briarproject.briar.headless
|
|||||||
import com.fasterxml.jackson.core.JsonParseException
|
import com.fasterxml.jackson.core.JsonParseException
|
||||||
import com.fasterxml.jackson.databind.ObjectMapper
|
import com.fasterxml.jackson.databind.ObjectMapper
|
||||||
import io.javalin.Javalin
|
import io.javalin.Javalin
|
||||||
import io.javalin.apibuilder.ApiBuilder.*
|
import io.javalin.apibuilder.ApiBuilder.delete
|
||||||
|
import io.javalin.apibuilder.ApiBuilder.get
|
||||||
|
import io.javalin.apibuilder.ApiBuilder.path
|
||||||
|
import io.javalin.apibuilder.ApiBuilder.post
|
||||||
|
import io.javalin.apibuilder.ApiBuilder.put
|
||||||
import io.javalin.core.security.AccessManager
|
import io.javalin.core.security.AccessManager
|
||||||
import io.javalin.core.util.Header.AUTHORIZATION
|
import io.javalin.core.util.Header.AUTHORIZATION
|
||||||
import io.javalin.http.BadRequestResponse
|
import io.javalin.http.BadRequestResponse
|
||||||
|
|||||||
@@ -2,7 +2,11 @@ package org.briarproject.briar.headless.contact
|
|||||||
|
|
||||||
import org.briarproject.bramble.api.contact.PendingContact
|
import org.briarproject.bramble.api.contact.PendingContact
|
||||||
import org.briarproject.bramble.api.contact.PendingContactState
|
import org.briarproject.bramble.api.contact.PendingContactState
|
||||||
import org.briarproject.bramble.api.contact.PendingContactState.*
|
import org.briarproject.bramble.api.contact.PendingContactState.ADDING_CONTACT
|
||||||
|
import org.briarproject.bramble.api.contact.PendingContactState.CONNECTING
|
||||||
|
import org.briarproject.bramble.api.contact.PendingContactState.FAILED
|
||||||
|
import org.briarproject.bramble.api.contact.PendingContactState.OFFLINE
|
||||||
|
import org.briarproject.bramble.api.contact.PendingContactState.WAITING_FOR_CONNECTION
|
||||||
import org.briarproject.bramble.api.contact.event.PendingContactAddedEvent
|
import org.briarproject.bramble.api.contact.event.PendingContactAddedEvent
|
||||||
import org.briarproject.bramble.api.contact.event.PendingContactRemovedEvent
|
import org.briarproject.bramble.api.contact.event.PendingContactRemovedEvent
|
||||||
import org.briarproject.bramble.api.contact.event.PendingContactStateChangedEvent
|
import org.briarproject.bramble.api.contact.event.PendingContactStateChangedEvent
|
||||||
|
|||||||
@@ -14,7 +14,12 @@ import org.briarproject.bramble.api.identity.LocalAuthor
|
|||||||
import org.briarproject.bramble.api.sync.Group
|
import org.briarproject.bramble.api.sync.Group
|
||||||
import org.briarproject.bramble.api.sync.Message
|
import org.briarproject.bramble.api.sync.Message
|
||||||
import org.briarproject.bramble.api.system.Clock
|
import org.briarproject.bramble.api.system.Clock
|
||||||
import org.briarproject.bramble.test.TestUtils.*
|
import org.briarproject.bramble.test.TestUtils.getAuthor
|
||||||
|
import org.briarproject.bramble.test.TestUtils.getClientId
|
||||||
|
import org.briarproject.bramble.test.TestUtils.getContact
|
||||||
|
import org.briarproject.bramble.test.TestUtils.getGroup
|
||||||
|
import org.briarproject.bramble.test.TestUtils.getLocalAuthor
|
||||||
|
import org.briarproject.bramble.test.TestUtils.getMessage
|
||||||
import org.briarproject.bramble.util.StringUtils.getRandomString
|
import org.briarproject.bramble.util.StringUtils.getRandomString
|
||||||
import org.briarproject.briar.api.conversation.ConversationManager
|
import org.briarproject.briar.api.conversation.ConversationManager
|
||||||
import org.briarproject.briar.headless.event.WebSocketController
|
import org.briarproject.briar.headless.event.WebSocketController
|
||||||
|
|||||||
@@ -1,8 +1,6 @@
|
|||||||
package org.briarproject.briar.headless.contact
|
package org.briarproject.briar.headless.contact
|
||||||
|
|
||||||
import io.javalin.http.BadRequestResponse
|
import io.javalin.http.BadRequestResponse
|
||||||
import io.javalin.http.ForbiddenResponse
|
|
||||||
import io.javalin.http.HttpResponseException
|
|
||||||
import io.javalin.http.NotFoundResponse
|
import io.javalin.http.NotFoundResponse
|
||||||
import io.javalin.plugin.json.JavalinJson.toJson
|
import io.javalin.plugin.json.JavalinJson.toJson
|
||||||
import io.mockk.Runs
|
import io.mockk.Runs
|
||||||
@@ -35,7 +33,6 @@ import org.briarproject.bramble.util.StringUtils.getRandomString
|
|||||||
import org.briarproject.briar.headless.ControllerTest
|
import org.briarproject.briar.headless.ControllerTest
|
||||||
import org.briarproject.briar.headless.getFromJson
|
import org.briarproject.briar.headless.getFromJson
|
||||||
import org.briarproject.briar.headless.json.JsonDict
|
import org.briarproject.briar.headless.json.JsonDict
|
||||||
import org.junit.jupiter.api.Assertions.assertEquals
|
|
||||||
import org.junit.jupiter.api.Assertions.assertNotNull
|
import org.junit.jupiter.api.Assertions.assertNotNull
|
||||||
import org.junit.jupiter.api.Assertions.assertThrows
|
import org.junit.jupiter.api.Assertions.assertThrows
|
||||||
import org.junit.jupiter.api.Test
|
import org.junit.jupiter.api.Test
|
||||||
@@ -316,7 +313,9 @@ internal class ContactControllerTest : ControllerTest() {
|
|||||||
fun testSetContactAliasInvalid() {
|
fun testSetContactAliasInvalid() {
|
||||||
mockkStatic("org.briarproject.briar.headless.RouterKt")
|
mockkStatic("org.briarproject.briar.headless.RouterKt")
|
||||||
every { ctx.pathParam("contactId") } returns "1"
|
every { ctx.pathParam("contactId") } returns "1"
|
||||||
every { ctx.getFromJson(objectMapper, "alias") } returns getRandomString(MAX_AUTHOR_NAME_LENGTH + 1)
|
every {
|
||||||
|
ctx.getFromJson(objectMapper, "alias")
|
||||||
|
} returns getRandomString(MAX_AUTHOR_NAME_LENGTH + 1)
|
||||||
assertThrows(BadRequestResponse::class.java) {
|
assertThrows(BadRequestResponse::class.java) {
|
||||||
controller.setContactAlias(ctx)
|
controller.setContactAlias(ctx)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user