This is an automated email from the ASF dual-hosted git repository. gongchao pushed a commit to branch remove-avaitor in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
commit 3e7dd361c6a9fb1197fed24924480f14db047db7 Author: tomsun28 <[email protected]> AuthorDate: Fri Apr 26 18:05:33 2024 +0800 remove avaitor Signed-off-by: tomsun28 <[email protected]> --- .../java/org/apache/hertzbeat/alert/calculate/CalculateAlarm.java | 5 ----- .../apache/hertzbeat/alert/service/impl/AlertDefineServiceImpl.java | 4 ++-- .../org/apache/hertzbeat/collector/dispatch/MetricsCollect.java | 2 -- common/pom.xml | 6 ------ 4 files changed, 2 insertions(+), 15 deletions(-) diff --git a/alerter/src/main/java/org/apache/hertzbeat/alert/calculate/CalculateAlarm.java b/alerter/src/main/java/org/apache/hertzbeat/alert/calculate/CalculateAlarm.java index 157c9f4ad..fb60f50f8 100644 --- a/alerter/src/main/java/org/apache/hertzbeat/alert/calculate/CalculateAlarm.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/calculate/CalculateAlarm.java @@ -26,11 +26,6 @@ import static org.apache.hertzbeat.common.constants.CommonConstants.TAG_METRICS; import static org.apache.hertzbeat.common.constants.CommonConstants.TAG_MONITOR_APP; import static org.apache.hertzbeat.common.constants.CommonConstants.TAG_MONITOR_ID; import static org.apache.hertzbeat.common.constants.CommonConstants.TAG_MONITOR_NAME; -import com.googlecode.aviator.AviatorEvaluator; -import com.googlecode.aviator.Expression; -import com.googlecode.aviator.exception.CompileExpressionErrorException; -import com.googlecode.aviator.exception.ExpressionRuntimeException; -import com.googlecode.aviator.exception.ExpressionSyntaxErrorException; import jakarta.persistence.criteria.Predicate; import java.util.ArrayList; import java.util.HashMap; diff --git a/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineServiceImpl.java b/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineServiceImpl.java index b66ef9841..21d07b2e1 100644 --- a/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineServiceImpl.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineServiceImpl.java @@ -17,7 +17,6 @@ package org.apache.hertzbeat.alert.service.impl; -import com.googlecode.aviator.AviatorEvaluator; import jakarta.servlet.http.HttpServletResponse; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; @@ -35,6 +34,7 @@ import org.apache.hertzbeat.alert.service.AlertDefineImExportService; import org.apache.hertzbeat.alert.service.AlertDefineService; import org.apache.hertzbeat.common.entity.alerter.AlertDefine; import org.apache.hertzbeat.common.entity.alerter.AlertDefineMonitorBind; +import org.apache.hertzbeat.common.util.JexlExpressionRunner; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; @@ -70,7 +70,7 @@ public class AlertDefineServiceImpl implements AlertDefineService { // todo if (StringUtils.hasText(alertDefine.getExpr())) { try { - AviatorEvaluator.compile(alertDefine.getExpr(), false); + JexlExpressionRunner.compile(alertDefine.getExpr()); } catch (Exception e) { throw new IllegalArgumentException("alert expr error: " + e.getMessage()); } diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/MetricsCollect.java b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/MetricsCollect.java index 22ac738a4..52d265fa8 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/MetricsCollect.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/dispatch/MetricsCollect.java @@ -17,8 +17,6 @@ package org.apache.hertzbeat.collector.dispatch; -import com.googlecode.aviator.AviatorEvaluator; -import com.googlecode.aviator.Expression; import java.util.Collections; import java.util.HashMap; import java.util.LinkedList; diff --git a/common/pom.xml b/common/pom.xml index dc2d1b5db..622083fe5 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -78,12 +78,6 @@ <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId> <scope>provided</scope> </dependency> - <!-- Expression evaluation --> - <dependency> - <groupId>com.googlecode.aviator</groupId> - <artifactId>aviator</artifactId> - <version>5.4.1</version> - </dependency> <!-- Tool dependencies --> <dependency> <groupId>com.google.guava</groupId> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
