Skip to content

Commit e051a08

Browse files
authored
fix(codegen): avoid using model.getServiceShapes() for endpoint generation (#1642)
1 parent bae1dc7 commit e051a08

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/endpointsV2/AddDefaultEndpointRuleSet.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import software.amazon.smithy.codegen.core.SymbolProvider;
1616
import software.amazon.smithy.model.Model;
1717
import software.amazon.smithy.model.node.Node;
18+
import software.amazon.smithy.model.shapes.ServiceShape;
1819
import software.amazon.smithy.rulesengine.traits.EndpointRuleSetTrait;
1920
import software.amazon.smithy.typescript.codegen.CodegenUtils;
2021
import software.amazon.smithy.typescript.codegen.LanguageTarget;
@@ -109,15 +110,14 @@ public List<RuntimeClientPlugin> getClientPlugins() {
109110
public Model preprocessModel(Model model, TypeScriptSettings settings) {
110111
Model.Builder modelBuilder = model.toBuilder();
111112

112-
model.getServiceShapes().forEach(serviceShape -> {
113-
if (!serviceShape.hasTrait(EndpointRuleSetTrait.class)) {
114-
usesDefaultEndpointRuleset = true;
115-
modelBuilder.removeShape(serviceShape.toShapeId());
116-
modelBuilder.addShape(serviceShape.toBuilder()
117-
.addTrait(DEFAULT_RULESET)
118-
.build());
119-
}
120-
});
113+
ServiceShape serviceShape = settings.getService(model);
114+
if (!serviceShape.hasTrait(EndpointRuleSetTrait.class)) {
115+
usesDefaultEndpointRuleset = true;
116+
modelBuilder.removeShape(serviceShape.toShapeId());
117+
modelBuilder.addShape(serviceShape.toBuilder()
118+
.addTrait(DEFAULT_RULESET)
119+
.build());
120+
}
121121

122122
return modelBuilder.build();
123123
}

smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/schema/SchemaGenerator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ private void writeStructureSchema(StructureShape shape) {
259259
private void writeBaseError() {
260260
String serviceName = CodegenUtils.getServiceName(settings, model, symbolProvider);
261261
String serviceExceptionName = CodegenUtils.getServiceExceptionName(serviceName);
262-
String namespace = model.getServiceShapes().stream().findFirst().get().getId().getNamespace();
262+
String namespace = settings.getService(model).getId().getNamespace();
263263

264264
String exceptionCtorSymbolName = "__" + serviceExceptionName;
265265
writer.addImportSubmodule("error", "error", TypeScriptDependency.SMITHY_CORE, "/schema");

0 commit comments

Comments
 (0)