Skip to content

Commit 79e1a3a

Browse files
committed
Code reformatting with ktlint (https://github.com/pinterest/ktlint)
1 parent bf04853 commit 79e1a3a

File tree

10 files changed

+56
-65
lines changed

10 files changed

+56
-65
lines changed

src/main/kotlin/com/github/azurapi/azurapikotlin/internal/entities/Ship.kt

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ package com.github.azurapi.azurapikotlin.internal.entities
55
* @param stars
66
* @param value
77
*/
8-
data class Stars (
9-
val stars: String,
10-
val value: Int
8+
data class Stars(
9+
val stars: String,
10+
val value: Int
1111
)
1212

1313
/**
@@ -19,13 +19,13 @@ data class Stars (
1919
* @param cost
2020
* @param isLive2D
2121
*/
22-
data class SkinInfo (
23-
val enClient: String,
24-
val cnClient: String,
25-
val jpClient: String,
26-
val obtainedFrom: String?,
27-
val cost: Int,
28-
val isLive2D: Boolean
22+
data class SkinInfo(
23+
val enClient: String,
24+
val cnClient: String,
25+
val jpClient: String,
26+
val obtainedFrom: String?,
27+
val cost: Int,
28+
val isLive2D: Boolean
2929
)
3030

3131
/**
@@ -36,12 +36,12 @@ data class SkinInfo (
3636
* @param chibi
3737
* @param info
3838
*/
39-
data class Skin (
40-
val image: String,
41-
val background: String,
42-
val name: String,
43-
val chibi: String,
44-
val info: SkinInfo?
39+
data class Skin(
40+
val image: String,
41+
val background: String,
42+
val name: String,
43+
val chibi: String,
44+
val info: SkinInfo?
4545
)
4646

4747
/**
@@ -51,11 +51,11 @@ data class Skin (
5151
* @param en english name
5252
* @param cn chinese name
5353
*/
54-
data class Name (
55-
val jp: String,
56-
val kr: String,
57-
val en: String,
58-
val cn: String
54+
data class Name(
55+
val jp: String,
56+
val kr: String,
57+
val en: String,
58+
val cn: String
5959
)
6060

6161
/**
@@ -74,20 +74,20 @@ data class Name (
7474
* @param antiSub
7575
* @param firepower
7676
*/
77-
data class StatsDetails (
78-
val speed: Int,
79-
val aviation: Int,
80-
val health: Int,
81-
val torpedo: Int,
82-
val evasion: Int,
83-
val luck: Int,
84-
val armor: String,
85-
val reload: Int,
86-
val antiAir: Int,
87-
val oil: Int,
88-
val accuracy: Int,
89-
val antiSub: Int,
90-
val firepower: Int
77+
data class StatsDetails(
78+
val speed: Int,
79+
val aviation: Int,
80+
val health: Int,
81+
val torpedo: Int,
82+
val evasion: Int,
83+
val luck: Int,
84+
val armor: String,
85+
val reload: Int,
86+
val antiAir: Int,
87+
val oil: Int,
88+
val accuracy: Int,
89+
val antiSub: Int,
90+
val firepower: Int
9191
)
9292

9393
/**
@@ -96,7 +96,7 @@ data class StatsDetails (
9696
* @param level100
9797
* @param base
9898
*/
99-
data class Stats (
99+
data class Stats(
100100
val level120: StatsDetails,
101101
val level100: StatsDetails,
102102
val base: StatsDetails
@@ -107,9 +107,9 @@ data class Stats (
107107
* @param name
108108
* @param url
109109
*/
110-
data class Url (
111-
val name: String,
112-
val url: String
110+
data class Url(
111+
val name: String,
112+
val url: String
113113
)
114114

115115
/**
@@ -121,7 +121,7 @@ data class Url (
121121
* @param limited
122122
* @param exchange
123123
*/
124-
data class ShipConstruction (
124+
data class ShipConstruction(
125125
val constructionTime: String,
126126
val light: Boolean,
127127
val heavy: Boolean,
@@ -138,7 +138,7 @@ data class ShipConstruction (
138138
* @param web
139139
* @param pixiv
140140
*/
141-
data class Miscellaneous (
141+
data class Miscellaneous(
142142
val voice: Url?,
143143
val twitter: Url?,
144144
val artist: String?,
@@ -149,7 +149,6 @@ data class Miscellaneous (
149149
/**
150150
* Class representation of a ship
151151
* @param thumbnail
152-
* @param buildTime
153152
* @param stars
154153
* @param skins
155154
* @param names
@@ -160,9 +159,10 @@ data class Miscellaneous (
160159
* @param id
161160
* @param shipClass
162161
* @param hullType
162+
* @param construction
163163
* @param misc
164164
*/
165-
data class Ship (
165+
data class Ship(
166166
val wikiUrl: String,
167167
val id: String,
168168
val names: Name,

src/main/kotlin/com/github/azurapi/azurapikotlin/internal/entities/Version.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.github.azurapi.azurapikotlin.internal.entities
22

3-
import java.util.*
3+
import java.util.Date
44

55
/**
66
* Version representation
@@ -9,7 +9,7 @@ import java.util.*
99
* @param databaseVersion json version
1010
* @param lastUpdatedDatabase last time json has been refreshed
1111
*/
12-
data class Version (
12+
data class Version(
1313
val apiVersion: String,
1414
val lastUpdatedApi: Date,
1515
val databaseVersion: Int,
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
package com.github.azurapi.azurapikotlin.internal.exceptions
22

3-
class ApiException(message: String = "") : Exception(message) {
4-
}
3+
class ApiException(message: String = "") : Exception(message)
Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
package com.github.azurapi.azurapikotlin.internal.exceptions
22

3-
import java.lang.Exception
4-
5-
class DatabaseException(message: String = "") : Exception(message) {
6-
}
3+
class DatabaseException(message: String = "") : Exception(message)
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
package com.github.azurapi.azurapikotlin.internal.exceptions
22

3-
class ShipNotFoundException(message: String = "") : Exception(message) {
4-
}
3+
class ShipNotFoundException(message: String = "") : Exception(message)
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
package com.github.azurapi.azurapikotlin.internal.responses
22

3-
class ErrorResponse {
4-
}
3+
class ErrorResponse

src/main/kotlin/com/github/azurapi/azurapikotlin/json/Takao.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ class Takao {
9292
val cosine = Cosine()
9393
var bestScore = 0.0
9494
var result: Ship? = null
95-
val databaseLang = when(lang) {
95+
val databaseLang = when (lang) {
9696
Lang.EN -> shipsByEnName
9797
Lang.CN -> shipsByCnName
9898
Lang.JP -> shipsByJpName

src/test/kotlin/com/github/azurapi/azurapikotlin/api/AtagoTestCase.kt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package com.github.azurapi.azurapikotlin.api
22

33
import com.github.azurapi.azurapikotlin.internal.entities.Lang
44
import com.github.azurapi.azurapikotlin.internal.exceptions.ShipNotFoundException
5-
import io.kotlintest.TestCase
65
import io.kotlintest.matchers.boolean.shouldBeTrue
76
import io.kotlintest.matchers.types.shouldNotBeNull
87
import io.kotlintest.shouldBe
@@ -11,10 +10,6 @@ import io.kotlintest.specs.StringSpec
1110

1211
class AtagoTestCase : StringSpec() {
1312

14-
override fun beforeTest(testCase: TestCase) {
15-
super.beforeTest(testCase)
16-
}
17-
1813
init {
1914
"it should find Atago" {
2015
Atago.getShipByName("aTa gOo", Lang.EN).names.en.shouldBe("Atago")

src/test/kotlin/com/github/azurapi/azurapikotlin/json/ShipParserTestCase.kt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,12 @@ import io.kotlintest.shouldBe
1010
import io.kotlintest.specs.StringSpec
1111
import org.json.JSONObject
1212

13-
class ShipParserTestCase: StringSpec() {
13+
class ShipParserTestCase : StringSpec() {
1414

1515
init {
1616
"it should correctly parse Atago" {
17-
val json = JSONObject("""
17+
val json = JSONObject(
18+
"""
1819
{
1920
"201": {
2021
"wikiUrl": "https://azurlane.koumakan.jp/Atago",
@@ -305,7 +306,8 @@ class ShipParserTestCase: StringSpec() {
305306
]
306307
}
307308
}
308-
""".trimIndent())
309+
""".trimIndent()
310+
)
309311
val atago = ShipParser.jsonToShip(json.optJSONObject("201"), "201")
310312

311313
atago.wikiUrl.shouldBe("https://azurlane.koumakan.jp/Atago")

src/test/kotlin/com/github/azurapi/azurapikotlin/json/TakaoTestCase.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import io.kotlintest.matchers.boolean.shouldBeFalse
66
import io.kotlintest.shouldBe
77
import io.kotlintest.specs.StringSpec
88

9-
class TakaoTestCase: StringSpec() {
9+
class TakaoTestCase : StringSpec() {
1010

1111
lateinit var takao: Takao
1212

0 commit comments

Comments
 (0)