Fix resource properties IDL serializing order

smithy-lang · Feb 7, 2025 · afecd8a · afecd8a
1 parent 996fd94
commit afecd8a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
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
@@ -837,6 +837,11 @@ public Void resourceShape(ResourceShape shape) {
                                 entry.getValue()));
                 codeWriter.closeBlock("}");
             }
+            if (shape.hasProperties()) {
+                codeWriter.openBlock("properties: {");
+                shape.getProperties().forEach((name, shapeId) -> codeWriter.write("$L: $I", name, shapeId));
+                codeWriter.closeBlock("}");
+            }
 
             shape.getPut().ifPresent(shapeId -> codeWriter.write("put: $I", shapeId));
             shape.getCreate().ifPresent(shapeId -> codeWriter.write("create: $I", shapeId));
@@ -847,11 +852,6 @@ public Void resourceShape(ResourceShape shape) {
             codeWriter.writeOptionalIdList("operations", shape.getIntroducedOperations());
             codeWriter.writeOptionalIdList("collectionOperations", shape.getCollectionOperations());
             codeWriter.writeOptionalIdList("resources", shape.getIntroducedResources());
-            if (shape.hasProperties()) {
-                codeWriter.openBlock("properties: {");
-                shape.getProperties().forEach((name, shapeId) -> codeWriter.write("$L: $I", name, shapeId));
-                codeWriter.closeBlock("}");
-            }
             codeWriter.closeBlock("}");
             codeWriter.write("");
             return null;

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
@@ -23,6 +23,10 @@ resource MyResource {
     identifiers: {
         id: String
     }
+    properties: {
+        value: String
+        other: String
+    }
     put: ResourceOperation
     create: EmptyOperation
     read: ReadonlyResourceOperation
@@ -38,10 +42,6 @@ resource MyResource {
     resources: [
         SubResource
     ]
-    properties: {
-        value: String
-        other: String
-    }
 }
 
 resource SubResource {