From 985704a5eac1c72e4367040195d8fb8c554b8fe5 Mon Sep 17 00:00:00 2001 From: Ryan Pelaez Date: Mon, 19 Jun 2023 15:02:16 -0700 Subject: [PATCH] Updated region validation in multilang to be more readible --- .../multilang/config/KinesisClientLibConfigurator.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/amazon-kinesis-client-multilang/src/main/java/software/amazon/kinesis/multilang/config/KinesisClientLibConfigurator.java b/amazon-kinesis-client-multilang/src/main/java/software/amazon/kinesis/multilang/config/KinesisClientLibConfigurator.java index 3a636c6c..b4ca8214 100644 --- a/amazon-kinesis-client-multilang/src/main/java/software/amazon/kinesis/multilang/config/KinesisClientLibConfigurator.java +++ b/amazon-kinesis-client-multilang/src/main/java/software/amazon/kinesis/multilang/config/KinesisClientLibConfigurator.java @@ -94,11 +94,8 @@ public class KinesisClientLibConfigurator { Validate.isTrue(configuration.getKinesisCredentialsProvider().isDirty(), "A basic set of AWS credentials must be provided"); //Verify Region is real - if(configuration.getKinesisClient().get("region") == null){ - throw new NullPointerException("regionName must be passed in"); - } - final String regionCode = configuration.getKinesisClient().get("region").toString(); - if (Region.regions().stream().filter(x -> x.id().equalsIgnoreCase(regionCode)).count() == 0) { + final String regionCode = String.valueOf(configuration.getKinesisClient().get("region")); + if (regionCode == null || Region.regions().stream().filter(x -> x.id().equalsIgnoreCase(regionCode)).count() == 0) { throw new IllegalArgumentException(String.format("Unsupported region: %s", regionCode)); } return configuration;