Skip to content

Commit

Permalink
Merge branch 'feat/4963' of https://github.com/lmnewton/eventmesh int…
Browse files Browse the repository at this point in the history
…o feat/4963
  • Loading branch information
lmnewton committed Jun 24, 2024
2 parents afdcf4d + f3976e5 commit 0a75e4f
Show file tree
Hide file tree
Showing 10 changed files with 138 additions and 45 deletions.
4 changes: 4 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ updates:
ignore:
- dependency-name: "*"
update-types: [ "version-update:semver-major" ]
- dependency-name: "software.amazon.awssdk:s3"
update-types: [ "version-update:semver-patch" ]
- dependency-name: "com.aliyun:dingtalk"
update-types: [ "version-update:semver-patch" ]
- package-ecosystem: "gomod"
directory: "eventmesh-sdks/eventmesh-sdk-go"
# Disabled temporarily since the Go SDK is not integrated with CI
Expand Down
25 changes: 11 additions & 14 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ buildscript {

plugins {
id 'org.cyclonedx.bom' version '1.8.2'
id 'com.github.jk1.dependency-license-report' version '2.7'
id 'com.github.jk1.dependency-license-report' version '2.8'
}

allprojects {
Expand Down Expand Up @@ -653,11 +653,11 @@ subprojects {
def grpcVersion = '1.64.0'
def log4jVersion = '2.23.1'
def jacksonVersion = '2.17.1'
def dropwizardMetricsVersion = '4.2.25'
def dropwizardMetricsVersion = '4.2.26'
def opentelemetryVersion = '1.36.0'
def cloudeventsVersion = '2.5.0'
def curatorVersion = '5.6.0'
def mockitoVersion = '3.12.4'
def cloudeventsVersion = '3.0.0'
def curatorVersion = '5.7.0'
def mockitoVersion = '4.11.0'

dependencyManagement {
dependencies {
Expand All @@ -666,14 +666,14 @@ subprojects {
dependency "org.apache.commons:commons-text:1.12.0"
dependency "commons-io:commons-io:2.16.1"
dependency "commons-validator:commons-validator:1.9.0"
dependency "com.google.guava:guava:31.1-jre"
dependency "com.google.guava:guava:33.2.1-jre"

dependency "org.slf4j:slf4j-api:2.0.13"
dependency "org.apache.logging.log4j:log4j-api:${log4jVersion}"
dependency "org.apache.logging.log4j:log4j-core:${log4jVersion}"
dependency "org.apache.logging.log4j:log4j-slf4j2-impl:${log4jVersion}"

dependency "com.lmax:disruptor:3.4.2"
dependency "com.lmax:disruptor:3.4.4"

dependency "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"
dependency "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}"
Expand All @@ -686,7 +686,7 @@ subprojects {
dependency "org.asynchttpclient:async-http-client:2.12.3"
dependency "org.apache.httpcomponents:httpclient:4.5.14"

dependency "io.netty:netty-all:4.1.79.Final"
dependency "io.netty:netty-all:4.1.111.Final"

dependency "io.dropwizard.metrics:metrics-core:${dropwizardMetricsVersion}"
dependency "io.dropwizard.metrics:metrics-healthchecks:${dropwizardMetricsVersion}"
Expand All @@ -712,7 +712,7 @@ subprojects {

dependency "org.junit.jupiter:junit-jupiter:5.10.2"
dependency "org.junit-pioneer:junit-pioneer:1.9.1"
dependency "org.assertj:assertj-core:2.8.0"
dependency "org.assertj:assertj-core:3.26.0"

dependency "org.mockito:mockito-core:${mockitoVersion}"
dependency "org.mockito:mockito-inline:${mockitoVersion}"
Expand Down Expand Up @@ -747,15 +747,12 @@ subprojects {
dependency "javax.annotation:javax.annotation-api:1.3.2"
dependency "com.alibaba.fastjson2:fastjson2:2.0.51"

dependency "software.amazon.awssdk:s3:2.25.64"
dependency "software.amazon.awssdk:s3:2.26.3"
dependency "com.github.rholder:guava-retrying:2.0.0"

dependency "org.mybatis.spring.boot:mybatis-spring-boot-starter:2.3.2"
dependency "com.alibaba:druid-spring-boot-starter:1.2.23"
dependency "org.springframework.boot:spring-boot-starter-jetty:2.7.18"

dependency "com.baomidou:mybatis-plus:3.5.6"
dependency "com.mysql:mysql-connector-j:8.0.33"
dependency "com.mysql:mysql-connector-j:8.4.0"
}
}
}
48 changes: 24 additions & 24 deletions eventmesh-admin-server/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,33 +16,33 @@
*/

dependencies {
implementation project(":eventmesh-spi")
implementation project(":eventmesh-common")
implementation project(":eventmesh-registry:eventmesh-registry-api")
implementation project(":eventmesh-registry:eventmesh-registry-nacos")
implementation project(':eventmesh-openconnect:eventmesh-openconnect-offsetmgmt-plugin:eventmesh-openconnect-offsetmgmt-api')
implementation "com.alibaba.nacos:nacos-client"
implementation ("org.springframework.boot:spring-boot-starter-web") {
exclude group: "org.springframework.boot", module: "spring-boot-starter-tomcat"
}
implementation 'org.springframework.boot:spring-boot-starter-jetty'
implementation "io.grpc:grpc-core"
implementation "io.grpc:grpc-protobuf"
implementation "io.grpc:grpc-stub"
implementation "io.grpc:grpc-netty-shaded"
implementation project(":eventmesh-spi")
implementation project(":eventmesh-common")
implementation project(":eventmesh-registry:eventmesh-registry-api")
implementation project(":eventmesh-registry:eventmesh-registry-nacos")
implementation project(':eventmesh-openconnect:eventmesh-openconnect-offsetmgmt-plugin:eventmesh-openconnect-offsetmgmt-api')
implementation "com.alibaba.nacos:nacos-client"
implementation("org.springframework.boot:spring-boot-starter-web") {
exclude group: "org.springframework.boot", module: "spring-boot-starter-tomcat"
}
implementation 'org.springframework.boot:spring-boot-starter-jetty'
implementation "io.grpc:grpc-core"
implementation "io.grpc:grpc-protobuf"
implementation "io.grpc:grpc-stub"
implementation "io.grpc:grpc-netty-shaded"

// https://mvnrepository.com/artifact/com.baomidou/mybatis-plus-boot-starter
implementation group: 'com.baomidou', name: 'mybatis-plus-boot-starter', version: '3.5.6'
implementation "org.reflections:reflections:0.10.2"
// https://mvnrepository.com/artifact/com.baomidou/mybatis-plus-boot-starter
implementation 'com.baomidou:mybatis-plus-boot-starter:3.5.7'
implementation "org.reflections:reflections:0.10.2"

// https://mvnrepository.com/artifact/com.alibaba/druid-spring-boot-starter
implementation "com.alibaba:druid-spring-boot-starter"
compileOnly 'com.mysql:mysql-connector-j'
compileOnly 'org.projectlombok:lombok'
annotationProcessor 'org.projectlombok:lombok'
// https://mvnrepository.com/artifact/com.alibaba/druid-spring-boot-starter
implementation "com.alibaba:druid-spring-boot-starter"
compileOnly 'com.mysql:mysql-connector-j'
compileOnly 'org.projectlombok:lombok'
annotationProcessor 'org.projectlombok:lombok'
}

configurations.implementation {
exclude group: "org.springframework.boot", module: "spring-boot-starter-logging"
configurations.implementation {
exclude group: "org.springframework.boot", module: "spring-boot-starter-logging"
}

Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ dependencies {
implementation project(":eventmesh-common")
implementation project(":eventmesh-sdks:eventmesh-sdk-java")
implementation project(":eventmesh-openconnect:eventmesh-openconnect-java")
implementation "com.aliyun:dingtalk:2.1.25"
implementation "com.aliyun:dingtalk:2.1.27"
implementation 'com.google.guava:guava'

compileOnly 'org.projectlombok:lombok'
Expand Down
2 changes: 1 addition & 1 deletion eventmesh-connectors/eventmesh-connector-jdbc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ dependencies {
implementation project(":eventmesh-openconnect:eventmesh-openconnect-java")
implementation project(":eventmesh-spi")
implementation 'com.zendesk:mysql-binlog-connector-java:0.29.2'
compileOnly 'mysql:mysql-connector-java:8.0.33'
compileOnly 'com.mysql:mysql-connector-j'

compileOnly 'org.projectlombok:lombok'
annotationProcessor 'org.projectlombok:lombok'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ dependencies {
implementation project(":eventmesh-common")
implementation project(":eventmesh-openconnect:eventmesh-openconnect-java")

implementation 'org.redisson:redisson:3.30.0'
implementation 'org.redisson:redisson:3.31.0'

api 'io.cloudevents:cloudevents-json-jackson'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ dependencies {
implementation project(":eventmesh-sdks:eventmesh-sdk-java")
implementation project(":eventmesh-openconnect:eventmesh-openconnect-java")

implementation "com.slack.api:bolt:1.39.+"
implementation "com.slack.api:bolt:1.40.+"
implementation 'com.google.guava:guava'

compileOnly 'org.projectlombok:lombok'
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package org.apache.eventmesh.runtime.util;

import java.net.URI;
import java.net.URISyntaxException;
import java.nio.charset.StandardCharsets;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.OffsetDateTime;
import java.time.ZoneOffset;
import java.util.Map;

import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

public class EventMeshCloudEventWriterTest {

@Test
public void testURIAsValueWithContextAttribute() throws URISyntaxException {
String key = "testKey";
EventMeshCloudEventWriter eventMeshCloudEventWriter = new EventMeshCloudEventWriter();

eventMeshCloudEventWriter.withContextAttribute(key, new URI("file://foo/bars"));

Map<String, Object> extensionMap = eventMeshCloudEventWriter.getExtensionMap();
Assertions.assertEquals(extensionMap.get(key), "file://foo/bars");
}

@Test
public void testOffsetDateTimeAsValueWithContextAttribute() {
String key = "testKey";
EventMeshCloudEventWriter eventMeshCloudEventWriter = new EventMeshCloudEventWriter();

eventMeshCloudEventWriter.withContextAttribute(key, OffsetDateTime.of(LocalDateTime.of(
LocalDate.of(2023, 6, 17), LocalTime.MIDNIGHT), ZoneOffset.ofTotalSeconds(32400)));

Map<String, Object> extensionMap = eventMeshCloudEventWriter.getExtensionMap();
Assertions.assertEquals(extensionMap.get(key), "2023-06-17T00:00:00+09:00");
}

@Test
public void testIntegerAsValueWithContextAttribute() {
String key = "testKey";
EventMeshCloudEventWriter eventMeshCloudEventWriter = new EventMeshCloudEventWriter();

eventMeshCloudEventWriter.withContextAttribute(key, 123);

Map<String, Object> extensionMap = eventMeshCloudEventWriter.getExtensionMap();
Assertions.assertEquals(extensionMap.get(key), "123");
}

@Test
public void testBooleanAsValueWithContextAttribute() {
String key = "testKey";
EventMeshCloudEventWriter eventMeshCloudEventWriter = new EventMeshCloudEventWriter();

eventMeshCloudEventWriter.withContextAttribute(key, Boolean.FALSE);

Map<String, Object> extensionMap = eventMeshCloudEventWriter.getExtensionMap();
Assertions.assertEquals(extensionMap.get(key), "false");
}

@Test
public void testByteArrayAsValueWithContextAttribute() {
String key = "testKey";
EventMeshCloudEventWriter eventMeshCloudEventWriter = new EventMeshCloudEventWriter();

eventMeshCloudEventWriter.withContextAttribute(key, "bytesArray".getBytes(StandardCharsets.UTF_8));

Map<String, Object> extensionMap = eventMeshCloudEventWriter.getExtensionMap();
String base64EncodedValue = "Ynl0ZXNBcnJheQ==";
Assertions.assertEquals(extensionMap.get(key), base64EncodedValue);
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ dependencies {
implementation project(":eventmesh-storage-plugin:eventmesh-storage-api")

// redisson
implementation 'org.redisson:redisson:3.30.0'
implementation 'org.redisson:redisson:3.31.0'

// netty
implementation 'io.netty:netty-all'
Expand Down
4 changes: 2 additions & 2 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
*/

plugins {
id 'com.gradle.develocity' version '3.17.4'
id 'com.gradle.common-custom-user-data-gradle-plugin' version '2.0.1'
id 'com.gradle.develocity' version '3.17.5'
id 'com.gradle.common-custom-user-data-gradle-plugin' version '2.0.2'
}

def isCiServer = System.getenv().containsKey("CI")
Expand Down

0 comments on commit 0a75e4f

Please sign in to comment.