You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@eventmesh.apache.org by mi...@apache.org on 2022/12/01 09:15:01 UTC
[incubator-eventmesh] branch master updated: Simplify spi usage
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/incubator-eventmesh.git
The following commit(s) were added to refs/heads/master by this push:
new 0f7a8d8e5 Simplify spi usage
new 2734d5102 Merge pull request #2326 from weihubeats/spi
0f7a8d8e5 is described below
commit 0f7a8d8e5c2285b2d48f62c4dfd9f9b98c0effa9
Author: weihu <we...@163.com>
AuthorDate: Thu Dec 1 09:28:39 2022 +0800
Simplify spi usage
---
.../org/apache/eventmesh/api/connector/ConnectorResourceService.java | 2 +-
.../src/main/java/org/apache/eventmesh/metrics/api/MetricsRegistry.java | 2 +-
.../main/java/org/apache/eventmesh/protocol/api/ProtocolAdaptor.java | 2 +-
.../main/java/org/apache/eventmesh/api/registry/RegistryService.java | 2 +-
.../src/main/java/org/apache/eventmesh/api/acl/AclService.java | 2 +-
.../src/main/java/org/apache/eventmesh/api/auth/AuthService.java | 2 +-
eventmesh-spi/src/main/java/org/apache/eventmesh/spi/EventMeshSPI.java | 2 +-
.../java/org/apache/eventmesh/spi/example/TestSingletonExtension.java | 2 +-
.../main/java/org/apache/eventmesh/trace/api/EventMeshTraceService.java | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/eventmesh-connector-plugin/eventmesh-connector-api/src/main/java/org/apache/eventmesh/api/connector/ConnectorResourceService.java b/eventmesh-connector-plugin/eventmesh-connector-api/src/main/java/org/apache/eventmesh/api/connector/ConnectorResourceService.java
index 8b6cff71c..2657fe5ab 100644
--- a/eventmesh-connector-plugin/eventmesh-connector-api/src/main/java/org/apache/eventmesh/api/connector/ConnectorResourceService.java
+++ b/eventmesh-connector-plugin/eventmesh-connector-api/src/main/java/org/apache/eventmesh/api/connector/ConnectorResourceService.java
@@ -23,7 +23,7 @@ import org.apache.eventmesh.spi.EventMeshSPI;
/**
* ConnectorResourceService
*/
-@EventMeshSPI(isSingleton = true, eventMeshExtensionType = EventMeshExtensionType.CONNECTOR)
+@EventMeshSPI(eventMeshExtensionType = EventMeshExtensionType.CONNECTOR)
public interface ConnectorResourceService {
/**
diff --git a/eventmesh-metrics-plugin/eventmesh-metrics-api/src/main/java/org/apache/eventmesh/metrics/api/MetricsRegistry.java b/eventmesh-metrics-plugin/eventmesh-metrics-api/src/main/java/org/apache/eventmesh/metrics/api/MetricsRegistry.java
index 6a1bf2ef0..e73bcf321 100644
--- a/eventmesh-metrics-plugin/eventmesh-metrics-api/src/main/java/org/apache/eventmesh/metrics/api/MetricsRegistry.java
+++ b/eventmesh-metrics-plugin/eventmesh-metrics-api/src/main/java/org/apache/eventmesh/metrics/api/MetricsRegistry.java
@@ -27,7 +27,7 @@ import org.apache.eventmesh.spi.EventMeshSPI;
*
* @since 1.4.0
*/
-@EventMeshSPI(isSingleton = true, eventMeshExtensionType = EventMeshExtensionType.METRICS)
+@EventMeshSPI(eventMeshExtensionType = EventMeshExtensionType.METRICS)
public interface MetricsRegistry {
/**
diff --git a/eventmesh-protocol-plugin/eventmesh-protocol-api/src/main/java/org/apache/eventmesh/protocol/api/ProtocolAdaptor.java b/eventmesh-protocol-plugin/eventmesh-protocol-api/src/main/java/org/apache/eventmesh/protocol/api/ProtocolAdaptor.java
index b6d5c83a4..8d7c35fd7 100644
--- a/eventmesh-protocol-plugin/eventmesh-protocol-api/src/main/java/org/apache/eventmesh/protocol/api/ProtocolAdaptor.java
+++ b/eventmesh-protocol-plugin/eventmesh-protocol-api/src/main/java/org/apache/eventmesh/protocol/api/ProtocolAdaptor.java
@@ -33,7 +33,7 @@ import io.cloudevents.CloudEvent;
*
* @since 1.3.0
*/
-@EventMeshSPI(isSingleton = true, eventMeshExtensionType = EventMeshExtensionType.PROTOCOL)
+@EventMeshSPI(eventMeshExtensionType = EventMeshExtensionType.PROTOCOL)
public interface ProtocolAdaptor<T extends ProtocolTransportObject> {
/**
diff --git a/eventmesh-registry-plugin/eventmesh-registry-api/src/main/java/org/apache/eventmesh/api/registry/RegistryService.java b/eventmesh-registry-plugin/eventmesh-registry-api/src/main/java/org/apache/eventmesh/api/registry/RegistryService.java
index c38bf7a4a..fb064362a 100644
--- a/eventmesh-registry-plugin/eventmesh-registry-api/src/main/java/org/apache/eventmesh/api/registry/RegistryService.java
+++ b/eventmesh-registry-plugin/eventmesh-registry-api/src/main/java/org/apache/eventmesh/api/registry/RegistryService.java
@@ -30,7 +30,7 @@ import java.util.Map;
/**
* RegistryService
*/
-@EventMeshSPI(isSingleton = true, eventMeshExtensionType = EventMeshExtensionType.REGISTRY)
+@EventMeshSPI(eventMeshExtensionType = EventMeshExtensionType.REGISTRY)
public interface RegistryService {
void init() throws RegistryException;
diff --git a/eventmesh-security-plugin/eventmesh-security-api/src/main/java/org/apache/eventmesh/api/acl/AclService.java b/eventmesh-security-plugin/eventmesh-security-api/src/main/java/org/apache/eventmesh/api/acl/AclService.java
index 8387de290..9b8d5b511 100644
--- a/eventmesh-security-plugin/eventmesh-security-api/src/main/java/org/apache/eventmesh/api/acl/AclService.java
+++ b/eventmesh-security-plugin/eventmesh-security-api/src/main/java/org/apache/eventmesh/api/acl/AclService.java
@@ -26,7 +26,7 @@ import java.util.Properties;
/**
* AclService
*/
-@EventMeshSPI(isSingleton = true, eventMeshExtensionType = EventMeshExtensionType.SECURITY)
+@EventMeshSPI(eventMeshExtensionType = EventMeshExtensionType.SECURITY)
public interface AclService {
void init() throws AclException;
diff --git a/eventmesh-security-plugin/eventmesh-security-api/src/main/java/org/apache/eventmesh/api/auth/AuthService.java b/eventmesh-security-plugin/eventmesh-security-api/src/main/java/org/apache/eventmesh/api/auth/AuthService.java
index a7b777377..8e3ec8fed 100644
--- a/eventmesh-security-plugin/eventmesh-security-api/src/main/java/org/apache/eventmesh/api/auth/AuthService.java
+++ b/eventmesh-security-plugin/eventmesh-security-api/src/main/java/org/apache/eventmesh/api/auth/AuthService.java
@@ -26,7 +26,7 @@ import java.util.Map;
/**
* AuthService
*/
-@EventMeshSPI(isSingleton = true, eventMeshExtensionType = EventMeshExtensionType.SECURITY)
+@EventMeshSPI(eventMeshExtensionType = EventMeshExtensionType.SECURITY)
public interface AuthService {
void init() throws AuthException;
diff --git a/eventmesh-spi/src/main/java/org/apache/eventmesh/spi/EventMeshSPI.java b/eventmesh-spi/src/main/java/org/apache/eventmesh/spi/EventMeshSPI.java
index a0ae5ecd3..850340f20 100644
--- a/eventmesh-spi/src/main/java/org/apache/eventmesh/spi/EventMeshSPI.java
+++ b/eventmesh-spi/src/main/java/org/apache/eventmesh/spi/EventMeshSPI.java
@@ -34,7 +34,7 @@ public @interface EventMeshSPI {
/**
* If true, the spi instance is singleton
*/
- boolean isSingleton() default false;
+ boolean isSingleton() default true;
/**
* {@link EventMeshExtensionType}
diff --git a/eventmesh-spi/src/test/java/org/apache/eventmesh/spi/example/TestSingletonExtension.java b/eventmesh-spi/src/test/java/org/apache/eventmesh/spi/example/TestSingletonExtension.java
index 9b67793e1..e05fe9592 100644
--- a/eventmesh-spi/src/test/java/org/apache/eventmesh/spi/example/TestSingletonExtension.java
+++ b/eventmesh-spi/src/test/java/org/apache/eventmesh/spi/example/TestSingletonExtension.java
@@ -23,7 +23,7 @@ import org.apache.eventmesh.spi.EventMeshSPI;
/**
* TestSingletonExtension
*/
-@EventMeshSPI(isSingleton = true, eventMeshExtensionType = EventMeshExtensionType.UNKNOWN)
+@EventMeshSPI(eventMeshExtensionType = EventMeshExtensionType.UNKNOWN)
public interface TestSingletonExtension {
void hello();
diff --git a/eventmesh-trace-plugin/eventmesh-trace-api/src/main/java/org/apache/eventmesh/trace/api/EventMeshTraceService.java b/eventmesh-trace-plugin/eventmesh-trace-api/src/main/java/org/apache/eventmesh/trace/api/EventMeshTraceService.java
index c7d566199..8757b7100 100644
--- a/eventmesh-trace-plugin/eventmesh-trace-api/src/main/java/org/apache/eventmesh/trace/api/EventMeshTraceService.java
+++ b/eventmesh-trace-plugin/eventmesh-trace-api/src/main/java/org/apache/eventmesh/trace/api/EventMeshTraceService.java
@@ -31,7 +31,7 @@ import io.opentelemetry.context.Context;
/**
* EventMeshTraceService
*/
-@EventMeshSPI(isSingleton = true, eventMeshExtensionType = EventMeshExtensionType.TRACE)
+@EventMeshSPI(eventMeshExtensionType = EventMeshExtensionType.TRACE)
public interface EventMeshTraceService {
void init() throws TraceException;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@eventmesh.apache.org
For additional commands, e-mail: commits-help@eventmesh.apache.org