feat: use serviceId for all plugins

aws · Dec 4, 2019 · ca7934e · ca7934e
1 parent 65c11d1
commit ca7934e
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/...odegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddBuiltinPlugins.java b/...odegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddBuiltinPlugins.java
@@ -58,17 +58,17 @@ public List<RuntimeClientPlugin> getClientPlugins() {
                 RuntimeClientPlugin.builder()
                         .withConventions("@aws-sdk/middleware-sdk-api-gateway", "^0.1.0-preview.5",
                                         "AcceptsHeader", HAS_MIDDLEWARE)
-                        .servicePredicate((m, s) -> s.getId().getName().equals("BackplaneControlService"))
+                        .servicePredicate((m, s) -> testServiceId(s, "API Gatewas"))
                         .build(),
                 RuntimeClientPlugin.builder()
                         .withConventions("@aws-sdk/middleware-sdk-s3", "^0.1.0-preview.2",
                                         "validateBucketNameMiddleware", HAS_MIDDLEWARE)
-                        .servicePredicate((m, s) -> s.getId().getName().equals("AmazonS3"))
+                        .servicePredicate((m, s) -> testServiceId(s, "S3"))
                         .build(),
                 RuntimeClientPlugin.builder()
                         .withConventions("@aws-sdk/middleware-expect-continue", "^0.1.0-preview.5",
                                         "AddExpectContinue", HAS_MIDDLEWARE)
-                        .servicePredicate((m, s) -> s.getId().getName().equals("AmazonS3"))
+                        .servicePredicate((m, s) -> testServiceId(s, "S3"))
                         .build(),
                 RuntimeClientPlugin.builder()
                         .withConventions("@aws-sdk/middleware-sdk-glacier", "^0.1.0-preview.7",