Skip to content

Commit 18a4c67

Browse files
skarpenkokptfh
authored andcommitted
Fixes #613
1 parent d890bd6 commit 18a4c67

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

feign-reactor-core/src/main/java/reactivefeign/methodhandler/PublisherClientMethodHandler.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,8 +189,12 @@ private String queryLine(Map<String, Collection<String>> queries) {
189189
Collection<String> valuesEncoded = query.getValue().stream()
190190
.map(value -> UriUtils.encode(value, UTF_8))
191191
.collect(toList());
192-
queryBuilder.append('&');
193-
queryBuilder.append(collectionFormat.join(query.getKey(), valuesEncoded, UTF_8));
192+
193+
CharSequence queryString = collectionFormat.join(query.getKey(), valuesEncoded, UTF_8);
194+
if(queryString.length() > 0){
195+
queryBuilder.append('&');
196+
queryBuilder.append(queryString);
197+
}
194198
}
195199
if(queryBuilder.length() > 0) {
196200
queryBuilder.deleteCharAt(0);

feign-reactor-core/src/test/java/reactivefeign/allfeatures/AllFeaturesTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ public void shouldPassEmptyParameterInUrl() {
155155

156156
@Test
157157
public void shouldNotReturnNullPassedParametersNew() {
158-
Map<String, String> paramMap = new HashMap<String, String>() {
158+
Map<String, String> paramMap = new HashMap<>() {
159159
{
160160
put("paramKey", "paramValue");
161161
put("paramKeyNull", null);

feign-reactor-spring-configuration/src/main/java/reactivefeign/spring/config/ReactiveFeignAutoConfiguration.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public ReactiveFeignNamedContextFactory reactiveFeignContext() {
4141

4242
@Configuration
4343
@ConditionalOnClass(WebReactiveFeign.class)
44-
public class WebClientReactiveFeignClientPropertiesAutoConfiguration {
44+
public static class WebClientReactiveFeignClientPropertiesAutoConfiguration {
4545

4646
@Bean
4747
@ConditionalOnMissingBean
@@ -54,7 +54,7 @@ public ReactiveFeignClientsProperties<WebReactiveOptions.Builder> webClientReact
5454

5555
@Configuration
5656
@ConditionalOnClass(Java11ReactiveFeign.class)
57-
public class Java11ReactiveFeignClientPropertiesAutoConfiguration {
57+
public static class Java11ReactiveFeignClientPropertiesAutoConfiguration {
5858

5959
@Bean
6060
@ConditionalOnMissingBean
@@ -67,7 +67,7 @@ public ReactiveFeignClientsProperties<Java11ReactiveOptions.Builder> java11React
6767

6868
@Configuration
6969
@ConditionalOnClass(JettyReactiveFeign.class)
70-
public class JettyReactiveFeignClientPropertiesAutoConfiguration {
70+
public static class JettyReactiveFeignClientPropertiesAutoConfiguration {
7171

7272
@Bean
7373
@ConditionalOnMissingBean

0 commit comments

Comments
 (0)