Fix conflicts.

apache · Sep 14, 2023 · 7f72d53 · 7f72d53
2 parents 7c6e42c + 74f9abf
commit 7f72d53
Show file tree

Hide file tree

Showing 971 changed files with 43,809 additions and 36,115 deletions.
diff --git a/.asf.yaml b/.asf.yaml
@@ -38,7 +38,7 @@ github:
     - hacktoberfest
   enabled_merge_buttons:
     squash: true
-    merge: true
+    merge: false
     rebase: false
   protected_branches:
     master:
@@ -47,6 +47,25 @@ github:
       required_pull_request_reviews:
         dismiss_stale_reviews: true
         required_approving_review_count: 2
+  # Attempt to make the auto-generated github emails more easily readable in email clients.
+  custom_subjects:
+    new_pr: "[PR] {title} ({repository})"
+    close_pr: "Re: [PR] {title} ({repository})"
+    comment_pr: "Re: [PR] {title} ({repository})"
+    diffcomment: "Re: [PR] {title} ({repository})"
+    merge_pr: "Re: [PR] {title} ({repository})"
+    new_issue: "[I] {title} ({repository})"
+    comment_issue: "Re: [I] {title} ({repository})"
+    close_issue: "Re: [I] {title} ({repository})"
+    catchall: "[GH] {title} ({repository})"
+    new_discussion: "[D] {title} ({repository})"
+    edit_discussion: "Re: [D] {title} ({repository})"
+    close_discussion: "Re: [D] {title} ({repository})"
+    close_discussion_with_comment: "Re: [D] {title} ({repository})"
+    reopen_discussion: "Re: [D] {title} ({repository})"
+    new_comment_discussion: "Re: [D] {title} ({repository})"
+    edit_comment_discussion: "Re: [D] {title} ({repository})"
+    delete_comment_discussion: "Re: [D] {title} ({repository})"
 notifications:
     commits: commits@eventmesh.apache.org
     # Send all issue emails (new, closed, comments) to issues@

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -101,6 +101,14 @@ body:
       options:
         - label: Yes I am willing to submit a PR!
 
+  - type: checkboxes
+    attributes:
+      label: Code of Conduct
+      description: >
+        The Code of Conduct helps create a safe space for everyone. We require that everyone agrees to it..
+      options:
+        - label: I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct) *
+
   - type: markdown
     attributes:
       value: "Thanks for completing our form!"
diff --git a/.github/ISSUE_TEMPLATE/documentation_related.yml b/.github/ISSUE_TEMPLATE/documentation_related.yml
@@ -55,6 +55,14 @@ body:
       options:
         - label: Yes I am willing to submit a PR!
 
+  - type: checkboxes
+    attributes:
+      label: Code of Conduct
+      description: >
+        The Code of Conduct helps create a safe space for everyone. We require that everyone agrees to it..
+      options:
+        - label: I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct) *
+
   - type: markdown
     attributes:
-      value: "Thanks for completing our form!"
+      value: "Thanks for completing our form!"
diff --git a/.github/ISSUE_TEMPLATE/enhancement_request.yml b/.github/ISSUE_TEMPLATE/enhancement_request.yml
@@ -65,6 +65,13 @@ body:
       options:
         - label: Yes I am willing to submit a PR!
 
+  - type: checkboxes
+    attributes:
+      label: Code of Conduct
+      description: >
+        The Code of Conduct helps create a safe space for everyone. We require that everyone agrees to it..
+      options:
+        - label: I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct) *
   - type: markdown
     attributes:
-      value: "Thanks for completing our form!"
+      value: "Thanks for completing our form!"
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -57,6 +57,14 @@ body:
       options:
         - label: Yes I am willing to submit a PR!
 
+  - type: checkboxes
+    attributes:
+      label: Code of Conduct
+      description: >
+        The Code of Conduct helps create a safe space for everyone. We require that everyone agrees to it..
+      options:
+        - label: I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct) *
+
   - type: markdown
     attributes:
       value: "Thanks for completing our form!"
diff --git a/.github/ISSUE_TEMPLATE/unit_test.yml b/.github/ISSUE_TEMPLATE/unit_test.yml
@@ -41,7 +41,7 @@ body:
     attributes:
       label: Read the unit testing guidelines
       description: >
-        Read the [unit testing guidelines](https://github.com/apache/eventmesh/blob/master/docs/en/contribute/02-write-unit-test.md) before writing unit test code.
+        Read the [unit testing guidelines](https://eventmesh.apache.org/community/contribute/write-unit-test) before writing unit test code.
       options:
         - label: >
             I have read.
@@ -83,4 +83,4 @@ body:
 
   - type: markdown
     attributes:
-      value: "Thanks for completing our form!"
+      value: "Thanks for completing our form!"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -48,12 +48,6 @@ jobs:
           # queries: ./path/to/local/query, your-org/your-repo/queries@main
           languages: ${{ matrix.language }}
 
-      - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'zulu'
-          java-version: ${{ matrix.java }}
-
       - name: Cache Gradle packages
         uses: actions/cache@v3
         with:
@@ -63,9 +57,24 @@ jobs:
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
           restore-keys: ${{ runner.os }}-gradle-
 
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: 11
+
+      - name: GenerateGrammarSource
+        run: ./gradlew clean generateGrammarSource --parallel --daemon
+
+      - name: Set up JDK ${{ matrix.java }}
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: ${{ matrix.java }}
+
       # https://docs.gradle.org/current/userguide/performance.html
       - name: Build
-        run: ./gradlew clean build jar dist jacocoTestReport --parallel --daemon
+        run: ./gradlew clean build jar dist jacocoTestReport -x generateGrammarSource --parallel --daemon
 
       - name: Install plugin
         run: ./gradlew installPlugin

diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml
@@ -26,7 +26,7 @@ jobs:
     name: Greeting
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/first-interaction@v1
+      - uses: actions/first-interaction@v1.1.1
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           issue-message: |
@@ -43,7 +43,7 @@ jobs:
 
             |WeChat Assistant|WeChat Public Account|Slack|
             |-|-|-|
-            |<img src="https://github.com/apache/eventmesh/blob/master/resources/wechat-assistant.jpg?raw=true" width="128"/>|<img src="https://github.com/apache/eventmesh/blob/master/resources/wechat-official.jpg?raw=true" width="128"/>|[Join Slack Chat](https://join.slack.com/t/apacheeventmesh/shared_invite/zt-1t1816dli-I0t3OE~IpdYWrZbIWhMbXg)|
+            |<img src="https://github.com/apache/eventmesh/blob/master/resources/wechat-assistant.jpg?raw=true" width="128"/>|<img src="https://github.com/apache/eventmesh/blob/master/resources/wechat-official.jpg?raw=true" width="128"/>|[Join Slack Chat](https://join.slack.com/t/the-asf/shared_invite/zt-1y375qcox-UW1898e4kZE_pqrNsrBM2g)|
 
             Mailing Lists:
             | Name | Description |Subscribe	|Unsubscribe|Archive
@@ -65,7 +65,7 @@ jobs:
 
             |WeChat Assistant|WeChat Public Account|Slack|
             |-|-|-|
-            |<img src="https://github.com/apache/eventmesh/blob/master/resources/wechat-assistant.jpg?raw=true" width="128"/>|<img src="https://github.com/apache/eventmesh/blob/master/resources/wechat-official.jpg?raw=true" width="128"/>|[Join Slack Chat](https://join.slack.com/t/apacheeventmesh/shared_invite/zt-1t1816dli-I0t3OE~IpdYWrZbIWhMbXg)|
+            |<img src="https://github.com/apache/eventmesh/blob/master/resources/wechat-assistant.jpg?raw=true" width="128"/>|<img src="https://github.com/apache/eventmesh/blob/master/resources/wechat-official.jpg?raw=true" width="128"/>|[Join Slack Chat](https://join.slack.com/t/the-asf/shared_invite/zt-1y375qcox-UW1898e4kZE_pqrNsrBM2g)|
 
             Mailing Lists:
             | Name | Description |Subscribe	|Unsubscribe|Archive

diff --git a/.gitignore b/.gitignore
@@ -11,6 +11,7 @@ logs
 *.log
 *.log.*
 .idea
+!/.idea/icon.png
 build
 .classpath
 .project
@@ -47,4 +48,4 @@ bld/
 [Oo]bj/
 [Ll]og/
 [Ll]ogs/
-!eventmesh-runtime/bin/*.sh
+**/org/apache/eventmesh/connector/jdbc/antlr4/autogeneration/*
diff --git a/.idea/icon.png b/.idea/icon.png
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@
 
 [![License](https://img.shields.io/github/license/apache/eventmesh?style=for-the-badge)](https://www.apache.org/licenses/LICENSE-2.0.html)
 [![GitHub Release](https://img.shields.io/github/v/release/apache/eventmesh?style=for-the-badge)](https://github.com/apache/eventmesh/releases)
-[![Slack Status](https://img.shields.io/badge/slack-join_chat-blue.svg?logo=slack&style=for-the-badge)](https://join.slack.com/t/apacheeventmesh/shared_invite/zt-1vpgrvm5u-hh~5H9Aj4TGThaP9tusFfw)
+[![Slack Status](https://img.shields.io/badge/slack-join_chat-blue.svg?logo=slack&style=for-the-badge)](https://join.slack.com/t/the-asf/shared_invite/zt-1y375qcox-UW1898e4kZE_pqrNsrBM2g)
 
 
 [📦 Documentation](https://eventmesh.apache.org/docs/introduction) |
@@ -37,9 +37,9 @@
 Apache EventMesh has a vast amount of features to help users achieve their goals. Let us share with you some of the key features EventMesh has to offer:
 
 - Built around the [CloudEvents](https://cloudevents.io) specification.
-- Rapidty extendsible interconnector layer [connectors](https://github.com/apache/eventmesh/tree/master/eventmesh-connectors) such as the source or sink of Saas, CloudService, and Database etc.
-- Rapidty extendsible storage layer such as [Apache RocketMQ](https://rocketmq.apache.org), [Apache Kafka](https://kafka.apache.org), [Apache Pulsar](https://pulsar.apache.org), [RabbitMQ](https://rabbitmq.com), [Redis](https://redis.io), [Pravega](https://cncf.pravega.io), and [RDMS](https://en.wikipedia.org/wiki/Relational_database)(in progress) using [JDBC](https://en.wikipedia.org/wiki/Java_Database_Connectivity).
-- Rapidty extendsible controller such as [Consul](https://consulproject.org/en/), [Nacos](https://nacos.io), [ETCD](https://etcd.io) and [Zookeeper](https://zookeeper.apache.org/).
+- Rapidty extendsible interconnector layer [connectors](https://github.com/apache/eventmesh/tree/master/eventmesh-connectors) using [openConnect](https://github.com/apache/eventmesh/tree/master/eventmesh-openconnect) such as the source or sink of Saas, CloudService, and Database etc.
+- Rapidty extendsible storage layer such as [Apache RocketMQ](https://rocketmq.apache.org), [Apache Kafka](https://kafka.apache.org), [Apache Pulsar](https://pulsar.apache.org), [RabbitMQ](https://rabbitmq.com), [Redis](https://redis.io).
+- Rapidty extendsible meta such as [Consul](https://consulproject.org/en/), [Nacos](https://nacos.io), [ETCD](https://etcd.io) and [Zookeeper](https://zookeeper.apache.org/).
 - Guaranteed at-least-once delivery.
 - Deliver events between multiple EventMesh deployments.
 - Event schema management by catalog service.
@@ -108,7 +108,7 @@ Apache EventMesh is licensed under the [Apache License, Version 2.0](http://www.
 
 |WeChat Assistant|WeChat Public Account|Slack|
 |-|-|-|
-|<img src="resources/wechat-assistant.jpg" width="128"/>|<img src="resources/wechat-official.jpg" width="128"/>|[Join Slack Chat](https://join.slack.com/t/apacheeventmesh/shared_invite/zt-1vpgrvm5u-hh~5H9Aj4TGThaP9tusFfw)|
+|<img src="resources/wechat-assistant.jpg" width="128"/>|<img src="resources/wechat-official.jpg" width="128"/>|[Join Slack Chat](https://join.slack.com/t/the-asf/shared_invite/zt-1y375qcox-UW1898e4kZE_pqrNsrBM2g)(Please open an issue if this link is expired)|
 
 Bi-weekly meeting : [#Tencent meeting](https://meeting.tencent.com/dm/wes6Erb9ioVV) : 346-6926-0133
 

diff --git a/build.gradle b/build.gradle
@@ -21,6 +21,8 @@ import java.util.concurrent.TimeUnit
 
 buildscript {
     repositories {
+        mavenLocal()
+        mavenCentral()
         maven {
             url "https://maven.aliyun.com/repository/public"
         }
@@ -84,10 +86,16 @@ allprojects {
         configDirectory = file("${rootDir}/style")
     }
 
-    checkstyleMain.exclude '**/org/apache/eventmesh/client/grpc/protos**'
+    checkstyleMain.exclude('**/org/apache/eventmesh/client/grpc/protos**')
+                  .exclude('**/org/apache/eventmesh/common/protocol/grpc/cloudevents**')
+                  .exclude('**/org/apache/eventmesh/connector/openfunction/client/EventMeshGrpcService**')
+                  .exclude('**/org/apache/eventmesh/connector/openfunction/client/CallbackServiceGrpc**')
+                  .exclude('**/org/apache/eventmesh/connector/jdbc/antlr**')
 
     dependencies {
         repositories {
+            mavenLocal()
+            mavenCentral()
             maven {
                 url "https://maven.aliyun.com/repository/public"
             }
@@ -242,6 +250,9 @@ subprojects {
         rulesMinimumPriority = 5
         ruleSets = ["category/java/errorprone.xml", "category/java/bestpractices.xml"]
         ignoreFailures = true
+        pmdMain {
+            excludes = ["**/org/apache/eventmesh/connector/jdbc/antlr4/autogeneration/**"]
+        }
     }
 
     jar {
@@ -268,10 +279,9 @@ subprojects {
         Set<String> rootProject = ["eventmesh-admin",
                                    "eventmesh-admin-rocketmq",
                                    "eventmesh-common",
-                                   "eventmesh-connector-api",
                                    "eventmesh-storage-api",
                                    "eventmesh-metrics-api",
-                                   "eventmesh-registry-api",
+                                   "eventmesh-meta-api",
                                    "eventmesh-trace-api",
                                    "eventmesh-runtime",
                                    "eventmesh-security-api",
@@ -334,6 +344,7 @@ subprojects {
     javadoc {
         source = sourceSets.main.java
         destinationDir = reporting.file("javadoc")
+        options.encoding = "UTF-8"
     }
 
     task packageJavadoc(type: Jar, dependsOn: ['javadoc']) {
@@ -361,9 +372,9 @@ subprojects {
     }
 
     repositories {
-        maven { url "https://maven.aliyun.com/repository/public" }
-        mavenCentral()
         mavenLocal()
+        mavenCentral()
+        maven { url "https://maven.aliyun.com/repository/public" }
     }
 
     configurations.all {
@@ -451,6 +462,7 @@ subprojects {
             dependency "com.fasterxml.jackson.core:jackson-core:2.13.0"
             dependency "com.fasterxml.jackson.core:jackson-annotations:2.13.0"
             dependency "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.0"
+            dependency "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.0"
 
             dependency "org.asynchttpclient:async-http-client:2.12.0"
             dependency "org.apache.httpcomponents:httpclient:4.5.13"
@@ -489,9 +501,11 @@ subprojects {
             dependency "org.powermock:powermock-module-junit4:2.0.2"
             dependency "org.powermock:powermock-api-mockito2:2.0.9"
 
-            dependency "io.cloudevents:cloudevents-core:2.2.0"
-            dependency "io.cloudevents:cloudevents-json-jackson:2.2.0"
+            dependency "io.cloudevents:cloudevents-core:2.4.2"
+            dependency "io.cloudevents:cloudevents-json-jackson:2.4.2"
+            dependency "io.cloudevents:cloudevents-protobuf:2.4.2"
 
+            dependency "io.grpc:grpc-core:${grpcVersion}"
             dependency "io.grpc:grpc-protobuf:${grpcVersion}"
             dependency "io.grpc:grpc-stub:${grpcVersion}"
             dependency "io.grpc:grpc-netty:${grpcVersion}"
@@ -517,6 +531,8 @@ subprojects {
             dependency "com.github.seancfoley:ipaddress:5.3.3"
             dependency "javax.annotation:javax.annotation-api:1.3.2"
             dependency "com.alibaba:fastjson:1.2.83"
+
+            dependency "software.amazon.awssdk:s3:2.20.29"
         }
     }
 }
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -29,7 +29,7 @@ WORKDIR /data/app/eventmesh
 COPY --from=builder /build/dist ./
 
 EXPOSE 10106 
-EXPOSE 10205 10105 10002
+EXPOSE 10205 10105 10000
 
 ENV DOCKER true
 ENV EVENTMESH_HOME /data/app/eventmesh

diff --git a/eventmesh-admin/eventmesh-admin-rocketmq/build.gradle b/eventmesh-admin/eventmesh-admin-rocketmq/build.gradle
@@ -17,7 +17,7 @@
 
 
 dependencies {
-    compileOnly project(":eventmesh-common")
+    implementation project(":eventmesh-common")
 
     implementation "org.apache.httpcomponents:httpclient"
     implementation "com.fasterxml.jackson.core:jackson-databind"
@@ -29,5 +29,6 @@ dependencies {
     compileOnly 'org.projectlombok:lombok'
     annotationProcessor 'org.projectlombok:lombok'
 
-    testImplementation project(":eventmesh-storage-plugin:eventmesh-storage-api")
+    testImplementation 'org.mockito:mockito-core'
+    testImplementation 'org.mockito:mockito-inline'
 }
diff --git a/...ocketmq/src/main/java/org/apache/eventmesh/admin/rocketmq/controller/AdminController.java b/...ocketmq/src/main/java/org/apache/eventmesh/admin/rocketmq/controller/AdminController.java
@@ -28,14 +28,30 @@
 
 import lombok.extern.slf4j.Slf4j;
 
+/**
+ * This class is responsible for managing the admin module.
+ * <p>
+ * It provides a method to run the admin module with the specified {@link HttpServer}
+ * and handles requests related to topics management.
+ */
+
 @Slf4j
 public class AdminController {
 
     public AdminController() {
     }
 
+    /**
+     * Invoke this method to run the admin module.
+     *
+     * @param server A HttpServer is bound to an IP address and port number
+     *               and listens for incoming TCP connections from clients on this address.
+     * @throws IOException
+     * @see HttpServer
+     */
     public void run(HttpServer server) throws IOException {
 
+        // Creates a mapping from API URI path to the exchange handler on this HttpServer.
         server.createContext(TOPIC_MANAGE_PATH, new TopicsHandler());
 
         log.info("EventMesh-Admin Controller server context created successfully");