From 17766114d7b1d83e1693cdda0527a40b15de50cd Mon Sep 17 00:00:00 2001
From: Maxim Muzafarov <maxmuzaf@gmail.com>
Date: Fri, 26 May 2023 10:36:31 +0200
Subject: [PATCH] fix minor comments for the code clarity

---
 .../config/ValidatedPropertyLoader.java        | 18 ++++++++----------
 .../config/WithReplacementLoader.java          |  1 +
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/java/org/apache/cassandra/config/ValidatedPropertyLoader.java b/src/java/org/apache/cassandra/config/ValidatedPropertyLoader.java
index b736540ff056..e781715509d5 100644
--- a/src/java/org/apache/cassandra/config/ValidatedPropertyLoader.java
+++ b/src/java/org/apache/cassandra/config/ValidatedPropertyLoader.java
@@ -74,14 +74,11 @@ private static Property listenablePropertyFactory(Field field)
     private static <S, T> ListenableProperty.BeforeChangeListener<S, T> createValidationListener(Field field, ValidatedBy annotation)
     {
         Class<?> clazz = FBUtilities.classForName(annotation.useClass(), "validate method");
-        List<Method> matches = new ArrayList<>();
-        for (Method method : clazz.getDeclaredMethods())
-        {
-            if (method.getName().equals(annotation.useClassMethod()) &&
-                Modifier.isStatic(method.getModifiers()) &&
-                Modifier.isPublic(method.getModifiers()))
-                matches.add(method);
-        }
+        List<Method> matches = Arrays.stream(clazz.getDeclaredMethods())
+                                     .filter(m -> m.getName().equals(annotation.useClassMethod()) &&
+                                                  Modifier.isStatic(m.getModifiers()) &&
+                                                  Modifier.isPublic(m.getModifiers()))
+                                     .collect(Collectors.toList());
 
         if (matches.isEmpty())
             throw new ConfigurationException(String.format("Required public static method '%s' not found in class '%s'",
@@ -120,9 +117,10 @@ private static <S, T> ListenableProperty.BeforeChangeListener<S, T> createValida
                                                   (s, n, o, v) -> sneakyThrow(() -> method.invoke(null, s, n, v)));
             default:
                 throw new ConfigurationException(String.format("Required method '%s' in class '%s' must have one, two, " +
-                                                               "or three input parameters",
+                                                               "or three input parameters, but it has '%s' instead.",
                                                                annotation.useClassMethod(),
-                                                               clazz.getCanonicalName()), false);
+                                                               clazz.getCanonicalName(),
+                                                               method.getParameterCount()), false);
         }
     }
 
diff --git a/src/java/org/apache/cassandra/config/WithReplacementLoader.java b/src/java/org/apache/cassandra/config/WithReplacementLoader.java
index c0a288de22e3..89e1c8faf460 100644
--- a/src/java/org/apache/cassandra/config/WithReplacementLoader.java
+++ b/src/java/org/apache/cassandra/config/WithReplacementLoader.java
@@ -24,6 +24,7 @@
 public class WithReplacementLoader implements Loader
 {
     private final Loader delegate;
+
     public WithReplacementLoader(Loader delegate)
     {
         this.delegate = delegate;