- Implement randomAlphanumeric() for dynamic variable Generators

- Doc edits

Signed-off-by: Gopal S Akshintala <[email protected]>

Author: overfullstack

README.adoc

@@ -114,6 +114,15 @@ ____
 ** link:{sourcedir}/com/salesforce/revoman/internal/postman/DynamicVariableGenerator.kt[Dynamic variables], e.g., `{{$randomUUID}}`, `{{$randomEmail}}`
 ** <<Custom Dynamic variables>>
 
+[NOTE]
+====
+In the case of collision between variable keys, the precedence order to derive a value to replace any key is:
+
+. Custom Dynamic variables
+. Generated Dynamic variables
+. Dynamic Environment supplied through config + Environment built during execution + Postman environment supplied as a file through config
+====
+
 [.lead]
 You can _kick off_ this *Template-Driven Testing* by invoking `ReVoman.revUp()`,
 supplying your Postman templates and environments, and all your customizations through a configuration:

build.gradle.kts

@@ -11,7 +11,7 @@ plugins {
   id("revoman.kt-conventions")
   alias(libs.plugins.moshix)
   alias(libs.plugins.node.gradle)
-  // alias(libs.plugins.kover)
+  alias(libs.plugins.kover)
   alias(libs.plugins.nexus.publish)
   alias(libs.plugins.gradle.taskinfo)
 }
@@ -23,7 +23,6 @@ dependencies {
   api(libs.kotlin.vavr)
   api(libs.arrow.core)
   api(libs.kotlinx.datetime)
-  implementation(libs.apache.commons.lang3)
   implementation(libs.bundles.kotlin.logging)
   implementation(libs.pprint)
   implementation(libs.graal.js)

libs.versions.toml

@@ -19,7 +19,6 @@ kotlin-logging = "7.0.0"
 pprint = "3.0.0"
 underscore = "1.105"
 kotlin-faker = "1.16.0"
-apache-commons-lang3 = "3.17.0"
 mockito = "5.14.0"
 spring = "6.2.0"
 json-assert = "1.5.3"
@@ -70,7 +69,6 @@ mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockito" }
 spring-beans = { module = "org.springframework:spring-beans", version.ref = "spring" }
 json-assert = { module = "org.skyscreamer:jsonassert", version.ref = "json-assert" }
 kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime-jvm", version.ref = "kotlinx-datetime" }
-apache-commons-lang3 = { module = "org.apache.commons:commons-lang3", version.ref = "apache-commons-lang3" }
 mockk = { module = "io.mockk:mockk", version.ref = "mockk" }
 
 # Gradle plugins

src/main/kotlin/com/salesforce/revoman/internal/postman/DynamicVariableGenerator.kt

@@ -14,7 +14,6 @@ import kotlin.random.Random.Default.nextBoolean
 import kotlin.random.Random.Default.nextInt
 import kotlin.random.Random.Default.nextLong
 import kotlinx.datetime.Clock
-import org.apache.commons.lang3.RandomStringUtils
 
 private val faker = faker {}
 
@@ -31,7 +30,7 @@ private val dynamicVariableGenerators: Map<String, () -> String> =
     "\$isoTimestamp" to { Clock.System.now().toString() },
     "\$randomUUID" to { UUID.randomUUID().toString() },
     // Text, numbers, and colors
-    "\$randomAlphaNumeric" to { RandomStringUtils.randomAlphanumeric(1) },
+    "\$randomAlphaNumeric" to { randomAlphanumeric(1) },
     "\$randomBoolean" to { nextBoolean().toString() },
     "\$randomInt" to { nextInt(0, Int.MAX_VALUE).toString() },
     "\$randomColor" to faker.color::name,
@@ -40,7 +39,7 @@ private val dynamicVariableGenerators: Map<String, () -> String> =
     "\$randomIP" to faker.internet::iPv4Address,
     "\$randomIPV6" to faker.internet::iPv6Address,
     "\$randomMACAddress" to { faker.internet.macAddress() },
-    "\$randomPassword" to { RandomStringUtils.randomAlphanumeric(15) },
+    "\$randomPassword" to { randomAlphanumeric(15) },
     // Names
     "\$randomFirstName" to faker.name::firstName,
     "\$randomLastName" to faker.name::lastName,
@@ -64,6 +63,11 @@ private val dynamicVariableGenerators: Map<String, () -> String> =
 
 fun getRandomHex() = nextInt(255).toString(16).uppercase()
 
+private val charPool = ('a'..'z') + ('A'..'Z') + ('0'..'9')
+
+fun randomAlphanumeric(length: Int) =
+  (1..length).map { charPool[nextInt(0, charPool.size)] }.joinToString("")
+
 private val dynamicVariableGeneratorsWithPM: Map<String, (PostmanSDK) -> String> =
   mapOf("\$currentRequestName" to { it.info.requestName })
 

src/main/kotlin/com/salesforce/revoman/internal/postman/RegexReplacer.kt

@@ -25,8 +25,8 @@ class RegexReplacer(
    * Order of Variable resolution
    * <ul>
    * <li>Custom Dynamic Variables</li>
-   * <li>Dynamic variable supplied through config </li>
-   * <li>Environment built during execution + Postman environment supplied as a file through
+   * <li>Generated Dynamic variables</li>
+   * <li>Dynamic Environment supplied through config + Environment built during execution + Postman environment supplied as a file through
    *   config</li>
    * </ul>
    */