Skip to content

Commit 7db9801

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

File tree

7 files changed

+147
-55
lines changed

7 files changed

+147
-55
lines changed

‎javav2/example_code/rds/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>
@@ -87,5 +94,22 @@
8794
<groupId>software.amazon.awssdk</groupId>
8895
<artifactId>ssooidc</artifactId>
8996
</dependency>
97+
<dependency>
98+
<groupId>org.apache.logging.log4j</groupId>
99+
<artifactId>log4j-core</artifactId>
100+
</dependency>
101+
<dependency>
102+
<groupId>org.slf4j</groupId>
103+
<artifactId>slf4j-api</artifactId>
104+
<version>2.0.13</version>
105+
</dependency>
106+
<dependency>
107+
<groupId>org.apache.logging.log4j</groupId>
108+
<artifactId>log4j-slf4j2-impl</artifactId>
109+
</dependency>
110+
<dependency>
111+
<groupId>org.apache.logging.log4j</groupId>
112+
<artifactId>log4j-1.2-api</artifactId>
113+
</dependency>
90114
</dependencies>
91115
</project>

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

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

44
import com.example.rds.*;
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.rds.RdsClient;
810
import org.junit.jupiter.api.*;
@@ -22,7 +24,7 @@
2224
@TestInstance(TestInstance.Lifecycle.PER_METHOD)
2325
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
2426
public class AmazonRDSTest {
25-
27+
private static final Logger logger = LoggerFactory.getLogger(AmazonRDSTest.class);
2628
private static RdsClient rdsClient;
2729

2830
private static String dbInstanceIdentifier = "";
@@ -76,67 +78,67 @@ public static void setUp() throws IOException {
7678
@Test
7779
@Tag("IntegrationTest")
7880
@Order(1)
79-
public void CreateDBInstance() {
81+
public void testCreateDBInstance() {
8082
Gson gson = new Gson();
8183
User user = gson.fromJson(String.valueOf(RDSScenario.getSecretValues(secretDBName)), User.class);
8284
assertDoesNotThrow(() -> CreateDBInstance.createDatabaseInstance(rdsClient, dbInstanceIdentifier, dbName,
8385
user.getUsername(), user.getPassword()));
84-
System.out.println("CreateDBInstance test passed");
86+
logger.info("CreateDBInstance test passed");
8587
}
8688

8789
@Test
8890
@Tag("IntegrationTest")
8991
@Order(2)
90-
public void waitForInstanceReady() {
92+
public void testWaitForInstanceReady() {
9193
assertDoesNotThrow(() -> CreateDBInstance.waitForInstanceReady(rdsClient, dbInstanceIdentifier));
92-
System.out.println("waitForInstanceReady test passed");
94+
logger.info("waitForInstanceReady test passed");
9395
}
9496

9597
@Test
9698
@Tag("IntegrationTest")
9799
@Order(3)
98-
public void DescribeAccountAttributes() {
100+
public void testDescribeAccountAttributes() {
99101
assertDoesNotThrow(() -> DescribeAccountAttributes.getAccountAttributes(rdsClient));
100-
System.out.println("DescribeAccountAttributes test passed");
102+
logger.info("DescribeAccountAttributes test passed");
101103
}
102104

103105
@Test
104106
@Tag("IntegrationTest")
105107
@Order(4)
106-
public void DescribeDBInstances() {
108+
public void testDescribeDBInstances() {
107109
assertDoesNotThrow(() -> DescribeDBInstances.describeInstances(rdsClient));
108-
System.out.println("DescribeDBInstances test passed");
110+
logger.info("DescribeDBInstances test passed");
109111
}
110112

111113
@Test
112114
@Tag("IntegrationTest")
113115
@Order(5)
114-
public void ModifyDBInstance() {
116+
public void testModifyDBInstance() {
115117
assertDoesNotThrow(
116118
() -> ModifyDBInstance.updateIntance(rdsClient, dbInstanceIdentifier, newMasterUserPassword));
117-
System.out.println("ModifyDBInstance test passed");
119+
logger.info("ModifyDBInstance test passed");
118120
}
119121

120122
@Test
121123
@Order(6)
122-
public void CreateDBSnapshot() {
124+
public void testCreateDBSnapshot() {
123125
assertDoesNotThrow(
124126
() -> CreateDBSnapshot.createSnapshot(rdsClient, dbInstanceIdentifier, dbSnapshotIdentifier));
125-
System.out.println("CreateDBSnapshot test passed");
127+
logger.info("CreateDBSnapshot test passed");
126128
}
127129

128130
@Test
129131
@Tag("IntegrationTest")
130132
@Order(7)
131-
public void DeleteDBInstance() {
133+
public void testDeleteDBInstance() {
132134
assertDoesNotThrow(() -> DeleteDBInstance.deleteDatabaseInstance(rdsClient, dbInstanceIdentifier));
133-
System.out.println("DeleteDBInstance test passed");
135+
logger.info("DeleteDBInstance test passed");
134136
}
135137

136138
@Test
137139
@Tag("IntegrationTest")
138140
@Order(8)
139-
public void TestRDSScenario() {
141+
public void testRDSScenario() {
140142
Gson gson = new Gson();
141143
User user = gson.fromJson(String.valueOf(RDSScenario.getSecretValues(secretDBName)), User.class);
142144
assertDoesNotThrow(() -> RDSScenario.describeDBEngines(rdsClient));
@@ -163,7 +165,7 @@ public void TestRDSScenario() {
163165
@Test
164166
@Tag("IntegrationTest")
165167
@Order(9)
166-
public void TestAuroraScenario() throws InterruptedException {
168+
public void testAuroraScenario() throws InterruptedException {
167169
Gson gson = new Gson();
168170
User user = gson.fromJson(String.valueOf(RDSScenario.getSecretValues(secretDBName)), User.class);
169171
System.out.println("1. Return a list of the available DB engines");

‎javav2/example_code/redshift/src/test/java/AmazonRedshiftTest.java‎

Lines changed: 27 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
import com.google.gson.Gson;
88
import org.junit.jupiter.api.*;
99
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
10+
11+
import org.slf4j.Logger;
12+
import org.slf4j.LoggerFactory;
1013
import software.amazon.awssdk.auth.credentials.EnvironmentVariableCredentialsProvider;
1114
import software.amazon.awssdk.regions.Region;
1215
import software.amazon.awssdk.services.redshift.RedshiftClient;
@@ -31,6 +34,7 @@
3134
@TestInstance(TestInstance.Lifecycle.PER_METHOD)
3235
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
3336
public class AmazonRedshiftTest {
37+
private static final Logger logger = LoggerFactory.getLogger(AmazonRedshiftTest.class);
3438
private static RedshiftClient redshiftClient;
3539
private static RedshiftDataClient redshiftDataClient;
3640
static RedshiftActions redshiftActions = new RedshiftActions();
@@ -68,19 +72,19 @@ public static void setUp() {
6872
@Test
6973
@Tag("IntegrationTest")
7074
@Order(1)
71-
public void helloRedshift() {
75+
public void testHelloRedshift() {
7276
assertDoesNotThrow(() -> HelloRedshift.listClustersPaginator(redshiftClient));
73-
System.out.println("Test 1 passed");
77+
logger.info("Test 1 passed");
7478
}
7579

7680
@Test
7781
@Tag("IntegrationTest")
7882
@Order(2)
79-
public void createCluster() {
83+
public void testCreateCluster() {
8084
try {
8185
CompletableFuture<CreateClusterResponse> future = redshiftActions.createClusterAsync(clusterId, userName, userPassword);
8286
future.join();
83-
System.out.println("Cluster successfully created.");
87+
logger.info("Cluster successfully created.");
8488

8589
} catch (RuntimeException rt) {
8690
Throwable cause = rt.getCause();
@@ -90,104 +94,105 @@ public void createCluster() {
9094
System.out.println("An unexpected error occurred: " + rt.getMessage());
9195
}
9296
}
97+
logger.info("Test 2 passed");
9398
}
9499

95100
@Test
96101
@Tag("IntegrationTest")
97102
@Order(3)
98-
public void waitCluster() {
103+
public void testWaitCluster() {
99104
assertDoesNotThrow(() -> {
100105
CompletableFuture<Void> future = redshiftActions.waitForClusterReadyAsync(clusterId);
101106
future.join();
102107
});
103-
System.out.println("Test 3 passed");
108+
logger.info("Test 3 passed");
104109
}
105110

106111
@Test
107112
@Tag("IntegrationTest")
108113
@Order(4)
109-
public void listDatabases() {
114+
public void testListDatabases() {
110115
assertDoesNotThrow(() -> {
111116
CompletableFuture<Void> future = redshiftActions.listAllDatabasesAsync(clusterId, userName, "dev");
112117
future.join();
113118
});
114-
System.out.println("Test 3 passed");
119+
logger.info("Test 4 passed");
115120
}
116121

117122
@Test
118123
@Tag("IntegrationTest")
119124
@Order(5)
120-
public void createDatabaseTable() {
125+
public void testCreateDatabaseTable() {
121126
assertDoesNotThrow(() -> {
122127
CompletableFuture<ExecuteStatementResponse> future = redshiftActions.createTableAsync(clusterId, databaseName, userName);
123128
future.join();
124129
});
125-
System.out.println("Test 5 passed");
130+
logger.info("Test 5 passed");
126131
}
127132

128133
@Test
129134
@Tag("IntegrationTest")
130135
@Order(6)
131-
public void popDatabaseTable() {
136+
public void testPopDatabaseTable() {
132137
assertDoesNotThrow(() -> {
133138
redshiftActions.popTableAsync(clusterId, databaseName, userName, fileNameSc, 50).join();
134139
});
135-
System.out.println("Test 6 passed");
140+
logger.info("Test 6 passed");
136141
}
137142

138143
@Test
139144
@Tag("IntegrationTest")
140145
@Order(7)
141-
public void queryDatabaseTable() {
146+
public void testQueryDatabaseTable() {
142147
assertDoesNotThrow(() -> {
143148
CompletableFuture<String> future = redshiftActions.queryMoviesByYearAsync(databaseName, userName, 2014, clusterId);
144149
id = future.join();
145150
});
146-
System.out.println("Test 7 passed");
151+
logger.info("Test 7 passed");
147152
}
148153

149154
@Test
150155
@Tag("IntegrationTest")
151156
@Order(8)
152-
public void checkStatement() {
157+
public void testCheckStatement() {
153158
assertDoesNotThrow(() -> {
154159
CompletableFuture<Void> future = redshiftActions.checkStatementAsync(id);
155160
future.join();
156161
});
157-
System.out.println("Test 8 passed");
162+
logger.info("Test 8 passed");
158163
}
159164

160165
@Test
161166
@Tag("IntegrationTest")
162167
@Order(9)
163-
public void getResults() {
168+
public void testGetResults() {
164169
assertDoesNotThrow(() -> {
165170
CompletableFuture<Void> future = redshiftActions.getResultsAsync(id);
166171
future.join();
167172
});
168-
System.out.println("Test 9 passed");
173+
logger.info("Test 9 passed");
169174
}
170175

171176
@Test
172177
@Tag("IntegrationTest")
173178
@Order(10)
174-
public void modifyDatabase() {
179+
public void testModifyDatabase() {
175180
assertDoesNotThrow(() -> {
176181
CompletableFuture<ModifyClusterResponse> future = redshiftActions.modifyClusterAsync(clusterId);;
177182
future.join();
178183
});
179-
System.out.println("Test 10 passed");
184+
logger.info("Test 10 passed");
180185
}
181186

182187
@Test
183188
@Tag("IntegrationTest")
184189
@Order(11)
185-
public void deleteDatabase() {
190+
public void testDeleteDatabase() {
186191
assertDoesNotThrow(() -> {
187192
CompletableFuture<DeleteClusterResponse> future = redshiftActions.deleteRedshiftClusterAsync(clusterId);;
188193
future.join();
189194
});
190-
System.out.println("Test 11 passed");
195+
logger.info("Test 11 passed");
191196
}
192197

193198
private static String getSecretValues() {

‎javav2/example_code/rekognition/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>
@@ -87,5 +94,22 @@
8794
<groupId>software.amazon.awssdk</groupId>
8895
<artifactId>ssooidc</artifactId>
8996
</dependency>
97+
<dependency>
98+
<groupId>org.apache.logging.log4j</groupId>
99+
<artifactId>log4j-core</artifactId>
100+
</dependency>
101+
<dependency>
102+
<groupId>org.slf4j</groupId>
103+
<artifactId>slf4j-api</artifactId>
104+
<version>2.0.13</version>
105+
</dependency>
106+
<dependency>
107+
<groupId>org.apache.logging.log4j</groupId>
108+
<artifactId>log4j-slf4j2-impl</artifactId>
109+
</dependency>
110+
<dependency>
111+
<groupId>org.apache.logging.log4j</groupId>
112+
<artifactId>log4j-1.2-api</artifactId>
113+
</dependency>
90114
</dependencies>
91115
</project>

‎javav2/example_code/rekognition/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>

0 commit comments

Comments
 (0)