updated POM to use JDK 21

Author: scmacdon

javav2/example_code/firehose/src/main/java/com/example/firehose/CreateDeliveryStream.java

@@ -7,10 +7,9 @@
 // snippet-start:[firehose.java2.create_stream.import]
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.services.firehose.FirehoseClient;
-import software.amazon.awssdk.services.firehose.model.FirehoseException;
-import software.amazon.awssdk.services.firehose.model.CreateDeliveryStreamRequest;
-import software.amazon.awssdk.services.firehose.model.ExtendedS3DestinationConfiguration;
-import software.amazon.awssdk.services.firehose.model.CreateDeliveryStreamResponse;
+import software.amazon.awssdk.services.firehose.model.*;
+
+import java.util.concurrent.TimeUnit;
 // snippet-end:[firehose.java2.create_stream.import]
 
 /**
@@ -72,5 +71,36 @@ public static void createStream(FirehoseClient firehoseClient, String bucketARN,
             System.out.println(e.getLocalizedMessage());
         }
     }
+
+    public static void waitForStreamToBecomeActive(FirehoseClient firehoseClient, String streamName) {
+        System.out.println("Waiting for the stream to become ACTIVE...");
+        int maxAttempts = 60; // 10 minutes (60 * 10 seconds)
+        int attempt = 0;
+        while (attempt < maxAttempts) {
+            try {
+                DescribeDeliveryStreamRequest describeRequest = DescribeDeliveryStreamRequest.builder()
+                        .deliveryStreamName(streamName)
+                        .build();
+                DescribeDeliveryStreamResponse describeResponse = firehoseClient.describeDeliveryStream(describeRequest);
+                String status = describeResponse.deliveryStreamDescription().deliveryStreamStatusAsString();
+
+                System.out.println("Current status: " + status);
+                if (status.equals("ACTIVE")) {
+                    System.out.println("Stream is now ACTIVE.");
+                    return;
+                }
+
+                TimeUnit.SECONDS.sleep(10);
+                attempt++;
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+                throw new RuntimeException("Polling interrupted", e);
+            } catch (FirehoseException e) {
+                System.err.println("Error while checking stream status: " + e.getMessage());
+            }
+        }
+        System.err.println("Timed out waiting for the stream to become ACTIVE.");
+        System.exit(1);
+    }
 }
 // snippet-end:[firehose.java2.create_stream.main]

javav2/example_code/firehose/src/main/java/com/example/firehose/scenario/FirehoseScenario.java

@@ -6,6 +6,7 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import software.amazon.awssdk.core.SdkBytes;
+import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.services.cloudwatch.CloudWatchClient;
 import software.amazon.awssdk.services.cloudwatch.model.*;
 import software.amazon.awssdk.services.firehose.FirehoseClient;
@@ -38,11 +39,11 @@ public static void main(String[] args) {
                     deliveryStreamName - The Firehose delivery stream name.
                 """;
 
-        if (args.length != 1) {
-            System.out.println(usage);
-            return;
-        }
-        String deliveryStreamName = args[0];
+      //  if (args.length != 1) {
+       //     System.out.println(usage);
+      //      return;
+      //  }
+        String deliveryStreamName = "scottstocks" ; //args[0];
 
         try {
             // Read and parse sample data.
@@ -77,14 +78,18 @@ public static void main(String[] args) {
 
     private static FirehoseClient getFirehoseClient() {
         if (firehoseClient == null) {
-            firehoseClient = FirehoseClient.create();
+            firehoseClient = FirehoseClient.builder()
+                    .region(Region.US_EAST_1)
+                    .build();
         }
         return firehoseClient;
     }
 
     private static CloudWatchClient getCloudWatchClient() {
         if (cloudWatchClient == null) {
-            cloudWatchClient = CloudWatchClient.create();
+            cloudWatchClient = CloudWatchClient.builder()
+                    .region(Region.US_EAST_1)
+                    .build();
         }
         return cloudWatchClient;
     }

javav2/example_code/firehose/src/test/java/FirehoseTest.java

@@ -37,7 +37,7 @@ public class FirehoseTest {
     @BeforeAll
     public static void setUp() throws IOException {
         firehoseClient = FirehoseClient.builder()
-                .region(Region.US_WEST_2)
+                .region(Region.US_EAST_1)
                 .build();
 
         // Get the values to run these tests from AWS Secrets Manager.
@@ -55,16 +55,17 @@ public static void setUp() throws IOException {
     @Tag("IntegrationTest")
     @Order(1)
     public void CreateDeliveryStream() {
-        assertDoesNotThrow(() -> CreateDeliveryStream.createStream(firehoseClient, bucketARN, roleARN, newStream));
+        assertDoesNotThrow(() -> {
+            CreateDeliveryStream.createStream(firehoseClient, bucketARN, roleARN, newStream);
+            CreateDeliveryStream.waitForStreamToBecomeActive(firehoseClient, newStream);
+        });
         System.out.println("Test 1 passed");
     }
 
     @Test
     @Tag("IntegrationTest")
     @Order(2)
     public void PutRecord() throws IOException, InterruptedException {
-        System.out.println("Wait 10 mins for resource to become available.");
-        TimeUnit.MINUTES.sleep(10);
         String jsonContent = FirehoseScenario.readJsonFile("sample_records.json");
         ObjectMapper objectMapper = new ObjectMapper();
         List<Map<String, Object>> sampleData = objectMapper.readValue(jsonContent, new TypeReference<>() {});