Skip to content
This repository was archived by the owner on Apr 9, 2024. It is now read-only.

Commit 6f11fe2

Browse files
thoo0224thoo0224
committed
Fixed exception info, stacktrace and throws
1 parent 9dc7fcb commit 6f11fe2

18 files changed

+83
-33
lines changed

‎src/main/kotlin/com/thoo/api/endpoints/AESEndpoints.kt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,25 @@
11
package com.thoo.api.endpoints
22

33
import com.thoo.api.enums.KeyFormat
4+
import com.thoo.api.exceptions.FortniteApiException
45
import com.thoo.api.models.AesModel
56
import com.thoo.api.models.BaseModel
67
import com.thoo.api.services.AESService
78
import com.thoo.api.utils.send
89
import retrofit2.Retrofit
10+
import kotlin.jvm.Throws
911

1012
@SuppressWarnings("unused")
1113
class AESEndpoints(
1214
retrofit: Retrofit,
1315
clazz: Class<out AESService>
1416
): EndpointBase<AESService>(retrofit, clazz) {
1517

18+
@Throws(FortniteApiException::class)
1619
@JvmOverloads fun getAes(keyFormat: KeyFormat = KeyFormat.HEX): BaseModel<AesModel> =
1720
service.getAes(keyFormat.code).send()
1821

22+
@Throws(FortniteApiException::class)
1923
@JvmOverloads suspend fun getAesAsync(keyFormat: KeyFormat = KeyFormat.HEX): BaseModel<AesModel> =
2024
service.getAesAsync(keyFormat.code)
2125

‎src/main/kotlin/com/thoo/api/endpoints/BannerEndpoints.kt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
package com.thoo.api.endpoints
22

33
import com.thoo.api.enums.Language
4+
import com.thoo.api.exceptions.FortniteApiException
45
import com.thoo.api.services.BannerService
56
import com.thoo.api.utils.send
67
import retrofit2.Retrofit
8+
import kotlin.jvm.Throws
79

810
@SuppressWarnings("unused")
911
class BannerEndpoints(
@@ -12,9 +14,11 @@ class BannerEndpoints(
1214
private val language: Language
1315
): EndpointBase<BannerService>(retrofit, clazz) {
1416

17+
@Throws(FortniteApiException::class)
1518
@JvmOverloads fun getBanners(language: Language = this.language) =
1619
service.getBanners(language.code).send()
1720

21+
@Throws(FortniteApiException::class)
1822
fun getBannerColors() = service.getBannerColors().send()
1923

2024
}

‎src/main/kotlin/com/thoo/api/endpoints/CosmeticEndpoints.kt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package com.thoo.api.endpoints
33
import com.google.gson.Gson
44
import com.thoo.api.FortniteAPI
55
import com.thoo.api.enums.Language
6+
import com.thoo.api.exceptions.FortniteApiException
67
import com.thoo.api.models.BaseModel
78
import com.thoo.api.models.Cosmetic
89
import com.thoo.api.models.CosmeticSearchProperties
@@ -14,6 +15,7 @@ import okhttp3.HttpUrl
1415
import okhttp3.OkHttpClient
1516
import okhttp3.Request
1617
import retrofit2.Retrofit
18+
import kotlin.jvm.Throws
1719

1820
@SuppressWarnings("unused")
1921
class CosmeticEndpoints(
@@ -23,12 +25,15 @@ class CosmeticEndpoints(
2325
private val httpClient: OkHttpClient
2426
): EndpointBase<CosmeticService>(retrofit, clazz) {
2527

28+
@Throws(FortniteApiException::class)
2629
@JvmOverloads fun getCosmetics(language: Language = this.language) =
2730
service.getCosmetics(language.code).send()
2831

32+
@Throws(FortniteApiException::class)
2933
@JvmOverloads fun getNewCosmetics(language: Language = this.language) =
3034
service.getNewCosmetics(language.code).send()
3135

36+
@Throws(FortniteApiException::class)
3237
@JvmOverloads
3338
fun searchCosmetic(language: Language = this.language, propertiesReceiver: CosmeticSearchProperties.() -> Unit): BaseModel<Cosmetic> {
3439
val properties = CosmeticSearchProperties()
@@ -54,6 +59,7 @@ class CosmeticEndpoints(
5459
return request.sendOkHttp(httpClient)
5560
}
5661

62+
@Throws(FortniteApiException::class)
5763
@JvmOverloads
5864
fun searchCosmetics(language: Language = this.language, propertiesReceiver: CosmeticSearchProperties.() -> Unit): BaseModel<MutableList<Cosmetic>> {
5965
val properties = CosmeticSearchProperties()

‎src/main/kotlin/com/thoo/api/endpoints/CreatorEndpoints.kt‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
11
package com.thoo.api.endpoints
22

3+
import com.thoo.api.exceptions.FortniteApiException
34
import com.thoo.api.services.CreatorService
45
import com.thoo.api.utils.send
56
import retrofit2.Retrofit
7+
import kotlin.jvm.Throws
68

79
@SuppressWarnings("unused")
810
class CreatorEndpoints(
911
retrofit: Retrofit,
1012
clazz: Class<out CreatorService>
1113
): EndpointBase<CreatorService>(retrofit, clazz) {
1214

13-
fun getCreator(name: String) = service.getCreator(name).send()
14-
fun searchCreator(name: String) = service.searchCreator(name).send()
15-
fun searchCreators(name: String) = service.searchCreators(name).send()
15+
16+
@Throws(FortniteApiException::class) fun getCreator(name: String) = service.getCreator(name).send()
17+
@Throws(FortniteApiException::class) fun searchCreator(name: String) = service.searchCreator(name).send()
18+
@Throws(FortniteApiException::class) fun searchCreators(name: String) = service.searchCreators(name).send()
1619

1720
}

‎src/main/kotlin/com/thoo/api/endpoints/MapEndpoints.kt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
package com.thoo.api.endpoints
22

33
import com.thoo.api.enums.Language
4+
import com.thoo.api.exceptions.FortniteApiException
45
import com.thoo.api.services.MapService
56
import com.thoo.api.utils.download
67
import com.thoo.api.utils.send
78
import okhttp3.OkHttpClient
89
import org.jetbrains.annotations.NotNull
910
import retrofit2.Retrofit
1011
import java.io.File
12+
import kotlin.jvm.Throws
1113

1214
@SuppressWarnings("unused")
1315
class MapEndpoints(
@@ -18,6 +20,7 @@ class MapEndpoints(
1820

1921
private val okhttp = OkHttpClient()
2022

23+
@Throws(FortniteApiException::class)
2124
@JvmOverloads fun getMap(language: Language = this.language) =
2225
service.getMap(language.code).send()
2326

‎src/main/kotlin/com/thoo/api/endpoints/PlaylistEndpoints.kt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
package com.thoo.api.endpoints
22

33
import com.thoo.api.enums.Language
4+
import com.thoo.api.exceptions.FortniteApiException
45
import com.thoo.api.services.PlaylistService
56
import com.thoo.api.utils.send
67
import retrofit2.Retrofit
8+
import kotlin.jvm.Throws
79

810
@SuppressWarnings("unused")
911
class PlaylistEndpoints(
@@ -12,12 +14,14 @@ class PlaylistEndpoints(
1214
private val language: Language
1315
): EndpointBase<PlaylistService>(retrofit, clazz) {
1416

17+
@Throws(FortniteApiException::class)
1518
@JvmOverloads fun getPlaylists(language: Language = this.language) =
1619
service.getPlaylists(language.code).send()
1720

1821
/*@JvmOverloads suspend fun getPlaylistsAsync(language: Language = this.language) =
1922
service.getPlaylistsAsync(language.code)*/
2023

24+
@Throws(FortniteApiException::class)
2125
@JvmOverloads fun getPlaylistById(id: String, language: Language = this.language) =
2226
service.getPlaylistById(id, language.code).send()
2327

‎src/main/kotlin/com/thoo/api/exceptions/FortniteApiException.kt‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
package com.thoo.api.exceptions
22

33
class FortniteApiException(
4-
message: String?
5-
): Exception(message ?: "Unknown.")
4+
status: Int,
5+
error: String
6+
): Exception("$error (${status})") {
7+
8+
init {
9+
println("$error (${status})")
10+
}
11+
12+
}

‎src/main/kotlin/com/thoo/api/models/AesModels.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ package com.thoo.api.models
22

33
import com.google.gson.annotations.SerializedName
44

5-
data class AesModel(
5+
class AesModel(
66
val build: String,
77
val mainKey: String,
88
val dynamicKeys: List<DynamicKey>
99
)
1010

11-
data class DynamicKey(
11+
class DynamicKey(
1212
@SerializedName("pakFilename")
1313
val pakFileName: String,
1414
val pakGuid: String,

‎src/main/kotlin/com/thoo/api/models/BannerModels.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.thoo.api.models
22

3-
data class Banner(
3+
class Banner(
44
val id: String,
55
val devName: String,
66
val name: String,
@@ -10,12 +10,12 @@ data class Banner(
1010
val images: BannerImages
1111
)
1212

13-
data class BannerImages(
13+
class BannerImages(
1414
val smallIcon: String,
1515
val icon: String
1616
)
1717

18-
data class BannerColor(
18+
class BannerColor(
1919
val id: String,
2020
val color: String,
2121
val category: String,

‎src/main/kotlin/com/thoo/api/models/BaseModel.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.thoo.api.models
22

3-
data class BaseModel<T>(
3+
class BaseModel<T>(
44
val status: Int,
55
val data: T
66
)

0 commit comments

Comments
 (0)