[common] optimize common aviator configuration (#327)

apache · Oct 6, 2022 · b3ab203 · b3ab203
1 parent 389b4a8
commit b3ab203
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 14 deletions.
diff --git a/alerter/pom.xml b/alerter/pom.xml
@@ -95,12 +95,6 @@
             <artifactId>springdoc-openapi-ui</artifactId>
             <scope>provided</scope>
         </dependency>
-        <!-- 表达式计算 -->
-        <dependency>
-            <groupId>com.googlecode.aviator</groupId>
-            <artifactId>aviator</artifactId>
-            <version>5.2.7</version>
-        </dependency>
         <!-- feign -->
         <dependency>
             <groupId>org.springframework.cloud</groupId>

diff --git a/alerter/src/main/resources/META-INF/spring.factories b/alerter/src/main/resources/META-INF/spring.factories
@@ -19,7 +19,6 @@ com.usthe.alert.service.impl.AlertServiceImpl,\
 com.usthe.alert.controller.AlertDefineController,\
 com.usthe.alert.AlerterWorkerPool,\
 com.usthe.alert.AlerterProperties,\
-com.usthe.alert.AlerterConfiguration,\
 com.usthe.alert.calculate.CalculateAlarm,\
 com.usthe.alert.controller.AlertsController,\
 com.usthe.alert.controller.AlertDefinesController
diff --git a/collector/pom.xml b/collector/pom.xml
@@ -96,11 +96,6 @@
             <artifactId>gson</artifactId>
             <version>2.8.8</version>
         </dependency>
-        <dependency>
-            <groupId>com.googlecode.aviator</groupId>
-            <artifactId>aviator</artifactId>
-            <version>5.2.7</version>
-        </dependency>
         <!--collect-->
         <!-- mysql -->
         <dependency>

diff --git a/common/pom.xml b/common/pom.xml
@@ -75,6 +75,12 @@
             <version>0.5.11</version>
             <scope>provided</scope>
         </dependency>
+        <!-- 表达式计算 -->
+        <dependency>
+            <groupId>com.googlecode.aviator</groupId>
+            <artifactId>aviator</artifactId>
+            <version>5.2.7</version>
+        </dependency>
         <!-- 工具依赖  -->
         <dependency>
             <groupId>com.google.guava</groupId>

diff --git a/...com/usthe/alert/AlerterConfiguration.java → ...e/common/config/AviatorConfiguration.java b/...com/usthe/alert/AlerterConfiguration.java → ...e/common/config/AviatorConfiguration.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.usthe.alert;
+package com.usthe.common.config;
 
 import com.googlecode.aviator.AviatorEvaluator;
 import com.googlecode.aviator.lexer.token.OperatorType;
@@ -33,7 +33,7 @@
  */
 @Configuration
 @Slf4j
-public class AlerterConfiguration {
+public class AviatorConfiguration {
 
     private static final int AVIATOR_LRU_CACHE_SIZE = 1024;
 

diff --git a/common/src/main/resources/META-INF/spring.factories b/common/src/main/resources/META-INF/spring.factories
@@ -17,5 +17,6 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
 com.usthe.common.config.CommonProperties,\
 com.usthe.common.config.CommonConfig,\
+com.usthe.common.config.AviatorConfiguration,\
 com.usthe.common.queue.impl.InMemoryCommonDataQueue,\
 com.usthe.common.support.SpringContextHolder