From 2db2638fc2b8b053a443cb7a0650ea325d5ea06a Mon Sep 17 00:00:00 2001 From: Jared Tan Date: Wed, 9 Oct 2019 10:05:23 +0800 Subject: [PATCH] code cleanup: remove unnecessary and optimize the function's parameters. (#3577) * code cleanup: remove unnecessary and optimize the function's parameters. * fix code style. --- .../core/query/AggregationQueryService.java | 10 +++++----- .../core/query/TopologyQueryService.java | 3 +-- .../server/core/query/TraceQueryService.java | 20 +++++++++---------- .../query/graphql/resolver/TopologyQuery.java | 8 ++------ 4 files changed, 18 insertions(+), 23 deletions(-) diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/AggregationQueryService.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/AggregationQueryService.java index d35d18a95804..271926c379ea 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/AggregationQueryService.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/AggregationQueryService.java @@ -54,7 +54,7 @@ public List getServiceTopN(final String indName, final int topN, fin final long endTB, final Order order) throws IOException { List topNEntities = getAggregationQueryDAO().getServiceTopN(indName, ValueColumnIds.INSTANCE.getValueCName(indName), topN, downsampling, startTB, endTB, order); for (TopNEntity entity : topNEntities) { - ServiceInventory inventory = moduleManager.find(CoreModule.NAME).provider().getService(ServiceInventoryCache.class).get(Integer.valueOf(entity.getId())); + ServiceInventory inventory = moduleManager.find(CoreModule.NAME).provider().getService(ServiceInventoryCache.class).get(Integer.parseInt(entity.getId())); if (inventory != null) { entity.setName(inventory.getName()); } @@ -66,7 +66,7 @@ public List getAllServiceInstanceTopN(final String indName, final in final long startTB, final long endTB, final Order order) throws IOException { List topNEntities = getAggregationQueryDAO().getAllServiceInstanceTopN(indName, ValueColumnIds.INSTANCE.getValueCName(indName), topN, downsampling, startTB, endTB, order); for (TopNEntity entity : topNEntities) { - ServiceInstanceInventory inventory = moduleManager.find(CoreModule.NAME).provider().getService(ServiceInstanceInventoryCache.class).get(Integer.valueOf(entity.getId())); + ServiceInstanceInventory inventory = moduleManager.find(CoreModule.NAME).provider().getService(ServiceInstanceInventoryCache.class).get(Integer.parseInt(entity.getId())); if (inventory != null) { entity.setName(inventory.getName()); } @@ -78,7 +78,7 @@ public List getServiceInstanceTopN(final int serviceId, final String final Downsampling downsampling, final long startTB, final long endTB, final Order order) throws IOException { List topNEntities = getAggregationQueryDAO().getServiceInstanceTopN(serviceId, indName, ValueColumnIds.INSTANCE.getValueCName(indName), topN, downsampling, startTB, endTB, order); for (TopNEntity entity : topNEntities) { - ServiceInstanceInventory inventory = moduleManager.find(CoreModule.NAME).provider().getService(ServiceInstanceInventoryCache.class).get(Integer.valueOf(entity.getId())); + ServiceInstanceInventory inventory = moduleManager.find(CoreModule.NAME).provider().getService(ServiceInstanceInventoryCache.class).get(Integer.parseInt(entity.getId())); if (inventory != null) { entity.setName(inventory.getName()); } @@ -90,7 +90,7 @@ public List getAllEndpointTopN(final String indName, final int topN, final long startTB, final long endTB, final Order order) throws IOException { List topNEntities = getAggregationQueryDAO().getAllEndpointTopN(indName, ValueColumnIds.INSTANCE.getValueCName(indName), topN, downsampling, startTB, endTB, order); for (TopNEntity entity : topNEntities) { - EndpointInventory inventory = moduleManager.find(CoreModule.NAME).provider().getService(EndpointInventoryCache.class).get(Integer.valueOf(entity.getId())); + EndpointInventory inventory = moduleManager.find(CoreModule.NAME).provider().getService(EndpointInventoryCache.class).get(Integer.parseInt(entity.getId())); if (inventory != null) { entity.setName(inventory.getName()); } @@ -102,7 +102,7 @@ public List getEndpointTopN(final int serviceId, final String indNam final Downsampling downsampling, final long startTB, final long endTB, final Order order) throws IOException { List topNEntities = getAggregationQueryDAO().getEndpointTopN(serviceId, indName, ValueColumnIds.INSTANCE.getValueCName(indName), topN, downsampling, startTB, endTB, order); for (TopNEntity entity : topNEntities) { - EndpointInventory inventory = moduleManager.find(CoreModule.NAME).provider().getService(EndpointInventoryCache.class).get(Integer.valueOf(entity.getId())); + EndpointInventory inventory = moduleManager.find(CoreModule.NAME).provider().getService(EndpointInventoryCache.class).get(Integer.parseInt(entity.getId())); if (inventory != null) { entity.setName(inventory.getName()); } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/TopologyQueryService.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/TopologyQueryService.java index ad3a814d9ec2..a30998574395 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/TopologyQueryService.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/TopologyQueryService.java @@ -79,8 +79,7 @@ private EndpointInventoryCache getEndpointInventoryCache() { return endpointInventoryCache; } - public Topology getGlobalTopology(final Downsampling downsampling, final long startTB, final long endTB, final long startTimestamp, - final long endTimestamp) throws IOException { + public Topology getGlobalTopology(final Downsampling downsampling, final long startTB, final long endTB) throws IOException { logger.debug("Downsampling: {}, startTimeBucket: {}, endTimeBucket: {}", downsampling, startTB, endTB); List serviceRelationServerCalls = getTopologyQueryDAO().loadServerSideServiceRelations(downsampling, startTB, endTB); List serviceRelationClientCalls = getTopologyQueryDAO().loadClientSideServiceRelations(downsampling, startTB, endTB); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/TraceQueryService.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/TraceQueryService.java index 6ff4690e42d0..b32859c4d123 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/TraceQueryService.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/TraceQueryService.java @@ -155,10 +155,10 @@ private List buildSpanV2List(String traceId, String segmentId, int service span.setLayer(spanObject.getSpanLayer().name()); span.setType(spanObject.getSpanType().name()); - String segmentSpanId = segmentId + Const.SEGMENT_SPAN_SPLIT + String.valueOf(spanObject.getSpanId()); + String segmentSpanId = segmentId + Const.SEGMENT_SPAN_SPLIT + spanObject.getSpanId(); span.setSegmentSpanId(segmentSpanId); - String segmentParentSpanId = segmentId + Const.SEGMENT_SPAN_SPLIT + String.valueOf(spanObject.getParentSpanId()); + String segmentParentSpanId = segmentId + Const.SEGMENT_SPAN_SPLIT + spanObject.getParentSpanId(); span.setSegmentParentSpanId(segmentParentSpanId); if (spanObject.getPeerId() == 0) { @@ -209,14 +209,14 @@ private List buildSpanV2List(String traceId, String segmentId, int service StringBuilder segmentIdBuilder = new StringBuilder(); for (int i = 0; i < uniqueId.getIdPartsList().size(); i++) { if (i == 0) { - segmentIdBuilder.append(String.valueOf(uniqueId.getIdPartsList().get(i))); + segmentIdBuilder.append(uniqueId.getIdPartsList().get(i)); } else { - segmentIdBuilder.append(".").append(String.valueOf(uniqueId.getIdPartsList().get(i))); + segmentIdBuilder.append(".").append(uniqueId.getIdPartsList().get(i)); } } ref.setParentSegmentId(segmentIdBuilder.toString()); - span.setSegmentParentSpanId(ref.getParentSegmentId() + Const.SEGMENT_SPAN_SPLIT + String.valueOf(ref.getParentSpanId())); + span.setSegmentParentSpanId(ref.getParentSegmentId() + Const.SEGMENT_SPAN_SPLIT + ref.getParentSpanId()); span.getRefs().add(ref); }); @@ -264,10 +264,10 @@ private List buildSpanList(String traceId, String segmentId, int serviceId span.setLayer(spanObject.getSpanLayer().name()); span.setType(spanObject.getSpanType().name()); - String segmentSpanId = segmentId + Const.SEGMENT_SPAN_SPLIT + String.valueOf(spanObject.getSpanId()); + String segmentSpanId = segmentId + Const.SEGMENT_SPAN_SPLIT + spanObject.getSpanId(); span.setSegmentSpanId(segmentSpanId); - String segmentParentSpanId = segmentId + Const.SEGMENT_SPAN_SPLIT + String.valueOf(spanObject.getParentSpanId()); + String segmentParentSpanId = segmentId + Const.SEGMENT_SPAN_SPLIT + spanObject.getParentSpanId(); span.setSegmentParentSpanId(segmentParentSpanId); if (spanObject.getPeerId() == 0) { @@ -318,14 +318,14 @@ private List buildSpanList(String traceId, String segmentId, int serviceId StringBuilder segmentIdBuilder = new StringBuilder(); for (int i = 0; i < uniqueId.getIdPartsList().size(); i++) { if (i == 0) { - segmentIdBuilder.append(String.valueOf(uniqueId.getIdPartsList().get(i))); + segmentIdBuilder.append(uniqueId.getIdPartsList().get(i)); } else { - segmentIdBuilder.append(".").append(String.valueOf(uniqueId.getIdPartsList().get(i))); + segmentIdBuilder.append(".").append(uniqueId.getIdPartsList().get(i)); } } ref.setParentSegmentId(segmentIdBuilder.toString()); - span.setSegmentParentSpanId(ref.getParentSegmentId() + Const.SEGMENT_SPAN_SPLIT + String.valueOf(ref.getParentSpanId())); + span.setSegmentParentSpanId(ref.getParentSegmentId() + Const.SEGMENT_SPAN_SPLIT + ref.getParentSpanId()); span.getRefs().add(ref); }); diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/TopologyQuery.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/TopologyQuery.java index 64282612dfce..c3903400efb0 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/TopologyQuery.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/TopologyQuery.java @@ -20,7 +20,6 @@ import com.coxautodev.graphql.tools.GraphQLQueryResolver; import java.io.IOException; -import java.text.ParseException; import org.apache.skywalking.oap.query.graphql.type.Duration; import org.apache.skywalking.oap.server.core.CoreModule; import org.apache.skywalking.oap.server.core.query.*; @@ -46,14 +45,11 @@ private TopologyQueryService getQueryService() { return queryService; } - public Topology getGlobalTopology(final Duration duration) throws IOException, ParseException { + public Topology getGlobalTopology(final Duration duration) throws IOException { long startTimeBucket = DurationUtils.INSTANCE.exchangeToTimeBucket(duration.getStart()); long endTimeBucket = DurationUtils.INSTANCE.exchangeToTimeBucket(duration.getEnd()); - long startTimestamp = DurationUtils.INSTANCE.startTimeToTimestamp(duration.getStep(), duration.getStart()); - long endTimestamp = DurationUtils.INSTANCE.endTimeToTimestamp(duration.getStep(), duration.getEnd()); - - return getQueryService().getGlobalTopology(StepToDownsampling.transform(duration.getStep()), startTimeBucket, endTimeBucket, startTimestamp, endTimestamp); + return getQueryService().getGlobalTopology(StepToDownsampling.transform(duration.getStep()), startTimeBucket, endTimeBucket); } public Topology getServiceTopology(final int serviceId, final Duration duration) throws IOException {