FIX: Move classes to a package.

epool · Jul 1, 2018 · 5c073c0 · 5c073c0
1 parent fa42219
commit 5c073c0
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 13 deletions.
diff --git a/src/main/kotlin/IpApi.kt → .../kotlin/com/nearsoft/ipapiklient/IpApi.kt b/src/main/kotlin/IpApi.kt → .../kotlin/com/nearsoft/ipapiklient/IpApi.kt
@@ -1,5 +1,7 @@
+package com.nearsoft.ipapiklient
+
+import com.nearsoft.ipapiklient.models.IpCheckResult
 import io.reactivex.Single
-import models.IpCheckResult
 import retrofit2.http.GET
 import retrofit2.http.Path
 import retrofit2.http.Query

diff --git a/src/main/kotlin/IpApiKlient.kt → ...n/com/nearsoft/ipapiklient/IpApiKlient.kt b/src/main/kotlin/IpApiKlient.kt → ...n/com/nearsoft/ipapiklient/IpApiKlient.kt
@@ -1,8 +1,10 @@
+package com.nearsoft.ipapiklient
+
 import com.google.gson.GsonBuilder
-import gson.IpCheckResultAdapter
+import com.nearsoft.ipapiklient.gson.IpCheckResultAdapter
+import com.nearsoft.ipapiklient.models.IpCheckResult
+import com.nearsoft.ipapiklient.models.IpInfo
 import io.reactivex.Single
-import models.IpCheckResult
-import models.IpInfo
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.Retrofit

diff --git a/src/main/kotlin/gson/IpCheckResultAdapter.kt → .../ipapiklient/gson/IpCheckResultAdapter.kt b/src/main/kotlin/gson/IpCheckResultAdapter.kt → .../ipapiklient/gson/IpCheckResultAdapter.kt
@@ -1,12 +1,12 @@
-package gson
+package com.nearsoft.ipapiklient.gson
 
 import com.google.gson.Gson
 import com.google.gson.JsonDeserializationContext
 import com.google.gson.JsonDeserializer
 import com.google.gson.JsonElement
-import models.IpCheckResult
-import models.IpError
-import models.IpInfo
+import com.nearsoft.ipapiklient.models.IpCheckResult
+import com.nearsoft.ipapiklient.models.IpError
+import com.nearsoft.ipapiklient.models.IpInfo
 import java.lang.reflect.Type
 
 object IpCheckResultAdapter : JsonDeserializer<IpCheckResult> {

diff --git a/src/main/kotlin/models/IpCheckResult.kt → ...rsoft/ipapiklient/models/IpCheckResult.kt b/src/main/kotlin/models/IpCheckResult.kt → ...rsoft/ipapiklient/models/IpCheckResult.kt
@@ -1,4 +1,4 @@
-package models
+package com.nearsoft.ipapiklient.models
 
 data class IpCheckResult(val ipInfo: IpInfo?, val ipError: IpError?) {
 

diff --git a/src/main/kotlin/models/IpError.kt → ...om/nearsoft/ipapiklient/models/IpError.kt b/src/main/kotlin/models/IpError.kt → ...om/nearsoft/ipapiklient/models/IpError.kt
@@ -1,4 +1,4 @@
-package models
+package com.nearsoft.ipapiklient.models
 
 /**
  * In case we don't have data on a specific field, the returned value will be, depending on the field type:

diff --git a/src/main/kotlin/models/IpInfo.kt → ...com/nearsoft/ipapiklient/models/IpInfo.kt b/src/main/kotlin/models/IpInfo.kt → ...com/nearsoft/ipapiklient/models/IpInfo.kt
@@ -1,4 +1,4 @@
-package models
+package com.nearsoft.ipapiklient.models
 
 /**
  * In case we don't have data on a specific field, the returned value will be, depending on the field type:

diff --git a/src/test/kotlin/IpApiKlientTest.kt → ...m/nearsoft/ipapiklient/IpApiKlientTest.kt b/src/test/kotlin/IpApiKlientTest.kt → ...m/nearsoft/ipapiklient/IpApiKlientTest.kt
@@ -1,5 +1,7 @@
-import models.IpError
-import models.IpInfo
+package com.nearsoft.ipapiklient
+
+import com.nearsoft.ipapiklient.models.IpError
+import com.nearsoft.ipapiklient.models.IpInfo
 import org.jetbrains.spek.api.Spek
 import org.jetbrains.spek.api.dsl.given
 import org.jetbrains.spek.api.dsl.it