smithy-lang · JordonPhillips · Feb 27, 2020 · Feb 21, 2020 · Feb 21, 2020 · Feb 24, 2020
diff --git a/smithy-model/src/main/java/software/amazon/smithy/model/shapes/SmithyIdlModelSerializer.java b/smithy-model/src/main/java/software/amazon/smithy/model/shapes/SmithyIdlModelSerializer.java
diff --git a/...model/src/test/java/software/amazon/smithy/model/shapes/SmithyIdlModelSerializerTest.java b/...model/src/test/java/software/amazon/smithy/model/shapes/SmithyIdlModelSerializerTest.java
@@ -0,0 +1,54 @@
+package software.amazon.smithy.model.shapes;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Map;
+import java.util.stream.Stream;
+import org.junit.jupiter.api.DynamicTest;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestFactory;
+import software.amazon.smithy.model.Model;
+import software.amazon.smithy.utils.IoUtils;
+
+public class SmithyIdlModelSerializerTest {
+    @TestFactory
+    public Stream<DynamicTest> generateTests() throws IOException {
+        return Files.list(Paths.get(
+                SmithyIdlModelSerializer.class.getResource("idl-serialization/cases").getPath()))
+                .map(path -> DynamicTest.dynamicTest(path.getFileName().toString(), () -> testConversion(path)));
+    }
+
+    public void testConversion(Path path) {
+        Model model = Model.assembler().addImport(path).assemble().unwrap();
+        SmithyIdlModelSerializer serializer = SmithyIdlModelSerializer.builder().build();
+        Map<Path, String> serialized = serializer.serialize(model);
+
+        if (serialized.size() != 1) {
+            throw new RuntimeException("Exactly one smithy file should be output for generated tests.");
+        }
+
+        String serializedString = serialized.entrySet().iterator().next().getValue();
+        assertThat(serializedString, equalTo(IoUtils.readUtf8File(path)));
+    }
+
+    @Test
+    public void multipleNamespacesGenerateMultipleFiles() {
+        Model model = Model.assembler()
+                .addImport(getClass().getResource("idl-serialization/multiple-namespaces/input.json"))
+                .assemble()
+                .unwrap();
+        SmithyIdlModelSerializer serializer = SmithyIdlModelSerializer.builder().build();
+        Map<Path, String> serialized = serializer.serialize(model);
+
+        Path outputDir = Paths.get(getClass().getResource("idl-serialization/multiple-namespaces/output").getFile());
+        serialized.forEach((path, generated) -> {
+            Path expectedPath = outputDir.resolve(path);
+            assertThat(generated, equalTo(IoUtils.readUtf8File(expectedPath)));
+        });
+    }
+}
diff --git a/...sources/software/amazon/smithy/model/shapes/idl-serialization/cases/boolean-traits.smithy b/...sources/software/amazon/smithy/model/shapes/idl-serialization/cases/boolean-traits.smithy
@@ -0,0 +1,11 @@
+$version: "0.5.0"
+
+namespace ns.foo
+
+/// This trait isn't an annotation trait since it doesn't extend BooleanTrait
+@trait
+boolean FalseBooleanTrait
+
+@FalseBooleanTrait(true)
+@private
+string Foo
diff --git a/...rces/software/amazon/smithy/model/shapes/idl-serialization/cases/collection-traits.smithy b/...rces/software/amazon/smithy/model/shapes/idl-serialization/cases/collection-traits.smithy
@@ -0,0 +1,27 @@
+$version: "0.5.0"
+
+namespace ns.foo
+
+@trait
+list ListTrait {
+    member: String,
+}
+
+@trait
+set SetTrait {
+    member: String,
+}
+
+@ListTrait([])
+@SetTrait([])
+string Bar
+
+@ListTrait([
+    "first",
+    "second",
+])
+@SetTrait([
+    "first",
+    "second",
+])
+string Foo
diff --git a/...ources/software/amazon/smithy/model/shapes/idl-serialization/cases/document-traits.smithy b/...ources/software/amazon/smithy/model/shapes/idl-serialization/cases/document-traits.smithy
@@ -0,0 +1,28 @@
+$version: "0.5.0"
+
+namespace ns.foo
+
+@trait
+document DocumentTrait
+
+@DocumentTrait(false)
+string Boolean
+
+@DocumentTrait([
+    "foo",
+])
+string List
+
+@DocumentTrait(
+    foo: "bar",
+)
+string Map
+
+@DocumentTrait(null)
+string Null
+
+@DocumentTrait(123)
+string Number
+
+@DocumentTrait("foo")
+string String
diff --git a/...es/software/amazon/smithy/model/shapes/idl-serialization/cases/documentation-trait.smithy b/...es/software/amazon/smithy/model/shapes/idl-serialization/cases/documentation-trait.smithy
@@ -0,0 +1,7 @@
+$version: "0.5.0"
+
+namespace ns.foo
+
+/// Documentation comments are used.
+/// $ is escaped
+string Foo
diff --git a/...est/resources/software/amazon/smithy/model/shapes/idl-serialization/cases/metadata.smithy b/...est/resources/software/amazon/smithy/model/shapes/idl-serialization/cases/metadata.smithy
@@ -0,0 +1,20 @@
+$version: "0.5.0"
+
+metadata example.array = [
+    10,
+    true,
+    "hello",
+]
+metadata example.bool1 = true
+metadata example.bool2 = false
+metadata example.null = null
+metadata example.number = 10
+metadata example.object = {
+    foo: "baz",
+}
+metadata example.string = "hello there"
+metadata "key must be quoted" = true
+
+namespace ns.foo
+
+string Placeholder
diff --git a/...esources/software/amazon/smithy/model/shapes/idl-serialization/cases/number-traits.smithy b/...esources/software/amazon/smithy/model/shapes/idl-serialization/cases/number-traits.smithy
@@ -0,0 +1,37 @@
+$version: "0.5.0"
+
+namespace ns.foo
+
+@trait
+bigDecimal BigDecimalTrait
+
+@trait
+bigInteger BigIntegerTrait
+
+@trait
+byte ByteTrait
+
+@trait
+double DoubleTrait
+
+@trait
+float FloatTrait
+
+@trait
+integer IntegerTrait
+
+@trait
+long LongTrait
+
+@trait
+short ShortTrait
+
+@BigDecimalTrait(3.14)
+@BigIntegerTrait(123)
+@ByteTrait(123)
+@DoubleTrait(1.234)
+@FloatTrait(-1.234)
+@IntegerTrait(-123)
+@LongTrait(321)
+@ShortTrait(12321)
+string Foo
diff --git a/...esources/software/amazon/smithy/model/shapes/idl-serialization/cases/object-traits.smithy b/...esources/software/amazon/smithy/model/shapes/idl-serialization/cases/object-traits.smithy
@@ -0,0 +1,66 @@
+$version: "0.5.0"
+
+namespace ns.foo
+
+@trait
+map MapTrait {
+    key: String,
+    value: String,
+}
+
+@trait
+structure StructureTrait {
+    collectionMember: StringList,
+    nestedMember: NestedMember,
+    shapeIdMember: ShapeId,
+    staticMember: String,
+}
+
+@trait
+union UnionTrait {
+    boolean: Boolean,
+    string: String,
+}
+
+structure NestedMember {
+    shapeIds: ShapeIdList,
+}
+
+list ShapeIdList {
+    member: ShapeId,
+}
+
+list StringList {
+    member: String,
+}
+
+@MapTrait
+@StructureTrait
+string EmptyBody
+
+@MapTrait(
+    bar: "baz",
+    foo: "bar",
+    "must be quoted": "bam",
+)
+@StructureTrait(
+    collectionMember: [
+        "foo",
+        "bar",
+    ],
+    nestedMember: {
+        shapeIds: [
+            String,
+            EmptyBody,
+        ],
+    },
+    shapeIdMember: UnionTrait,
+    staticMember: "Foo",
+)
+@UnionTrait(
+    boolean: false,
+)
+string NonEmptyBody
+
+@idRef
+string ShapeId
diff --git a/...mazon/smithy/model/shapes/idl-serialization/cases/optional-namespaces-are-stripped.smithy b/...mazon/smithy/model/shapes/idl-serialization/cases/optional-namespaces-are-stripped.smithy
@@ -0,0 +1,11 @@
+$version: "0.5.0"
+
+namespace ns.foo
+
+structure Structure {
+    localWithConflict: String,
+    prelude: Blob,
+    preludeWithConflict: smithy.api#String,
+}
+
+string String
diff --git a/...sources/software/amazon/smithy/model/shapes/idl-serialization/cases/service-shapes.smithy b/...sources/software/amazon/smithy/model/shapes/idl-serialization/cases/service-shapes.smithy
@@ -0,0 +1,75 @@
+$version: "0.5.0"
+
+namespace ns.foo
+
+service EmptyService {
+    version: "2020-02-18",
+}
+
+service MyService {
+    version: "2020-02-18",
+    operations: [
+        MyOperation,
+    ],
+    resources: [
+        MyResource,
+    ],
+}
+
+resource EmptyResource {}
+
+resource MyResource {
+    identifiers: {
+        id: String,
+    },
+    put: ResourceOperation,
+    create: ResourceOperation,
+    read: ReadonlyResourceOperation,
+    update: ResourceOperation,
+    delete: ResourceOperation,
+    list: ReadonlyResourceOperation,
+    operations: [
+        ResourceOperation,
+    ],
+    collectionOperations: [
+        ResourceOperation,
+    ],
+    resources: [
+        SubResource,
+    ],
+}
+
+resource SubResource {
+    identifiers: {
+        id: String,
+    },
+}
+
+operation EmptyOperation {}
+
+operation MyOperation {
+    input: InputOutput,
+    output: InputOutput,
+    errors: [
+        Error,
+    ],
+}
+
+@readonly
+operation ReadonlyResourceOperation {
+    input: ResourceOperationInput,
+}
+
+@idempotent
+operation ResourceOperation {
+    input: ResourceOperationInput,
+}
+
+@error("client")
+structure Error {}
+
+structure InputOutput {}
+
+structure ResourceOperationInput {
+    id: String,
+}
diff --git a/...esources/software/amazon/smithy/model/shapes/idl-serialization/cases/simple-shapes.smithy b/...esources/software/amazon/smithy/model/shapes/idl-serialization/cases/simple-shapes.smithy
@@ -0,0 +1,52 @@
+$version: "0.5.0"
+
+namespace ns.foo
+
+union Union {
+    byte: Byte,
+    double: Double,
+}
+
+structure StructureWithMembers {
+    a: String,
+    b: String,
+}
+
+structure StructureWithoutMembers {}
+
+list List {
+    member: String,
+}
+
+set Set {
+    member: String,
+}
+
+map Map {
+    key: String,
+    value: String,
+}
+
+bigDecimal BigDecimal
+
+bigInteger BigInteger
+
+blob Blob
+
+boolean Boolean
+
+byte Byte
+
+document Document
+
+double Double
+
+float Float
+
+integer Integer
+
+long Long
+
+short Short
+
+string String