fix: exclude CustomEndpoints plugin from Endpoints 2.0 services (smit…

…hy-lang#1337)

* fix: exclude CustomEndpoints plugin from Endpoints 2.0 services

* linting

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

@@ -9,6 +9,8 @@
 import static software.amazon.smithy.typescript.codegen.integration.RuntimeClientPlugin.Convention.HAS_MIDDLEWARE;
 
 import java.util.List;
+import software.amazon.smithy.model.shapes.ServiceShape;
+import software.amazon.smithy.rulesengine.traits.EndpointRuleSetTrait;
 import software.amazon.smithy.typescript.codegen.TypeScriptDependency;
 import software.amazon.smithy.utils.SmithyInternalApi;
 
@@ -25,6 +27,7 @@ public List<RuntimeClientPlugin> getClientPlugins() {
             RuntimeClientPlugin.builder()
                 .withConventions(
                     TypeScriptDependency.CONFIG_RESOLVER.dependency, "CustomEndpoints", HAS_CONFIG)
+                .servicePredicate((m, s) -> !isEndpointsV2Service(s))
                 .build(),
             RuntimeClientPlugin.builder()
                 .withConventions(TypeScriptDependency.MIDDLEWARE_RETRY.dependency, "Retry")
@@ -34,4 +37,8 @@ public List<RuntimeClientPlugin> getClientPlugins() {
                     HAS_MIDDLEWARE)
                 .build());
     }
+
+    private static boolean isEndpointsV2Service(ServiceShape serviceShape) {
+        return serviceShape.hasTrait(EndpointRuleSetTrait.class);
+    }
 }