Skip to content

Commit ffe2fcc

Browse files
authored
3.x: Patch out duplicate @nonnull annotation in generated javadocs (#7073)
* 3.x: Patch out duplicate @nonnull annotation in generated javadocs * Replace different pattern for Javadocs 8
1 parent 0f21ba8 commit ffe2fcc

File tree

1 file changed

+25
-0
lines changed

1 file changed

+25
-0
lines changed

gradle/javadoc_cleanup.gradle

+25
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,31 @@ def fixJavadocFile(file) {
2929
// lots of spaces after the @Nullable annotations
3030
fileContents = fileContents.replaceAll("@Nullable</a>\\s{4,}", "@Nullable</a> ");
3131

32+
// javadoc bug: duplicates the link to @NonNull for some reason
33+
def nonNullText1 = "<a href=\"../annotations/NonNull.html\" title=\"annotation in io.reactivex.rxjava3.annotations\">@NonNull</a>";
34+
35+
fileContents = fileContents.replace(nonNullText1 + " " + nonNullText1, nonNullText1);
36+
fileContents = fileContents.replace(nonNullText1 + "\n " + nonNullText1, nonNullText1);
37+
fileContents = fileContents.replace(nonNullText1 + "\r\n " + nonNullText1, nonNullText1);
38+
39+
def nonNullText2 = "<a href=\"../../../../io/reactivex/rxjava3/annotations/NonNull.html\" title=\"annotation in io.reactivex.rxjava3.annotations\">@NonNull</a>";
40+
fileContents = fileContents.replace(nonNullText2 + " " + nonNullText2, nonNullText2);
41+
fileContents = fileContents.replace(nonNullText2 + "\n " + nonNullText2, nonNullText2);
42+
fileContents = fileContents.replace(nonNullText2 + "\r\n " + nonNullText2, nonNullText2);
43+
44+
// javadoc bug: duplicates the link to @Nullable for some reason
45+
def nullableText1 = "<a href=\"../annotations/Nullable.html\" title=\"annotation in io.reactivex.rxjava3.annotations\">@Nullable</a>";
46+
47+
fileContents = fileContents.replace(nullableText1 + " " + nullableText1, nullableText1);
48+
fileContents = fileContents.replace(nullableText1 + "\n " + nullableText1, nullableText1);
49+
fileContents = fileContents.replace(nullableText1 + "\r\n " + nullableText1, nullableText1);
50+
51+
def nullableText2 = "<a href=\"../../../../io/reactivex/rxjava3/annotations/Nullable.html\" title=\"annotation in io.reactivex.rxjava3.annotations\">@Nullable</a>";
52+
53+
fileContents = fileContents.replace(nullableText2 + " " + nullableText2, nullableText2);
54+
fileContents = fileContents.replace(nullableText2 + "\n " + nullableText2, nullableText2);
55+
fileContents = fileContents.replace(nullableText2 + "\r\n " + nullableText2, nullableText2);
56+
3257
file.setText(fileContents, 'UTF-8');
3358
}
3459

0 commit comments

Comments
 (0)