smithy-lang · adwsingh · Mar 10, 2026
diff --git a/aws/aws-mcp-types/build.gradle.kts b/aws/aws-mcp-types/build.gradle.kts
@@ -8,13 +8,13 @@ extra["displayName"] = "Smithy :: Java :: AWS MCP types"
 extra["moduleName"] = "software.amazon.smithy.java.awsmcp.types"
 
 dependencies {
-    smithyBuild(project(":codegen:plugins:types-codegen"))
+    smithyBuild(project(":codegen:codegen-plugin"))
     api(project(":core"))
     api(libs.smithy.model)
 }
 
 afterEvaluate {
-    val typePath = smithy.getPluginProjectionPath(smithy.sourceProjection.get(), "java-type-codegen")
+    val typePath = smithy.getPluginProjectionPath(smithy.sourceProjection.get(), "java-codegen")
     sourceSets {
         main {
             java {

diff --git a/aws/aws-mcp-types/smithy-build.json b/aws/aws-mcp-types/smithy-build.json
@@ -1,9 +1,10 @@
 {
   "version": "1.0",
   "plugins": {
-    "java-type-codegen": {
+    "java-codegen": {
       "namespace": "software.amazon.smithy.awsmcp",
-      "headerFile": "license.txt"
+      "headerFile": "license.txt",
+      "modes": ["types"]
     }
   }
 }
diff --git a/buildSrc/src/main/kotlin/smithy-java.codegen-plugin-conventions.gradle.kts b/buildSrc/src/main/kotlin/smithy-java.codegen-plugin-conventions.gradle.kts
@@ -13,9 +13,9 @@ dependencies {
     implementation(project(":core"))
     implementation(project(":logging"))
 
-    // Avoid circular dependency in codegen core
-    if (project.name != "codegen-core") {
-        api(project(":codegen:codegen-core"))
+    // Avoid circular dependency in codegen plugin
+    if (project.name != "codegen-plugin") {
+        api(project(":codegen:codegen-plugin"))
     }
 }
 

diff --git a/client/client-api/build.gradle.kts b/client/client-api/build.gradle.kts
@@ -0,0 +1,18 @@
+plugins {
+    id("smithy-java.module-conventions")
+    id("smithy-java.publishing-conventions")
+}
+
+description = "This module provides the core client API types"
+
+extra["displayName"] = "Smithy :: Java :: Client :: API"
+extra["moduleName"] = "software.amazon.smithy.java.client.core"
+
+dependencies {
+    api(project(":context"))
+    api(project(":core"))
+    api(project(":auth-api"))
+    api(project(":client:client-auth-api"))
+    api(project(":retries-api"))
+    implementation(project(":logging"))
+}
diff --git a/...hy/java/client/core/AutoClientPlugin.java → ...hy/java/client/core/AutoClientPlugin.java b/...hy/java/client/core/AutoClientPlugin.java → ...hy/java/client/core/AutoClientPlugin.java
diff --git a/.../smithy/java/client/core/CallContext.java → .../smithy/java/client/core/CallContext.java b/.../smithy/java/client/core/CallContext.java → .../smithy/java/client/core/CallContext.java
diff --git a/...mazon/smithy/java/client/core/Client.java → ...mazon/smithy/java/client/core/Client.java b/...mazon/smithy/java/client/core/Client.java → ...mazon/smithy/java/client/core/Client.java
diff --git a/...n/smithy/java/client/core/ClientCall.java → ...n/smithy/java/client/core/ClientCall.java b/...n/smithy/java/client/core/ClientCall.java → ...n/smithy/java/client/core/ClientCall.java
diff --git a/...smithy/java/client/core/ClientConfig.java → ...smithy/java/client/core/ClientConfig.java b/...smithy/java/client/core/ClientConfig.java → ...smithy/java/client/core/ClientConfig.java
diff --git a/...mithy/java/client/core/ClientContext.java → ...mithy/java/client/core/ClientContext.java b/...mithy/java/client/core/ClientContext.java → ...mithy/java/client/core/ClientContext.java
diff --git a/...ithy/java/client/core/ClientPipeline.java → ...ithy/java/client/core/ClientPipeline.java b/...ithy/java/client/core/ClientPipeline.java → ...ithy/java/client/core/ClientPipeline.java
diff --git a/...smithy/java/client/core/ClientPlugin.java → ...smithy/java/client/core/ClientPlugin.java b/...smithy/java/client/core/ClientPlugin.java → ...smithy/java/client/core/ClientPlugin.java
diff --git a/...ithy/java/client/core/ClientProtocol.java → ...ithy/java/client/core/ClientProtocol.java b/...ithy/java/client/core/ClientProtocol.java → ...ithy/java/client/core/ClientProtocol.java
diff --git a/...va/client/core/ClientProtocolFactory.java → ...va/client/core/ClientProtocolFactory.java b/...va/client/core/ClientProtocolFactory.java → ...va/client/core/ClientProtocolFactory.java
diff --git a/...mithy/java/client/core/ClientSetting.java → ...mithy/java/client/core/ClientSetting.java b/...mithy/java/client/core/ClientSetting.java → ...mithy/java/client/core/ClientSetting.java
diff --git a/...thy/java/client/core/ClientTransport.java → ...thy/java/client/core/ClientTransport.java b/...thy/java/client/core/ClientTransport.java → ...thy/java/client/core/ClientTransport.java
diff --git a/...a/client/core/ClientTransportFactory.java → ...a/client/core/ClientTransportFactory.java b/...a/client/core/ClientTransportFactory.java → ...a/client/core/ClientTransportFactory.java
diff --git a/...on/smithy/java/client/core/FeatureId.java → ...on/smithy/java/client/core/FeatureId.java b/...on/smithy/java/client/core/FeatureId.java → ...on/smithy/java/client/core/FeatureId.java
diff --git a/...thy/java/client/core/MessageExchange.java → ...thy/java/client/core/MessageExchange.java b/...thy/java/client/core/MessageExchange.java → ...thy/java/client/core/MessageExchange.java
diff --git a/...hy/java/client/core/ProtocolSettings.java → ...hy/java/client/core/ProtocolSettings.java b/...hy/java/client/core/ProtocolSettings.java → ...hy/java/client/core/ProtocolSettings.java
diff --git a/...va/client/core/RequestOverrideConfig.java → ...va/client/core/RequestOverrideConfig.java b/...va/client/core/RequestOverrideConfig.java → ...va/client/core/RequestOverrideConfig.java
diff --git a/...y/java/client/core/endpoint/Endpoint.java → ...y/java/client/core/endpoint/Endpoint.java b/...y/java/client/core/endpoint/Endpoint.java → ...y/java/client/core/endpoint/Endpoint.java
diff --git a/...ent/core/endpoint/EndpointAuthScheme.java → ...ent/core/endpoint/EndpointAuthScheme.java b/...ent/core/endpoint/EndpointAuthScheme.java → ...ent/core/endpoint/EndpointAuthScheme.java
diff --git a/...core/endpoint/EndpointAuthSchemeImpl.java → ...core/endpoint/EndpointAuthSchemeImpl.java b/...core/endpoint/EndpointAuthSchemeImpl.java → ...core/endpoint/EndpointAuthSchemeImpl.java
diff --git a/...client/core/endpoint/EndpointContext.java → ...client/core/endpoint/EndpointContext.java b/...client/core/endpoint/EndpointContext.java → ...client/core/endpoint/EndpointContext.java
diff --git a/...va/client/core/endpoint/EndpointImpl.java → ...va/client/core/endpoint/EndpointImpl.java b/...va/client/core/endpoint/EndpointImpl.java → ...va/client/core/endpoint/EndpointImpl.java
diff --git a/...lient/core/endpoint/EndpointResolver.java → ...lient/core/endpoint/EndpointResolver.java b/...lient/core/endpoint/EndpointResolver.java → ...lient/core/endpoint/EndpointResolver.java
diff --git a/...core/endpoint/EndpointResolverParams.java → ...core/endpoint/EndpointResolverParams.java b/...core/endpoint/EndpointResolverParams.java → ...core/endpoint/EndpointResolverParams.java
diff --git a/...e/endpoint/HostLabelEndpointResolver.java → ...e/endpoint/HostLabelEndpointResolver.java b/...e/endpoint/HostLabelEndpointResolver.java → ...e/endpoint/HostLabelEndpointResolver.java
diff --git a/...nt/core/endpoint/HostLabelSerializer.java → ...nt/core/endpoint/HostLabelSerializer.java b/...nt/core/endpoint/HostLabelSerializer.java → ...nt/core/endpoint/HostLabelSerializer.java
diff --git a/...ent/core/endpoint/StaticHostResolver.java → ...ent/core/endpoint/StaticHostResolver.java b/...ent/core/endpoint/StaticHostResolver.java → ...ent/core/endpoint/StaticHostResolver.java
diff --git a/...t/core/error/ConnectTimeoutException.java → ...t/core/error/ConnectTimeoutException.java b/...t/core/error/ConnectTimeoutException.java → ...t/core/error/ConnectTimeoutException.java
diff --git a/...or/ConnectionAcquireTimeoutException.java → ...or/ConnectionAcquireTimeoutException.java b/...or/ConnectionAcquireTimeoutException.java → ...or/ConnectionAcquireTimeoutException.java
diff --git a/...core/error/ConnectionClosedException.java → ...core/error/ConnectionClosedException.java b/...core/error/ConnectionClosedException.java → ...core/error/ConnectionClosedException.java
diff --git a/.../java/client/core/error/TlsException.java → .../java/client/core/error/TlsException.java b/.../java/client/core/error/TlsException.java → .../java/client/core/error/TlsException.java
diff --git a/...client/core/error/TransportException.java → ...client/core/error/TransportException.java b/...client/core/error/TransportException.java → ...client/core/error/TransportException.java
diff --git a/...ore/error/TransportProtocolException.java → ...ore/error/TransportProtocolException.java b/...ore/error/TransportProtocolException.java → ...ore/error/TransportProtocolException.java
diff --git a/.../core/error/TransportSocketException.java → .../core/error/TransportSocketException.java b/.../core/error/TransportSocketException.java → .../core/error/TransportSocketException.java
diff --git a/...nt/core/error/TransportSocketTimeout.java → ...nt/core/error/TransportSocketTimeout.java b/...nt/core/error/TransportSocketTimeout.java → ...nt/core/error/TransportSocketTimeout.java
diff --git a/...va/client/core/interceptors/CallHook.java → ...va/client/core/interceptors/CallHook.java b/...va/client/core/interceptors/CallHook.java → ...va/client/core/interceptors/CallHook.java
diff --git a/.../core/interceptors/ClientInterceptor.java → .../core/interceptors/ClientInterceptor.java b/.../core/interceptors/ClientInterceptor.java → .../core/interceptors/ClientInterceptor.java
diff --git a/.../interceptors/ClientInterceptorChain.java → .../interceptors/ClientInterceptorChain.java b/.../interceptors/ClientInterceptorChain.java → .../interceptors/ClientInterceptorChain.java
diff --git a/...a/client/core/interceptors/InputHook.java → ...a/client/core/interceptors/InputHook.java b/...a/client/core/interceptors/InputHook.java → ...a/client/core/interceptors/InputHook.java
diff --git a/.../client/core/interceptors/OutputHook.java → .../client/core/interceptors/OutputHook.java b/.../client/core/interceptors/OutputHook.java → .../client/core/interceptors/OutputHook.java
diff --git a/...client/core/interceptors/RequestHook.java → ...client/core/interceptors/RequestHook.java b/...client/core/interceptors/RequestHook.java → ...client/core/interceptors/RequestHook.java
diff --git a/...lient/core/interceptors/ResponseHook.java → ...lient/core/interceptors/ResponseHook.java b/...lient/core/interceptors/ResponseHook.java → ...lient/core/interceptors/ResponseHook.java
diff --git a/...smithy/java/client/core/package-info.java → ...smithy/java/client/core/package-info.java b/...smithy/java/client/core/package-info.java → ...smithy/java/client/core/package-info.java
diff --git a/...core/pagination/DefaultSyncPaginator.java → ...core/pagination/DefaultSyncPaginator.java b/...core/pagination/DefaultSyncPaginator.java → ...core/pagination/DefaultSyncPaginator.java
diff --git a/...ore/pagination/PaginationInputSetter.java → ...ore/pagination/PaginationInputSetter.java b/...ore/pagination/PaginationInputSetter.java → ...ore/pagination/PaginationInputSetter.java
diff --git a/.../pagination/PaginationTokenExtractor.java → .../pagination/PaginationTokenExtractor.java b/.../pagination/PaginationTokenExtractor.java → .../pagination/PaginationTokenExtractor.java
diff --git a/...ava/client/core/pagination/Paginator.java → ...ava/client/core/pagination/Paginator.java b/...ava/client/core/pagination/Paginator.java → ...ava/client/core/pagination/Paginator.java
diff --git a/...nt/core/pagination/PaginatorSettings.java → ...nt/core/pagination/PaginatorSettings.java b/...nt/core/pagination/PaginatorSettings.java → ...nt/core/pagination/PaginatorSettings.java
diff --git a/...re/plugins/ApplyModelRetryInfoPlugin.java → ...re/plugins/ApplyModelRetryInfoPlugin.java b/...re/plugins/ApplyModelRetryInfoPlugin.java → ...re/plugins/ApplyModelRetryInfoPlugin.java
diff --git a/.../java/client/core/plugins/AutoPlugin.java → .../java/client/core/plugins/AutoPlugin.java b/.../java/client/core/plugins/AutoPlugin.java → .../java/client/core/plugins/AutoPlugin.java
diff --git a/...va/client/core/plugins/DefaultPlugin.java → ...va/client/core/plugins/DefaultPlugin.java b/...va/client/core/plugins/DefaultPlugin.java → ...va/client/core/plugins/DefaultPlugin.java
diff --git a/...core/plugins/DiscoverTransportPlugin.java → ...core/plugins/DiscoverTransportPlugin.java b/...core/plugins/DiscoverTransportPlugin.java → ...core/plugins/DiscoverTransportPlugin.java
diff --git a/...t/core/plugins/ExceptionMapperPlugin.java → ...t/core/plugins/ExceptionMapperPlugin.java b/...t/core/plugins/ExceptionMapperPlugin.java → ...t/core/plugins/ExceptionMapperPlugin.java
diff --git a/...plugins/InjectIdempotencyTokenPlugin.java → ...plugins/InjectIdempotencyTokenPlugin.java b/...plugins/InjectIdempotencyTokenPlugin.java → ...plugins/InjectIdempotencyTokenPlugin.java
diff --git a/...va/client/core/settings/ClockSetting.java → ...va/client/core/settings/ClockSetting.java b/...va/client/core/settings/ClockSetting.java → ...va/client/core/settings/ClockSetting.java
diff --git a/client/client-core/build.gradle.kts b/client/client-core/build.gradle.kts
@@ -8,11 +8,7 @@ extra["displayName"] = "Smithy :: Java :: Client :: Core"
 extra["moduleName"] = "software.amazon.smithy.java.client.core"
 
 dependencies {
-    api(project(":context"))
-    api(project(":core"))
-    api(project(":auth-api"))
-    api(project(":client:client-auth-api"))
-    api(project(":retries-api"))
+    api(project(":client:client-api"))
     api(project(":framework-errors"))
     implementation(project(":logging"))
 

diff --git a/client/client-rulesengine/build.gradle.kts b/client/client-rulesengine/build.gradle.kts
@@ -8,7 +8,7 @@ extra["displayName"] = "Smithy :: Java :: Client :: Endpoint Rules"
 extra["moduleName"] = "software.amazon.smithy.java.client.endpointrules"
 
 dependencies {
-    api(project(":client:client-core"))
+    api(project(":client:client-api"))
     api(project(":jmespath"))
     api(libs.smithy.rules)
     implementation(project(":logging"))

diff --git a/client/client-waiters/build.gradle.kts b/client/client-waiters/build.gradle.kts
@@ -11,5 +11,5 @@ dependencies {
     api(libs.smithy.waiters)
     implementation(project(":jmespath"))
     implementation(project(":logging"))
-    implementation(project(":client:client-core"))
+    implementation(project(":client:client-api"))
 }
diff --git a/codegen/codegen-core/README.md b/codegen/codegen-core/README.md
diff --git a/codegen/codegen-core/build.gradle.kts b/codegen/codegen-core/build.gradle.kts
diff --git a/codegen/codegen-core/src/it/java/software/amazon/smithy/java/codegen/test/BuilderTest.java b/codegen/codegen-core/src/it/java/software/amazon/smithy/java/codegen/test/BuilderTest.java
diff --git a/...-core/src/it/java/software/amazon/smithy/java/codegen/test/ClientErrorCorrectionTest.java b/...-core/src/it/java/software/amazon/smithy/java/codegen/test/ClientErrorCorrectionTest.java
diff --git a/codegen/codegen-core/src/it/java/software/amazon/smithy/java/codegen/test/DefaultsTest.java b/codegen/codegen-core/src/it/java/software/amazon/smithy/java/codegen/test/DefaultsTest.java
diff --git a/...en-core/src/it/java/software/amazon/smithy/java/codegen/test/EffectiveAuthSchemeTest.java b/...en-core/src/it/java/software/amazon/smithy/java/codegen/test/EffectiveAuthSchemeTest.java
diff --git a/codegen/codegen-core/src/it/java/software/amazon/smithy/java/codegen/test/EnumTest.java b/codegen/codegen-core/src/it/java/software/amazon/smithy/java/codegen/test/EnumTest.java