Skip to content

Commit 8729308

Browse files
authored
Merge pull request #2 from devondragon:issue-1-RestTemplate-component-conflict
RestTemplate component conflict
2 parents bef747d + 8410f44 commit 8729308

4 files changed

Lines changed: 6 additions & 5 deletions

File tree

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Add the following dependency to your `pom.xml`:
3636
<dependency>
3737
<groupId>com.digitalsanctuary</groupId>
3838
<artifactId>spring-cf-turnstile</artifactId>
39-
<version>1.1.1</version>
39+
<version>1.1.2</version>
4040
</dependency>
4141
```
4242

@@ -46,7 +46,7 @@ Add the following dependency to your `build.gradle`:
4646

4747
```groovy
4848
dependencies {
49-
implementation 'com.digitalsanctuary:spring-cf-turnstile:1.1.1'
49+
implementation 'com.digitalsanctuary:spring-cf-turnstile:1.1.2'
5050
}
5151
```
5252

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import com.vanniktech.maven.publish.JavaLibrary
1313
import com.vanniktech.maven.publish.JavadocJar
1414

1515
group 'com.digitalsanctuary.cf.turnstile'
16-
version '1.1.1'
16+
version '1.1.2'
1717
description = 'SpringBoot Cloudflare Turnstile Library'
1818

1919
ext {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
public class TurnstileConfiguration {
2525

2626
@Bean
27-
public RestTemplate restTemplate(RestTemplateBuilder builder) {
27+
public RestTemplate turnstileRestTemplate(RestTemplateBuilder builder) {
2828
return builder.build();
2929
}
3030

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import java.util.HashMap;
44
import java.util.Map;
5+
import org.springframework.beans.factory.annotation.Qualifier;
56
import org.springframework.beans.factory.annotation.Value;
67
import org.springframework.http.HttpEntity;
78
import org.springframework.http.HttpHeaders;
@@ -37,7 +38,7 @@ public class TurnstileValidationService {
3738
*
3839
* @param restTemplate the RestTemplate to be used for making HTTP requests.
3940
*/
40-
public TurnstileValidationService(RestTemplate restTemplate) {
41+
public TurnstileValidationService(@Qualifier("turnstileRestTemplate") RestTemplate restTemplate) {
4142
this.restTemplate = restTemplate;
4243
}
4344

0 commit comments

Comments
 (0)