[Improve] Optimize spring auto configuration registry (#2304)

Signed-off-by: yuluo-yx <[email protected]> Co-authored-by: tomsun28 <[email protected]>
apache · Jul 20, 2024 · 6421fef · 6421fef
1 parent 70af066
commit 6421fef
Show file tree

Hide file tree

Showing 13 changed files with 19 additions and 92 deletions.
diff --git a/alerter/src/main/java/org/apache/hertzbeat/alert/config/AlerterAutoConfiguration.java b/alerter/src/main/java/org/apache/hertzbeat/alert/config/AlerterAutoConfiguration.java
@@ -17,11 +17,14 @@
 
 package org.apache.hertzbeat.alert.config;
 
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.context.annotation.ComponentScan;
 
 /**
  * Alert auto configuration.
  */
+
+@AutoConfiguration
 @ComponentScan(basePackages = "org.apache.hertzbeat.alert")
 public class AlerterAutoConfiguration {
 }
diff --git a/alerter/src/main/resources/META-INF/spring.factories b/alerter/src/main/resources/META-INF/spring.factories
diff --git a/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-org.apache.hertzbeat.alert.config.AlerterAutoConfiguration
+org.apache.hertzbeat.alert.config.AlerterAutoConfiguration
diff --git a/...ector/src/main/java/org/apache/hertzbeat/collector/config/CollectorAutoConfiguration.java b/...ector/src/main/java/org/apache/hertzbeat/collector/config/CollectorAutoConfiguration.java
@@ -17,12 +17,15 @@
 
 package org.apache.hertzbeat.collector.config;
 
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.context.annotation.ComponentScan;
 
 /**
  * Collector Auto Configuration
  * @version 2.1
  */
+
+@AutoConfiguration
 @ComponentScan(basePackages = "org.apache.hertzbeat.collector")
 public class CollectorAutoConfiguration {
 }
diff --git a/collector/src/main/resources/META-INF/spring.factories b/collector/src/main/resources/META-INF/spring.factories
diff --git a/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-org.apache.hertzbeat.collector.config.CollectorAutoConfiguration
+org.apache.hertzbeat.collector.config.CollectorAutoConfiguration
diff --git a/common/src/main/java/org/apache/hertzbeat/common/config/CommonConfig.java b/common/src/main/java/org/apache/hertzbeat/common/config/CommonConfig.java
@@ -18,16 +18,17 @@
 package org.apache.hertzbeat.common.config;
 
 import org.apache.hertzbeat.common.util.AesUtil;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
 
 /**
  * common module config
  */
+
+@AutoConfiguration
 @ComponentScan(basePackages = "org.apache.hertzbeat.common")
 @EnableConfigurationProperties(CommonProperties.class)
-@Configuration
 public class CommonConfig {
 
     public CommonConfig(CommonProperties commonProperties) {

diff --git a/common/src/main/resources/META-INF/spring.factories b/common/src/main/resources/META-INF/spring.factories
diff --git a/push/src/main/java/org/apache/hertzbeat/push/config/PushAutoConfiguration.java b/push/src/main/java/org/apache/hertzbeat/push/config/PushAutoConfiguration.java
@@ -17,11 +17,14 @@
 
 package org.apache.hertzbeat.push.config;
 
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.context.annotation.ComponentScan;
 
 /**
  * push configuration
  */
+
+@AutoConfiguration
 @ComponentScan(basePackages = "org.apache.hertzbeat.push")
 public class PushAutoConfiguration {
 }
diff --git a/push/src/main/resources/META-INF/spring.factories b/push/src/main/resources/META-INF/spring.factories
diff --git a/...warehouse/WarehouseAutoConfiguration.java → ...se/config/WarehouseAutoConfiguration.java b/...warehouse/WarehouseAutoConfiguration.java → ...se/config/WarehouseAutoConfiguration.java
@@ -15,14 +15,17 @@
  * limitations under the License.
  */
 
-package org.apache.hertzbeat.warehouse;
+package org.apache.hertzbeat.warehouse.config;
 
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.context.annotation.ComponentScan;
 
 /**
  * WarehouseAutoConfiguration class
  * @version 2.1
  */
+
+@AutoConfiguration
 @ComponentScan(basePackages = "org.apache.hertzbeat.warehouse")
 public class WarehouseAutoConfiguration {
 }
diff --git a/warehouse/src/main/resources/META-INF/spring.factories b/warehouse/src/main/resources/META-INF/spring.factories
diff --git a/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-org.apache.hertzbeat.warehouse.WarehouseAutoConfiguration
+org.apache.hertzbeat.warehouse.config.WarehouseAutoConfiguration