From c64b2b67da544614d76561ac4722d0e99a741340 Mon Sep 17 00:00:00 2001
From: Marko Strukelj <marko.strukelj@gmail.com>
Date: Mon, 29 Nov 2021 11:15:03 +0100
Subject: [PATCH] Replace blanket ParameterNumber warning suppression with
 explicit in-source declarations

Signed-off-by: Marko Strukelj <marko.strukelj@gmail.com>
---
 .checkstyle/checkstyle.xml                                      | 2 +-
 .../main/java/io/strimzi/kafka/oauth/services/ValidatorKey.java | 1 +
 .../io/strimzi/kafka/oauth/validator/JWTSignatureValidator.java | 1 +
 .../kafka/oauth/validator/OAuthIntrospectionValidator.java      | 1 +
 .../oauth/server/JaasServerOauthValidatorCallbackHandler.java   | 2 ++
 5 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.checkstyle/checkstyle.xml b/.checkstyle/checkstyle.xml
index 5317413d..5f132b81 100644
--- a/.checkstyle/checkstyle.xml
+++ b/.checkstyle/checkstyle.xml
@@ -90,7 +90,7 @@
         <module name="MethodLength"/>
         <module name="ParameterNumber">
             <!-- default is 8 -->
-            <property name="max" value="15"/>
+            <property name="max" value="13"/>
         </module>
         <module name="ClassDataAbstractionCoupling">
             <!-- default is 7 -->
diff --git a/oauth-common/src/main/java/io/strimzi/kafka/oauth/services/ValidatorKey.java b/oauth-common/src/main/java/io/strimzi/kafka/oauth/services/ValidatorKey.java
index 57e0713d..a6dfa809 100644
--- a/oauth-common/src/main/java/io/strimzi/kafka/oauth/services/ValidatorKey.java
+++ b/oauth-common/src/main/java/io/strimzi/kafka/oauth/services/ValidatorKey.java
@@ -26,6 +26,7 @@ public class ValidatorKey {
     private final int connectTimeout;
     private final int readTimeout;
 
+    @SuppressWarnings("checkstyle:ParameterNumber")
     ValidatorKey(String validIssuerUri,
             String audience,
             String customClaimCheck,
diff --git a/oauth-common/src/main/java/io/strimzi/kafka/oauth/validator/JWTSignatureValidator.java b/oauth-common/src/main/java/io/strimzi/kafka/oauth/validator/JWTSignatureValidator.java
index 1caa4475..ac286d72 100644
--- a/oauth-common/src/main/java/io/strimzi/kafka/oauth/validator/JWTSignatureValidator.java
+++ b/oauth-common/src/main/java/io/strimzi/kafka/oauth/validator/JWTSignatureValidator.java
@@ -100,6 +100,7 @@ public class JWTSignatureValidator implements TokenValidator {
      * @param connectTimeoutSeconds The maximum time to wait for connection to authorization server to be established (in seconds)
      * @param readTimeoutSeconds The maximum time to wait for response from authorization server after connection has been established and request sent (in seconds)
      */
+    @SuppressWarnings("checkstyle:ParameterNumber")
     public JWTSignatureValidator(String keysEndpointUri,
                                  SSLSocketFactory socketFactory,
                                  HostnameVerifier verifier,
diff --git a/oauth-common/src/main/java/io/strimzi/kafka/oauth/validator/OAuthIntrospectionValidator.java b/oauth-common/src/main/java/io/strimzi/kafka/oauth/validator/OAuthIntrospectionValidator.java
index 5d8538be..7cc9f3f1 100644
--- a/oauth-common/src/main/java/io/strimzi/kafka/oauth/validator/OAuthIntrospectionValidator.java
+++ b/oauth-common/src/main/java/io/strimzi/kafka/oauth/validator/OAuthIntrospectionValidator.java
@@ -77,6 +77,7 @@ public class OAuthIntrospectionValidator implements TokenValidator {
      * @param connectTimeoutSeconds The maximum time to wait for connection to authorization server to be established (in seconds)
      * @param readTimeoutSeconds The maximum time to wait for response from authorization server after connection has been established and request sent (in seconds)
      */
+    @SuppressWarnings("checkstyle:ParameterNumber")
     public OAuthIntrospectionValidator(String introspectionEndpointUri,
                                        SSLSocketFactory socketFactory,
                                        HostnameVerifier verifier,
diff --git a/oauth-server/src/main/java/io/strimzi/kafka/oauth/server/JaasServerOauthValidatorCallbackHandler.java b/oauth-server/src/main/java/io/strimzi/kafka/oauth/server/JaasServerOauthValidatorCallbackHandler.java
index 51f083ee..14163b81 100644
--- a/oauth-server/src/main/java/io/strimzi/kafka/oauth/server/JaasServerOauthValidatorCallbackHandler.java
+++ b/oauth-server/src/main/java/io/strimzi/kafka/oauth/server/JaasServerOauthValidatorCallbackHandler.java
@@ -271,6 +271,7 @@ public void configure(Map<String, ?> configs, String saslMechanism, List<AppConf
         }
     }
 
+    @SuppressWarnings("checkstyle:ParameterNumber")
     private void setupIntrospectionValidator(String validIssuerUri, String usernameClaim, String fallbackUsernameClaim, String fallbackUsernamePrefix,
                                              String groupQuery, String groupDelimiter, String clientId, String clientSecret, String audience, String customClaimCheck,
                                              String sslTruststore, String sslPassword, String sslType, String sslRnd) {
@@ -321,6 +322,7 @@ private void setupIntrospectionValidator(String validIssuerUri, String usernameC
         validator = Services.getInstance().getValidators().get(vkey, factory);
     }
 
+    @SuppressWarnings("checkstyle:ParameterNumber")
     private void setupJWKSValidator(String jwksUri, String validIssuerUri, boolean checkTokenType,
                                     String usernameClaim, String fallbackUsernameClaim, String fallbackUsernamePrefix,
                                     String groupQuery, String groupDelimiter, String audience, String customClaimCheck,