Issue #17225: Continue to extend 'Since version' javadoc marking implementation

SteLeo1602 · romani · commit 3ce0224b28cb · 2025-06-24T16:56:48.000-07:00
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassDataAbstractionCouplingCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassDataAbstractionCouplingCheck.java
@@ -99,6 +99,7 @@
  * SortedMap, SortedSet, Stream, String, StringBuffer, StringBuilder, SuppressWarnings, Throwable,
  * TreeMap, TreeSet, UnsupportedOperationException, Void, boolean, byte, char, double,
  * float, int, long, short, var, void}.
+ * Since version 5.7
  * </li>
  * <li>
  * Property {@code excludedPackages} - Specify user-configured packages to ignore.
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassFanOutComplexityCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassFanOutComplexityCheck.java
@@ -66,6 +66,7 @@
  * SortedMap, SortedSet, Stream, String, StringBuffer, StringBuilder, SuppressWarnings, Throwable,
  * TreeMap, TreeSet, UnsupportedOperationException, Void, boolean, byte, char, double,
  * float, int, long, short, var, void}.
+ * Since version 5.7
  * </li>
  * <li>
  * Property {@code excludedPackages} - Specify user-configured packages to ignore.
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/ConstantNameCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/ConstantNameCheck.java
@@ -37,21 +37,25 @@
  * Property {@code applyToPackage} - Control if check should apply to package-private members.
  * Type is {@code boolean}.
  * Default value is {@code true}.
+ * Since version 5.0
  * </li>
  * <li>
  * Property {@code applyToPrivate} - Control if check should apply to private members.
  * Type is {@code boolean}.
  * Default value is {@code true}.
+ * Since version 5.0
  * </li>
  * <li>
  * Property {@code applyToProtected} - Control if check should apply to protected members.
  * Type is {@code boolean}.
  * Default value is {@code true}.
+ * Since version 5.0
  * </li>
  * <li>
  * Property {@code applyToPublic} - Control if check should apply to public members.
  * Type is {@code boolean}.
  * Default value is {@code true}.
+ * Since version 5.0
  * </li>
  * <li>
  * Property {@code format} - Sets the pattern to match valid identifiers.
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/MemberNameCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/MemberNameCheck.java
@@ -32,21 +32,25 @@
  * Property {@code applyToPackage} - Control if check should apply to package-private members.
  * Type is {@code boolean}.
  * Default value is {@code true}.
+ * Since version 3.4
  * </li>
  * <li>
  * Property {@code applyToPrivate} - Control if check should apply to private members.
  * Type is {@code boolean}.
  * Default value is {@code true}.
+ * Since version 3.4
  * </li>
  * <li>
  * Property {@code applyToProtected} - Control if check should apply to protected members.
  * Type is {@code boolean}.
  * Default value is {@code true}.
+ * Since version 3.4
  * </li>
  * <li>
  * Property {@code applyToPublic} - Control if check should apply to public members.
  * Type is {@code boolean}.
  * Default value is {@code true}.
+ * Since version 3.4
  * </li>
  * <li>
  * Property {@code format} - Sets the pattern to match valid identifiers.
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/MethodNameCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/MethodNameCheck.java
@@ -48,21 +48,25 @@
  * Property {@code applyToPackage} - Control if check should apply to package-private members.
  * Type is {@code boolean}.
  * Default value is {@code true}.
+ * Since version 5.1
  * </li>
  * <li>
  * Property {@code applyToPrivate} - Control if check should apply to private members.
  * Type is {@code boolean}.
  * Default value is {@code true}.
+ * Since version 5.1
  * </li>
  * <li>
  * Property {@code applyToProtected} - Control if check should apply to protected members.
  * Type is {@code boolean}.
  * Default value is {@code true}.
+ * Since version 5.1
  * </li>
  * <li>
  * Property {@code applyToPublic} - Control if check should apply to public members.
  * Type is {@code boolean}.
  * Default value is {@code true}.
+ * Since version 5.1
  * </li>
  * <li>
  * Property {@code format} - Sets the pattern to match valid identifiers.
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/StaticVariableNameCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/StaticVariableNameCheck.java
@@ -33,22 +33,26 @@
  *   members.
  * Type is {@code boolean}.
  * Default value is {@code true}.
+ * Since version 5.0
  * </li>
  * <li>
  * Property {@code applyToPrivate} - Control if check should apply to private members.
  * Type is {@code boolean}.
  * Default value is {@code true}.
+ * Since version 5.0
  * </li>
  * <li>
  * Property {@code applyToProtected} - Control if check should apply to protected
  *   members.
  * Type is {@code boolean}.
  * Default value is {@code true}.
+ * Since version 5.0
  * </li>
  * <li>
  * Property {@code applyToPublic} - Control if check should apply to public members.
  * Type is {@code boolean}.
  * Default value is {@code true}.
+ * Since version 5.0
  * </li>
  * <li>
  * Property {@code format} - Sets the pattern to match valid identifiers.
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/TypeNameCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/TypeNameCheck.java
@@ -32,22 +32,26 @@
  *   members.
  * Type is {@code boolean}.
  * Default value is {@code true}.
+ * Since version 5.0
  * </li>
  * <li>
  * Property {@code applyToPrivate} - Control if check should apply to private members.
  * Type is {@code boolean}.
  * Default value is {@code true}.
+ * Since version 5.0
  * </li>
  * <li>
  * Property {@code applyToProtected} - Control if check should apply to protected
  *   members.
  * Type is {@code boolean}.
  * Default value is {@code true}.
+ * Since version 5.0
  * </li>
  * <li>
  * Property {@code applyToPublic} - Control if check should apply to public members.
  * Type is {@code boolean}.
  * Default value is {@code true}.
+ * Since version 5.0
  * </li>
  * <li>
  * Property {@code format} - Sets the pattern to match valid identifiers.
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/site/SiteUtil.java b/src/main/java/com/puppycrawl/tools/checkstyle/site/SiteUtil.java
@@ -175,59 +175,6 @@ public final class SiteUtil {
         "CustomImportOrderCheck.customImportOrderRules"
     );
 
-    /**
-     * Frequent version.
-     */
-    private static final String VERSION_5_0 = "5.0";
-
-    /**
-     * Frequent version.
-     */
-    private static final String VERSION_5_7 = "5.7";
-
-    /**
-     * Frequent version.
-     */
-    private static final String VERSION_5_1 = "5.1";
-
-    /**
-     * Frequent version.
-     */
-    private static final String VERSION_3_4 = "3.4";
-
-    /**
-     * Map of properties whose since version is different from module version but
-     * are not specified in code because they are inherited from their super class(es).
-     * Until <a href="https://github.com/checkstyle/checkstyle/issues/14052">#14052</a>.
-     *
-     * @noinspectionreason JavacQuirks until #14052
-     */
-    private static final Map<String, String> SINCE_VERSION_FOR_INHERITED_PROPERTY = Map.ofEntries(
-        Map.entry("ClassDataAbstractionCouplingCheck.excludedClasses", VERSION_5_7),
-        Map.entry("ClassFanOutComplexityCheck.excludedClasses", VERSION_5_7),
-        // until https://github.com/checkstyle/checkstyle/issues/14052
-        Map.entry("StaticVariableNameCheck.applyToPackage", VERSION_5_0),
-        Map.entry("StaticVariableNameCheck.applyToPrivate", VERSION_5_0),
-        Map.entry("StaticVariableNameCheck.applyToProtected", VERSION_5_0),
-        Map.entry("StaticVariableNameCheck.applyToPublic", VERSION_5_0),
-        Map.entry("TypeNameCheck.applyToPackage", VERSION_5_0),
-        Map.entry("TypeNameCheck.applyToPrivate", VERSION_5_0),
-        Map.entry("TypeNameCheck.applyToProtected", VERSION_5_0),
-        Map.entry("TypeNameCheck.applyToPublic", VERSION_5_0),
-        Map.entry("ConstantNameCheck.applyToPackage", VERSION_5_0),
-        Map.entry("ConstantNameCheck.applyToPrivate", VERSION_5_0),
-        Map.entry("ConstantNameCheck.applyToProtected", VERSION_5_0),
-        Map.entry("ConstantNameCheck.applyToPublic", VERSION_5_0),
-        Map.entry("MemberNameCheck.applyToPackage", VERSION_3_4),
-        Map.entry("MemberNameCheck.applyToPrivate", VERSION_3_4),
-        Map.entry("MemberNameCheck.applyToProtected", VERSION_3_4),
-        Map.entry("MemberNameCheck.applyToPublic", VERSION_3_4),
-        Map.entry("MethodNameCheck.applyToPackage", VERSION_5_1),
-        Map.entry("MethodNameCheck.applyToPrivate", VERSION_5_1),
-        Map.entry("MethodNameCheck.applyToProtected", VERSION_5_1),
-        Map.entry("MethodNameCheck.applyToPublic", VERSION_5_1)
-    );
-
     /** Map of all superclasses properties and their javadocs. */
     private static final Map<String, DetailNode> SUPER_CLASS_PROPERTIES_JAVADOCS =
             new HashMap<>();
@@ -755,15 +702,10 @@ public static String getSinceVersion(String moduleName, DetailNode moduleJavadoc
             throws MacroExecutionException {
         final String sinceVersion;
 
-        final String hardCodedPropertyVersion = SINCE_VERSION_FOR_INHERITED_PROPERTY.get(
-            moduleName + DOT + propertyName);
         final Optional<String> specifiedPropertyVersion =
             getSpecifiedPropertyVersion(propertyName, moduleJavadoc);
 
-        if (hardCodedPropertyVersion != null) {
-            sinceVersion = hardCodedPropertyVersion;
-        }
-        else if (specifiedPropertyVersion.isPresent()) {
+        if (specifiedPropertyVersion.isPresent()) {
             sinceVersion = specifiedPropertyVersion.get();
         }
         else {
