Skip to content

Commit a20d3af

Browse files
kuhekuhe
committed
chore(codegen): use submodule imports for core pkg
1 parent 6542d25 commit a20d3af

File tree

8 files changed

+54
-15
lines changed

8 files changed

+54
-15
lines changed

‎codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddAwsRuntimeConfig.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,10 @@ public void prepareCustomizations(
162162
) {
163163
if (isAwsService(settings, model) && target.equals(LanguageTarget.NODE)) {
164164
writer.addDependency(AwsDependency.AWS_SDK_CORE);
165-
writer.addImport("emitWarningIfUnsupportedVersion", "awsCheckVersion", AwsDependency.AWS_SDK_CORE);
165+
writer.addImportSubmodule(
166+
"emitWarningIfUnsupportedVersion", "awsCheckVersion",
167+
AwsDependency.AWS_SDK_CORE, "/client"
168+
);
166169
writer.write("awsCheckVersion(process.version);");
167170
}
168171
if (target.equals(LanguageTarget.NODE)) {

‎codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AwsProtocolUtils.java‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,10 @@ static void generateDocumentBodyShapeSerde(
110110
static void generateJsonParseBody(GenerationContext context) {
111111
TypeScriptWriter writer = context.getWriter();
112112
writer.addDependency(AwsDependency.AWS_SDK_CORE);
113-
writer.addImport("parseJsonBody", "parseBody", AwsDependency.AWS_SDK_CORE);
113+
writer.addImportSubmodule(
114+
"parseJsonBody", "parseBody",
115+
AwsDependency.AWS_SDK_CORE, "/protocols"
116+
);
114117
}
115118

116119
static void generateJsonParseBodyWithQueryHeader(GenerationContext context) {
@@ -129,7 +132,10 @@ static void generateJsonParseBodyWithQueryHeader(GenerationContext context) {
129132
static void generateJsonParseErrorBody(GenerationContext context) {
130133
TypeScriptWriter writer = context.getWriter();
131134
writer.addDependency(AwsDependency.AWS_SDK_CORE);
132-
writer.addImport("parseJsonErrorBody", "parseErrorBody", AwsDependency.AWS_SDK_CORE);
135+
writer.addImportSubmodule(
136+
"parseJsonErrorBody", "parseErrorBody",
137+
AwsDependency.AWS_SDK_CORE, "/protocols"
138+
);
133139
}
134140

135141
/**
@@ -141,7 +147,10 @@ static void generateJsonParseErrorBody(GenerationContext context) {
141147
static void generateXmlParseBody(GenerationContext context) {
142148
TypeScriptWriter writer = context.getWriter();
143149
writer.addDependency(AwsDependency.AWS_SDK_CORE);
144-
writer.addImport("parseXmlBody", "parseBody", AwsDependency.AWS_SDK_CORE);
150+
writer.addImportSubmodule(
151+
"parseXmlBody", "parseBody",
152+
AwsDependency.AWS_SDK_CORE, "/protocols"
153+
);
145154
}
146155

147156
/**
@@ -153,7 +162,10 @@ static void generateXmlParseBody(GenerationContext context) {
153162
static void generateXmlParseErrorBody(GenerationContext context) {
154163
TypeScriptWriter writer = context.getWriter();
155164
writer.addDependency(AwsDependency.AWS_SDK_CORE);
156-
writer.addImport("parseXmlErrorBody", "parseErrorBody", AwsDependency.AWS_SDK_CORE);
165+
writer.addImportSubmodule(
166+
"parseXmlErrorBody", "parseErrorBody",
167+
AwsDependency.AWS_SDK_CORE, "/protocols"
168+
);
157169
}
158170

159171
/**

‎codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AwsRestXml.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,10 @@ public void generateSharedComponents(GenerationContext context) {
110110
writer.addDependency(AwsDependency.XML_BUILDER);
111111

112112
writer.addDependency(AwsDependency.AWS_SDK_CORE);
113-
writer.addImport("loadRestXmlErrorCode", null, AwsDependency.AWS_SDK_CORE);
113+
writer.addImportSubmodule(
114+
"loadRestXmlErrorCode", null,
115+
AwsDependency.AWS_SDK_CORE, "/protocols"
116+
);
114117

115118
writer.write(
116119
context.getStringStore().flushVariableDeclarationCode()

‎codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/JsonMemberDeserVisitor.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,10 @@ public String bigIntegerShape(BigIntegerShape shape) {
7373
@Override
7474
public String unionShape(UnionShape shape) {
7575
context.getWriter().addDependency(AwsDependency.AWS_SDK_CORE);
76-
context.getWriter().addImport("awsExpectUnion", "__expectUnion", AwsDependency.AWS_SDK_CORE);
76+
context.getWriter().addImportSubmodule(
77+
"awsExpectUnion", "__expectUnion",
78+
AwsDependency.AWS_SDK_CORE, "/protocols"
79+
);
7780
return getDelegateDeserializer(shape, "__expectUnion(" + dataSource + ")");
7881
}
7982

‎codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/JsonMemberSerVisitor.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,12 @@ final class JsonMemberSerVisitor extends DocumentMemberSerVisitor {
5555
this.serdeElisionEnabled = !this.isAwsQueryCompat && !context.getSettings().generateServerSdk();
5656
if (isAwsQueryCompat) {
5757
writer.addDependency(AwsDependency.AWS_SDK_CORE);
58-
writer.addImport("_toStr", null, AwsDependency.AWS_SDK_CORE);
59-
writer.addImport("_toNum", null, AwsDependency.AWS_SDK_CORE);
60-
writer.addImport("_toBool", null, AwsDependency.AWS_SDK_CORE);
58+
writer.addImportSubmodule("_toStr", null,
59+
AwsDependency.AWS_SDK_CORE, "/protocols");
60+
writer.addImportSubmodule("_toNum", null,
61+
AwsDependency.AWS_SDK_CORE, "/protocols");
62+
writer.addImportSubmodule("_toBool", null,
63+
AwsDependency.AWS_SDK_CORE, "/protocols");
6164
}
6265
}
6366

‎codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/JsonRpcProtocolGenerator.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,10 @@ public void generateSharedComponents(GenerationContext context) {
107107
TypeScriptWriter writer = context.getWriter();
108108
writer.addUseImports(getApplicationProtocol().getResponseType());
109109
writer.addDependency(AwsDependency.AWS_SDK_CORE);
110-
writer.addImport("loadRestJsonErrorCode", null, AwsDependency.AWS_SDK_CORE);
110+
writer.addImportSubmodule(
111+
"loadRestJsonErrorCode", null,
112+
AwsDependency.AWS_SDK_CORE, "/protocols"
113+
);
111114

112115
if (context.getService().hasTrait(AwsQueryCompatibleTrait.class)) {
113116
AwsProtocolUtils.generateJsonParseBodyWithQueryHeader(context);

‎codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/RestJsonProtocolGenerator.java‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,10 @@ public void generateSharedComponents(GenerationContext context) {
112112
writer.addUseImports(getApplicationProtocol().getResponseType());
113113
writer.addImport("take", null, TypeScriptDependency.AWS_SMITHY_CLIENT);
114114
writer.addDependency(AwsDependency.AWS_SDK_CORE);
115-
writer.addImport("loadRestJsonErrorCode", null, AwsDependency.AWS_SDK_CORE);
115+
writer.addImportSubmodule(
116+
"loadRestJsonErrorCode", null,
117+
AwsDependency.AWS_SDK_CORE, "/protocols"
118+
);
116119

117120
writer.write(
118121
context.getStringStore().flushVariableDeclarationCode()
@@ -122,7 +125,10 @@ public void generateSharedComponents(GenerationContext context) {
122125
@Override
123126
protected void importUnionDeserializer(TypeScriptWriter writer) {
124127
writer.addDependency(AwsDependency.AWS_SDK_CORE);
125-
writer.addImport("awsExpectUnion", "__expectUnion", AwsDependency.AWS_SDK_CORE);
128+
writer.addImportSubmodule(
129+
"awsExpectUnion", "__expectUnion",
130+
AwsDependency.AWS_SDK_CORE, "/protocols"
131+
);
126132
}
127133

128134
@Override

‎codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/auth/http/integration/AwsSdkCustomizeSigV4Auth.java‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,10 @@ public void customizeSupportedHttpAuthSchemes(
203203
.build())
204204
.putDefaultSigner(LanguageTarget.SHARED, w -> w
205205
.addDependency(AwsDependency.AWS_SDK_CORE)
206-
.addImport("AwsSdkSigV4Signer", null, AwsDependency.AWS_SDK_CORE)
206+
.addImportSubmodule(
207+
"AwsSdkSigV4Signer", null,
208+
AwsDependency.AWS_SDK_CORE, "/httpAuthSchemes"
209+
)
207210
.write("new AwsSdkSigV4Signer()"))
208211
.build();
209212
supportedHttpAuthSchemesIndex.putHttpAuthScheme(authScheme.getSchemeId(), authScheme);
@@ -237,7 +240,10 @@ public void customizeSupportedHttpAuthSchemes(
237240
.build())
238241
.putDefaultSigner(LanguageTarget.SHARED, w -> w
239242
.addDependency(AwsDependency.AWS_SDK_CORE)
240-
.addImport("AwsSdkSigV4ASigner", null, AwsDependency.AWS_SDK_CORE)
243+
.addImportSubmodule(
244+
"AwsSdkSigV4ASigner", null,
245+
AwsDependency.AWS_SDK_CORE, "/httpAuthSchemes"
246+
)
241247
.write("new AwsSdkSigV4ASigner()"))
242248
.build();
243249
supportedHttpAuthSchemesIndex.putHttpAuthScheme(authSchemeSigV4a.getSchemeId(), authSchemeSigV4a);

0 commit comments

Comments
 (0)