Merge pull request #1139 from jgelon/master

Fix: Keep existing path on baseUrl
pact-foundation · Jun 19, 2020 · 9f21d62 · 9f21d62
2 parents 152ecc1 + fb78bbf
commit 9f21d62
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/core/pactbroker/src/main/kotlin/au/com/dius/pact/core/pactbroker/util/HttpClientUtils.kt b/core/pactbroker/src/main/kotlin/au/com/dius/pact/core/pactbroker/util/HttpClientUtils.kt
@@ -29,13 +29,22 @@ object HttpClientUtils {
       }
     } else {
       if (encodePath) {
-        URIBuilder(baseUrl).setPath(url).build()
+        val builder = URIBuilder(baseUrl)
+        pathCombiner(builder, url)
       } else {
         URI(baseUrl + url)
       }
     }
   }
 
+  fun pathCombiner(builder: URIBuilder, url: String): URI {
+    return if (builder.getPath() != null) {
+      builder.setPath(builder.getPath() + url).build()
+    } else {
+      builder.setPath(url).build()
+    }
+  }
+
   fun isJsonResponse(contentType: ContentType) = contentType.mimeType == "application/json" ||
     contentType.mimeType == "application/hal+json"
 }
diff --git a/...ctbroker/src/test/groovy/au/com/dius/pact/core/pactbroker/util/HttpClientUtilsSpec.groovy b/...ctbroker/src/test/groovy/au/com/dius/pact/core/pactbroker/util/HttpClientUtilsSpec.groovy
@@ -22,6 +22,7 @@ class HttpClientUtilsSpec extends Specification {
     'path with spaces'        | ''                      | '/path/with spaces'                      | '/path/with%20spaces'
     'Full URL with spaces'    | ''                      | 'http://localhost:1234/path/with spaces' | 'http://localhost:1234/path/with%20spaces'
     'no port'                 | 'http://localhost'      | '/path/with spaces'                      | 'http://localhost/path/with%20spaces'
+    'Extra path'              | 'http://localhost/sub'  | '/extraPath/with spaces'                 | 'http://localhost/sub/extraPath/with%20spaces'
   }
 
 }