[skywalking] branch new-topo updated: Change endpoint point id rule to match service relation id rule.

[wu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a commit to branch new-topo
in repository https://gitbox.apache.org/repos/asf/skywalking.git


The following commit(s) were added to refs/heads/new-topo by this push:
     new bcc173b  Change endpoint point id rule to match service relation id rule.
bcc173b is described below

commit bcc173b3d3675d2601a09def9295ca6ec83522b8
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Mon May 13 11:55:24 2019 +0800

    Change endpoint point id rule to match service relation id rule.
---
 .../apache/skywalking/oap/server/core/source/EndpointRelation.java  | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/EndpointRelation.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/EndpointRelation.java
index 648daec..f2dfd41 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/EndpointRelation.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/EndpointRelation.java
@@ -34,11 +34,7 @@ public class EndpointRelation extends Source {
     }
 
     @Override public String getEntityId() {
-        return String.valueOf(endpointId) + Const.ID_SPLIT + String.valueOf(childEndpointId) + Const.ID_SPLIT + String.valueOf(componentId);
-    }
-
-    public static String buildEntityId(int endpointId, int childEndpointId, int componentId) {
-        return String.valueOf(endpointId) + Const.ID_SPLIT + String.valueOf(childEndpointId) + Const.ID_SPLIT + String.valueOf(componentId);
+        return String.valueOf(endpointId) + Const.ID_SPLIT + String.valueOf(childEndpointId);
     }
 
     @Getter @Setter private int endpointId;