Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ISSUE #4812] Set up Admin Endpoints v2 #4813

Merged
merged 18 commits into from
Apr 8, 2024
Merged

[ISSUE #4812] Set up Admin Endpoints v2 #4813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
8513059
Remove redundant overloaded methods
Pil0tXia Apr 3, 2024
26ec36c
Simplify write() result param
Pil0tXia Apr 3, 2024
1e08e31
Add writeJson(); Add PUT; Add JavaDoc
Pil0tXia Apr 3, 2024
60a6afd
Rename EventHttpHandler to EventMeshHttpHandler
Pil0tXia Apr 3, 2024
dec8449
Correct server thread name
Pil0tXia Apr 3, 2024
634b4ac
Clean up messy & non-hierarchical overloading
Pil0tXia Apr 3, 2024
458d14f
No need to set headers manually any more
Pil0tXia Apr 4, 2024
4cc512e
Set up v1&v2 endpoints
Pil0tXia Apr 4, 2024
f1f7534
Set up v1&v2 response dto
Pil0tXia Apr 4, 2024
e9462f7
Introduce fastjson2
Pil0tXia Apr 4, 2024
584b680
Fix fastjson2 "level too large : 2048" error caused by IPAddress
Pil0tXia Apr 4, 2024
1f99125
Correct @ConfigField naming
Pil0tXia Apr 4, 2024
da4eed8
Return properties format json key
Pil0tXia Apr 4, 2024
195cb9d
Add format option to query string
Pil0tXia Apr 4, 2024
dbc32a0
Introduce Result
Pil0tXia Apr 5, 2024
b4d230c
Reduce duplicate builder code
Pil0tXia Apr 5, 2024
61417aa
Fix all checkstyle warnings in eventmesh-runtime
Pil0tXia Apr 5, 2024
1930bbe
Add known dependency
Pil0tXia Apr 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,8 @@ subprojects {
dependency "org.projectlombok:lombok:1.18.22"
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 "com.alibaba:fastjson:1.2.83" // TODO migrate to fastjson2
dependency "com.alibaba.fastjson2:fastjson2:2.0.48"

dependency "software.amazon.awssdk:s3:2.20.29"
dependency "com.github.rholder:guava-retrying:2.0.0"
Expand Down
2 changes: 2 additions & 0 deletions eventmesh-common/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ dependencies {
api "io.cloudevents:cloudevents-core"
api "io.cloudevents:cloudevents-json-jackson"

api "com.alibaba.fastjson2:fastjson2"

implementation "org.apache.logging.log4j:log4j-api"
implementation "org.apache.logging.log4j:log4j-core"
implementation "org.apache.logging.log4j:log4j-slf4j2-impl"
Expand Down
52 changes: 26 additions & 26 deletions eventmesh-common/src/main/java/org/apache/eventmesh/common/config/CommonConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,82 +37,82 @@
@Config(prefix = "eventMesh")
public class CommonConfiguration {

@ConfigFiled(field = "sysid", beNumber = true, notEmpty = true)
@ConfigField(field = "sysid", beNumber = true, notEmpty = true)
private String sysID = "5477";

@ConfigFiled(field = "server.env", notEmpty = true)
@ConfigField(field = "server.env", notEmpty = true)
private String eventMeshEnv = "P";

@ConfigFiled(field = "server.idc", notEmpty = true)
@ConfigField(field = "server.idc", notEmpty = true)
private String eventMeshIDC = "FT";

@ConfigFiled(field = "server.name", notEmpty = true)
@ConfigField(field = "server.name", notEmpty = true)
private String eventMeshName = "";

@ConfigFiled(field = "server.cluster", notEmpty = true)
@ConfigField(field = "server.cluster", notEmpty = true)
private String eventMeshCluster = "LS";

@ConfigFiled(field = "server.hostIp", reload = true)
@ConfigField(field = "server.hostIp", reload = true)
private String eventMeshServerIp = null;

@ConfigFiled(field = "metaStorage.plugin.server-addr", notEmpty = true)
@ConfigField(field = "metaStorage.plugin.server-addr", notEmpty = true)
private String metaStorageAddr = "";

@ConfigFiled(field = "metaStorage.plugin.type", notEmpty = true)
@ConfigField(field = "metaStorage.plugin.type", notEmpty = true)
private String eventMeshMetaStoragePluginType = "nacos";

@ConfigFiled(field = "metaStorage.plugin.username")
@ConfigField(field = "metaStorage.plugin.username")
private String eventMeshMetaStoragePluginUsername = "";

@ConfigFiled(field = "metaStorage.plugin.password")
@ConfigField(field = "metaStorage.plugin.password")
private String eventMeshMetaStoragePluginPassword = "";

@ConfigFiled(field = "metaStorage.plugin.metaStorageIntervalInMills")
@ConfigField(field = "metaStorage.plugin.metaStorageIntervalInMills")
private Integer eventMeshMetaStorageIntervalInMills = 10 * 1000;

@ConfigFiled(field = "metaStorage.plugin.fetchMetaStorageAddrIntervalInMills")
@ConfigField(field = "metaStorage.plugin.fetchMetaStorageAddrIntervalInMills")
private Integer eventMeshFetchMetaStorageAddrInterval = 10 * 1000;

@ConfigFiled(field = "metaStorage.plugin.enabled")
@ConfigField(field = "metaStorage.plugin.enabled")
private boolean eventMeshServerMetaStorageEnable = false;

@ConfigFiled(field = "trace.plugin", notEmpty = true)
@ConfigField(field = "trace.plugin", notEmpty = true)
private String eventMeshTracePluginType;

@ConfigFiled(field = "metrics.plugin", notEmpty = true)
@ConfigField(field = "metrics.plugin", notEmpty = true)
private List<String> eventMeshMetricsPluginType;

@ConfigFiled(field = "security.plugin.type", notEmpty = true)
@ConfigField(field = "security.plugin.type", notEmpty = true)
private String eventMeshSecurityPluginType = "security";

@ConfigFiled(field = "connector.plugin.type", notEmpty = true)
@ConfigField(field = "connector.plugin.type", notEmpty = true)
private String eventMeshConnectorPluginType = "rocketmq";

@ConfigFiled(field = "storage.plugin.type", notEmpty = true)
@ConfigField(field = "storage.plugin.type", notEmpty = true)
private String eventMeshStoragePluginType = "rocketmq";

@ConfigFiled(field = "security.validation.type.token", notEmpty = true)
@ConfigField(field = "security.validation.type.token", notEmpty = true)
private boolean eventMeshSecurityValidateTypeToken = false;

@ConfigFiled(field = "server.trace.enabled")
@ConfigField(field = "server.trace.enabled")
private boolean eventMeshServerTraceEnable = false;

@ConfigFiled(field = "server.security.enabled")
@ConfigField(field = "server.security.enabled")
private boolean eventMeshServerSecurityEnable = false;

@ConfigFiled(field = "security.publickey")
@ConfigField(field = "security.publickey")
private String eventMeshSecurityPublickey = "";

@ConfigFiled(field = "server.provide.protocols", reload = true)
@ConfigField(field = "server.provide.protocols", reload = true)
private List<String> eventMeshProvideServerProtocols;

@ConfigFiled(reload = true)
@ConfigField(reload = true)
private String eventMeshWebhookOrigin;

@ConfigFiled(reload = true)
@ConfigField(reload = true)
private String meshGroup;

@ConfigFiled(field = "server.retry.plugin.type")
@ConfigField(field = "server.retry.plugin.type")
private String eventMeshRetryPluginType = Constants.DEFAULT;

public void reload() {
Expand Down
2 changes: 1 addition & 1 deletion .../eventmesh/common/config/ConfigFiled.java → .../eventmesh/common/config/ConfigField.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.TYPE, ElementType.FIELD})
public @interface ConfigFiled {
public @interface ConfigField {

/**
* @return The key name of the configuration file
Expand Down
10 changes: 5 additions & 5 deletions eventmesh-common/src/main/java/org/apache/eventmesh/common/config/convert/ConvertValue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

package org.apache.eventmesh.common.config.convert;

import org.apache.eventmesh.common.config.ConfigFiled;
import org.apache.eventmesh.common.config.ConfigField;

import org.apache.commons.lang3.StringUtils;

Expand All @@ -44,7 +44,7 @@ default boolean canHandleNullValue() {
/**
* @return The value converter needs
*/
default Object processFieldValue(ConvertInfo convertInfo, String key, ConfigFiled configFiled) {
default Object processFieldValue(ConvertInfo convertInfo, String key, ConfigField configField) {
Properties properties = convertInfo.getProperties();
String value = properties.getProperty(key);

Expand All @@ -54,14 +54,14 @@ default Object processFieldValue(ConvertInfo convertInfo, String key, ConfigFile

value = value.trim();

boolean findEnv = configFiled.findEnv();
String fieldName = configFiled.field();
boolean findEnv = configField.findEnv();
String fieldName = configField.field();

if (StringUtils.isBlank(value) && !StringUtils.isBlank(fieldName) && findEnv) {
value = Optional.ofNullable(System.getProperty(fieldName)).orElse(System.getenv(fieldName));
}

if (StringUtils.isBlank(value) && configFiled.notEmpty()) {
if (StringUtils.isBlank(value) && configField.notEmpty()) {
throw new RuntimeException(key + " can't be empty!");
}

Expand Down
6 changes: 3 additions & 3 deletions eventmesh-common/src/main/java/org/apache/eventmesh/common/config/convert/ConverterMap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

package org.apache.eventmesh.common.config.convert;

import org.apache.eventmesh.common.config.ConfigFiled;
import org.apache.eventmesh.common.config.ConfigField;
import org.apache.eventmesh.common.config.convert.converter.BaseDataTypeConverter;
import org.apache.eventmesh.common.config.convert.converter.DateConverter;
import org.apache.eventmesh.common.config.convert.converter.EnumConverter;
Expand Down Expand Up @@ -96,9 +96,9 @@ public static void register(ConvertValue<?> convertValue, Class<?>... clazzs) {
*/
public static ConvertValue<?> getFieldConverter(Field field) {
Class<?> clazz = field.getType();
ConfigFiled configFiled = field.getAnnotation(ConfigFiled.class);
ConfigField configField = field.getAnnotation(ConfigField.class);

Class<?> converter1 = configFiled.converter();
Class<?> converter1 = configField.converter();
if (!converter1.equals(ConvertValue.DefaultConverter.class)) {
if (!classToConverter.containsKey(converter1)) {
try {
Expand Down
36 changes: 18 additions & 18 deletions ...n/src/main/java/org/apache/eventmesh/common/config/convert/converter/ObjectConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
package org.apache.eventmesh.common.config.convert.converter;

import org.apache.eventmesh.common.config.Config;
import org.apache.eventmesh.common.config.ConfigFiled;
import org.apache.eventmesh.common.config.ConfigField;
import org.apache.eventmesh.common.config.ConfigInfo;
import org.apache.eventmesh.common.config.convert.ConvertInfo;
import org.apache.eventmesh.common.config.convert.ConvertValue;
Expand Down Expand Up @@ -110,26 +110,26 @@ private void setValue() throws Exception {
field.setAccessible(true);

ConvertInfo convertInfo = this.convertInfo;
ConfigFiled configFiled = field.getAnnotation(ConfigFiled.class);
if (Objects.isNull(configFiled)) {
ConfigField configField = field.getAnnotation(ConfigField.class);
if (Objects.isNull(configField)) {
continue;
}

String key = this.buildKey(configFiled);
needReload = this.checkNeedReload(needReload, configFiled);
String key = this.buildKey(configField);
needReload = this.checkNeedReload(needReload, configField);

ConvertValue<?> convertValue = ConverterMap.getFieldConverter(field);
Object fieldValue = convertValue.processFieldValue(convertInfo, key, configFiled);
Object fieldValue = convertValue.processFieldValue(convertInfo, key, configField);

if (!checkFieldValueBefore(configFiled, key, convertValue, fieldValue)) {
if (!checkFieldValueBefore(configField, key, convertValue, fieldValue)) {
continue;
}
convertInfo.setValue(fieldValue);
convertInfo.setField(field);
convertInfo.setKey(key);
Object convertedValue = convertValue.convert(convertInfo);

if (!checkFieldValueAfter(configFiled, key, convertedValue)) {
if (!checkFieldValueAfter(configField, key, convertedValue)) {
continue;
}
field.set(object, convertedValue);
Expand All @@ -155,16 +155,16 @@ private void reloadConfigIfNeed(boolean needReload) throws NoSuchMethodException
}
}

private boolean checkFieldValueAfter(ConfigFiled configFiled, String key, Object convertedValue) {
private boolean checkFieldValueAfter(ConfigField configField, String key, Object convertedValue) {
if (Objects.isNull(convertedValue)) {
if (configFiled.notNull()) {
if (configField.notNull()) {
throw new RuntimeException(key + " can not be null!");
}

return false;
}

if (configFiled.beNumber()) {
if (configField.beNumber()) {
if (!StringUtils.isNumeric(String.valueOf(convertedValue))) {
throw new RuntimeException(key + " must be number!");
}
Expand All @@ -173,9 +173,9 @@ private boolean checkFieldValueAfter(ConfigFiled configFiled, String key, Object
return true;
}

private boolean checkFieldValueBefore(ConfigFiled configFiled, String key, ConvertValue<?> convertValue, Object fieldValue) {
private boolean checkFieldValueBefore(ConfigField configField, String key, ConvertValue<?> convertValue, Object fieldValue) {
if (Objects.isNull(fieldValue) && !convertValue.canHandleNullValue()) {
if (configFiled.notNull()) {
if (configField.notNull()) {
throw new RuntimeException(key + " can not be null!");
}

Expand All @@ -185,8 +185,8 @@ private boolean checkFieldValueBefore(ConfigFiled configFiled, String key, Conve
return true;
}

private boolean checkNeedReload(boolean needReload, ConfigFiled configFiled) {
if (!needReload && configFiled != null && configFiled.reload()) {
private boolean checkNeedReload(boolean needReload, ConfigField configField) {
if (!needReload && configField != null && configField.reload()) {
needReload = Boolean.TRUE;
}

Expand All @@ -201,14 +201,14 @@ private boolean checkNeedReload(boolean needReload, ConfigFiled configFiled) {
return needReload;
}

private String buildKey(ConfigFiled configFiled) {
private String buildKey(ConfigField configField) {
String key;
StringBuilder keyPrefix = new StringBuilder(Objects.isNull(prefix) ? "" : prefix);

if (configFiled == null || configFiled.field().isEmpty() && keyPrefix.length() > 0) {
if (configField == null || configField.field().isEmpty() && keyPrefix.length() > 0) {
key = keyPrefix.deleteCharAt(keyPrefix.length() - 1).toString();
} else {
key = keyPrefix.append(configFiled.field()).toString();
key = keyPrefix.append(configField.field()).toString();
}

return key;
Expand Down
4 changes: 2 additions & 2 deletions ...c/main/java/org/apache/eventmesh/common/config/convert/converter/PropertiesConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

package org.apache.eventmesh.common.config.convert.converter;

import org.apache.eventmesh.common.config.ConfigFiled;
import org.apache.eventmesh.common.config.ConfigField;
import org.apache.eventmesh.common.config.convert.ConvertInfo;
import org.apache.eventmesh.common.config.convert.ConvertValue;
import org.apache.eventmesh.common.utils.PropertiesUtils;
Expand All @@ -41,7 +41,7 @@ public Properties convert(ConvertInfo convertInfo) {
}

@Override
public Object processFieldValue(ConvertInfo convertInfo, String prefix, ConfigFiled configFiled) {
public Object processFieldValue(ConvertInfo convertInfo, String prefix, ConfigField configField) {
Properties properties = convertInfo.getProperties();

if (StringUtils.isBlank(prefix)) {
Expand Down
12 changes: 6 additions & 6 deletions ...sh-meta-consul/src/main/java/org/apache/eventmesh/meta/consul/config/ConsulTLSConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
package org.apache.eventmesh.meta.consul.config;

import org.apache.eventmesh.common.config.Config;
import org.apache.eventmesh.common.config.ConfigFiled;
import org.apache.eventmesh.common.config.ConfigField;
import org.apache.eventmesh.common.config.convert.converter.EnumConverter;

import com.ecwid.consul.transport.TLSConfig.KeyStoreInstanceType;
Expand All @@ -31,19 +31,19 @@
@Config(prefix = "eventMesh.registry.consul.tls")
public class ConsulTLSConfig {

@ConfigFiled(field = "keyStoreInstanceType", converter = EnumConverter.class)
@ConfigField(field = "keyStoreInstanceType", converter = EnumConverter.class)
private KeyStoreInstanceType keyStoreInstanceType;

@ConfigFiled(field = "certificatePath")
@ConfigField(field = "certificatePath")
private String certificatePath;

@ConfigFiled(field = "certificatePassword")
@ConfigField(field = "certificatePassword")
private String certificatePassword;

@ConfigFiled(field = "keyStorePath")
@ConfigField(field = "keyStorePath")
private String keyStorePath;

@ConfigFiled(field = "keyStorePassword")
@ConfigField(field = "keyStorePassword")
private String keyStorePassword;

}
20 changes: 10 additions & 10 deletions ...s/src/main/java/org/apache/eventmesh/meta/nacos/config/NacosMetaStorageConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
package org.apache.eventmesh.meta.nacos.config;

import org.apache.eventmesh.common.config.Config;
import org.apache.eventmesh.common.config.ConfigFiled;
import org.apache.eventmesh.common.config.ConfigField;

import com.alibaba.nacos.api.PropertyKeyConst;
import com.alibaba.nacos.client.naming.utils.UtilAndComs;
Expand All @@ -31,31 +31,31 @@
@Config(prefix = "eventMesh.metaStorage.nacos")
public class NacosMetaStorageConfiguration {

@ConfigFiled(field = PropertyKeyConst.ENDPOINT)
@ConfigField(field = PropertyKeyConst.ENDPOINT)
private String endpoint;

@ConfigFiled(field = PropertyKeyConst.ENDPOINT_PORT)
@ConfigField(field = PropertyKeyConst.ENDPOINT_PORT)
private String endpointPort;

@ConfigFiled(field = PropertyKeyConst.ACCESS_KEY)
@ConfigField(field = PropertyKeyConst.ACCESS_KEY)
private String accessKey;

@ConfigFiled(field = PropertyKeyConst.SECRET_KEY)
@ConfigField(field = PropertyKeyConst.SECRET_KEY)
private String secretKey;

@ConfigFiled(field = PropertyKeyConst.CLUSTER_NAME)
@ConfigField(field = PropertyKeyConst.CLUSTER_NAME)
private String clusterName;

@ConfigFiled(field = PropertyKeyConst.NAMESPACE)
@ConfigField(field = PropertyKeyConst.NAMESPACE)
private String namespace;

@ConfigFiled(field = PropertyKeyConst.NAMING_POLLING_THREAD_COUNT)
@ConfigField(field = PropertyKeyConst.NAMING_POLLING_THREAD_COUNT)
private Integer pollingThreadCount = Runtime.getRuntime().availableProcessors() / 2 + 1;

@ConfigFiled(field = UtilAndComs.NACOS_NAMING_LOG_NAME)
@ConfigField(field = UtilAndComs.NACOS_NAMING_LOG_NAME)
private String logFileName;

@ConfigFiled(field = UtilAndComs.NACOS_NAMING_LOG_LEVEL)
@ConfigField(field = UtilAndComs.NACOS_NAMING_LOG_LEVEL)
private String logLevel;

}
Loading
Loading