Skip to content

Commit 8976c38

Browse files
scmacdonscmacdon
committed
updated POM to use JDK 21
1 parent a0562c7 commit 8976c38

File tree

6 files changed

+108
-57
lines changed

6 files changed

+108
-57
lines changed

‎javav2/example_code/sns/pom.xml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,13 @@
4343
<type>pom</type>
4444
<scope>import</scope>
4545
</dependency>
46+
<dependency>
47+
<groupId>org.apache.logging.log4j</groupId>
48+
<artifactId>log4j-bom</artifactId>
49+
<version>2.23.1</version>
50+
<type>pom</type>
51+
<scope>import</scope>
52+
</dependency>
4653
</dependencies>
4754
</dependencyManagement>
4855
<dependencies>
@@ -90,5 +97,22 @@
9097
<groupId>software.amazon.awssdk</groupId>
9198
<artifactId>sts</artifactId>
9299
</dependency>
100+
<dependency>
101+
<groupId>org.apache.logging.log4j</groupId>
102+
<artifactId>log4j-core</artifactId>
103+
</dependency>
104+
<dependency>
105+
<groupId>org.slf4j</groupId>
106+
<artifactId>slf4j-api</artifactId>
107+
<version>2.0.13</version>
108+
</dependency>
109+
<dependency>
110+
<groupId>org.apache.logging.log4j</groupId>
111+
<artifactId>log4j-slf4j2-impl</artifactId>
112+
</dependency>
113+
<dependency>
114+
<groupId>org.apache.logging.log4j</groupId>
115+
<artifactId>log4j-1.2-api</artifactId>
116+
</dependency>
93117
</dependencies>
94118
</project>

‎javav2/example_code/sns/src/main/resources/log4j2.xml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<Configuration status="WARN">
2+
<Appenders>
3+
<Console name="ConsoleAppender" target="SYSTEM_OUT">
4+
<PatternLayout pattern="%msg%n"/>
5+
</Console>
6+
<Console name="AlignedConsoleAppender" target="SYSTEM_OUT">
7+
<PatternLayout pattern="%m%n"/>
8+
</Console>
9+
</Appenders>
10+
<Loggers>
11+
<!-- Root logger configuration -->
12+
<Root level="info">
13+
<!-- Specify which appenders to use -->
14+
<AppenderRef ref="ConsoleAppender" />
15+
</Root>
16+
</Loggers>
17+
</Configuration>

‎javav2/example_code/sns/src/test/java/AWSSNSTest.java‎

Lines changed: 35 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33

44
import com.example.sns.*;
55
import org.junit.jupiter.api.*;
6+
import org.slf4j.Logger;
7+
import org.slf4j.LoggerFactory;
68
import software.amazon.awssdk.auth.credentials.EnvironmentVariableCredentialsProvider;
79
import software.amazon.awssdk.regions.Region;
810
import software.amazon.awssdk.services.secretsmanager.SecretsManagerClient;
@@ -21,6 +23,7 @@
2123
@TestInstance(TestInstance.Lifecycle.PER_METHOD)
2224
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
2325
public class AWSSNSTest {
26+
private static final Logger logger = LoggerFactory.getLogger(AWSSNSTest.class);
2427
private static SnsClient snsClient;
2528
private static String topicName = "";
2629
private static String topicArn = "";
@@ -57,131 +60,131 @@ public static void setUp() {
5760
@Test
5861
@Tag("IntegrationTest")
5962
@Order(1)
60-
public void createTopicTest() {
63+
public void testCreateTopicTest() {
6164
topicArn = CreateTopic.createSNSTopic(snsClient, topicName);
6265
assertFalse(topicArn.isEmpty());
63-
System.out.println("Test 1 passed");
66+
logger.info("Test 1 passed");
6467
}
6568

6669
@Test
6770
@Tag("IntegrationTest")
6871
@Order(2)
69-
public void listTopicsTest() {
72+
public void testListTopicsTest() {
7073
assertDoesNotThrow(() -> ListTopics.listSNSTopics(snsClient));
71-
System.out.println("Test 2 passed");
74+
logger.info("Test 2 passed");
7275
}
7376

7477
@Test
7578
@Tag("IntegrationTest")
7679
@Order(3)
77-
public void setTopicAttributesTest() {
80+
public void testSetTopicAttributesTest() {
7881
assertDoesNotThrow(() -> SetTopicAttributes.setTopAttr(snsClient, attributeName, topicArn, attributeValue));
79-
System.out.println("Test 3 passed");
82+
logger.info("Test 3 passed");
8083
}
8184

8285
@Test
8386
@Tag("IntegrationTest")
8487
@Order(4)
85-
public void getTopicAttributesTest() {
88+
public void testGetTopicAttributesTest() {
8689
assertDoesNotThrow(() -> GetTopicAttributes.getSNSTopicAttributes(snsClient, topicArn));
87-
System.out.println("Test 4 passed");
90+
logger.info("Test 4 passed");
8891
}
8992

9093
@Test
9194
@Tag("IntegrationTest")
9295
@Order(5)
93-
public void subscribeEmailTest() {
96+
public void testSubscribeEmailTest() {
9497
assertDoesNotThrow(() -> SubscribeEmail.subEmail(snsClient, topicArn, email));
95-
System.out.println("Test 5 passed");
98+
logger.info("Test 5 passed");
9699
}
97100

98101
@Test
99102
@Tag("IntegrationTest")
100103
@Order(6)
101-
public void subscribeLambdaTest() {
104+
public void testSubscribeLambdaTest() {
102105
subArn = SubscribeLambda.subLambda(snsClient, topicArn, lambdaarn);
103106
assertFalse(subArn.isEmpty());
104-
System.out.println("Test 6 passed");
107+
logger.info("Test 6 passed");
105108
}
106109

107110
@Test
108111
@Tag("IntegrationTest")
109112
@Order(7)
110-
public void useMessageFilterPolicyTest() {
113+
public void testUseMessageFilterPolicyTest() {
111114
assertDoesNotThrow(() -> UseMessageFilterPolicy.usePolicy(snsClient, subArn));
112-
System.out.println("Test 7 passed");
115+
logger.info("Test 7 passed");
113116
}
114117

115118
@Test
116119
@Tag("IntegrationTest")
117120
@Order(8)
118-
public void addTagsTest() {
121+
public void testAddTagsTest() {
119122
assertDoesNotThrow(() -> AddTags.addTopicTags(snsClient, topicArn));
120-
System.out.println("Test 8 passed");
123+
logger.info("Test 8 passed");
121124
}
122125

123126
@Test
124127
@Tag("IntegrationTest")
125128
@Order(9)
126-
public void listTagsTest() {
129+
public void testListTagsTest() {
127130
assertDoesNotThrow(() -> ListTags.listTopicTags(snsClient, topicArn));
128-
System.out.println("Test 9 passed");
131+
logger.info("Test 9 passed");
129132
}
130133

131134
@Test
132135
@Tag("IntegrationTest")
133136
@Order(10)
134-
public void deleteTagTest() {
137+
public void testDeleteTagTest() {
135138
assertDoesNotThrow(() -> DeleteTag.removeTag(snsClient, topicArn, "Environment"));
136-
System.out.println("Test 10 passed");
139+
logger.info("Test 10 passed");
137140
}
138141

139142
@Test
140143
@Tag("IntegrationTest")
141144
@Order(11)
142-
public void unsubscribeTest() {
145+
public void testUnsubscribeTest() {
143146
assertDoesNotThrow(() -> Unsubscribe.unSub(snsClient, subArn));
144-
System.out.println("Test 11 passed");
147+
logger.info("Test 11 passed");
145148
}
146149

147150
@Test
148151
@Tag("IntegrationTest")
149152
@Order(12)
150-
public void publishTopicTest() {
153+
public void testPublishTopicTest() {
151154
assertDoesNotThrow(() -> PublishTopic.pubTopic(snsClient, message, topicArn));
152-
System.out.println("Test 12 passed");
155+
logger.info("Test 12 passed");
153156
}
154157

155158
@Test
156159
@Tag("IntegrationTest")
157160
@Order(13)
158-
public void subscribeTextSMSTest() {
161+
public void testSubscribeTextSMSTest() {
159162
assertDoesNotThrow(() -> SubscribeTextSMS.subTextSNS(snsClient, topicArn, phone));
160-
System.out.println("Test 13 passed");
163+
logger.info("Test 13 passed");
161164
}
162165

163166
@Test
164167
@Tag("IntegrationTest")
165168
@Order(14)
166-
public void publishTextSMSTest() {
169+
public void testPublishTextSMSTest() {
167170
assertDoesNotThrow(() -> PublishTextSMS.pubTextSMS(snsClient, message, phone));
168-
System.out.println("Test 14 passed");
171+
logger.info("Test 14 passed");
169172
}
170173

171174
@Test
172175
@Tag("IntegrationTest")
173176
@Order(15)
174-
public void listSubscriptionsTest() {
177+
public void testListSubscriptionsTest() {
175178
assertDoesNotThrow(() -> ListSubscriptions.listSNSSubscriptions(snsClient));
176-
System.out.println("Test 15 passed");
179+
logger.info("Test 15 passed");
177180
}
178181

179182
@Test
180183
@Tag("IntegrationTest")
181184
@Order(16)
182-
public void DeleteTopic() {
185+
public void testDeleteTopic() {
183186
assertDoesNotThrow(() -> DeleteTopic.deleteSNSTopic(snsClient, topicArn));
184-
System.out.println("Test 16 passed");
187+
logger.info("Test 16 passed");
185188
}
186189

187190
private static String getSecretValues() {

‎javav2/example_code/sqs/pom.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,10 @@
9292
<groupId>software.amazon.awssdk</groupId>
9393
<artifactId>ssooidc</artifactId>
9494
</dependency>
95+
<dependency>
96+
<groupId>org.apache.logging.log4j</groupId>
97+
<artifactId>log4j-core</artifactId>
98+
</dependency>
9599
<dependency>
96100
<groupId>org.slf4j</groupId>
97101
<artifactId>slf4j-api</artifactId>

‎javav2/example_code/sqs/src/main/resources/log4j2.xml‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
<Configuration status="WARN">
22
<Appenders>
33
<Console name="ConsoleAppender" target="SYSTEM_OUT">
4-
<PatternLayout pattern="%d{YYYY-MM-dd HH:mm:ss} [%t] %-5p %c:%L - %m%n"/>
4+
<PatternLayout pattern="%msg%n"/>
5+
</Console>
6+
<Console name="AlignedConsoleAppender" target="SYSTEM_OUT">
7+
<PatternLayout pattern="%m%n"/>
58
</Console>
69
</Appenders>
7-
8-
910
<Loggers>
10-
<Root level="WARN">
11-
<AppenderRef ref="ConsoleAppender"/>
11+
<!-- Root logger configuration -->
12+
<Root level="info">
13+
<!-- Specify which appenders to use -->
14+
<AppenderRef ref="ConsoleAppender" />
1215
</Root>
13-
<Logger name="software.amazon.awssdk" level="WARN"/>
14-
<Logger name="software.amazon.awssdk.request" level="INFO"/>
15-
<Logger name="org.apache.http.wire" level="DEBUG"/>
16-
<Logger name="com.example.sqs" level="INFO"/>
1716
</Loggers>
1817
</Configuration>

‎javav2/example_code/sqs/src/test/java/SQSIntegrationTest.java‎

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
99
import static org.junit.jupiter.api.Assertions.assertFalse;
1010
import static org.junit.jupiter.api.Assertions.assertNotNull;
11+
12+
import org.slf4j.Logger;
13+
import org.slf4j.LoggerFactory;
1114
import software.amazon.awssdk.auth.credentials.EnvironmentVariableCredentialsProvider;
1215
import software.amazon.awssdk.regions.Region;
1316
import software.amazon.awssdk.services.secretsmanager.SecretsManagerClient;
@@ -26,6 +29,7 @@
2629
@TestInstance(TestInstance.Lifecycle.PER_METHOD)
2730
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
2831
public class SQSIntegrationTest {
32+
private static final Logger logger = LoggerFactory.getLogger(SQSIntegrationTest.class);
2933
private static SqsClient sqsClient;
3034
private static String queueName = "";
3135
private static String queueUrl = "";
@@ -53,67 +57,67 @@ public static void setUp() throws IOException {
5357
@Test
5458
@Tag("IntegrationTest")
5559
@Order(1)
56-
public void CreateSQSQueue() {
60+
public void testCreateSQSQueue() {
5761
queueUrl = SQSExample.createQueue(sqsClient, queueName);
5862
assertFalse(queueUrl.isEmpty());
59-
System.out.println("Test 1 passed");
63+
logger.info("Test 1 passed");
6064
}
6165

6266
@Test
6367
@Tag("IntegrationTest")
6468
@Order(2)
65-
public void SendMessage() {
69+
public void testSendMessage() {
6670
assertDoesNotThrow(() -> SendMessages.sendMessage(sqsClient, queueName, message));
67-
System.out.println("Test 2 passed");
71+
logger.info("Test 2 passed");
6872
}
6973

7074
@Test
7175
@Tag("IntegrationTest")
7276
@Order(3)
73-
public void GetMessage() {
77+
public void testGetMessage() {
7478
messages = SQSExample.receiveMessages(sqsClient, queueUrl);
7579
assertNotNull(messages);
76-
System.out.println("Test 3 passed");
80+
logger.info("Test 3 passed");
7781
}
7882

7983
@Test
8084
@Tag("IntegrationTest")
8185
@Order(4)
82-
public void GetQueueAttributes() {
86+
public void testGetQueueAttributes() {
8387
assertDoesNotThrow(() -> GetQueueAttributes.getAttributes(sqsClient, queueName));
84-
System.out.println("Test 4 passed");
88+
logger.info("Test 4 passed");
8589
}
8690

8791
@Test
8892
@Tag("IntegrationTest")
8993
@Order(5)
90-
public void DeleteMessages() {
94+
public void testDeleteMessages() {
9195
assertDoesNotThrow(() -> SQSExample.deleteMessages(sqsClient, queueUrl, messages));
92-
System.out.println("Test 5 passed");
96+
logger.info("Test 5 passed");
9397
}
9498

9599
@Test
96100
@Tag("IntegrationTest")
97101
@Order(6)
98-
public void LongPolling() {
102+
public void testLongPolling() {
99103
assertDoesNotThrow(() -> LongPolling.setLongPoll(sqsClient));
100-
System.out.println("Test 6 passed");
104+
logger.info("Test 6 passed");
101105
}
102106

103107
@Test
104108
@Tag("IntegrationTest")
105109
@Order(7)
106-
public void DeadLetterQueues() {
110+
public void testDeadLetterQueues() {
107111
assertDoesNotThrow(() -> DeadLetterQueues.setDeadLetterQueue(sqsClient));
108-
System.out.println("Test 7 passed");
112+
logger.info("Test 7 passed");
109113
}
110114

111115
@Test
112116
@Tag("IntegrationTest")
113117
@Order(8)
114-
public void DeleteQueue() {
118+
public void testDeleteQueue() {
115119
assertDoesNotThrow(() -> DeleteQueue.deleteSQSQueue(sqsClient, queueName));
116-
System.out.println("Test 8 passed");
120+
logger.info("Test 8 passed");
117121
}
118122

119123
private static String getSecretValues() {

0 commit comments

Comments
 (0)