Compare commits

..

2 commits

Author SHA1 Message Date
30a3e9022d
Made config constructors private 2024-05-26 00:21:50 -07:00
b9449b9140
Minor cleanup 2024-05-26 00:18:23 -07:00
7 changed files with 33 additions and 56 deletions

3
.idea/misc.xml generated
View file

@ -8,9 +8,6 @@
<pattern value="net.thauvin.erik.bitly.BitlyShortenBuild" method="detekt" /> <pattern value="net.thauvin.erik.bitly.BitlyShortenBuild" method="detekt" />
<pattern value="net.thauvin.erik.bitly.BitlyShortenBuild" method="detektBaseline" /> <pattern value="net.thauvin.erik.bitly.BitlyShortenBuild" method="detektBaseline" />
</component> </component>
<component name="PDMPlugin">
<option name="skipTestSources" value="false" />
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="17" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="17" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build" /> <output url="file://$PROJECT_DIR$/build" />
</component> </component>

View file

@ -1,5 +1,3 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins { plugins {
id("application") id("application")
id("com.github.ben-manes.versions") version "0.51.0" id("com.github.ben-manes.versions") version "0.51.0"

View file

@ -7,4 +7,4 @@
* in the user manual at https://docs.gradle.org/6.2/userguide/multi_project_builds.html * in the user manual at https://docs.gradle.org/6.2/userguide/multi_project_builds.html
*/ */
rootProject.name = "bitly-examples" rootProject.name = "bitly-examples-gradle"

View file

@ -40,23 +40,14 @@ import net.thauvin.erik.bitly.config.deeplinks.CreateDeeplinks
* See the [Bit.ly API](https://dev.bitly.com/api-reference#createFullBitlink) for more information. * See the [Bit.ly API](https://dev.bitly.com/api-reference#createFullBitlink) for more information.
*/ */
@Suppress("LocalVariableName", "PropertyName") @Suppress("LocalVariableName", "PropertyName")
class CreateConfig @JvmOverloads constructor( class CreateConfig private constructor(builder: Builder) {
var long_url: String, val long_url = builder.long_url
var domain: String = Constants.EMPTY, val domain = builder.domain
var group_guid: String = Constants.EMPTY, val group_guid = builder.group_guid
var title: String = Constants.EMPTY, val title = builder.title
var tags: Array<String> = emptyArray(), val tags = builder.tags
var deeplinks: CreateDeeplinks = CreateDeeplinks(), val deeplinks = builder.deeplinks
var toJson: Boolean = false val toJson = builder.toJson
) {
constructor(builder: Builder) : this(builder.long_url) {
domain = builder.domain
group_guid = builder.group_guid
title = builder.title
tags = builder.tags
deeplinks = builder.deeplinks
toJson = builder.toJson
}
/** /**
* Configures the creation parameters of a Bitlink. * Configures the creation parameters of a Bitlink.

View file

@ -39,21 +39,13 @@ import net.thauvin.erik.bitly.config.deeplinks.UpdateDeeplinks
* *
* See the [Bit.ly API](https://dev.bitly.com/api-reference#updateBitlink) for more information. * See the [Bit.ly API](https://dev.bitly.com/api-reference#updateBitlink) for more information.
*/ */
class UpdateConfig @JvmOverloads constructor( class UpdateConfig private constructor(builder: Builder) {
var bitlink: String, val bitlink = builder.bitlink
var title: String = Constants.EMPTY, val title = builder.title
var archived: Boolean = false, val archived = builder.archived
var tags: Array<String> = emptyArray(), val tags = builder.tags
var deeplinks: UpdateDeeplinks = UpdateDeeplinks(), val deeplinks = builder.deeplinks
var toJson: Boolean = false val toJson = builder.toJson
) {
constructor(builder: Builder) : this(builder.bitlink) {
title = builder.title
archived = builder.archived
tags = builder.tags
deeplinks = builder.deeplinks
toJson = builder.toJson
}
/** /**
* Configures the update parameters of a Bitlink. * Configures the update parameters of a Bitlink.

View file

@ -41,9 +41,9 @@ import net.thauvin.erik.bitly.Utils.toEndPoint
import net.thauvin.erik.bitly.config.CreateConfig import net.thauvin.erik.bitly.config.CreateConfig
import net.thauvin.erik.bitly.config.UpdateConfig import net.thauvin.erik.bitly.config.UpdateConfig
import net.thauvin.erik.bitly.config.deeplinks.CreateDeeplinks import net.thauvin.erik.bitly.config.deeplinks.CreateDeeplinks
import net.thauvin.erik.bitly.config.deeplinks.UpdateDeeplinks
import net.thauvin.erik.bitly.config.deeplinks.enums.InstallType import net.thauvin.erik.bitly.config.deeplinks.enums.InstallType
import net.thauvin.erik.bitly.config.deeplinks.enums.Os import net.thauvin.erik.bitly.config.deeplinks.enums.Os
import net.thauvin.erik.bitly.config.deeplinks.UpdateDeeplinks
import org.json.JSONObject import org.json.JSONObject
import org.junit.jupiter.api.BeforeAll import org.junit.jupiter.api.BeforeAll
import java.io.File import java.io.File

View file

@ -34,9 +34,9 @@ package net.thauvin.erik.bitly.config
import assertk.assertThat import assertk.assertThat
import assertk.assertions.isEqualTo import assertk.assertions.isEqualTo
import net.thauvin.erik.bitly.config.deeplinks.CreateDeeplinks import net.thauvin.erik.bitly.config.deeplinks.CreateDeeplinks
import net.thauvin.erik.bitly.config.deeplinks.UpdateDeeplinks
import net.thauvin.erik.bitly.config.deeplinks.enums.InstallType import net.thauvin.erik.bitly.config.deeplinks.enums.InstallType
import net.thauvin.erik.bitly.config.deeplinks.enums.Os import net.thauvin.erik.bitly.config.deeplinks.enums.Os
import net.thauvin.erik.bitly.config.deeplinks.UpdateDeeplinks
import org.json.JSONObject import org.json.JSONObject
import kotlin.test.Test import kotlin.test.Test
@ -48,14 +48,13 @@ class ConfigTest {
install_type(InstallType.AUTO_INSTALL) install_type(InstallType.AUTO_INSTALL)
} }
val config = CreateConfig( val config = CreateConfig.Builder("long_url")
"long_url", .domain("domain")
"domain", .groupGuid("group_guid")
"group_guid", .title("title")
"title", .tags(arrayOf("tag", "tag2"))
arrayOf("tag", "tag2"), .deeplinks(deeplinks)
deeplinks, .build()
)
val map = mapOf( val map = mapOf(
"long_url" to config.long_url, "long_url" to config.long_url,
@ -81,13 +80,13 @@ class ConfigTest {
app_guid("app_guid") app_guid("app_guid")
} }
val config = UpdateConfig( val config = UpdateConfig.Builder("blink")
"blink", .title("title")
"title", .archived(true)
true, .tags(arrayOf("tag", "tag2"))
arrayOf("tag", "tag2"), .deeplinks(deeplinks)
deeplinks .build()
)
val map = mapOf( val map = mapOf(
"bitlink" to config.bitlink, "bitlink" to config.bitlink,
"title" to config.title, "title" to config.title,