Merge pull request #53 from devondragon/dependabot/gradle/springBootVersion-3.5.0

Bump springBootVersion from 3.4.5 to 3.5.0

Author: devondragon

build.gradle

@@ -20,7 +20,7 @@ group 'com.digitalsanctuary.cf.turnstile'
 description = 'SpringBoot Cloudflare Turnstile Library'
 
 ext {
-    springBootVersion = '3.4.5'
+    springBootVersion = '3.5.0'
     lombokVersion = '1.18.38'
 }
 
@@ -52,6 +52,9 @@ dependencies {
     testImplementation "org.springframework.boot:spring-boot-starter-web:$springBootVersion"
     testImplementation "org.springframework.boot:spring-boot-starter-test:$springBootVersion"
     testImplementation "org.springframework.boot:spring-boot-starter-actuator:$springBootVersion"
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.12.2'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 }
 
 test {
@@ -154,7 +157,7 @@ publishing {
 // Code Quality Configurations
 
 checkstyle {
-    toolVersion = '10.14.2'
+   //  toolVersion = '10.14.2'
     configFile = project.file("config/checkstyle/checkstyle.xml")
     configProperties = [
         'baseDir': rootDir
@@ -172,7 +175,7 @@ tasks.withType(Checkstyle) {
 }
 
 pmd {
-    toolVersion = '6.55.0'
+    // toolVersion = '6.55.0'
     consoleOutput = true
     ruleSetFiles = files(project.file("config/pmd/ruleset.xml"))
     ruleSets = []
@@ -189,7 +192,7 @@ tasks.withType(Pmd) {
 }
 
 jacoco {
-    toolVersion = '0.8.11'
+    // toolVersion = '0.8.11'
 }
 
 jacocoTestReport {
@@ -237,19 +240,19 @@ tasks.register("debugCI") {
         println "Working directory: ${System.getProperty('user.dir')}"
         println "Project directory: ${project.projectDir.absolutePath}"
         println "Root directory: ${rootDir.absolutePath}"
-        
+
         def checkstyleFile = project.file("config/checkstyle/checkstyle.xml")
         println "Checkstyle file exists: ${checkstyleFile.exists()}"
         if (checkstyleFile.exists()) {
             println "Checkstyle file path: ${checkstyleFile.absolutePath}"
         }
-        
+
         def pmdFile = project.file("config/pmd/ruleset.xml")
         println "PMD file exists: ${pmdFile.exists()}"
         if (pmdFile.exists()) {
             println "PMD file path: ${pmdFile.absolutePath}"
         }
-        
+
         println "Directory contents:"
         project.file("config").listFiles().each { file ->
             println " - ${file.name}"

config/pmd/ruleset.xml

@@ -12,8 +12,10 @@
         <exclude name="JUnitTestContainsTooManyAsserts"/>
         <exclude name="JUnitTestsShouldIncludeAssert"/>
         <exclude name="JUnitAssertionsShouldIncludeMessage"/>
+        <exclude name="JUnit5TestShouldBePackagePrivate"/>
     </rule>
-    
+
+
     <!-- Code Style -->
     <rule ref="category/java/codestyle.xml">
         <exclude name="AtLeastOneConstructor"/>
@@ -28,7 +30,7 @@
         <exclude name="CallSuperInConstructor"/>
         <exclude name="UselessParentheses"/>
     </rule>
-    
+
     <!-- Design -->
     <rule ref="category/java/design.xml">
         <exclude name="LawOfDemeter"/>
@@ -37,32 +39,33 @@
         <exclude name="DataClass"/>
         <exclude name="TooManyMethods"/>
     </rule>
-    
+
     <!-- Documentation -->
     <rule ref="category/java/documentation.xml">
         <exclude name="CommentSize"/>
     </rule>
-    
+
     <!-- Error Prone -->
     <rule ref="category/java/errorprone.xml">
-        <exclude name="BeanMembersShouldSerialize"/>
         <exclude name="DataflowAnomalyAnalysis"/>
         <exclude name="AvoidFieldNameMatchingMethodName"/>
         <exclude name="AvoidLiteralsInIfCondition"/>
         <exclude name="NullAssignment"/>
         <exclude name="MissingSerialVersionUID"/>
         <exclude name="AssignmentInOperand"/>
     </rule>
-    
+
     <!-- Multithreading -->
     <rule ref="category/java/multithreading.xml">
         <exclude name="UseConcurrentHashMap"/>
         <exclude name="DoNotUseThreads"/>
     </rule>
-    
+
     <!-- Performance -->
     <rule ref="category/java/performance.xml">
         <exclude name="AvoidInstantiatingObjectsInLoops"/>
         <exclude name="SimplifyStartsWith"/>
     </rule>
-</ruleset>
+
+
+</ruleset>

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

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

@@ -13,9 +13,8 @@
 /**
  * Health indicator for the Cloudflare Turnstile service.
  * <p>
- * This component provides health check information for the Cloudflare Turnstile service.
- * It checks if the service is properly configured and if the service has not exceeded
- * the configured error threshold. The health indicator can be disabled through configuration.
+ * This component provides health check information for the Cloudflare Turnstile service. It checks if the service is properly configured and if the
+ * service has not exceeded the configured error threshold. The health indicator can be disabled through configuration.
  * </p>
  */
 @Slf4j
@@ -43,19 +42,15 @@ public Health health() {
             double errorRate = validationService.getErrorRate();
             int errorThreshold = properties.getMetrics().getErrorThreshold();
 
-            Health.Builder builder = Health.up()
-                    .withDetail("url", properties.getUrl())
-                    .withDetail("validationCount", validationService.getValidationCount())
-                    .withDetail("successCount", validationService.getSuccessCount())
-                    .withDetail("errorCount", validationService.getErrorCount())
-                    .withDetail("errorRate", String.format("%.2f%%", errorRate))
-                    .withDetail("responseTimeAvg", String.format("%.2fms", validationService.getAverageResponseTime()));
+            Health.Builder builder =
+                    Health.up().withDetail("url", properties.getUrl()).withDetail("validationCount", validationService.getValidationCount())
+                            .withDetail("successCount", validationService.getSuccessCount())
+                            .withDetail("errorCount", validationService.getErrorCount()).withDetail("errorRate", String.format("%.2f%%", errorRate))
+                            .withDetail("responseTimeAvg", String.format("%.2fms", validationService.getAverageResponseTime()));
 
             // If error rate exceeds threshold, report as DOWN
             if (errorRate > errorThreshold) {
-                return builder.down()
-                        .withDetail("reason", "Error rate exceeded threshold: " + errorRate + "% > " + errorThreshold + "%")
-                        .build();
+                return builder.down().withDetail("reason", "Error rate exceeded threshold: " + errorRate + "% > " + errorThreshold + "%").build();
             }
 
             return builder.build();
@@ -64,4 +59,4 @@ public Health health() {
             return Health.down(e).withDetail("reason", "Error checking service health: " + e.getMessage()).build();
         }
     }
-}
+}

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

@@ -15,9 +15,8 @@
 /**
  * Configuration for Turnstile metrics and monitoring.
  * <p>
- * This class configures the metrics for Cloudflare Turnstile service. It sets up common
- * tags and filters for all metrics related to the Turnstile service. The metrics are only
- * configured if micrometer-core is on the classpath and metrics are enabled in the configuration.
+ * This class configures the metrics for Cloudflare Turnstile service. It sets up common tags and filters for all metrics related to the Turnstile
+ * service. The metrics are only configured if micrometer-core is on the classpath and metrics are enabled in the configuration.
  * </p>
  */
 @Slf4j
@@ -29,8 +28,7 @@ public class TurnstileMetricsConfig {
     /**
      * Customizes the meter registry for Turnstile metrics.
      * <p>
-     * Adds a common tag 'component:turnstile' to all Turnstile-related metrics
-     * and configures a prefix for all Turnstile metrics.
+     * Adds a common tag 'component:turnstile' to all Turnstile-related metrics and configures a prefix for all Turnstile metrics.
      * </p>
      *
      * @return a MeterRegistryCustomizer to customize the MeterRegistry
@@ -40,9 +38,8 @@ public MeterRegistryCustomizer<MeterRegistry> turnstileMeterRegistryCustomizer()
         log.info("Configuring Turnstile metrics");
         return registry -> {
             // Add a common tag to all turnstile metrics
-            registry.config()
-                    .meterFilter(MeterFilter.acceptNameStartsWith("turnstile"))
+            registry.config().meterFilter(MeterFilter.acceptNameStartsWith("turnstile"))
                     .meterFilter(MeterFilter.commonTags(Collections.singletonList(Tag.of("component", "turnstile"))));
         };
     }
-}
+}

src/main/java/com/digitalsanctuary/cf/turnstile/dto/TurnstileResponse.java

@@ -7,13 +7,13 @@
 /**
  * Data Transfer Object (DTO) representing the response from Cloudflare's Turnstile API.
  * <p>
- * This class maps to the JSON response returned by Cloudflare's Turnstile verification endpoint.
- * It contains information about whether the verification was successful, when the challenge was 
- * completed, what hostname it was completed on, and any error codes if the verification failed.
+ * This class maps to the JSON response returned by Cloudflare's Turnstile verification endpoint. It contains information about whether the
+ * verification was successful, when the challenge was completed, what hostname it was completed on, and any error codes if the verification failed.
  * </p>
  * <p>
  * Example successful JSON response:
  * </p>
+ * 
  * <pre>
  * {
  *   "success": true,
@@ -25,13 +25,14 @@
  * <p>
  * Example failed JSON response:
  * </p>
+ * 
  * <pre>
  * {
  *   "success": false,
  *   "error-codes": ["invalid-input-response", "timeout-or-duplicate"]
  * }
  * </pre>
- * 
+ *
  * @see <a href="https://developers.cloudflare.com/turnstile/get-started/server-side-validation/">Cloudflare Turnstile Server-Side Validation</a>
  */
 @Data
@@ -58,4 +59,3 @@ public class TurnstileResponse {
     @JsonProperty("error-codes")
     private List<String> errorCodes;
 }
-