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));
     }
 
     /**

core/sdk-core/src/main/java/software/amazon/awssdk/core/util/SdkUserAgent.java

@@ -38,7 +38,7 @@ public final class SdkUserAgent {
                                             + "vendor/{java.vendor}";
 
     /** Disallowed characters in the user agent token: @see <a href="https://tools.ietf.org/html/rfc7230#section-3.2.6">RFC 7230</a> */
-    private static final String UA_BLACKLIST_REGEX = "[() ,/:;<=>?@\\[\\]{}\\\\]";
+    private static final String UA_DENYLIST_REGEX = "[() ,/:;<=>?@\\[\\]{}\\\\]";
 
     /** Shared logger for any issues while loading version information. */
     private static final Logger log = LoggerFactory.getLogger(SdkUserAgent.class);
@@ -125,7 +125,7 @@ String getUserAgent() {
      * @return the input with spaces replaced by underscores
      */
     private static String sanitizeInput(String input) {
-        return input == null ? UNKNOWN : input.replaceAll(UA_BLACKLIST_REGEX, "_");
+        return input == null ? UNKNOWN : input.replaceAll(UA_DENYLIST_REGEX, "_");
     }
 
     private static String getAdditionalJvmLanguages() {

services/alexaforbusiness/src/main/resources/codegen-resources/customization.config

@@ -1,3 +1,3 @@
 {
-    "blacklistedSimpleMethods" : ["*"]
+    "excludedSimpleMethods" : ["*"]
 }

services/apigateway/src/main/resources/codegen-resources/customization.config

@@ -4,7 +4,7 @@
       "emitAsShape": "String"
     }
   },
-  "blacklistedSimpleMethods" : [
+  "excludedSimpleMethods" : [
     "updateAccount",
     "createApiKey",
     "generateClientCertificate"

services/applicationdiscovery/src/main/resources/codegen-resources/customization.config

@@ -9,7 +9,7 @@
         "describeExportConfigurations",
         "getDiscoverySummary"
     ],
-    "blacklistedSimpleMethods" : [
+    "excludedSimpleMethods" : [
         "startContinuousExport",
         "describeContinuousExports"
     ],

services/appstream/src/main/resources/codegen-resources/customization.config

@@ -1,5 +1,5 @@
 {
-     "blacklistedSimpleMethods" : [
+     "excludedSimpleMethods" : [
         "updateFleet",
          "describeUserStackAssociations"
      ],

services/backup/src/main/resources/codegen-resources/customization.config

@@ -1,5 +1,5 @@
 {
-    "blacklistedSimpleMethods" : [
+    "excludedSimpleMethods" : [
         "getSupportedResourceTypes"
     ],
     "verifiedSimpleMethods" : [

services/batch/src/main/resources/codegen-resources/customization.config

@@ -4,7 +4,7 @@
     "describeJobDefinitions",
     "describeJobQueues"
   ],
-  "blacklistedSimpleMethods": [
+  "excludedSimpleMethods": [
     "listJobs"
   ]
 }

services/cloudformation/src/main/resources/codegen-resources/customization.config

@@ -17,7 +17,7 @@
       ]
     }
   },
-  "blacklistedSimpleMethods": [
+  "excludedSimpleMethods": [
     "estimateTemplateCost",
     "validateTemplate",
     "getTemplate",

services/cloudhsm/src/main/resources/codegen-resources/customization.config

@@ -14,7 +14,7 @@
       "exclude": [ "retryable" ]
     }
   },
-  "blacklistedSimpleMethods" : [
+  "excludedSimpleMethods" : [
     "describeHsm",
     "describeLunaClient"
   ],

services/cloudwatch/src/main/resources/codegen-resources/customization.config

@@ -5,7 +5,7 @@
     "listDashboards",
     "listMetrics"
   ],
-  "blacklistedSimpleMethods": [
+  "excludedSimpleMethods": [
     "deleteDashboards",
     "putDashboard",
     "getDashboard"

services/cloudwatchlogs/src/main/resources/codegen-resources/customization.config

@@ -1,5 +1,5 @@
 {
-  "blacklistedSimpleMethods" : [
+  "excludedSimpleMethods" : [
     "deleteResourcePolicy",
     "putResourcePolicy"
   ],

services/codecommit/src/main/resources/codegen-resources/customization.config

@@ -2,7 +2,7 @@
   "verifiedSimpleMethods": [
     "listRepositories"
   ],
-  "blacklistedSimpleMethods": [
+  "excludedSimpleMethods": [
     "getBranch"
   ]
 }

services/codedeploy/src/main/resources/codegen-resources/customization.config

@@ -6,7 +6,7 @@
     "listGitHubAccountTokenNames",
     "listOnPremisesInstances"
   ],
-  "blacklistedSimpleMethods": [
+  "excludedSimpleMethods": [
     "continueDeployment",
     "skipWaitTimeForInstanceTermination",
     "updateApplication",

services/codepipeline/src/main/resources/codegen-resources/customization.config

@@ -4,7 +4,7 @@
     "listPipelines",
     "listWebhooks"
   ],
-  "blacklistedSimpleMethods": [
+  "excludedSimpleMethods": [
     "deregisterWebhookWithThirdParty",
     "registerWebhookWithThirdParty"
   ]

services/cognitoidentityprovider/src/main/resources/codegen-resources/customization.config

@@ -1,5 +1,5 @@
 {
-    "blacklistedSimpleMethods" : [
+    "excludedSimpleMethods" : [
         "associateSoftwareToken"
     ],
     "shapeModifiers" : {

services/config/src/main/resources/codegen-resources/customization.config

@@ -16,7 +16,7 @@
     "getComplianceSummaryByResourceType",
     "getDiscoveredResourceCounts"
   ],
-  "blacklistedSimpleMethods": [
+  "excludedSimpleMethods": [
     "startConfigRulesEvaluation"
   ]
 }

services/costandusagereport/src/main/resources/codegen-resources/customization.config

@@ -2,7 +2,7 @@
   "verifiedSimpleMethods": [
     "describeReportDefinitions"
   ],
-  "blacklistedSimpleMethods": [
+  "excludedSimpleMethods": [
     "deleteReportDefinition"
   ]
 }

services/costexplorer/src/main/resources/codegen-resources/customization.config

@@ -1,3 +1,3 @@
 {
-  "blacklistedSimpleMethods" : ["getCostAndUsage"]
+  "excludedSimpleMethods" : ["getCostAndUsage"]
 }

services/databasemigration/src/main/resources/codegen-resources/customization.config

@@ -13,7 +13,7 @@
     "describeReplicationSubnetGroups",
     "describeReplicationTasks"
   ],
-  "blacklistedSimpleMethods": [
+  "excludedSimpleMethods": [
     "describeReplicationTaskAssessmentResults"
   ]
 }

services/devicefarm/src/main/resources/codegen-resources/customization.config

@@ -10,7 +10,7 @@
     "listOfferings",
     "listProjects"
   ],
-  "blacklistedSimpleMethods": [
+  "excludedSimpleMethods": [
     "purchaseOffering",
     "renewOffering",
     "listVPCEConfigurations"

services/directconnect/src/main/resources/codegen-resources/customization.config

@@ -8,7 +8,7 @@
     "describeVirtualGateways",
     "describeVirtualInterfaces"
   ],
-  "blacklistedSimpleMethods": [
+  "excludedSimpleMethods": [
     "createBGPPeer",
     "deleteBGPPeer",
     "describeDirectConnectGatewayAttachments",

services/ec2/src/main/resources/codegen-resources/customization.config

@@ -330,7 +330,7 @@
       ]
     }
   },
-  "blacklistedSimpleMethods": [
+  "excludedSimpleMethods": [
     "acceptVpcPeeringConnection",
     "authorizeSecurityGroupIngress",
     "cancelImportTask",

services/ecs/src/main/resources/codegen-resources/customization.config

@@ -10,7 +10,7 @@
     "listTaskDefinitionFamilies",
     "listTaskDefinitions"
   ],
-  "blacklistedSimpleMethods": [
+  "excludedSimpleMethods": [
     "discoverPollEndpoint",
     "registerContainerInstance",
     "submitContainerStateChange",

services/efs/src/main/resources/codegen-resources/customization.config

@@ -2,7 +2,7 @@
   "verifiedSimpleMethods": [
     "describeFileSystems"
   ],
-  "blacklistedSimpleMethods": [
+  "excludedSimpleMethods": [
     "describeMountTargets"
   ]
 }

services/elasticache/src/main/resources/codegen-resources/customization.config

@@ -10,7 +10,7 @@
     "describeReservedCacheNodesOfferings",
     "describeSnapshots"
   ],
-  "blacklistedSimpleMethods": [
+  "excludedSimpleMethods": [
     "describeCacheSecurityGroups",
     "listAllowedNodeTypeModifications"
   ]

services/elasticbeanstalk/src/main/resources/codegen-resources/customization.config

@@ -17,7 +17,7 @@
            ]
         }
     },
-    "blacklistedSimpleMethods" : [
+    "excludedSimpleMethods" : [
         "abortEnvironmentUpdate",
         "composeEnvironments",
         "deletePlatformVersion",

services/elasticloadbalancingv2/src/main/resources/codegen-resources/customization.config

@@ -5,7 +5,7 @@
     "describeSSLPolicies",
     "describeTargetGroups"
   ],
-  "blacklistedSimpleMethods": [
+  "excludedSimpleMethods": [
     "describeRules",
     "describeListeners"
   ]

services/emr/src/main/resources/codegen-resources/customization.config

@@ -14,7 +14,7 @@
       ]
     }
   },
-  "blacklistedSimpleMethods": [
+  "excludedSimpleMethods": [
     "cancelSteps",
     "modifyInstanceGroups",
     "describeJobFlows"