Update Turnstile service configuration, dependencies, and checkstyle rules

Author: devondragon

.claude/settings.local.json

@@ -21,7 +21,13 @@
       "Bash(git push:*)",
       "Bash(ls:*)",
       "Bash(find:*)",
-      "Bash(git restore:*)"
+      "Bash(git restore:*)",
+      "Bash(gradle clean:*)",
+      "Bash(gradle build:*)",
+      "Bash(gradle checkstyle:*)",
+      "mcp__zen__codereview",
+      "Bash(xargs ls:*)",
+      "Bash(gradle:*)"
     ],
     "deny": []
   }

README.md

@@ -43,7 +43,7 @@ Add the following dependency to your `pom.xml`:
 <dependency>
     <groupId>com.digitalsanctuary</groupId>
     <artifactId>ds-spring-cf-turnstile</artifactId>
-    <version>1.1.8</version>
+    <version>1.2.0</version>
 </dependency>
 ```
 
@@ -53,7 +53,7 @@ Add the following dependency to your `build.gradle`:
 
 ```groovy
 dependencies {
-    implementation 'com.digitalsanctuary:ds-spring-cf-turnstile:1.1.8'
+    implementation 'com.digitalsanctuary:ds-spring-cf-turnstile:1.2.0'
 }
 ```
 

config/checkstyle/checkstyle.xml

@@ -36,9 +36,6 @@
     <module name="JavadocType">
       <property name="scope" value="public"/>
     </module>
-    <module name="JavadocVariable">
-      <property name="scope" value="public"/>
-    </module>
     <module name="JavadocStyle"/>
 
     <!-- Naming Conventions -->

config/pmd/ruleset.xml

@@ -9,10 +9,10 @@
     <!-- Best Practices -->
     <rule ref="category/java/bestpractices.xml">
         <exclude name="GuardLogStatement"/>
-        <exclude name="JUnitTestContainsTooManyAsserts"/>
-        <exclude name="JUnitTestsShouldIncludeAssert"/>
-        <exclude name="JUnitAssertionsShouldIncludeMessage"/>
+        <exclude name="UnitTestContainsTooManyAsserts"/>
+        <exclude name="UnitTestAssertionsShouldIncludeMessage"/>
         <exclude name="JUnit5TestShouldBePackagePrivate"/>
+        <exclude name="AvoidUsingHardCodedIP"/>
     </rule>
 
 
@@ -26,9 +26,9 @@
         <exclude name="LongVariable"/>
         <exclude name="ShortClassName"/>
         <exclude name="CommentDefaultAccessModifier"/>
-        <exclude name="DefaultPackage"/>
         <exclude name="CallSuperInConstructor"/>
         <exclude name="UselessParentheses"/>
+        <exclude name="TooManyStaticImports"/>
     </rule>
 
     <!-- Design -->
@@ -38,21 +38,29 @@
         <exclude name="UseUtilityClass"/>
         <exclude name="DataClass"/>
         <exclude name="TooManyMethods"/>
+        <exclude name="CognitiveComplexity"/>
+        <exclude name="CyclomaticComplexity"/>
+        <exclude name="NPathComplexity"/>
+        <exclude name="NcssCount"/>
+        <exclude name="GodClass"/>
+        <exclude name="AvoidCatchingGenericException"/>
     </rule>
 
     <!-- Documentation -->
     <rule ref="category/java/documentation.xml">
         <exclude name="CommentSize"/>
+        <exclude name="CommentRequired"/>
     </rule>
 
     <!-- Error Prone -->
     <rule ref="category/java/errorprone.xml">
-        <exclude name="DataflowAnomalyAnalysis"/>
         <exclude name="AvoidFieldNameMatchingMethodName"/>
         <exclude name="AvoidLiteralsInIfCondition"/>
         <exclude name="NullAssignment"/>
         <exclude name="MissingSerialVersionUID"/>
         <exclude name="AssignmentInOperand"/>
+        <exclude name="AvoidDuplicateLiterals"/>
+        <exclude name="TestClassWithoutTestCases"/>
     </rule>
 
     <!-- Multithreading -->
@@ -64,7 +72,6 @@
     <!-- Performance -->
     <rule ref="category/java/performance.xml">
         <exclude name="AvoidInstantiatingObjectsInLoops"/>
-        <exclude name="SimplifyStartsWith"/>
     </rule>
 
 

src/main/java/com/digitalsanctuary/cf/turnstile/config/TurnstileServiceConfig.java

@@ -3,13 +3,11 @@
 import java.util.Optional;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.web.client.RestClient;
-import org.springframework.web.client.RestTemplate;
 import com.digitalsanctuary.cf.turnstile.service.TurnstileValidationService;
 import io.micrometer.core.instrument.MeterRegistry;
 import lombok.RequiredArgsConstructor;
@@ -27,17 +25,6 @@ public class TurnstileServiceConfig {
     private final TurnstileConfigProperties properties;
     private final ObjectProvider<MeterRegistry> meterRegistryProvider;
 
-    /**
-     * Creates a RestTemplate bean for Turnstile API interactions.
-     *
-     * @param builder the RestTemplateBuilder used to build the RestTemplate
-     * @return a configured RestTemplate instance
-     */
-    @Bean
-    public RestTemplate turnstileRestTemplate(RestTemplateBuilder builder) {
-        return builder.build();
-    }
-
     /**
      * Creates a TurnstileValidationService bean.
      *

src/main/java/com/digitalsanctuary/cf/turnstile/service/TurnstileValidationService.java

@@ -138,6 +138,7 @@ public void onStartup() {
         log.info("TurnstileValidationService started");
         log.info("Turnstile URL: {}", properties.getUrl());
         log.info("Turnstile Sitekey: {}", properties.getSitekey());
+        log.info("Turnstile Secret: {}", properties.getSecret() != null && !properties.getSecret().isBlank() ? "[CONFIGURED]" : "[NOT CONFIGURED]");
         log.info("Turnstile Metrics enabled: {}", properties.getMetrics().isEnabled());
         log.info("Turnstile Health Check enabled: {}", properties.getMetrics().isHealthCheckEnabled());
 
@@ -237,9 +238,10 @@ public ValidationResult validateTurnstileResponseDetailed(String token, String r
         }
 
         // Validate remoteIp if provided
-        if (remoteIp != null && (remoteIp.isEmpty() || remoteIp.isBlank())) {
+        String cleanRemoteIp = remoteIp;
+        if (cleanRemoteIp != null && (cleanRemoteIp.isEmpty() || cleanRemoteIp.isBlank())) {
             log.warn("Turnstile validation: ignoring empty or blank remoteIp");
-            remoteIp = null;
+            cleanRemoteIp = null;
         }
 
         // Validate that we have the required configuration
@@ -261,7 +263,7 @@ public ValidationResult validateTurnstileResponseDetailed(String token, String r
         Map<String, String> requestBody = new HashMap<>();
         requestBody.put("secret", properties.getSecret());
         requestBody.put("response", token);
-        Optional.ofNullable(remoteIp).ifPresent(ip -> requestBody.put("remoteip", ip));
+        Optional.ofNullable(cleanRemoteIp).ifPresent(ip -> requestBody.put("remoteip", ip));
 
         log.trace("Making request to Cloudflare Turnstile API at: {}", properties.getUrl());