Allow subtypes of Map for Collection elements

dagnir · dagnir · commit 0d73ac6ac775 · 2018-10-02T14:06:08.000-07:00
Related to #693.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/TypeProvider.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/TypeProvider.java
@@ -201,7 +201,7 @@ public FieldSpec asField(MemberModel memberModel, Modifier... modifiers) {
     private TypeName listParameterType(ListModel listModel) {
         MemberModel elementModel = listModel.getListMemberModel();
         TypeName listElementType = parameterType(elementModel);
-        if (elementModel.isList()) {
+        if (isContainerType(elementModel)) {
             listElementType = WildcardTypeName.subtypeOf(listElementType);
         }
         return ParameterizedTypeName.get(ClassName.get(Collection.class), listElementType);
@@ -227,4 +227,8 @@ private TypeName mapValueParameterType(MapModel mapModel) {
 
         return valueType;
     }
+
+    private static boolean isContainerType(MemberModel m) {
+        return m.isList() || m.isMap();
+    }
 }
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/alltypesrequest.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/alltypesrequest.java
@@ -757,7 +757,7 @@ public interface Builder extends JsonProtocolTestsRequest.Builder, CopyableBuild
          *        The new value for the ListOfMaps property for this object.
          * @return Returns a reference to this object so that method calls can be chained together.
          */
-        Builder listOfMaps(Collection<Map<String, String>> listOfMaps);
+        Builder listOfMaps(Collection<? extends Map<String, String>> listOfMaps);
 
         /**
          * Sets the value of the ListOfMaps property for this object.
@@ -1341,12 +1341,12 @@ public final void setListOfEnums(Collection<String> listOfEnums) {
             this.listOfEnums = ListOfEnumsCopier.copy(listOfEnums);
         }
 
-        public final Collection<Map<String, String>> getListOfMaps() {
+        public final Collection<? extends Map<String, String>> getListOfMaps() {
             return listOfMaps;
         }
 
         @Override
-        public final Builder listOfMaps(Collection<Map<String, String>> listOfMaps) {
+        public final Builder listOfMaps(Collection<? extends Map<String, String>> listOfMaps) {
             this.listOfMaps = ListOfMapStringToStringCopier.copy(listOfMaps);
             return this;
         }
@@ -1358,7 +1358,7 @@ public final Builder listOfMaps(Map<String, String>... listOfMaps) {
             return this;
         }
 
-        public final void setListOfMaps(Collection<Map<String, String>> listOfMaps) {
+        public final void setListOfMaps(Collection<? extends Map<String, String>> listOfMaps) {
             this.listOfMaps = ListOfMapStringToStringCopier.copy(listOfMaps);
         }
 
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/alltypesresponse.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/alltypesresponse.java
@@ -756,7 +756,7 @@ public interface Builder extends JsonProtocolTestsResponse.Builder, CopyableBuil
          *        The new value for the ListOfMaps property for this object.
          * @return Returns a reference to this object so that method calls can be chained together.
          */
-        Builder listOfMaps(Collection<Map<String, String>> listOfMaps);
+        Builder listOfMaps(Collection<? extends Map<String, String>> listOfMaps);
 
         /**
          * Sets the value of the ListOfMaps property for this object.
@@ -1334,12 +1334,12 @@ public final void setListOfEnums(Collection<String> listOfEnums) {
             this.listOfEnums = ListOfEnumsCopier.copy(listOfEnums);
         }
 
-        public final Collection<Map<String, String>> getListOfMaps() {
+        public final Collection<? extends Map<String, String>> getListOfMaps() {
             return listOfMaps;
         }
 
         @Override
-        public final Builder listOfMaps(Collection<Map<String, String>> listOfMaps) {
+        public final Builder listOfMaps(Collection<? extends Map<String, String>> listOfMaps) {
             this.listOfMaps = ListOfMapStringToStringCopier.copy(listOfMaps);
             return this;
         }
@@ -1351,7 +1351,7 @@ public final Builder listOfMaps(Map<String, String>... listOfMaps) {
             return this;
         }
 
-        public final void setListOfMaps(Collection<Map<String, String>> listOfMaps) {
+        public final void setListOfMaps(Collection<? extends Map<String, String>> listOfMaps) {
             this.listOfMaps = ListOfMapStringToStringCopier.copy(listOfMaps);
         }
 
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/listofmapstringtostringcopier.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/listofmapstringtostringcopier.java
@@ -12,7 +12,7 @@
 
 @Generated("software.amazon.awssdk:codegen")
 final class ListOfMapStringToStringCopier {
-    static List<Map<String, String>> copy(Collection<Map<String, String>> listOfMapStringToStringParam) {
+    static List<Map<String, String>> copy(Collection<? extends Map<String, String>> listOfMapStringToStringParam) {
         if (listOfMapStringToStringParam == null || listOfMapStringToStringParam instanceof SdkAutoConstructList) {
             return DefaultSdkAutoConstructList.getInstance();
         }
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/nonautoconstructcontainers/alltypesrequest.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/nonautoconstructcontainers/alltypesrequest.java
@@ -755,7 +755,7 @@ public interface Builder extends JsonProtocolTestsRequest.Builder, CopyableBuild
          *        The new value for the ListOfMaps property for this object.
          * @return Returns a reference to this object so that method calls can be chained together.
          */
-        Builder listOfMaps(Collection<Map<String, String>> listOfMaps);
+        Builder listOfMaps(Collection<? extends Map<String, String>> listOfMaps);
 
         /**
          * Sets the value of the ListOfMaps property for this object.
@@ -1339,12 +1339,12 @@ public final void setListOfEnums(Collection<String> listOfEnums) {
             this.listOfEnums = ListOfEnumsCopier.copy(listOfEnums);
         }
 
-        public final Collection<Map<String, String>> getListOfMaps() {
+        public final Collection<? extends Map<String, String>> getListOfMaps() {
             return listOfMaps;
         }
 
         @Override
-        public final Builder listOfMaps(Collection<Map<String, String>> listOfMaps) {
+        public final Builder listOfMaps(Collection<? extends Map<String, String>> listOfMaps) {
             this.listOfMaps = ListOfMapStringToStringCopier.copy(listOfMaps);
             return this;
         }
@@ -1356,7 +1356,7 @@ public final Builder listOfMaps(Map<String, String>... listOfMaps) {
             return this;
         }
 
-        public final void setListOfMaps(Collection<Map<String, String>> listOfMaps) {
+        public final void setListOfMaps(Collection<? extends Map<String, String>> listOfMaps) {
             this.listOfMaps = ListOfMapStringToStringCopier.copy(listOfMaps);
         }
 
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/nonautoconstructcontainers/alltypesresponse.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/nonautoconstructcontainers/alltypesresponse.java
@@ -754,7 +754,7 @@ public interface Builder extends JsonProtocolTestsResponse.Builder, CopyableBuil
          *        The new value for the ListOfMaps property for this object.
          * @return Returns a reference to this object so that method calls can be chained together.
          */
-        Builder listOfMaps(Collection<Map<String, String>> listOfMaps);
+        Builder listOfMaps(Collection<? extends Map<String, String>> listOfMaps);
 
         /**
          * Sets the value of the ListOfMaps property for this object.
@@ -1332,12 +1332,12 @@ public final void setListOfEnums(Collection<String> listOfEnums) {
             this.listOfEnums = ListOfEnumsCopier.copy(listOfEnums);
         }
 
-        public final Collection<Map<String, String>> getListOfMaps() {
+        public final Collection<? extends Map<String, String>> getListOfMaps() {
             return listOfMaps;
         }
 
         @Override
-        public final Builder listOfMaps(Collection<Map<String, String>> listOfMaps) {
+        public final Builder listOfMaps(Collection<? extends Map<String, String>> listOfMaps) {
             this.listOfMaps = ListOfMapStringToStringCopier.copy(listOfMaps);
             return this;
         }
@@ -1349,7 +1349,7 @@ public final Builder listOfMaps(Map<String, String>... listOfMaps) {
             return this;
         }
 
-        public final void setListOfMaps(Collection<Map<String, String>> listOfMaps) {
+        public final void setListOfMaps(Collection<? extends Map<String, String>> listOfMaps) {
             this.listOfMaps = ListOfMapStringToStringCopier.copy(listOfMaps);
         }
 
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/nonautoconstructcontainers/listofmapstringtostringcopier.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/nonautoconstructcontainers/listofmapstringtostringcopier.java
@@ -10,7 +10,7 @@
 
 @Generated("software.amazon.awssdk:codegen")
 final class ListOfMapStringToStringCopier {
-    static List<Map<String, String>> copy(Collection<Map<String, String>> listOfMapStringToStringParam) {
+    static List<Map<String, String>> copy(Collection<? extends Map<String, String>> listOfMapStringToStringParam) {
         if (listOfMapStringToStringParam == null) {
             return null;
         }

Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ public FieldSpec asField(MemberModel memberModel, Modifier... modifiers) {`
`201`	`201`	`private TypeName listParameterType(ListModel listModel) {`
`202`	`202`	`MemberModel elementModel = listModel.getListMemberModel();`
`203`	`203`	`TypeName listElementType = parameterType(elementModel);`
`204`		`- if (elementModel.isList()) {`
	`204`	`+ if (isContainerType(elementModel)) {`
`205`	`205`	`listElementType = WildcardTypeName.subtypeOf(listElementType);`
`206`	`206`	`}`
`207`	`207`	`return ParameterizedTypeName.get(ClassName.get(Collection.class), listElementType);`
`@@ -227,4 +227,8 @@ private TypeName mapValueParameterType(MapModel mapModel) {`
`227`	`227`
`228`	`228`	`return valueType;`
`229`	`229`	`}`
	`230`	`+`
	`231`	`+ private static boolean isContainerType(MemberModel m) {`
	`232`	`+ return m.isList() \|\| m.isMap();`
	`233`	`+ }`
`230`	`234`	`}`
Original file line number	Diff line number	Diff line change
`@@ -757,7 +757,7 @@ public interface Builder extends JsonProtocolTestsRequest.Builder, CopyableBuild`
`757`	`757`	`* The new value for the ListOfMaps property for this object.`
`758`	`758`	`* @return Returns a reference to this object so that method calls can be chained together.`
`759`	`759`	`*/`
`760`		`- Builder listOfMaps(Collection<Map<String, String>> listOfMaps);`
	`760`	`+ Builder listOfMaps(Collection<? extends Map<String, String>> listOfMaps);`
`761`	`761`
`762`	`762`	`/**`
`763`	`763`	`* Sets the value of the ListOfMaps property for this object.`
`@@ -1341,12 +1341,12 @@ public final void setListOfEnums(Collection<String> listOfEnums) {`
`1341`	`1341`	`this.listOfEnums = ListOfEnumsCopier.copy(listOfEnums);`
`1342`	`1342`	`}`
`1343`	`1343`
`1344`		`- public final Collection<Map<String, String>> getListOfMaps() {`
	`1344`	`+ public final Collection<? extends Map<String, String>> getListOfMaps() {`
`1345`	`1345`	`return listOfMaps;`
`1346`	`1346`	`}`
`1347`	`1347`
`1348`	`1348`	`@Override`
`1349`		`- public final Builder listOfMaps(Collection<Map<String, String>> listOfMaps) {`
	`1349`	`+ public final Builder listOfMaps(Collection<? extends Map<String, String>> listOfMaps) {`
`1350`	`1350`	`this.listOfMaps = ListOfMapStringToStringCopier.copy(listOfMaps);`
`1351`	`1351`	`return this;`
`1352`	`1352`	`}`
`@@ -1358,7 +1358,7 @@ public final Builder listOfMaps(Map<String, String>... listOfMaps) {`
`1358`	`1358`	`return this;`
`1359`	`1359`	`}`
`1360`	`1360`
`1361`		`- public final void setListOfMaps(Collection<Map<String, String>> listOfMaps) {`
	`1361`	`+ public final void setListOfMaps(Collection<? extends Map<String, String>> listOfMaps) {`
`1362`	`1362`	`this.listOfMaps = ListOfMapStringToStringCopier.copy(listOfMaps);`
`1363`	`1363`	`}`
`1364`	`1364`
Original file line number	Diff line number	Diff line change
`@@ -756,7 +756,7 @@ public interface Builder extends JsonProtocolTestsResponse.Builder, CopyableBuil`
`756`	`756`	`* The new value for the ListOfMaps property for this object.`
`757`	`757`	`* @return Returns a reference to this object so that method calls can be chained together.`
`758`	`758`	`*/`
`759`		`- Builder listOfMaps(Collection<Map<String, String>> listOfMaps);`
	`759`	`+ Builder listOfMaps(Collection<? extends Map<String, String>> listOfMaps);`
`760`	`760`
`761`	`761`	`/**`
`762`	`762`	`* Sets the value of the ListOfMaps property for this object.`
`@@ -1334,12 +1334,12 @@ public final void setListOfEnums(Collection<String> listOfEnums) {`
`1334`	`1334`	`this.listOfEnums = ListOfEnumsCopier.copy(listOfEnums);`
`1335`	`1335`	`}`
`1336`	`1336`
`1337`		`- public final Collection<Map<String, String>> getListOfMaps() {`
	`1337`	`+ public final Collection<? extends Map<String, String>> getListOfMaps() {`
`1338`	`1338`	`return listOfMaps;`
`1339`	`1339`	`}`
`1340`	`1340`
`1341`	`1341`	`@Override`
`1342`		`- public final Builder listOfMaps(Collection<Map<String, String>> listOfMaps) {`
	`1342`	`+ public final Builder listOfMaps(Collection<? extends Map<String, String>> listOfMaps) {`
`1343`	`1343`	`this.listOfMaps = ListOfMapStringToStringCopier.copy(listOfMaps);`
`1344`	`1344`	`return this;`
`1345`	`1345`	`}`
`@@ -1351,7 +1351,7 @@ public final Builder listOfMaps(Map<String, String>... listOfMaps) {`
`1351`	`1351`	`return this;`
`1352`	`1352`	`}`
`1353`	`1353`
`1354`		`- public final void setListOfMaps(Collection<Map<String, String>> listOfMaps) {`
	`1354`	`+ public final void setListOfMaps(Collection<? extends Map<String, String>> listOfMaps) {`
`1355`	`1355`	`this.listOfMaps = ListOfMapStringToStringCopier.copy(listOfMaps);`
`1356`	`1356`	`}`
`1357`	`1357`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`
`13`	`13`	`@Generated("software.amazon.awssdk:codegen")`
`14`	`14`	`final class ListOfMapStringToStringCopier {`
`15`		`- static List<Map<String, String>> copy(Collection<Map<String, String>> listOfMapStringToStringParam) {`
	`15`	`+ static List<Map<String, String>> copy(Collection<? extends Map<String, String>> listOfMapStringToStringParam) {`
`16`	`16`	`if (listOfMapStringToStringParam == null \|\| listOfMapStringToStringParam instanceof SdkAutoConstructList) {`
`17`	`17`	`return DefaultSdkAutoConstructList.getInstance();`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -755,7 +755,7 @@ public interface Builder extends JsonProtocolTestsRequest.Builder, CopyableBuild`
`755`	`755`	`* The new value for the ListOfMaps property for this object.`
`756`	`756`	`* @return Returns a reference to this object so that method calls can be chained together.`
`757`	`757`	`*/`
`758`		`- Builder listOfMaps(Collection<Map<String, String>> listOfMaps);`
	`758`	`+ Builder listOfMaps(Collection<? extends Map<String, String>> listOfMaps);`
`759`	`759`
`760`	`760`	`/**`
`761`	`761`	`* Sets the value of the ListOfMaps property for this object.`
`@@ -1339,12 +1339,12 @@ public final void setListOfEnums(Collection<String> listOfEnums) {`
`1339`	`1339`	`this.listOfEnums = ListOfEnumsCopier.copy(listOfEnums);`
`1340`	`1340`	`}`
`1341`	`1341`
`1342`		`- public final Collection<Map<String, String>> getListOfMaps() {`
	`1342`	`+ public final Collection<? extends Map<String, String>> getListOfMaps() {`
`1343`	`1343`	`return listOfMaps;`
`1344`	`1344`	`}`
`1345`	`1345`
`1346`	`1346`	`@Override`
`1347`		`- public final Builder listOfMaps(Collection<Map<String, String>> listOfMaps) {`
	`1347`	`+ public final Builder listOfMaps(Collection<? extends Map<String, String>> listOfMaps) {`
`1348`	`1348`	`this.listOfMaps = ListOfMapStringToStringCopier.copy(listOfMaps);`
`1349`	`1349`	`return this;`
`1350`	`1350`	`}`
`@@ -1356,7 +1356,7 @@ public final Builder listOfMaps(Map<String, String>... listOfMaps) {`
`1356`	`1356`	`return this;`
`1357`	`1357`	`}`
`1358`	`1358`
`1359`		`- public final void setListOfMaps(Collection<Map<String, String>> listOfMaps) {`
	`1359`	`+ public final void setListOfMaps(Collection<? extends Map<String, String>> listOfMaps) {`
`1360`	`1360`	`this.listOfMaps = ListOfMapStringToStringCopier.copy(listOfMaps);`
`1361`	`1361`	`}`
`1362`	`1362`
Original file line number	Diff line number	Diff line change
`@@ -754,7 +754,7 @@ public interface Builder extends JsonProtocolTestsResponse.Builder, CopyableBuil`
`754`	`754`	`* The new value for the ListOfMaps property for this object.`
`755`	`755`	`* @return Returns a reference to this object so that method calls can be chained together.`
`756`	`756`	`*/`
`757`		`- Builder listOfMaps(Collection<Map<String, String>> listOfMaps);`
	`757`	`+ Builder listOfMaps(Collection<? extends Map<String, String>> listOfMaps);`
`758`	`758`
`759`	`759`	`/**`
`760`	`760`	`* Sets the value of the ListOfMaps property for this object.`
`@@ -1332,12 +1332,12 @@ public final void setListOfEnums(Collection<String> listOfEnums) {`
`1332`	`1332`	`this.listOfEnums = ListOfEnumsCopier.copy(listOfEnums);`
`1333`	`1333`	`}`
`1334`	`1334`
`1335`		`- public final Collection<Map<String, String>> getListOfMaps() {`
	`1335`	`+ public final Collection<? extends Map<String, String>> getListOfMaps() {`
`1336`	`1336`	`return listOfMaps;`
`1337`	`1337`	`}`
`1338`	`1338`
`1339`	`1339`	`@Override`
`1340`		`- public final Builder listOfMaps(Collection<Map<String, String>> listOfMaps) {`
	`1340`	`+ public final Builder listOfMaps(Collection<? extends Map<String, String>> listOfMaps) {`
`1341`	`1341`	`this.listOfMaps = ListOfMapStringToStringCopier.copy(listOfMaps);`
`1342`	`1342`	`return this;`
`1343`	`1343`	`}`
`@@ -1349,7 +1349,7 @@ public final Builder listOfMaps(Map<String, String>... listOfMaps) {`
`1349`	`1349`	`return this;`
`1350`	`1350`	`}`
`1351`	`1351`
`1352`		`- public final void setListOfMaps(Collection<Map<String, String>> listOfMaps) {`
	`1352`	`+ public final void setListOfMaps(Collection<? extends Map<String, String>> listOfMaps) {`
`1353`	`1353`	`this.listOfMaps = ListOfMapStringToStringCopier.copy(listOfMaps);`
`1354`	`1354`	`}`
`1355`	`1355`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`
`11`	`11`	`@Generated("software.amazon.awssdk:codegen")`
`12`	`12`	`final class ListOfMapStringToStringCopier {`
`13`		`- static List<Map<String, String>> copy(Collection<Map<String, String>> listOfMapStringToStringParam) {`
	`13`	`+ static List<Map<String, String>> copy(Collection<? extends Map<String, String>> listOfMapStringToStringParam) {`
`14`	`14`	`if (listOfMapStringToStringParam == null) {`
`15`	`15`	`return null;`
`16`	`16`	`}`