Skip to content

feat(clients): allow protocol selection by class constructor #7568

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

Draft
kuhe wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

feat(clients): allow protocol selection by class constructor #7568

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
131 changes: 53 additions & 78 deletions ...odegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddProtocolConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,34 @@ public Map<String, Consumer<TypeScriptWriter>> getRuntimeConfigWriters(
.orElse("");
String awsQueryCompat = settings.getService(model).hasTrait(AwsQueryCompatibleTrait.class) ? "true" : "false";

Consumer<TypeScriptWriter> typeScriptWriterConsumer = (TypeScriptWriter writer) -> {
writer.openBlock(
"""
{
defaultNamespace: $S,""",
"""
}""",
namespace,
() -> {
if (!xmlns.isEmpty()) {
writer.write("xmlNamespace: $S,", xmlns);
}
String version = settings.getService(model).getVersion();
if (!version.isEmpty()) {
writer.write("version: $S,", version);
}
writer.write("serviceTarget: $S,", rpcTarget);
if (awsQueryCompat.equals("true")) {
writer.write("awsQueryCompat: $L,", awsQueryCompat);
}

if (CUSTOMIZATIONS.containsKey(settings.getService())) {
CUSTOMIZATIONS.get(settings.getService()).accept(writer);
}
}
);
};

switch (target) {
case SHARED:
if (Objects.equals(settings.getProtocol(), RestXmlTrait.ID)) {
Expand All @@ -121,16 +149,10 @@ public Map<String, Consumer<TypeScriptWriter>> getRuntimeConfigWriters(
AwsDependency.AWS_SDK_CORE,
"/protocols"
);
writer.write(
"""
new AwsRestXmlProtocol({
defaultNamespace: $S,
xmlNamespace: $S,
})""",
namespace,
xmlns
);
}
writer.write("AwsRestXmlProtocol");
},
"protocolSettings",
typeScriptWriterConsumer
);
} else if (Objects.equals(settings.getProtocol(), AwsQueryTrait.ID)) {
return MapUtils.of(
Expand All @@ -142,18 +164,10 @@ public Map<String, Consumer<TypeScriptWriter>> getRuntimeConfigWriters(
AwsDependency.AWS_SDK_CORE,
"/protocols"
);
writer.write(
"""
new AwsQueryProtocol({
defaultNamespace: $S,
xmlNamespace: $S,
version: $S,
})""",
namespace,
xmlns,
settings.getService(model).getVersion()
);
}
writer.write("AwsQueryProtocol");
},
"protocolSettings",
typeScriptWriterConsumer
);
} else if (Objects.equals(settings.getProtocol(), Ec2QueryTrait.ID)) {
return MapUtils.of(
Expand All @@ -165,18 +179,10 @@ public Map<String, Consumer<TypeScriptWriter>> getRuntimeConfigWriters(
AwsDependency.AWS_SDK_CORE,
"/protocols"
);
writer.write(
"""
new AwsEc2QueryProtocol({
defaultNamespace: $S,
xmlNamespace: $S,
version: $S,
})""",
namespace,
xmlns,
settings.getService(model).getVersion()
);
}
writer.write("AwsEc2QueryProtocol");
},
"protocolSettings",
typeScriptWriterConsumer
);
} else if (Objects.equals(settings.getProtocol(), RestJson1Trait.ID)) {
return MapUtils.of(
Expand All @@ -188,7 +194,7 @@ public Map<String, Consumer<TypeScriptWriter>> getRuntimeConfigWriters(
AwsDependency.AWS_SDK_CORE,
"/protocols"
);
writer.write("new AwsRestJsonProtocol({ defaultNamespace: $S })", namespace);
writer.write("AwsRestJsonProtocol");
}
);
} else if (Objects.equals(settings.getProtocol(), AwsJson1_0Trait.ID)) {
Expand All @@ -201,24 +207,10 @@ public Map<String, Consumer<TypeScriptWriter>> getRuntimeConfigWriters(
AwsDependency.AWS_SDK_CORE,
"/protocols"
);
writer.openBlock(
"""
new AwsJson1_0Protocol({
defaultNamespace: $S,
serviceTarget: $S,
awsQueryCompatible: $L,""",
"""
})""",
namespace,
rpcTarget,
awsQueryCompat,
() -> {
if (CUSTOMIZATIONS.containsKey(settings.getService())) {
CUSTOMIZATIONS.get(settings.getService()).accept(writer);
}
}
);
}
writer.write("AwsJson1_0Protocol");
},
"protocolSettings",
typeScriptWriterConsumer
);
} else if (Objects.equals(settings.getProtocol(), AwsJson1_1Trait.ID)) {
return MapUtils.of(
Expand All @@ -230,24 +222,10 @@ public Map<String, Consumer<TypeScriptWriter>> getRuntimeConfigWriters(
AwsDependency.AWS_SDK_CORE,
"/protocols"
);
writer.openBlock(
"""
new AwsJson1_1Protocol({
defaultNamespace: $S,
serviceTarget: $S,
awsQueryCompatible: $L,""",
"""
})""",
namespace,
rpcTarget,
awsQueryCompat,
() -> {
if (CUSTOMIZATIONS.containsKey(settings.getService())) {
CUSTOMIZATIONS.get(settings.getService()).accept(writer);
}
}
);
}
writer.write("AwsJson1_1Protocol");
},
"protocolSettings",
typeScriptWriterConsumer
);
} else if (Objects.equals(settings.getProtocol(), Rpcv2CborTrait.ID)) {
return MapUtils.of(
Expand All @@ -261,14 +239,11 @@ public Map<String, Consumer<TypeScriptWriter>> getRuntimeConfigWriters(
);
writer.write(
"""
new AwsSmithyRpcV2CborProtocol({
defaultNamespace: $S,
awsQueryCompatible: $L,
})""",
namespace,
awsQueryCompat
AwsSmithyRpcV2CborProtocol"""
);
}
},
"protocolSettings",
typeScriptWriterConsumer
);
}
case BROWSER:
Expand Down
Loading