#44 import WebProperties

hank-cp · Nov 21, 2023 · f569e5a · f569e5a
1 parent 4ddd735
commit f569e5a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -7,7 +7,8 @@ http_port=8080
 
 sbpVersion=22
 
-springBootVersion=3.1.1
+springBootVersion=3.1.4
+#springBootVersion=3.1.1
 lombokVersion=1.18.26
 pf4jVersion=3.8.0
 jooqVersion=3.17.7

diff --git a/sbp-core/src/main/java/org/laxture/sbp/spring/boot/SpringBootstrap.java b/sbp-core/src/main/java/org/laxture/sbp/spring/boot/SpringBootstrap.java
@@ -467,7 +467,7 @@ protected boolean importBean(GenericApplicationContext sourceApplicationContext,
                                  Class<?> beanClass) {
         try {
             Map<String, ?> beans = sourceApplicationContext.getBeansOfType(beanClass);
-            if (beans.size() == 0) {
+            if (beans.isEmpty()) {
                 return false;
             }
             for (String beanName : beans.keySet()) {

diff --git a/...t-starter/src/main/java/org/laxture/sbp/spring/boot/SbpWebFluxPatchAutoConfiguration.java b/...t-starter/src/main/java/org/laxture/sbp/spring/boot/SbpWebFluxPatchAutoConfiguration.java
@@ -23,9 +23,12 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
+import org.springframework.boot.autoconfigure.web.WebProperties;
 import org.springframework.boot.autoconfigure.web.reactive.PluginWebFluxResourceHandlerRegistrationCustomizer;
 import org.springframework.boot.autoconfigure.web.reactive.WebFluxAutoConfiguration;
+import org.springframework.boot.autoconfigure.web.reactive.WebFluxProperties;
 import org.springframework.boot.autoconfigure.web.reactive.WebFluxRegistrations;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.reactive.result.method.annotation.RequestMappingHandlerMapping;
@@ -40,6 +43,7 @@
 @ConditionalOnProperty(prefix = SbpProperties.PREFIX, value = {"enabled"}, havingValue = "true")
 @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE)
 @AutoConfigureBefore({ WebFluxAutoConfiguration.class })
+@EnableConfigurationProperties({WebProperties.class, WebFluxProperties.class})
 public class SbpWebFluxPatchAutoConfiguration {
 
 	@Bean

diff --git a/...ot-starter/src/main/java/org/laxture/sbp/spring/boot/SbpWebMvcPatchAutoConfiguration.java b/...ot-starter/src/main/java/org/laxture/sbp/spring/boot/SbpWebMvcPatchAutoConfiguration.java
@@ -23,9 +23,11 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
+import org.springframework.boot.autoconfigure.web.WebProperties;
 import org.springframework.boot.autoconfigure.web.reactive.WebFluxRegistrations;
 import org.springframework.boot.autoconfigure.web.servlet.PluginResourceHandlerRegistrationCustomizer;
 import org.springframework.boot.autoconfigure.web.servlet.WebMvcRegistrations;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
@@ -42,7 +44,7 @@
 @ConditionalOnClass({ PluginManager.class, SpringBootPluginManager.class })
 @ConditionalOnProperty(prefix = SbpProperties.PREFIX, value = "enabled", havingValue = "true")
 @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
-
+@EnableConfigurationProperties(WebProperties.class)
 public class SbpWebMvcPatchAutoConfiguration {
 
 	@Bean