From f9541ceff13a020e080c0cac2abc6f7b134ff991 Mon Sep 17 00:00:00 2001
From: akarnokd <akarnokd@gmail.com>
Date: Fri, 11 Sep 2020 16:08:03 +0200
Subject: [PATCH 1/2] 3.x: Patch out duplicate @NonNull annotation in generated
 javadocs

---
 gradle/javadoc_cleanup.gradle | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/gradle/javadoc_cleanup.gradle b/gradle/javadoc_cleanup.gradle
index 12216464a7..44379c42ec 100644
--- a/gradle/javadoc_cleanup.gradle
+++ b/gradle/javadoc_cleanup.gradle
@@ -29,6 +29,20 @@ def fixJavadocFile(file) {
     // lots of spaces after the @Nullable annotations
     fileContents = fileContents.replaceAll("@Nullable</a>\\s{4,}", "@Nullable</a> ");
 
+    // javadoc bug: duplicates the link to @NonNull for some reason
+    def nonNullText = "<a href=\"../annotations/NonNull.html\" title=\"annotation in io.reactivex.rxjava3.annotations\">@NonNull</a>";
+    
+    fileContents = fileContents.replace(nonNullText + " " + nonNullText, nonNullText);
+    fileContents = fileContents.replace(nonNullText + "\n " + nonNullText, nonNullText);
+    fileContents = fileContents.replace(nonNullText + "\r\n " + nonNullText, nonNullText);
+
+    // javadoc bug: duplicates the link to @Nullable for some reason
+    def nullableText = "<a href=\"../annotations/Nullable.html\" title=\"annotation in io.reactivex.rxjava3.annotations\">@Nullable</a>";
+    
+    fileContents = fileContents.replace(nullableText + " " + nullableText, nullableText);
+    fileContents = fileContents.replace(nullableText + "\n " + nullableText, nullableText);
+    fileContents = fileContents.replace(nullableText + "\r\n " + nullableText, nullableText);
+
     file.setText(fileContents, 'UTF-8');
 }
 

From 6ae80f9bee8ef1c1de36386bccf142941faa4bba Mon Sep 17 00:00:00 2001
From: akarnokd <akarnokd@gmail.com>
Date: Fri, 11 Sep 2020 16:23:33 +0200
Subject: [PATCH 2/2] Replace different pattern for Javadocs 8

---
 gradle/javadoc_cleanup.gradle | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/gradle/javadoc_cleanup.gradle b/gradle/javadoc_cleanup.gradle
index 44379c42ec..64f6437288 100644
--- a/gradle/javadoc_cleanup.gradle
+++ b/gradle/javadoc_cleanup.gradle
@@ -30,18 +30,29 @@ def fixJavadocFile(file) {
     fileContents = fileContents.replaceAll("@Nullable</a>\\s{4,}", "@Nullable</a> ");
 
     // javadoc bug: duplicates the link to @NonNull for some reason
-    def nonNullText = "<a href=\"../annotations/NonNull.html\" title=\"annotation in io.reactivex.rxjava3.annotations\">@NonNull</a>";
+    def nonNullText1 = "<a href=\"../annotations/NonNull.html\" title=\"annotation in io.reactivex.rxjava3.annotations\">@NonNull</a>";
     
-    fileContents = fileContents.replace(nonNullText + " " + nonNullText, nonNullText);
-    fileContents = fileContents.replace(nonNullText + "\n " + nonNullText, nonNullText);
-    fileContents = fileContents.replace(nonNullText + "\r\n " + nonNullText, nonNullText);
+    fileContents = fileContents.replace(nonNullText1 + " " + nonNullText1, nonNullText1);
+    fileContents = fileContents.replace(nonNullText1 + "\n " + nonNullText1, nonNullText1);
+    fileContents = fileContents.replace(nonNullText1 + "\r\n " + nonNullText1, nonNullText1);
+
+    def nonNullText2 = "<a href=\"../../../../io/reactivex/rxjava3/annotations/NonNull.html\" title=\"annotation in io.reactivex.rxjava3.annotations\">@NonNull</a>";
+    fileContents = fileContents.replace(nonNullText2 + " " + nonNullText2, nonNullText2);
+    fileContents = fileContents.replace(nonNullText2 + "\n " + nonNullText2, nonNullText2);
+    fileContents = fileContents.replace(nonNullText2 + "\r\n " + nonNullText2, nonNullText2);
 
     // javadoc bug: duplicates the link to @Nullable for some reason
-    def nullableText = "<a href=\"../annotations/Nullable.html\" title=\"annotation in io.reactivex.rxjava3.annotations\">@Nullable</a>";
+    def nullableText1 = "<a href=\"../annotations/Nullable.html\" title=\"annotation in io.reactivex.rxjava3.annotations\">@Nullable</a>";
+    
+    fileContents = fileContents.replace(nullableText1 + " " + nullableText1, nullableText1);
+    fileContents = fileContents.replace(nullableText1 + "\n " + nullableText1, nullableText1);
+    fileContents = fileContents.replace(nullableText1 + "\r\n " + nullableText1, nullableText1);
+
+    def nullableText2 = "<a href=\"../../../../io/reactivex/rxjava3/annotations/Nullable.html\" title=\"annotation in io.reactivex.rxjava3.annotations\">@Nullable</a>";
     
-    fileContents = fileContents.replace(nullableText + " " + nullableText, nullableText);
-    fileContents = fileContents.replace(nullableText + "\n " + nullableText, nullableText);
-    fileContents = fileContents.replace(nullableText + "\r\n " + nullableText, nullableText);
+    fileContents = fileContents.replace(nullableText2 + " " + nullableText2, nullableText2);
+    fileContents = fileContents.replace(nullableText2 + "\n " + nullableText2, nullableText2);
+    fileContents = fileContents.replace(nullableText2 + "\r\n " + nullableText2, nullableText2);
 
     file.setText(fileContents, 'UTF-8');
 }