Added logic to trim uri input.

Signed-off-by: AWSHurneyt <[email protected]>
AWSHurneyt · Sep 14, 2023 · e4ac7d5 · e4ac7d5
1 parent 397cf0c
commit e4ac7d5
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/model/ClusterMetricsInput.kt b/src/main/kotlin/org/opensearch/commons/alerting/model/ClusterMetricsInput.kt
@@ -12,6 +12,7 @@ import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
 import java.io.IOException
+import java.lang.StringBuilder
 import java.net.URI
 
 val ILLEGAL_PATH_PARAMETER_CHARACTERS = arrayOf(':', '"', '+', '\\', '|', '?', '#', '>', '<', ' ')
@@ -207,11 +208,20 @@ data class ClusterMetricsInput(
      * @return The constructed [URI].
      */
     private fun constructUrlFromInputs(): URI {
+        val fullPath = StringBuilder()
+            .append(path.trim('/'))
+
+        if (pathParams.isNotEmpty())
+            fullPath
+                .append('/')
+                .append(pathParams.trim('/'))
+
         val uriBuilder = URIBuilder()
             .setScheme(SUPPORTED_SCHEME)
             .setHost(SUPPORTED_HOST)
             .setPort(SUPPORTED_PORT)
-            .setPath(path + pathParams)
+            .setPath(fullPath.toString())
+
         return uriBuilder.build()
     }