Skip to content

Commit db4e99a

Browse files
committed
Deprecate ServiceMetadata.setProtocol()
1 parent 6a7f6e4 commit db4e99a

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
package software.amazon.awssdk.codegen.customization.processors;
1717

18+
import java.util.Collections;
1819
import software.amazon.awssdk.codegen.customization.CodegenCustomizationProcessor;
1920
import software.amazon.awssdk.codegen.model.config.customization.MetadataConfig;
2021
import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
@@ -44,7 +45,7 @@ public void preprocess(ServiceModel serviceModel) {
4445

4546
String customProtocol = metadataConfig.getProtocol();
4647
if (customProtocol != null) {
47-
serviceMetadata.setProtocol(customProtocol);
48+
serviceMetadata.setProtocols(Collections.singletonList(customProtocol));
4849
}
4950

5051
}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,10 @@ public String getProtocol() {
114114
return protocol;
115115
}
116116

117+
/**
118+
* {@code protocol} superseded by {@code protocols} field, resolved in {@link ProtocolUtils#resolveProtocol(ServiceMetadata)}
119+
*/
120+
@Deprecated
117121
public void setProtocol(String protocol) {
118122
this.protocol = protocol;
119123
}

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,15 @@ public static String resolveProtocol(ServiceMetadata serviceMetadata) {
4343
List<String> protocols = serviceMetadata.getProtocols();
4444
String protocol = serviceMetadata.getProtocol();
4545

46-
// Kinesis uses customization.config customServiceMetadata to set cbor
47-
if ("cbor".equals(protocol) || protocols == null || protocols.isEmpty()) {
46+
if (protocols == null || protocols.isEmpty()) {
4847
return protocol;
4948
}
5049

50+
// Kinesis uses customization.config customServiceMetadata to set cbor
51+
if ("cbor".equals(protocols.get(0))) {
52+
return "cbor";
53+
}
54+
5155
for (String supportedProtocol : SUPPORTED_PROTOCOLS) {
5256
if (protocols.contains(supportedProtocol)) {
5357
return supportedProtocol;

0 commit comments

Comments
 (0)