Throw syntax exceptions on duplicate bindings

smithy-model/src/main/java/software/amazon/smithy/model/loader/IdlModelParser.java

@@ -542,7 +542,7 @@ private void parseStructuredShape(ShapeId id, SourceLocation location, AbstractS
     private void parseOperationStatement(ShapeId id, SourceLocation location) {
         ws();
         OperationShape.Builder builder = OperationShape.builder().id(id).source(location);
-        ObjectNode node = IdlNodeParser.parseObjectNode(this);
+        ObjectNode node = IdlNodeParser.parseObjectNode(this, id.toString());
         LoaderUtils.checkForAdditionalProperties(node, id, OPERATION_PROPERTY_NAMES, modelFile.events());
         modelFile.onShape(builder);
         optionalId(node, "input", builder::input);
@@ -553,7 +553,7 @@ private void parseOperationStatement(ShapeId id, SourceLocation location) {
     private void parseServiceStatement(ShapeId id, SourceLocation location) {
         ws();
         ServiceShape.Builder builder = new ServiceShape.Builder().id(id).source(location);
-        ObjectNode shapeNode = IdlNodeParser.parseObjectNode(this);
+        ObjectNode shapeNode = IdlNodeParser.parseObjectNode(this, id.toString());
         LoaderUtils.checkForAdditionalProperties(shapeNode, id, SERVICE_PROPERTY_NAMES, modelFile.events());
         builder.version(shapeNode.expectStringMember(VERSION_KEY).getValue());
         modelFile.onShape(builder);
@@ -580,7 +580,7 @@ private void parseResourceStatement(ShapeId id, SourceLocation location) {
         ws();
         ResourceShape.Builder builder = ResourceShape.builder().id(id).source(location);
         modelFile.onShape(builder);
-        ObjectNode shapeNode = IdlNodeParser.parseObjectNode(this);
+        ObjectNode shapeNode = IdlNodeParser.parseObjectNode(this, id.toString());
 
         LoaderUtils.checkForAdditionalProperties(shapeNode, id, RESOURCE_PROPERTY_NAMES, modelFile.events());
         optionalId(shapeNode, PUT_KEY, builder::put);

smithy-model/src/main/java/software/amazon/smithy/model/loader/IdlNodeParser.java

@@ -44,7 +44,7 @@ static Node parseNode(IdlModelParser parser) {
         char c = parser.peek();
         switch (c) {
             case '{':
-                return parseObjectNode(parser);
+                return parseObjectNode(parser, "object node");
             case '[':
                 return parseArrayNode(parser);
             case '"': {
@@ -119,7 +119,7 @@ static Node parseTextBlock(IdlModelParser parser) {
         return new StringNode(IdlTextParser.parseQuotedTextAndTextBlock(parser, true), location);
     }
 
-    static ObjectNode parseObjectNode(IdlModelParser parser) {
+    static ObjectNode parseObjectNode(IdlModelParser parser, String parent) {
         parser.increaseNestingLevel();
         SourceLocation location = parser.currentLocation();
         Map<StringNode, Node> entries = new LinkedHashMap<>();
@@ -137,7 +137,11 @@ static ObjectNode parseObjectNode(IdlModelParser parser) {
                 parser.expect(':');
                 parser.ws();
                 Node value = parseNode(parser);
-                entries.put(new StringNode(key, keyLocation), value);
+                StringNode keyNode = new StringNode(key, keyLocation);
+                Node previous = entries.put(keyNode, value);
+                if (previous != null) {
+                    throw parser.syntax("Duplicate member of " + parent + ": '" + keyNode.getValue() + '\'');
+                }
                 parser.ws();
                 if (parser.peek() == ',') {
                     parser.skip();

smithy-model/src/main/java/software/amazon/smithy/model/loader/IdlTraitParser.java

@@ -121,6 +121,8 @@ private static Node parseTraitValueBodyIdentifierOrQuotedString(
     private static ObjectNode parseStructuredTrait(IdlModelParser parser, StringNode startingKey) {
         Map<StringNode, Node> entries = new LinkedHashMap<>();
         Node firstValue = IdlNodeParser.parseNode(parser);
+        // This put call can be done safely without checking for duplicates,
+        // as it's always the first member of the trait.
         entries.put(startingKey, firstValue);
         parser.ws();
 
@@ -150,6 +152,9 @@ private static void parseTraitStructureKvp(IdlModelParser parser, Map<StringNode
         parser.ws();
         Node nextValue = IdlNodeParser.parseNode(parser);
         parser.ws();
-        entries.put(nextKey, nextValue);
+        Node previous = entries.put(nextKey, nextValue);
+        if (previous != null) {
+            throw parser.syntax("Duplicate member of trait: '" + nextKey.getValue() + '\'');
+        }
     }
 }

smithy-model/src/test/resources/software/amazon/smithy/model/errorfiles/loader/dupe-operation-binding.errors

@@ -0,0 +1 @@
+[ERROR] -: Parse error at line 5, column 23 near `, | Model

smithy-model/src/test/resources/software/amazon/smithy/model/errorfiles/loader/dupe-operation-binding.smithy

@@ -0,0 +1,8 @@
+namespace com.foo
+
+operation GetFoo {
+    input: GetFooInput,
+    input: GetFooInput,
+}
+
+structure GetFooInput {}

smithy-model/src/test/resources/software/amazon/smithy/model/errorfiles/loader/dupe-resource-binding.errors

@@ -0,0 +1 @@
+[ERROR] -: Parse error at line 8, column 22 near `, | Model

smithy-model/src/test/resources/software/amazon/smithy/model/errorfiles/loader/dupe-resource-binding.smithy

@@ -0,0 +1,11 @@
+namespace com.foo
+
+resource Foo {
+    identifiers: {
+        id: String,
+    },
+    create: createFoo,
+    create: createFoo,
+}
+
+operation createFoo {}

smithy-model/src/test/resources/software/amazon/smithy/model/errorfiles/loader/dupe-service-binding.errors

@@ -0,0 +1 @@
+[ERROR] -: Parse error at line 5, column 26 near `, | Model

smithy-model/src/test/resources/software/amazon/smithy/model/errorfiles/loader/dupe-service-binding.smithy

@@ -0,0 +1,6 @@
+namespace com.foo
+
+service Foo {
+    version: "2020-07-02",
+    version: "2020-07-02",
+}

smithy-model/src/test/resources/software/amazon/smithy/model/errorfiles/loader/dupe-trait-member-names.errors

@@ -0,0 +1 @@
+[ERROR] -: Parse error at line 5, column 19 near `, | Model

smithy-model/src/test/resources/software/amazon/smithy/model/errorfiles/loader/dupe-trait-member-names.smithy

@@ -0,0 +1,7 @@
+namespace com.foo
+
+@deprecated(
+    message: "Foo",
+    message: "Foo",
+)
+structure Foo {}

smithy-model/src/test/resources/software/amazon/smithy/model/errorfiles/loader/dupe-trait-object-keys.errors

@@ -0,0 +1 @@
+[ERROR] -: Parse error at line 6, column 21 near `, | Model

smithy-model/src/test/resources/software/amazon/smithy/model/errorfiles/loader/dupe-trait-object-keys.smithy

@@ -0,0 +1,9 @@
+namespace com.foo
+
+@enum([
+    {
+        value: "foo",
+        value: "foo",
+    },
+])
+string Foo