Skip to content

Commit 5afd3a2

Browse files
scmacdonscmacdon
committed
updated POM to use JDK 21
1 parent 24f65a9 commit 5afd3a2

8 files changed

Lines changed: 117 additions & 101 deletions

File tree

‎javav2/example_code/forecast/pom.xml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,13 @@
3030
<type>pom</type>
3131
<scope>import</scope>
3232
</dependency>
33+
<dependency>
34+
<groupId>org.apache.logging.log4j</groupId>
35+
<artifactId>log4j-bom</artifactId>
36+
<version>2.23.1</version>
37+
<type>pom</type>
38+
<scope>import</scope>
39+
</dependency>
3340
</dependencies>
3441
</dependencyManagement>
3542
<dependencies>
@@ -60,5 +67,22 @@
6067
<groupId>software.amazon.awssdk</groupId>
6168
<artifactId>ssooidc</artifactId>
6269
</dependency>
70+
<dependency>
71+
<groupId>org.apache.logging.log4j</groupId>
72+
<artifactId>log4j-core</artifactId>
73+
</dependency>
74+
<dependency>
75+
<groupId>org.slf4j</groupId>
76+
<artifactId>slf4j-api</artifactId>
77+
<version>2.0.13</version>
78+
</dependency>
79+
<dependency>
80+
<groupId>org.apache.logging.log4j</groupId>
81+
<artifactId>log4j-slf4j2-impl</artifactId>
82+
</dependency>
83+
<dependency>
84+
<groupId>org.apache.logging.log4j</groupId>
85+
<artifactId>log4j-1.2-api</artifactId>
86+
</dependency>
6387
</dependencies>
6488
</project>

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

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
import org.junit.jupiter.api.*;
77
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
88
import static org.junit.jupiter.api.Assertions.assertFalse;
9+
10+
import org.slf4j.Logger;
11+
import org.slf4j.LoggerFactory;
912
import software.amazon.awssdk.auth.credentials.EnvironmentVariableCredentialsProvider;
1013
import software.amazon.awssdk.regions.Region;
1114
import java.util.*;
@@ -22,6 +25,7 @@
2225
@TestInstance(TestInstance.Lifecycle.PER_METHOD)
2326
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
2427
public class ForecastTest {
28+
private static final Logger logger = LoggerFactory.getLogger(ForecastTest.class);
2529
private static ForecastClient forecast;
2630
private static String predARN = "";
2731
private static String forecastArn = ""; // set in test 3
@@ -49,61 +53,61 @@ public static void setUp() {
4953
@Test
5054
@Tag("IntegrationTest")
5155
@Order(1)
52-
public void CreateDataSet() {
56+
public void testCreateDataSet() {
5357
myDataSetARN = CreateDataSet.createForecastDataSet(forecast, dataSet);
5458
assertFalse(myDataSetARN.isEmpty());
55-
System.out.println("Test 1 passed");
59+
logger.info("Test 1 passed");
5660
}
5761

5862
@Test
5963
@Tag("IntegrationTest")
6064
@Order(2)
61-
public void CreateForecast() {
65+
public void testCreateForecast() {
6266
forecastArn = CreateForecast.createNewForecast(forecast, forecastName, predARN);
6367
assertFalse(forecastArn.isEmpty());
64-
System.out.println("Test 2 passed");
68+
logger.info("Test 2 passed");
6569
}
6670

6771
@Test
6872
@Tag("IntegrationTest")
6973
@Order(3)
70-
public void ListDataSets() {
74+
public void testListDataSets() {
7175
assertDoesNotThrow(() -> ListDataSets.listForecastDataSets(forecast));
72-
System.out.println("Test 3 passed");
76+
logger.info("Test 3 passed");
7377
}
7478

7579
@Test
7680
@Tag("IntegrationTest")
7781
@Order(4)
78-
public void ListDataSetGroups() {
82+
public void testListDataSetGroups() {
7983
assertDoesNotThrow(() -> ListDataSetGroups.listDataGroups(forecast));
80-
System.out.println("Test 4 passed");
84+
logger.info("Test 4 passed");
8185
}
8286

8387
@Test
8488
@Tag("IntegrationTest")
8589
@Order(5)
86-
public void ListForecasts() {
90+
public void testListForecasts() {
8791
assertDoesNotThrow(() -> ListForecasts.listAllForeCasts(forecast));
88-
System.out.println("Test 5 passed");
92+
logger.info("Test 5 passed");
8993
}
9094

9195
@Test
9296
@Tag("IntegrationTest")
9397
@Order(6)
94-
public void DeleteDataSet() {
98+
public void testDeleteDataSet() {
9599
assertDoesNotThrow(() -> DeleteDataset.deleteForecastDataSet(forecast, myDataSetARN));
96-
System.out.println("Test 6 passed");
100+
logger.info("Test 6 passed");
97101
}
98102

99103
@Test
100104
@Tag("IntegrationTest")
101105
@Order(7)
102-
public void DeleteForecast() throws InterruptedException {
106+
public void testDeleteForecast() throws InterruptedException {
103107
System.out.println("Wait 40 mins for resource to become available.");
104108
TimeUnit.MINUTES.sleep(40);
105109
assertDoesNotThrow(() -> DeleteForecast.delForecast(forecast, forecastArn));
106-
System.out.println("Test 7 passed");
110+
logger.info("Test 7 passed");
107111
}
108112

109113
private static String getSecretValues() {

‎javav2/example_code/glacier/pom.xml‎

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

‎javav2/example_code/glacier/src/main/pom.xml‎

Lines changed: 0 additions & 68 deletions
This file was deleted.

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

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
import com.example.glacier.*;
55
import com.google.gson.Gson;
66
import org.junit.jupiter.api.*;
7+
import org.slf4j.Logger;
8+
import org.slf4j.LoggerFactory;
79
import software.amazon.awssdk.auth.credentials.EnvironmentVariableCredentialsProvider;
810
import software.amazon.awssdk.regions.Region;
911
import software.amazon.awssdk.services.glacier.GlacierClient;
@@ -24,6 +26,7 @@
2426
@TestInstance(TestInstance.Lifecycle.PER_METHOD)
2527
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
2628
public class GlacierTest {
29+
private static final Logger logger = LoggerFactory.getLogger(GlacierTest.class);
2730
private static GlacierClient glacier;
2831
private static String vaultName = "";
2932
private static String strPath = "";
@@ -52,60 +55,60 @@ public static void setUp() {
5255
@Test
5356
@Tag("IntegrationTest")
5457
@Order(1)
55-
public void CreateVault() {
58+
public void testCreateVault() {
5659
assertDoesNotThrow(() -> CreateVault.createGlacierVault(glacier, vaultName));
57-
System.out.println("Test 1 passed");
60+
logger.info("Test 1 passed");
5861
}
5962

6063
@Test
6164
@Tag("IntegrationTest")
6265
@Order(2)
63-
public void DescribeVault() {
66+
public void testDescribeVault() {
6467
assertDoesNotThrow(() -> DescribeVault.describeGlacierVault(glacier, vaultName));
65-
System.out.println("Test 2 passed");
68+
logger.info("Test 2 passed");
6669
}
6770

6871
@Test
6972
@Tag("IntegrationTest")
7073
@Order(3)
71-
public void ListVaults() {
74+
public void testListVaults() {
7275
assertDoesNotThrow(() -> ListVaults.listAllVault(glacier));
73-
System.out.println("Test 3 passed");
76+
logger.info("Test 3 passed");
7477
}
7578

7679
@Test
7780
@Tag("IntegrationTest")
7881
@Order(4)
79-
public void UploadArchive() {
82+
public void testUploadArchive() {
8083
File myFile = new File(strPath);
8184
Path path = Paths.get(strPath);
8285
archiveId = UploadArchive.uploadContent(glacier, path, vaultName, myFile);
8386
assertFalse(archiveId.isEmpty());
84-
System.out.println("Test 4 passed");
87+
logger.info("Test 4 passed");
8588
}
8689

8790
@Test
8891
@Tag("IntegrationTest")
8992
@Order(5)
90-
public void ArchiveDownload() {
93+
public void testArchiveDownload() {
9194
assertDoesNotThrow(() -> ArchiveDownload.createJob(glacier, downloadVault, accountId));
92-
System.out.println("Test 5 passed");
95+
logger.info("Test 5 passed");
9396
}
9497

9598
@Test
9699
@Tag("IntegrationTest")
97100
@Order(6)
98-
public void DeleteArchive() {
101+
public void testDeleteArchive() {
99102
assertDoesNotThrow(() -> DeleteArchive.deleteGlacierArchive(glacier, vaultName, accountId, archiveId));
100-
System.out.println("Test 6 passed");
103+
logger.info("Test 6 passed");
101104
}
102105

103106
@Test
104107
@Tag("IntegrationTest")
105108
@Order(7)
106-
public void DeleteVault() {
109+
public void testDeleteVault() {
107110
assertDoesNotThrow(() -> DeleteVault.deleteGlacierVault(glacier, emptyVault));
108-
System.out.println("Test 7 passed");
111+
logger.info("Test 7 passed");
109112
}
110113

111114
private static String getSecretValues() {

‎javav2/example_code/glue/src/test/java/GlueTest.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,13 @@
55
import com.google.gson.Gson;
66
import org.slf4j.Logger;
77
import org.slf4j.LoggerFactory;
8-
import software.amazon.awssdk.auth.credentials.EnvironmentVariableCredentialsProvider;
98
import software.amazon.awssdk.services.glue.GlueClient;
109
import org.junit.jupiter.api.*;
1110
import software.amazon.awssdk.regions.Region;
1211
import software.amazon.awssdk.services.secretsmanager.SecretsManagerClient;
1312
import software.amazon.awssdk.services.secretsmanager.model.GetSecretValueRequest;
1413
import software.amazon.awssdk.services.secretsmanager.model.GetSecretValueResponse;
15-
16-
import java.io.*;
17-
import java.net.URISyntaxException;
1814
import java.util.concurrent.TimeUnit;
19-
2015
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
2116

2217
/**

0 commit comments

Comments
 (0)