Skip to content
This repository has been archived by the owner on Aug 20, 2021. It is now read-only.

Commit

Permalink
fix(requests): do not encode/decode query parameters by default
Browse files Browse the repository at this point in the history 
fix gravitee-io/issues#2557
  • Loading branch information
@NicolasGeraud @tcompiegne
NicolasGeraud authored and tcompiegne committed Sep 18, 2019
1 parent 4c24170 commit 1bf26f2
Show file tree
Hide file tree
Showing 17 changed files with 45 additions and 25 deletions.
1 change: 1 addition & 0 deletions ...rc/main/java/io/gravitee/management/service/jackson/ser/api/Api1_15VersionSerializer.java
View file
Expand Up @@ -18,6 +18,7 @@
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.SerializerProvider;
import io.gravitee.definition.model.LoggingMode;
import io.gravitee.definition.model.endpoint.HttpEndpoint;
import io.gravitee.management.model.MemberEntity;
import io.gravitee.management.model.UserEntity;
import io.gravitee.management.model.api.ApiEntity;
Expand Down
10 changes: 5 additions & 5 deletions ...api-service/src/test/java/io/gravitee/management/service/ApiService_ExportAsJsonTest.java
View file
Expand Up @@ -349,7 +349,7 @@ public void shouldConvertAsJsonMultipleGroups_1_15() throws IOException, Technic
String expectedJson = Resources.toString(url, Charsets.UTF_8);

assertThat(jsonForExport).isNotNull();
assertThat(objectMapper.readTree(jsonForExport)).isEqualTo(objectMapper.readTree(expectedJson));
assertThat(objectMapper.readTree(expectedJson)).isEqualTo(objectMapper.readTree(jsonForExport));
}

private void shouldConvertAsJsonForExport(ApiSerializer.Version version, String filename) throws TechnicalException, IOException {
Expand All @@ -359,7 +359,7 @@ private void shouldConvertAsJsonForExport(ApiSerializer.Version version, String
String expectedJson = Resources.toString(url, Charsets.UTF_8);

assertThat(jsonForExport).isNotNull();
assertThat(objectMapper.readTree(jsonForExport)).isEqualTo(objectMapper.readTree(expectedJson));
assertThat(objectMapper.readTree(expectedJson)).isEqualTo(objectMapper.readTree(jsonForExport));
}

private void shouldConvertAsJsonWithoutMembers(ApiSerializer.Version version, String filename) throws IOException {
Expand All @@ -369,7 +369,7 @@ private void shouldConvertAsJsonWithoutMembers(ApiSerializer.Version version, St
String expectedJson = Resources.toString(url, Charsets.UTF_8);

assertThat(jsonForExport).isNotNull();
assertThat(objectMapper.readTree(jsonForExport)).isEqualTo(objectMapper.readTree(expectedJson));
assertThat(objectMapper.readTree(expectedJson)).isEqualTo(objectMapper.readTree(jsonForExport));
}

private void shouldConvertAsJsonWithoutPages(ApiSerializer.Version version, String filename) throws IOException {
Expand All @@ -379,7 +379,7 @@ private void shouldConvertAsJsonWithoutPages(ApiSerializer.Version version, Stri
String expectedJson = Resources.toString(url, Charsets.UTF_8);

assertThat(jsonForExport).isNotNull();
assertThat(objectMapper.readTree(jsonForExport)).isEqualTo(objectMapper.readTree(expectedJson));
assertThat(objectMapper.readTree(expectedJson)).isEqualTo(objectMapper.readTree(jsonForExport));
}

private void shouldConvertAsJsonWithoutPlans(ApiSerializer.Version version, String filename) throws IOException {
Expand All @@ -389,6 +389,6 @@ private void shouldConvertAsJsonWithoutPlans(ApiSerializer.Version version, Stri
String expectedJson = Resources.toString(url, Charsets.UTF_8);

assertThat(jsonForExport).isNotNull();
assertThat(objectMapper.readTree(jsonForExport)).isEqualTo(objectMapper.readTree(expectedJson));
assertThat(objectMapper.readTree(expectedJson)).isEqualTo(objectMapper.readTree(jsonForExport));
}
}
3 changes: 2 additions & 1 deletion ...src/test/resources/io/gravitee/management/service/export-convertAsJsonForExport-1_15.json
View file
Expand Up @@ -58,7 +58,8 @@
"pipelining": false,
"maxConcurrentConnections": 100,
"useCompression": true,
"followRedirects": false
"followRedirects": false,
"encodeURI":false
}
}
],
Expand Down
3 changes: 2 additions & 1 deletion ...src/test/resources/io/gravitee/management/service/export-convertAsJsonForExport-1_20.json
View file
Expand Up @@ -65,7 +65,8 @@
"pipelining": false,
"maxConcurrentConnections": 100,
"useCompression": true,
"followRedirects": false
"followRedirects": false,
"encodeURI":false
}
}
],
Expand Down
6 changes: 4 additions & 2 deletions ...vice/src/test/resources/io/gravitee/management/service/export-convertAsJsonForExport.json
View file
Expand Up @@ -66,7 +66,8 @@
"pipelining": false,
"maxConcurrentConnections": 100,
"useCompression": true,
"followRedirects": false
"followRedirects": false,
"encodeURI":false
}
}
],
Expand All @@ -81,7 +82,8 @@
"pipelining": false,
"maxConcurrentConnections": 100,
"useCompression": true,
"followRedirects": false
"followRedirects": false,
"encodeURI":false
}
}
]
Expand Down
6 changes: 4 additions & 2 deletions ...gravitee/management/service/export-convertAsJsonForExportMultipleEndpointGroups-1_15.json
View file
Expand Up @@ -58,7 +58,8 @@
"pipelining": false,
"maxConcurrentConnections": 100,
"useCompression": true,
"followRedirects": false
"followRedirects": false,
"encodeURI":false
}
},
{
Expand All @@ -75,7 +76,8 @@
"pipelining": false,
"maxConcurrentConnections": 100,
"useCompression": true,
"followRedirects": false
"followRedirects": false,
"encodeURI":false
}
}
],
Expand Down
3 changes: 2 additions & 1 deletion ...st/resources/io/gravitee/management/service/export-convertAsJsonForExportWithouGroup.json
View file
Expand Up @@ -61,7 +61,8 @@
"pipelining": false,
"maxConcurrentConnections": 100,
"useCompression": true,
"followRedirects": false
"followRedirects": false,
"encodeURI":false
}
}
],
Expand Down
3 changes: 2 additions & 1 deletion ...rces/io/gravitee/management/service/export-convertAsJsonForExportWithoutMembers-1_15.json
View file
Expand Up @@ -54,7 +54,8 @@
"pipelining": false,
"maxConcurrentConnections": 100,
"useCompression": true,
"followRedirects": false
"followRedirects": false,
"encodeURI":false
}
}
],
Expand Down
3 changes: 2 additions & 1 deletion ...rces/io/gravitee/management/service/export-convertAsJsonForExportWithoutMembers-1_20.json
View file
Expand Up @@ -61,7 +61,8 @@
"pipelining": false,
"maxConcurrentConnections": 100,
"useCompression": true,
"followRedirects": false
"followRedirects": false,
"encodeURI":false
}
}
],
Expand Down
6 changes: 4 additions & 2 deletions ...resources/io/gravitee/management/service/export-convertAsJsonForExportWithoutMembers.json
View file
Expand Up @@ -61,7 +61,8 @@
"pipelining": false,
"maxConcurrentConnections": 100,
"useCompression": true,
"followRedirects": false
"followRedirects": false,
"encodeURI":false
}
}
],
Expand All @@ -76,7 +77,8 @@
"pipelining": false,
"maxConcurrentConnections": 100,
"useCompression": true,
"followRedirects": false
"followRedirects": false,
"encodeURI":false
}
}
]
Expand Down
3 changes: 2 additions & 1 deletion ...ources/io/gravitee/management/service/export-convertAsJsonForExportWithoutPages-1_15.json
View file
Expand Up @@ -50,7 +50,8 @@
"pipelining": false,
"maxConcurrentConnections": 100,
"useCompression": true,
"followRedirects": false
"followRedirects": false,
"encodeURI":false
}
}
],
Expand Down
3 changes: 2 additions & 1 deletion ...ources/io/gravitee/management/service/export-convertAsJsonForExportWithoutPages-1_20.json
View file
Expand Up @@ -57,7 +57,8 @@
"pipelining": false,
"maxConcurrentConnections": 100,
"useCompression": true,
"followRedirects": false
"followRedirects": false,
"encodeURI":false
}
}
],
Expand Down
6 changes: 4 additions & 2 deletions ...t/resources/io/gravitee/management/service/export-convertAsJsonForExportWithoutPages.json
View file
Expand Up @@ -58,7 +58,8 @@
"pipelining": false,
"maxConcurrentConnections": 100,
"useCompression": true,
"followRedirects": false
"followRedirects": false,
"encodeURI":false
}
}
],
Expand All @@ -73,7 +74,8 @@
"pipelining": false,
"maxConcurrentConnections": 100,
"useCompression": true,
"followRedirects": false
"followRedirects": false,
"encodeURI":false
}
}
]
Expand Down
3 changes: 2 additions & 1 deletion ...ources/io/gravitee/management/service/export-convertAsJsonForExportWithoutPlans-1_15.json
View file
Expand Up @@ -34,7 +34,8 @@
"pipelining": false,
"maxConcurrentConnections": 100,
"useCompression": true,
"followRedirects": false
"followRedirects": false,
"encodeURI":false
}
}
],
Expand Down
3 changes: 2 additions & 1 deletion ...ources/io/gravitee/management/service/export-convertAsJsonForExportWithoutPlans-1_20.json
View file
Expand Up @@ -41,7 +41,8 @@
"pipelining": false,
"maxConcurrentConnections": 100,
"useCompression": true,
"followRedirects": false
"followRedirects": false,
"encodeURI":false
}
}
],
Expand Down
6 changes: 4 additions & 2 deletions ...t/resources/io/gravitee/management/service/export-convertAsJsonForExportWithoutPlans.json
View file
Expand Up @@ -42,7 +42,8 @@
"pipelining": false,
"maxConcurrentConnections": 100,
"useCompression": true,
"followRedirects": false
"followRedirects": false,
"encodeURI":false
}
}
],
Expand All @@ -57,7 +58,8 @@
"pipelining": false,
"maxConcurrentConnections": 100,
"useCompression": true,
"followRedirects": false
"followRedirects": false,
"encodeURI":false
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Expand Up @@ -34,7 +34,7 @@

<properties>
<gravitee-node.version>1.4.2</gravitee-node.version>
<gravitee-definition.version>1.18.0</gravitee-definition.version>
<gravitee-definition.version>1.18.1-SNAPSHOT</gravitee-definition.version>
<gravitee-common.version>1.15.0</gravitee-common.version>
<gravitee-plugin.version>1.8.0</gravitee-plugin.version>
<gravitee-repository.version>1.25.1</gravitee-repository.version>
Expand Down

0 comments on commit 1bf26f2

Please sign in to comment.