Skip to content

Commit af40dad

Browse files
scmacdonscmacdon
committed
updated POM to use JDK 21
1 parent 7db9801 commit af40dad

File tree

7 files changed

+128
-68
lines changed

7 files changed

+128
-68
lines changed

‎javav2/example_code/route53/pom.xml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,13 @@
3939
<type>pom</type>
4040
<scope>import</scope>
4141
</dependency>
42+
<dependency>
43+
<groupId>org.apache.logging.log4j</groupId>
44+
<artifactId>log4j-bom</artifactId>
45+
<version>2.23.1</version>
46+
<type>pom</type>
47+
<scope>import</scope>
48+
</dependency>
4249
</dependencies>
4350
</dependencyManagement>
4451
<dependencies>
@@ -73,5 +80,22 @@
7380
<groupId>software.amazon.awssdk</groupId>
7481
<artifactId>ssooidc</artifactId>
7582
</dependency>
83+
<dependency>
84+
<groupId>org.apache.logging.log4j</groupId>
85+
<artifactId>log4j-core</artifactId>
86+
</dependency>
87+
<dependency>
88+
<groupId>org.slf4j</groupId>
89+
<artifactId>slf4j-api</artifactId>
90+
<version>2.0.13</version>
91+
</dependency>
92+
<dependency>
93+
<groupId>org.apache.logging.log4j</groupId>
94+
<artifactId>log4j-slf4j2-impl</artifactId>
95+
</dependency>
96+
<dependency>
97+
<groupId>org.apache.logging.log4j</groupId>
98+
<artifactId>log4j-1.2-api</artifactId>
99+
</dependency>
76100
</dependencies>
77101
</project>

‎javav2/example_code/route53/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/route53/src/test/java/Route53Test.java‎

Lines changed: 19 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
import org.junit.jupiter.api.DisplayName;
1414
import org.junit.jupiter.api.Nested;
1515
import org.junit.jupiter.api.Tag;
16+
import org.slf4j.Logger;
17+
import org.slf4j.LoggerFactory;
1618
import software.amazon.awssdk.auth.credentials.EnvironmentVariableCredentialsProvider;
1719
import software.amazon.awssdk.services.route53.Route53Client;
1820
import org.junit.jupiter.api.TestInstance;
@@ -37,7 +39,7 @@
3739
@TestInstance(TestInstance.Lifecycle.PER_METHOD)
3840
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
3941
public class Route53Test {
40-
public static final String DASHES = new String(new char[80]).replace("\0", "-");
42+
private static final Logger logger = LoggerFactory.getLogger(Route53Test.class);
4143
private static String domainName = "";
4244
private static String healthCheckId = "";
4345
private static String hostedZoneId = "";
@@ -73,107 +75,78 @@ public static void setUp() {
7375
firstNameSc = values.getFirstNameSc();
7476
lastNameSc = values.getLastNameSc();
7577
citySc = values.getCitySc();
76-
77-
// Uncomment this code block if you prefer using a config.properties file to
78-
// retrieve AWS values required for these tests.
79-
/*
80-
*
81-
* try (InputStream input =
82-
* Route53Test.class.getClassLoader().getResourceAsStream("config.properties"))
83-
* {
84-
* Properties prop = new Properties();
85-
* if (input == null) {
86-
* System.out.println("Sorry, unable to find config.properties");
87-
* return;
88-
* }
89-
*
90-
* // Populate the data members required for all tests
91-
* prop.load(input);
92-
* domainName = prop.getProperty("domainName");
93-
* domainSuggestionSc = prop.getProperty("domainSuggestionSc");
94-
* domainTypeSc = prop.getProperty("domainTypeSc");
95-
* phoneNumerSc = prop.getProperty("phoneNumerSc");
96-
* emailSc = prop.getProperty("emailSc");
97-
* firstNameSc = prop.getProperty("firstNameSc");
98-
* lastNameSc = prop.getProperty("lastNameSc");
99-
* citySc = prop.getProperty("citySc");
100-
*
101-
* } catch (IOException ex) {
102-
* ex.printStackTrace();
103-
* }
104-
*/
10578
}
10679

10780
@Test
10881
@Tag("IntegrationTest")
10982
@Order(1)
110-
public void createHealthCheck() {
83+
public void testCreateHealthCheck() {
11184
healthCheckId = CreateHealthCheck.createCheck(route53Client, domainName);
11285
assertFalse(healthCheckId.isEmpty());
113-
System.out.println("Test 1 passed");
86+
logger.info("Test 1 passed");
11487
}
11588

11689
@Test
11790
@Tag("IntegrationTest")
11891
@Order(2)
119-
public void createHostedZone() {
92+
public void testCreateHostedZone() {
12093
hostedZoneId = CreateHostedZone.createZone(route53Client, domainName);
12194
assertFalse(hostedZoneId.isEmpty());
122-
System.out.println("Test 2 passed");
95+
logger.info("Test 2 passed");
12396
}
12497

12598
@Test
12699
@Tag("IntegrationTest")
127100
@Order(3)
128-
public void getHealthCheckStatus() {
101+
public void testGetHealthCheckStatus() {
129102
try {
130103
TimeUnit.SECONDS.sleep(20); // wait for the new health check
131104
assertDoesNotThrow(() -> GetHealthCheckStatus.getHealthStatus(route53Client, healthCheckId));
132105

133106
} catch (InterruptedException e) {
134107
e.printStackTrace();
135108
}
136-
System.out.println("Test 3 passed");
109+
logger.info("Test 3 passed");
137110
}
138111

139112
@Test
140113
@Tag("IntegrationTest")
141114
@Order(4)
142-
public void listHealthChecks() {
115+
public void testListHealthChecks() {
143116
assertDoesNotThrow(() -> ListHealthChecks.listAllHealthChecks(route53Client));
144-
System.out.println("Test 4 passed");
117+
logger.info("Test 4 passed");
145118
}
146119

147120
@Test
148121
@Tag("IntegrationTest")
149122
@Order(5)
150-
public void updateHealthCheck() {
123+
public void testUpdateHealthCheck() {
151124
assertDoesNotThrow(() -> UpdateHealthCheck.updateSpecificHealthCheck(route53Client, healthCheckId));
152-
System.out.println("Test 5 passed");
125+
logger.info("Test 5 passed");
153126
}
154127

155128
@Test
156129
@Tag("IntegrationTest")
157130
@Order(6)
158-
public void listHostedZones() {
131+
public void testListHostedZones() {
159132
assertDoesNotThrow(() -> ListHostedZones.listZones(route53Client));
160-
System.out.println("Test 6 passed");
133+
logger.info("Test 6 passed");
161134
}
162135

163136
@Test
164137
@Tag("IntegrationTest")
165138
@Order(7)
166-
public void deleteHealthCheck() {
139+
public void testDeleteHealthCheck() {
167140
assertDoesNotThrow(() -> DeleteHealthCheck.delHealthCheck(route53Client, healthCheckId));
168-
System.out.println("Test 7 passed");
141+
logger.info("Test 7 passed");
169142
}
170143

171144
@Test
172145
@Tag("IntegrationTest")
173146
@Order(8)
174-
public void deleteHostedZone() {
147+
public void testDeleteHostedZone() {
175148
assertDoesNotThrow(() -> DeleteHostedZone.delHostedZone(route53Client, hostedZoneId));
176-
System.out.println("Test 8 passed");
149+
logger.info("Test 8 passed");
177150
}
178151

179152
private static String getSecretValues() {

‎javav2/example_code/sagemaker/pom.xml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,13 @@
3939
<type>pom</type>
4040
<scope>import</scope>
4141
</dependency>
42+
<dependency>
43+
<groupId>org.apache.logging.log4j</groupId>
44+
<artifactId>log4j-bom</artifactId>
45+
<version>2.23.1</version>
46+
<type>pom</type>
47+
<scope>import</scope>
48+
</dependency>
4249
</dependencies>
4350
</dependencyManagement>
4451
<dependencies>
@@ -97,5 +104,22 @@
97104
<groupId>software.amazon.awssdk</groupId>
98105
<artifactId>ssooidc</artifactId>
99106
</dependency>
107+
<dependency>
108+
<groupId>org.apache.logging.log4j</groupId>
109+
<artifactId>log4j-core</artifactId>
110+
</dependency>
111+
<dependency>
112+
<groupId>org.slf4j</groupId>
113+
<artifactId>slf4j-api</artifactId>
114+
<version>2.0.13</version>
115+
</dependency>
116+
<dependency>
117+
<groupId>org.apache.logging.log4j</groupId>
118+
<artifactId>log4j-slf4j2-impl</artifactId>
119+
</dependency>
120+
<dependency>
121+
<groupId>org.apache.logging.log4j</groupId>
122+
<artifactId>log4j-1.2-api</artifactId>
123+
</dependency>
100124
</dependencies>
101125
</project>

‎javav2/example_code/sagemaker/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/sagemaker/src/test/java/SageMakerTest.java‎

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

44
import com.example.sage.*;
55
import com.google.gson.Gson;
6+
import org.slf4j.Logger;
7+
import org.slf4j.LoggerFactory;
68
import software.amazon.awssdk.auth.credentials.EnvironmentVariableCredentialsProvider;
79
import software.amazon.awssdk.services.sagemaker.SageMakerClient;
810
import org.junit.jupiter.api.*;
@@ -20,6 +22,7 @@
2022
@TestInstance(TestInstance.Lifecycle.PER_METHOD)
2123
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
2224
public class SageMakerTest {
25+
private static final Logger logger = LoggerFactory.getLogger(SageMakerTest.class);
2326
private static SageMakerClient sageMakerClient;
2427
private static String image = "";
2528
private static String modelDataUrl = "";
@@ -62,59 +65,59 @@ public static void setUp() throws IOException {
6265
@Test
6366
@Tag("IntegrationTest")
6467
@Order(1)
65-
public void CreateModel() {
68+
public void testCreateModel() {
6669
assertDoesNotThrow(() -> CreateModel.createSagemakerModel(sageMakerClient, modelDataUrl, image, modelName,
6770
executionRoleArn));
68-
System.out.println("Test 1 passed");
71+
logger.info("Test 1 passed");
6972
}
7073

7174
@Test
7275
@Tag("IntegrationTest")
7376
@Order(2)
74-
public void CreateTrainingJob() {
77+
public void testCreateTrainingJob() {
7578
assertDoesNotThrow(() -> CreateTrainingJob.trainJob(sageMakerClient, s3UriData, s3Uri, trainingJobName, roleArn,
7679
s3OutputPath, channelName, trainingImage));
77-
System.out.println("Test 2 passed");
80+
logger.info("Test 2 passed");
7881
}
7982

8083
@Test
8184
@Tag("IntegrationTest")
8285
@Order(3)
83-
public void DescribeTrainingJob() {
86+
public void testDescribeTrainingJob() {
8487
assertDoesNotThrow(() -> DescribeTrainingJob.describeTrainJob(sageMakerClient, trainingJobName));
85-
System.out.println("Test 3 passed");
88+
logger.info("Test 3 passed");
8689
}
8790

8891
@Test
8992
@Tag("IntegrationTest")
9093
@Order(4)
91-
public void ListModels() {
94+
public void testListModels() {
9295
assertDoesNotThrow(() -> ListModels.listAllModels(sageMakerClient));
93-
System.out.println("Test 4 passed");
96+
logger.info("Test 4 passed");
9497
}
9598

9699
@Test
97100
@Tag("IntegrationTest")
98101
@Order(5)
99-
public void ListAlgorithms() {
102+
public void testListAlgorithms() {
100103
assertDoesNotThrow(() -> ListAlgorithms.listAlgs(sageMakerClient));
101-
System.out.println("Test 6 passed");
104+
logger.info("Test 6 passed");
102105
}
103106

104107
@Test
105108
@Tag("IntegrationTest")
106109
@Order(6)
107-
public void ListTrainingJobs() {
110+
public void testListTrainingJobs() {
108111
assertDoesNotThrow(() -> ListTrainingJobs.listJobs(sageMakerClient));
109-
System.out.println("Test 7 passed");
112+
logger.info("Test 7 passed");
110113
}
111114

112115
@Test
113116
@Tag("IntegrationTest")
114117
@Order(7)
115-
public void DeleteModel() {
118+
public void testDeleteModel() {
116119
assertDoesNotThrow(() -> DeleteModel.deleteSagemakerModel(sageMakerClient, modelName));
117-
System.out.println("Test 8 passed");
120+
logger.info("Test 8 passed");
118121
}
119122

120123
private static String getSecretValues() {

0 commit comments

Comments
 (0)