erik/bitly-shorten
erik/bitly-shorten
1
1
Fork 0
Code Issues Releases Activity

Added EMPTY constant.

Browse source
This commit is contained in:
Erik C. Thauvin 2020-02-26 15:21:35 -08:00
parent d77b3cce72
commit abdae1cc77
6 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

6
detekt-baseline.xml
View file

@ -2,12 +2,8 @@
<SmellBaseline>
<Blacklist></Blacklist>
<Whitelist>
<ID>ComplexMethod:Utils.kt$Utils.Companion$call</ID>
<ID>FunctionParameterNaming:Bitlinks.kt$Bitlinks$bitlink_id: String</ID>
<ID>FunctionParameterNaming:Bitlinks.kt$Bitlinks$group_guid: String = ""</ID>
<ID>FunctionParameterNaming:Bitlinks.kt$Bitlinks$group_guid: String = Constants.EMPTY</ID>
<ID>FunctionParameterNaming:Bitlinks.kt$Bitlinks$long_url: String</ID>
<ID>NestedBlockDepth:Utils.kt$Utils.Companion$call</ID>
<ID>NestedBlockDepth:Utils.kt$Utils.Companion$logApiError</ID>
<ID>ReturnCount:Bitlinks.kt$Bitlinks$private fun parseJsonResponse(response: String, key: String, default: String, isJson: Boolean): String</ID>
</Whitelist>
</SmellBaseline>

11
src/main/kotlin/net/thauvin/erik/bitly/Bitlinks.kt
View file

@ -53,7 +53,7 @@ class Bitlinks(private val accessToken: String) {
*/
@JvmOverloads
fun expand(bitlink_id: String, isJson: Boolean = false): String {
var longUrl = if (isJson) "{}" else ""
var longUrl = if (isJson) "{}" else Constants.EMPTY
if (bitlink_id.isNotBlank()) {
val response = Utils.call(
accessToken,
@ -86,8 +86,13 @@ class Bitlinks(private val accessToken: String) {
* @return THe short URL or JSON API response.
*/
@JvmOverloads
fun shorten(long_url: String, group_guid: String = "", domain: String = "", isJson: Boolean = false): String {
var bitlink = if (isJson) "{}" else ""
fun shorten(
long_url: String,
group_guid: String = Constants.EMPTY,
domain: String = Constants.EMPTY,
isJson: Boolean = false
): String {
var bitlink = if (isJson) "{}" else Constants.EMPTY
if (!Utils.validateUrl(long_url)) {
Utils.logger.severe("Please specify a valid URL to shorten.")
} else {

2
src/main/kotlin/net/thauvin/erik/bitly/Bitly.kt
View file

@ -51,7 +51,7 @@ enum class Methods {
*/
open class Bitly() {
/** The API access token. **/
var accessToken: String = System.getenv(Constants.ENV_ACCESS_TOKEN) ?: ""
var accessToken: String = System.getenv(Constants.ENV_ACCESS_TOKEN) ?: Constants.EMPTY
/**
* Creates a new instance using an [API Access Token][accessToken].

3
src/main/kotlin/net/thauvin/erik/bitly/Constants.kt
View file

@ -40,5 +40,8 @@ class Constants private constructor() {
/** The API access token environment variable. **/
const val ENV_ACCESS_TOKEN = "BITLY_ACCESS_TOKEN"
/** Empty String **/
const val EMPTY = ""
}
}

8
src/main/kotlin/net/thauvin/erik/bitly/Utils.kt
View file

@ -89,12 +89,8 @@ class Utils private constructor() {
params: Map<String, String>,
method: Methods = Methods.POST
): String {
var response = ""
if (endPoint.isBlank()) {
logger.severe("Please specify a valid API endpoint.")
} else if (accessToken.isBlank()) {
logger.severe("Please specify a valid API access token.")
} else {
var response = Constants.EMPTY
if (validateCall(accessToken, endPoint)) {
val apiUrl = endPoint.toHttpUrlOrNull()
if (apiUrl != null) {
val builder = when (method) {

6
src/test/kotlin/net/thauvin/erik/bitly/BitlyTest.kt
View file

@ -60,9 +60,9 @@ class BitlyTest {
fun `token should be specified`() {
val test = Bitly()
if (System.getenv("CI") == "true") {
test.accessToken = ""
test.accessToken = Constants.EMPTY
}
assertEquals("", test.bitlinks().shorten(blog))
assertEquals(Constants.EMPTY, test.bitlinks().shorten(blog))
}
@Test
@ -73,7 +73,7 @@ class BitlyTest {
@Test
fun `long url should be valid`() {
assertEquals("", bitly.bitlinks().shorten(""))
assertEquals(Constants.EMPTY, bitly.bitlinks().shorten(Constants.EMPTY))
}
@Test