vongosling closed pull request #226: [ROCKETMQ-346] One message could only has
one tag，“tags” is confusing
URL: https://github.com/apache/rocketmq/pull/226
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
similarity index 100%
rename from PULL_REQUEST_TEMPLATE.md
rename to .github/PULL_REQUEST_TEMPLATE.md
diff --git a/1 b/1
deleted file mode 100644
index 5f9f277ed..000000000
--- a/1
+++ /dev/null
@@ -1,105 +0,0 @@
-# This is a combination of 3 commits.
-# The first commit's message is:
-remove spaces before and after the properties
-
-# This is the 2nd commit message:
-
-remove spaces before and after the properties
-
-remove spaces before and after the properties
-
-remove spaces before and after the properties
-
-remove spaces before and after the properties
-
-Remove spaces before and after the properties
-
-Remove spaces before and after the properties
-
-Remove spaces before and after the properties
-
-Remove spaces before and after the properties
-
-Remove the code that is not useful in the loop
-
-Remove the code that is not useful in the loop
-
-Remove the code that is not useful in the loop
-
-Remove the code that is not useful in the loop
-
-Remove the code that is not useful in the loop
-
-Remove spaces before and after the properties
-
-Remove spaces before and after the properties
-
-Remove the code that is not useful in the loop
-
-Remove the code that is not useful in the loop
-
-Remove the code that is not useful in the loop
-
-Remove the code that is not useful in the loop
-
-Remove the code that is not useful in the loop
-
-remove spaces before and after the properties
-
-remove spaces before and after the properties
-
-Remove spaces before and after the properties
-
-Remove spaces before and after the properties
-
-Remove spaces before and after the properties
-
-Remove spaces before and after the properties
-
-Remove the code that is not useful in the loop
-
-Remove the code that is not useful in the loop
-
-Remove the code that is not useful in the loop
-
-Remove the code that is not useful in the loop
-
-Remove the code that is not useful in the loop
-
-Remove spaces before and after the properties
-
-Remove spaces before and after the properties
-
-Remove the code that is not useful in the loop
-
-Remove the code that is not useful in the loop
-
-Remove the code that is not useful in the loop
-
-Remove the code that is not useful in the loop
-
-Remove the code that is not useful in the loop
-
-# This is the 3rd commit message:
-
-remove spaces before and after the properties
-
-# Please enter the commit message for your changes. Lines starting
-# with '#' will be ignored, and an empty message aborts the commit.
-#
-# Date: Wed May 17 16:11:07 2017 +0800
-#
-# interactive rebase in progress; onto a2894b6
-# Last commands done (3 commands done):
-# squash 76b35ab remove spaces before and after the properties
-# squash 92f83bc remove spaces before and after the properties
-# Next commands to do (12 remaining commands):
-# squash d142037 remove spaces before and after the properties
-# squash 9df0fcb remove spaces before and after the properties
-# You are currently rebasing branch 'Branch_0616' on 'a2894b6'.
-#
-# Changes to be committed:
-# modified:
client/src/main/java/org/apache/rocketmq/client/impl/factory/MQClientInstance.java
-# modified: common/src/main/java/org/apache/rocketmq/common/MixAll.java
-# new file: "\357\200\272"
-#
diff --git
a/common/src/main/java/org/apache/rocketmq/common/message/Message.java
b/common/src/main/java/org/apache/rocketmq/common/message/Message.java
index 15ba2142c..a2e242a05 100644
--- a/common/src/main/java/org/apache/rocketmq/common/message/Message.java
+++ b/common/src/main/java/org/apache/rocketmq/common/message/Message.java
@@ -36,13 +36,13 @@ public Message(String topic, byte[] body) {
this(topic, "", "", 0, body, true);
}
- public Message(String topic, String tags, String keys, int flag, byte[]
body, boolean waitStoreMsgOK) {
+ public Message(String topic, String tag, String keys, int flag, byte[]
body, boolean waitStoreMsgOK) {
this.topic = topic;
this.flag = flag;
this.body = body;
- if (tags != null && tags.length() > 0)
- this.setTags(tags);
+ if (tag != null && tag.length() > 0)
+ this.setTags(tag);
if (keys != null && keys.length() > 0)
this.setKeys(keys);
@@ -50,12 +50,12 @@ public Message(String topic, String tags, String keys, int
flag, byte[] body, bo
this.setWaitStoreMsgOK(waitStoreMsgOK);
}
- public Message(String topic, String tags, byte[] body) {
- this(topic, tags, "", 0, body, true);
+ public Message(String topic, String tag, byte[] body) {
+ this(topic, tag, "", 0, body, true);
}
- public Message(String topic, String tags, String keys, byte[] body) {
- this(topic, tags, keys, 0, body, true);
+ public Message(String topic, String tag, String keys, byte[] body) {
+ this(topic, tag, keys, 0, body, true);
}
public void setKeys(String keys) {
@@ -116,8 +116,8 @@ public String getTags() {
return this.getProperty(MessageConst.PROPERTY_TAGS);
}
- public void setTags(String tags) {
- this.putProperty(MessageConst.PROPERTY_TAGS, tags);
+ public void setTags(String tag) {
+ this.putProperty(MessageConst.PROPERTY_TAGS, tag);
}
public String getKeys() {
diff --git a/pom.xml b/pom.xml
index 80db29f54..079aecd54 100644
--- a/pom.xml
+++ b/pom.xml
@@ -252,7 +252,8 @@
<exclude>.travis.yml</exclude>
<exclude>CONTRIBUTING.md</exclude>
<exclude>bin/README.md</exclude>
- <exclude>PULL_REQUEST_TEMPLATE.md</exclude>
+ <exclude>.github/*</exclude>
+ <exclude>src/test/resources/certs/*</exclude>
</excludes>
</configuration>
</plugin>
diff --git a/remoting/src/test/resources/certs/client.pem
b/remoting/src/test/resources/certs/client.pem
index 31412fea8..cb6580d90 100644
--- a/remoting/src/test/resources/certs/client.pem
+++ b/remoting/src/test/resources/certs/client.pem
@@ -1,18 +1,19 @@
-----BEGIN CERTIFICATE-----
-MIIC8zCCAdsCAQIwDQYJKoZIhvcNAQEFBQAwfDELMAkGA1UEBhMCemgxCzAJBgNV
+MIIDATCCAekCAQIwDQYJKoZIhvcNAQEFBQAwfDELMAkGA1UEBhMCemgxCzAJBgNV
BAgMAnpqMQswCQYDVQQHDAJoejEPMA0GA1UECgwGYXBhY2hlMREwDwYDVQQLDAhy
b2NrZXRtcTEOMAwGA1UEAwwFeXVrb24xHzAdBgkqhkiG9w0BCQEWEHl1a29uQGFw
-YWNoZS5vcmcwHhcNMTcxMjExMDkyOTUyWhcNMTgwMTEwMDkyOTUyWjCBhjELMAkG
-A1UEBhMCemgxCzAJBgNVBAgMAnpqMQswCQYDVQQHDAJoejEPMA0GA1UECgwGYXBh
-Y2hlMREwDwYDVQQLDAhyb2NrZXRtcTEWMBQGA1UEAwwNZm9vYmFyLmNsaWVudDEh
-MB8GCSqGSIb3DQEJARYSZm9vQGJhci5jbGllbnQuY29tMIGfMA0GCSqGSIb3DQEB
-AQUAA4GNADCBiQKBgQDoz5Uo2ZN+1ywSQXORv6kDbDXVQ72ZxBp7a6ltFLh4xdk/
-yz7bBjmryz+cAh759s8DEdngl2cCnSiM0r5NC91zox/12Di4EWt3IPdJVe1s5/VD
-Bqt5zoxbYyDgz47c95cGALgLdTB/itBPgobghQYBanWPVBNLLltw19DLf1gd6QID
-AQABMA0GCSqGSIb3DQEBBQUAA4IBAQDEpVFFcFILdnEXjyDSbgJ8rxXaUYV2aK+a
-lgrYfoHBv83MlEuHbydmHBoTL7BmPIL7JCIfufvRnnyBwcECi0E6qFbvMYNoMy6b
-OUiTq3nAnPSSoOgi2MxFxpGaOE0s2dp4K9U5nV6bXKLIwIZbJAiZT6aPVenNYJbv
-4arzFDe0Yjs/l3VYn2k9TjiiU2fxaW/8Ikx6o9nGWLTKeX/WtXfBNISqOPIL5dPF
-eaf0YKCVzvBQ3dIJiUyanRP1BCJJFrCsrPpyu4xFprbjRmDTnOpYB6CdIas5TMC8
-6HzB1fSFoltNEiCjlnLlfjpb5ueSLSbs6h1A7VH7NUEmLmncSlHf
+YWNoZS5vcmcwIBcNMTgwMTE2MDYxNjQ0WhgPMjExNzEyMjMwNjE2NDRaMIGSMQsw
+CQYDVQQGEwJDTjERMA8GA1UECAwIWmhlamlhbmcxETAPBgNVBAcMCEhhbmd6aG91
+MQ8wDQYDVQQKDAZhcGFjaGUxETAPBgNVBAsMCHJvY2tldG1xMRgwFgYDVQQDDA9h
+cGFjaGUgcm9ja2V0bXExHzAdBgkqhkiG9w0BCQEWEHl1a29uQGFwYWNoZS5vcmcw
+gZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAOjPlSjZk37XLBJBc5G/qQNsNdVD
+vZnEGntrqW0UuHjF2T/LPtsGOavLP5wCHvn2zwMR2eCXZwKdKIzSvk0L3XOjH/XY
+OLgRa3cg90lV7Wzn9UMGq3nOjFtjIODPjtz3lwYAuAt1MH+K0E+ChuCFBgFqdY9U
+E0suW3DX0Mt/WB3pAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAFGPaZKyCZzQihKj
+n/7I1J0wKl1HrU7N4sOie8E+ntcpKeX9zKYAou/4Iy0qwgxgRsnucB1rDous560a
++8DFDU8+FnikK9cQtKfQqu4F266IkkXolviZMSfkmB+NIsByIl95eMJlQHVlAvnX
+vnpGdhD/Jhs+acE1VHhO6K+8omKLA6Og8MmYGRwmnBLcxIvqoSNDlEShfQyjaECg
+I4bEi4ZhH3lSHE46FybJdoxDbj9IjHWqpOnjM23EOyfd1zcwOZJA7a54kfOpiTjz
+wrtes5yoQznun5WtGcLM8ZmyaQ+Jr3j6NyZhOwULzK1+A8YUsW6Ww39xTxQoIHEQ
+7eirb54=
-----END CERTIFICATE-----
diff --git a/remoting/src/test/resources/certs/server.pem
b/remoting/src/test/resources/certs/server.pem
index b73e33ef8..0187247af 100644
--- a/remoting/src/test/resources/certs/server.pem
+++ b/remoting/src/test/resources/certs/server.pem
@@ -1,18 +1,19 @@
-----BEGIN CERTIFICATE-----
-MIIC5DCCAcwCAQEwDQYJKoZIhvcNAQEFBQAwfDELMAkGA1UEBhMCemgxCzAJBgNV
+MIIDATCCAekCAQIwDQYJKoZIhvcNAQEFBQAwfDELMAkGA1UEBhMCemgxCzAJBgNV
BAgMAnpqMQswCQYDVQQHDAJoejEPMA0GA1UECgwGYXBhY2hlMREwDwYDVQQLDAhy
b2NrZXRtcTEOMAwGA1UEAwwFeXVrb24xHzAdBgkqhkiG9w0BCQEWEHl1a29uQGFw
-YWNoZS5vcmcwHhcNMTcxMjExMDkyNjIwWhcNMTgwMTEwMDkyNjIwWjB4MQswCQYD
-VQQGEwJ6aDELMAkGA1UECAwCemoxCzAJBgNVBAcMAmh6MQ8wDQYDVQQKDAZhcGFj
-aGUxETAPBgNVBAsMCHJvY2tldG1xMQ8wDQYDVQQDDAZmb29iYXIxGjAYBgkqhkiG
-9w0BCQEWC2Zvb0BiYXIuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDr
-JqeGLayEbAXQUC8jyJmnwkcp0yZbNzTReIOp2a/XtHnwWPN9IMPZAXm3JutN7HWT
-ZfeX80a9vrK14uRSWxuxZqtfhdMSzSv5CloqxrTTE9g7m5oVXSsl2CUryJ6BkZK0
-M2zhtDHQMsxOkDujo4zTfsRpJmnVsgsjRekvGKjCUwIDAQABMA0GCSqGSIb3DQEB
-BQUAA4IBAQCmhSgxU5PRhBD2qahj2eWKcmz3FCevXgfyN/EUrwI2dZTU5fXPP+m9
-YBLAYUINI0eYGWt0wlGJ6UFyEgt1fcXP3gqsye9fjECmWoae1kVjvYdaxYGsEXrM
-bxSum1D1bz6yRA+eSOaT5aesfw1ZL74AkIq5aRKQ4cgLGzlbIYeoa62XcAj6GrBo
-V2s/mvKCc1FPrqnpUlTTYFM9eRbEyC7HkOm9c+NAy6FqoLFr3tegH+q8ZxENDw4k
-z9gojQ6t1LDPOAmLGHwvMshHa841CwfOduSvzldtxzjnLVUvYB9cyXS1JXvuC9jj
-Q6BOXIYI+0HVgkJbcPOIYDlgC+g6QJqf
+YWNoZS5vcmcwIBcNMTgwMTE2MDYxMzQ5WhgPMjExNzEyMjMwNjEzNDlaMIGSMQsw
+CQYDVQQGEwJDTjERMA8GA1UECAwIWmhlamlhbmcxETAPBgNVBAcMCEhhbmd6aG91
+MQ8wDQYDVQQKDAZhcGFjaGUxETAPBgNVBAsMCHJvY2tldG1xMRgwFgYDVQQDDA9h
+cGFjaGUgcm9ja2V0bXExHzAdBgkqhkiG9w0BCQEWEHl1a29uQGFwYWNoZS5vcmcw
+gZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAOsmp4YtrIRsBdBQLyPImafCRynT
+Jls3NNF4g6nZr9e0efBY830gw9kBebcm603sdZNl95fzRr2+srXi5FJbG7Fmq1+F
+0xLNK/kKWirGtNMT2DubmhVdKyXYJSvInoGRkrQzbOG0MdAyzE6QO6OjjNN+xGkm
+adWyCyNF6S8YqMJTAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAAzbwXyAULmXitiU
++8/2vbUZQlzB/nXY52OIq7qu3F55hE5qlHkcVxG2JZjO3p5UETwOyNUpU4dpu3uT
+7WSdygH4Iagl87ILpGsob9pAf0joAbaXAY4sGDhg+WjR5JInAxbmT+QWZ+4NTuLQ
+fSudUSJrv+HmUlmcVOvLiNStgt9rbtcgJAvpVwY+iCv0HQziFuQxmOkDv09ZLzu/
+lxCMqnbgkEFYkwdntN6MVk38K3MovszedGO/n19hNOFss7nn5XDEeEnc6BqKGdck
+YDoy6amohY0Ds0o0gJ2rq0Y8Gjl9spQ3oeXpoNUoz84OF4KIBRTzSMv8CrmqPdFY
+Zd2MGjw=
-----END CERTIFICATE-----
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
