Moved simple methods to be whitelist-based. Messages are logged when a potentially-simple method is encountered that hasn't been whitelisted or blacklisted.

Author: millems

.changes/next-release/bugfix-AWSSDKforJavav2-da6c66e.json

@@ -0,0 +1,5 @@
+{
+    "category": "AWS SDK for Java v2", 
+    "type": "bugfix", 
+    "description": "Removed broken client methods: `BackupClient#getSupportedResourceTypes()` and `PinpointSmsVoiceClient.listConfigurationSets()`."
+}

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

@@ -45,6 +45,7 @@
 import software.amazon.awssdk.codegen.model.service.ServiceModel;
 import software.amazon.awssdk.codegen.naming.DefaultNamingStrategy;
 import software.amazon.awssdk.codegen.naming.NamingStrategy;
+import software.amazon.awssdk.utils.CollectionUtils;
 
 /**
  * Builds an intermediate model to be used by the templates from the service model and
@@ -247,24 +248,24 @@ private void linkAuthorizationToRequestShapeForAwsProtocol(AuthType authType, Sh
     }
 
     private void setSimpleMethods(IntermediateModel model) {
-        model.getOperations().entrySet().forEach(m -> {
-
-            ShapeModel inputShape = m.getValue().getInputShape();
-            String methodName = m.getValue().getMethodName();
-            CustomizationConfig config = model.getCustomizationConfig();
-
-            if (inputShape.getRequired() == null
-                && !config.getBlacklistedSimpleMethods().contains(methodName)
-                && !(config.getBlacklistedSimpleMethods().size() == 1 && config.getBlacklistedSimpleMethods().get(0).equals("*"))
-                && !m.getValue().hasStreamingInput()
-                && !m.getValue().hasStreamingOutput()) {
-
-                if (!methodName.matches(Constant.APPROVED_SIMPLE_METHOD_VERBS) &&
-                    !config.getVerifiedSimpleMethods().contains(methodName)) {
-                    // TODO: How do we prevent these from being missed before services launch?
-                    log.warn("Simple method encountered that is not approved or blacklisted: " + methodName);
-                } else {
-                    inputShape.setSimpleMethod(true);
+        CustomizationConfig config = model.getCustomizationConfig();
+        model.getOperations().values().forEach(operation -> {
+            ShapeModel inputShape = operation.getInputShape();
+            String methodName = operation.getMethodName();
+
+            if (config.getVerifiedSimpleMethods().contains(methodName)) {
+                inputShape.setSimpleMethod(true);
+            } else {
+                inputShape.setSimpleMethod(false);
+
+                boolean methodIsNotBlacklisted = !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);
                 }
             }
         });

codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/IntermediateModel.java

@@ -15,8 +15,6 @@
 
 package software.amazon.awssdk.codegen.model.intermediate;
 
-import static software.amazon.awssdk.codegen.internal.Constant.APPROVED_SIMPLE_METHOD_VERBS;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -37,12 +35,6 @@
 import software.amazon.awssdk.utils.IoUtils;
 
 public final class IntermediateModel {
-
-    /**
-     * This is used for all service clients unless overridden in the Customizations file.
-     */
-    private static final String DEFAULT_CLIENT_CONFIG_FACTORY = "LegacyClientConfigurationFactory";
-
     private final Metadata metadata;
 
     private final Map<String, OperationModel> operations;
@@ -203,8 +195,6 @@ private String getResponseMetadataClassName() {
     public List<OperationModel> simpleMethodsRequiringTesting() {
         return getOperations().values().stream()
                               .filter(v -> v.getInputShape().isSimpleMethod())
-                              .filter(v -> !getCustomizationConfig().getVerifiedSimpleMethods().contains(v.getMethodName()))
-                              .filter(v -> v.getMethodName().matches(APPROVED_SIMPLE_METHOD_VERBS))
                               .collect(Collectors.toList());
     }