Deprecate ServiceMetadata.setProtocol()

Author: davidh44

codegen/src/main/java/software/amazon/awssdk/codegen/customization/processors/MetadataModifiersProcessor.java

@@ -15,6 +15,7 @@
 
 package software.amazon.awssdk.codegen.customization.processors;
 
+import java.util.Collections;
 import software.amazon.awssdk.codegen.customization.CodegenCustomizationProcessor;
 import software.amazon.awssdk.codegen.model.config.customization.MetadataConfig;
 import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
@@ -44,7 +45,7 @@ public void preprocess(ServiceModel serviceModel) {
 
         String customProtocol = metadataConfig.getProtocol();
         if (customProtocol != null) {
-            serviceMetadata.setProtocol(customProtocol);
+            serviceMetadata.setProtocols(Collections.singletonList(customProtocol));
         }
 
     }

codegen/src/main/java/software/amazon/awssdk/codegen/model/service/ServiceMetadata.java

@@ -114,6 +114,10 @@ public String getProtocol() {
         return protocol;
     }
 
+    /**
+     * {@code protocol} superseded by {@code protocols} field, resolved in {@link ProtocolUtils#resolveProtocol(ServiceMetadata)}
+     */
+    @Deprecated
     public void setProtocol(String protocol) {
         this.protocol = protocol;
     }

codegen/src/main/java/software/amazon/awssdk/codegen/utils/ProtocolUtils.java

@@ -43,11 +43,15 @@ public static String resolveProtocol(ServiceMetadata serviceMetadata) {
         List<String> protocols = serviceMetadata.getProtocols();
         String protocol = serviceMetadata.getProtocol();
 
-        // Kinesis uses customization.config customServiceMetadata to set cbor
-        if ("cbor".equals(protocol) || protocols == null || protocols.isEmpty()) {
+        if (protocols == null || protocols.isEmpty()) {
             return protocol;
         }
 
+        // Kinesis uses customization.config customServiceMetadata to set cbor
+        if ("cbor".equals(protocols.get(0))) {
+            return "cbor";
+        }
+
         for (String supportedProtocol : SUPPORTED_PROTOCOLS) {
             if (protocols.contains(supportedProtocol)) {
                 return supportedProtocol;