Skip to content

Commit 5c073c0

Browse files
epoolepool
committed
FIX: Move classes to a package.
1 parent fa42219 commit 5c073c0

7 files changed

Lines changed: 19 additions & 13 deletions

File tree

src/main/kotlin/IpApi.kt renamed to src/main/kotlin/com/nearsoft/ipapiklient/IpApi.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
package com.nearsoft.ipapiklient
2+
3+
import com.nearsoft.ipapiklient.models.IpCheckResult
14
import io.reactivex.Single
2-
import models.IpCheckResult
35
import retrofit2.http.GET
46
import retrofit2.http.Path
57
import retrofit2.http.Query

src/main/kotlin/IpApiKlient.kt renamed to src/main/kotlin/com/nearsoft/ipapiklient/IpApiKlient.kt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1+
package com.nearsoft.ipapiklient
2+
13
import com.google.gson.GsonBuilder
2-
import gson.IpCheckResultAdapter
4+
import com.nearsoft.ipapiklient.gson.IpCheckResultAdapter
5+
import com.nearsoft.ipapiklient.models.IpCheckResult
6+
import com.nearsoft.ipapiklient.models.IpInfo
37
import io.reactivex.Single
4-
import models.IpCheckResult
5-
import models.IpInfo
68
import okhttp3.OkHttpClient
79
import okhttp3.logging.HttpLoggingInterceptor
810
import retrofit2.Retrofit

src/main/kotlin/gson/IpCheckResultAdapter.kt renamed to src/main/kotlin/com/nearsoft/ipapiklient/gson/IpCheckResultAdapter.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package gson
1+
package com.nearsoft.ipapiklient.gson
22

33
import com.google.gson.Gson
44
import com.google.gson.JsonDeserializationContext
55
import com.google.gson.JsonDeserializer
66
import com.google.gson.JsonElement
7-
import models.IpCheckResult
8-
import models.IpError
9-
import models.IpInfo
7+
import com.nearsoft.ipapiklient.models.IpCheckResult
8+
import com.nearsoft.ipapiklient.models.IpError
9+
import com.nearsoft.ipapiklient.models.IpInfo
1010
import java.lang.reflect.Type
1111

1212
object IpCheckResultAdapter : JsonDeserializer<IpCheckResult> {

src/main/kotlin/models/IpCheckResult.kt renamed to src/main/kotlin/com/nearsoft/ipapiklient/models/IpCheckResult.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package models
1+
package com.nearsoft.ipapiklient.models
22

33
data class IpCheckResult(val ipInfo: IpInfo?, val ipError: IpError?) {
44

src/main/kotlin/models/IpError.kt renamed to src/main/kotlin/com/nearsoft/ipapiklient/models/IpError.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package models
1+
package com.nearsoft.ipapiklient.models
22

33
/**
44
* In case we don't have data on a specific field, the returned value will be, depending on the field type:

src/main/kotlin/models/IpInfo.kt renamed to src/main/kotlin/com/nearsoft/ipapiklient/models/IpInfo.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package models
1+
package com.nearsoft.ipapiklient.models
22

33
/**
44
* In case we don't have data on a specific field, the returned value will be, depending on the field type:

src/test/kotlin/IpApiKlientTest.kt renamed to src/test/kotlin/com/nearsoft/ipapiklient/IpApiKlientTest.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
import models.IpError
2-
import models.IpInfo
1+
package com.nearsoft.ipapiklient
2+
3+
import com.nearsoft.ipapiklient.models.IpError
4+
import com.nearsoft.ipapiklient.models.IpInfo
35
import org.jetbrains.spek.api.Spek
46
import org.jetbrains.spek.api.dsl.given
57
import org.jetbrains.spek.api.dsl.it

0 commit comments

Comments
 (0)