Skip to content

Commit 4b2c97f

Browse files
AllanZhengYPAllanZhengYP
committed
chore: remove stream hasher customization, rename md5 customization to sqs customization
1 parent 363db12 commit 4b2c97f

File tree

5 files changed

+31
-173
lines changed

5 files changed

+31
-173
lines changed

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

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -100,24 +100,6 @@ && testServiceId(s, "Route 53"))
100100
.operationPredicate((m, s, o) -> testInputContainsMember(m, o, ROUTE_53_ID_MEMBERS)
101101
&& testServiceId(s, "Route 53"))
102102
.build(),
103-
RuntimeClientPlugin.builder()
104-
.withConventions(AwsDependency.SQS_MIDDLEWARE.dependency, "SendMessage",
105-
HAS_MIDDLEWARE)
106-
.operationPredicate((m, s, o) -> o.getId().getName(s).equals("SendMessage")
107-
&& testServiceId(s, "SQS"))
108-
.build(),
109-
RuntimeClientPlugin.builder()
110-
.withConventions(AwsDependency.SQS_MIDDLEWARE.dependency, "SendMessageBatch",
111-
HAS_MIDDLEWARE)
112-
.operationPredicate((m, s, o) -> o.getId().getName(s).equals("SendMessageBatch")
113-
&& testServiceId(s, "SQS"))
114-
.build(),
115-
RuntimeClientPlugin.builder()
116-
.withConventions(AwsDependency.SQS_MIDDLEWARE.dependency, "ReceiveMessage",
117-
HAS_MIDDLEWARE)
118-
.operationPredicate((m, s, o) -> o.getId().getName(s).equals("ReceiveMessage")
119-
&& testServiceId(s, "SQS"))
120-
.build(),
121103
RuntimeClientPlugin.builder()
122104
.withConventions(AwsDependency.MIDDLEWARE_HOST_HEADER.dependency, "HostHeader")
123105
.build(),

‎codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddMd5HashDependency.java renamed to ‎codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddSqsDependency.java

Lines changed: 30 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,11 @@
2020
import java.util.Collections;
2121
import java.util.List;
2222
import java.util.Map;
23-
import java.util.Set;
2423
import java.util.function.Consumer;
2524
import software.amazon.smithy.aws.traits.ServiceTrait;
2625
import software.amazon.smithy.codegen.core.SymbolProvider;
2726
import software.amazon.smithy.model.Model;
2827
import software.amazon.smithy.model.shapes.ServiceShape;
29-
import software.amazon.smithy.model.shapes.Shape;
3028
import software.amazon.smithy.typescript.codegen.LanguageTarget;
3129
import software.amazon.smithy.typescript.codegen.TypeScriptDependency;
3230
import software.amazon.smithy.typescript.codegen.TypeScriptSettings;
@@ -35,38 +33,34 @@
3533
import software.amazon.smithy.typescript.codegen.integration.TypeScriptIntegration;
3634
import software.amazon.smithy.utils.ListUtils;
3735
import software.amazon.smithy.utils.MapUtils;
38-
import software.amazon.smithy.utils.SetUtils;
3936
import software.amazon.smithy.utils.SmithyInternalApi;
4037

4138
/**
42-
* Adds Md5Hash if needed.
39+
* Adds SQS customization
4340
*/
4441
@SmithyInternalApi
45-
public class AddMd5HashDependency implements TypeScriptIntegration {
46-
private static final Set<String> SERVICE_IDS = SetUtils.of("S3", "SQS", "S3 Control");
47-
private static final Set<String> S3_CONTROL_MD5_OPERATIONS = SetUtils.of(
48-
"CreateBucket",
49-
"CreateMultiRegionAccessPoint",
50-
"DeleteMultiRegionAccessPoint",
51-
"DescribeMultiRegionAccessPointOperation",
52-
"GetMultiRegionAccessPoint",
53-
"GetMultiRegionAccessPointPolicy",
54-
"GetMultiRegionAccessPointPolicyStatus",
55-
"ListMultiRegionAccessPoints",
56-
"PutBucketLifecycleConfiguration",
57-
"PutBucketPolicy",
58-
"PutBucketTagging",
59-
"PutMultiRegionAccessPointPolicy"
60-
);
61-
private static final Set<String> S3_MD5_OPERATIONS = SetUtils.of(
62-
"DeleteObjects",
63-
"PutBucketCors",
64-
"PutBucketLifecycle",
65-
"PutBucketLifecycleConfiguration",
66-
"PutBucketPolicy",
67-
"PutBucketTagging",
68-
"PutBucketReplication"
69-
);
42+
public class AddSqsDependency implements TypeScriptIntegration {
43+
44+
@Override
45+
public List<RuntimeClientPlugin> getClientPlugins() {
46+
return ListUtils.of(
47+
RuntimeClientPlugin.builder()
48+
.withConventions(AwsDependency.SQS_MIDDLEWARE.dependency, "SendMessage",
49+
HAS_MIDDLEWARE)
50+
.operationPredicate((m, s, o) -> o.getId().getName(s).equals("SendMessage") && isSQS(s))
51+
.build(),
52+
RuntimeClientPlugin.builder()
53+
.withConventions(AwsDependency.SQS_MIDDLEWARE.dependency, "SendMessageBatch",
54+
HAS_MIDDLEWARE)
55+
.operationPredicate((m, s, o) -> o.getId().getName(s).equals("SendMessageBatch") && isSQS(s))
56+
.build(),
57+
RuntimeClientPlugin.builder()
58+
.withConventions(AwsDependency.SQS_MIDDLEWARE.dependency, "ReceiveMessage",
59+
HAS_MIDDLEWARE)
60+
.operationPredicate((m, s, o) -> o.getId().getName(s).equals("ReceiveMessage") && isSQS(s))
61+
.build()
62+
);
63+
}
7064

7165
@Override
7266
public void addConfigInterfaceFields(
@@ -75,7 +69,7 @@ public void addConfigInterfaceFields(
7569
SymbolProvider symbolProvider,
7670
TypeScriptWriter writer
7771
) {
78-
if (!needsMd5Dep(settings.getService(model))) {
72+
if (!isSQS(settings.getService(model))) {
7973
return;
8074
}
8175

@@ -93,7 +87,7 @@ public Map<String, Consumer<TypeScriptWriter>> getRuntimeConfigWriters(
9387
SymbolProvider symbolProvider,
9488
LanguageTarget target
9589
) {
96-
if (!needsMd5Dep(settings.getService(model))) {
90+
if (!isSQS(settings.getService(model))) {
9791
return Collections.emptyMap();
9892
}
9993

@@ -107,35 +101,16 @@ public Map<String, Consumer<TypeScriptWriter>> getRuntimeConfigWriters(
107101
});
108102
case BROWSER:
109103
return MapUtils.of("md5", writer -> {
110-
writer.addDependency(AwsDependency.MD5_BROWSER);
111-
writer.addImport("Md5", "Md5", AwsDependency.MD5_BROWSER.packageName);
104+
writer.addDependency(TypeScriptDependency.MD5_BROWSER);
105+
writer.addImport("Md5", "Md5", TypeScriptDependency.MD5_BROWSER.packageName);
112106
writer.write("md5: Md5,");
113107
});
114108
default:
115109
return Collections.emptyMap();
116110
}
117111
}
118112

119-
@Override
120-
public List<RuntimeClientPlugin> getClientPlugins() {
121-
return ListUtils.of(
122-
RuntimeClientPlugin.builder()
123-
.withConventions(AwsDependency.BODY_CHECKSUM.dependency, "ApplyMd5BodyChecksum",
124-
HAS_MIDDLEWARE)
125-
.operationPredicate((m, s, o) -> S3_MD5_OPERATIONS.contains(o.getId().getName(s))
126-
&& testServiceId(s, "S3")
127-
|| S3_CONTROL_MD5_OPERATIONS.contains(o.getId().getName(s))
128-
&& testServiceId(s, "S3 Control"))
129-
.build()
130-
);
131-
}
132-
133-
private static boolean needsMd5Dep(ServiceShape service) {
134-
String serviceId = service.getTrait(ServiceTrait.class).map(ServiceTrait::getSdkId).orElse("");
135-
return SERVICE_IDS.contains(serviceId);
136-
}
137-
138-
private static boolean testServiceId(Shape serviceShape, String serviceId) {
139-
return serviceShape.getTrait(ServiceTrait.class).map(ServiceTrait::getSdkId).orElse("").equals(serviceId);
113+
private static boolean isSQS(ServiceShape service) {
114+
return service.getTrait(ServiceTrait.class).map(ServiceTrait::getSdkId).orElse("").equals("SQS");
140115
}
141-
}
116+
}

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

Lines changed: 0 additions & 94 deletions
This file was deleted.

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,9 @@ public enum AwsDependency implements SymbolDependencyContainer {
4242
SSEC_MIDDLEWARE(NORMAL_DEPENDENCY, "@aws-sdk/middleware-ssec", "3.15.0"),
4343
RDS_MIDDLEWARE(NORMAL_DEPENDENCY, "@aws-sdk/middleware-sdk-rds", "3.15.0"),
4444
LOCATION_CONSTRAINT(NORMAL_DEPENDENCY, "@aws-sdk/middleware-location-constraint", "3.15.0"),
45-
MD5_BROWSER(NORMAL_DEPENDENCY, "@aws-sdk/md5-js", "3.15.0"),
46-
STREAM_HASHER_NODE(NORMAL_DEPENDENCY, "@aws-sdk/hash-stream-node", "3.15.0"),
47-
STREAM_HASHER_BROWSER(NORMAL_DEPENDENCY, "@aws-sdk/hash-blob-browser", "3.15.0"),
4845
ROUTE53_MIDDLEWARE(NORMAL_DEPENDENCY, "@aws-sdk/middleware-sdk-route53", "3.15.0"),
4946
EC2_MIDDLEWARE(NORMAL_DEPENDENCY, "@aws-sdk/middleware-sdk-ec2", "3.15.0"),
5047
BUCKET_ENDPOINT_MIDDLEWARE(NORMAL_DEPENDENCY, "@aws-sdk/middleware-bucket-endpoint", "3.15.0"),
51-
BODY_CHECKSUM(NORMAL_DEPENDENCY, "@aws-sdk/middleware-apply-body-checksum", "3.15.0"),
5248
MIDDLEWARE_HOST_HEADER(NORMAL_DEPENDENCY, "@aws-sdk/middleware-host-header", "3.15.0"),
5349
SQS_MIDDLEWARE(NORMAL_DEPENDENCY, "@aws-sdk/middleware-sdk-sqs", "3.15.0"),
5450
BODY_CHECKSUM_GENERATOR_BROWSER(NORMAL_DEPENDENCY, "@aws-sdk/body-checksum-browser", "3.15.0"),

‎codegen/smithy-aws-typescript-codegen/src/main/resources/META-INF/services/software.amazon.smithy.typescript.codegen.integration.TypeScriptIntegration

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ software.amazon.smithy.aws.typescript.codegen.AddProtocols
55
software.amazon.smithy.aws.typescript.codegen.AwsEndpointGeneratorIntegration
66
software.amazon.smithy.aws.typescript.codegen.AwsServiceIdIntegration
77
software.amazon.smithy.aws.typescript.codegen.AwsPackageFixturesGeneratorIntegration
8-
software.amazon.smithy.aws.typescript.codegen.AddMd5HashDependency
9-
software.amazon.smithy.aws.typescript.codegen.AddStreamHasherDependency
8+
software.amazon.smithy.aws.typescript.codegen.AddSqsDependency
109
software.amazon.smithy.aws.typescript.codegen.AddBodyChecksumGeneratorDependency
1110
software.amazon.smithy.aws.typescript.codegen.AddS3Config
1211
software.amazon.smithy.aws.typescript.codegen.AddS3ControlDependency

0 commit comments

Comments
 (0)