refactor to getOrElse of client, instead of endpoint

Author: jhulten

src/main/scala/com/audienceproject/spark/dynamodb/connector/DynamoConnector.scala

@@ -75,13 +75,19 @@ private[dynamodb] trait DynamoConnector {
       **/
     private def getCredentials(chosenRegion: String, roleArn: Option[String]) = {
         roleArn.map(arn => {
-            val stsEndpoint = Option(System.getProperty("aws.sts.endpoint")).getOrElse("https://sts.amazonaws.com")
-            val stsClient = AWSSecurityTokenServiceClientBuilder
-                .standard()
-                .withCredentials(new DefaultAWSCredentialsProviderChain)
-                .withRegion(chosenRegion)
-                .withEndpointConfiguration(new EndpointConfiguration(stsEndpoint, chosenRegion))
-                .build()
+            val stsClient = Option(System.getProperty("aws.sts.endpoint")).map(endpoint => {
+                AWSSecurityTokenServiceClientBuilder
+                    .standard()
+                    .withCredentials(new DefaultAWSCredentialsProviderChain)
+                    .withEndpointConfiguration(new EndpointConfiguration(endpoint, chosenRegion))
+                    .build()
+            }).getOrElse(
+                AWSSecurityTokenServiceClientBuilder
+                    .standard()
+                    .withCredentials(new DefaultAWSCredentialsProviderChain)
+                    .withRegion(chosenRegion)
+                    .build()
+            )
             val assumeRoleResult = stsClient.assumeRole(
                 new AssumeRoleRequest()
                     .withRoleSessionName("DynamoDBAssumed")