Skip to content

Commit 39c4cc5

Browse files
philwebbrstoyanchev
authored andcommitted
Apply HTTP Service group configurers in order
See gh-33992
1 parent 7c3618d commit 39c4cc5

File tree

1 file changed

+7
-12
lines changed

1 file changed

+7
-12
lines changed

spring-web/src/main/java/org/springframework/web/service/registry/HttpServiceProxyRegistryFactoryBean.java

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
package org.springframework.web.service.registry;
1818

1919
import java.util.Arrays;
20-
import java.util.Collection;
2120
import java.util.Collections;
2221
import java.util.LinkedHashMap;
2322
import java.util.List;
@@ -90,19 +89,15 @@ public void afterPropertiesSet() {
9089

9190
// Set client builders
9291
this.groupAdapters.forEach((clientType, groupAdapter) ->
93-
this.groupSet.stream()
94-
.filter(group -> group.clientType().equals(clientType))
95-
.forEach(group -> group.initialize(groupAdapter)));
92+
this.groupSet.stream()
93+
.filter(group -> group.clientType().equals(clientType))
94+
.forEach(group -> group.initialize(groupAdapter)));
9695

9796
// Apply group configurers
98-
this.groupAdapters.forEach((clientType, groupAdapter) -> {
99-
Collection<? extends HttpServiceGroupConfigurer<?>> configurers =
100-
this.applicationContext.getBeansOfType(groupAdapter.getConfigurerType()).values();
101-
102-
configurers.stream()
103-
.filter(configurer -> groupAdapter.getConfigurerType().isInstance(configurer))
104-
.forEach(configurer -> configurer.configureGroups(new DefaultGroups<>(clientType)));
105-
});
97+
this.groupAdapters.forEach((clientType, groupAdapter) ->
98+
this.applicationContext.getBeanProvider(groupAdapter.getConfigurerType())
99+
.orderedStream()
100+
.forEach(configurer -> configurer.configureGroups(new DefaultGroups<>(clientType))));
106101

107102
// Create proxies
108103
Map<String, Map<Class<?>, Object>> groupProxyMap = this.groupSet.stream()

0 commit comments

Comments
 (0)