From 4af3afe880d56b3c2334e4c5ed700b3dacfdcca0 Mon Sep 17 00:00:00 2001 From: Richard Hernandez Date: Tue, 29 Apr 2025 19:32:15 -0700 Subject: [PATCH] Fix saving and loading of generic arg models in bundles --- .../java/aws/servicebundle/bundler/AwsServiceBundler.java | 2 +- .../java/software/amazon/smithy/java/server/ProxyService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/aws/aws-service-bundler/src/main/java/software/amazon/smithy/java/aws/servicebundle/bundler/AwsServiceBundler.java b/aws/aws-service-bundler/src/main/java/software/amazon/smithy/java/aws/servicebundle/bundler/AwsServiceBundler.java index 7135ca49a..cf73245ba 100644 --- a/aws/aws-service-bundler/src/main/java/software/amazon/smithy/java/aws/servicebundle/bundler/AwsServiceBundler.java +++ b/aws/aws-service-bundler/src/main/java/software/amazon/smithy/java/aws/servicebundle/bundler/AwsServiceBundler.java @@ -121,7 +121,7 @@ private static String loadModel(String path) { try (var reader = new BufferedReader(new InputStreamReader( Objects.requireNonNull(AwsServiceBundler.class.getResourceAsStream(path)), StandardCharsets.UTF_8))) { - return reader.lines().collect(Collectors.joining()); + return reader.lines().collect(Collectors.joining("\n")); } catch (Exception e) { throw new RuntimeException(e); } diff --git a/server/server-proxy/src/main/java/software/amazon/smithy/java/server/ProxyService.java b/server/server-proxy/src/main/java/software/amazon/smithy/java/server/ProxyService.java index 5c2a52014..b88f1658e 100644 --- a/server/server-proxy/src/main/java/software/amazon/smithy/java/server/ProxyService.java +++ b/server/server-proxy/src/main/java/software/amazon/smithy/java/server/ProxyService.java @@ -62,7 +62,7 @@ private static software.amazon.smithy.model.Model adapt(Builder builder) { var args = builder.bundle.getRequestArguments(); var model = new ModelAssembler() .addModel(builder.model) - .addModel(args.getModel().getValue()) + .addUnparsedModel("args.smithy", args.getModel().getValue()) .assemble() .unwrap(); var template = model.expectShape(ShapeId.from(args.getIdentifier()))