Skip to content

Commit 572565f

Browse files
committed
awspringgh-1246: fix comments & remove unnecessary exclusions
1 parent 17610e0 commit 572565f

File tree

5 files changed

+2
-27
lines changed

5 files changed

+2
-27
lines changed

pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@
6060
<module>spring-cloud-aws-test</module>
6161
<module>spring-cloud-aws-modulith</module>
6262
<module>docs</module>
63-
<module>spring-cloud-aws-samples/spring-cloud-aws-cognito-sample</module>
6463
</modules>
6564

6665
<dependencyManagement>

spring-cloud-aws-autoconfigure/src/main/java/io/awspring/cloud/autoconfigure/cognito/CognitoAutoConfiguration.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
package io.awspring.cloud.autoconfigure.cognito;
1717

1818
import io.awspring.cloud.autoconfigure.AwsSyncClientCustomizer;
19-
import io.awspring.cloud.autoconfigure.core.AwsAutoConfiguration;
2019
import io.awspring.cloud.autoconfigure.core.AwsClientBuilderConfigurer;
2120
import io.awspring.cloud.autoconfigure.core.AwsConnectionDetails;
2221
import io.awspring.cloud.autoconfigure.core.CredentialsProviderAutoConfiguration;
@@ -42,8 +41,7 @@
4241
@AutoConfiguration
4342
@EnableConfigurationProperties(CognitoProperties.class)
4443
@ConditionalOnClass({ CognitoIdentityProviderClient.class })
45-
@AutoConfigureAfter({ CredentialsProviderAutoConfiguration.class, RegionProviderAutoConfiguration.class,
46-
AwsAutoConfiguration.class })
44+
@AutoConfigureAfter({ CredentialsProviderAutoConfiguration.class, RegionProviderAutoConfiguration.class })
4745
@ConditionalOnProperty(name = "spring.cloud.aws.cognito.enabled", havingValue = "true", matchIfMissing = true)
4846
public class CognitoAutoConfiguration {
4947

spring-cloud-aws-autoconfigure/src/main/java/io/awspring/cloud/autoconfigure/cognito/CognitoProperties.java

-13
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,6 @@ public class CognitoProperties extends AwsClientProperties {
3333
*/
3434
public static final String CONFIG_PREFIX = "spring.cloud.aws.cognito";
3535

36-
/**
37-
* Enables Cognito integration.
38-
*/
39-
private boolean enabled = true;
40-
4136
/**
4237
* The user pool ID.
4338
*/
@@ -53,14 +48,6 @@ public class CognitoProperties extends AwsClientProperties {
5348
*/
5449
private String clientSecret;
5550

56-
public boolean isEnabled() {
57-
return enabled;
58-
}
59-
60-
public void setEnabled(boolean enabled) {
61-
this.enabled = enabled;
62-
}
63-
6451
public String getUserPoolId() {
6552
return userPoolId;
6653
}

spring-cloud-aws-cognito/pom.xml

-10
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,6 @@
1717
<dependency>
1818
<groupId>software.amazon.awssdk</groupId>
1919
<artifactId>cognitoidentityprovider</artifactId>
20-
<exclusions>
21-
<exclusion>
22-
<groupId>software.amazon.awssdk</groupId>
23-
<artifactId>netty-nio-client</artifactId>
24-
</exclusion>
25-
<exclusion>
26-
<groupId>software.amazon.awssdk</groupId>
27-
<artifactId>apache-client</artifactId>
28-
</exclusion>
29-
</exclusions>
3020
</dependency>
3121
<dependency>
3222
<groupId>org.springframework</groupId>

spring-cloud-aws-samples/pom.xml

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
<module>spring-cloud-aws-ses-sample</module>
2424
<module>spring-cloud-aws-sns-sample</module>
2525
<module>spring-cloud-aws-sqs-sample</module>
26+
<module>spring-cloud-aws-cognito-sample</module>
2627
</modules>
2728

2829
<properties>

0 commit comments

Comments
 (0)