Avoid smithyBuild not being up-to-date incorrectly and use plugin everywhere

adwsingh · adwsingh · commit e19d5a202fc0 · 2026-06-16T12:45:29.000-07:00
diff --git a/benchmarks/serde-benchmarks/build.gradle.kts b/benchmarks/serde-benchmarks/build.gradle.kts
@@ -2,17 +2,22 @@ plugins {
     id("smithy-java.java-conventions")
     id("com.gradleup.shadow")
     id("smithy-java.jmh-conventions")
-    id("software.amazon.smithy.gradle.smithy-base")
+    id("software.amazon.smithy.java.gradle.smithy-java")
 }
 
 description = "Serde (serialization/deserialization) microbenchmarks for smithy-java codecs."
 
-// Not published. No `smithy-java.module-conventions`, no publishing, no BOM entry.
+smithyJava {
+    projections.addAll(
+        "aws-json-rpc-1-0-client",
+        "aws-query-client",
+        "rest-json-client",
+        "rest-xml-client",
+        "rpc-v2-cbor-client",
+    )
+}
 
 // Benchmarks intentionally target JDK 25 (the rest of smithy-java targets 21).
-// Performance measurements should reflect the latest JIT/runtime improvements
-// available to consumers; the runtime deps were compiled for 21 but run fine
-// on a newer JVM.
 java {
     toolchain {
         languageVersion = JavaLanguageVersion.of(25)
@@ -24,33 +29,18 @@ tasks.withType<JavaCompile>().configureEach {
 }
 
 dependencies {
-    // Smithy traits needed at build time (smithy-build) and at runtime (when
-    // BenchmarkTestCases loads the model). The jmh configuration extends
-    // implementation, so these are available to both.
     implementation(libs.smithy.model)
     implementation(libs.smithy.aws.traits)
     implementation(libs.smithy.protocol.traits)
     implementation(libs.smithy.protocol.test.traits)
     implementation(libs.smithy.utils)
 
-    // The Smithy Java codegen plugin produces typed shape classes plus
-    // ApiOperation classes per service (see `smithy-build.json`). The
-    // client-core dep is required because the generated client classes
-    // reference it.
-    smithyBuild(project(":codegen:codegen-plugin"))
-    smithyBuild(project(":client:client-core"))
-
-    // smithy-java runtime stack — what we are benchmarking.
-    jmh(project(":core"))
     jmh(project(":io"))
     jmh(project(":logging"))
     jmh(project(":codecs:json-codec", configuration = "shadow"))
     jmh(project(":codecs:cbor-codec"))
     jmh(project(":codecs:xml-codec"))
 
-    // Client protocols — every benchmark drives the corresponding
-    // ClientProtocol#createRequest / #deserializeResponse, mirroring the
-    // reference implementation's protocol-level entry points.
     jmh(project(":client:client-core"))
     jmh(project(":client:client-http"))
     jmh(project(":client:client-http-binding"))
@@ -60,7 +50,6 @@ dependencies {
     jmh(project(":aws:client:aws-client-restjson"))
     jmh(project(":aws:client:aws-client-restxml"))
 
-    // Protocol test document for converting test case params into typed shapes.
     jmh(project(":protocol-test-harness"))
 
     // Dynamic-client path: build the ApiOperation + input from the runtime
@@ -69,20 +58,14 @@ dependencies {
     jmh(project(":dynamic-schemas"))
 }
 
-// Smithy benchmark model files (tagged @httpRequestTests / @httpResponseTests
-// with the `serde-benchmark` tag).
-//
-// At runtime BenchmarkContext loads the model via
-// `Model.assembler().discoverModels()`, which walks `META-INF/smithy/manifest`
-// resources on the classpath.
 abstract class GenerateSmithyManifest : DefaultTask() {
     @get:InputDirectory
     abstract val sourceDir: DirectoryProperty
 
     @get:OutputDirectory
     abstract val outputDir: DirectoryProperty
 
-    @org.gradle.api.tasks.TaskAction
+    @TaskAction
     fun run() {
         val outRoot = outputDir.get().asFile
         val smithyDir = outRoot.resolve("META-INF/smithy")
@@ -109,50 +92,14 @@ val generateSmithyManifest by tasks.registering(GenerateSmithyManifest::class) {
     outputDir.set(layout.buildDirectory.dir("generated-resources/smithy-manifest"))
 }
 
-// Wire each codegen projection's output into the jmh source set. There are
-// five projections (one per service); each emits Java source under
-// `build/smithyprojections/<project>/<projection>/java-codegen/java` into a
-// distinct package so same-named typed shapes from different protocols don't
-// collide.
-val codegenProjections =
-    listOf(
-        "aws-json-rpc-1-0-client",
-        "aws-query-client",
-        "rest-json-client",
-        "rest-xml-client",
-        "rpc-v2-cbor-client",
-    )
-
-afterEvaluate {
-    val projectionPaths =
-        codegenProjections.map { name ->
-            smithy.getPluginProjectionPath(name, "java-codegen").get()
-        }
-    sourceSets.named("jmh") {
-        java {
-            projectionPaths.forEach { srcDir("$it/java") }
-        }
-        resources {
-            projectionPaths.forEach { srcDir("$it/resources") }
-            srcDir(generateSmithyManifest)
-        }
+sourceSets.named("jmh") {
+    resources {
+        srcDir(generateSmithyManifest)
     }
 }
 
 tasks.named("processJmhResources") {
     dependsOn(generateSmithyManifest)
-    dependsOn("smithyBuild")
-}
-
-// Multiple codegen projections each register META-INF/services/...SchemaIndex
-// (and other SPI files). Both should be on the runtime classpath; tell
-// processJmhResources to keep both entries by concatenating.
-tasks.named<Copy>("processJmhResources") {
-    duplicatesStrategy = DuplicatesStrategy.INCLUDE
-}
-
-tasks.named("compileJmhJava") {
-    dependsOn("smithyBuild")
 }
 
 // Test case:  -Pjmh.testCaseId=rpcv2Cbor_PutItemRequest_BinaryData_S
@@ -181,23 +128,11 @@ jmh {
     resultsFile = layout.buildDirectory.file("results/jmh/results.json")
 }
 
-// With shadow applied before jmh, jmhJar is a ShadowJar. Configure
-// mergeServiceFiles() so duplicate META-INF/services/ entries from
-// multiple codegen projections are concatenated rather than overwritten.
 tasks.jmhJar {
     mergeServiceFiles()
     append("META-INF/smithy/manifest")
 }
 
-// Run the cross-language result converter. Reads the JMH JSON written by the
-// `jmh` task and writes a JSON + Markdown pair conforming to the shared
-// benchmark output schema. OS, instance type (via EC2 IMDS), and smithy-java
-// version are detected at runtime.
-//
-//   ./gradlew :benchmarks:serde-benchmarks:convertJmhResults
-//
-// Optional properties:
-//   -PoutputPrefix=<path>   prefix for the output files (default: build/results/jmh/output)
 tasks.register<JavaExec>("convertJmhResults") {
     group = "benchmarks"
     description = "Convert JMH JSON output to the cross-language serde benchmark schema."
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -25,6 +25,14 @@ val smithyJavaVersion = project.file("VERSION").readText().replace(System.lineSe
 allprojects {
     group = "software.amazon.smithy.java"
     version = smithyJavaVersion
+
+    configurations.all {
+        resolutionStrategy.dependencySubstitution {
+            rootProject.allprojects.forEach {
+                substitute(module("${it.group}:${it.name}")).using(project(it.path))
+            }
+        }
+    }
 }
 println("Smithy-Java version: '${smithyJavaVersion}'")
 
diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts
@@ -1,16 +1,7 @@
 
-// Substitute any maven module dependencies with and project dependencies
 subprojects {
     group = "software.amazon.smithy.java.example"
 
-    configurations.all {
-        resolutionStrategy.dependencySubstitution {
-            rootProject.allprojects.forEach {
-                substitute(module("${it.group}:${it.name}")).using(project(it.path))
-            }
-        }
-    }
-
     plugins.withId("java") {
         the<JavaPluginExtension>().toolchain {
             languageVersion.set(JavaLanguageVersion.of(21))
diff --git a/examples/end-to-end/build.gradle.kts b/examples/end-to-end/build.gradle.kts
@@ -16,7 +16,6 @@ dependencies {
 
     // Client dependencies
     implementation("software.amazon.smithy.java:aws-client-restjson:$smithyJavaVersion")
-    implementation("software.amazon.smithy.java:client-core:$smithyJavaVersion")
 
     // Test dependencies
     testImplementation("org.junit.jupiter:junit-jupiter:6.0.3")
diff --git a/gradle-plugin/README.md b/gradle-plugin/README.md
@@ -197,6 +197,21 @@ When set, these override whatever is in `smithy-build.json` for dependency resol
 
 When empty (default), modes are read from `smithy-build.json` automatically.
 
+### `projections`
+
+When your `smithy-build.json` uses named projections (instead of or in addition to the
+default source projection), list them here so the plugin wires each projection's
+`java-codegen` output into the main source set:
+
+```kotlin
+smithyJava {
+    projections.addAll("rest-json-client", "rpc-v2-cbor-client")
+}
+```
+
+When empty (default), the plugin uses the source projection. Service files from multiple
+projections are merged automatically.
+
 ### `generatedPluginOutputs`
 
 When your `smithy-build.json` has plugins beyond `java-codegen` that produce Java source
@@ -217,9 +232,8 @@ When `true` (default), the plugin automatically adds the correct Smithy Java run
 dependencies based on the active modes. The configuration used depends on which Java plugin
 you apply and the codegen mode:
 
-- **`java-library`**: types/client dependencies (`core`, `framework-errors`, `client-core`)
-  are added to `api`, making them transitively available to consumers. Server dependencies
-  (`server-api`) are added to `implementation` since servers are typically not re-exported.
+- **`java-library`**: all runtime dependencies are added to `api` unless the mode is
+  server-only (no types or client), in which case `implementation` is used.
 - **`java` / `application`**: all runtime dependencies are added to `implementation`.
 
 Set to `false` when you need full control over dependency versions or want to use project
diff --git a/gradle-plugin/src/main/java/software/amazon/smithy/java/gradle/SmithyBuildModesValueSource.java b/gradle-plugin/src/main/java/software/amazon/smithy/java/gradle/SmithyBuildModesValueSource.java
@@ -9,6 +9,7 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.util.HashSet;
+import java.util.Locale;
 import java.util.Set;
 import org.gradle.api.provider.SetProperty;
 import org.gradle.api.provider.ValueSource;
@@ -35,28 +36,42 @@ public interface Params extends ValueSourceParameters {
 
     @Override
     public Set<String> obtain() {
+        Set<String> allModes = new HashSet<>();
         for (File config : getParameters().getSmithyBuildConfigs().get()) {
             if (!config.exists()) {
                 continue;
             }
             try {
                 String content = Files.readString(config.toPath());
                 ObjectNode root = Node.parseJsonWithComments(content).expectObjectNode();
-                return root.getObjectMember("plugins")
+
+                root.getObjectMember("plugins")
                         .flatMap(plugins -> plugins.getObjectMember(JAVA_CODEGEN_PLUGIN_NAME))
                         .flatMap(codegen -> codegen.getArrayMember("modes"))
                         .map(SmithyBuildModesValueSource::extractModes)
-                        .orElse(Set.of("types"));
+                        .ifPresent(allModes::addAll);
+                root.getObjectMember("projections").ifPresent(projections -> {
+                    for (Node value : projections.getMembers().values()) {
+                        value.expectObjectNode()
+                                .getObjectMember("plugins")
+                                .flatMap(plugins -> plugins.getObjectMember(JAVA_CODEGEN_PLUGIN_NAME))
+                                .flatMap(codegen -> codegen.getArrayMember("modes"))
+                                .map(SmithyBuildModesValueSource::extractModes)
+                                .ifPresent(allModes::addAll);
+                    }
+                });
             } catch (IOException ignored) {
             }
         }
-        return Set.of("types");
+        return allModes.isEmpty() ? Set.of("types") : allModes;
     }
 
     private static Set<String> extractModes(ArrayNode modesArray) {
         Set<String> modes = new HashSet<>();
         for (Node element : modesArray.getElements()) {
-            element.asStringNode().map(StringNode::getValue).ifPresent(modes::add);
+            element.asStringNode()
+                    .map(s -> s.getValue().toLowerCase(Locale.ENGLISH))
+                    .ifPresent(modes::add);
         }
         return modes;
     }
diff --git a/gradle-plugin/src/main/java/software/amazon/smithy/java/gradle/SmithyJavaExtension.java b/gradle-plugin/src/main/java/software/amazon/smithy/java/gradle/SmithyJavaExtension.java
@@ -28,6 +28,7 @@ public abstract class SmithyJavaExtension {
     public SmithyJavaExtension() {
         getAutoAddDependencies().convention(true);
         getModes().convention(Collections.emptySet());
+        getProjections().convention(Collections.emptyList());
         getGeneratedPluginOutputs().convention(Collections.emptyList());
         getMergeServiceFiles().convention(true);
     }
@@ -39,13 +40,14 @@ public SmithyJavaExtension() {
      * <ul>
      *     <li>Always: {@code codegen-plugin} to smithyBuild; {@code core} and
      *     {@code framework-errors} to api/implementation</li>
-     *     <li>Client mode: {@code client-core} to api/implementation</li>
-     *     <li>Server mode: {@code server-api} to implementation</li>
+     *     <li>Client mode: {@code client-core} to smithyBuild and api/implementation</li>
+     *     <li>Server mode: {@code server-api} to smithyBuild and api/implementation</li>
      * </ul>
      *
-     * <p>When {@code java-library} is applied, types/client dependencies use {@code api}
-     * and server dependencies use {@code implementation}. When only {@code java} or
-     * {@code application} is applied, all dependencies use {@code implementation}.
+     * <p>When {@code java-library} is applied, all runtime dependencies use {@code api}
+     * unless the mode is server-only, in which case {@code implementation} is used.
+     * When only {@code java} or {@code application} is applied, all dependencies use
+     * {@code implementation}.
      *
      * <p>Set to {@code false} to manage all dependencies manually.
      *
@@ -73,6 +75,26 @@ public SmithyJavaExtension() {
      */
     public abstract SetProperty<String> getModes();
 
+    /**
+     * Explicit list of projection names whose {@code java-codegen} output should be
+     * wired into the main source set. When non-empty, these are used instead of
+     * the default source projection.
+     *
+     * <p>This is useful for multi-projection builds where each projection generates
+     * code for a different service or protocol:
+     * <pre>{@code
+     * smithyJava {
+     *     projections.addAll("rest-json-client", "rpc-v2-cbor-client")
+     * }
+     * }</pre>
+     *
+     * <p>When empty (default), the plugin uses the single source projection from
+     * the {@code smithy} extension.
+     *
+     * @return list of projection names to wire
+     */
+    public abstract ListProperty<String> getProjections();
+
     /**
      * Additional Smithy build plugin names (as declared in {@code smithy-build.json})
      * whose generated output directories should be wired into the Java source set.
@@ -87,10 +109,11 @@ public SmithyJavaExtension() {
     public abstract ListProperty<String> getGeneratedPluginOutputs();
 
     /**
-     * Whether to automatically merge {@code META-INF/services} files when
-     * {@link #getGeneratedPluginOutputs()} is non-empty. Defaults to {@code true}.
+     * Whether to automatically merge {@code META-INF/services} files when multiple
+     * projections or {@link #getGeneratedPluginOutputs()} are configured. Defaults to
+     * {@code true}.
      *
-     * <p>When multiple Smithy build plugins produce service provider files, they
+     * <p>When multiple projections or plugins produce service provider files, they
      * may conflict. This option enables a merge task that combines them.
      *
      * @return property controlling service file merging
diff --git a/gradle-plugin/src/main/java/software/amazon/smithy/java/gradle/SmithyJavaPlugin.java b/gradle-plugin/src/main/java/software/amazon/smithy/java/gradle/SmithyJavaPlugin.java
diff --git a/gradle-plugin/src/main/java/software/amazon/smithy/java/gradle/tasks/MergeServiceFilesTask.java b/gradle-plugin/src/main/java/software/amazon/smithy/java/gradle/tasks/MergeServiceFilesTask.java
diff --git a/mcp/mcp-schemas/build.gradle.kts b/mcp/mcp-schemas/build.gradle.kts
