This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch es-idx-merging
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/es-idx-merging by this push:
new dab8a2f Fix style.
dab8a2f is described below
commit dab8a2f72b59c89d624c8352968874b1da84e446
Author: Wu Sheng <[email protected]>
AuthorDate: Sat Feb 15 20:53:45 2020 +0800
Fix style.
---
.../oap/server/receiver/trace/mock/RegisterMock.java | 3 ---
.../oap/server/receiver/trace/mock/ServiceAMock.java | 10 +++++-----
.../oap/server/receiver/trace/mock/ServiceBMock.java | 3 ---
.../oap/server/receiver/trace/mock/ServiceCMock.java | 3 ---
.../oap/server/receiver/trace/mock/UniqueIdBuilder.java | 3 ---
5 files changed, 5 insertions(+), 17 deletions(-)
diff --git
a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/mock/RegisterMock.java
b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/mock/RegisterMock.java
index ed9c94d..ea7e03f 100644
---
a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/mock/RegisterMock.java
+++
b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/mock/RegisterMock.java
@@ -35,9 +35,6 @@ import org.apache.skywalking.apm.network.register.v2.Services;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-/**
- * @author peng-yongsheng
- */
class RegisterMock {
private static final Logger logger =
LoggerFactory.getLogger(RegisterMock.class);
diff --git
a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/mock/ServiceAMock.java
b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/mock/ServiceAMock.java
index 65ac83e..ba6660a 100644
---
a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/mock/ServiceAMock.java
+++
b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/mock/ServiceAMock.java
@@ -20,14 +20,14 @@ package
org.apache.skywalking.oap.server.receiver.trace.mock;
import com.google.protobuf.ByteString;
import io.grpc.stub.StreamObserver;
-import org.apache.skywalking.apm.network.language.agent.*;
+import org.apache.skywalking.apm.network.language.agent.SpanLayer;
+import org.apache.skywalking.apm.network.language.agent.SpanType;
+import org.apache.skywalking.apm.network.language.agent.UniqueId;
+import org.apache.skywalking.apm.network.language.agent.UpstreamSegment;
import org.apache.skywalking.apm.network.language.agent.v2.SegmentObject;
import org.apache.skywalking.apm.network.language.agent.v2.SpanObjectV2;
import org.apache.skywalking.apm.network.trace.component.ComponentsDefine;
-/**
- * @author peng-yongsheng
- */
class ServiceAMock {
static String REST_ENDPOINT = "/dubbox-case/case/dubbox-rest";
@@ -47,7 +47,7 @@ class ServiceAMock {
}
void mock(StreamObserver<UpstreamSegment> streamObserver, UniqueId.Builder
traceId,
- UniqueId.Builder segmentId, long startTimestamp, boolean isPrepare) {
+ UniqueId.Builder segmentId, long startTimestamp, boolean
isPrepare) {
UpstreamSegment.Builder upstreamSegment = UpstreamSegment.newBuilder();
upstreamSegment.addGlobalTraceIds(traceId);
upstreamSegment.setSegment(createSegment(startTimestamp, segmentId,
isPrepare));
diff --git
a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/mock/ServiceBMock.java
b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/mock/ServiceBMock.java
index 46aab9c..da26ab7 100644
---
a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/mock/ServiceBMock.java
+++
b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/mock/ServiceBMock.java
@@ -31,9 +31,6 @@ import
org.apache.skywalking.apm.network.language.agent.v2.SegmentReference;
import org.apache.skywalking.apm.network.language.agent.v2.SpanObjectV2;
import org.apache.skywalking.apm.network.trace.component.ComponentsDefine;
-/**
- * @author peng-yongsheng
- */
class ServiceBMock {
private final RegisterMock registerMock;
diff --git
a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/mock/ServiceCMock.java
b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/mock/ServiceCMock.java
index 17897c8..8149b7a 100644
---
a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/mock/ServiceCMock.java
+++
b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/mock/ServiceCMock.java
@@ -30,9 +30,6 @@ import
org.apache.skywalking.apm.network.language.agent.v2.SegmentReference;
import org.apache.skywalking.apm.network.language.agent.v2.SpanObjectV2;
import org.apache.skywalking.apm.network.trace.component.ComponentsDefine;
-/**
- * @author peng-yongsheng
- */
class ServiceCMock {
private final RegisterMock registerMock;
diff --git
a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/mock/UniqueIdBuilder.java
b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/mock/UniqueIdBuilder.java
index e64adff..de1b171 100644
---
a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/mock/UniqueIdBuilder.java
+++
b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/mock/UniqueIdBuilder.java
@@ -21,9 +21,6 @@ package org.apache.skywalking.oap.server.receiver.trace.mock;
import java.util.concurrent.atomic.AtomicLong;
import org.apache.skywalking.apm.network.language.agent.UniqueId;
-/**
- * @author peng-yongsheng
- */
public enum UniqueIdBuilder {
INSTANCE;