Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make container annotation for ImportHttpServices nested

Browse Source 
See gh-33992
This commit is contained in:
rstoyanchev
2025-03-31 18:29:14 +01:00
parent a122dda596
commit 10e32c92e6
6 changed files with 35 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spring-web/src/test/java/org/springframework/web/service/registry/AnnotationHttpServiceRegistrarTests.java
View File

@@ -63,8 +63,8 @@ public class AnnotationHttpServiceRegistrarTests {
}
@Test
void containerWithClientType() {
doRegister(ContainerConfig.class);
void clientType() {
doRegister(ClientTypeConfig.class);
assertGroups(
StubGroup.ofListing(ECHO_GROUP, ClientType.WEB_CLIENT, EchoA.class),
StubGroup.ofListing(GREETING_GROUP, ClientType.WEB_CLIENT, GreetingA.class));
@@ -97,19 +97,17 @@ public class AnnotationHttpServiceRegistrarTests {
private static class ScanConfig {
}
@ImportHttpServiceGroups(clientType = ClientType.WEB_CLIENT, groups = {
@ImportHttpServices(group = ECHO_GROUP, types = {EchoA.class}),
@ImportHttpServices(group = GREETING_GROUP, types = {GreetingA.class})
})
private static class ContainerConfig {
@ImportHttpServices(clientType = ClientType.WEB_CLIENT, group = ECHO_GROUP, types = {EchoA.class})
@ImportHttpServices(clientType = ClientType.WEB_CLIENT, group = GREETING_GROUP, types = {GreetingA.class})
private static class ClientTypeConfig {
}
private static class TestAnnotationHttpServiceRegistrar extends AnnotationHttpServiceRegistrar {
@Override
public void registerHttpServices(GroupRegistry registry, AnnotationMetadata importMetadata) {
super.registerHttpServices(registry, importMetadata);
public void registerHttpServices(GroupRegistry registry, AnnotationMetadata metadata) {
super.registerHttpServices(registry, metadata);
}
}