优化代码

java110-bean/src/main/java/com/java110/dto/trace/TraceAnnotationsDto.java

@@ -11,7 +11,7 @@ public class TraceAnnotationsDto implements Serializable {
     private String value;
 
 
-    private TraceEndpointDto traceEndpoint;
+    private TraceEndpointDto endpoint;
 
 
     public long getTimestamp() {
@@ -30,11 +30,11 @@ public class TraceAnnotationsDto implements Serializable {
         this.value = value;
     }
 
-    public TraceEndpointDto getTraceEndpoint() {
-        return traceEndpoint;
+    public TraceEndpointDto getEndpoint() {
+        return endpoint;
     }
 
-    public void setTraceEndpoint(TraceEndpointDto traceEndpoint) {
-        this.traceEndpoint = traceEndpoint;
+    public void setEndpoint(TraceEndpointDto endpoint) {
+        this.endpoint = endpoint;
     }
 }

java110-bean/src/main/java/com/java110/dto/trace/TraceDto.java

@@ -10,7 +10,7 @@ public class TraceDto implements Serializable {
     private String name;
     private long timestamp;
 
-    private List<TraceAnnotationsDto> traceAnnotations;
+    private List<TraceAnnotationsDto> annotations;
 
 
     public String getId() {
@@ -53,11 +53,11 @@ public class TraceDto implements Serializable {
         this.timestamp = timestamp;
     }
 
-    public List<TraceAnnotationsDto> getTraceAnnotations() {
-        return traceAnnotations;
+    public List<TraceAnnotationsDto> getAnnotations() {
+        return annotations;
     }
 
-    public void setTraceAnnotations(List<TraceAnnotationsDto> traceAnnotations) {
-        this.traceAnnotations = traceAnnotations;
+    public void setAnnotations(List<TraceAnnotationsDto> annotations) {
+        this.annotations = annotations;
     }
 }

java110-core/src/main/java/com/java110/core/factory/Java110TraceFactory.java

@@ -136,13 +136,13 @@ public class Java110TraceFactory {
             ip = "127.0.0.1";
         }
         traceEndpointDto.setIpv4(ip);
-        traceAnnotationsDto.setTraceEndpoint(traceEndpointDto);
+        traceAnnotationsDto.setEndpoint(traceEndpointDto);
         traceAnnotationsDto.setTimestamp(DateUtil.getCurrentDate().getTime());
         traceAnnotationsDto.setValue(event);
 
         List<TraceAnnotationsDto> traceAnnotationsDtos = new ArrayList<>();
         traceAnnotationsDtos.add(traceAnnotationsDto);
-        traceDto.setTraceAnnotations(traceAnnotationsDtos);
+        traceDto.setAnnotations(traceAnnotationsDtos);
         traceDto.setTraceId(traceId);
         put(traceDto.getId(), traceDto);
         putSpanId(SPAN_ID, traceDto.getId());
@@ -176,13 +176,13 @@ public class Java110TraceFactory {
             ip = "127.0.0.1";
         }
         traceEndpointDto.setIpv4(ip);
-        traceAnnotationsDto.setTraceEndpoint(traceEndpointDto);
+        traceAnnotationsDto.setEndpoint(traceEndpointDto);
         traceAnnotationsDto.setTimestamp(DateUtil.getCurrentDate().getTime());
         traceAnnotationsDto.setValue(event);
 
-        List<TraceAnnotationsDto> traceAnnotationsDtos = traceDto.getTraceAnnotations();
+        List<TraceAnnotationsDto> traceAnnotationsDtos = traceDto.getAnnotations();
         traceAnnotationsDtos.add(traceAnnotationsDto);
-        traceDto.setTraceAnnotations(traceAnnotationsDtos);
+        traceDto.setAnnotations(traceAnnotationsDtos);
         put(getSpanId(SPAN_ID), traceDto);
         //判断是否为cr
         if (!TraceAnnotationsDto.VALUE_CLIENT_RECEIVE.equals(traceAnnotationsDto.getValue())) {