updated Java code to address comments

Author: scmacdon

javav2/example_code/inspector/src/main/java/com/java/inspector/HelloInspector.java

@@ -18,6 +18,7 @@
 import software.amazon.awssdk.services.inspector2.model.ListUsageTotalsResponse;
 import software.amazon.awssdk.services.inspector2.model.UsageTotal;
 import software.amazon.awssdk.services.inspector2.model.Inspector2Exception;
+import software.amazon.awssdk.services.inspector2.paginators.ListFindingsIterable;
 import software.amazon.awssdk.services.inspector2.paginators.ListUsageTotalsIterable;
 import java.util.List;
 import java.util.ArrayList;
@@ -75,19 +76,19 @@ public static void checkAccountStatus(Inspector2Client inspectorClient) {
 
             List<AccountState> accounts = response.accounts();
             if (accounts == null || accounts.isEmpty()) {
-                System.out.println(" No account information returned.");
+                logger.info(" No account information returned.");
                 return;
             }
 
             for (AccountState account : accounts) {
-                System.out.println(" Account: " + account.accountId());
+                logger.info(" Account: " + account.accountId());
                 ResourceState resources = account.resourceState();
                 if (resources == null) {
                     System.out.println("   No resource state data available.");
                     continue;
                 }
 
-                System.out.println("   Resource States:");
+                logger.info("   Resource States:");
                 printState("EC2", resources.ec2());
                 printState("ECR", resources.ecr());
                 printState("Lambda", resources.lambda());
@@ -102,45 +103,79 @@ public static void checkAccountStatus(Inspector2Client inspectorClient) {
 
     public static void printState(String name, State state) {
         if (state == null) {
-            System.out.println("     - " + name + ": (no data)");
+            logger.info("     - {} : (no data)", name);
             return;
         }
         String err = state.errorMessage() != null ? " (Error: " + state.errorMessage() + ")" : "";
-        System.out.println("     - " + name + ": " + state.status() + err);
+        logger.info("     - {}: {}{}", name, state.status(), err);
     }
 
     /**
-     * Retrieves and prints the most recent findings from the Inspector2 service.
+     * Lists recent findings from AWS Inspector2 using the synchronous client with a paginator.
      *
-     * @param inspectorClient the Inspector2Client used to interact with the AWS Inspector2 service
+     * @param inspectorClient an instance of {@link Inspector2Client} used to call AWS Inspector2
+     * @throws Inspector2Exception if there is an error communicating with the Inspector2 service
+     */
+    /**
+     * Lists up to 10 recent findings from AWS Inspector2 using the synchronous client.
+     *
+     * <p>This method retrieves findings in pages and logs details for each finding,
+     * including title, severity, status, and last observed time. Only the first
+     * 10 findings are logged, even if more exist.
+     *
+     * @param inspectorClient an instance of {@link Inspector2Client} used to call AWS Inspector2
+     * @throws Inspector2Exception if there is an error communicating with the Inspector2 service
      */
     public static void listRecentFindings(Inspector2Client inspectorClient) {
+        final int MAX_FINDINGS = 10;
+        int totalLogged = 0;
+
         try {
+            // Build initial request with page size
             ListFindingsRequest request = ListFindingsRequest.builder()
-                    .maxResults(10)
+                    .maxResults(MAX_FINDINGS)
                     .build();
 
-            ListFindingsResponse response = inspectorClient.listFindings(request);
-            List<Finding> findings = response.findings();
+            // Paginator returns an iterable over responses
+            ListFindingsIterable responses = inspectorClient.listFindingsPaginator(request);
+
+            for (ListFindingsResponse response : responses) {
+                List<Finding> findings = response.findings();
+                if (findings == null || findings.isEmpty()) {
+                    continue;
+                }
 
-            if (findings == null || findings.isEmpty()) {
-                System.out.println(" No findings found.");
-            } else {
-                System.out.println(" Found " + findings.size() + " recent finding(s):");
                 for (Finding finding : findings) {
-                    System.out.println("   Title: " + finding.title());
-                    System.out.println("   Severity: " + finding.severity());
-                    System.out.println("   Status: " + finding.status());
-                    System.out.println("   Last Observed: " + finding.lastObservedAt());
-                    System.out.println();
+                    if (totalLogged >= MAX_FINDINGS) {
+                        break;
+                    }
+
+                    logger.info("   Title: {}", finding.title());
+                    logger.info("   Severity: {}", finding.severity());
+                    logger.info("   Status: {}", finding.status());
+                    logger.info("   Last Observed: {}", finding.lastObservedAt());
+                    logger.info("");
+
+                    totalLogged++;
+                }
+
+                if (totalLogged >= MAX_FINDINGS) {
+                    break;
                 }
             }
 
+            if (totalLogged == 0) {
+                logger.info(" No findings found.");
+            } else {
+                logger.info(" Displayed {} recent finding(s).", totalLogged);
+            }
+
         } catch (Inspector2Exception e) {
-            System.err.println(" Error listing findings: " + e.awsErrorDetails().errorMessage());
+            logger.info(" Error listing findings: {}", e.awsErrorDetails().errorMessage());
         }
     }
 
+
     /**
      * Displays the usage totals for the Inspector2 service.
      *
@@ -152,7 +187,7 @@ public static void listRecentFindings(Inspector2Client inspectorClient) {
      */
     public static void showUsageTotals(Inspector2Client inspectorClient) {
         try {
-            System.out.println("Listing usage totals using paginator...");
+            logger.info("Listing usage totals using paginator...");
             ListUsageTotalsRequest request = ListUsageTotalsRequest.builder()
                     .maxResults(10)
                     .build();
@@ -171,27 +206,27 @@ public static void showUsageTotals(Inspector2Client inspectorClient) {
 
             // Display results.
             if (allTotals.isEmpty()) {
-                System.out.println(" No usage data available yet.");
-                System.out.println(" Usage data appears after Inspector has been active for some time.");
+                logger.info(" No usage data available yet.");
+                logger.info(" Usage data appears after Inspector has been active for some time.");
             } else {
-                System.out.println(" Usage Totals (Last 30 days):");
+                logger.info(" Usage Totals (Last 30 days):");
                 for (UsageTotal total : allTotals) {
-                    System.out.println("   Account: " + total.accountId());
+                    logger.info("   Account: {}" , total.accountId());
                     if (total.usage() != null && !total.usage().isEmpty()) {
                         total.usage().forEach(u -> {
-                            System.out.println("     - " + u.type() + ": " + u.total());
+                            logger.info("     - {}: {}", u.type(), u.total());
+
                             if (u.estimatedMonthlyCost() != null) {
-                                System.out.println("       Estimated Monthly Cost: " +
-                                        u.estimatedMonthlyCost() + " " + u.currency());
+                                logger.info("       Estimated Monthly Cost: {} {}", u.estimatedMonthlyCost(), u.currency());
                             }
                         });
                     }
-                    System.out.println();
+                    logger.info("");
                 }
             }
 
         } catch (Inspector2Exception e) {
-            System.err.println(" Error getting usage totals: " + e.awsErrorDetails().errorMessage());
+            logger.info(" Error getting usage totals: {}" , e.awsErrorDetails().errorMessage());
             throw e;
         } catch (Exception e) {
             throw new RuntimeException("Unexpected error while listing usage totals: " + e.getMessage(), e);

javav2/example_code/inspector/src/main/java/com/java/inspector/InspectorActions.java

@@ -557,13 +557,12 @@ public CompletableFuture<String> createLowSeverityFilterAsync(
                         );
                     }
                 })
-                // Extract and return the ARN of the created filter
+                // Extract and return the ARN of the created filter.
                 .thenApply(response -> response.arn());
     }
     // snippet-end:[inspector.java2.create.filter.main]
 
     // snippet-start:[inspector.java2.list_findings.main]
-
     /**
      * Fetches Inspector2 findings asynchronously using a paginator and returns
      * a summary string when complete.