rolled in review comments

Author: scmacdon

javav2/example_code/iotfleetwise/src/main/java/com/example/fleetwise/scenario/FleetwiseActions.java

@@ -262,9 +262,9 @@ public CompletableFuture<Void> deleteDecoderManifestAsync(String name) {
                     if (exception != null) {
                         Throwable cause = exception.getCause() != null ? exception.getCause() : exception;
                         if (cause instanceof ResourceNotFoundException) {
-                            throw new RuntimeException("Decoder manifest not found: " + name, cause);
+                            throw (ResourceNotFoundException) cause;
                         }
-                        throw new RuntimeException("Failed to delete decoder manifest: " + name, cause);
+                        throw new RuntimeException("Failed to delete the decoder manifest: " + cause);
                     }
                     return null;
                 });
@@ -289,9 +289,9 @@ public CompletableFuture<Void> deleteVehicleAsync(String vecName) {
                     if (exception != null) {
                         Throwable cause = exception.getCause() != null ? exception.getCause() : exception;
                         if (cause instanceof ResourceNotFoundException) {
-                            throw new RuntimeException("Failed to locate the vehicle: " + vecName, cause);
+                            throw (ResourceNotFoundException) cause;
                         }
-                        throw new RuntimeException("Failed to delete vehicle: " + vecName, cause);
+                        throw new RuntimeException("Failed to delete the vehicle: " + cause);
                     }
                     return null;
                 });
@@ -617,9 +617,9 @@ public CompletableFuture<Void> deleteModelManifestAsync(String name) {
                     if (exception != null) {
                         Throwable cause = exception.getCause() != null ? exception.getCause() : exception;
                         if (cause instanceof ResourceNotFoundException) {
-                            throw new RuntimeException("Failed to locate the model manifest: " + name, cause);
+                            throw (ResourceNotFoundException) cause;
                         }
-                        throw new RuntimeException("Failed to delete model manifest: " + name, cause);
+                        throw new RuntimeException("Failed to delete the model manifest: " + cause);
                     }
                     logger.info("{} was successfully deleted", name);
                     return null;
@@ -645,9 +645,9 @@ public CompletableFuture<Void> deleteSignalCatalogAsync(String name) {
                     if (exception != null) {
                         Throwable cause = exception.getCause() != null ? exception.getCause() : exception;
                         if (cause instanceof ResourceNotFoundException) {
-                            throw new RuntimeException("Failed to locate the signal catalog: " + name, cause);
+                            throw (ResourceNotFoundException) cause;
                         }
-                        throw new RuntimeException("Failed to delete signal catalog: " + name, cause);
+                        throw new RuntimeException("Failed to delete the signal catalog: " + cause);
                     }
                     logger.info("{} was successfully deleted", name);
                     return null;
@@ -749,9 +749,9 @@ public CompletableFuture<Void> deleteFleetAsync(String fleetId) {
                     if (exception != null) {
                         Throwable cause = exception.getCause() != null ? exception.getCause() : exception;
                         if (cause instanceof ResourceNotFoundException) {
-                            throw new RuntimeException("Failed to locate the fleet: " + fleetId, cause);
+                            throw (ResourceNotFoundException) cause;
                         }
-                        throw new RuntimeException("Failed to delete fleet: " + fleetId, cause);
+                        throw new RuntimeException("Failed to delete the fleet: " + cause);
                     }
                     logger.info("{} was successfully deleted", fleetId);
                     return null;

javav2/example_code/iotfleetwise/src/main/java/com/example/fleetwise/scenario/FleetwiseScenario.java

@@ -297,9 +297,14 @@ Before calling createVehicle(), you must create an AWS IoT Thing
             } catch (CompletionException ce) {
                 Throwable cause = ce.getCause();
                 if (cause instanceof ResourceNotFoundException) {
+                    // Handle the case where the resource is not found.
                     logger.error("The resource was not found: {}", cause.getMessage());
+                } else if (cause instanceof RuntimeException) {
+                    // Handle other runtime exceptions.
+                    logger.error("An unexpected error occurred: {}", cause.getMessage());
                 } else {
-                    logger.error("An unexpected error occurred.", cause);
+                    // Catch any other unexpected exceptions.
+                    logger.error("An unknown error occurred.", cause);
                 }
                 return;
             }