From 0a51a3d13e2054698a9524b720153a9b46fe4fe8 Mon Sep 17 00:00:00 2001 From: Steven Yuan Date: Tue, 2 Jul 2024 04:27:23 -0700 Subject: [PATCH] feat(codegen): add set of builtin plugins --- .../codegen/integration}/AddBuiltinPlugins.java | 16 ++++++++-------- ...ipt.codegen.integration.TypeScriptIntegration | 1 + ...ipt.codegen.integration.TypeScriptIntegration | 1 - 3 files changed, 9 insertions(+), 9 deletions(-) rename {smithy-typescript-ssdk-codegen-test-utils/src/main/java/software/amazon/smithy/typescript/ssdk/codegen/test/utils => smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/integration}/AddBuiltinPlugins.java (78%) diff --git a/smithy-typescript-ssdk-codegen-test-utils/src/main/java/software/amazon/smithy/typescript/ssdk/codegen/test/utils/AddBuiltinPlugins.java b/smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/integration/AddBuiltinPlugins.java similarity index 78% rename from smithy-typescript-ssdk-codegen-test-utils/src/main/java/software/amazon/smithy/typescript/ssdk/codegen/test/utils/AddBuiltinPlugins.java rename to smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/integration/AddBuiltinPlugins.java index a61dbf2b783..3f3ce13f1d7 100644 --- a/smithy-typescript-ssdk-codegen-test-utils/src/main/java/software/amazon/smithy/typescript/ssdk/codegen/test/utils/AddBuiltinPlugins.java +++ b/smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/integration/AddBuiltinPlugins.java @@ -1,26 +1,27 @@ -package software.amazon.smithy.typescript.ssdk.codegen.test.utils; +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + +package software.amazon.smithy.typescript.codegen.integration; import static software.amazon.smithy.typescript.codegen.integration.RuntimeClientPlugin.Convention.HAS_CONFIG; import static software.amazon.smithy.typescript.codegen.integration.RuntimeClientPlugin.Convention.HAS_MIDDLEWARE; import java.util.List; import software.amazon.smithy.typescript.codegen.TypeScriptDependency; -import software.amazon.smithy.typescript.codegen.integration.RuntimeClientPlugin; -import software.amazon.smithy.typescript.codegen.integration.TypeScriptIntegration; -import software.amazon.smithy.utils.ListUtils; import software.amazon.smithy.utils.SmithyInternalApi; /** - * Adds built-in plugins. + * Adds all built-in runtime client plugins to clients. */ @SmithyInternalApi public class AddBuiltinPlugins implements TypeScriptIntegration { - @Override public List getClientPlugins() { // Note that order is significant because configurations might // rely on previously resolved values. - return ListUtils.of( + return List.of( RuntimeClientPlugin.builder() .withConventions( TypeScriptDependency.CONFIG_RESOLVER.dependency, "CustomEndpoints", HAS_CONFIG) @@ -34,4 +35,3 @@ public List getClientPlugins() { .build()); } } - \ No newline at end of file diff --git a/smithy-typescript-codegen/src/main/resources/META-INF/services/software.amazon.smithy.typescript.codegen.integration.TypeScriptIntegration b/smithy-typescript-codegen/src/main/resources/META-INF/services/software.amazon.smithy.typescript.codegen.integration.TypeScriptIntegration index 5bbd45c4fdc..d1d0cf3904f 100644 --- a/smithy-typescript-codegen/src/main/resources/META-INF/services/software.amazon.smithy.typescript.codegen.integration.TypeScriptIntegration +++ b/smithy-typescript-codegen/src/main/resources/META-INF/services/software.amazon.smithy.typescript.codegen.integration.TypeScriptIntegration @@ -1,3 +1,4 @@ +software.amazon.smithy.typescript.codegen.integration.AddBuiltinPlugins software.amazon.smithy.typescript.codegen.integration.AddClientRuntimeConfig software.amazon.smithy.typescript.codegen.integration.AddEventStreamDependency software.amazon.smithy.typescript.codegen.integration.AddChecksumRequiredDependency diff --git a/smithy-typescript-ssdk-codegen-test-utils/src/main/resources/META-INF/services/software.amazon.smithy.typescript.codegen.integration.TypeScriptIntegration b/smithy-typescript-ssdk-codegen-test-utils/src/main/resources/META-INF/services/software.amazon.smithy.typescript.codegen.integration.TypeScriptIntegration index 3bfe4fdfed0..ac9c21fa612 100644 --- a/smithy-typescript-ssdk-codegen-test-utils/src/main/resources/META-INF/services/software.amazon.smithy.typescript.codegen.integration.TypeScriptIntegration +++ b/smithy-typescript-ssdk-codegen-test-utils/src/main/resources/META-INF/services/software.amazon.smithy.typescript.codegen.integration.TypeScriptIntegration @@ -1,2 +1 @@ -software.amazon.smithy.typescript.ssdk.codegen.test.utils.AddBuiltinPlugins software.amazon.smithy.typescript.ssdk.codegen.test.utils.AddProtocols