Skip to content

Remove binding properties of evicted channels sent with a binder name #3306

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kdelay wants to merge 1 commit into from
Closed

Remove binding properties of evicted channels sent with a binder name #3306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions ...tion-tests/src/test/java/org/springframework/cloud/stream/function/StreamBridgeTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -944,6 +944,25 @@ void dynamicDestinationWithBinderNameDestroyForCacheSize() {
}
}

@Test
void bindingsWithBinderNameAreRemovedWithCache() {
try (ConfigurableApplicationContext context = new SpringApplicationBuilder(TestChannelBinderConfiguration
.getCompleteConfiguration(InterceptorConfiguration.class))
.web(WebApplicationType.NONE).run(
"--spring.jmx.enabled=false",
"--spring.cloud.stream.dynamic-destination-cache-size=1",
"--spring.cloud.stream.binders.kafka1.type=kafka"
)) {
StreamBridge bridge = context.getBean(StreamBridge.class);
bridge.send("binding1", "kafka1", "hello");
bridge.send("binding2", "kafka1", "hello");
bridge.send("binding3", "kafka1", "hello");

BindingServiceProperties bindingServiceProp = context.getBean(BindingServiceProperties.class);
assertThat(bindingServiceProp.getBindings()).containsOnlyKeys("binding3");
}
}

@Test
void withIntegrationFlowBecauseMarcinSaidSo() {
try (ConfigurableApplicationContext context = new SpringApplicationBuilder(TestChannelBinderConfiguration
Expand Down
7 changes: 5 additions & 2 deletions ...ng-cloud-stream/src/main/java/org/springframework/cloud/stream/function/StreamBridge.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,11 @@ protected boolean removeEldestEntry(Map.Entry<String, MessageChannel> eldest) {
if (logger.isDebugEnabled()) {
logger.debug("Removing message channel from cache " + eldest.getKey());
}
if (!configuredBindingNames.contains(eldest.getKey())) {
bindingServiceProperties.getBindings().remove(eldest.getKey());
// The cache key is prefixed with the binder name when one is used, while the
// binding properties are keyed by the binding name the channel was created for.
String bindingName = ((AbstractMessageChannel) eldest.getValue()).getComponentName();
if (!configuredBindingNames.contains(bindingName)) {
bindingServiceProperties.getBindings().remove(bindingName);
}
bindingService.unbindProducers(eldest.getKey());
}
Expand Down
Loading