From f58b175d9a0937bf3c43ba279c17a07d923925eb Mon Sep 17 00:00:00 2001
From: nathsou <nathan.soufflet@sonarsource.com>
Date: Fri, 21 Aug 2026 11:04:56 +0200
Subject: [PATCH 1/4] SONARJAVA-6820 Fix S9355 false positives on Eclipse
 (non-Javadoc) comments

---
 .../java/checks/AlmostJavadocCheckSample.java | 29 +++++++++++++++++++
 .../sonar/java/checks/AlmostJavadocCheck.java |  3 ++
 .../org/sonar/l10n/java/rules/java/S9355.html | 24 +++++++++++++++
 3 files changed, 56 insertions(+)

diff --git a/java-checks-test-sources/default/src/main/java/checks/AlmostJavadocCheckSample.java b/java-checks-test-sources/default/src/main/java/checks/AlmostJavadocCheckSample.java
index 32695186b26..2267a900692 100644
--- a/java-checks-test-sources/default/src/main/java/checks/AlmostJavadocCheckSample.java
+++ b/java-checks-test-sources/default/src/main/java/checks/AlmostJavadocCheckSample.java
@@ -121,6 +121,35 @@ public String toString() {
     return name;
   }
 
+  /*
+   * (non-Javadoc)
+   * @see java.lang.Object#hashCode()
+   */
+  @Override
+  public int hashCode() {
+    return 0;
+  }
+
+  /* (non-Javadoc)
+   * @see java.lang.Object#equals(java.lang.Object)
+   */
+  @Override
+  public boolean equals(Object other) {
+    return this == other;
+  }
+
+  /* (non-Javadoc)
+   * @param ignored this Eclipse stub still contains a Javadoc tag
+   */
+  public void eclipseMarkerWithoutSee(int ignored) {
+  }
+
+  // Noncompliant@+1
+  /* @see java.lang.Object#clone() */
+  public Object seeWithoutEclipseMarker() {
+    return this;
+  }
+
   record Point(int x, int y) {
     // Noncompliant@+1
     /* @param x the x coordinate */
diff --git a/java-checks/src/main/java/org/sonar/java/checks/AlmostJavadocCheck.java b/java-checks/src/main/java/org/sonar/java/checks/AlmostJavadocCheck.java
index dbb292499df..cd99cc030db 100644
--- a/java-checks/src/main/java/org/sonar/java/checks/AlmostJavadocCheck.java
+++ b/java-checks/src/main/java/org/sonar/java/checks/AlmostJavadocCheck.java
@@ -132,6 +132,9 @@ private static Tree previousSibling(Tree tree) {
 
   private static boolean isAlmostJavadoc(SyntaxTrivia trivia) {
     String text = trivia.comment().stripTrailing();
+    if (text.contains("(non-Javadoc)")) {
+      return false;
+    }
     if (trivia.isComment(CommentKind.BLOCK)) {
       return hasTag(text);
     }
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S9355.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S9355.html
index 466fe27486e..87d5cca01db 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S9355.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S9355.html
@@ -15,6 +15,7 @@ <h3>Exceptions</h3>
   <code>&lt;/a&gt;</code>, <code>&lt;/strong&gt;</code>, <code>&lt;/i&gt;</code>, <code>&lt;/pre&gt;</code>, or <code>&lt;/code&gt;</code>.</li>
   <li>The comment does not immediately precede a documentable declaration.</li>
   <li>The declaration already has a documentation comment.</li>
+  <li>The comment contains the Eclipse <code>(non-Javadoc)</code> marker.</li>
 </ul>
 <h3>Code examples</h3>
 <h4>Noncompliant code example</h4>
@@ -75,6 +76,29 @@ <h4>Compliant solution</h4>
   Entity load(String id);
 }
 </pre>
+<h4>Noncompliant code example</h4>
+<pre data-diff-id="4" data-diff-type="noncompliant">
+class Value {
+  /* @see java.lang.Object#hashCode() */ // Noncompliant: @see tag in a regular comment
+  @Override
+  public int hashCode() {
+    return 0;
+  }
+}
+</pre>
+<h4>Compliant solution</h4>
+<pre data-diff-id="4" data-diff-type="compliant">
+class Value {
+  /*
+   * (non-Javadoc)
+   * @see java.lang.Object#hashCode()
+   */
+  @Override
+  public int hashCode() {
+    return 0;
+  }
+}
+</pre>
 <h2>Resources</h2>
 <h3>Documentation</h3>
 <ul>

From 44efad03342734feef7d877c7c793f9976c45df4 Mon Sep 17 00:00:00 2001
From: nathsou <nathan.soufflet@sonarsource.com>
Date: Fri, 21 Aug 2026 11:17:49 +0200
Subject: [PATCH 2/4] SONARJAVA-6820 Pin exact (non-Javadoc) matching in S9355
 tests

---
 .../main/java/checks/AlmostJavadocCheckSample.java | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/java-checks-test-sources/default/src/main/java/checks/AlmostJavadocCheckSample.java b/java-checks-test-sources/default/src/main/java/checks/AlmostJavadocCheckSample.java
index 2267a900692..36c7a30e2a8 100644
--- a/java-checks-test-sources/default/src/main/java/checks/AlmostJavadocCheckSample.java
+++ b/java-checks-test-sources/default/src/main/java/checks/AlmostJavadocCheckSample.java
@@ -150,6 +150,20 @@ public Object seeWithoutEclipseMarker() {
     return this;
   }
 
+  // Noncompliant@+1
+  /* (non-javadoc) @see java.lang.Object#wait() */
+  public void lowercaseMarkerLookalike() {
+  }
+
+  // (non-Javadoc) {@link Object} */
+  public void eclipseMarkerLineComment() {
+  }
+
+  /* (non-Javadoc) returns </code> */
+  public String eclipseMarkerWithHtml() {
+    return name;
+  }
+
   record Point(int x, int y) {
     // Noncompliant@+1
     /* @param x the x coordinate */

From 7c9916bef5d1daab270d52c10f3aec12995c019e Mon Sep 17 00:00:00 2001
From: nathsou <nathan.soufflet@sonarsource.com>
Date: Fri, 21 Aug 2026 11:52:34 +0200
Subject: [PATCH 3/4] SONARJAVA-6820 Align S9355 description with RSPEC
 exception-only docs

---
 .../org/sonar/l10n/java/rules/java/S9355.html | 23 -------------------
 1 file changed, 23 deletions(-)

diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S9355.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S9355.html
index 87d5cca01db..81a69eb17ec 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S9355.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S9355.html
@@ -76,29 +76,6 @@ <h4>Compliant solution</h4>
   Entity load(String id);
 }
 </pre>
-<h4>Noncompliant code example</h4>
-<pre data-diff-id="4" data-diff-type="noncompliant">
-class Value {
-  /* @see java.lang.Object#hashCode() */ // Noncompliant: @see tag in a regular comment
-  @Override
-  public int hashCode() {
-    return 0;
-  }
-}
-</pre>
-<h4>Compliant solution</h4>
-<pre data-diff-id="4" data-diff-type="compliant">
-class Value {
-  /*
-   * (non-Javadoc)
-   * @see java.lang.Object#hashCode()
-   */
-  @Override
-  public int hashCode() {
-    return 0;
-  }
-}
-</pre>
 <h2>Resources</h2>
 <h3>Documentation</h3>
 <ul>

From ffd72627a47738985f9a28b537bb1acf9d188e22 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Fri, 21 Aug 2026 10:10:19 +0000
Subject: [PATCH 4/4] Update ruling results
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

🤖 Generated with GitHub Actions
---
 its/ruling/src/test/resources/mall/java-S2160.json | 5 +++++
 its/ruling/src/test/resources/mall/java-S6212.json | 1 +
 2 files changed, 6 insertions(+)
 create mode 100644 its/ruling/src/test/resources/mall/java-S2160.json

diff --git a/its/ruling/src/test/resources/mall/java-S2160.json b/its/ruling/src/test/resources/mall/java-S2160.json
new file mode 100644
index 00000000000..b8807da7619
--- /dev/null
+++ b/its/ruling/src/test/resources/mall/java-S2160.json
@@ -0,0 +1,5 @@
+{
+"com.macro.mall:mall:mall-admin/src/main/java/com/macro/mall/dto/PmsProductResult.java": [
+11
+]
+}
diff --git a/its/ruling/src/test/resources/mall/java-S6212.json b/its/ruling/src/test/resources/mall/java-S6212.json
index c6d156b68d3..5f0a1d58d7a 100644
--- a/its/ruling/src/test/resources/mall/java-S6212.json
+++ b/its/ruling/src/test/resources/mall/java-S6212.json
@@ -10,6 +10,7 @@
 65,
 69,
 76,
+91,
 107
 ],
 "com.macro.mall:mall:mall-admin/src/main/java/com/macro/mall/controller/OssController.java": [