Address comments

Author: zoewangg

core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/RetryPolicy.java

@@ -55,12 +55,8 @@ private RetryPolicy(BuilderImpl builder) {
         this.throttlingBackoffStrategy = builder.throttlingBackoffStrategy;
         this.numRetries = builder.numRetries;
         this.retryConditionFromBuilder = builder.retryCondition;
-        if (numRetries == 0) {
-            this.retryCondition = retryConditionFromBuilder;
-        } else {
-            this.retryCondition = AndRetryCondition.create(MaxNumberOfRetriesCondition.create(numRetries),
-                                                           retryConditionFromBuilder);
-        }
+        this.retryCondition = AndRetryCondition.create(MaxNumberOfRetriesCondition.create(numRetries),
+                                                       retryConditionFromBuilder);
     }
 
     public RetryCondition retryCondition() {

core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/conditions/AndRetryCondition.java

@@ -15,9 +15,9 @@
 
 package software.amazon.awssdk.core.retry.conditions;
 
-import java.util.ArrayList;
 import java.util.Collections;
-import java.util.List;
+import java.util.HashSet;
+import java.util.Set;
 import software.amazon.awssdk.annotations.SdkPublicApi;
 import software.amazon.awssdk.core.retry.RetryPolicyContext;
 import software.amazon.awssdk.utils.ToString;
@@ -29,7 +29,7 @@
 @SdkPublicApi
 public final class AndRetryCondition implements RetryCondition {
 
-    private List<RetryCondition> conditions = new ArrayList<>();
+    private Set<RetryCondition> conditions = new HashSet<>();
 
     private AndRetryCondition(RetryCondition... conditions) {
         Collections.addAll(this.conditions, Validate.notEmpty(conditions, "%s cannot be empty.", "conditions"));

core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/conditions/OrRetryCondition.java

@@ -15,9 +15,9 @@
 
 package software.amazon.awssdk.core.retry.conditions;
 
-import java.util.ArrayList;
 import java.util.Collections;
-import java.util.List;
+import java.util.HashSet;
+import java.util.Set;
 import software.amazon.awssdk.annotations.SdkPublicApi;
 import software.amazon.awssdk.core.retry.RetryPolicyContext;
 import software.amazon.awssdk.utils.ToString;
@@ -28,7 +28,7 @@
 @SdkPublicApi
 public final class OrRetryCondition implements RetryCondition {
 
-    private List<RetryCondition> conditions = new ArrayList<>();
+    private Set<RetryCondition> conditions = new HashSet<>();
 
     private OrRetryCondition(RetryCondition... conditions) {
         Collections.addAll(this.conditions, conditions);

core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/RetryPolicyTest.java

@@ -75,7 +75,7 @@ public void throttlingDelay_delegatesToThrottlingBackoffStrategy() {
     public void nonRetryPolicy_shouldUseNullCondition() {
         RetryPolicy noneRetry = RetryPolicy.none();
 
-        assertThat(noneRetry.retryCondition()).isEqualTo(RetryCondition.none());
+        assertThat(noneRetry.retryCondition().shouldRetry(RetryPolicyContext.builder().build())).isFalse();
         assertThat(noneRetry.numRetries()).isZero();
         assertThat(noneRetry.backoffStrategy()).isEqualTo(BackoffStrategy.none());
         assertThat(noneRetry.throttlingBackoffStrategy()).isEqualTo(BackoffStrategy.none());