Merge pull request #18 from avioconsulting/request_uri_query_params

Include query params on request URI
avioconsulting · Sep 9, 2021 · 757852e · 757852e
2 parents 266189a + 1c9fc7e
commit 757852e
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
 # 2.0
 (for Mule 4.x)
 
+# 2.0.52
+* Include query params properly on `requestUri` when invoking apikit flows 
+
 # 2.0.51
 * Removed `pom` type that didn't belong on Groovy dependency
 

diff --git a/connector-class-loader-test/pom.xml b/connector-class-loader-test/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.avioconsulting.mule.testing</groupId>
     <artifactId>connector-classloader-test</artifactId>
-    <version>2.0.51</version>
+    <version>2.0.52</version>
     <packaging>mule-extension</packaging>
 
     <properties>

diff --git a/implementation/pom.xml b/implementation/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.avioconsulting.mule</groupId>
     <artifactId>testing</artifactId>
-    <version>2.0.51</version>
+    <version>2.0.52</version>
     <packaging>jar</packaging>
 
     <properties>

diff --git a/.../src/main/java/com/avioconsulting/mule/testing/muleinterfaces/HttpAttributeBuilder.groovy b/.../src/main/java/com/avioconsulting/mule/testing/muleinterfaces/HttpAttributeBuilder.groovy
@@ -49,6 +49,10 @@ trait HttpAttributeBuilder {
                 // apikit router in mule 4 depends on this
                 'content-type': mimeType
         ] + additionalHeaders
+        def uriWithQueryParams = url + '?' + queryParams.collect { kv ->
+            kv.key + '=' + URLEncoder.encode(kv.value as String,
+                                             'utf-8')
+        }.join('&')
         def attrBuilderClass = appClassLoader.loadClass('org.mule.extension.http.api.HttpRequestAttributesBuilder')
         attrBuilderClass.newInstance()
                 .headers(getMultiMap(headers))
@@ -58,7 +62,7 @@ trait HttpAttributeBuilder {
                 .scheme('http')
                 .method(method)
                 .requestPath(url)
-                .requestUri(url)
+                .requestUri(uriWithQueryParams)
                 .queryParams(getMultiMap(queryParams))
         // has to be non-null
                 .localAddress('/localAddress')

diff --git a/misc-dependency/pom.xml b/misc-dependency/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.avioconsulting.mule.testing</groupId>
     <artifactId>misc-dependency</artifactId>
-    <version>2.0.51</version>
+    <version>2.0.52</version>
     <packaging>mule-extension</packaging>
 
     <properties>

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.avioconsulting.mule</groupId>
     <artifactId>testing-parent-project</artifactId>
-    <version>2.0.51</version>
+    <version>2.0.52</version>
     <packaging>pom</packaging>
 
     <modules>

diff --git a/test-api/pom.xml b/test-api/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.avioconsulting.mule.testing</groupId>
     <artifactId>test-api</artifactId>
-    <version>2.0.51</version>
+    <version>2.0.52</version>
     <packaging>mule-extension</packaging>
 
     <properties>

diff --git a/test/pom.xml b/test/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.avioconsulting.mule</groupId>
     <artifactId>tests-for-the-test</artifactId>
-    <version>2.0.51</version>
+    <version>2.0.52</version>
     <packaging>mule-application</packaging>
 
     <properties>

diff --git a/test/src/main/mule/api-the-app-v1.xml b/test/src/main/mule/api-the-app-v1.xml
@@ -69,7 +69,8 @@ output application/json
 output application/json
 ---
 {
-    key: vars.foo + vars.bar
+    key: vars.foo + vars.bar,
+    requestUri: attributes.requestUri
 }]]></ee:set-payload>
             </ee:message>
         </ee:transform>

diff --git a/test/src/test/java/com/avioconsulting/mule/testing/invocation/ApikitFlowInvokeTest.groovy b/test/src/test/java/com/avioconsulting/mule/testing/invocation/ApikitFlowInvokeTest.groovy
@@ -96,13 +96,15 @@ class ApikitFlowInvokeTest extends
                                    '/resources',
                                    queryParams) {
             json {
-                outputOnly(SampleJacksonOutput)
+                outputOnly(Map)
             }
-        } as SampleJacksonOutput
+        } as Map
 
         // assert
-        assertThat result.result,
+        assertThat result.key,
                    is(equalTo(133))
+        assertThat result.requestUri,
+                   is(equalTo('/the-APP/api/v1/resources?foo=123&bar=10'))
     }
 
     @Test