changing terminology to more inclusive terms (#4115)

Author: cenedhryn

codegen/src/main/java/software/amazon/awssdk/codegen/IntermediateModelBuilder.java

@@ -253,14 +253,16 @@ private void setSimpleMethods(IntermediateModel model) {
             } else {
                 inputShape.setSimpleMethod(false);
 
-                boolean methodIsNotBlacklisted = !config.getBlacklistedSimpleMethods().contains(methodName) ||
-                                                 config.getBlacklistedSimpleMethods().stream().noneMatch(m -> m.equals("*"));
+                boolean methodIsNotExcluded = !config.getExcludedSimpleMethods().contains(methodName) ||
+                                              config.getExcludedSimpleMethods().stream().noneMatch(m -> m.equals("*")) ||
+                                              !config.getBlacklistedSimpleMethods().contains(methodName) ||
+                                              config.getBlacklistedSimpleMethods().stream().noneMatch(m -> m.equals("*"));
                 boolean methodHasNoRequiredMembers = !CollectionUtils.isNullOrEmpty(inputShape.getRequired());
                 boolean methodIsNotStreaming = !operation.isStreaming();
                 boolean methodHasSimpleMethodVerb = methodName.matches(Constant.APPROVED_SIMPLE_METHOD_VERBS);
 
-                if (methodIsNotBlacklisted && methodHasNoRequiredMembers && methodIsNotStreaming && methodHasSimpleMethodVerb) {
-                    log.warn("A potential simple method exists that isn't whitelisted or blacklisted: " + methodName);
+                if (methodIsNotExcluded && methodHasNoRequiredMembers && methodIsNotStreaming && methodHasSimpleMethodVerb) {
+                    log.warn("A potential simple method exists that isn't explicitly excluded or included: " + methodName);
                 }
             }
         });

codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/CustomizationConfig.java

@@ -103,6 +103,13 @@ public class CustomizationConfig {
     /**
      * APIs that have no required arguments in their model but can't be called via a simple method
      */
+    private List<String> excludedSimpleMethods = new ArrayList<>();
+
+    /**
+     * APIs that have no required arguments in their model but can't be called via a simple method.
+     * Superseded by {@link #excludedSimpleMethods}
+     */
+    @Deprecated
     private List<String> blacklistedSimpleMethods = new ArrayList<>();
 
     /**
@@ -373,10 +380,26 @@ public void setServiceSpecificHttpConfig(String serviceSpecificHttpConfig) {
         this.serviceSpecificHttpConfig = serviceSpecificHttpConfig;
     }
 
+    public List<String> getExcludedSimpleMethods() {
+        return excludedSimpleMethods;
+    }
+
+    public void setExcludedSimpleMethods(List<String> excludedSimpleMethods) {
+        this.excludedSimpleMethods = excludedSimpleMethods;
+    }
+
+    /**
+     * Use {@link #getExcludedSimpleMethods()}
+     */
+    @Deprecated
     public List<String> getBlacklistedSimpleMethods() {
         return blacklistedSimpleMethods;
     }
 
+    /**
+     * Use {@link #setExcludedSimpleMethods(List)}
+     */
+    @Deprecated
     public void setBlacklistedSimpleMethods(List<String> blackListedSimpleMethods) {
         this.blacklistedSimpleMethods = blackListedSimpleMethods;
     }

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/c2j/json/customization.config

@@ -11,7 +11,7 @@
     },
     "customRetryPolicy": "software.amazon.MyServiceRetryPolicy",
     "verifiedSimpleMethods" : ["paginatedOperationWithResultKey"],
-    "blacklistedSimpleMethods" : [
+    "excludedSimpleMethods" : [
         "eventStreamOperation"
     ],
   "utilitiesMethod": {

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/c2j/rest-json/customization.config

@@ -15,7 +15,7 @@
     },
     "customRetryPolicy": "software.amazon.MyServiceRetryPolicy",
     "verifiedSimpleMethods" : ["paginatedOperationWithResultKey"],
-    "blacklistedSimpleMethods" : [
+    "excludedSimpleMethods" : [
         "eventStreamOperation"
     ],
   "utilitiesMethod": {

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/customization.config

@@ -1,5 +1,5 @@
 {
-    "blacklistedSimpleMethods" : [
+    "excludedSimpleMethods" : [
         "allTypes",
         "nestedContainers",
         "operationWithNoInputOrOutput",

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/customresponsemetadata/customization.config

@@ -1,5 +1,5 @@
 {
-    "blacklistedSimpleMethods" : [
+    "excludedSimpleMethods" : [
         "allTypes",
         "nestedContainers",
         "operationWithNoInputOrOutput",

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/xmlnamespace/customization.config

@@ -1,5 +1,5 @@
 {
-  "blacklistedSimpleMethods": [
+  "excludedSimpleMethods": [
     "allTypes",
     "nestedContainers",
     "operationWithNoInputOrOutput",

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/paginators/customization.config

@@ -1,5 +1,5 @@
 {
-    "blacklistedSimpleMethods" : [
+    "excludedSimpleMethods" : [
         "allTypes",
         "nestedContainers",
         "operationWithNoInputOrOutput"

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/transform/customization.config

@@ -1,5 +1,5 @@
 {
-    "blacklistedSimpleMethods" : [
+    "excludedSimpleMethods" : [
         "allTypes",
         "nestedContainers",
         "operationWithNoInputOrOutput",

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

@@ -42,8 +42,8 @@ private RetryOnExceptionsCondition(Set<Class<? extends Exception>> exceptionsToR
 
     /**
      * @param context Context about the state of the last request and information about the number of requests made.
-     * @return True if the exception class matches one of the whitelisted exceptions or if the cause of the exception matches the
-     *     whitelisted exception.
+     * @return True if the exception class or the cause of the exception matches one of the exceptions supplied at
+     * initialization time.
      */
     @Override
     public boolean shouldRetry(RetryPolicyContext context) {
@@ -56,10 +56,10 @@ public boolean shouldRetry(RetryPolicyContext context) {
         Predicate<Class<? extends Exception>> isRetryableException =
             ex -> ex.isAssignableFrom(exception.getClass());
 
-        Predicate<Class<? extends Exception>> hasRetrableCause =
+        Predicate<Class<? extends Exception>> hasRetryableCause =
             ex -> exception.getCause() != null && ex.isAssignableFrom(exception.getCause().getClass());
 
-        return exceptionsToRetryOn.stream().anyMatch(isRetryableException.or(hasRetrableCause));
+        return exceptionsToRetryOn.stream().anyMatch(isRetryableException.or(hasRetryableCause));
     }
 
     /**