From 421df91a8055d30aaa268d0fd8851894073b4510 Mon Sep 17 00:00:00 2001
From: Nick Smith <nsmith@dalet.com>
Date: Mon, 26 Apr 2021 18:28:12 +0100
Subject: [PATCH] Filters out null matrix parameters

---
 .../annotation/MatrixVariableParameterProcessor.java         | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/annotation/MatrixVariableParameterProcessor.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/annotation/MatrixVariableParameterProcessor.java
index 4f58dbed..f0ee2793 100644
--- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/annotation/MatrixVariableParameterProcessor.java
+++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/annotation/MatrixVariableParameterProcessor.java
@@ -75,9 +75,8 @@ public class MatrixVariableParameterProcessor implements AnnotatedParameterProce
 	private String expandMap(Object object) {
 		Map<String, Object> paramMap = (Map) object;
 
-		return paramMap.keySet().stream()
-				.map(key -> ";" + key + "=" + paramMap.get(key).toString())
-				.collect(Collectors.joining());
+		return paramMap.keySet().stream().filter(key -> paramMap.get(key) != null)
+				.map(key -> ";" + key + "=" + paramMap.get(key).toString()).collect(Collectors.joining());
 	}
 
 }