diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllDispatcher.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllDispatcher.java index be176f18b..2e3dabb85 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllDispatcher.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllDispatcher.java @@ -20,7 +20,7 @@ package org.apache.skywalking.oap.server.core.analysis.generated.all; import org.apache.skywalking.oap.server.core.analysis.SourceDispatcher; import org.apache.skywalking.oap.server.core.analysis.worker.IndicatorProcess; -import org.apache.skywalking.oap.server.core.source.All; +import org.apache.skywalking.oap.server.core.source.*; /** * This class is auto generated. Please don't change this class manually. diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllHeatmapIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllHeatmapIndicator.java index 596e90bb5..fc0947b0a 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllHeatmapIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllHeatmapIndicator.java @@ -19,14 +19,15 @@ package org.apache.skywalking.oap.server.core.analysis.generated.all; import java.util.*; -import org.apache.skywalking.oap.server.core.alarm.*; +import org.apache.skywalking.oap.server.core.alarm.AlarmMeta; +import org.apache.skywalking.oap.server.core.alarm.AlarmSupported; import org.apache.skywalking.oap.server.core.analysis.indicator.*; import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.IndicatorType; import org.apache.skywalking.oap.server.core.remote.annotation.StreamData; import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData; -import org.apache.skywalking.oap.server.core.source.Scope; +import org.apache.skywalking.oap.server.core.storage.annotation.*; import org.apache.skywalking.oap.server.core.storage.StorageBuilder; -import org.apache.skywalking.oap.server.core.storage.annotation.StorageEntity; +import org.apache.skywalking.oap.server.core.source.Scope; /** * This class is auto generated. Please don't change this class manually. diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllP50Indicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllP50Indicator.java index 8981e0c15..0220536e1 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllP50Indicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllP50Indicator.java @@ -19,14 +19,15 @@ package org.apache.skywalking.oap.server.core.analysis.generated.all; import java.util.*; -import org.apache.skywalking.oap.server.core.alarm.*; +import org.apache.skywalking.oap.server.core.alarm.AlarmMeta; +import org.apache.skywalking.oap.server.core.alarm.AlarmSupported; import org.apache.skywalking.oap.server.core.analysis.indicator.*; import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.IndicatorType; import org.apache.skywalking.oap.server.core.remote.annotation.StreamData; import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData; -import org.apache.skywalking.oap.server.core.source.Scope; +import org.apache.skywalking.oap.server.core.storage.annotation.*; import org.apache.skywalking.oap.server.core.storage.StorageBuilder; -import org.apache.skywalking.oap.server.core.storage.annotation.StorageEntity; +import org.apache.skywalking.oap.server.core.source.Scope; /** * This class is auto generated. Please don't change this class manually. diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllP75Indicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllP75Indicator.java index 8c897795b..09fc0687e 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllP75Indicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllP75Indicator.java @@ -19,14 +19,15 @@ package org.apache.skywalking.oap.server.core.analysis.generated.all; import java.util.*; -import org.apache.skywalking.oap.server.core.alarm.*; +import org.apache.skywalking.oap.server.core.alarm.AlarmMeta; +import org.apache.skywalking.oap.server.core.alarm.AlarmSupported; import org.apache.skywalking.oap.server.core.analysis.indicator.*; import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.IndicatorType; import org.apache.skywalking.oap.server.core.remote.annotation.StreamData; import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData; -import org.apache.skywalking.oap.server.core.source.Scope; +import org.apache.skywalking.oap.server.core.storage.annotation.*; import org.apache.skywalking.oap.server.core.storage.StorageBuilder; -import org.apache.skywalking.oap.server.core.storage.annotation.StorageEntity; +import org.apache.skywalking.oap.server.core.source.Scope; /** * This class is auto generated. Please don't change this class manually. diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllP90Indicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllP90Indicator.java index 86f2c02aa..12f39edc3 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllP90Indicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllP90Indicator.java @@ -19,14 +19,15 @@ package org.apache.skywalking.oap.server.core.analysis.generated.all; import java.util.*; -import org.apache.skywalking.oap.server.core.alarm.*; +import org.apache.skywalking.oap.server.core.alarm.AlarmMeta; +import org.apache.skywalking.oap.server.core.alarm.AlarmSupported; import org.apache.skywalking.oap.server.core.analysis.indicator.*; import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.IndicatorType; import org.apache.skywalking.oap.server.core.remote.annotation.StreamData; import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData; -import org.apache.skywalking.oap.server.core.source.Scope; +import org.apache.skywalking.oap.server.core.storage.annotation.*; import org.apache.skywalking.oap.server.core.storage.StorageBuilder; -import org.apache.skywalking.oap.server.core.storage.annotation.StorageEntity; +import org.apache.skywalking.oap.server.core.source.Scope; /** * This class is auto generated. Please don't change this class manually. diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllP95Indicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllP95Indicator.java index 4a77b2854..64f3734fa 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllP95Indicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllP95Indicator.java @@ -19,14 +19,15 @@ package org.apache.skywalking.oap.server.core.analysis.generated.all; import java.util.*; -import org.apache.skywalking.oap.server.core.alarm.*; +import org.apache.skywalking.oap.server.core.alarm.AlarmMeta; +import org.apache.skywalking.oap.server.core.alarm.AlarmSupported; import org.apache.skywalking.oap.server.core.analysis.indicator.*; import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.IndicatorType; import org.apache.skywalking.oap.server.core.remote.annotation.StreamData; import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData; -import org.apache.skywalking.oap.server.core.source.Scope; +import org.apache.skywalking.oap.server.core.storage.annotation.*; import org.apache.skywalking.oap.server.core.storage.StorageBuilder; -import org.apache.skywalking.oap.server.core.storage.annotation.StorageEntity; +import org.apache.skywalking.oap.server.core.source.Scope; /** * This class is auto generated. Please don't change this class manually. diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllP99Indicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllP99Indicator.java index b069175d5..f9054a3d1 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllP99Indicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllP99Indicator.java @@ -19,14 +19,15 @@ package org.apache.skywalking.oap.server.core.analysis.generated.all; import java.util.*; -import org.apache.skywalking.oap.server.core.alarm.*; +import org.apache.skywalking.oap.server.core.alarm.AlarmMeta; +import org.apache.skywalking.oap.server.core.alarm.AlarmSupported; import org.apache.skywalking.oap.server.core.analysis.indicator.*; import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.IndicatorType; import org.apache.skywalking.oap.server.core.remote.annotation.StreamData; import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData; -import org.apache.skywalking.oap.server.core.source.Scope; +import org.apache.skywalking.oap.server.core.storage.annotation.*; import org.apache.skywalking.oap.server.core.storage.StorageBuilder; -import org.apache.skywalking.oap.server.core.storage.annotation.StorageEntity; +import org.apache.skywalking.oap.server.core.source.Scope; /** * This class is auto generated. Please don't change this class manually. diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointAvgIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointAvgIndicator.java index 8c43abbe7..41b270c91 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointAvgIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointAvgIndicator.java @@ -21,14 +21,15 @@ package org.apache.skywalking.oap.server.core.analysis.generated.endpoint; import java.util.*; import lombok.*; import org.apache.skywalking.oap.server.core.Const; -import org.apache.skywalking.oap.server.core.alarm.*; +import org.apache.skywalking.oap.server.core.alarm.AlarmMeta; +import org.apache.skywalking.oap.server.core.alarm.AlarmSupported; import org.apache.skywalking.oap.server.core.analysis.indicator.*; import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.IndicatorType; import org.apache.skywalking.oap.server.core.remote.annotation.StreamData; import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData; -import org.apache.skywalking.oap.server.core.source.Scope; -import org.apache.skywalking.oap.server.core.storage.StorageBuilder; import org.apache.skywalking.oap.server.core.storage.annotation.*; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.source.Scope; /** * This class is auto generated. Please don't change this class manually. @@ -40,7 +41,7 @@ import org.apache.skywalking.oap.server.core.storage.annotation.*; @StorageEntity(name = "endpoint_avg", builder = EndpointAvgIndicator.Builder.class) public class EndpointAvgIndicator extends LongAvgIndicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Setter @Getter @Column(columnName = "service_id") private int serviceId; @Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId; @@ -73,7 +74,7 @@ public class EndpointAvgIndicator extends LongAvgIndicator implements AlarmSuppo return false; EndpointAvgIndicator indicator = (EndpointAvgIndicator)obj; - if (entityId != indicator.entityId) + if (!entityId.equals(indicator.entityId)) return false; if (getTimeBucket() != indicator.getTimeBucket()) diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointCpmIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointCpmIndicator.java index add7f73d3..ffbd64fe0 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointCpmIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointCpmIndicator.java @@ -21,14 +21,15 @@ package org.apache.skywalking.oap.server.core.analysis.generated.endpoint; import java.util.*; import lombok.*; import org.apache.skywalking.oap.server.core.Const; -import org.apache.skywalking.oap.server.core.alarm.*; +import org.apache.skywalking.oap.server.core.alarm.AlarmMeta; +import org.apache.skywalking.oap.server.core.alarm.AlarmSupported; import org.apache.skywalking.oap.server.core.analysis.indicator.*; import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.IndicatorType; import org.apache.skywalking.oap.server.core.remote.annotation.StreamData; import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData; -import org.apache.skywalking.oap.server.core.source.Scope; -import org.apache.skywalking.oap.server.core.storage.StorageBuilder; import org.apache.skywalking.oap.server.core.storage.annotation.*; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.source.Scope; /** * This class is auto generated. Please don't change this class manually. @@ -40,7 +41,7 @@ import org.apache.skywalking.oap.server.core.storage.annotation.*; @StorageEntity(name = "endpoint_cpm", builder = EndpointCpmIndicator.Builder.class) public class EndpointCpmIndicator extends CPMIndicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Setter @Getter @Column(columnName = "service_id") private int serviceId; @Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId; @@ -73,7 +74,7 @@ public class EndpointCpmIndicator extends CPMIndicator implements AlarmSupported return false; EndpointCpmIndicator indicator = (EndpointCpmIndicator)obj; - if (entityId != indicator.entityId) + if (!entityId.equals(indicator.entityId)) return false; if (getTimeBucket() != indicator.getTimeBucket()) 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 7a84e0a16..1b4f62185 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 @@ -20,7 +20,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.worker.IndicatorProcess; -import org.apache.skywalking.oap.server.core.source.Endpoint; +import org.apache.skywalking.oap.server.core.source.*; /** * This class is auto generated. Please don't change this class manually. diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP50Indicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP50Indicator.java index 52abc4481..1a44a7e0e 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP50Indicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP50Indicator.java @@ -21,14 +21,15 @@ package org.apache.skywalking.oap.server.core.analysis.generated.endpoint; import java.util.*; import lombok.*; import org.apache.skywalking.oap.server.core.Const; -import org.apache.skywalking.oap.server.core.alarm.*; +import org.apache.skywalking.oap.server.core.alarm.AlarmMeta; +import org.apache.skywalking.oap.server.core.alarm.AlarmSupported; import org.apache.skywalking.oap.server.core.analysis.indicator.*; import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.IndicatorType; import org.apache.skywalking.oap.server.core.remote.annotation.StreamData; import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData; -import org.apache.skywalking.oap.server.core.source.Scope; -import org.apache.skywalking.oap.server.core.storage.StorageBuilder; import org.apache.skywalking.oap.server.core.storage.annotation.*; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.source.Scope; /** * This class is auto generated. Please don't change this class manually. @@ -40,7 +41,7 @@ import org.apache.skywalking.oap.server.core.storage.annotation.*; @StorageEntity(name = "endpoint_p50", builder = EndpointP50Indicator.Builder.class) public class EndpointP50Indicator extends P50Indicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Setter @Getter @Column(columnName = "service_id") private int serviceId; @Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId; @@ -73,7 +74,7 @@ public class EndpointP50Indicator extends P50Indicator implements AlarmSupported return false; EndpointP50Indicator indicator = (EndpointP50Indicator)obj; - if (entityId != indicator.entityId) + if (!entityId.equals(indicator.entityId)) return false; if (getTimeBucket() != indicator.getTimeBucket()) diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP75Indicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP75Indicator.java index 9f2d02677..87db4af7c 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP75Indicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP75Indicator.java @@ -21,14 +21,15 @@ package org.apache.skywalking.oap.server.core.analysis.generated.endpoint; import java.util.*; import lombok.*; import org.apache.skywalking.oap.server.core.Const; -import org.apache.skywalking.oap.server.core.alarm.*; +import org.apache.skywalking.oap.server.core.alarm.AlarmMeta; +import org.apache.skywalking.oap.server.core.alarm.AlarmSupported; import org.apache.skywalking.oap.server.core.analysis.indicator.*; import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.IndicatorType; import org.apache.skywalking.oap.server.core.remote.annotation.StreamData; import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData; -import org.apache.skywalking.oap.server.core.source.Scope; -import org.apache.skywalking.oap.server.core.storage.StorageBuilder; import org.apache.skywalking.oap.server.core.storage.annotation.*; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.source.Scope; /** * This class is auto generated. Please don't change this class manually. @@ -40,7 +41,7 @@ import org.apache.skywalking.oap.server.core.storage.annotation.*; @StorageEntity(name = "endpoint_p75", builder = EndpointP75Indicator.Builder.class) public class EndpointP75Indicator extends P75Indicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Setter @Getter @Column(columnName = "service_id") private int serviceId; @Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId; @@ -73,7 +74,7 @@ public class EndpointP75Indicator extends P75Indicator implements AlarmSupported return false; EndpointP75Indicator indicator = (EndpointP75Indicator)obj; - if (entityId != indicator.entityId) + if (!entityId.equals(indicator.entityId)) return false; if (getTimeBucket() != indicator.getTimeBucket()) diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP90Indicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP90Indicator.java index 5d1620b64..cf65588e3 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP90Indicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP90Indicator.java @@ -21,14 +21,15 @@ package org.apache.skywalking.oap.server.core.analysis.generated.endpoint; import java.util.*; import lombok.*; import org.apache.skywalking.oap.server.core.Const; -import org.apache.skywalking.oap.server.core.alarm.*; +import org.apache.skywalking.oap.server.core.alarm.AlarmMeta; +import org.apache.skywalking.oap.server.core.alarm.AlarmSupported; import org.apache.skywalking.oap.server.core.analysis.indicator.*; import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.IndicatorType; import org.apache.skywalking.oap.server.core.remote.annotation.StreamData; import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData; -import org.apache.skywalking.oap.server.core.source.Scope; -import org.apache.skywalking.oap.server.core.storage.StorageBuilder; import org.apache.skywalking.oap.server.core.storage.annotation.*; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.source.Scope; /** * This class is auto generated. Please don't change this class manually. @@ -40,7 +41,7 @@ import org.apache.skywalking.oap.server.core.storage.annotation.*; @StorageEntity(name = "endpoint_p90", builder = EndpointP90Indicator.Builder.class) public class EndpointP90Indicator extends P90Indicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Setter @Getter @Column(columnName = "service_id") private int serviceId; @Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId; @@ -73,7 +74,7 @@ public class EndpointP90Indicator extends P90Indicator implements AlarmSupported return false; EndpointP90Indicator indicator = (EndpointP90Indicator)obj; - if (entityId != indicator.entityId) + if (!entityId.equals(indicator.entityId)) return false; if (getTimeBucket() != indicator.getTimeBucket()) diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP95Indicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP95Indicator.java index 3c4fc1a9b..cf76238d7 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP95Indicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP95Indicator.java @@ -21,14 +21,15 @@ package org.apache.skywalking.oap.server.core.analysis.generated.endpoint; import java.util.*; import lombok.*; import org.apache.skywalking.oap.server.core.Const; -import org.apache.skywalking.oap.server.core.alarm.*; +import org.apache.skywalking.oap.server.core.alarm.AlarmMeta; +import org.apache.skywalking.oap.server.core.alarm.AlarmSupported; import org.apache.skywalking.oap.server.core.analysis.indicator.*; import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.IndicatorType; import org.apache.skywalking.oap.server.core.remote.annotation.StreamData; import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData; -import org.apache.skywalking.oap.server.core.source.Scope; -import org.apache.skywalking.oap.server.core.storage.StorageBuilder; import org.apache.skywalking.oap.server.core.storage.annotation.*; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.source.Scope; /** * This class is auto generated. Please don't change this class manually. @@ -40,7 +41,7 @@ import org.apache.skywalking.oap.server.core.storage.annotation.*; @StorageEntity(name = "endpoint_p95", builder = EndpointP95Indicator.Builder.class) public class EndpointP95Indicator extends P95Indicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Setter @Getter @Column(columnName = "service_id") private int serviceId; @Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId; @@ -73,7 +74,7 @@ public class EndpointP95Indicator extends P95Indicator implements AlarmSupported return false; EndpointP95Indicator indicator = (EndpointP95Indicator)obj; - if (entityId != indicator.entityId) + if (!entityId.equals(indicator.entityId)) return false; if (getTimeBucket() != indicator.getTimeBucket()) diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP99Indicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP99Indicator.java index aadf67789..60c0768cd 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP99Indicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP99Indicator.java @@ -21,14 +21,15 @@ package org.apache.skywalking.oap.server.core.analysis.generated.endpoint; import java.util.*; import lombok.*; import org.apache.skywalking.oap.server.core.Const; -import org.apache.skywalking.oap.server.core.alarm.*; +import org.apache.skywalking.oap.server.core.alarm.AlarmMeta; +import org.apache.skywalking.oap.server.core.alarm.AlarmSupported; import org.apache.skywalking.oap.server.core.analysis.indicator.*; import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.IndicatorType; import org.apache.skywalking.oap.server.core.remote.annotation.StreamData; import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData; -import org.apache.skywalking.oap.server.core.source.Scope; -import org.apache.skywalking.oap.server.core.storage.StorageBuilder; import org.apache.skywalking.oap.server.core.storage.annotation.*; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.source.Scope; /** * This class is auto generated. Please don't change this class manually. @@ -40,7 +41,7 @@ import org.apache.skywalking.oap.server.core.storage.annotation.*; @StorageEntity(name = "endpoint_p99", builder = EndpointP99Indicator.Builder.class) public class EndpointP99Indicator extends P99Indicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Setter @Getter @Column(columnName = "service_id") private int serviceId; @Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId; @@ -73,7 +74,7 @@ public class EndpointP99Indicator extends P99Indicator implements AlarmSupported return false; EndpointP99Indicator indicator = (EndpointP99Indicator)obj; - if (entityId != indicator.entityId) + if (!entityId.equals(indicator.entityId)) return false; if (getTimeBucket() != indicator.getTimeBucket()) diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointSlaIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointSlaIndicator.java index 2175c872e..20a6bd1d0 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointSlaIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointSlaIndicator.java @@ -21,14 +21,15 @@ package org.apache.skywalking.oap.server.core.analysis.generated.endpoint; import java.util.*; import lombok.*; import org.apache.skywalking.oap.server.core.Const; -import org.apache.skywalking.oap.server.core.alarm.*; +import org.apache.skywalking.oap.server.core.alarm.AlarmMeta; +import org.apache.skywalking.oap.server.core.alarm.AlarmSupported; import org.apache.skywalking.oap.server.core.analysis.indicator.*; import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.IndicatorType; import org.apache.skywalking.oap.server.core.remote.annotation.StreamData; import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData; -import org.apache.skywalking.oap.server.core.source.Scope; -import org.apache.skywalking.oap.server.core.storage.StorageBuilder; import org.apache.skywalking.oap.server.core.storage.annotation.*; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.source.Scope; /** * This class is auto generated. Please don't change this class manually. @@ -40,7 +41,7 @@ import org.apache.skywalking.oap.server.core.storage.annotation.*; @StorageEntity(name = "endpoint_sla", builder = EndpointSlaIndicator.Builder.class) public class EndpointSlaIndicator extends PercentIndicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Setter @Getter @Column(columnName = "service_id") private int serviceId; @Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId; @@ -73,7 +74,7 @@ public class EndpointSlaIndicator extends PercentIndicator implements AlarmSuppo return false; EndpointSlaIndicator indicator = (EndpointSlaIndicator)obj; - if (entityId != indicator.entityId) + if (!entityId.equals(indicator.entityId)) return false; if (getTimeBucket() != indicator.getTimeBucket()) diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpointrelation/EndpointRelationCpmIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpointrelation/EndpointRelationCpmIndicator.java index 71f83c30c..9b890d233 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpointrelation/EndpointRelationCpmIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpointrelation/EndpointRelationCpmIndicator.java @@ -21,14 +21,15 @@ package org.apache.skywalking.oap.server.core.analysis.generated.endpointrelatio import java.util.*; import lombok.*; import org.apache.skywalking.oap.server.core.Const; -import org.apache.skywalking.oap.server.core.alarm.*; +import org.apache.skywalking.oap.server.core.alarm.AlarmMeta; +import org.apache.skywalking.oap.server.core.alarm.AlarmSupported; import org.apache.skywalking.oap.server.core.analysis.indicator.*; import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.IndicatorType; import org.apache.skywalking.oap.server.core.remote.annotation.StreamData; import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData; -import org.apache.skywalking.oap.server.core.source.Scope; -import org.apache.skywalking.oap.server.core.storage.StorageBuilder; import org.apache.skywalking.oap.server.core.storage.annotation.*; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.source.Scope; /** * This class is auto generated. Please don't change this class manually. @@ -40,7 +41,7 @@ import org.apache.skywalking.oap.server.core.storage.annotation.*; @StorageEntity(name = "endpoint_relation_cpm", builder = EndpointRelationCpmIndicator.Builder.class) public class EndpointRelationCpmIndicator extends CPMIndicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Setter @Getter @Column(columnName = "service_id") private int serviceId; @Setter @Getter @Column(columnName = "child_service_id") private int childServiceId; @Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId; @@ -75,7 +76,7 @@ public class EndpointRelationCpmIndicator extends CPMIndicator implements AlarmS return false; EndpointRelationCpmIndicator indicator = (EndpointRelationCpmIndicator)obj; - if (entityId != indicator.entityId) + if (!entityId.equals(indicator.entityId)) return false; if (getTimeBucket() != indicator.getTimeBucket()) diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpointrelation/EndpointRelationDispatcher.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpointrelation/EndpointRelationDispatcher.java index 5d51268cb..0d214ce0c 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpointrelation/EndpointRelationDispatcher.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpointrelation/EndpointRelationDispatcher.java @@ -19,8 +19,8 @@ package org.apache.skywalking.oap.server.core.analysis.generated.endpointrelation; 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.analysis.indicator.expression.*; import org.apache.skywalking.oap.server.core.source.*; /** diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpointrelation/EndpointRelationRespTimeIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpointrelation/EndpointRelationRespTimeIndicator.java index ab5520245..8682119b0 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpointrelation/EndpointRelationRespTimeIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpointrelation/EndpointRelationRespTimeIndicator.java @@ -21,14 +21,15 @@ package org.apache.skywalking.oap.server.core.analysis.generated.endpointrelatio import java.util.*; import lombok.*; import org.apache.skywalking.oap.server.core.Const; -import org.apache.skywalking.oap.server.core.alarm.*; +import org.apache.skywalking.oap.server.core.alarm.AlarmMeta; +import org.apache.skywalking.oap.server.core.alarm.AlarmSupported; import org.apache.skywalking.oap.server.core.analysis.indicator.*; import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.IndicatorType; import org.apache.skywalking.oap.server.core.remote.annotation.StreamData; import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData; -import org.apache.skywalking.oap.server.core.source.Scope; -import org.apache.skywalking.oap.server.core.storage.StorageBuilder; import org.apache.skywalking.oap.server.core.storage.annotation.*; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.source.Scope; /** * This class is auto generated. Please don't change this class manually. @@ -40,7 +41,7 @@ import org.apache.skywalking.oap.server.core.storage.annotation.*; @StorageEntity(name = "endpoint_relation_resp_time", builder = EndpointRelationRespTimeIndicator.Builder.class) public class EndpointRelationRespTimeIndicator extends LongAvgIndicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Setter @Getter @Column(columnName = "service_id") private int serviceId; @Setter @Getter @Column(columnName = "child_service_id") private int childServiceId; @Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId; @@ -75,7 +76,7 @@ public class EndpointRelationRespTimeIndicator extends LongAvgIndicator implemen return false; EndpointRelationRespTimeIndicator indicator = (EndpointRelationRespTimeIndicator)obj; - if (entityId != indicator.entityId) + if (!entityId.equals(indicator.entityId)) return false; if (getTimeBucket() != indicator.getTimeBucket()) diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceCpmIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceCpmIndicator.java index 08dfc3bea..c2c00459d 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceCpmIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceCpmIndicator.java @@ -21,14 +21,15 @@ package org.apache.skywalking.oap.server.core.analysis.generated.service; import java.util.*; import lombok.*; import org.apache.skywalking.oap.server.core.Const; -import org.apache.skywalking.oap.server.core.alarm.*; +import org.apache.skywalking.oap.server.core.alarm.AlarmMeta; +import org.apache.skywalking.oap.server.core.alarm.AlarmSupported; import org.apache.skywalking.oap.server.core.analysis.indicator.*; import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.IndicatorType; import org.apache.skywalking.oap.server.core.remote.annotation.StreamData; import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData; -import org.apache.skywalking.oap.server.core.source.Scope; -import org.apache.skywalking.oap.server.core.storage.StorageBuilder; import org.apache.skywalking.oap.server.core.storage.annotation.*; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.source.Scope; /** * This class is auto generated. Please don't change this class manually. @@ -40,7 +41,7 @@ import org.apache.skywalking.oap.server.core.storage.annotation.*; @StorageEntity(name = "service_cpm", builder = ServiceCpmIndicator.Builder.class) public class ServiceCpmIndicator extends CPMIndicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Override public String id() { String splitJointId = String.valueOf(getTimeBucket()); @@ -71,7 +72,7 @@ public class ServiceCpmIndicator extends CPMIndicator implements AlarmSupported return false; ServiceCpmIndicator indicator = (ServiceCpmIndicator)obj; - if (entityId != indicator.entityId) + if (!entityId.equals(indicator.entityId)) return false; if (getTimeBucket() != indicator.getTimeBucket()) diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceDispatcher.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceDispatcher.java index e1638c82b..22126dd4e 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceDispatcher.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceDispatcher.java @@ -20,7 +20,7 @@ package org.apache.skywalking.oap.server.core.analysis.generated.service; import org.apache.skywalking.oap.server.core.analysis.SourceDispatcher; import org.apache.skywalking.oap.server.core.analysis.worker.IndicatorProcess; -import org.apache.skywalking.oap.server.core.source.Service; +import org.apache.skywalking.oap.server.core.source.*; /** * This class is auto generated. Please don't change this class manually. diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP50Indicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP50Indicator.java index a283ecbaf..b050e8eb3 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP50Indicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP50Indicator.java @@ -21,14 +21,15 @@ package org.apache.skywalking.oap.server.core.analysis.generated.service; import java.util.*; import lombok.*; import org.apache.skywalking.oap.server.core.Const; -import org.apache.skywalking.oap.server.core.alarm.*; +import org.apache.skywalking.oap.server.core.alarm.AlarmMeta; +import org.apache.skywalking.oap.server.core.alarm.AlarmSupported; import org.apache.skywalking.oap.server.core.analysis.indicator.*; import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.IndicatorType; import org.apache.skywalking.oap.server.core.remote.annotation.StreamData; import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData; -import org.apache.skywalking.oap.server.core.source.Scope; -import org.apache.skywalking.oap.server.core.storage.StorageBuilder; import org.apache.skywalking.oap.server.core.storage.annotation.*; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.source.Scope; /** * This class is auto generated. Please don't change this class manually. @@ -40,7 +41,7 @@ import org.apache.skywalking.oap.server.core.storage.annotation.*; @StorageEntity(name = "service_p50", builder = ServiceP50Indicator.Builder.class) public class ServiceP50Indicator extends P50Indicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Override public String id() { String splitJointId = String.valueOf(getTimeBucket()); @@ -71,7 +72,7 @@ public class ServiceP50Indicator extends P50Indicator implements AlarmSupported return false; ServiceP50Indicator indicator = (ServiceP50Indicator)obj; - if (entityId != indicator.entityId) + if (!entityId.equals(indicator.entityId)) return false; if (getTimeBucket() != indicator.getTimeBucket()) diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP75Indicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP75Indicator.java index d69742d79..5a7015990 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP75Indicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP75Indicator.java @@ -21,14 +21,15 @@ package org.apache.skywalking.oap.server.core.analysis.generated.service; import java.util.*; import lombok.*; import org.apache.skywalking.oap.server.core.Const; -import org.apache.skywalking.oap.server.core.alarm.*; +import org.apache.skywalking.oap.server.core.alarm.AlarmMeta; +import org.apache.skywalking.oap.server.core.alarm.AlarmSupported; import org.apache.skywalking.oap.server.core.analysis.indicator.*; import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.IndicatorType; import org.apache.skywalking.oap.server.core.remote.annotation.StreamData; import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData; -import org.apache.skywalking.oap.server.core.source.Scope; -import org.apache.skywalking.oap.server.core.storage.StorageBuilder; import org.apache.skywalking.oap.server.core.storage.annotation.*; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.source.Scope; /** * This class is auto generated. Please don't change this class manually. @@ -40,7 +41,7 @@ import org.apache.skywalking.oap.server.core.storage.annotation.*; @StorageEntity(name = "service_p75", builder = ServiceP75Indicator.Builder.class) public class ServiceP75Indicator extends P75Indicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Override public String id() { String splitJointId = String.valueOf(getTimeBucket()); @@ -71,7 +72,7 @@ public class ServiceP75Indicator extends P75Indicator implements AlarmSupported return false; ServiceP75Indicator indicator = (ServiceP75Indicator)obj; - if (entityId != indicator.entityId) + if (!entityId.equals(indicator.entityId)) return false; if (getTimeBucket() != indicator.getTimeBucket()) diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP90Indicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP90Indicator.java index d638bd129..7b4deb6cd 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP90Indicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP90Indicator.java @@ -21,14 +21,15 @@ package org.apache.skywalking.oap.server.core.analysis.generated.service; import java.util.*; import lombok.*; import org.apache.skywalking.oap.server.core.Const; -import org.apache.skywalking.oap.server.core.alarm.*; +import org.apache.skywalking.oap.server.core.alarm.AlarmMeta; +import org.apache.skywalking.oap.server.core.alarm.AlarmSupported; import org.apache.skywalking.oap.server.core.analysis.indicator.*; import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.IndicatorType; import org.apache.skywalking.oap.server.core.remote.annotation.StreamData; import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData; -import org.apache.skywalking.oap.server.core.source.Scope; -import org.apache.skywalking.oap.server.core.storage.StorageBuilder; import org.apache.skywalking.oap.server.core.storage.annotation.*; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.source.Scope; /** * This class is auto generated. Please don't change this class manually. @@ -40,7 +41,7 @@ import org.apache.skywalking.oap.server.core.storage.annotation.*; @StorageEntity(name = "service_p90", builder = ServiceP90Indicator.Builder.class) public class ServiceP90Indicator extends P90Indicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Override public String id() { String splitJointId = String.valueOf(getTimeBucket()); @@ -71,7 +72,7 @@ public class ServiceP90Indicator extends P90Indicator implements AlarmSupported return false; ServiceP90Indicator indicator = (ServiceP90Indicator)obj; - if (entityId != indicator.entityId) + if (!entityId.equals(indicator.entityId)) return false; if (getTimeBucket() != indicator.getTimeBucket()) diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP95Indicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP95Indicator.java index 526c0e14c..212eb92af 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP95Indicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP95Indicator.java @@ -21,14 +21,15 @@ package org.apache.skywalking.oap.server.core.analysis.generated.service; import java.util.*; import lombok.*; import org.apache.skywalking.oap.server.core.Const; -import org.apache.skywalking.oap.server.core.alarm.*; +import org.apache.skywalking.oap.server.core.alarm.AlarmMeta; +import org.apache.skywalking.oap.server.core.alarm.AlarmSupported; import org.apache.skywalking.oap.server.core.analysis.indicator.*; import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.IndicatorType; import org.apache.skywalking.oap.server.core.remote.annotation.StreamData; import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData; -import org.apache.skywalking.oap.server.core.source.Scope; -import org.apache.skywalking.oap.server.core.storage.StorageBuilder; import org.apache.skywalking.oap.server.core.storage.annotation.*; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.source.Scope; /** * This class is auto generated. Please don't change this class manually. @@ -40,7 +41,7 @@ import org.apache.skywalking.oap.server.core.storage.annotation.*; @StorageEntity(name = "service_p95", builder = ServiceP95Indicator.Builder.class) public class ServiceP95Indicator extends P95Indicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Override public String id() { String splitJointId = String.valueOf(getTimeBucket()); @@ -71,7 +72,7 @@ public class ServiceP95Indicator extends P95Indicator implements AlarmSupported return false; ServiceP95Indicator indicator = (ServiceP95Indicator)obj; - if (entityId != indicator.entityId) + if (!entityId.equals(indicator.entityId)) return false; if (getTimeBucket() != indicator.getTimeBucket()) diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP99Indicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP99Indicator.java index 5a661cc6d..2f9d317b7 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP99Indicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP99Indicator.java @@ -21,14 +21,15 @@ package org.apache.skywalking.oap.server.core.analysis.generated.service; import java.util.*; import lombok.*; import org.apache.skywalking.oap.server.core.Const; -import org.apache.skywalking.oap.server.core.alarm.*; +import org.apache.skywalking.oap.server.core.alarm.AlarmMeta; +import org.apache.skywalking.oap.server.core.alarm.AlarmSupported; import org.apache.skywalking.oap.server.core.analysis.indicator.*; import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.IndicatorType; import org.apache.skywalking.oap.server.core.remote.annotation.StreamData; import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData; -import org.apache.skywalking.oap.server.core.source.Scope; -import org.apache.skywalking.oap.server.core.storage.StorageBuilder; import org.apache.skywalking.oap.server.core.storage.annotation.*; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.source.Scope; /** * This class is auto generated. Please don't change this class manually. @@ -40,7 +41,7 @@ import org.apache.skywalking.oap.server.core.storage.annotation.*; @StorageEntity(name = "service_p99", builder = ServiceP99Indicator.Builder.class) public class ServiceP99Indicator extends P99Indicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Override public String id() { String splitJointId = String.valueOf(getTimeBucket()); @@ -71,7 +72,7 @@ public class ServiceP99Indicator extends P99Indicator implements AlarmSupported return false; ServiceP99Indicator indicator = (ServiceP99Indicator)obj; - if (entityId != indicator.entityId) + if (!entityId.equals(indicator.entityId)) return false; if (getTimeBucket() != indicator.getTimeBucket()) diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceRespTimeIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceRespTimeIndicator.java index 5de6eaa62..60ae6c2ce 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceRespTimeIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceRespTimeIndicator.java @@ -21,14 +21,15 @@ package org.apache.skywalking.oap.server.core.analysis.generated.service; import java.util.*; import lombok.*; import org.apache.skywalking.oap.server.core.Const; -import org.apache.skywalking.oap.server.core.alarm.*; +import org.apache.skywalking.oap.server.core.alarm.AlarmMeta; +import org.apache.skywalking.oap.server.core.alarm.AlarmSupported; import org.apache.skywalking.oap.server.core.analysis.indicator.*; import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.IndicatorType; import org.apache.skywalking.oap.server.core.remote.annotation.StreamData; import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData; -import org.apache.skywalking.oap.server.core.source.Scope; -import org.apache.skywalking.oap.server.core.storage.StorageBuilder; import org.apache.skywalking.oap.server.core.storage.annotation.*; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.source.Scope; /** * This class is auto generated. Please don't change this class manually. @@ -40,7 +41,7 @@ import org.apache.skywalking.oap.server.core.storage.annotation.*; @StorageEntity(name = "service_resp_time", builder = ServiceRespTimeIndicator.Builder.class) public class ServiceRespTimeIndicator extends LongAvgIndicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Override public String id() { String splitJointId = String.valueOf(getTimeBucket()); @@ -71,7 +72,7 @@ public class ServiceRespTimeIndicator extends LongAvgIndicator implements AlarmS return false; ServiceRespTimeIndicator indicator = (ServiceRespTimeIndicator)obj; - if (entityId != indicator.entityId) + if (!entityId.equals(indicator.entityId)) return false; if (getTimeBucket() != indicator.getTimeBucket()) diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceSlaIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceSlaIndicator.java index fa2e8b93c..68f023ab6 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceSlaIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceSlaIndicator.java @@ -21,14 +21,15 @@ package org.apache.skywalking.oap.server.core.analysis.generated.service; import java.util.*; import lombok.*; import org.apache.skywalking.oap.server.core.Const; -import org.apache.skywalking.oap.server.core.alarm.*; +import org.apache.skywalking.oap.server.core.alarm.AlarmMeta; +import org.apache.skywalking.oap.server.core.alarm.AlarmSupported; import org.apache.skywalking.oap.server.core.analysis.indicator.*; import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.IndicatorType; import org.apache.skywalking.oap.server.core.remote.annotation.StreamData; import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData; -import org.apache.skywalking.oap.server.core.source.Scope; -import org.apache.skywalking.oap.server.core.storage.StorageBuilder; import org.apache.skywalking.oap.server.core.storage.annotation.*; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.source.Scope; /** * This class is auto generated. Please don't change this class manually. @@ -40,7 +41,7 @@ import org.apache.skywalking.oap.server.core.storage.annotation.*; @StorageEntity(name = "service_sla", builder = ServiceSlaIndicator.Builder.class) public class ServiceSlaIndicator extends PercentIndicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Override public String id() { String splitJointId = String.valueOf(getTimeBucket()); @@ -71,7 +72,7 @@ public class ServiceSlaIndicator extends PercentIndicator implements AlarmSuppor return false; ServiceSlaIndicator indicator = (ServiceSlaIndicator)obj; - if (entityId != indicator.entityId) + if (!entityId.equals(indicator.entityId)) return false; if (getTimeBucket() != indicator.getTimeBucket()) diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstance/ServiceInstanceCpmIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstance/ServiceInstanceCpmIndicator.java index fa26f5d4c..dc9669a66 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstance/ServiceInstanceCpmIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstance/ServiceInstanceCpmIndicator.java @@ -21,14 +21,15 @@ package org.apache.skywalking.oap.server.core.analysis.generated.serviceinstance import java.util.*; import lombok.*; import org.apache.skywalking.oap.server.core.Const; -import org.apache.skywalking.oap.server.core.alarm.*; +import org.apache.skywalking.oap.server.core.alarm.AlarmMeta; +import org.apache.skywalking.oap.server.core.alarm.AlarmSupported; import org.apache.skywalking.oap.server.core.analysis.indicator.*; import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.IndicatorType; import org.apache.skywalking.oap.server.core.remote.annotation.StreamData; import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData; -import org.apache.skywalking.oap.server.core.source.Scope; -import org.apache.skywalking.oap.server.core.storage.StorageBuilder; import org.apache.skywalking.oap.server.core.storage.annotation.*; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.source.Scope; /** * This class is auto generated. Please don't change this class manually. @@ -40,7 +41,7 @@ import org.apache.skywalking.oap.server.core.storage.annotation.*; @StorageEntity(name = "service_instance_cpm", builder = ServiceInstanceCpmIndicator.Builder.class) public class ServiceInstanceCpmIndicator extends CPMIndicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Setter @Getter @Column(columnName = "service_id") private int serviceId; @Override public String id() { @@ -72,7 +73,7 @@ public class ServiceInstanceCpmIndicator extends CPMIndicator implements AlarmSu return false; ServiceInstanceCpmIndicator indicator = (ServiceInstanceCpmIndicator)obj; - if (entityId != indicator.entityId) + if (!entityId.equals(indicator.entityId)) return false; if (getTimeBucket() != indicator.getTimeBucket()) diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstance/ServiceInstanceDispatcher.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstance/ServiceInstanceDispatcher.java index 43add9df6..91b32f533 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstance/ServiceInstanceDispatcher.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstance/ServiceInstanceDispatcher.java @@ -20,7 +20,7 @@ package org.apache.skywalking.oap.server.core.analysis.generated.serviceinstance import org.apache.skywalking.oap.server.core.analysis.SourceDispatcher; import org.apache.skywalking.oap.server.core.analysis.worker.IndicatorProcess; -import org.apache.skywalking.oap.server.core.source.ServiceInstance; +import org.apache.skywalking.oap.server.core.source.*; /** * This class is auto generated. Please don't change this class manually. diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstance/ServiceInstanceRespTimeIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstance/ServiceInstanceRespTimeIndicator.java index aa0468ef6..39a6ac1e4 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstance/ServiceInstanceRespTimeIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstance/ServiceInstanceRespTimeIndicator.java @@ -21,14 +21,15 @@ package org.apache.skywalking.oap.server.core.analysis.generated.serviceinstance import java.util.*; import lombok.*; import org.apache.skywalking.oap.server.core.Const; -import org.apache.skywalking.oap.server.core.alarm.*; +import org.apache.skywalking.oap.server.core.alarm.AlarmMeta; +import org.apache.skywalking.oap.server.core.alarm.AlarmSupported; import org.apache.skywalking.oap.server.core.analysis.indicator.*; import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.IndicatorType; import org.apache.skywalking.oap.server.core.remote.annotation.StreamData; import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData; -import org.apache.skywalking.oap.server.core.source.Scope; -import org.apache.skywalking.oap.server.core.storage.StorageBuilder; import org.apache.skywalking.oap.server.core.storage.annotation.*; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.source.Scope; /** * This class is auto generated. Please don't change this class manually. @@ -40,7 +41,7 @@ import org.apache.skywalking.oap.server.core.storage.annotation.*; @StorageEntity(name = "service_instance_resp_time", builder = ServiceInstanceRespTimeIndicator.Builder.class) public class ServiceInstanceRespTimeIndicator extends LongAvgIndicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Setter @Getter @Column(columnName = "service_id") private int serviceId; @Override public String id() { @@ -72,7 +73,7 @@ public class ServiceInstanceRespTimeIndicator extends LongAvgIndicator implement return false; ServiceInstanceRespTimeIndicator indicator = (ServiceInstanceRespTimeIndicator)obj; - if (entityId != indicator.entityId) + if (!entityId.equals(indicator.entityId)) return false; if (getTimeBucket() != indicator.getTimeBucket()) diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmcpu/InstanceJvmCpuIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmcpu/InstanceJvmCpuIndicator.java index 040278a4a..99fe1085d 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmcpu/InstanceJvmCpuIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmcpu/InstanceJvmCpuIndicator.java @@ -21,14 +21,15 @@ package org.apache.skywalking.oap.server.core.analysis.generated.serviceinstance import java.util.*; import lombok.*; import org.apache.skywalking.oap.server.core.Const; -import org.apache.skywalking.oap.server.core.alarm.*; +import org.apache.skywalking.oap.server.core.alarm.AlarmMeta; +import org.apache.skywalking.oap.server.core.alarm.AlarmSupported; import org.apache.skywalking.oap.server.core.analysis.indicator.*; import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.IndicatorType; import org.apache.skywalking.oap.server.core.remote.annotation.StreamData; import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData; -import org.apache.skywalking.oap.server.core.source.Scope; -import org.apache.skywalking.oap.server.core.storage.StorageBuilder; import org.apache.skywalking.oap.server.core.storage.annotation.*; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.source.Scope; /** * This class is auto generated. Please don't change this class manually. @@ -40,7 +41,7 @@ import org.apache.skywalking.oap.server.core.storage.annotation.*; @StorageEntity(name = "instance_jvm_cpu", builder = InstanceJvmCpuIndicator.Builder.class) public class InstanceJvmCpuIndicator extends DoubleAvgIndicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId; @Override public String id() { @@ -72,7 +73,7 @@ public class InstanceJvmCpuIndicator extends DoubleAvgIndicator implements Alarm return false; InstanceJvmCpuIndicator indicator = (InstanceJvmCpuIndicator)obj; - if (entityId != indicator.entityId) + if (!entityId.equals(indicator.entityId)) return false; if (getTimeBucket() != indicator.getTimeBucket()) diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmcpu/ServiceInstanceJVMCPUDispatcher.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmcpu/ServiceInstanceJVMCPUDispatcher.java index 7e496d2c3..7c9386701 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmcpu/ServiceInstanceJVMCPUDispatcher.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmcpu/ServiceInstanceJVMCPUDispatcher.java @@ -20,7 +20,7 @@ package org.apache.skywalking.oap.server.core.analysis.generated.serviceinstance import org.apache.skywalking.oap.server.core.analysis.SourceDispatcher; import org.apache.skywalking.oap.server.core.analysis.worker.IndicatorProcess; -import org.apache.skywalking.oap.server.core.source.ServiceInstanceJVMCPU; +import org.apache.skywalking.oap.server.core.source.*; /** * This class is auto generated. Please don't change this class manually. diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/InstanceJvmOldGcCountIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/InstanceJvmOldGcCountIndicator.java index 792e6fc6c..f5f8a36c6 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/InstanceJvmOldGcCountIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/InstanceJvmOldGcCountIndicator.java @@ -21,14 +21,15 @@ package org.apache.skywalking.oap.server.core.analysis.generated.serviceinstance import java.util.*; import lombok.*; import org.apache.skywalking.oap.server.core.Const; -import org.apache.skywalking.oap.server.core.alarm.*; +import org.apache.skywalking.oap.server.core.alarm.AlarmMeta; +import org.apache.skywalking.oap.server.core.alarm.AlarmSupported; import org.apache.skywalking.oap.server.core.analysis.indicator.*; import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.IndicatorType; import org.apache.skywalking.oap.server.core.remote.annotation.StreamData; import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData; -import org.apache.skywalking.oap.server.core.source.Scope; -import org.apache.skywalking.oap.server.core.storage.StorageBuilder; import org.apache.skywalking.oap.server.core.storage.annotation.*; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.source.Scope; /** * This class is auto generated. Please don't change this class manually. @@ -40,7 +41,7 @@ import org.apache.skywalking.oap.server.core.storage.annotation.*; @StorageEntity(name = "instance_jvm_old_gc_count", builder = InstanceJvmOldGcCountIndicator.Builder.class) public class InstanceJvmOldGcCountIndicator extends SumIndicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId; @Override public String id() { @@ -72,7 +73,7 @@ public class InstanceJvmOldGcCountIndicator extends SumIndicator implements Alar return false; InstanceJvmOldGcCountIndicator indicator = (InstanceJvmOldGcCountIndicator)obj; - if (entityId != indicator.entityId) + if (!entityId.equals(indicator.entityId)) return false; if (getTimeBucket() != indicator.getTimeBucket()) diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/InstanceJvmOldGcTimeIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/InstanceJvmOldGcTimeIndicator.java index af1a9bd92..4c4d5afd4 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/InstanceJvmOldGcTimeIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/InstanceJvmOldGcTimeIndicator.java @@ -21,14 +21,15 @@ package org.apache.skywalking.oap.server.core.analysis.generated.serviceinstance import java.util.*; import lombok.*; import org.apache.skywalking.oap.server.core.Const; -import org.apache.skywalking.oap.server.core.alarm.*; +import org.apache.skywalking.oap.server.core.alarm.AlarmMeta; +import org.apache.skywalking.oap.server.core.alarm.AlarmSupported; import org.apache.skywalking.oap.server.core.analysis.indicator.*; import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.IndicatorType; import org.apache.skywalking.oap.server.core.remote.annotation.StreamData; import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData; -import org.apache.skywalking.oap.server.core.source.Scope; -import org.apache.skywalking.oap.server.core.storage.StorageBuilder; import org.apache.skywalking.oap.server.core.storage.annotation.*; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.source.Scope; /** * This class is auto generated. Please don't change this class manually. @@ -40,7 +41,7 @@ import org.apache.skywalking.oap.server.core.storage.annotation.*; @StorageEntity(name = "instance_jvm_old_gc_time", builder = InstanceJvmOldGcTimeIndicator.Builder.class) public class InstanceJvmOldGcTimeIndicator extends LongAvgIndicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId; @Override public String id() { @@ -72,7 +73,7 @@ public class InstanceJvmOldGcTimeIndicator extends LongAvgIndicator implements A return false; InstanceJvmOldGcTimeIndicator indicator = (InstanceJvmOldGcTimeIndicator)obj; - if (entityId != indicator.entityId) + if (!entityId.equals(indicator.entityId)) return false; if (getTimeBucket() != indicator.getTimeBucket()) diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/InstanceJvmYoungGcCountIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/InstanceJvmYoungGcCountIndicator.java index b29c61d53..614e02ece 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/InstanceJvmYoungGcCountIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/InstanceJvmYoungGcCountIndicator.java @@ -21,14 +21,15 @@ package org.apache.skywalking.oap.server.core.analysis.generated.serviceinstance import java.util.*; import lombok.*; import org.apache.skywalking.oap.server.core.Const; -import org.apache.skywalking.oap.server.core.alarm.*; +import org.apache.skywalking.oap.server.core.alarm.AlarmMeta; +import org.apache.skywalking.oap.server.core.alarm.AlarmSupported; import org.apache.skywalking.oap.server.core.analysis.indicator.*; import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.IndicatorType; import org.apache.skywalking.oap.server.core.remote.annotation.StreamData; import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData; -import org.apache.skywalking.oap.server.core.source.Scope; -import org.apache.skywalking.oap.server.core.storage.StorageBuilder; import org.apache.skywalking.oap.server.core.storage.annotation.*; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.source.Scope; /** * This class is auto generated. Please don't change this class manually. @@ -40,7 +41,7 @@ import org.apache.skywalking.oap.server.core.storage.annotation.*; @StorageEntity(name = "instance_jvm_young_gc_count", builder = InstanceJvmYoungGcCountIndicator.Builder.class) public class InstanceJvmYoungGcCountIndicator extends SumIndicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId; @Override public String id() { @@ -72,7 +73,7 @@ public class InstanceJvmYoungGcCountIndicator extends SumIndicator implements Al return false; InstanceJvmYoungGcCountIndicator indicator = (InstanceJvmYoungGcCountIndicator)obj; - if (entityId != indicator.entityId) + if (!entityId.equals(indicator.entityId)) return false; if (getTimeBucket() != indicator.getTimeBucket()) diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/InstanceJvmYoungGcTimeIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/InstanceJvmYoungGcTimeIndicator.java index 092a5592a..e017f65dd 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/InstanceJvmYoungGcTimeIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/InstanceJvmYoungGcTimeIndicator.java @@ -21,14 +21,15 @@ package org.apache.skywalking.oap.server.core.analysis.generated.serviceinstance import java.util.*; import lombok.*; import org.apache.skywalking.oap.server.core.Const; -import org.apache.skywalking.oap.server.core.alarm.*; +import org.apache.skywalking.oap.server.core.alarm.AlarmMeta; +import org.apache.skywalking.oap.server.core.alarm.AlarmSupported; import org.apache.skywalking.oap.server.core.analysis.indicator.*; import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.IndicatorType; import org.apache.skywalking.oap.server.core.remote.annotation.StreamData; import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData; -import org.apache.skywalking.oap.server.core.source.Scope; -import org.apache.skywalking.oap.server.core.storage.StorageBuilder; import org.apache.skywalking.oap.server.core.storage.annotation.*; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.source.Scope; /** * This class is auto generated. Please don't change this class manually. @@ -40,7 +41,7 @@ import org.apache.skywalking.oap.server.core.storage.annotation.*; @StorageEntity(name = "instance_jvm_young_gc_time", builder = InstanceJvmYoungGcTimeIndicator.Builder.class) public class InstanceJvmYoungGcTimeIndicator extends LongAvgIndicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId; @Override public String id() { @@ -72,7 +73,7 @@ public class InstanceJvmYoungGcTimeIndicator extends LongAvgIndicator implements return false; InstanceJvmYoungGcTimeIndicator indicator = (InstanceJvmYoungGcTimeIndicator)obj; - if (entityId != indicator.entityId) + if (!entityId.equals(indicator.entityId)) return false; if (getTimeBucket() != indicator.getTimeBucket()) diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/ServiceInstanceJVMGCDispatcher.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/ServiceInstanceJVMGCDispatcher.java index cc631e0ff..d99291dde 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/ServiceInstanceJVMGCDispatcher.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/ServiceInstanceJVMGCDispatcher.java @@ -19,8 +19,8 @@ package org.apache.skywalking.oap.server.core.analysis.generated.serviceinstancejvmgc; 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.analysis.indicator.expression.*; import org.apache.skywalking.oap.server.core.source.*; /** diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryHeapIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryHeapIndicator.java index ccfb6eea5..2480f8420 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryHeapIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryHeapIndicator.java @@ -21,14 +21,15 @@ package org.apache.skywalking.oap.server.core.analysis.generated.serviceinstance import java.util.*; import lombok.*; import org.apache.skywalking.oap.server.core.Const; -import org.apache.skywalking.oap.server.core.alarm.*; +import org.apache.skywalking.oap.server.core.alarm.AlarmMeta; +import org.apache.skywalking.oap.server.core.alarm.AlarmSupported; import org.apache.skywalking.oap.server.core.analysis.indicator.*; import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.IndicatorType; import org.apache.skywalking.oap.server.core.remote.annotation.StreamData; import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData; -import org.apache.skywalking.oap.server.core.source.Scope; -import org.apache.skywalking.oap.server.core.storage.StorageBuilder; import org.apache.skywalking.oap.server.core.storage.annotation.*; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.source.Scope; /** * This class is auto generated. Please don't change this class manually. @@ -40,7 +41,7 @@ import org.apache.skywalking.oap.server.core.storage.annotation.*; @StorageEntity(name = "instance_jvm_memory_heap", builder = InstanceJvmMemoryHeapIndicator.Builder.class) public class InstanceJvmMemoryHeapIndicator extends LongAvgIndicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId; @Override public String id() { @@ -72,7 +73,7 @@ public class InstanceJvmMemoryHeapIndicator extends LongAvgIndicator implements return false; InstanceJvmMemoryHeapIndicator indicator = (InstanceJvmMemoryHeapIndicator)obj; - if (entityId != indicator.entityId) + if (!entityId.equals(indicator.entityId)) return false; if (getTimeBucket() != indicator.getTimeBucket()) diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryHeapMaxIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryHeapMaxIndicator.java index 88605860a..0e070d46a 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryHeapMaxIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryHeapMaxIndicator.java @@ -21,14 +21,15 @@ package org.apache.skywalking.oap.server.core.analysis.generated.serviceinstance import java.util.*; import lombok.*; import org.apache.skywalking.oap.server.core.Const; -import org.apache.skywalking.oap.server.core.alarm.*; +import org.apache.skywalking.oap.server.core.alarm.AlarmMeta; +import org.apache.skywalking.oap.server.core.alarm.AlarmSupported; import org.apache.skywalking.oap.server.core.analysis.indicator.*; import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.IndicatorType; import org.apache.skywalking.oap.server.core.remote.annotation.StreamData; import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData; -import org.apache.skywalking.oap.server.core.source.Scope; -import org.apache.skywalking.oap.server.core.storage.StorageBuilder; import org.apache.skywalking.oap.server.core.storage.annotation.*; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.source.Scope; /** * This class is auto generated. Please don't change this class manually. @@ -40,7 +41,7 @@ import org.apache.skywalking.oap.server.core.storage.annotation.*; @StorageEntity(name = "instance_jvm_memory_heap_max", builder = InstanceJvmMemoryHeapMaxIndicator.Builder.class) public class InstanceJvmMemoryHeapMaxIndicator extends LongAvgIndicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId; @Override public String id() { @@ -72,7 +73,7 @@ public class InstanceJvmMemoryHeapMaxIndicator extends LongAvgIndicator implemen return false; InstanceJvmMemoryHeapMaxIndicator indicator = (InstanceJvmMemoryHeapMaxIndicator)obj; - if (entityId != indicator.entityId) + if (!entityId.equals(indicator.entityId)) return false; if (getTimeBucket() != indicator.getTimeBucket()) diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryNoheapIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryNoheapIndicator.java index b66fcf962..a426d98f3 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryNoheapIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryNoheapIndicator.java @@ -21,14 +21,15 @@ package org.apache.skywalking.oap.server.core.analysis.generated.serviceinstance import java.util.*; import lombok.*; import org.apache.skywalking.oap.server.core.Const; -import org.apache.skywalking.oap.server.core.alarm.*; +import org.apache.skywalking.oap.server.core.alarm.AlarmMeta; +import org.apache.skywalking.oap.server.core.alarm.AlarmSupported; import org.apache.skywalking.oap.server.core.analysis.indicator.*; import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.IndicatorType; import org.apache.skywalking.oap.server.core.remote.annotation.StreamData; import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData; -import org.apache.skywalking.oap.server.core.source.Scope; -import org.apache.skywalking.oap.server.core.storage.StorageBuilder; import org.apache.skywalking.oap.server.core.storage.annotation.*; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.source.Scope; /** * This class is auto generated. Please don't change this class manually. @@ -40,7 +41,7 @@ import org.apache.skywalking.oap.server.core.storage.annotation.*; @StorageEntity(name = "instance_jvm_memory_noheap", builder = InstanceJvmMemoryNoheapIndicator.Builder.class) public class InstanceJvmMemoryNoheapIndicator extends LongAvgIndicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId; @Override public String id() { @@ -72,7 +73,7 @@ public class InstanceJvmMemoryNoheapIndicator extends LongAvgIndicator implement return false; InstanceJvmMemoryNoheapIndicator indicator = (InstanceJvmMemoryNoheapIndicator)obj; - if (entityId != indicator.entityId) + if (!entityId.equals(indicator.entityId)) return false; if (getTimeBucket() != indicator.getTimeBucket()) diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryNoheapMaxIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryNoheapMaxIndicator.java index 8c4ff876e..375eb7fc1 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryNoheapMaxIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryNoheapMaxIndicator.java @@ -21,14 +21,15 @@ package org.apache.skywalking.oap.server.core.analysis.generated.serviceinstance import java.util.*; import lombok.*; import org.apache.skywalking.oap.server.core.Const; -import org.apache.skywalking.oap.server.core.alarm.*; +import org.apache.skywalking.oap.server.core.alarm.AlarmMeta; +import org.apache.skywalking.oap.server.core.alarm.AlarmSupported; import org.apache.skywalking.oap.server.core.analysis.indicator.*; import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.IndicatorType; import org.apache.skywalking.oap.server.core.remote.annotation.StreamData; import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData; -import org.apache.skywalking.oap.server.core.source.Scope; -import org.apache.skywalking.oap.server.core.storage.StorageBuilder; import org.apache.skywalking.oap.server.core.storage.annotation.*; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.source.Scope; /** * This class is auto generated. Please don't change this class manually. @@ -40,7 +41,7 @@ import org.apache.skywalking.oap.server.core.storage.annotation.*; @StorageEntity(name = "instance_jvm_memory_noheap_max", builder = InstanceJvmMemoryNoheapMaxIndicator.Builder.class) public class InstanceJvmMemoryNoheapMaxIndicator extends LongAvgIndicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Setter @Getter @Column(columnName = "service_instance_id") private int serviceInstanceId; @Override public String id() { @@ -72,7 +73,7 @@ public class InstanceJvmMemoryNoheapMaxIndicator extends LongAvgIndicator implem return false; InstanceJvmMemoryNoheapMaxIndicator indicator = (InstanceJvmMemoryNoheapMaxIndicator)obj; - if (entityId != indicator.entityId) + if (!entityId.equals(indicator.entityId)) return false; if (getTimeBucket() != indicator.getTimeBucket()) diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/ServiceInstanceJVMMemoryDispatcher.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/ServiceInstanceJVMMemoryDispatcher.java index 8cf86da9a..f6c58661e 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/ServiceInstanceJVMMemoryDispatcher.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/ServiceInstanceJVMMemoryDispatcher.java @@ -19,9 +19,9 @@ package org.apache.skywalking.oap.server.core.analysis.generated.serviceinstancejvmmemory; 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.ServiceInstanceJVMMemory; +import org.apache.skywalking.oap.server.core.analysis.indicator.expression.*; +import org.apache.skywalking.oap.server.core.source.*; /** * This class is auto generated. Please don't change this class manually. diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemorypool/ServiceInstanceJVMMemoryPoolDispatcher.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemorypool/ServiceInstanceJVMMemoryPoolDispatcher.java index bc56cb687..409f13543 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemorypool/ServiceInstanceJVMMemoryPoolDispatcher.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemorypool/ServiceInstanceJVMMemoryPoolDispatcher.java @@ -19,7 +19,7 @@ package org.apache.skywalking.oap.server.core.analysis.generated.serviceinstancejvmmemorypool; import org.apache.skywalking.oap.server.core.analysis.SourceDispatcher; -import org.apache.skywalking.oap.server.core.source.ServiceInstanceJVMMemoryPool; +import org.apache.skywalking.oap.server.core.source.*; /** * This class is auto generated. Please don't change this class manually. diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancerelation/ServiceInstanceRelationDispatcher.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancerelation/ServiceInstanceRelationDispatcher.java index 0ddd689f7..15af66468 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancerelation/ServiceInstanceRelationDispatcher.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancerelation/ServiceInstanceRelationDispatcher.java @@ -19,7 +19,7 @@ package org.apache.skywalking.oap.server.core.analysis.generated.serviceinstancerelation; import org.apache.skywalking.oap.server.core.analysis.SourceDispatcher; -import org.apache.skywalking.oap.server.core.source.ServiceInstanceRelation; +import org.apache.skywalking.oap.server.core.source.*; /** * This class is auto generated. Please don't change this class manually. diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationClientCallSlaIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationClientCallSlaIndicator.java index 303581864..272e34019 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationClientCallSlaIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationClientCallSlaIndicator.java @@ -21,14 +21,15 @@ package org.apache.skywalking.oap.server.core.analysis.generated.servicerelation import java.util.*; import lombok.*; import org.apache.skywalking.oap.server.core.Const; -import org.apache.skywalking.oap.server.core.alarm.*; +import org.apache.skywalking.oap.server.core.alarm.AlarmMeta; +import org.apache.skywalking.oap.server.core.alarm.AlarmSupported; import org.apache.skywalking.oap.server.core.analysis.indicator.*; import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.IndicatorType; import org.apache.skywalking.oap.server.core.remote.annotation.StreamData; import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData; -import org.apache.skywalking.oap.server.core.source.Scope; -import org.apache.skywalking.oap.server.core.storage.StorageBuilder; import org.apache.skywalking.oap.server.core.storage.annotation.*; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.source.Scope; /** * This class is auto generated. Please don't change this class manually. @@ -40,7 +41,7 @@ import org.apache.skywalking.oap.server.core.storage.annotation.*; @StorageEntity(name = "service_relation_client_call_sla", builder = ServiceRelationClientCallSlaIndicator.Builder.class) public class ServiceRelationClientCallSlaIndicator extends PercentIndicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Override public String id() { String splitJointId = String.valueOf(getTimeBucket()); @@ -71,7 +72,7 @@ public class ServiceRelationClientCallSlaIndicator extends PercentIndicator impl return false; ServiceRelationClientCallSlaIndicator indicator = (ServiceRelationClientCallSlaIndicator)obj; - if (entityId != indicator.entityId) + if (!entityId.equals(indicator.entityId)) return false; if (getTimeBucket() != indicator.getTimeBucket()) diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationClientCpmIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationClientCpmIndicator.java index cb2f82257..ad1c6776a 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationClientCpmIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationClientCpmIndicator.java @@ -21,14 +21,15 @@ package org.apache.skywalking.oap.server.core.analysis.generated.servicerelation import java.util.*; import lombok.*; import org.apache.skywalking.oap.server.core.Const; -import org.apache.skywalking.oap.server.core.alarm.*; +import org.apache.skywalking.oap.server.core.alarm.AlarmMeta; +import org.apache.skywalking.oap.server.core.alarm.AlarmSupported; import org.apache.skywalking.oap.server.core.analysis.indicator.*; import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.IndicatorType; import org.apache.skywalking.oap.server.core.remote.annotation.StreamData; import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData; -import org.apache.skywalking.oap.server.core.source.Scope; -import org.apache.skywalking.oap.server.core.storage.StorageBuilder; import org.apache.skywalking.oap.server.core.storage.annotation.*; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.source.Scope; /** * This class is auto generated. Please don't change this class manually. @@ -40,7 +41,7 @@ import org.apache.skywalking.oap.server.core.storage.annotation.*; @StorageEntity(name = "service_relation_client_cpm", builder = ServiceRelationClientCpmIndicator.Builder.class) public class ServiceRelationClientCpmIndicator extends CPMIndicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Override public String id() { String splitJointId = String.valueOf(getTimeBucket()); @@ -71,7 +72,7 @@ public class ServiceRelationClientCpmIndicator extends CPMIndicator implements A return false; ServiceRelationClientCpmIndicator indicator = (ServiceRelationClientCpmIndicator)obj; - if (entityId != indicator.entityId) + if (!entityId.equals(indicator.entityId)) return false; if (getTimeBucket() != indicator.getTimeBucket()) diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationClientRespTimeIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationClientRespTimeIndicator.java index 97310ea4a..2f536b803 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationClientRespTimeIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationClientRespTimeIndicator.java @@ -21,14 +21,15 @@ package org.apache.skywalking.oap.server.core.analysis.generated.servicerelation import java.util.*; import lombok.*; import org.apache.skywalking.oap.server.core.Const; -import org.apache.skywalking.oap.server.core.alarm.*; +import org.apache.skywalking.oap.server.core.alarm.AlarmMeta; +import org.apache.skywalking.oap.server.core.alarm.AlarmSupported; import org.apache.skywalking.oap.server.core.analysis.indicator.*; import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.IndicatorType; import org.apache.skywalking.oap.server.core.remote.annotation.StreamData; import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData; -import org.apache.skywalking.oap.server.core.source.Scope; -import org.apache.skywalking.oap.server.core.storage.StorageBuilder; import org.apache.skywalking.oap.server.core.storage.annotation.*; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.source.Scope; /** * This class is auto generated. Please don't change this class manually. @@ -40,7 +41,7 @@ import org.apache.skywalking.oap.server.core.storage.annotation.*; @StorageEntity(name = "service_relation_client_resp_time", builder = ServiceRelationClientRespTimeIndicator.Builder.class) public class ServiceRelationClientRespTimeIndicator extends LongAvgIndicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Override public String id() { String splitJointId = String.valueOf(getTimeBucket()); @@ -71,7 +72,7 @@ public class ServiceRelationClientRespTimeIndicator extends LongAvgIndicator imp return false; ServiceRelationClientRespTimeIndicator indicator = (ServiceRelationClientRespTimeIndicator)obj; - if (entityId != indicator.entityId) + if (!entityId.equals(indicator.entityId)) return false; if (getTimeBucket() != indicator.getTimeBucket()) diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationDispatcher.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationDispatcher.java index 839b49cc3..b61c06a98 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationDispatcher.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationDispatcher.java @@ -19,8 +19,8 @@ package org.apache.skywalking.oap.server.core.analysis.generated.servicerelation; 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.analysis.indicator.expression.*; import org.apache.skywalking.oap.server.core.source.*; /** diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationServerCallSlaIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationServerCallSlaIndicator.java index 1dc46e7ee..159b7eadf 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationServerCallSlaIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationServerCallSlaIndicator.java @@ -21,14 +21,15 @@ package org.apache.skywalking.oap.server.core.analysis.generated.servicerelation import java.util.*; import lombok.*; import org.apache.skywalking.oap.server.core.Const; -import org.apache.skywalking.oap.server.core.alarm.*; +import org.apache.skywalking.oap.server.core.alarm.AlarmMeta; +import org.apache.skywalking.oap.server.core.alarm.AlarmSupported; import org.apache.skywalking.oap.server.core.analysis.indicator.*; import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.IndicatorType; import org.apache.skywalking.oap.server.core.remote.annotation.StreamData; import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData; -import org.apache.skywalking.oap.server.core.source.Scope; -import org.apache.skywalking.oap.server.core.storage.StorageBuilder; import org.apache.skywalking.oap.server.core.storage.annotation.*; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.source.Scope; /** * This class is auto generated. Please don't change this class manually. @@ -40,7 +41,7 @@ import org.apache.skywalking.oap.server.core.storage.annotation.*; @StorageEntity(name = "service_relation_server_call_sla", builder = ServiceRelationServerCallSlaIndicator.Builder.class) public class ServiceRelationServerCallSlaIndicator extends PercentIndicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Override public String id() { String splitJointId = String.valueOf(getTimeBucket()); @@ -71,7 +72,7 @@ public class ServiceRelationServerCallSlaIndicator extends PercentIndicator impl return false; ServiceRelationServerCallSlaIndicator indicator = (ServiceRelationServerCallSlaIndicator)obj; - if (entityId != indicator.entityId) + if (!entityId.equals(indicator.entityId)) return false; if (getTimeBucket() != indicator.getTimeBucket()) diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationServerCpmIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationServerCpmIndicator.java index 4a1f31720..8255b7f91 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationServerCpmIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationServerCpmIndicator.java @@ -21,14 +21,15 @@ package org.apache.skywalking.oap.server.core.analysis.generated.servicerelation import java.util.*; import lombok.*; import org.apache.skywalking.oap.server.core.Const; -import org.apache.skywalking.oap.server.core.alarm.*; +import org.apache.skywalking.oap.server.core.alarm.AlarmMeta; +import org.apache.skywalking.oap.server.core.alarm.AlarmSupported; import org.apache.skywalking.oap.server.core.analysis.indicator.*; import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.IndicatorType; import org.apache.skywalking.oap.server.core.remote.annotation.StreamData; import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData; -import org.apache.skywalking.oap.server.core.source.Scope; -import org.apache.skywalking.oap.server.core.storage.StorageBuilder; import org.apache.skywalking.oap.server.core.storage.annotation.*; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.source.Scope; /** * This class is auto generated. Please don't change this class manually. @@ -40,7 +41,7 @@ import org.apache.skywalking.oap.server.core.storage.annotation.*; @StorageEntity(name = "service_relation_server_cpm", builder = ServiceRelationServerCpmIndicator.Builder.class) public class ServiceRelationServerCpmIndicator extends CPMIndicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Override public String id() { String splitJointId = String.valueOf(getTimeBucket()); @@ -71,7 +72,7 @@ public class ServiceRelationServerCpmIndicator extends CPMIndicator implements A return false; ServiceRelationServerCpmIndicator indicator = (ServiceRelationServerCpmIndicator)obj; - if (entityId != indicator.entityId) + if (!entityId.equals(indicator.entityId)) return false; if (getTimeBucket() != indicator.getTimeBucket()) diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationServerRespTimeIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationServerRespTimeIndicator.java index a67e634c6..ffc9d53b5 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationServerRespTimeIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationServerRespTimeIndicator.java @@ -21,14 +21,15 @@ package org.apache.skywalking.oap.server.core.analysis.generated.servicerelation import java.util.*; import lombok.*; import org.apache.skywalking.oap.server.core.Const; -import org.apache.skywalking.oap.server.core.alarm.*; +import org.apache.skywalking.oap.server.core.alarm.AlarmMeta; +import org.apache.skywalking.oap.server.core.alarm.AlarmSupported; import org.apache.skywalking.oap.server.core.analysis.indicator.*; import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.IndicatorType; import org.apache.skywalking.oap.server.core.remote.annotation.StreamData; import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData; -import org.apache.skywalking.oap.server.core.source.Scope; -import org.apache.skywalking.oap.server.core.storage.StorageBuilder; import org.apache.skywalking.oap.server.core.storage.annotation.*; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.source.Scope; /** * This class is auto generated. Please don't change this class manually. @@ -40,7 +41,7 @@ import org.apache.skywalking.oap.server.core.storage.annotation.*; @StorageEntity(name = "service_relation_server_resp_time", builder = ServiceRelationServerRespTimeIndicator.Builder.class) public class ServiceRelationServerRespTimeIndicator extends LongAvgIndicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Override public String id() { String splitJointId = String.valueOf(getTimeBucket()); @@ -71,7 +72,7 @@ public class ServiceRelationServerRespTimeIndicator extends LongAvgIndicator imp return false; ServiceRelationServerRespTimeIndicator indicator = (ServiceRelationServerRespTimeIndicator)obj; - if (entityId != indicator.entityId) + if (!entityId.equals(indicator.entityId)) return false; if (getTimeBucket() != indicator.getTimeBucket())