Ensure bindings are removed from BindingServiceProperties

Author: olegz

core/spring-cloud-stream-integration-tests/src/test/java/org/springframework/cloud/stream/function/StreamBridgeTests.java

@@ -575,6 +575,9 @@ void bindingsAreRemovedWithCache() {
 			BindingService bindingService = context.getBean(BindingService.class);
 			assertThat(bindingService.getProducerBindingNames().length).isEqualTo(1);
 			assertThat(bindingService.getProducerBindingNames()[0]).isEqualTo("d");
+			BindingServiceProperties bindingServiceProp = context.getBean(BindingServiceProperties.class);
+			assertThat(bindingServiceProp.getBindings().size()).isEqualTo(1);
+			assertThat(bindingServiceProp.getBindings().keySet().iterator().next()).isEqualTo("d");
 		}
 	}
 

core/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/function/StreamBridge.java

@@ -155,6 +155,7 @@ protected boolean removeEldestEntry(Map.Entry<String, MessageChannel> eldest) {
 					if (logger.isDebugEnabled()) {
 						logger.debug("Removing message channel from cache " + eldest.getKey());
 					}
+					bindingServiceProperties.getBindings().remove(eldest.getKey());
 					bindingService.unbindProducers(eldest.getKey());
 				}
 				return remove;