From 08df2218d70457ad27b4df92a339ebbcd3753f67 Mon Sep 17 00:00:00 2001 From: Wu Sheng Date: Mon, 20 Aug 2018 15:45:49 +0800 Subject: [PATCH] Rename match expression classes. --- .../analysis/generated/endpoint/EndpointDispatcher.java | 3 ++- .../server/core/analysis/indicator/PercentIndicator.java | 4 ++-- .../indicator/expression/BinaryMatchExpression.java | 6 ++++-- .../expression/{BooleanBinaryMatch.java => EqualMatch.java} | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/expression/{BooleanBinaryMatch.java => EqualMatch.java} (93%) diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointDispatcher.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointDispatcher.java index 73436254f..565e65dd9 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointDispatcher.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointDispatcher.java @@ -19,6 +19,7 @@ package org.apache.skywalking.oap.server.core.analysis.generated.endpoint; import org.apache.skywalking.oap.server.core.analysis.SourceDispatcher; +import org.apache.skywalking.oap.server.core.analysis.indicator.expression.EqualMatch; import org.apache.skywalking.oap.server.core.analysis.worker.IndicatorProcess; import org.apache.skywalking.oap.server.core.source.Endpoint; @@ -52,7 +53,7 @@ public class EndpointDispatcher implements SourceDispatcher { indicator.setId(source.getId()); indicator.setServiceId(source.getServiceId()); indicator.setServiceInstanceId(source.getServiceInstanceId()); - indicator.combine(new org.apache.skywalking.oap.server.core.analysis.indicator.expression.BooleanBinaryMatch(), source.isStatus(), true); + indicator.combine(new EqualMatch(), source.isStatus(), true); IndicatorProcess.INSTANCE.in(indicator); } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/PercentIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/PercentIndicator.java index b5b4551bd..113551219 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/PercentIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/PercentIndicator.java @@ -20,7 +20,7 @@ package org.apache.skywalking.oap.server.core.analysis.indicator; import lombok.*; import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.*; -import org.apache.skywalking.oap.server.core.analysis.indicator.expression.BooleanBinaryMatch; +import org.apache.skywalking.oap.server.core.analysis.indicator.expression.EqualMatch; import org.apache.skywalking.oap.server.core.storage.annotation.Column; /** @@ -37,7 +37,7 @@ public abstract class PercentIndicator extends Indicator { @Getter @Setter @Column(columnName = MATCH) private long match; @Entrance - public final void combine(@Expression BooleanBinaryMatch expression, @ExpressionArg0 Object leftValue, + public final void combine(@Expression EqualMatch expression, @ExpressionArg0 Object leftValue, @ExpressionArg1 Object rightValue) { expression.setLeft(leftValue); expression.setRight(rightValue); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/expression/BinaryMatchExpression.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/expression/BinaryMatchExpression.java index ef8cc809d..8fd5dbc02 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/expression/BinaryMatchExpression.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/expression/BinaryMatchExpression.java @@ -28,12 +28,14 @@ public abstract class BinaryMatchExpression { protected Object left; protected Object right; - public void setLeft(Object left) { + public BinaryMatchExpression setLeft(Object left) { this.left = left; + return this; } - public void setRight(Object right) { + public BinaryMatchExpression setRight(Object right) { this.right = right; + return this; } public abstract boolean match(); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/expression/BooleanBinaryMatch.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/expression/EqualMatch.java similarity index 93% rename from oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/expression/BooleanBinaryMatch.java rename to oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/expression/EqualMatch.java index dc55b83d3..d1c8aa9c8 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/expression/BooleanBinaryMatch.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/expression/EqualMatch.java @@ -22,7 +22,7 @@ package org.apache.skywalking.oap.server.core.analysis.indicator.expression; * * @author wusheng */ -public class BooleanBinaryMatch extends BinaryMatchExpression { +public class EqualMatch extends BinaryMatchExpression { @Override public boolean match() { return left == right; }