From 572565fa7723683b27024280301b21f008e94c46 Mon Sep 17 00:00:00 2001
From: Oleh Onufryk <oleh.onufryk@boemm.eu>
Date: Mon, 9 Dec 2024 19:04:39 +0200
Subject: [PATCH] gh-1246: fix comments & remove unnecessary exclusions

---
 pom.xml                                             |  1 -
 .../cognito/CognitoAutoConfiguration.java           |  4 +---
 .../autoconfigure/cognito/CognitoProperties.java    | 13 -------------
 spring-cloud-aws-cognito/pom.xml                    | 10 ----------
 spring-cloud-aws-samples/pom.xml                    |  1 +
 5 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/pom.xml b/pom.xml
index c55a025f8..b2537809f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,6 @@
 		<module>spring-cloud-aws-test</module>
 		<module>spring-cloud-aws-modulith</module>
 		<module>docs</module>
-        <module>spring-cloud-aws-samples/spring-cloud-aws-cognito-sample</module>
     </modules>
 
 	<dependencyManagement>
diff --git a/spring-cloud-aws-autoconfigure/src/main/java/io/awspring/cloud/autoconfigure/cognito/CognitoAutoConfiguration.java b/spring-cloud-aws-autoconfigure/src/main/java/io/awspring/cloud/autoconfigure/cognito/CognitoAutoConfiguration.java
index 99a3efc62..55d4151fe 100644
--- a/spring-cloud-aws-autoconfigure/src/main/java/io/awspring/cloud/autoconfigure/cognito/CognitoAutoConfiguration.java
+++ b/spring-cloud-aws-autoconfigure/src/main/java/io/awspring/cloud/autoconfigure/cognito/CognitoAutoConfiguration.java
@@ -16,7 +16,6 @@
 package io.awspring.cloud.autoconfigure.cognito;
 
 import io.awspring.cloud.autoconfigure.AwsSyncClientCustomizer;
-import io.awspring.cloud.autoconfigure.core.AwsAutoConfiguration;
 import io.awspring.cloud.autoconfigure.core.AwsClientBuilderConfigurer;
 import io.awspring.cloud.autoconfigure.core.AwsConnectionDetails;
 import io.awspring.cloud.autoconfigure.core.CredentialsProviderAutoConfiguration;
@@ -42,8 +41,7 @@
 @AutoConfiguration
 @EnableConfigurationProperties(CognitoProperties.class)
 @ConditionalOnClass({ CognitoIdentityProviderClient.class })
-@AutoConfigureAfter({ CredentialsProviderAutoConfiguration.class, RegionProviderAutoConfiguration.class,
-		AwsAutoConfiguration.class })
+@AutoConfigureAfter({ CredentialsProviderAutoConfiguration.class, RegionProviderAutoConfiguration.class })
 @ConditionalOnProperty(name = "spring.cloud.aws.cognito.enabled", havingValue = "true", matchIfMissing = true)
 public class CognitoAutoConfiguration {
 
diff --git a/spring-cloud-aws-autoconfigure/src/main/java/io/awspring/cloud/autoconfigure/cognito/CognitoProperties.java b/spring-cloud-aws-autoconfigure/src/main/java/io/awspring/cloud/autoconfigure/cognito/CognitoProperties.java
index a122a070c..40bd94d3a 100644
--- a/spring-cloud-aws-autoconfigure/src/main/java/io/awspring/cloud/autoconfigure/cognito/CognitoProperties.java
+++ b/spring-cloud-aws-autoconfigure/src/main/java/io/awspring/cloud/autoconfigure/cognito/CognitoProperties.java
@@ -33,11 +33,6 @@ public class CognitoProperties extends AwsClientProperties {
 	 */
 	public static final String CONFIG_PREFIX = "spring.cloud.aws.cognito";
 
-	/**
-	 * Enables Cognito integration.
-	 */
-	private boolean enabled = true;
-
 	/**
 	 * The user pool ID.
 	 */
@@ -53,14 +48,6 @@ public class CognitoProperties extends AwsClientProperties {
 	 */
 	private String clientSecret;
 
-	public boolean isEnabled() {
-		return enabled;
-	}
-
-	public void setEnabled(boolean enabled) {
-		this.enabled = enabled;
-	}
-
 	public String getUserPoolId() {
 		return userPoolId;
 	}
diff --git a/spring-cloud-aws-cognito/pom.xml b/spring-cloud-aws-cognito/pom.xml
index c1faec731..6484a97df 100644
--- a/spring-cloud-aws-cognito/pom.xml
+++ b/spring-cloud-aws-cognito/pom.xml
@@ -17,16 +17,6 @@
 		<dependency>
 			<groupId>software.amazon.awssdk</groupId>
 			<artifactId>cognitoidentityprovider</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>software.amazon.awssdk</groupId>
-					<artifactId>netty-nio-client</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>software.amazon.awssdk</groupId>
-					<artifactId>apache-client</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
diff --git a/spring-cloud-aws-samples/pom.xml b/spring-cloud-aws-samples/pom.xml
index da1eb2363..2a95100ec 100644
--- a/spring-cloud-aws-samples/pom.xml
+++ b/spring-cloud-aws-samples/pom.xml
@@ -23,6 +23,7 @@
 		<module>spring-cloud-aws-ses-sample</module>
 		<module>spring-cloud-aws-sns-sample</module>
 		<module>spring-cloud-aws-sqs-sample</module>
+		<module>spring-cloud-aws-cognito-sample</module>
     </modules>
 
 	<properties>