opendev/gerrit
Code Issues Proposed changes

Make MetadataParser more resistent

Browse Source 
In this commit:
- Make MetadataParser resistent to blanks
- Convert all CRLF to LF for unified processing
- For HTML processing split on <div> instead of <p> to adapt the parser
  to the new email format we send out to users.

Change-Id: I7e0316915765dab256771467e0e8345ca75802aa
This commit is contained in:
Patrick Hiesel
2017-02-07 10:33:09 +01:00
parent 49df12cb7d
commit 432229e0f7
3 changed files with 33 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/MetadataParserTest.java
View File

@@ -62,11 +62,11 @@ public class MetadataParserTest {
b.subject("");
StringBuilder stringBuilder = new StringBuilder();
stringBuilder.append(toFooterWithDelimiter(MetadataName.CHANGE_ID) + "cid" + "\n");
stringBuilder.append(toFooterWithDelimiter(MetadataName.PATCH_SET) + "1" + "\n");
stringBuilder.append(toFooterWithDelimiter(MetadataName.CHANGE_ID) + "cid" + "\r\n");
stringBuilder.append("> " + toFooterWithDelimiter(MetadataName.PATCH_SET) + "1" + "\n");
stringBuilder.append(toFooterWithDelimiter(MetadataName.MESSAGE_TYPE) + "comment" + "\n");
stringBuilder.append(
toFooterWithDelimiter(MetadataName.TIMESTAMP) + "Tue, 25 Oct 2016 02:11:35 -0700" + "\n");
toFooterWithDelimiter(MetadataName.TIMESTAMP) + "Tue, 25 Oct 2016 02:11:35 -0700" + "\r\n");
b.textContent(stringBuilder.toString());
Address author = new Address("Diffy", "test@gerritcodereview.com");
@@ -91,15 +91,16 @@ public class MetadataParserTest {
b.subject("");
StringBuilder stringBuilder = new StringBuilder();
stringBuilder.append("<p>" + toFooterWithDelimiter(MetadataName.CHANGE_ID) + "cid" + "</p>");
stringBuilder.append("<p>" + toFooterWithDelimiter(MetadataName.PATCH_SET) + "1" + "</p>");
stringBuilder.append(
"<p>" + toFooterWithDelimiter(MetadataName.MESSAGE_TYPE) + "comment" + "</p>");
"<div id\"someid\">" + toFooterWithDelimiter(MetadataName.CHANGE_ID) + "cid" + "</div>");
stringBuilder.append("<div>" + toFooterWithDelimiter(MetadataName.PATCH_SET) + "1" + "</div>");
stringBuilder.append(
"<p>"
"<div>" + toFooterWithDelimiter(MetadataName.MESSAGE_TYPE) + "comment" + "</div>");
stringBuilder.append(
"<div>"
+ toFooterWithDelimiter(MetadataName.TIMESTAMP)
+ "Tue, 25 Oct 2016 02:11:35 -0700"
+ "</p>");
+ "</div>");
b.htmlContent(stringBuilder.toString());
Address author = new Address("Diffy", "test@gerritcodereview.com");