Add test for list / map as structure member

Author: joewyz

smithy-trait-codegen/src/test/java/software/amazon/smithy/traitcodegen/integrations/annotations/AnnotationsTest.java

@@ -131,7 +131,7 @@ void unstableAnnotationOnEnumVariant() {
     }
 
     @Test
-    void deprecatedAnnotationOnList() {
+    void deprecatedAnnotationOnListTrait() {
         String fileContents = getFileContentsFromShapeName("DeprecatedList", true);
         String expected = "@Deprecated\n" +
                 "@SmithyGenerated\n" +
@@ -148,7 +148,7 @@ void noDeprecatedAnnotationOnListGetValues() {
     }
 
     @Test
-    void deprecatedAnnotationOnMap() {
+    void deprecatedAnnotationOnMapTrait() {
         String fileContents = getFileContentsFromShapeName("DeprecatedMap", true);
         String expected = "@Deprecated\n" +
                 "@SmithyGenerated\n" +
@@ -164,6 +164,15 @@ void noDeprecatedAnnotationOnMapGetValues() {
         assertTrue(fileContents.contains(expected));
     }
 
+    @Test
+    void deprecatedAnnotationOnListMember() {
+        String fileContents = getFileContentsFromShapeName("DeprecatedStructure", true);
+        String expected = "    @Deprecated\n" +
+                "    public Optional<Map<String, Integer>> getDeprecatedMap() {";
+        assertTrue(fileContents.contains(expected));
+    }
+
+
     private String getFileContentsFromShapeName(String className, boolean isTrait) {
         String suffix = isTrait ? "Trait" : "";
         String path = String.format("com/example/traits/%s%s.java", className, suffix);

smithy-trait-codegen/src/test/java/software/amazon/smithy/traitcodegen/integrations/javadoc/JavadocTest.java

@@ -265,6 +265,19 @@ void deprecatedAnnotationAndNoteForMapTrait() {
         assertTrue(fileContents.contains(expectedForGetter));
     }
 
+    @Test
+    void deprecatedAnnotationAndNoteForListMember() {
+        String fileContents = getFileContentsFromShapeName("DeprecatedStructure", true);
+        String expected = "    /**\n" +
+                "     * @deprecated As of yesterday. A message\n" +
+                "     */\n" +
+                "    @Deprecated\n" +
+                "    public Optional<List<Integer>> getDeprecatedList() {\n" +
+                "        return Optional.ofNullable(deprecatedList);\n" +
+                "    }";
+        assertTrue(fileContents.contains(expected));
+    }
+
     private String getFileContentsFromShapeName(String className, boolean isTrait) {
         String suffix = isTrait ? "Trait" : "";
         String path = String.format("com/example/traits/%s%s.java", className, suffix);

smithy-trait-codegen/src/test/resources/software/amazon/smithy/traitcodegen/integrations/annotations/annotations-test.smithy

@@ -20,6 +20,14 @@ structure DeprecatedStructure {
     /// Has docs in addition to deprecated
     @deprecated
     deprecatedWithDocs: String
+
+    @deprecated
+    deprecatedMap: MemberMap
+}
+
+map MemberMap {
+    key: String
+    value: Integer
 }
 
 @trait

smithy-trait-codegen/src/test/resources/software/amazon/smithy/traitcodegen/integrations/javadoc/javadoc-test.smithy

@@ -31,6 +31,13 @@ structure DeprecatedStructure {
     /// Has docs in addition to deprecated
     @deprecated(message: "A message", since: "yesterday")
     deprecatedWithDocs: String
+
+    @deprecated(message: "A message", since: "yesterday")
+    deprecatedList: MemberList
+}
+
+list MemberList {
+    member: Integer
 }
 
 @trait