Skip to content

Commit 31f4c42

Browse files
maciejwalkowiakmaciejwalkowiak
committed
Fix CloudMap modules in pom.xml, reformat code.
1 parent 9986358 commit 31f4c42

File tree

9 files changed

+32
-31
lines changed

9 files changed

+32
-31
lines changed

‎pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838

3939
<modules>
4040
<module>spring-cloud-aws-core</module>
41+
<module>spring-cloud-aws-cloudmap</module>
4142
<module>spring-cloud-aws-autoconfigure</module>
4243
<module>spring-cloud-aws-dependencies</module>
4344
<module>spring-cloud-aws-parameter-store</module>

‎spring-cloud-aws-autoconfigure/src/main/java/io/awspring/cloud/autoconfigure/cloudmap/CloudMapBootstrapConfiguration.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@
2121
import io.awspring.cloud.autoconfigure.cloudmap.registration.CloudMapAutoRegistration;
2222
import io.awspring.cloud.autoconfigure.core.AwsClientBuilderConfigurer;
2323
import io.awspring.cloud.autoconfigure.core.AwsClientCustomizer;
24-
import software.amazon.awssdk.services.servicediscovery.ServiceDiscoveryClient;
25-
import software.amazon.awssdk.services.servicediscovery.ServiceDiscoveryClientBuilder;
26-
2724
import org.springframework.beans.factory.ObjectProvider;
2825
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2926
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -32,6 +29,8 @@
3229
import org.springframework.context.ApplicationContext;
3330
import org.springframework.context.annotation.Bean;
3431
import org.springframework.context.annotation.Configuration;
32+
import software.amazon.awssdk.services.servicediscovery.ServiceDiscoveryClient;
33+
import software.amazon.awssdk.services.servicediscovery.ServiceDiscoveryClientBuilder;
3534

3635
/**
3736
* Cloudmap BootstrapConfiguration configuration class to create the required beans.
@@ -69,7 +68,7 @@ CloudMapAutoRegistration createAutoRegistration(ServiceDiscoveryClient serviceDi
6968

7069
@Bean
7170
@ConditionalOnMissingBean
72-
CloudMapDiscoveryClient createDiscoveryClient(ServiceDiscoveryClient serviceDiscovery){
71+
CloudMapDiscoveryClient createDiscoveryClient(ServiceDiscoveryClient serviceDiscovery) {
7372
return new CloudMapDiscoveryClient(serviceDiscovery, properties);
7473
}
7574

‎spring-cloud-aws-autoconfigure/src/main/java/io/awspring/cloud/autoconfigure/cloudmap/CloudMapUtils.java

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@
1515
*/
1616
package io.awspring.cloud.autoconfigure.cloudmap;
1717

18+
import com.fasterxml.jackson.databind.JsonNode;
19+
import com.fasterxml.jackson.databind.ObjectMapper;
20+
import io.awspring.cloud.autoconfigure.cloudmap.discovery.CloudMapServiceInstance;
21+
import io.awspring.cloud.autoconfigure.cloudmap.properties.discovery.CloudMapDiscoveryProperties;
22+
import io.awspring.cloud.autoconfigure.cloudmap.properties.registration.CloudMapRegistryProperties;
1823
import java.util.ArrayList;
1924
import java.util.Collections;
2025
import java.util.HashMap;
@@ -23,14 +28,15 @@
2328
import java.util.Optional;
2429
import java.util.UUID;
2530
import java.util.stream.Collectors;
26-
27-
import com.fasterxml.jackson.databind.JsonNode;
28-
import com.fasterxml.jackson.databind.ObjectMapper;
29-
import io.awspring.cloud.autoconfigure.cloudmap.discovery.CloudMapServiceInstance;
30-
import io.awspring.cloud.autoconfigure.cloudmap.properties.discovery.CloudMapDiscoveryProperties;
31-
import io.awspring.cloud.autoconfigure.cloudmap.properties.registration.CloudMapRegistryProperties;
3231
import org.slf4j.Logger;
3332
import org.slf4j.LoggerFactory;
33+
import org.springframework.cloud.aws.cloudmap.exceptions.CreateNameSpaceException;
34+
import org.springframework.cloud.aws.cloudmap.exceptions.CreateServiceException;
35+
import org.springframework.cloud.aws.cloudmap.exceptions.MaxRetryExceededException;
36+
import org.springframework.cloud.client.ServiceInstance;
37+
import org.springframework.core.env.Environment;
38+
import org.springframework.util.StringUtils;
39+
import org.springframework.web.reactive.function.client.WebClient;
3440
import software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider;
3541
import software.amazon.awssdk.regions.Region;
3642
import software.amazon.awssdk.services.ec2.Ec2Client;
@@ -61,14 +67,6 @@
6167
import software.amazon.awssdk.services.servicediscovery.model.ServiceFilter;
6268
import software.amazon.awssdk.services.servicediscovery.model.ServiceSummary;
6369

64-
import org.springframework.cloud.aws.cloudmap.exceptions.CreateNameSpaceException;
65-
import org.springframework.cloud.aws.cloudmap.exceptions.CreateServiceException;
66-
import org.springframework.cloud.aws.cloudmap.exceptions.MaxRetryExceededException;
67-
import org.springframework.cloud.client.ServiceInstance;
68-
import org.springframework.core.env.Environment;
69-
import org.springframework.util.StringUtils;
70-
import org.springframework.web.reactive.function.client.WebClient;
71-
7270
/**
7371
* Uses Fargate Metadata URL to retrieve IPv4 address and VPC ID to register instances to cloudmap.
7472
*

‎spring-cloud-aws-autoconfigure/src/main/java/io/awspring/cloud/autoconfigure/cloudmap/discovery/CloudMapDiscoveryClient.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@
2323
import java.util.stream.Collectors;
2424
import org.springframework.cloud.client.ServiceInstance;
2525
import org.springframework.cloud.client.discovery.DiscoveryClient;
26-
import org.springframework.context.ApplicationContext;
27-
import org.springframework.context.annotation.Bean;
28-
import org.springframework.stereotype.Service;
29-
3026
import software.amazon.awssdk.services.servicediscovery.ServiceDiscoveryClient;
3127

3228
// @checkstyle: off
@@ -41,8 +37,7 @@ public class CloudMapDiscoveryClient implements DiscoveryClient {
4137
private final ServiceDiscoveryClient serviceDiscovery;
4238
private final CloudMapProperties properties;
4339

44-
public CloudMapDiscoveryClient(ServiceDiscoveryClient serviceDiscovery,
45-
CloudMapProperties properties) {
40+
public CloudMapDiscoveryClient(ServiceDiscoveryClient serviceDiscovery, CloudMapProperties properties) {
4641
this.serviceDiscovery = serviceDiscovery;
4742
this.properties = properties;
4843
}

‎spring-cloud-aws-dependencies/pom.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,12 @@
6969
<version>${project.version}</version>
7070
</dependency>
7171

72+
<dependency>
73+
<groupId>io.awspring.cloud</groupId>
74+
<artifactId>spring-cloud-aws-cloudmap</artifactId>
75+
<version>${project.version}</version>
76+
</dependency>
77+
7278
<dependency>
7379
<groupId>io.awspring.cloud</groupId>
7480
<artifactId>spring-cloud-aws-autoconfigure</artifactId>
@@ -129,6 +135,12 @@
129135
<version>${project.version}</version>
130136
</dependency>
131137

138+
<dependency>
139+
<groupId>io.awspring.cloud</groupId>
140+
<artifactId>spring-cloud-aws-starter-cloudmap</artifactId>
141+
<version>${project.version}</version>
142+
</dependency>
143+
132144
<dependency>
133145
<groupId>io.awspring.cloud</groupId>
134146
<artifactId>spring-cloud-aws-starter-parameter-store</artifactId>

‎spring-cloud-aws-samples/spring-cloud-aws-cloud-map-sample/pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121
</dependency>
2222
<dependency>
2323
<groupId>io.awspring.cloud</groupId>
24-
<artifactId>spring-cloud-starter-aws-cloudmap</artifactId>
25-
<version>3.0.0-SNAPSHOT</version>
24+
<artifactId>spring-cloud-aws-starter-cloudmap</artifactId>
2625
</dependency>
2726
</dependencies>
2827

‎spring-cloud-aws-samples/spring-cloud-aws-cloud-map-sample/src/main/java/io/awspring/cloud/cloudmap/sample/SpringCloudAwsCloudMapSample.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
import org.slf4j.Logger;
1919
import org.slf4j.LoggerFactory;
20-
2120
import org.springframework.beans.factory.annotation.Autowired;
2221
import org.springframework.boot.ApplicationRunner;
2322
import org.springframework.boot.SpringApplication;

‎spring-cloud-aws-starters/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
<modules>
1616
<module>spring-cloud-aws-starter</module>
17+
<module>spring-cloud-aws-starter-cloudmap</module>
1718
<module>spring-cloud-aws-starter-metrics</module>
1819
<module>spring-cloud-aws-starter-parameter-store</module>
1920
<module>spring-cloud-aws-starter-secrets-manager</module>
@@ -22,7 +23,6 @@
2223
<module>spring-cloud-aws-starter-sns</module>
2324
<module>spring-cloud-aws-starter-sqs</module>
2425
<module>spring-cloud-aws-starter-dynamodb</module>
25-
<module>spring-cloud-starter-aws-cloudmap</module>
2626
</modules>
2727

2828
</project>

‎spring-cloud-aws-starters/spring-cloud-starter-aws-cloudmap/pom.xml renamed to ‎spring-cloud-aws-starters/spring-cloud-aws-starter-cloudmap/pom.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,18 @@
99
<version>3.0.0-SNAPSHOT</version>
1010
</parent>
1111

12-
<artifactId>spring-cloud-starter-aws-cloudmap</artifactId>
12+
<artifactId>spring-cloud-aws-starter-cloudmap</artifactId>
1313
<name>Spring Cloud AWS Cloud Map Starter</name>
1414
<description>Spring Cloud AWS Cloud Map Starter</description>
1515

1616
<dependencies>
1717
<dependency>
1818
<groupId>io.awspring.cloud</groupId>
1919
<artifactId>spring-cloud-aws-cloudmap</artifactId>
20-
<version>3.0.0-SNAPSHOT</version>
2120
</dependency>
2221
<dependency>
2322
<groupId>io.awspring.cloud</groupId>
2423
<artifactId>spring-cloud-aws-starter</artifactId>
25-
<version>3.0.0-SNAPSHOT</version>
2624
</dependency>
2725
</dependencies>
2826

0 commit comments

Comments
 (0)