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 #428]Fix Chinese annotation #431

Merged
merged 6 commits into from
Jul 16, 2021
Merged

[ISSUE #428]Fix Chinese annotation #431

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
518c6fd
The Chinese in the notes is translated into English.
Roc-00 Jul 10, 2021
64e1331
Translation improvement
Roc-00 Jul 12, 2021
69d4887
Merge branch 'apache:develop' into develop
Roc-00 Jul 12, 2021
b1be2dd
Merge remote-tracking branch 'origin/develop' into develop
Roc-00 Jul 12, 2021
4b82183
Translation improvement
Roc-00 Jul 14, 2021
fad0381
fix Chinese annotation on runtime module
Roc-00 Jul 14, 2021
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
4 changes: 2 additions & 2 deletions eventmesh-common/src/main/java/org/apache/eventmesh/common/command/HttpCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ public class HttpCommand {

public Body body;

//Command 请求时间
//Command request time
public long reqTime;

//Command 回复时间
//Command response time
public long resTime;

public CmdType cmdType = CmdType.REQ;
Expand Down
6 changes: 3 additions & 3 deletions ...ain/java/org/apache/eventmesh/common/protocol/http/body/client/HeartbeatResponseBody.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@

public class HeartbeatResponseBody extends Body {

//响应码
//react code
private Integer retCode;

//响应信息
//response message
private String retMsg;

//回复时间
//response time
private long resTime = System.currentTimeMillis();

public Integer getRetCode() {
Expand Down
6 changes: 3 additions & 3 deletions ...java/org/apache/eventmesh/common/protocol/http/body/message/ReplyMessageResponseBody.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@

public class ReplyMessageResponseBody extends Body {

//响应码
//react code
private Integer retCode;

//响应信息
//react message
private String retMsg;

//回复时间
//response time
private long resTime = System.currentTimeMillis();

public Integer getRetCode() {
Expand Down
6 changes: 3 additions & 3 deletions .../org/apache/eventmesh/common/protocol/http/body/message/SendMessageBatchResponseBody.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@

public class SendMessageBatchResponseBody extends Body {

//响应码
//react code
private Integer retCode;

//响应信息
//react message
private String retMsg;

//回复时间
//response time
private long resTime = System.currentTimeMillis();

public Integer getRetCode() {
Expand Down
6 changes: 3 additions & 3 deletions ...rg/apache/eventmesh/common/protocol/http/body/message/SendMessageBatchV2ResponseBody.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@

public class SendMessageBatchV2ResponseBody extends Body {

//响应码
//react code
private Integer retCode;

//响应信息
//react code
private String retMsg;

//回复时间
//response time
private long resTime = System.currentTimeMillis();

public Integer getRetCode() {
Expand Down
1 change: 1 addition & 0 deletions ...-common/src/main/java/org/apache/eventmesh/common/protocol/http/common/ClientRetCode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ public enum ClientRetCode {

/**
* 这个RETRY的意思是 客户端发现投递的消息它没有监听时, 告诉EventMesh 发往下一个, 重试几次以实现灰度 , 预留
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We may also need to remove this Chinese comment

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it.

* The "RETRY" means:when the client finds the delivered message and it does not listen, tell EventMesh to send next,try again several times to achieve grayscale, reserve
*/

OK(1, "ok, SDK返回"),
Expand Down
6 changes: 3 additions & 3 deletions ...sh-common/src/main/java/org/apache/eventmesh/common/protocol/http/common/ProtocolKey.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public class ProtocolKey {
public static final String VERSION = "Version";

public static class ClientInstanceKey {
////////////////////////////////////协议层请求方描述///////////
////////////////////////////////////Protocol layer requester description///////////
public static final String ENV = "Env";
public static final String IDC = "Idc";
public static final String SYS = "Sys";
Expand All @@ -36,15 +36,15 @@ public static class ClientInstanceKey {


public static class EventMeshInstanceKey {
///////////////////////////////////////////////协议层EventMesh描述
///////////////////////////////////////////////Protocol layer EventMesh description
public static final String EVENTMESHCLUSTER = "EventMeshCluster";
public static final String EVENTMESHIP = "EventMeshIp";
public static final String EVENTMESHENV = "EventMeshEnv";
public static final String EVENTMESHIDC = "EventMeshIdc";
}


//CLIENT <-> EventMesh 的 返回
//return of CLIENT <-> EventMesh
public static final String RETCODE = "retCode";
public static final String RETMSG = "retMsg";
public static final String RESTIME = "resTime";
Expand Down
20 changes: 10 additions & 10 deletions .../java/org/apache/eventmesh/common/protocol/http/header/client/HeartbeatRequestHeader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,36 +29,36 @@

public class HeartbeatRequestHeader extends Header {

//请求码
//request code
private String code;

//请求方语言描述
//requester language description
private String language;

//请求方采用的协议版本, 默认1.0
//protocol version adopted by requester, default:1.0
private ProtocolVersion version;

//请求方所在环境编号
//the environment number of the requester
private String env;

//请求方所在IDC
//the IDC of the requester
private String idc;

//请求方的子系统
//subsystem of the requester
private String sys;

//请求方的进程号
//PID of the requester
private String pid;

//请求方的IP
//IP of the requester
private String ip;

private String producerGroup;

//请求方的USERNAME
//USERNAME of the requester
private String username = "username";

//请求方的PASSWD
//PASSWD of the requester
private String passwd = "user@123";

public String getCode() {
Expand Down
10 changes: 5 additions & 5 deletions .../main/java/org/apache/eventmesh/common/protocol/http/header/client/RegResponseHeader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,19 @@

public class RegResponseHeader extends Header {

//响应码, 与对应Request的code一致
//response code, as same as the request code
private int code;

//处理该次Request请求的eventMesh的集群名
//The cluster name of the EventMesh that processes the request
private String eventMeshCluster;

//处理该次Request请求的eventMesh的IP
//IP of the EventMesh that processes the request
private String eventMeshIp;

//处理该次Request请求的eventMesh所在的环境编号
//Environment number of the EventMesh that processes the request
private String eventMeshEnv;

//处理该次Request请求的eventMesh所在IDC
//IDC of the EventMesh that processes the request
private String eventMeshIdc;

public int getCode() {
Expand Down
20 changes: 10 additions & 10 deletions ...main/java/org/apache/eventmesh/common/protocol/http/header/client/UnRegRequestHeader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,34 +29,34 @@

public class UnRegRequestHeader extends Header {

//请求码
//request code
private String code;

//请求方语言描述
//requester language description
private String language;

//请求方采用的协议版本, 默认1.0
//protocol version adopted by requester, default:1.0
private ProtocolVersion version;

//请求方所在环境编号
//the environment number of the requester
private String env;

//请求方所在IDC
//the IDC of the requester
private String idc;

//请求方的子系统
//subsystem of the requester
private String sys;

//请求方的进程号
//PID of the requester
private String pid;

//请求方的IP
//IP of the requester
private String ip;

//请求方的USERNAME
//USERNAME of the requester
private String username = "username";

//请求方的PASSWD
//PASSWD of the requester
private String passwd = "user@123";

public static UnRegRequestHeader buildHeader(Map<String, Object> headerParam) {
Expand Down
6 changes: 3 additions & 3 deletions ...va/org/apache/eventmesh/common/protocol/http/header/message/PushMessageRequestHeader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@

public class PushMessageRequestHeader extends Header {

//请求码
//request code
private int code;

//请求方语言描述
//requester language description
private String language;

//请求方采用的协议版本, 默认1.0
//protocol version adopted by requester, default:1.0
private ProtocolVersion version;

private String eventMeshCluster;
Expand Down
20 changes: 10 additions & 10 deletions ...a/org/apache/eventmesh/common/protocol/http/header/message/PushMessageResponseHeader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,34 +28,34 @@

public class PushMessageResponseHeader extends Header {

//响应码
//response code
private int code;

//请求方语言描述
//requester language description
private String language;

//请求方采用的协议版本, 默认1.0
//protocol version adopted by requester, default:1.0
private ProtocolVersion version;

//请求方所在环境编号
//the environment number of the requester
private String env;

//请求方所在IDC
//the IDC of the requester
private String idc;

//请求方的子系统
//subsystem of the requester
private String sys;

//请求方的进程号
//PID of the requester
private String pid;

//请求方的IP
//IP of the requester
private String ip;

//请求方的USERNAME
//USERNAME of the requester
private String username = "username";

//请求方的PASSWD
//PASSWD of the requester
private String passwd = "user@123";

public String getUsername() {
Expand Down
20 changes: 10 additions & 10 deletions ...a/org/apache/eventmesh/common/protocol/http/header/message/ReplyMessageRequestHeader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,34 +29,34 @@

public class ReplyMessageRequestHeader extends Header {

//请求码
//request code
private String code;

//请求方语言描述
//requester language description
private String language;

//请求方采用的协议版本, 默认1.0
//protocol version adopted by requester, default:1.0
private ProtocolVersion version;

//请求方所在环境编号
//the environment number of the requester
private String env;

//请求方所在IDC
//the IDC of the requester
private String idc;

//请求方的子系统
//subsystem of the requester
private String sys;

//请求方的进程号
//PID of the requester
private String pid;

//请求方的IP
//IP of the requester
private String ip;

//请求方的USERNAME
//USERNAME of the requester
private String username = "username";

//请求方的PASSWD
//PASSWD of the requester
private String passwd = "user@123";

public String getUsername() {
Expand Down
10 changes: 5 additions & 5 deletions .../org/apache/eventmesh/common/protocol/http/header/message/ReplyMessageResponseHeader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,19 @@

public class ReplyMessageResponseHeader extends Header {

//响应码, 与对应Request的code一致
//response code, as same as the request code
private int code;

//处理该次Request请求的eventMesh的集群名
//The cluster name of the EventMesh that processes the request
private String eventMeshCluster;

//处理该次Request请求的eventMesh的IP
//IP of the EventMesh that processes the request
private String eventMeshIp;

//处理该次Request请求的eventMesh所在的环境编号
//Environment number of the EventMesh that processes the request
private String eventMeshEnv;

//处理该次Request请求的eventMesh所在IDC
//IDC of the EventMesh that processes the request
private String eventMeshIdc;

public int getCode() {
Expand Down
Loading