This is an automated email from the ASF dual-hosted git repository.
mikexue pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/eventmesh.git
The following commit(s) were added to refs/heads/master by this push:
new 27f0caa70 [ISSUE#4213]Resolve the compilation warning for the lombok
annotation @Data (#4214)
27f0caa70 is described below
commit 27f0caa70a813f784b4d3f125c9287ad26ff578b
Author: mxsm <[email protected]>
AuthorDate: Fri Jul 14 14:25:52 2023 +0800
[ISSUE#4213]Resolve the compilation warning for the lombok annotation @Data
(#4214)
---
.../config/OpenFunctionServerConfig.java | 2 +
.../sink/config/OpenFunctionSinkConfig.java | 2 +
.../source/config/OpenFunctionSourceConfig.java | 2 +
.../rocketmq/config/RocketMQServerConfig.java | 2 +
.../rocketmq/sink/config/RocketMQSinkConfig.java | 2 +
.../source/config/RocketMQSourceConfig.java | 2 +
.../openconnect/api/config/SinkConfig.java | 2 +
.../openconnect/api/config/SourceConfig.java | 2 +
.../eventmesh/trace/api/AbstractTraceService.java | 43 ++++++++++++----------
.../eventmesh/trace/jaeger/JaegerTraceService.java | 6 ++-
.../trace/pinpoint/PinpointTraceService.java | 6 ++-
.../eventmesh/trace/zipkin/ZipkinTraceService.java | 6 ++-
12 files changed, 51 insertions(+), 26 deletions(-)
diff --git
a/eventmesh-connectors/eventmesh-connector-openfunction/src/main/java/org/apache/eventmesh/connector/openfunction/config/OpenFunctionServerConfig.java
b/eventmesh-connectors/eventmesh-connector-openfunction/src/main/java/org/apache/eventmesh/connector/openfunction/config/OpenFunctionServerConfig.java
index 293dd1361..2cf28000f 100644
---
a/eventmesh-connectors/eventmesh-connector-openfunction/src/main/java/org/apache/eventmesh/connector/openfunction/config/OpenFunctionServerConfig.java
+++
b/eventmesh-connectors/eventmesh-connector-openfunction/src/main/java/org/apache/eventmesh/connector/openfunction/config/OpenFunctionServerConfig.java
@@ -20,8 +20,10 @@ package org.apache.eventmesh.connector.openfunction.config;
import org.apache.eventmesh.openconnect.api.config.Config;
import lombok.Data;
+import lombok.EqualsAndHashCode;
@Data
+@EqualsAndHashCode(callSuper = true)
public class OpenFunctionServerConfig extends Config {
private int serverPort;
diff --git
a/eventmesh-connectors/eventmesh-connector-openfunction/src/main/java/org/apache/eventmesh/connector/openfunction/sink/config/OpenFunctionSinkConfig.java
b/eventmesh-connectors/eventmesh-connector-openfunction/src/main/java/org/apache/eventmesh/connector/openfunction/sink/config/OpenFunctionSinkConfig.java
index a1ee99f68..6e4fbe3dc 100644
---
a/eventmesh-connectors/eventmesh-connector-openfunction/src/main/java/org/apache/eventmesh/connector/openfunction/sink/config/OpenFunctionSinkConfig.java
+++
b/eventmesh-connectors/eventmesh-connector-openfunction/src/main/java/org/apache/eventmesh/connector/openfunction/sink/config/OpenFunctionSinkConfig.java
@@ -20,8 +20,10 @@ package
org.apache.eventmesh.connector.openfunction.sink.config;
import org.apache.eventmesh.openconnect.api.config.SinkConfig;
import lombok.Data;
+import lombok.EqualsAndHashCode;
@Data
+@EqualsAndHashCode(callSuper = true)
public class OpenFunctionSinkConfig extends SinkConfig {
public SinkConnectorConfig sinkConnectorConfig;
diff --git
a/eventmesh-connectors/eventmesh-connector-openfunction/src/main/java/org/apache/eventmesh/connector/openfunction/source/config/OpenFunctionSourceConfig.java
b/eventmesh-connectors/eventmesh-connector-openfunction/src/main/java/org/apache/eventmesh/connector/openfunction/source/config/OpenFunctionSourceConfig.java
index 6baf076c1..f3f5b5275 100644
---
a/eventmesh-connectors/eventmesh-connector-openfunction/src/main/java/org/apache/eventmesh/connector/openfunction/source/config/OpenFunctionSourceConfig.java
+++
b/eventmesh-connectors/eventmesh-connector-openfunction/src/main/java/org/apache/eventmesh/connector/openfunction/source/config/OpenFunctionSourceConfig.java
@@ -20,8 +20,10 @@ package
org.apache.eventmesh.connector.openfunction.source.config;
import org.apache.eventmesh.openconnect.api.config.SourceConfig;
import lombok.Data;
+import lombok.EqualsAndHashCode;
@Data
+@EqualsAndHashCode(callSuper = true)
public class OpenFunctionSourceConfig extends SourceConfig {
public SourceConnectorConfig sourceConnectorConfig;
diff --git
a/eventmesh-connectors/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/config/RocketMQServerConfig.java
b/eventmesh-connectors/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/config/RocketMQServerConfig.java
index be90ee208..4dc574cda 100644
---
a/eventmesh-connectors/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/config/RocketMQServerConfig.java
+++
b/eventmesh-connectors/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/config/RocketMQServerConfig.java
@@ -20,8 +20,10 @@ package org.apache.eventmesh.connector.rocketmq.config;
import org.apache.eventmesh.openconnect.api.config.Config;
import lombok.Data;
+import lombok.EqualsAndHashCode;
@Data
+@EqualsAndHashCode(callSuper = true)
public class RocketMQServerConfig extends Config {
private boolean sourceEnable;
diff --git
a/eventmesh-connectors/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/sink/config/RocketMQSinkConfig.java
b/eventmesh-connectors/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/sink/config/RocketMQSinkConfig.java
index b59dd523d..bc4191c9b 100644
---
a/eventmesh-connectors/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/sink/config/RocketMQSinkConfig.java
+++
b/eventmesh-connectors/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/sink/config/RocketMQSinkConfig.java
@@ -20,8 +20,10 @@ package org.apache.eventmesh.connector.rocketmq.sink.config;
import org.apache.eventmesh.openconnect.api.config.SinkConfig;
import lombok.Data;
+import lombok.EqualsAndHashCode;
@Data
+@EqualsAndHashCode(callSuper = true)
public class RocketMQSinkConfig extends SinkConfig {
public SinkConnectorConfig connectorConfig;
diff --git
a/eventmesh-connectors/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/source/config/RocketMQSourceConfig.java
b/eventmesh-connectors/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/source/config/RocketMQSourceConfig.java
index 33d9b9d00..43a74fabd 100644
---
a/eventmesh-connectors/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/source/config/RocketMQSourceConfig.java
+++
b/eventmesh-connectors/eventmesh-connector-rocketmq/src/main/java/org/apache/eventmesh/connector/rocketmq/source/config/RocketMQSourceConfig.java
@@ -20,8 +20,10 @@ package
org.apache.eventmesh.connector.rocketmq.source.config;
import org.apache.eventmesh.openconnect.api.config.SourceConfig;
import lombok.Data;
+import lombok.EqualsAndHashCode;
@Data
+@EqualsAndHashCode(callSuper = true)
public class RocketMQSourceConfig extends SourceConfig {
public SourceConnectorConfig connectorConfig;
diff --git
a/eventmesh-openconnect/eventmesh-openconnect-java/src/main/java/org/apache/eventmesh/openconnect/api/config/SinkConfig.java
b/eventmesh-openconnect/eventmesh-openconnect-java/src/main/java/org/apache/eventmesh/openconnect/api/config/SinkConfig.java
index 7a7e997a5..527d02e04 100644
---
a/eventmesh-openconnect/eventmesh-openconnect-java/src/main/java/org/apache/eventmesh/openconnect/api/config/SinkConfig.java
+++
b/eventmesh-openconnect/eventmesh-openconnect-java/src/main/java/org/apache/eventmesh/openconnect/api/config/SinkConfig.java
@@ -18,8 +18,10 @@
package org.apache.eventmesh.openconnect.api.config;
import lombok.Data;
+import lombok.EqualsAndHashCode;
@Data
+@EqualsAndHashCode(callSuper = true)
public abstract class SinkConfig extends Config {
private PubSubConfig pubSubConfig;
diff --git
a/eventmesh-openconnect/eventmesh-openconnect-java/src/main/java/org/apache/eventmesh/openconnect/api/config/SourceConfig.java
b/eventmesh-openconnect/eventmesh-openconnect-java/src/main/java/org/apache/eventmesh/openconnect/api/config/SourceConfig.java
index d18ac4c6d..ab7c731b9 100644
---
a/eventmesh-openconnect/eventmesh-openconnect-java/src/main/java/org/apache/eventmesh/openconnect/api/config/SourceConfig.java
+++
b/eventmesh-openconnect/eventmesh-openconnect-java/src/main/java/org/apache/eventmesh/openconnect/api/config/SourceConfig.java
@@ -18,8 +18,10 @@
package org.apache.eventmesh.openconnect.api.config;
import lombok.Data;
+import lombok.EqualsAndHashCode;
@Data
+@EqualsAndHashCode(callSuper = true)
public abstract class SourceConfig extends Config {
private PubSubConfig pubSubConfig;
diff --git
a/eventmesh-trace-plugin/eventmesh-trace-api/src/main/java/org/apache/eventmesh/trace/api/AbstractTraceService.java
b/eventmesh-trace-plugin/eventmesh-trace-api/src/main/java/org/apache/eventmesh/trace/api/AbstractTraceService.java
index 89928a578..b5f837c0c 100644
---
a/eventmesh-trace-plugin/eventmesh-trace-api/src/main/java/org/apache/eventmesh/trace/api/AbstractTraceService.java
+++
b/eventmesh-trace-plugin/eventmesh-trace-api/src/main/java/org/apache/eventmesh/trace/api/AbstractTraceService.java
@@ -44,12 +44,14 @@ import io.opentelemetry.sdk.trace.SdkTracerProvider;
import io.opentelemetry.sdk.trace.SdkTracerProviderBuilder;
import io.opentelemetry.sdk.trace.SpanProcessor;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
/**
* The abstract base class for EventMeshTraceService's implementations
*/
-@Data
+@Getter
+@Setter
public abstract class AbstractTraceService implements EventMeshTraceService {
protected transient SdkTracerProvider sdkTracerProvider;
@@ -89,26 +91,26 @@ public abstract class AbstractTraceService implements
EventMeshTraceService {
@Override
public Span createSpan(final String spanName,
- final SpanKind spanKind,
- final long startTimestamp,
- final TimeUnit timeUnit,
- final Context context,
- final boolean isSpanFinishInOtherThread) throws
TraceException {
+ final SpanKind spanKind,
+ final long startTimestamp,
+ final TimeUnit timeUnit,
+ final Context context,
+ final boolean isSpanFinishInOtherThread) throws TraceException {
return tracer.spanBuilder(spanName)
- .setParent(context)
- .setSpanKind(spanKind)
- .setStartTimestamp(startTimestamp, timeUnit)
- .startSpan();
+ .setParent(context)
+ .setSpanKind(spanKind)
+ .setStartTimestamp(startTimestamp, timeUnit)
+ .startSpan();
}
@Override
public Span createSpan(String spanName, SpanKind spanKind, Context context,
- boolean isSpanFinishInOtherThread) throws
TraceException {
+ boolean isSpanFinishInOtherThread) throws TraceException {
return tracer.spanBuilder(spanName)
- .setParent(context)
- .setSpanKind(spanKind)
- .setStartTimestamp(System.currentTimeMillis(),
TimeUnit.MILLISECONDS)
- .startSpan();
+ .setParent(context)
+ .setSpanKind(spanKind)
+ .setStartTimestamp(System.currentTimeMillis(),
TimeUnit.MILLISECONDS)
+ .startSpan();
}
@Override
@@ -124,21 +126,22 @@ public abstract class AbstractTraceService implements
EventMeshTraceService {
/**
* Init the common fields
+ *
* @param spanProcessor
* @param serviceNameResource
*/
protected void initVars(SpanProcessor spanProcessor, Resource
serviceNameResource) {
SdkTracerProviderBuilder builder = SdkTracerProvider.builder()
- .addSpanProcessor(spanProcessor);
+ .addSpanProcessor(spanProcessor);
if (serviceNameResource != null) {
builder.setResource(Resource.getDefault().merge(serviceNameResource));
}
sdkTracerProvider = builder.build();
final OpenTelemetry openTelemetry = OpenTelemetrySdk.builder()
-
.setPropagators(ContextPropagators.create(W3CTraceContextPropagator.getInstance()))
- .setTracerProvider(sdkTracerProvider)
- .build();
+
.setPropagators(ContextPropagators.create(W3CTraceContextPropagator.getInstance()))
+ .setTracerProvider(sdkTracerProvider)
+ .build();
tracer = openTelemetry.getTracer(EventMeshTraceConstants.SERVICE_NAME);
textMapPropagator =
openTelemetry.getPropagators().getTextMapPropagator();
diff --git
a/eventmesh-trace-plugin/eventmesh-trace-jaeger/src/main/java/org/apache/eventmesh/trace/jaeger/JaegerTraceService.java
b/eventmesh-trace-plugin/eventmesh-trace-jaeger/src/main/java/org/apache/eventmesh/trace/jaeger/JaegerTraceService.java
index 0f48aed52..76bbc12fc 100644
---
a/eventmesh-trace-plugin/eventmesh-trace-jaeger/src/main/java/org/apache/eventmesh/trace/jaeger/JaegerTraceService.java
+++
b/eventmesh-trace-plugin/eventmesh-trace-jaeger/src/main/java/org/apache/eventmesh/trace/jaeger/JaegerTraceService.java
@@ -34,16 +34,18 @@ import io.opentelemetry.sdk.resources.Resource;
import io.opentelemetry.sdk.trace.SpanProcessor;
import io.opentelemetry.sdk.trace.export.BatchSpanProcessor;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
@Config(field = "jaegerConfiguration")
@Config(field = "exporterConfiguration")
-@Data
public class JaegerTraceService extends AbstractTraceService {
/**
* Unified configuration class corresponding to jaeger.properties
*/
+ @Getter
+ @Setter
private transient JaegerConfiguration jaegerConfiguration;
@Override
diff --git
a/eventmesh-trace-plugin/eventmesh-trace-pinpoint/src/main/java/org/apache/eventmesh/trace/pinpoint/PinpointTraceService.java
b/eventmesh-trace-plugin/eventmesh-trace-pinpoint/src/main/java/org/apache/eventmesh/trace/pinpoint/PinpointTraceService.java
index f3907e180..2316cbc0e 100644
---
a/eventmesh-trace-plugin/eventmesh-trace-pinpoint/src/main/java/org/apache/eventmesh/trace/pinpoint/PinpointTraceService.java
+++
b/eventmesh-trace-plugin/eventmesh-trace-pinpoint/src/main/java/org/apache/eventmesh/trace/pinpoint/PinpointTraceService.java
@@ -28,19 +28,21 @@ import java.util.concurrent.TimeUnit;
import io.opentelemetry.sdk.trace.SpanProcessor;
import io.opentelemetry.sdk.trace.export.BatchSpanProcessor;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
/**
* https://github.com/pinpoint-apm/pinpoint
*/
@Config(field = "pinpointConfiguration")
@Config(field = "exporterConfiguration")
-@Data
public class PinpointTraceService extends AbstractTraceService {
/**
* Unified configuration class corresponding to pinpoint.properties
*/
+ @Getter
+ @Setter
private transient PinpointConfiguration pinpointConfiguration;
@Override
diff --git
a/eventmesh-trace-plugin/eventmesh-trace-zipkin/src/main/java/org/apache/eventmesh/trace/zipkin/ZipkinTraceService.java
b/eventmesh-trace-plugin/eventmesh-trace-zipkin/src/main/java/org/apache/eventmesh/trace/zipkin/ZipkinTraceService.java
index 600563c92..75a4d5b46 100644
---
a/eventmesh-trace-plugin/eventmesh-trace-zipkin/src/main/java/org/apache/eventmesh/trace/zipkin/ZipkinTraceService.java
+++
b/eventmesh-trace-plugin/eventmesh-trace-zipkin/src/main/java/org/apache/eventmesh/trace/zipkin/ZipkinTraceService.java
@@ -34,7 +34,8 @@ import io.opentelemetry.sdk.resources.Resource;
import io.opentelemetry.sdk.trace.SpanProcessor;
import io.opentelemetry.sdk.trace.export.BatchSpanProcessor;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
/**
@@ -42,7 +43,8 @@ import lombok.Data;
*/
@Config(field = "zipkinConfiguration")
@Config(field = "exporterConfiguration")
-@Data
+@Getter
+@Setter
public class ZipkinTraceService extends AbstractTraceService {
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
