Funkwhale/ultrasonic-app-subsonic-android
1
0
Fork 0
mirror of https://github.com/ultrasonic/ultrasonic synced 2025-02-12 01:30:46 +01:00
Code Issues Releases Wiki Activity

Fix ktLint issues.

Browse Source 
Signed-off-by: Yahor Berdnikau <egorr.berd@gmail.com>
This commit is contained in:
Yahor Berdnikau 2017-07-29 22:51:57 +02:00
parent 2d3316964a
commit 3907d10950
10 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicAPIClientTest.kt
View File

@ -23,7 +23,9 @@ import retrofit2.Response
import java.nio.charset.Charset import java.nio.charset.Charset
import java.security.MessageDigest import java.security.MessageDigest
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
import java.util.* import java.util.Calendar
import java.util.Locale
import java.util.TimeZone
/** /**
* Integration test for [SubsonicAPIClient] class. * Integration test for [SubsonicAPIClient] class.

4
subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/rules/MockWebServerRule.kt
View File

@ -8,11 +8,11 @@ import org.junit.runners.model.Statement
/** /**
* Starts mock web server for test and shut it down after. * Starts mock web server for test and shut it down after.
*/ */
class MockWebServerRule: TestRule { class MockWebServerRule : TestRule {
val mockWebServer = MockWebServer() val mockWebServer = MockWebServer()
override fun apply(base: Statement?, description: Description?): Statement { override fun apply(base: Statement?, description: Description?): Statement {
val ruleStatement = object: Statement() { val ruleStatement = object : Statement() {
override fun evaluate() { override fun evaluate() {
try { try {
mockWebServer.start() mockWebServer.start()

6
subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicAPIVersions.kt
View File

@ -52,9 +52,9 @@ enum class SubsonicAPIVersions(val subsonicVersions: String, val restApiVersion:
throw IllegalArgumentException("Unknown api version $apiVersion") throw IllegalArgumentException("Unknown api version $apiVersion")
} }
class SubsonicAPIVersionsDeserializer: JsonDeserializer<SubsonicAPIVersions>() { class SubsonicAPIVersionsDeserializer : JsonDeserializer<SubsonicAPIVersions>() {
override fun deserialize(p: JsonParser?, ctxt: DeserializationContext?): SubsonicAPIVersions { override fun deserialize(p: JsonParser, ctxt: DeserializationContext?): SubsonicAPIVersions {
if (p!!.currentName != "version") { if (p.currentName != "version") {
throw JsonParseException(p, "Not valid token for API version!") throw JsonParseException(p, "Not valid token for API version!")
} }
return fromApiVersion(p.text) return fromApiVersion(p.text)

6
subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicError.kt
View File

@ -25,9 +25,9 @@ enum class SubsonicError(val code: Int) {
.filter { it.code == jsonErrorCode }.firstOrNull() .filter { it.code == jsonErrorCode }.firstOrNull()
?: throw IllegalArgumentException("Unknown code $jsonErrorCode") ?: throw IllegalArgumentException("Unknown code $jsonErrorCode")
class SubsonicErrorDeserializer: JsonDeserializer<SubsonicError>() { class SubsonicErrorDeserializer : JsonDeserializer<SubsonicError>() {
override fun deserialize(p: JsonParser?, ctxt: DeserializationContext?): SubsonicError { override fun deserialize(p: JsonParser, ctxt: DeserializationContext?): SubsonicError {
p!!.nextToken() // "code" p.nextToken() // "code"
val error = parseErrorFromJson(p.valueAsInt) val error = parseErrorFromJson(p.valueAsInt)
p.nextToken() // "message" p.nextToken() // "message"
p.nextToken() // end of error object p.nextToken() // end of error object

2
subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/models/Artist.kt
View File

@ -1,6 +1,6 @@
package org.moire.ultrasonic.api.subsonic.models package org.moire.ultrasonic.api.subsonic.models
import java.util.* import java.util.Calendar
data class Artist(val id: Long, data class Artist(val id: Long,
val name: String, val name: String,

2
subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/models/MusicDirectory.kt
View File

@ -1,7 +1,7 @@
package org.moire.ultrasonic.api.subsonic.models package org.moire.ultrasonic.api.subsonic.models
import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonProperty
import java.util.* import java.util.Calendar
data class MusicDirectory(val id: Long, data class MusicDirectory(val id: Long,
val name: String, val name: String,

2
subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/models/MusicDirectoryChild.kt
View File

@ -1,6 +1,6 @@
package org.moire.ultrasonic.api.subsonic.models package org.moire.ultrasonic.api.subsonic.models
import java.util.* import java.util.Calendar
data class MusicDirectoryChild(val id: Long, val parent: Long, val isDir: Boolean = false, data class MusicDirectoryChild(val id: Long, val parent: Long, val isDir: Boolean = false,
val title: String = "", val album: String = "", val title: String = "", val album: String = "",

2
subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/LicenseResponse.kt
View File

@ -7,5 +7,5 @@ import org.moire.ultrasonic.api.subsonic.models.License
class LicenseResponse(val license: License = License(), class LicenseResponse(val license: License = License(),
status: Status, status: Status,
version: SubsonicAPIVersions, version: SubsonicAPIVersions,
error: SubsonicError?): error: SubsonicError?) :
SubsonicResponse(status, version, error) SubsonicResponse(status, version, error)

8
subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/MusicFoldersResponse.kt
View File

@ -14,12 +14,12 @@ class MusicFoldersResponse(status: Status,
version: SubsonicAPIVersions, version: SubsonicAPIVersions,
error: SubsonicError?, error: SubsonicError?,
@JsonDeserialize(using = MusicFoldersDeserializer::class) @JsonDeserialize(using = MusicFoldersDeserializer::class)
val musicFolders: List<MusicFolder> = emptyList()): val musicFolders: List<MusicFolder> = emptyList()) :
SubsonicResponse(status, version, error) { SubsonicResponse(status, version, error) {
companion object { companion object {
class MusicFoldersDeserializer(): JsonDeserializer<List<MusicFolder>>() { class MusicFoldersDeserializer() : JsonDeserializer<List<MusicFolder>>() {
override fun deserialize(p: JsonParser?, ctxt: DeserializationContext?): List<MusicFolder> { override fun deserialize(p: JsonParser, ctxt: DeserializationContext?): List<MusicFolder> {
p!!.nextToken() p.nextToken()
if (p.currentName == "musicFolder" && p.nextToken() == JsonToken.START_ARRAY) { if (p.currentName == "musicFolder" && p.nextToken() == JsonToken.START_ARRAY) {
val mfJavaType = ctxt!!.typeFactory val mfJavaType = ctxt!!.typeFactory
.constructCollectionType(List::class.java, MusicFolder::class.java) .constructCollectionType(List::class.java, MusicFolder::class.java)

6
subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/SubsonicResponse.kt
View File

@ -25,9 +25,9 @@ open class SubsonicResponse(val status: Status,
.filter { it.jsonValue == jsonValue }.firstOrNull() .filter { it.jsonValue == jsonValue }.firstOrNull()
?: throw IllegalArgumentException("Unknown status value: $jsonValue") ?: throw IllegalArgumentException("Unknown status value: $jsonValue")
class StatusJsonDeserializer: JsonDeserializer<Status>() { class StatusJsonDeserializer : JsonDeserializer<Status>() {
override fun deserialize(p: JsonParser?, ctxt: DeserializationContext?): Status { override fun deserialize(p: JsonParser, ctxt: DeserializationContext?): Status {
if (p!!.currentName != "status") { if (p.currentName != "status") {
throw JsonParseException(p, throw JsonParseException(p,
"Current token is not status. Current token name ${p.currentName}.") "Current token is not status. Current token name ${p.currentName}.")
} }