diff --git a/detekt-baseline.xml b/detekt-baseline.xml
index 6769477..ce4ccf9 100644
--- a/detekt-baseline.xml
+++ b/detekt-baseline.xml
@@ -6,6 +6,7 @@
FunctionParameterNaming:Bitlinks.kt$Bitlinks$bitlink_id: String
FunctionParameterNaming:Bitlinks.kt$Bitlinks$group_guid: String = Constants.EMPTY
FunctionParameterNaming:Bitlinks.kt$Bitlinks$long_url: String
+ FunctionParameterNaming:Bitlinks.kt$Bitlinks.Clicks$unit_reference: String = Constants.EMPTY
NestedBlockDepth:Utils.kt$Utils.Companion$call
NestedBlockDepth:Utils.kt$Utils.Companion$parseBody
diff --git a/src/main/kotlin/net/thauvin/erik/bitly/Bitlinks.kt b/src/main/kotlin/net/thauvin/erik/bitly/Bitlinks.kt
index 2292726..a36deac 100644
--- a/src/main/kotlin/net/thauvin/erik/bitly/Bitlinks.kt
+++ b/src/main/kotlin/net/thauvin/erik/bitly/Bitlinks.kt
@@ -51,7 +51,7 @@ open class Bitlinks(val accessToken: String) {
unit_reference: String = Constants.EMPTY,
isJson: Boolean = false
): String {
- var clicks = if (isJson) "{}" else Constants.EMPTY
+ var clicks = if (isJson) Constants.EMPTY_JSON else Constants.EMPTY
if (bitlink.isNotBlank()) {
val response = Utils.call(
accessToken,
@@ -81,7 +81,7 @@ open class Bitlinks(val accessToken: String) {
*/
@JvmOverloads
fun expand(bitlink_id: String, isJson: Boolean = false): String {
- var longUrl = if (isJson) "{}" else Constants.EMPTY
+ var longUrl = if (isJson) Constants.EMPTY_JSON else Constants.EMPTY
if (bitlink_id.isNotBlank()) {
val response = Utils.call(
accessToken,
@@ -140,7 +140,7 @@ open class Bitlinks(val accessToken: String) {
domain: String = Constants.EMPTY,
isJson: Boolean = false
): String {
- var bitlink = if (isJson) "{}" else long_url
+ var bitlink = if (isJson) Constants.EMPTY_JSON else long_url
if (!Utils.validateUrl(long_url)) {
Utils.logger.severe("Please specify a valid URL to shorten.")
} else {
diff --git a/src/main/kotlin/net/thauvin/erik/bitly/Constants.kt b/src/main/kotlin/net/thauvin/erik/bitly/Constants.kt
index c02065d..f11d39f 100644
--- a/src/main/kotlin/net/thauvin/erik/bitly/Constants.kt
+++ b/src/main/kotlin/net/thauvin/erik/bitly/Constants.kt
@@ -43,5 +43,8 @@ open class Constants private constructor() {
/** Empty String **/
const val EMPTY = ""
+
+ /** Empty JSON Object **/
+ const val EMPTY_JSON = "{}"
}
}
diff --git a/src/main/kotlin/net/thauvin/erik/bitly/Utils.kt b/src/main/kotlin/net/thauvin/erik/bitly/Utils.kt
index eb2f26b..57cb313 100644
--- a/src/main/kotlin/net/thauvin/erik/bitly/Utils.kt
+++ b/src/main/kotlin/net/thauvin/erik/bitly/Utils.kt
@@ -36,7 +36,6 @@ import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
import okhttp3.MediaType.Companion.toMediaTypeOrNull
import okhttp3.OkHttpClient
import okhttp3.Request
-import okhttp3.RequestBody.Companion.create
import okhttp3.RequestBody.Companion.toRequestBody
import okhttp3.Response
import okhttp3.logging.HttpLoggingInterceptor
@@ -116,7 +115,7 @@ open class Utils private constructor() {
return response
}
- private fun createHttpClient() : OkHttpClient {
+ private fun createHttpClient(): OkHttpClient {
return if (logger.isLoggable(Level.FINE)) {
val httpLoggingInterceptor = HttpLoggingInterceptor().apply {
level = HttpLoggingInterceptor.Level.BODY