Merge pull request #8 from devondragon/3-more-component-issues-2

3 more component issues 2

Author: devondragon

README.md

@@ -36,7 +36,7 @@ Add the following dependency to your `pom.xml`:
 <dependency>
     <groupId>com.digitalsanctuary</groupId>
     <artifactId>ds-spring-cf-turnstile</artifactId>
-    <version>1.1.4</version>
+    <version>1.1.5</version>
 </dependency>
 ```
 
@@ -46,7 +46,7 @@ Add the following dependency to your `build.gradle`:
 
 ```groovy
 dependencies {
-    implementation 'com.digitalsanctuary:ds-spring-cf-turnstile:1.1.4'
+    implementation 'com.digitalsanctuary:ds-spring-cf-turnstile:1.1.5'
 }
 ```
 
@@ -115,7 +115,7 @@ The Turnstile token is passed as a request parameter named `cf-turnstile-respons
 
 ```java
 ...
-import com.digitalsanctuary.cf.turnstile.TurnstileValidationService; // Import the TurnstileValidationService
+import com.digitalsanctuary.cf.turnstile.service.TurnstileValidationService; // Import the TurnstileValidationService
 ...
 @Autowired
 private TurnstileValidationService turnstileValidationService; // Inject the TurnstileValidationService

build.gradle

@@ -13,7 +13,7 @@ import com.vanniktech.maven.publish.JavaLibrary
 import com.vanniktech.maven.publish.JavadocJar
 
 group 'com.digitalsanctuary.cf.turnstile'
-version '1.1.4'
+version '1.1.5'
 description = 'SpringBoot Cloudflare Turnstile Library'
 
 ext {
@@ -135,3 +135,18 @@ mavenPublishing {
 tasks.named("publishMavenPublicationToMavenCentralRepository") {
     dependsOn("signMavenPublication")
 }
+
+publishing {
+    repositories {
+        maven {
+            name = 'reposiliteRepository'
+            url = uri('https://reposilite.tr0n.io/private')
+            credentials(PasswordCredentials)
+            authentication {
+                 basic(BasicAuthentication)
+            }
+        }
+        // more repositories can go here
+    }
+}
+

src/main/java/com/digitalsanctuary/cf/turnstile/TurnstileConfiguration.java

@@ -1,15 +1,15 @@
 package com.digitalsanctuary.cf.turnstile;
 
 import org.springframework.boot.autoconfigure.AutoConfiguration;
-import org.springframework.boot.web.client.RestTemplateBuilder;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.web.client.RestTemplate;
+import org.springframework.context.annotation.Import;
+import com.digitalsanctuary.cf.turnstile.config.TurnstileConfigProperties;
+import com.digitalsanctuary.cf.turnstile.config.TurnstileServiceConfig;
 import jakarta.annotation.PostConstruct;
 import lombok.extern.slf4j.Slf4j;
 
 /**
- * A configuration class for the Spring AI Client.
+ * A configuration class for the Cloudflare Turnstile Client Service.
  * <p>
  * This class is responsible for configuring the necessary components and dependencies required by the client.
  * </p>
@@ -21,22 +21,13 @@
 @Slf4j
 @Configuration
 @AutoConfiguration
+@Import({TurnstileServiceConfig.class, TurnstileConfigProperties.class})
 public class TurnstileConfiguration {
 
-    @Bean
-    public RestTemplate turnstileRestTemplate(RestTemplateBuilder builder) {
-        return builder.build();
-    }
-
-    @Bean
-    public TurnstileValidationService turnstileValidationService() {
-        return new TurnstileValidationService(turnstileRestTemplate(new RestTemplateBuilder()));
-    }
-
     /**
      * Method executed after the bean initialization.
      * <p>
-     * This method logs a message indicating that the DigitalSanctuary Spring AI Client has been loaded.
+     * This method logs a message indicating that the DigitalSanctuary Cloudflare Turnstile Service has been loaded.
      * </p>
      */
     @PostConstruct

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

@@ -0,0 +1,33 @@
+package com.digitalsanctuary.cf.turnstile.config;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.stereotype.Component;
+import lombok.Data;
+
+/**
+ * Configuration properties for Turnstile integration. This class holds the properties required to configure the Turnstile service, such as the secret
+ * key, site key, and the URL for the Turnstile API.
+ */
+@Data
+@Component
+@PropertySource("classpath:config/turnstile.properties")
+@ConfigurationProperties(prefix = "ds.cf.turnstile")
+public class TurnstileConfigProperties {
+
+    /**
+     * The secret key used for Turnstile API authentication.
+     */
+    private String secret;
+
+    /**
+     * The site key used for Turnstile API authentication.
+     */
+    private String sitekey;
+
+    /**
+     * The URL for the Turnstile API.
+     */
+    private String url;
+
+}

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

@@ -0,0 +1,58 @@
+package com.digitalsanctuary.cf.turnstile.config;
+
+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 lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * Configuration class for setting up Turnstile related beans. This class configures the RestTemplate and RestClient used for Turnstile API
+ * interactions, and initializes the TurnstileValidationService.
+ */
+@Slf4j
+@Configuration
+@RequiredArgsConstructor
+public class TurnstileServiceConfig {
+
+    private final TurnstileConfigProperties properties;
+
+    /**
+     * 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.
+     *
+     * @return a configured TurnstileValidationService instance
+     */
+    @Bean
+    public TurnstileValidationService turnstileValidationService() {
+        return new TurnstileValidationService(turnstileRestClient(), properties);
+    }
+
+    /**
+     * Creates a RestClient bean for Turnstile API interactions.
+     *
+     * @return a configured RestClient instance
+     */
+    @Bean(name = "turnstileRestClient")
+    public RestClient turnstileRestClient() {
+        log.info("Creating Turnstile REST client with endpoint: {}", properties.getUrl());
+        return RestClient.builder().baseUrl(properties.getUrl()).defaultHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
+                .defaultHeader(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE).build();
+    }
+
+}

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

@@ -1,4 +1,4 @@
-package com.digitalsanctuary.cf.turnstile;
+package com.digitalsanctuary.cf.turnstile.dto;
 
 import java.util.List;
 import com.fasterxml.jackson.annotation.JsonProperty;