Skip to content

Commit 2d5d000

Browse files
chore(deps): update localstack/localstack and Spring Boot (#807)
* chore(deps): update localstack/localstack and Spring Boot * feat : upgrade localstack
1 parent 99ebd3b commit 2d5d000

File tree

13 files changed

+26
-22
lines changed

13 files changed

+26
-22
lines changed

aws-sns-project/docker/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: '3.8'
22
services:
33

44
localstack:
5-
image: localstack/localstack:3.8.1
5+
image: localstack/localstack:4.0.3
66
ports:
77
- "4566:4566"
88
environment:

aws-sns-project/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@
212212
<configuration>
213213
<java>
214214
<palantirJavaFormat>
215-
<version>2.47.0</version>
215+
<version>2.50.0</version>
216216
</palantirJavaFormat>
217217
<importOrder />
218218
<removeUnusedImports />

aws-sns-project/src/main/java/com/learning/awssns/config/WebMvcConfig.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,26 @@
33
import static io.awspring.cloud.sns.configuration.NotificationHandlerMethodArgumentResolverConfigurationUtils.getNotificationHandlerMethodArgumentResolver;
44

55
import java.util.List;
6-
import lombok.RequiredArgsConstructor;
76
import org.springframework.context.annotation.Configuration;
7+
import org.springframework.lang.NonNull;
88
import org.springframework.web.method.support.HandlerMethodArgumentResolver;
99
import org.springframework.web.servlet.config.annotation.CorsRegistry;
1010
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
1111
import software.amazon.awssdk.services.sns.SnsClient;
1212

1313
@Configuration(proxyBeanMethods = false)
14-
@RequiredArgsConstructor
1514
class WebMvcConfig implements WebMvcConfigurer {
1615

1716
private final ApplicationProperties properties;
1817
private final SnsClient snsClient;
1918

19+
public WebMvcConfig(ApplicationProperties properties, SnsClient snsClient) {
20+
this.properties = properties;
21+
this.snsClient = snsClient;
22+
}
23+
2024
@Override
21-
public void addCorsMappings(CorsRegistry registry) {
25+
public void addCorsMappings(@NonNull CorsRegistry registry) {
2226
registry.addMapping(properties.getCors().getPathPattern())
2327
.allowedMethods(properties.getCors().getAllowedMethods())
2428
.allowedHeaders(properties.getCors().getAllowedHeaders())
@@ -27,7 +31,7 @@ public void addCorsMappings(CorsRegistry registry) {
2731
}
2832

2933
@Override
30-
public void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) {
34+
public void addArgumentResolvers(@NonNull List<HandlerMethodArgumentResolver> argumentResolvers) {
3135
argumentResolvers.add(getNotificationHandlerMethodArgumentResolver(snsClient));
3236
}
3337
}
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
package com.learning.awssns;
22

33
import com.learning.awssns.common.ContainersConfig;
4+
import com.learning.awssns.utils.AppConstants;
45
import org.springframework.boot.SpringApplication;
56

67
public class TestSNSApplication {
78

89
public static void main(String[] args) {
9-
System.setProperty("spring.profiles.active", "local");
1010
SpringApplication.from(SNSApplication::main)
1111
.with(ContainersConfig.class)
12+
.withAdditionalProfiles(AppConstants.PROFILE_LOCAL)
1213
.run(args);
1314
}
1415
}

aws-sns-project/src/test/java/com/learning/awssns/common/ContainersConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ public class ContainersConfig {
1313
@ServiceConnection
1414
LocalStackContainer localstackContainer() {
1515
return new LocalStackContainer(
16-
DockerImageName.parse("localstack/localstack").withTag("3.7.2"));
16+
DockerImageName.parse("localstack/localstack").withTag("4.0.3"));
1717
}
1818
}

aws-sqs-project/docker/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ services:
1616
retries: 5
1717

1818
localstack:
19-
image: localstack/localstack:3.8.1
19+
image: localstack/localstack:4.0.3
2020
environment:
2121
- AWS_DEFAULT_REGION=us-east-1
2222
- EDGE_PORT=4566

aws-sqs-project/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@
336336
<configuration>
337337
<java>
338338
<googleJavaFormat>
339-
<version>1.22.0</version>
339+
<version>1.25.0</version>
340340
<style>AOSP</style>
341341
</googleJavaFormat>
342342
<formatAnnotations />

aws-sqs-project/src/test/java/com/learning/awspring/config/LocalStackTestContainers.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public class LocalStackTestContainers {
1313
@ServiceConnection
1414
LocalStackContainer localstackContainer() {
1515
return new LocalStackContainer(
16-
DockerImageName.parse("localstack/localstack").withTag("3.7.2"))
16+
DockerImageName.parse("localstack/localstack").withTag("4.0.3"))
1717
.withReuse(true);
1818
}
1919
}

aws-sqs-project/src/test/java/com/learning/awspring/config/SQLTestcontainersConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ public class SQLTestcontainersConfig {
1212
@Bean
1313
@ServiceConnection
1414
PostgreSQLContainer<?> postgreSQLContainer() {
15-
return new PostgreSQLContainer<>(DockerImageName.parse("postgres").withTag("17.0-alpine"));
15+
return new PostgreSQLContainer<>(DockerImageName.parse("postgres").withTag("17.2-alpine"));
1616
}
1717
}

aws-sqs-project/src/test/java/com/learning/awspring/repositories/SchemaValidationTest.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,13 @@
77
import javax.sql.DataSource;
88
import org.junit.jupiter.api.Test;
99
import org.springframework.beans.factory.annotation.Autowired;
10+
import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
1011
import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
1112
import org.springframework.context.annotation.Import;
1213

13-
@DataJpaTest(
14-
properties = {
15-
"spring.jpa.hibernate.ddl-auto=validate",
16-
"spring.test.database.replace=none"
17-
})
14+
@DataJpaTest(properties = {"spring.jpa.hibernate.ddl-auto=validate"})
1815
@Import(SQLTestcontainersConfig.class)
16+
@AutoConfigureTestDatabase
1917
class SchemaValidationTest {
2018

2119
@Autowired private DataSource dataSource;

0 commit comments

Comments
 (0)