Skip to content

Add support for service model protocols field #6161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
davidh44 merged 9 commits into from
Jun 6, 2025
Merged

Add support for service model protocols field #6161

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
82f93d3
Add support for service model protocols field
davidh44 Jun 5, 2025
490e155
Merge branch 'master' into hdavidh/protocols-selection
davidh44 Jun 5, 2025
64106de
Changelog
davidh44 Jun 5, 2025
fa97874
Add support for service model protocols field
davidh44 Jun 5, 2025
3fb37e1
Account for Kinesis cbor customization in ProtocolUtils
davidh44 Jun 5, 2025
6a7f6e4
Deprecate ServiceMetadata.getProtocol()
davidh44 Jun 5, 2025
db4e99a
Deprecate ServiceMetadata.setProtocol()
davidh44 Jun 5, 2025
b0ed395
Add test for Cbor v1
davidh44 Jun 5, 2025
cce4ebf
Merge branch 'master' into hdavidh/protocols-selection
davidh44 Jun 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...a/software/amazon/awssdk/codegen/customization/processors/MetadataModifiersProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -44,7 +45,7 @@ public void preprocess(ServiceModel serviceModel) {

String customProtocol = metadataConfig.getProtocol();
if (customProtocol != null) {
serviceMetadata.setProtocol(customProtocol);
serviceMetadata.setProtocols(Collections.singletonList(customProtocol));
}

}
Expand Down
4 changes: 4 additions & 0 deletions codegen/src/main/java/software/amazon/awssdk/codegen/model/service/ServiceMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
8 changes: 6 additions & 2 deletions codegen/src/main/java/software/amazon/awssdk/codegen/utils/ProtocolUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))) {
Comment thread
davidh44 marked this conversation as resolved.
return "cbor";
}

for (String supportedProtocol : SUPPORTED_PROTOCOLS) {
if (protocols.contains(supportedProtocol)) {
return supportedProtocol;
Expand Down
Loading