Skip to content

Commit 006e4a7

Browse files
committed
Migrate ConfigController to Spring Boot 3
spring-projects/spring-framework#22154
1 parent 7b213a3 commit 006e4a7

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

shenyu-admin/src/main/java/org/apache/shenyu/admin/config/DataSyncConfiguration.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,6 @@ static class HttpLongPollingListener {
9191
public HttpLongPollingDataChangedListener httpLongPollingDataChangedListener(final HttpSyncProperties httpSyncProperties) {
9292
return new HttpLongPollingDataChangedListener(httpSyncProperties);
9393
}
94-
95-
@Bean
96-
@ConditionalOnMissingBean(ConfigController.class)
97-
public ConfigController configController(final HttpLongPollingDataChangedListener httpLongPollingDataChangedListener) {
98-
return new ConfigController(httpLongPollingDataChangedListener);
99-
}
10094
}
10195

10296
/**

shenyu-admin/src/main/java/org/apache/shenyu/admin/controller/ConfigController.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
import org.apache.shenyu.admin.utils.ShenyuResultMessage;
2424
import org.apache.shenyu.common.dto.ConfigData;
2525
import org.apache.shenyu.common.enums.ConfigGroupEnum;
26+
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
27+
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2628
import org.springframework.web.bind.annotation.ResponseBody;
2729
import org.springframework.web.bind.annotation.RequestMapping;
2830
import org.springframework.web.bind.annotation.GetMapping;
@@ -31,13 +33,16 @@
3133
import jakarta.servlet.http.HttpServletRequest;
3234
import jakarta.servlet.http.HttpServletResponse;
3335
import jakarta.validation.constraints.NotNull;
36+
import org.springframework.web.bind.annotation.RestController;
37+
3438
import java.util.Map;
3539

3640
/**
3741
* This Controller only when HttpLongPollingDataChangedListener exist, will take effect.
3842
*/
39-
@ResponseBody
43+
@RestController
4044
@RequestMapping("/configs")
45+
@ConditionalOnBean(HttpLongPollingDataChangedListener.class)
4146
public class ConfigController {
4247

4348
private final HttpLongPollingDataChangedListener longPollingListener;

0 commit comments

Comments
 (0)