diff --git a/.changes/next-release/bugfix-AWSSDKforJavav2-a60f3ed.json b/.changes/next-release/bugfix-AWSSDKforJavav2-a60f3ed.json new file mode 100644 index 000000000000..77d72c8df553 --- /dev/null +++ b/.changes/next-release/bugfix-AWSSDKforJavav2-a60f3ed.json @@ -0,0 +1,6 @@ +{ + "category": "AWS SDK for Java v2", + "contributor": "", + "type": "bugfix", + "description": "Fixed an issue where a bean-based marshallers for request and response models would fail for fluent setters that happened to start with \"set\", like \"settings\"." +} diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/AbstractMemberSetters.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/AbstractMemberSetters.java index f34e5a310f87..11bc144b4dc2 100644 --- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/AbstractMemberSetters.java +++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/AbstractMemberSetters.java @@ -22,6 +22,7 @@ import com.squareup.javapoet.MethodSpec; import com.squareup.javapoet.ParameterSpec; import com.squareup.javapoet.TypeName; +import java.beans.Transient; import java.util.Optional; import java.util.stream.Collectors; import javax.lang.model.element.Modifier; @@ -84,6 +85,7 @@ protected MethodSpec.Builder fluentSetterBuilder(String methodName, ParameterSpe return MethodSpec.methodBuilder(methodName) .addParameter(setterParam) .addAnnotation(Override.class) + .addAnnotation(Transient.class) .returns(returnType) .addModifiers(Modifier.PUBLIC, Modifier.FINAL); } diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/ModelBuilderSpecs.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/ModelBuilderSpecs.java index d4bc7ce4d6a5..80d487668767 100644 --- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/ModelBuilderSpecs.java +++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/ModelBuilderSpecs.java @@ -216,8 +216,8 @@ private List accessors() { shapeModel.getNonStreamingMembers() .forEach(m -> { accessors.add(checkDeprecated(m, accessorsFactory.beanStyleGetter(m))); - accessors.addAll(checkDeprecated(m, accessorsFactory.fluentSetters(m, builderInterfaceName()))); accessors.addAll(checkDeprecated(m, accessorsFactory.beanStyleSetters(m))); + accessors.addAll(checkDeprecated(m, accessorsFactory.fluentSetters(m, builderInterfaceName()))); accessors.addAll(checkDeprecated(m, accessorsFactory.convenienceSetters(m, builderInterfaceName()))); }); 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 index 53f9ad25e81b..6dbe9bceb13c 100644 --- 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 @@ -1,5 +1,6 @@ package software.amazon.awssdk.services.jsonprotocoltests.model; +import java.beans.Transient; import java.nio.ByteBuffer; import java.time.Instant; import java.util.Arrays; @@ -424,9 +425,8 @@ SdkField. builder(MarshallingType.SDK_BYTES) .build(); private static final SdkField MY_DOCUMENT_FIELD = SdkField. builder(MarshallingType.DOCUMENT) - .memberName("MyDocument").getter(getter(AllTypesRequest::myDocument)).setter(setter(Builder::myDocument)) - .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MyDocument").build()).build(); - + .memberName("MyDocument").getter(getter(AllTypesRequest::myDocument)).setter(setter(Builder::myDocument)) + .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MyDocument").build()).build(); private static final List> SDK_FIELDS = Collections.unmodifiableList(Arrays.asList(STRING_MEMBER_FIELD, INTEGER_MEMBER_FIELD, BOOLEAN_MEMBER_FIELD, FLOAT_MEMBER_FIELD, DOUBLE_MEMBER_FIELD, LONG_MEMBER_FIELD, @@ -507,7 +507,6 @@ SdkField. builder(MarshallingType.SDK_BYTES) private final Document myDocument; - private AllTypesRequest(BuilderImpl builder) { super(builder); this.stringMember = builder.stringMember; @@ -1393,9 +1392,9 @@ public final String toString() { .add("StructWithNestedTimestampMember", structWithNestedTimestampMember()).add("BlobArg", blobArg()) .add("StructWithNestedBlob", structWithNestedBlob()).add("BlobMap", hasBlobMap() ? blobMap() : null) .add("ListOfBlobs", hasListOfBlobs() ? listOfBlobs() : null).add("RecursiveStruct", recursiveStruct()) - .add("PolymorphicTypeWithSubTypes", polymorphicTypeWithSubTypes()) - .add("PolymorphicTypeWithoutSubTypes", polymorphicTypeWithoutSubTypes()).add("EnumType", enumTypeAsString()) - .add("Underscore_Name_Type", underscore_Name_Type()).add("MyDocument", myDocument()).build(); + .add("PolymorphicTypeWithSubTypes", polymorphicTypeWithSubTypes()) + .add("PolymorphicTypeWithoutSubTypes", polymorphicTypeWithoutSubTypes()).add("EnumType", enumTypeAsString()) + .add("Underscore_Name_Type", underscore_Name_Type()).add("MyDocument", myDocument()).build(); } public final Optional getValueForField(String fieldName, Class clazz) { @@ -2187,98 +2186,105 @@ public final String getStringMember() { return stringMember; } - @Override - public final Builder stringMember(String stringMember) { + public final void setStringMember(String stringMember) { this.stringMember = stringMember; - return this; } - public final void setStringMember(String stringMember) { + @Override + @Transient + public final Builder stringMember(String stringMember) { this.stringMember = stringMember; + return this; } public final Integer getIntegerMember() { return integerMember; } - @Override - public final Builder integerMember(Integer integerMember) { + public final void setIntegerMember(Integer integerMember) { this.integerMember = integerMember; - return this; } - public final void setIntegerMember(Integer integerMember) { + @Override + @Transient + public final Builder integerMember(Integer integerMember) { this.integerMember = integerMember; + return this; } public final Boolean getBooleanMember() { return booleanMember; } - @Override - public final Builder booleanMember(Boolean booleanMember) { + public final void setBooleanMember(Boolean booleanMember) { this.booleanMember = booleanMember; - return this; } - public final void setBooleanMember(Boolean booleanMember) { + @Override + @Transient + public final Builder booleanMember(Boolean booleanMember) { this.booleanMember = booleanMember; + return this; } public final Float getFloatMember() { return floatMember; } - @Override - public final Builder floatMember(Float floatMember) { + public final void setFloatMember(Float floatMember) { this.floatMember = floatMember; - return this; } - public final void setFloatMember(Float floatMember) { + @Override + @Transient + public final Builder floatMember(Float floatMember) { this.floatMember = floatMember; + return this; } public final Double getDoubleMember() { return doubleMember; } - @Override - public final Builder doubleMember(Double doubleMember) { + public final void setDoubleMember(Double doubleMember) { this.doubleMember = doubleMember; - return this; } - public final void setDoubleMember(Double doubleMember) { + @Override + @Transient + public final Builder doubleMember(Double doubleMember) { this.doubleMember = doubleMember; + return this; } public final Long getLongMember() { return longMember; } - @Override - public final Builder longMember(Long longMember) { + public final void setLongMember(Long longMember) { this.longMember = longMember; - return this; } - public final void setLongMember(Long longMember) { + @Override + @Transient + public final Builder longMember(Long longMember) { this.longMember = longMember; + return this; } public final Short getShortMember() { return shortMember; } - @Override - public final Builder shortMember(Short shortMember) { + public final void setShortMember(Short shortMember) { this.shortMember = shortMember; - return this; } - public final void setShortMember(Short shortMember) { + @Override + @Transient + public final Builder shortMember(Short shortMember) { this.shortMember = shortMember; + return this; } public final Collection getSimpleList() { @@ -2288,23 +2294,25 @@ public final Collection getSimpleList() { return simpleList; } + public final void setSimpleList(Collection simpleList) { + this.simpleList = ListOfStringsCopier.copy(simpleList); + } + @Override + @Transient public final Builder simpleList(Collection simpleList) { this.simpleList = ListOfStringsCopier.copy(simpleList); return this; } @Override + @Transient @SafeVarargs public final Builder simpleList(String... simpleList) { simpleList(Arrays.asList(simpleList)); return this; } - public final void setSimpleList(Collection simpleList) { - this.simpleList = ListOfStringsCopier.copy(simpleList); - } - public final Collection getListOfEnums() { if (listOfEnums instanceof SdkAutoConstructList) { return null; @@ -2312,13 +2320,19 @@ public final Collection getListOfEnums() { return listOfEnums; } + public final void setListOfEnums(Collection listOfEnums) { + this.listOfEnums = ListOfEnumsCopier.copy(listOfEnums); + } + @Override + @Transient public final Builder listOfEnumsWithStrings(Collection listOfEnums) { this.listOfEnums = ListOfEnumsCopier.copy(listOfEnums); return this; } @Override + @Transient @SafeVarargs public final Builder listOfEnumsWithStrings(String... listOfEnums) { listOfEnumsWithStrings(Arrays.asList(listOfEnums)); @@ -2326,22 +2340,20 @@ public final Builder listOfEnumsWithStrings(String... listOfEnums) { } @Override + @Transient public final Builder listOfEnums(Collection listOfEnums) { this.listOfEnums = ListOfEnumsCopier.copyEnumToString(listOfEnums); return this; } @Override + @Transient @SafeVarargs public final Builder listOfEnums(EnumType... listOfEnums) { listOfEnums(Arrays.asList(listOfEnums)); return this; } - public final void setListOfEnums(Collection listOfEnums) { - this.listOfEnums = ListOfEnumsCopier.copy(listOfEnums); - } - public final Collection> getListOfMaps() { if (listOfMaps instanceof SdkAutoConstructList) { return null; @@ -2349,23 +2361,25 @@ public final Collection> getListOfMaps() { return listOfMaps; } + public final void setListOfMaps(Collection> listOfMaps) { + this.listOfMaps = ListOfMapStringToStringCopier.copy(listOfMaps); + } + @Override + @Transient public final Builder listOfMaps(Collection> listOfMaps) { this.listOfMaps = ListOfMapStringToStringCopier.copy(listOfMaps); return this; } @Override + @Transient @SafeVarargs public final Builder listOfMaps(Map... listOfMaps) { listOfMaps(Arrays.asList(listOfMaps)); return this; } - public final void setListOfMaps(Collection> listOfMaps) { - this.listOfMaps = ListOfMapStringToStringCopier.copy(listOfMaps); - } - public final List getListOfStructs() { List result = ListOfSimpleStructsCopier.copyToBuilder(this.listOfStructs); if (result instanceof SdkAutoConstructList) { @@ -2374,13 +2388,19 @@ public final List getListOfStructs() { return result; } + public final void setListOfStructs(Collection listOfStructs) { + this.listOfStructs = ListOfSimpleStructsCopier.copyFromBuilder(listOfStructs); + } + @Override + @Transient public final Builder listOfStructs(Collection listOfStructs) { this.listOfStructs = ListOfSimpleStructsCopier.copy(listOfStructs); return this; } @Override + @Transient @SafeVarargs public final Builder listOfStructs(SimpleStruct... listOfStructs) { listOfStructs(Arrays.asList(listOfStructs)); @@ -2388,6 +2408,7 @@ public final Builder listOfStructs(SimpleStruct... listOfStructs) { } @Override + @Transient @SafeVarargs public final Builder listOfStructs(Consumer... listOfStructs) { listOfStructs(Stream.of(listOfStructs).map(c -> SimpleStruct.builder().applyMutation(c).build()) @@ -2395,10 +2416,6 @@ public final Builder listOfStructs(Consumer... listOfStruc return this; } - public final void setListOfStructs(Collection listOfStructs) { - this.listOfStructs = ListOfSimpleStructsCopier.copyFromBuilder(listOfStructs); - } - public final Collection> getListOfMapOfEnumToString() { if (listOfMapOfEnumToString instanceof SdkAutoConstructList) { return null; @@ -2406,23 +2423,25 @@ public final Collection> getListOfMapOfEnumToStrin return listOfMapOfEnumToString; } + public final void setListOfMapOfEnumToString(Collection> listOfMapOfEnumToString) { + this.listOfMapOfEnumToString = ListOfMapOfEnumToStringCopier.copy(listOfMapOfEnumToString); + } + @Override + @Transient public final Builder listOfMapOfEnumToStringWithStrings(Collection> listOfMapOfEnumToString) { this.listOfMapOfEnumToString = ListOfMapOfEnumToStringCopier.copy(listOfMapOfEnumToString); return this; } @Override + @Transient @SafeVarargs public final Builder listOfMapOfEnumToStringWithStrings(Map... listOfMapOfEnumToString) { listOfMapOfEnumToStringWithStrings(Arrays.asList(listOfMapOfEnumToString)); return this; } - public final void setListOfMapOfEnumToString(Collection> listOfMapOfEnumToString) { - this.listOfMapOfEnumToString = ListOfMapOfEnumToStringCopier.copy(listOfMapOfEnumToString); - } - public final List> getListOfMapOfStringToStruct() { List> result = ListOfMapOfStringToStructCopier .copyToBuilder(this.listOfMapOfStringToStruct); @@ -2432,24 +2451,26 @@ public final List> getListOfMapOfStringToStruc return result; } + public final void setListOfMapOfStringToStruct( + Collection> listOfMapOfStringToStruct) { + this.listOfMapOfStringToStruct = ListOfMapOfStringToStructCopier.copyFromBuilder(listOfMapOfStringToStruct); + } + @Override + @Transient public final Builder listOfMapOfStringToStruct(Collection> listOfMapOfStringToStruct) { this.listOfMapOfStringToStruct = ListOfMapOfStringToStructCopier.copy(listOfMapOfStringToStruct); return this; } @Override + @Transient @SafeVarargs public final Builder listOfMapOfStringToStruct(Map... listOfMapOfStringToStruct) { listOfMapOfStringToStruct(Arrays.asList(listOfMapOfStringToStruct)); return this; } - public final void setListOfMapOfStringToStruct( - Collection> listOfMapOfStringToStruct) { - this.listOfMapOfStringToStruct = ListOfMapOfStringToStructCopier.copyFromBuilder(listOfMapOfStringToStruct); - } - public final Map> getMapOfStringToIntegerList() { if (mapOfStringToIntegerList instanceof SdkAutoConstructMap) { return null; @@ -2457,14 +2478,15 @@ public final void setListOfMapOfStringToStruct( return mapOfStringToIntegerList; } - @Override - public final Builder mapOfStringToIntegerList(Map> mapOfStringToIntegerList) { + public final void setMapOfStringToIntegerList(Map> mapOfStringToIntegerList) { this.mapOfStringToIntegerList = MapOfStringToIntegerListCopier.copy(mapOfStringToIntegerList); - return this; } - public final void setMapOfStringToIntegerList(Map> mapOfStringToIntegerList) { + @Override + @Transient + public final Builder mapOfStringToIntegerList(Map> mapOfStringToIntegerList) { this.mapOfStringToIntegerList = MapOfStringToIntegerListCopier.copy(mapOfStringToIntegerList); + return this; } public final Map getMapOfStringToString() { @@ -2474,14 +2496,15 @@ public final Map getMapOfStringToString() { return mapOfStringToString; } - @Override - public final Builder mapOfStringToString(Map mapOfStringToString) { + public final void setMapOfStringToString(Map mapOfStringToString) { this.mapOfStringToString = MapOfStringToStringCopier.copy(mapOfStringToString); - return this; } - public final void setMapOfStringToString(Map mapOfStringToString) { + @Override + @Transient + public final Builder mapOfStringToString(Map mapOfStringToString) { this.mapOfStringToString = MapOfStringToStringCopier.copy(mapOfStringToString); + return this; } public final Map getMapOfStringToSimpleStruct() { @@ -2493,16 +2516,17 @@ public final Map getMapOfStringToSimpleStruct() { return result; } + public final void setMapOfStringToSimpleStruct(Map mapOfStringToSimpleStruct) { + this.mapOfStringToSimpleStruct = MapOfStringToSimpleStructCopier.copyFromBuilder(mapOfStringToSimpleStruct); + } + @Override + @Transient public final Builder mapOfStringToSimpleStruct(Map mapOfStringToSimpleStruct) { this.mapOfStringToSimpleStruct = MapOfStringToSimpleStructCopier.copy(mapOfStringToSimpleStruct); return this; } - public final void setMapOfStringToSimpleStruct(Map mapOfStringToSimpleStruct) { - this.mapOfStringToSimpleStruct = MapOfStringToSimpleStructCopier.copyFromBuilder(mapOfStringToSimpleStruct); - } - public final Map getMapOfEnumToEnum() { if (mapOfEnumToEnum instanceof SdkAutoConstructMap) { return null; @@ -2510,22 +2534,24 @@ public final Map getMapOfEnumToEnum() { return mapOfEnumToEnum; } + public final void setMapOfEnumToEnum(Map mapOfEnumToEnum) { + this.mapOfEnumToEnum = MapOfEnumToEnumCopier.copy(mapOfEnumToEnum); + } + @Override + @Transient public final Builder mapOfEnumToEnumWithStrings(Map mapOfEnumToEnum) { this.mapOfEnumToEnum = MapOfEnumToEnumCopier.copy(mapOfEnumToEnum); return this; } @Override + @Transient public final Builder mapOfEnumToEnum(Map mapOfEnumToEnum) { this.mapOfEnumToEnum = MapOfEnumToEnumCopier.copyEnumToString(mapOfEnumToEnum); return this; } - public final void setMapOfEnumToEnum(Map mapOfEnumToEnum) { - this.mapOfEnumToEnum = MapOfEnumToEnumCopier.copy(mapOfEnumToEnum); - } - public final Map getMapOfEnumToString() { if (mapOfEnumToString instanceof SdkAutoConstructMap) { return null; @@ -2533,22 +2559,24 @@ public final Map getMapOfEnumToString() { return mapOfEnumToString; } + public final void setMapOfEnumToString(Map mapOfEnumToString) { + this.mapOfEnumToString = MapOfEnumToStringCopier.copy(mapOfEnumToString); + } + @Override + @Transient public final Builder mapOfEnumToStringWithStrings(Map mapOfEnumToString) { this.mapOfEnumToString = MapOfEnumToStringCopier.copy(mapOfEnumToString); return this; } @Override + @Transient public final Builder mapOfEnumToString(Map mapOfEnumToString) { this.mapOfEnumToString = MapOfEnumToStringCopier.copyEnumToString(mapOfEnumToString); return this; } - public final void setMapOfEnumToString(Map mapOfEnumToString) { - this.mapOfEnumToString = MapOfEnumToStringCopier.copy(mapOfEnumToString); - } - public final Map getMapOfStringToEnum() { if (mapOfStringToEnum instanceof SdkAutoConstructMap) { return null; @@ -2556,22 +2584,24 @@ public final Map getMapOfStringToEnum() { return mapOfStringToEnum; } + public final void setMapOfStringToEnum(Map mapOfStringToEnum) { + this.mapOfStringToEnum = MapOfStringToEnumCopier.copy(mapOfStringToEnum); + } + @Override + @Transient public final Builder mapOfStringToEnumWithStrings(Map mapOfStringToEnum) { this.mapOfStringToEnum = MapOfStringToEnumCopier.copy(mapOfStringToEnum); return this; } @Override + @Transient public final Builder mapOfStringToEnum(Map mapOfStringToEnum) { this.mapOfStringToEnum = MapOfStringToEnumCopier.copyEnumToString(mapOfStringToEnum); return this; } - public final void setMapOfStringToEnum(Map mapOfStringToEnum) { - this.mapOfStringToEnum = MapOfStringToEnumCopier.copy(mapOfStringToEnum); - } - public final Map getMapOfEnumToSimpleStruct() { Map result = MapOfEnumToSimpleStructCopier.copyToBuilder(this.mapOfEnumToSimpleStruct); if (result instanceof SdkAutoConstructMap) { @@ -2580,22 +2610,24 @@ public final Map getMapOfEnumToSimpleStruct() { return result; } + public final void setMapOfEnumToSimpleStruct(Map mapOfEnumToSimpleStruct) { + this.mapOfEnumToSimpleStruct = MapOfEnumToSimpleStructCopier.copyFromBuilder(mapOfEnumToSimpleStruct); + } + @Override + @Transient public final Builder mapOfEnumToSimpleStructWithStrings(Map mapOfEnumToSimpleStruct) { this.mapOfEnumToSimpleStruct = MapOfEnumToSimpleStructCopier.copy(mapOfEnumToSimpleStruct); return this; } @Override + @Transient public final Builder mapOfEnumToSimpleStruct(Map mapOfEnumToSimpleStruct) { this.mapOfEnumToSimpleStruct = MapOfEnumToSimpleStructCopier.copyEnumToString(mapOfEnumToSimpleStruct); return this; } - public final void setMapOfEnumToSimpleStruct(Map mapOfEnumToSimpleStruct) { - this.mapOfEnumToSimpleStruct = MapOfEnumToSimpleStructCopier.copyFromBuilder(mapOfEnumToSimpleStruct); - } - public final Map> getMapOfEnumToListOfEnums() { if (mapOfEnumToListOfEnums instanceof SdkAutoConstructMap) { return null; @@ -2603,22 +2635,24 @@ public final void setMapOfEnumToSimpleStruct(Map> mapOfEnumToListOfEnums) { + this.mapOfEnumToListOfEnums = MapOfEnumToListOfEnumsCopier.copy(mapOfEnumToListOfEnums); + } + @Override + @Transient public final Builder mapOfEnumToListOfEnumsWithStrings(Map> mapOfEnumToListOfEnums) { this.mapOfEnumToListOfEnums = MapOfEnumToListOfEnumsCopier.copy(mapOfEnumToListOfEnums); return this; } @Override + @Transient public final Builder mapOfEnumToListOfEnums(Map> mapOfEnumToListOfEnums) { this.mapOfEnumToListOfEnums = MapOfEnumToListOfEnumsCopier.copyEnumToString(mapOfEnumToListOfEnums); return this; } - public final void setMapOfEnumToListOfEnums(Map> mapOfEnumToListOfEnums) { - this.mapOfEnumToListOfEnums = MapOfEnumToListOfEnumsCopier.copy(mapOfEnumToListOfEnums); - } - public final Map> getMapOfEnumToMapOfStringToEnum() { if (mapOfEnumToMapOfStringToEnum instanceof SdkAutoConstructMap) { return null; @@ -2626,7 +2660,12 @@ public final void setMapOfEnumToListOfEnums(Map> mapOfEnumToMapOfStringToEnum) { + this.mapOfEnumToMapOfStringToEnum = MapOfEnumToMapOfStringToEnumCopier.copy(mapOfEnumToMapOfStringToEnum); + } + @Override + @Transient public final Builder mapOfEnumToMapOfStringToEnumWithStrings( Map> mapOfEnumToMapOfStringToEnum) { this.mapOfEnumToMapOfStringToEnum = MapOfEnumToMapOfStringToEnumCopier.copy(mapOfEnumToMapOfStringToEnum); @@ -2634,73 +2673,74 @@ public final Builder mapOfEnumToMapOfStringToEnumWithStrings( } @Override + @Transient public final Builder mapOfEnumToMapOfStringToEnum( Map> mapOfEnumToMapOfStringToEnum) { this.mapOfEnumToMapOfStringToEnum = MapOfEnumToMapOfStringToEnumCopier.copyEnumToString(mapOfEnumToMapOfStringToEnum); return this; } - public final void setMapOfEnumToMapOfStringToEnum(Map> mapOfEnumToMapOfStringToEnum) { - this.mapOfEnumToMapOfStringToEnum = MapOfEnumToMapOfStringToEnumCopier.copy(mapOfEnumToMapOfStringToEnum); - } - public final Instant getTimestampMember() { return timestampMember; } - @Override - public final Builder timestampMember(Instant timestampMember) { + public final void setTimestampMember(Instant timestampMember) { this.timestampMember = timestampMember; - return this; } - public final void setTimestampMember(Instant timestampMember) { + @Override + @Transient + public final Builder timestampMember(Instant timestampMember) { this.timestampMember = timestampMember; + return this; } public final StructWithTimestamp.Builder getStructWithNestedTimestampMember() { return structWithNestedTimestampMember != null ? structWithNestedTimestampMember.toBuilder() : null; } + public final void setStructWithNestedTimestampMember(StructWithTimestamp.BuilderImpl structWithNestedTimestampMember) { + this.structWithNestedTimestampMember = structWithNestedTimestampMember != null ? structWithNestedTimestampMember + .build() : null; + } + @Override + @Transient public final Builder structWithNestedTimestampMember(StructWithTimestamp structWithNestedTimestampMember) { this.structWithNestedTimestampMember = structWithNestedTimestampMember; return this; } - public final void setStructWithNestedTimestampMember(StructWithTimestamp.BuilderImpl structWithNestedTimestampMember) { - this.structWithNestedTimestampMember = structWithNestedTimestampMember != null ? structWithNestedTimestampMember - .build() : null; - } - public final ByteBuffer getBlobArg() { return blobArg == null ? null : blobArg.asByteBuffer(); } + public final void setBlobArg(ByteBuffer blobArg) { + blobArg(blobArg == null ? null : SdkBytes.fromByteBuffer(blobArg)); + } + @Override + @Transient public final Builder blobArg(SdkBytes blobArg) { this.blobArg = blobArg; return this; } - public final void setBlobArg(ByteBuffer blobArg) { - blobArg(blobArg == null ? null : SdkBytes.fromByteBuffer(blobArg)); - } - public final StructWithNestedBlobType.Builder getStructWithNestedBlob() { return structWithNestedBlob != null ? structWithNestedBlob.toBuilder() : null; } + public final void setStructWithNestedBlob(StructWithNestedBlobType.BuilderImpl structWithNestedBlob) { + this.structWithNestedBlob = structWithNestedBlob != null ? structWithNestedBlob.build() : null; + } + @Override + @Transient public final Builder structWithNestedBlob(StructWithNestedBlobType structWithNestedBlob) { this.structWithNestedBlob = structWithNestedBlob; return this; } - public final void setStructWithNestedBlob(StructWithNestedBlobType.BuilderImpl structWithNestedBlob) { - this.structWithNestedBlob = structWithNestedBlob != null ? structWithNestedBlob.build() : null; - } - public final Map getBlobMap() { if (blobMap instanceof SdkAutoConstructMap) { return null; @@ -2709,17 +2749,18 @@ public final Map getBlobMap() { .collect(Collectors.toMap(e -> e.getKey(), e -> e.getValue().asByteBuffer())); } + public final void setBlobMap(Map blobMap) { + blobMap(blobMap == null ? null : blobMap.entrySet().stream() + .collect(Collectors.toMap(e -> e.getKey(), e -> SdkBytes.fromByteBuffer(e.getValue())))); + } + @Override + @Transient public final Builder blobMap(Map blobMap) { this.blobMap = BlobMapTypeCopier.copy(blobMap); return this; } - public final void setBlobMap(Map blobMap) { - blobMap(blobMap == null ? null : blobMap.entrySet().stream() - .collect(Collectors.toMap(e -> e.getKey(), e -> SdkBytes.fromByteBuffer(e.getValue())))); - } - public final List getListOfBlobs() { if (listOfBlobs instanceof SdkAutoConstructList) { return null; @@ -2727,113 +2768,122 @@ public final List getListOfBlobs() { return listOfBlobs == null ? null : listOfBlobs.stream().map(SdkBytes::asByteBuffer).collect(Collectors.toList()); } + public final void setListOfBlobs(Collection listOfBlobs) { + listOfBlobs(listOfBlobs == null ? null : listOfBlobs.stream().map(SdkBytes::fromByteBuffer) + .collect(Collectors.toList())); + } + @Override + @Transient public final Builder listOfBlobs(Collection listOfBlobs) { this.listOfBlobs = ListOfBlobsTypeCopier.copy(listOfBlobs); return this; } @Override + @Transient @SafeVarargs public final Builder listOfBlobs(SdkBytes... listOfBlobs) { listOfBlobs(Arrays.asList(listOfBlobs)); return this; } - public final void setListOfBlobs(Collection listOfBlobs) { - listOfBlobs(listOfBlobs == null ? null : listOfBlobs.stream().map(SdkBytes::fromByteBuffer) - .collect(Collectors.toList())); - } - public final RecursiveStructType.Builder getRecursiveStruct() { return recursiveStruct != null ? recursiveStruct.toBuilder() : null; } + public final void setRecursiveStruct(RecursiveStructType.BuilderImpl recursiveStruct) { + this.recursiveStruct = recursiveStruct != null ? recursiveStruct.build() : null; + } + @Override + @Transient public final Builder recursiveStruct(RecursiveStructType recursiveStruct) { this.recursiveStruct = recursiveStruct; return this; } - public final void setRecursiveStruct(RecursiveStructType.BuilderImpl recursiveStruct) { - this.recursiveStruct = recursiveStruct != null ? recursiveStruct.build() : null; - } - public final BaseType.Builder getPolymorphicTypeWithSubTypes() { return polymorphicTypeWithSubTypes != null ? polymorphicTypeWithSubTypes.toBuilder() : null; } + public final void setPolymorphicTypeWithSubTypes(BaseType.BuilderImpl polymorphicTypeWithSubTypes) { + this.polymorphicTypeWithSubTypes = polymorphicTypeWithSubTypes != null ? polymorphicTypeWithSubTypes.build() : null; + } + @Override + @Transient public final Builder polymorphicTypeWithSubTypes(BaseType polymorphicTypeWithSubTypes) { this.polymorphicTypeWithSubTypes = polymorphicTypeWithSubTypes; return this; } - public final void setPolymorphicTypeWithSubTypes(BaseType.BuilderImpl polymorphicTypeWithSubTypes) { - this.polymorphicTypeWithSubTypes = polymorphicTypeWithSubTypes != null ? polymorphicTypeWithSubTypes.build() : null; - } - public final SubTypeOne.Builder getPolymorphicTypeWithoutSubTypes() { return polymorphicTypeWithoutSubTypes != null ? polymorphicTypeWithoutSubTypes.toBuilder() : null; } + public final void setPolymorphicTypeWithoutSubTypes(SubTypeOne.BuilderImpl polymorphicTypeWithoutSubTypes) { + this.polymorphicTypeWithoutSubTypes = polymorphicTypeWithoutSubTypes != null ? polymorphicTypeWithoutSubTypes.build() + : null; + } + @Override + @Transient public final Builder polymorphicTypeWithoutSubTypes(SubTypeOne polymorphicTypeWithoutSubTypes) { this.polymorphicTypeWithoutSubTypes = polymorphicTypeWithoutSubTypes; return this; } - public final void setPolymorphicTypeWithoutSubTypes(SubTypeOne.BuilderImpl polymorphicTypeWithoutSubTypes) { - this.polymorphicTypeWithoutSubTypes = polymorphicTypeWithoutSubTypes != null ? polymorphicTypeWithoutSubTypes.build() - : null; - } - public final String getEnumType() { return enumType; } + public final void setEnumType(String enumType) { + this.enumType = enumType; + } + @Override + @Transient public final Builder enumType(String enumType) { this.enumType = enumType; return this; } @Override + @Transient public final Builder enumType(EnumType enumType) { this.enumType(enumType == null ? null : enumType.toString()); return this; } - public final void setEnumType(String enumType) { - this.enumType = enumType; - } - public final Underscore_Name_Type.Builder getUnderscore_Name_Type() { return underscore_Name_Type != null ? underscore_Name_Type.toBuilder() : null; } + public final void setUnderscore_Name_Type(Underscore_Name_Type.BuilderImpl underscore_Name_Type) { + this.underscore_Name_Type = underscore_Name_Type != null ? underscore_Name_Type.build() : null; + } + @Override + @Transient public final Builder underscore_Name_Type(Underscore_Name_Type underscore_Name_Type) { this.underscore_Name_Type = underscore_Name_Type; return this; } - public final void setUnderscore_Name_Type(Underscore_Name_Type.BuilderImpl underscore_Name_Type) { - this.underscore_Name_Type = underscore_Name_Type != null ? underscore_Name_Type.build() : null; - } - public final Document getMyDocument() { return myDocument; } - @Override - public final Builder myDocument(Document myDocument) { + public final void setMyDocument(Document myDocument) { this.myDocument = myDocument; - return this; } - public final void setMyDocument(Document myDocument) { + @Override + @Transient + public final Builder myDocument(Document myDocument) { this.myDocument = myDocument; + return this; } @Override 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 index 04e1d2cc1ddd..e4d67881b89e 100644 --- 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 @@ -1,5 +1,6 @@ package software.amazon.awssdk.services.jsonprotocoltests.model; +import java.beans.Transient; import java.nio.ByteBuffer; import java.time.Instant; import java.util.Arrays; @@ -423,8 +424,8 @@ SdkField. builder(MarshallingType.SDK_BYTES) .build(); private static final SdkField MY_DOCUMENT_FIELD = SdkField. builder(MarshallingType.DOCUMENT) - .memberName("MyDocument").getter(getter(AllTypesResponse::myDocument)).setter(setter(Builder::myDocument)) - .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MyDocument").build()).build(); + .memberName("MyDocument").getter(getter(AllTypesResponse::myDocument)).setter(setter(Builder::myDocument)) + .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MyDocument").build()).build(); private static final List> SDK_FIELDS = Collections.unmodifiableList(Arrays.asList(STRING_MEMBER_FIELD, INTEGER_MEMBER_FIELD, BOOLEAN_MEMBER_FIELD, FLOAT_MEMBER_FIELD, DOUBLE_MEMBER_FIELD, LONG_MEMBER_FIELD, @@ -1278,7 +1279,7 @@ public final int hashCode() { hashCode = 31 * hashCode + Objects.hashCode(hasMapOfEnumToSimpleStruct() ? mapOfEnumToSimpleStructAsStrings() : null); hashCode = 31 * hashCode + Objects.hashCode(hasMapOfEnumToListOfEnums() ? mapOfEnumToListOfEnumsAsStrings() : null); hashCode = 31 * hashCode - + Objects.hashCode(hasMapOfEnumToMapOfStringToEnum() ? mapOfEnumToMapOfStringToEnumAsStrings() : null); + + Objects.hashCode(hasMapOfEnumToMapOfStringToEnum() ? mapOfEnumToMapOfStringToEnumAsStrings() : null); hashCode = 31 * hashCode + Objects.hashCode(timestampMember()); hashCode = 31 * hashCode + Objects.hashCode(structWithNestedTimestampMember()); hashCode = 31 * hashCode + Objects.hashCode(blobArg()); @@ -1351,8 +1352,8 @@ && hasMapOfEnumToMapOfStringToEnum() == other.hasMapOfEnumToMapOfStringToEnum() && Objects.equals(polymorphicTypeWithSubTypes(), other.polymorphicTypeWithSubTypes()) && Objects.equals(polymorphicTypeWithoutSubTypes(), other.polymorphicTypeWithoutSubTypes()) && Objects.equals(enumTypeAsString(), other.enumTypeAsString()) - && Objects.equals(underscore_Name_Type(), other.underscore_Name_Type()) - && Objects.equals(myDocument(), other.myDocument()); + && Objects.equals(underscore_Name_Type(), other.underscore_Name_Type()) + && Objects.equals(myDocument(), other.myDocument()); } /** @@ -1392,7 +1393,7 @@ public final String toString() { .add("ListOfBlobs", hasListOfBlobs() ? listOfBlobs() : null).add("RecursiveStruct", recursiveStruct()) .add("PolymorphicTypeWithSubTypes", polymorphicTypeWithSubTypes()) .add("PolymorphicTypeWithoutSubTypes", polymorphicTypeWithoutSubTypes()).add("EnumType", enumTypeAsString()) - .add("Underscore_Name_Type", underscore_Name_Type()).add("MyDocument", myDocument()).build(); + .add("Underscore_Name_Type", underscore_Name_Type()).add("MyDocument", myDocument()).build(); } public final Optional getValueForField(String fieldName, Class clazz) { @@ -2178,98 +2179,105 @@ public final String getStringMember() { return stringMember; } - @Override - public final Builder stringMember(String stringMember) { + public final void setStringMember(String stringMember) { this.stringMember = stringMember; - return this; } - public final void setStringMember(String stringMember) { + @Override + @Transient + public final Builder stringMember(String stringMember) { this.stringMember = stringMember; + return this; } public final Integer getIntegerMember() { return integerMember; } - @Override - public final Builder integerMember(Integer integerMember) { + public final void setIntegerMember(Integer integerMember) { this.integerMember = integerMember; - return this; } - public final void setIntegerMember(Integer integerMember) { + @Override + @Transient + public final Builder integerMember(Integer integerMember) { this.integerMember = integerMember; + return this; } public final Boolean getBooleanMember() { return booleanMember; } - @Override - public final Builder booleanMember(Boolean booleanMember) { + public final void setBooleanMember(Boolean booleanMember) { this.booleanMember = booleanMember; - return this; } - public final void setBooleanMember(Boolean booleanMember) { + @Override + @Transient + public final Builder booleanMember(Boolean booleanMember) { this.booleanMember = booleanMember; + return this; } public final Float getFloatMember() { return floatMember; } - @Override - public final Builder floatMember(Float floatMember) { + public final void setFloatMember(Float floatMember) { this.floatMember = floatMember; - return this; } - public final void setFloatMember(Float floatMember) { + @Override + @Transient + public final Builder floatMember(Float floatMember) { this.floatMember = floatMember; + return this; } public final Double getDoubleMember() { return doubleMember; } - @Override - public final Builder doubleMember(Double doubleMember) { + public final void setDoubleMember(Double doubleMember) { this.doubleMember = doubleMember; - return this; } - public final void setDoubleMember(Double doubleMember) { + @Override + @Transient + public final Builder doubleMember(Double doubleMember) { this.doubleMember = doubleMember; + return this; } public final Long getLongMember() { return longMember; } - @Override - public final Builder longMember(Long longMember) { + public final void setLongMember(Long longMember) { this.longMember = longMember; - return this; } - public final void setLongMember(Long longMember) { + @Override + @Transient + public final Builder longMember(Long longMember) { this.longMember = longMember; + return this; } public final Short getShortMember() { return shortMember; } - @Override - public final Builder shortMember(Short shortMember) { + public final void setShortMember(Short shortMember) { this.shortMember = shortMember; - return this; } - public final void setShortMember(Short shortMember) { + @Override + @Transient + public final Builder shortMember(Short shortMember) { this.shortMember = shortMember; + return this; } public final Collection getSimpleList() { @@ -2279,23 +2287,25 @@ public final Collection getSimpleList() { return simpleList; } + public final void setSimpleList(Collection simpleList) { + this.simpleList = ListOfStringsCopier.copy(simpleList); + } + @Override + @Transient public final Builder simpleList(Collection simpleList) { this.simpleList = ListOfStringsCopier.copy(simpleList); return this; } @Override + @Transient @SafeVarargs public final Builder simpleList(String... simpleList) { simpleList(Arrays.asList(simpleList)); return this; } - public final void setSimpleList(Collection simpleList) { - this.simpleList = ListOfStringsCopier.copy(simpleList); - } - public final Collection getListOfEnums() { if (listOfEnums instanceof SdkAutoConstructList) { return null; @@ -2303,13 +2313,19 @@ public final Collection getListOfEnums() { return listOfEnums; } + public final void setListOfEnums(Collection listOfEnums) { + this.listOfEnums = ListOfEnumsCopier.copy(listOfEnums); + } + @Override + @Transient public final Builder listOfEnumsWithStrings(Collection listOfEnums) { this.listOfEnums = ListOfEnumsCopier.copy(listOfEnums); return this; } @Override + @Transient @SafeVarargs public final Builder listOfEnumsWithStrings(String... listOfEnums) { listOfEnumsWithStrings(Arrays.asList(listOfEnums)); @@ -2317,22 +2333,20 @@ public final Builder listOfEnumsWithStrings(String... listOfEnums) { } @Override + @Transient public final Builder listOfEnums(Collection listOfEnums) { this.listOfEnums = ListOfEnumsCopier.copyEnumToString(listOfEnums); return this; } @Override + @Transient @SafeVarargs public final Builder listOfEnums(EnumType... listOfEnums) { listOfEnums(Arrays.asList(listOfEnums)); return this; } - public final void setListOfEnums(Collection listOfEnums) { - this.listOfEnums = ListOfEnumsCopier.copy(listOfEnums); - } - public final Collection> getListOfMaps() { if (listOfMaps instanceof SdkAutoConstructList) { return null; @@ -2340,23 +2354,25 @@ public final Collection> getListOfMaps() { return listOfMaps; } + public final void setListOfMaps(Collection> listOfMaps) { + this.listOfMaps = ListOfMapStringToStringCopier.copy(listOfMaps); + } + @Override + @Transient public final Builder listOfMaps(Collection> listOfMaps) { this.listOfMaps = ListOfMapStringToStringCopier.copy(listOfMaps); return this; } @Override + @Transient @SafeVarargs public final Builder listOfMaps(Map... listOfMaps) { listOfMaps(Arrays.asList(listOfMaps)); return this; } - public final void setListOfMaps(Collection> listOfMaps) { - this.listOfMaps = ListOfMapStringToStringCopier.copy(listOfMaps); - } - public final List getListOfStructs() { List result = ListOfSimpleStructsCopier.copyToBuilder(this.listOfStructs); if (result instanceof SdkAutoConstructList) { @@ -2365,13 +2381,19 @@ public final List getListOfStructs() { return result; } + public final void setListOfStructs(Collection listOfStructs) { + this.listOfStructs = ListOfSimpleStructsCopier.copyFromBuilder(listOfStructs); + } + @Override + @Transient public final Builder listOfStructs(Collection listOfStructs) { this.listOfStructs = ListOfSimpleStructsCopier.copy(listOfStructs); return this; } @Override + @Transient @SafeVarargs public final Builder listOfStructs(SimpleStruct... listOfStructs) { listOfStructs(Arrays.asList(listOfStructs)); @@ -2379,6 +2401,7 @@ public final Builder listOfStructs(SimpleStruct... listOfStructs) { } @Override + @Transient @SafeVarargs public final Builder listOfStructs(Consumer... listOfStructs) { listOfStructs(Stream.of(listOfStructs).map(c -> SimpleStruct.builder().applyMutation(c).build()) @@ -2386,10 +2409,6 @@ public final Builder listOfStructs(Consumer... listOfStruc return this; } - public final void setListOfStructs(Collection listOfStructs) { - this.listOfStructs = ListOfSimpleStructsCopier.copyFromBuilder(listOfStructs); - } - public final Collection> getListOfMapOfEnumToString() { if (listOfMapOfEnumToString instanceof SdkAutoConstructList) { return null; @@ -2397,23 +2416,25 @@ public final Collection> getListOfMapOfEnumToStrin return listOfMapOfEnumToString; } + public final void setListOfMapOfEnumToString(Collection> listOfMapOfEnumToString) { + this.listOfMapOfEnumToString = ListOfMapOfEnumToStringCopier.copy(listOfMapOfEnumToString); + } + @Override + @Transient public final Builder listOfMapOfEnumToStringWithStrings(Collection> listOfMapOfEnumToString) { this.listOfMapOfEnumToString = ListOfMapOfEnumToStringCopier.copy(listOfMapOfEnumToString); return this; } @Override + @Transient @SafeVarargs public final Builder listOfMapOfEnumToStringWithStrings(Map... listOfMapOfEnumToString) { listOfMapOfEnumToStringWithStrings(Arrays.asList(listOfMapOfEnumToString)); return this; } - public final void setListOfMapOfEnumToString(Collection> listOfMapOfEnumToString) { - this.listOfMapOfEnumToString = ListOfMapOfEnumToStringCopier.copy(listOfMapOfEnumToString); - } - public final List> getListOfMapOfStringToStruct() { List> result = ListOfMapOfStringToStructCopier .copyToBuilder(this.listOfMapOfStringToStruct); @@ -2423,24 +2444,26 @@ public final List> getListOfMapOfStringToStruc return result; } + public final void setListOfMapOfStringToStruct( + Collection> listOfMapOfStringToStruct) { + this.listOfMapOfStringToStruct = ListOfMapOfStringToStructCopier.copyFromBuilder(listOfMapOfStringToStruct); + } + @Override + @Transient public final Builder listOfMapOfStringToStruct(Collection> listOfMapOfStringToStruct) { this.listOfMapOfStringToStruct = ListOfMapOfStringToStructCopier.copy(listOfMapOfStringToStruct); return this; } @Override + @Transient @SafeVarargs public final Builder listOfMapOfStringToStruct(Map... listOfMapOfStringToStruct) { listOfMapOfStringToStruct(Arrays.asList(listOfMapOfStringToStruct)); return this; } - public final void setListOfMapOfStringToStruct( - Collection> listOfMapOfStringToStruct) { - this.listOfMapOfStringToStruct = ListOfMapOfStringToStructCopier.copyFromBuilder(listOfMapOfStringToStruct); - } - public final Map> getMapOfStringToIntegerList() { if (mapOfStringToIntegerList instanceof SdkAutoConstructMap) { return null; @@ -2448,14 +2471,15 @@ public final void setListOfMapOfStringToStruct( return mapOfStringToIntegerList; } - @Override - public final Builder mapOfStringToIntegerList(Map> mapOfStringToIntegerList) { + public final void setMapOfStringToIntegerList(Map> mapOfStringToIntegerList) { this.mapOfStringToIntegerList = MapOfStringToIntegerListCopier.copy(mapOfStringToIntegerList); - return this; } - public final void setMapOfStringToIntegerList(Map> mapOfStringToIntegerList) { + @Override + @Transient + public final Builder mapOfStringToIntegerList(Map> mapOfStringToIntegerList) { this.mapOfStringToIntegerList = MapOfStringToIntegerListCopier.copy(mapOfStringToIntegerList); + return this; } public final Map getMapOfStringToString() { @@ -2465,14 +2489,15 @@ public final Map getMapOfStringToString() { return mapOfStringToString; } - @Override - public final Builder mapOfStringToString(Map mapOfStringToString) { + public final void setMapOfStringToString(Map mapOfStringToString) { this.mapOfStringToString = MapOfStringToStringCopier.copy(mapOfStringToString); - return this; } - public final void setMapOfStringToString(Map mapOfStringToString) { + @Override + @Transient + public final Builder mapOfStringToString(Map mapOfStringToString) { this.mapOfStringToString = MapOfStringToStringCopier.copy(mapOfStringToString); + return this; } public final Map getMapOfStringToSimpleStruct() { @@ -2484,16 +2509,17 @@ public final Map getMapOfStringToSimpleStruct() { return result; } + public final void setMapOfStringToSimpleStruct(Map mapOfStringToSimpleStruct) { + this.mapOfStringToSimpleStruct = MapOfStringToSimpleStructCopier.copyFromBuilder(mapOfStringToSimpleStruct); + } + @Override + @Transient public final Builder mapOfStringToSimpleStruct(Map mapOfStringToSimpleStruct) { this.mapOfStringToSimpleStruct = MapOfStringToSimpleStructCopier.copy(mapOfStringToSimpleStruct); return this; } - public final void setMapOfStringToSimpleStruct(Map mapOfStringToSimpleStruct) { - this.mapOfStringToSimpleStruct = MapOfStringToSimpleStructCopier.copyFromBuilder(mapOfStringToSimpleStruct); - } - public final Map getMapOfEnumToEnum() { if (mapOfEnumToEnum instanceof SdkAutoConstructMap) { return null; @@ -2501,22 +2527,24 @@ public final Map getMapOfEnumToEnum() { return mapOfEnumToEnum; } + public final void setMapOfEnumToEnum(Map mapOfEnumToEnum) { + this.mapOfEnumToEnum = MapOfEnumToEnumCopier.copy(mapOfEnumToEnum); + } + @Override + @Transient public final Builder mapOfEnumToEnumWithStrings(Map mapOfEnumToEnum) { this.mapOfEnumToEnum = MapOfEnumToEnumCopier.copy(mapOfEnumToEnum); return this; } @Override + @Transient public final Builder mapOfEnumToEnum(Map mapOfEnumToEnum) { this.mapOfEnumToEnum = MapOfEnumToEnumCopier.copyEnumToString(mapOfEnumToEnum); return this; } - public final void setMapOfEnumToEnum(Map mapOfEnumToEnum) { - this.mapOfEnumToEnum = MapOfEnumToEnumCopier.copy(mapOfEnumToEnum); - } - public final Map getMapOfEnumToString() { if (mapOfEnumToString instanceof SdkAutoConstructMap) { return null; @@ -2524,22 +2552,24 @@ public final Map getMapOfEnumToString() { return mapOfEnumToString; } + public final void setMapOfEnumToString(Map mapOfEnumToString) { + this.mapOfEnumToString = MapOfEnumToStringCopier.copy(mapOfEnumToString); + } + @Override + @Transient public final Builder mapOfEnumToStringWithStrings(Map mapOfEnumToString) { this.mapOfEnumToString = MapOfEnumToStringCopier.copy(mapOfEnumToString); return this; } @Override + @Transient public final Builder mapOfEnumToString(Map mapOfEnumToString) { this.mapOfEnumToString = MapOfEnumToStringCopier.copyEnumToString(mapOfEnumToString); return this; } - public final void setMapOfEnumToString(Map mapOfEnumToString) { - this.mapOfEnumToString = MapOfEnumToStringCopier.copy(mapOfEnumToString); - } - public final Map getMapOfStringToEnum() { if (mapOfStringToEnum instanceof SdkAutoConstructMap) { return null; @@ -2547,22 +2577,24 @@ public final Map getMapOfStringToEnum() { return mapOfStringToEnum; } + public final void setMapOfStringToEnum(Map mapOfStringToEnum) { + this.mapOfStringToEnum = MapOfStringToEnumCopier.copy(mapOfStringToEnum); + } + @Override + @Transient public final Builder mapOfStringToEnumWithStrings(Map mapOfStringToEnum) { this.mapOfStringToEnum = MapOfStringToEnumCopier.copy(mapOfStringToEnum); return this; } @Override + @Transient public final Builder mapOfStringToEnum(Map mapOfStringToEnum) { this.mapOfStringToEnum = MapOfStringToEnumCopier.copyEnumToString(mapOfStringToEnum); return this; } - public final void setMapOfStringToEnum(Map mapOfStringToEnum) { - this.mapOfStringToEnum = MapOfStringToEnumCopier.copy(mapOfStringToEnum); - } - public final Map getMapOfEnumToSimpleStruct() { Map result = MapOfEnumToSimpleStructCopier.copyToBuilder(this.mapOfEnumToSimpleStruct); if (result instanceof SdkAutoConstructMap) { @@ -2571,22 +2603,24 @@ public final Map getMapOfEnumToSimpleStruct() { return result; } + public final void setMapOfEnumToSimpleStruct(Map mapOfEnumToSimpleStruct) { + this.mapOfEnumToSimpleStruct = MapOfEnumToSimpleStructCopier.copyFromBuilder(mapOfEnumToSimpleStruct); + } + @Override + @Transient public final Builder mapOfEnumToSimpleStructWithStrings(Map mapOfEnumToSimpleStruct) { this.mapOfEnumToSimpleStruct = MapOfEnumToSimpleStructCopier.copy(mapOfEnumToSimpleStruct); return this; } @Override + @Transient public final Builder mapOfEnumToSimpleStruct(Map mapOfEnumToSimpleStruct) { this.mapOfEnumToSimpleStruct = MapOfEnumToSimpleStructCopier.copyEnumToString(mapOfEnumToSimpleStruct); return this; } - public final void setMapOfEnumToSimpleStruct(Map mapOfEnumToSimpleStruct) { - this.mapOfEnumToSimpleStruct = MapOfEnumToSimpleStructCopier.copyFromBuilder(mapOfEnumToSimpleStruct); - } - public final Map> getMapOfEnumToListOfEnums() { if (mapOfEnumToListOfEnums instanceof SdkAutoConstructMap) { return null; @@ -2594,22 +2628,24 @@ public final void setMapOfEnumToSimpleStruct(Map> mapOfEnumToListOfEnums) { + this.mapOfEnumToListOfEnums = MapOfEnumToListOfEnumsCopier.copy(mapOfEnumToListOfEnums); + } + @Override + @Transient public final Builder mapOfEnumToListOfEnumsWithStrings(Map> mapOfEnumToListOfEnums) { this.mapOfEnumToListOfEnums = MapOfEnumToListOfEnumsCopier.copy(mapOfEnumToListOfEnums); return this; } @Override + @Transient public final Builder mapOfEnumToListOfEnums(Map> mapOfEnumToListOfEnums) { this.mapOfEnumToListOfEnums = MapOfEnumToListOfEnumsCopier.copyEnumToString(mapOfEnumToListOfEnums); return this; } - public final void setMapOfEnumToListOfEnums(Map> mapOfEnumToListOfEnums) { - this.mapOfEnumToListOfEnums = MapOfEnumToListOfEnumsCopier.copy(mapOfEnumToListOfEnums); - } - public final Map> getMapOfEnumToMapOfStringToEnum() { if (mapOfEnumToMapOfStringToEnum instanceof SdkAutoConstructMap) { return null; @@ -2617,7 +2653,12 @@ public final void setMapOfEnumToListOfEnums(Map> mapOfEnumToMapOfStringToEnum) { + this.mapOfEnumToMapOfStringToEnum = MapOfEnumToMapOfStringToEnumCopier.copy(mapOfEnumToMapOfStringToEnum); + } + @Override + @Transient public final Builder mapOfEnumToMapOfStringToEnumWithStrings( Map> mapOfEnumToMapOfStringToEnum) { this.mapOfEnumToMapOfStringToEnum = MapOfEnumToMapOfStringToEnumCopier.copy(mapOfEnumToMapOfStringToEnum); @@ -2625,73 +2666,74 @@ public final Builder mapOfEnumToMapOfStringToEnumWithStrings( } @Override + @Transient public final Builder mapOfEnumToMapOfStringToEnum( Map> mapOfEnumToMapOfStringToEnum) { this.mapOfEnumToMapOfStringToEnum = MapOfEnumToMapOfStringToEnumCopier.copyEnumToString(mapOfEnumToMapOfStringToEnum); return this; } - public final void setMapOfEnumToMapOfStringToEnum(Map> mapOfEnumToMapOfStringToEnum) { - this.mapOfEnumToMapOfStringToEnum = MapOfEnumToMapOfStringToEnumCopier.copy(mapOfEnumToMapOfStringToEnum); - } - public final Instant getTimestampMember() { return timestampMember; } - @Override - public final Builder timestampMember(Instant timestampMember) { + public final void setTimestampMember(Instant timestampMember) { this.timestampMember = timestampMember; - return this; } - public final void setTimestampMember(Instant timestampMember) { + @Override + @Transient + public final Builder timestampMember(Instant timestampMember) { this.timestampMember = timestampMember; + return this; } public final StructWithTimestamp.Builder getStructWithNestedTimestampMember() { return structWithNestedTimestampMember != null ? structWithNestedTimestampMember.toBuilder() : null; } + public final void setStructWithNestedTimestampMember(StructWithTimestamp.BuilderImpl structWithNestedTimestampMember) { + this.structWithNestedTimestampMember = structWithNestedTimestampMember != null ? structWithNestedTimestampMember + .build() : null; + } + @Override + @Transient public final Builder structWithNestedTimestampMember(StructWithTimestamp structWithNestedTimestampMember) { this.structWithNestedTimestampMember = structWithNestedTimestampMember; return this; } - public final void setStructWithNestedTimestampMember(StructWithTimestamp.BuilderImpl structWithNestedTimestampMember) { - this.structWithNestedTimestampMember = structWithNestedTimestampMember != null ? structWithNestedTimestampMember - .build() : null; - } - public final ByteBuffer getBlobArg() { return blobArg == null ? null : blobArg.asByteBuffer(); } + public final void setBlobArg(ByteBuffer blobArg) { + blobArg(blobArg == null ? null : SdkBytes.fromByteBuffer(blobArg)); + } + @Override + @Transient public final Builder blobArg(SdkBytes blobArg) { this.blobArg = blobArg; return this; } - public final void setBlobArg(ByteBuffer blobArg) { - blobArg(blobArg == null ? null : SdkBytes.fromByteBuffer(blobArg)); - } - public final StructWithNestedBlobType.Builder getStructWithNestedBlob() { return structWithNestedBlob != null ? structWithNestedBlob.toBuilder() : null; } + public final void setStructWithNestedBlob(StructWithNestedBlobType.BuilderImpl structWithNestedBlob) { + this.structWithNestedBlob = structWithNestedBlob != null ? structWithNestedBlob.build() : null; + } + @Override + @Transient public final Builder structWithNestedBlob(StructWithNestedBlobType structWithNestedBlob) { this.structWithNestedBlob = structWithNestedBlob; return this; } - public final void setStructWithNestedBlob(StructWithNestedBlobType.BuilderImpl structWithNestedBlob) { - this.structWithNestedBlob = structWithNestedBlob != null ? structWithNestedBlob.build() : null; - } - public final Map getBlobMap() { if (blobMap instanceof SdkAutoConstructMap) { return null; @@ -2700,17 +2742,18 @@ public final Map getBlobMap() { .collect(Collectors.toMap(e -> e.getKey(), e -> e.getValue().asByteBuffer())); } + public final void setBlobMap(Map blobMap) { + blobMap(blobMap == null ? null : blobMap.entrySet().stream() + .collect(Collectors.toMap(e -> e.getKey(), e -> SdkBytes.fromByteBuffer(e.getValue())))); + } + @Override + @Transient public final Builder blobMap(Map blobMap) { this.blobMap = BlobMapTypeCopier.copy(blobMap); return this; } - public final void setBlobMap(Map blobMap) { - blobMap(blobMap == null ? null : blobMap.entrySet().stream() - .collect(Collectors.toMap(e -> e.getKey(), e -> SdkBytes.fromByteBuffer(e.getValue())))); - } - public final List getListOfBlobs() { if (listOfBlobs instanceof SdkAutoConstructList) { return null; @@ -2718,113 +2761,122 @@ public final List getListOfBlobs() { return listOfBlobs == null ? null : listOfBlobs.stream().map(SdkBytes::asByteBuffer).collect(Collectors.toList()); } + public final void setListOfBlobs(Collection listOfBlobs) { + listOfBlobs(listOfBlobs == null ? null : listOfBlobs.stream().map(SdkBytes::fromByteBuffer) + .collect(Collectors.toList())); + } + @Override + @Transient public final Builder listOfBlobs(Collection listOfBlobs) { this.listOfBlobs = ListOfBlobsTypeCopier.copy(listOfBlobs); return this; } @Override + @Transient @SafeVarargs public final Builder listOfBlobs(SdkBytes... listOfBlobs) { listOfBlobs(Arrays.asList(listOfBlobs)); return this; } - public final void setListOfBlobs(Collection listOfBlobs) { - listOfBlobs(listOfBlobs == null ? null : listOfBlobs.stream().map(SdkBytes::fromByteBuffer) - .collect(Collectors.toList())); - } - public final RecursiveStructType.Builder getRecursiveStruct() { return recursiveStruct != null ? recursiveStruct.toBuilder() : null; } + public final void setRecursiveStruct(RecursiveStructType.BuilderImpl recursiveStruct) { + this.recursiveStruct = recursiveStruct != null ? recursiveStruct.build() : null; + } + @Override + @Transient public final Builder recursiveStruct(RecursiveStructType recursiveStruct) { this.recursiveStruct = recursiveStruct; return this; } - public final void setRecursiveStruct(RecursiveStructType.BuilderImpl recursiveStruct) { - this.recursiveStruct = recursiveStruct != null ? recursiveStruct.build() : null; - } - public final BaseType.Builder getPolymorphicTypeWithSubTypes() { return polymorphicTypeWithSubTypes != null ? polymorphicTypeWithSubTypes.toBuilder() : null; } + public final void setPolymorphicTypeWithSubTypes(BaseType.BuilderImpl polymorphicTypeWithSubTypes) { + this.polymorphicTypeWithSubTypes = polymorphicTypeWithSubTypes != null ? polymorphicTypeWithSubTypes.build() : null; + } + @Override + @Transient public final Builder polymorphicTypeWithSubTypes(BaseType polymorphicTypeWithSubTypes) { this.polymorphicTypeWithSubTypes = polymorphicTypeWithSubTypes; return this; } - public final void setPolymorphicTypeWithSubTypes(BaseType.BuilderImpl polymorphicTypeWithSubTypes) { - this.polymorphicTypeWithSubTypes = polymorphicTypeWithSubTypes != null ? polymorphicTypeWithSubTypes.build() : null; - } - public final SubTypeOne.Builder getPolymorphicTypeWithoutSubTypes() { return polymorphicTypeWithoutSubTypes != null ? polymorphicTypeWithoutSubTypes.toBuilder() : null; } + public final void setPolymorphicTypeWithoutSubTypes(SubTypeOne.BuilderImpl polymorphicTypeWithoutSubTypes) { + this.polymorphicTypeWithoutSubTypes = polymorphicTypeWithoutSubTypes != null ? polymorphicTypeWithoutSubTypes.build() + : null; + } + @Override + @Transient public final Builder polymorphicTypeWithoutSubTypes(SubTypeOne polymorphicTypeWithoutSubTypes) { this.polymorphicTypeWithoutSubTypes = polymorphicTypeWithoutSubTypes; return this; } - public final void setPolymorphicTypeWithoutSubTypes(SubTypeOne.BuilderImpl polymorphicTypeWithoutSubTypes) { - this.polymorphicTypeWithoutSubTypes = polymorphicTypeWithoutSubTypes != null ? polymorphicTypeWithoutSubTypes.build() - : null; - } - public final String getEnumType() { return enumType; } + public final void setEnumType(String enumType) { + this.enumType = enumType; + } + @Override + @Transient public final Builder enumType(String enumType) { this.enumType = enumType; return this; } @Override + @Transient public final Builder enumType(EnumType enumType) { this.enumType(enumType == null ? null : enumType.toString()); return this; } - public final void setEnumType(String enumType) { - this.enumType = enumType; - } - public final Underscore_Name_Type.Builder getUnderscore_Name_Type() { return underscore_Name_Type != null ? underscore_Name_Type.toBuilder() : null; } + public final void setUnderscore_Name_Type(Underscore_Name_Type.BuilderImpl underscore_Name_Type) { + this.underscore_Name_Type = underscore_Name_Type != null ? underscore_Name_Type.build() : null; + } + @Override + @Transient public final Builder underscore_Name_Type(Underscore_Name_Type underscore_Name_Type) { this.underscore_Name_Type = underscore_Name_Type; return this; } - public final void setUnderscore_Name_Type(Underscore_Name_Type.BuilderImpl underscore_Name_Type) { - this.underscore_Name_Type = underscore_Name_Type != null ? underscore_Name_Type.build() : null; - } - public final Document getMyDocument() { return myDocument; } - @Override - public final Builder myDocument(Document myDocument) { + public final void setMyDocument(Document myDocument) { this.myDocument = myDocument; - return this; } - public final void setMyDocument(Document myDocument) { + @Override + @Transient + public final Builder myDocument(Document myDocument) { this.myDocument = myDocument; + return this; } @Override @@ -2837,4 +2889,4 @@ public List> sdkFields() { return SDK_FIELDS; } } -} \ No newline at end of file +} diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/basetype.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/basetype.java index 1e40d634bf40..1f4bf1fc0664 100644 --- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/basetype.java +++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/basetype.java @@ -1,5 +1,6 @@ package software.amazon.awssdk.services.jsonprotocoltests.model; +import java.beans.Transient; import java.io.Serializable; import java.util.Arrays; import java.util.Collections; @@ -23,8 +24,8 @@ @Generated("software.amazon.awssdk:codegen") public final class BaseType implements SdkPojo, Serializable, ToCopyableBuilder { private static final SdkField BASE_MEMBER_FIELD = SdkField. builder(MarshallingType.STRING) - .memberName("BaseMember").getter(getter(BaseType::baseMember)).setter(setter(Builder::baseMember)) - .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("BaseMember").build()).build(); + .memberName("BaseMember").getter(getter(BaseType::baseMember)).setter(setter(Builder::baseMember)) + .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("BaseMember").build()).build(); private static final List> SDK_FIELDS = Collections.unmodifiableList(Arrays.asList(BASE_MEMBER_FIELD)); @@ -38,7 +39,7 @@ private BaseType(BuilderImpl builder) { /** * Returns the value of the BaseMember property for this object. - * + * * @return The value of the BaseMember property for this object. */ public final String baseMember() { @@ -96,10 +97,10 @@ public final String toString() { public final Optional getValueForField(String fieldName, Class clazz) { switch (fieldName) { - case "BaseMember": - return Optional.ofNullable(clazz.cast(baseMember())); - default: - return Optional.empty(); + case "BaseMember": + return Optional.ofNullable(clazz.cast(baseMember())); + default: + return Optional.empty(); } } @@ -141,14 +142,15 @@ public final String getBaseMember() { return baseMember; } - @Override - public final Builder baseMember(String baseMember) { + public final void setBaseMember(String baseMember) { this.baseMember = baseMember; - return this; } - public final void setBaseMember(String baseMember) { + @Override + @Transient + public final Builder baseMember(String baseMember) { this.baseMember = baseMember; + return this; } @Override @@ -162,4 +164,3 @@ public List> sdkFields() { } } } - diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/deprecatedrenamerequest.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/deprecatedrenamerequest.java index 395bd6785d9d..43f07e4d384b 100644 --- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/deprecatedrenamerequest.java +++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/deprecatedrenamerequest.java @@ -1,5 +1,6 @@ package software.amazon.awssdk.services.jsonprotocoltests.model; +import java.beans.Transient; import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -23,20 +24,20 @@ */ @Generated("software.amazon.awssdk:codegen") public final class DeprecatedRenameRequest extends JsonProtocolTestsRequest implements - ToCopyableBuilder { + ToCopyableBuilder { private static final SdkField NEW_NAME_NO_DEPRECATION_FIELD = SdkField. builder(MarshallingType.STRING) - .memberName("NewNameNoDeprecation").getter(getter(DeprecatedRenameRequest::newNameNoDeprecation)) - .setter(setter(Builder::newNameNoDeprecation)) - .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("OriginalNameNoDeprecation").build()) - .build(); + .memberName("NewNameNoDeprecation").getter(getter(DeprecatedRenameRequest::newNameNoDeprecation)) + .setter(setter(Builder::newNameNoDeprecation)) + .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("OriginalNameNoDeprecation").build()) + .build(); private static final SdkField NEW_NAME_FIELD = SdkField. builder(MarshallingType.STRING) - .memberName("NewName").getter(getter(DeprecatedRenameRequest::newName)).setter(setter(Builder::newName)) - .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("OriginalNameDeprecated").build()) - .build(); + .memberName("NewName").getter(getter(DeprecatedRenameRequest::newName)).setter(setter(Builder::newName)) + .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("OriginalNameDeprecated").build()) + .build(); private static final List> SDK_FIELDS = Collections.unmodifiableList(Arrays.asList(NEW_NAME_NO_DEPRECATION_FIELD, - NEW_NAME_FIELD)); + NEW_NAME_FIELD)); private final String newNameNoDeprecation; @@ -50,7 +51,7 @@ private DeprecatedRenameRequest(BuilderImpl builder) { /** * Returns the value of the NewNameNoDeprecation property for this object. - * + * * @return The value of the NewNameNoDeprecation property for this object. */ public final String newNameNoDeprecation() { @@ -59,7 +60,7 @@ public final String newNameNoDeprecation() { /** * Returns the value of the NewName property for this object. - * + * * @return The value of the NewName property for this object. * @deprecated Use {@link #newName()} */ @@ -70,7 +71,7 @@ public final String originalNameDeprecated() { /** * Returns the value of the NewName property for this object. - * + * * @return The value of the NewName property for this object. */ public final String newName() { @@ -126,19 +127,19 @@ public final boolean equalsBySdkFields(Object obj) { @Override public final String toString() { return ToString.builder("DeprecatedRenameRequest").add("NewNameNoDeprecation", newNameNoDeprecation()) - .add("NewName", newName()).build(); + .add("NewName", newName()).build(); } public final Optional getValueForField(String fieldName, Class clazz) { switch (fieldName) { - case "NewNameNoDeprecation": - return Optional.ofNullable(clazz.cast(newNameNoDeprecation())); - case "NewName": - return Optional.ofNullable(clazz.cast(newName())); - case "OriginalNameDeprecated": - return Optional.ofNullable(clazz.cast(newName())); - default: - return Optional.empty(); + case "NewNameNoDeprecation": + return Optional.ofNullable(clazz.cast(newNameNoDeprecation())); + case "NewName": + return Optional.ofNullable(clazz.cast(newName())); + case "OriginalNameDeprecated": + return Optional.ofNullable(clazz.cast(newName())); + default: + return Optional.empty(); } } @@ -210,30 +211,19 @@ public final String getNewNameNoDeprecation() { return newNameNoDeprecation; } - @Override - public final Builder newNameNoDeprecation(String newNameNoDeprecation) { - this.newNameNoDeprecation = newNameNoDeprecation; - return this; - } - public final void setNewNameNoDeprecation(String newNameNoDeprecation) { this.newNameNoDeprecation = newNameNoDeprecation; } - public final String getNewName() { - return newName; - } - @Override - public final Builder newName(String newName) { - this.newName = newName; + @Transient + public final Builder newNameNoDeprecation(String newNameNoDeprecation) { + this.newNameNoDeprecation = newNameNoDeprecation; return this; } - @Override - public final Builder originalNameDeprecated(String newName) { - this.newName = newName; - return this; + public final String getNewName() { + return newName; } public final void setNewName(String newName) { @@ -248,6 +238,20 @@ public final void setOriginalNameDeprecated(String newName) { this.newName = newName; } + @Override + @Transient + public final Builder newName(String newName) { + this.newName = newName; + return this; + } + + @Override + @Transient + public final Builder originalNameDeprecated(String newName) { + this.newName = newName; + return this; + } + @Override public Builder overrideConfiguration(AwsRequestOverrideConfiguration overrideConfiguration) { super.overrideConfiguration(overrideConfiguration); @@ -271,4 +275,3 @@ public List> sdkFields() { } } } - diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/deprecatedrenameresponse.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/deprecatedrenameresponse.java index 0537255d3477..0bf35f62a16a 100644 --- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/deprecatedrenameresponse.java +++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/deprecatedrenameresponse.java @@ -1,5 +1,6 @@ package software.amazon.awssdk.services.jsonprotocoltests.model; +import java.beans.Transient; import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -21,21 +22,21 @@ */ @Generated("software.amazon.awssdk:codegen") public final class DeprecatedRenameResponse extends JsonProtocolTestsResponse implements - ToCopyableBuilder { + ToCopyableBuilder { private static final SdkField ORIGINAL_NAME_NO_DEPRECATION_FIELD = SdkField. builder(MarshallingType.STRING) - .memberName("OriginalNameNoDeprecation").getter(getter(DeprecatedRenameResponse::originalNameNoDeprecation)) - .setter(setter(Builder::originalNameNoDeprecation)) - .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("OriginalNameNoDeprecation").build()) - .build(); + .memberName("OriginalNameNoDeprecation").getter(getter(DeprecatedRenameResponse::originalNameNoDeprecation)) + .setter(setter(Builder::originalNameNoDeprecation)) + .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("OriginalNameNoDeprecation").build()) + .build(); private static final SdkField ORIGINAL_NAME_DEPRECATED_FIELD = SdkField. builder(MarshallingType.STRING) - .memberName("OriginalNameDeprecated").getter(getter(DeprecatedRenameResponse::originalNameDeprecated)) - .setter(setter(Builder::originalNameDeprecated)) - .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("OriginalNameDeprecated").build()) - .build(); + .memberName("OriginalNameDeprecated").getter(getter(DeprecatedRenameResponse::originalNameDeprecated)) + .setter(setter(Builder::originalNameDeprecated)) + .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("OriginalNameDeprecated").build()) + .build(); private static final List> SDK_FIELDS = Collections.unmodifiableList(Arrays.asList( - ORIGINAL_NAME_NO_DEPRECATION_FIELD, ORIGINAL_NAME_DEPRECATED_FIELD)); + ORIGINAL_NAME_NO_DEPRECATION_FIELD, ORIGINAL_NAME_DEPRECATED_FIELD)); private final String originalNameNoDeprecation; @@ -49,7 +50,7 @@ private DeprecatedRenameResponse(BuilderImpl builder) { /** * Returns the value of the OriginalNameNoDeprecation property for this object. - * + * * @return The value of the OriginalNameNoDeprecation property for this object. */ public final String originalNameNoDeprecation() { @@ -58,7 +59,7 @@ public final String originalNameNoDeprecation() { /** * Returns the value of the OriginalNameDeprecated property for this object. - * + * * @return The value of the OriginalNameDeprecated property for this object. */ public final String originalNameDeprecated() { @@ -105,7 +106,7 @@ public final boolean equalsBySdkFields(Object obj) { } DeprecatedRenameResponse other = (DeprecatedRenameResponse) obj; return Objects.equals(originalNameNoDeprecation(), other.originalNameNoDeprecation()) - && Objects.equals(originalNameDeprecated(), other.originalNameDeprecated()); + && Objects.equals(originalNameDeprecated(), other.originalNameDeprecated()); } /** @@ -115,17 +116,17 @@ public final boolean equalsBySdkFields(Object obj) { @Override public final String toString() { return ToString.builder("DeprecatedRenameResponse").add("OriginalNameNoDeprecation", originalNameNoDeprecation()) - .add("OriginalNameDeprecated", originalNameDeprecated()).build(); + .add("OriginalNameDeprecated", originalNameDeprecated()).build(); } public final Optional getValueForField(String fieldName, Class clazz) { switch (fieldName) { - case "OriginalNameNoDeprecation": - return Optional.ofNullable(clazz.cast(originalNameNoDeprecation())); - case "OriginalNameDeprecated": - return Optional.ofNullable(clazz.cast(originalNameDeprecated())); - default: - return Optional.empty(); + case "OriginalNameNoDeprecation": + return Optional.ofNullable(clazz.cast(originalNameNoDeprecation())); + case "OriginalNameDeprecated": + return Optional.ofNullable(clazz.cast(originalNameDeprecated())); + default: + return Optional.empty(); } } @@ -143,7 +144,7 @@ private static BiConsumer setter(BiConsumer s) { } public interface Builder extends JsonProtocolTestsResponse.Builder, SdkPojo, - CopyableBuilder { + CopyableBuilder { /** * Sets the value of the OriginalNameNoDeprecation property for this object. * @@ -181,28 +182,30 @@ public final String getOriginalNameNoDeprecation() { return originalNameNoDeprecation; } - @Override - public final Builder originalNameNoDeprecation(String originalNameNoDeprecation) { + public final void setOriginalNameNoDeprecation(String originalNameNoDeprecation) { this.originalNameNoDeprecation = originalNameNoDeprecation; - return this; } - public final void setOriginalNameNoDeprecation(String originalNameNoDeprecation) { + @Override + @Transient + public final Builder originalNameNoDeprecation(String originalNameNoDeprecation) { this.originalNameNoDeprecation = originalNameNoDeprecation; + return this; } public final String getOriginalNameDeprecated() { return originalNameDeprecated; } - @Override - public final Builder originalNameDeprecated(String originalNameDeprecated) { + public final void setOriginalNameDeprecated(String originalNameDeprecated) { this.originalNameDeprecated = originalNameDeprecated; - return this; } - public final void setOriginalNameDeprecated(String originalNameDeprecated) { + @Override + @Transient + public final Builder originalNameDeprecated(String originalNameDeprecated) { this.originalNameDeprecated = originalNameDeprecated; + return this; } @Override @@ -216,4 +219,3 @@ public List> sdkFields() { } } } - diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/eventone.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/eventone.java index 8cd1e423601e..35c9dc964b90 100644 --- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/eventone.java +++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/eventone.java @@ -1,5 +1,6 @@ package software.amazon.awssdk.services.jsonprotocoltests.model; +import java.beans.Transient; import java.io.Serializable; import java.util.Arrays; import java.util.Collections; @@ -24,8 +25,8 @@ @Generated("software.amazon.awssdk:codegen") public class EventOne implements SdkPojo, Serializable, ToCopyableBuilder, EventStream { private static final SdkField FOO_FIELD = SdkField. builder(MarshallingType.STRING).memberName("Foo") - .getter(getter(EventOne::foo)).setter(setter(Builder::foo)) - .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("Foo").build()).build(); + .getter(getter(EventOne::foo)).setter(setter(Builder::foo)) + .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("Foo").build()).build(); private static final List> SDK_FIELDS = Collections.unmodifiableList(Arrays.asList(FOO_FIELD)); @@ -39,7 +40,7 @@ protected EventOne(BuilderImpl builder) { /** * Returns the value of the Foo property for this object. - * + * * @return The value of the Foo property for this object. */ public final String foo() { @@ -97,10 +98,10 @@ public final String toString() { public final Optional getValueForField(String fieldName, Class clazz) { switch (fieldName) { - case "Foo": - return Optional.ofNullable(clazz.cast(foo())); - default: - return Optional.empty(); + case "Foo": + return Optional.ofNullable(clazz.cast(foo())); + default: + return Optional.empty(); } } @@ -158,14 +159,15 @@ public final String getFoo() { return foo; } - @Override - public final Builder foo(String foo) { + public final void setFoo(String foo) { this.foo = foo; - return this; } - public final void setFoo(String foo) { + @Override + @Transient + public final Builder foo(String foo) { this.foo = foo; + return this; } @Override @@ -179,4 +181,3 @@ public List> sdkFields() { } } } - diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/eventtwo.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/eventtwo.java index 25b45d66c08b..2640edb77159 100644 --- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/eventtwo.java +++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/eventtwo.java @@ -1,5 +1,6 @@ package software.amazon.awssdk.services.jsonprotocoltests.model; +import java.beans.Transient; import java.io.Serializable; import java.util.Arrays; import java.util.Collections; @@ -24,8 +25,8 @@ @Generated("software.amazon.awssdk:codegen") public class EventTwo implements SdkPojo, Serializable, ToCopyableBuilder, EventStream { private static final SdkField BAR_FIELD = SdkField. builder(MarshallingType.STRING).memberName("Bar") - .getter(getter(EventTwo::bar)).setter(setter(Builder::bar)) - .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("Bar").build()).build(); + .getter(getter(EventTwo::bar)).setter(setter(Builder::bar)) + .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("Bar").build()).build(); private static final List> SDK_FIELDS = Collections.unmodifiableList(Arrays.asList(BAR_FIELD)); @@ -39,7 +40,7 @@ protected EventTwo(BuilderImpl builder) { /** * Returns the value of the Bar property for this object. - * + * * @return The value of the Bar property for this object. */ public final String bar() { @@ -97,10 +98,10 @@ public final String toString() { public final Optional getValueForField(String fieldName, Class clazz) { switch (fieldName) { - case "Bar": - return Optional.ofNullable(clazz.cast(bar())); - default: - return Optional.empty(); + case "Bar": + return Optional.ofNullable(clazz.cast(bar())); + default: + return Optional.empty(); } } @@ -158,14 +159,15 @@ public final String getBar() { return bar; } - @Override - public final Builder bar(String bar) { + public final void setBar(String bar) { this.bar = bar; - return this; } - public final void setBar(String bar) { + @Override + @Transient + public final Builder bar(String bar) { this.bar = bar; + return this; } @Override @@ -179,4 +181,3 @@ public List> sdkFields() { } } } - diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/existencechecknamingrequest.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/existencechecknamingrequest.java index 54c651084b78..f37fe9a0a062 100644 --- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/existencechecknamingrequest.java +++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/existencechecknamingrequest.java @@ -1,5 +1,6 @@ package software.amazon.awssdk.services.jsonprotocoltests.model; +import java.beans.Transient; import java.util.Arrays; import java.util.Collection; import java.util.Collections; @@ -31,65 +32,65 @@ */ @Generated("software.amazon.awssdk:codegen") public final class ExistenceCheckNamingRequest extends JsonProtocolTestsRequest implements - ToCopyableBuilder { + ToCopyableBuilder { private static final SdkField> BUILD_FIELD = SdkField - .> builder(MarshallingType.LIST) - .memberName("Build") - .getter(getter(ExistenceCheckNamingRequest::build)) - .setter(setter(Builder::build)) - .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("Build").build(), - ListTrait - .builder() - .memberLocationName(null) - .memberFieldInfo( - SdkField. builder(MarshallingType.STRING) - .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD) - .locationName("member").build()).build()).build()).build(); + .> builder(MarshallingType.LIST) + .memberName("Build") + .getter(getter(ExistenceCheckNamingRequest::build)) + .setter(setter(Builder::build)) + .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("Build").build(), + ListTrait + .builder() + .memberLocationName(null) + .memberFieldInfo( + SdkField. builder(MarshallingType.STRING) + .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD) + .locationName("member").build()).build()).build()).build(); private static final SdkField> SUPER_FIELD = SdkField - .> builder(MarshallingType.LIST) - .memberName("super") - .getter(getter(ExistenceCheckNamingRequest::superValue)) - .setter(setter(Builder::superValue)) - .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("super").build(), - ListTrait - .builder() - .memberLocationName(null) - .memberFieldInfo( - SdkField. builder(MarshallingType.STRING) - .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD) - .locationName("member").build()).build()).build()).build(); + .> builder(MarshallingType.LIST) + .memberName("super") + .getter(getter(ExistenceCheckNamingRequest::superValue)) + .setter(setter(Builder::superValue)) + .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("super").build(), + ListTrait + .builder() + .memberLocationName(null) + .memberFieldInfo( + SdkField. builder(MarshallingType.STRING) + .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD) + .locationName("member").build()).build()).build()).build(); private static final SdkField> TO_STRING_FIELD = SdkField - .> builder(MarshallingType.MAP) - .memberName("toString") - .getter(getter(ExistenceCheckNamingRequest::toStringValue)) - .setter(setter(Builder::toStringValue)) - .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("toString").build(), - MapTrait.builder() - .keyLocationName("key") - .valueLocationName("value") - .valueFieldInfo( - SdkField. builder(MarshallingType.STRING) - .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD) - .locationName("value").build()).build()).build()).build(); + .> builder(MarshallingType.MAP) + .memberName("toString") + .getter(getter(ExistenceCheckNamingRequest::toStringValue)) + .setter(setter(Builder::toStringValue)) + .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("toString").build(), + MapTrait.builder() + .keyLocationName("key") + .valueLocationName("value") + .valueFieldInfo( + SdkField. builder(MarshallingType.STRING) + .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD) + .locationName("value").build()).build()).build()).build(); private static final SdkField> EQUALS_FIELD = SdkField - .> builder(MarshallingType.MAP) - .memberName("equals") - .getter(getter(ExistenceCheckNamingRequest::equalsValue)) - .setter(setter(Builder::equalsValue)) - .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("equals").build(), - MapTrait.builder() - .keyLocationName("key") - .valueLocationName("value") - .valueFieldInfo( - SdkField. builder(MarshallingType.STRING) - .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD) - .locationName("value").build()).build()).build()).build(); + .> builder(MarshallingType.MAP) + .memberName("equals") + .getter(getter(ExistenceCheckNamingRequest::equalsValue)) + .setter(setter(Builder::equalsValue)) + .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("equals").build(), + MapTrait.builder() + .keyLocationName("key") + .valueLocationName("value") + .valueFieldInfo( + SdkField. builder(MarshallingType.STRING) + .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD) + .locationName("value").build()).build()).build()).build(); private static final List> SDK_FIELDS = Collections.unmodifiableList(Arrays.asList(BUILD_FIELD, SUPER_FIELD, - TO_STRING_FIELD, EQUALS_FIELD)); + TO_STRING_FIELD, EQUALS_FIELD)); private final List build; @@ -123,7 +124,7 @@ public final boolean hasBuild() { *

* You can use {@link #hasBuild()} to see if a value was sent in this field. *

- * + * * @return The value of the Build property for this object. */ public final List build() { @@ -146,7 +147,7 @@ public final boolean hasSuperValue() { *

* You can use {@link #hasSuperValue()} to see if a value was sent in this field. *

- * + * * @return The value of the Super property for this object. */ public final List superValue() { @@ -169,7 +170,7 @@ public final boolean hasToStringValue() { *

* You can use {@link #hasToStringValue()} to see if a value was sent in this field. *

- * + * * @return The value of the ToString property for this object. */ public final Map toStringValue() { @@ -192,7 +193,7 @@ public final boolean hasEqualsValue() { *

* You can use {@link #hasEqualsValue()} to see if a value was sent in this field. *

- * + * * @return The value of the Equals property for this object. */ public final Map equalsValue() { @@ -241,9 +242,9 @@ public final boolean equalsBySdkFields(Object obj) { } ExistenceCheckNamingRequest other = (ExistenceCheckNamingRequest) obj; return hasBuild() == other.hasBuild() && Objects.equals(build(), other.build()) - && hasSuperValue() == other.hasSuperValue() && Objects.equals(superValue(), other.superValue()) - && hasToStringValue() == other.hasToStringValue() && Objects.equals(toStringValue(), other.toStringValue()) - && hasEqualsValue() == other.hasEqualsValue() && Objects.equals(equalsValue(), other.equalsValue()); + && hasSuperValue() == other.hasSuperValue() && Objects.equals(superValue(), other.superValue()) + && hasToStringValue() == other.hasToStringValue() && Objects.equals(toStringValue(), other.toStringValue()) + && hasEqualsValue() == other.hasEqualsValue() && Objects.equals(equalsValue(), other.equalsValue()); } /** @@ -253,22 +254,22 @@ && hasToStringValue() == other.hasToStringValue() && Objects.equals(toStringValu @Override public final String toString() { return ToString.builder("ExistenceCheckNamingRequest").add("Build", hasBuild() ? build() : null) - .add("Super", hasSuperValue() ? superValue() : null).add("ToString", hasToStringValue() ? toStringValue() : null) - .add("Equals", hasEqualsValue() ? equalsValue() : null).build(); + .add("Super", hasSuperValue() ? superValue() : null).add("ToString", hasToStringValue() ? toStringValue() : null) + .add("Equals", hasEqualsValue() ? equalsValue() : null).build(); } public final Optional getValueForField(String fieldName, Class clazz) { switch (fieldName) { - case "Build": - return Optional.ofNullable(clazz.cast(build())); - case "super": - return Optional.ofNullable(clazz.cast(superValue())); - case "toString": - return Optional.ofNullable(clazz.cast(toStringValue())); - case "equals": - return Optional.ofNullable(clazz.cast(equalsValue())); - default: - return Optional.empty(); + case "Build": + return Optional.ofNullable(clazz.cast(build())); + case "super": + return Optional.ofNullable(clazz.cast(superValue())); + case "toString": + return Optional.ofNullable(clazz.cast(toStringValue())); + case "equals": + return Optional.ofNullable(clazz.cast(equalsValue())); + default: + return Optional.empty(); } } @@ -286,7 +287,7 @@ private static BiConsumer setter(BiConsumer s) { } public interface Builder extends JsonProtocolTestsRequest.Builder, SdkPojo, - CopyableBuilder { + CopyableBuilder { /** * Sets the value of the Build property for this object. * @@ -375,23 +376,25 @@ public final Collection getBuild() { return build; } + public final void setBuild(Collection build) { + this.build = ListOfStringsCopier.copy(build); + } + @Override + @Transient public final Builder build(Collection build) { this.build = ListOfStringsCopier.copy(build); return this; } @Override + @Transient @SafeVarargs public final Builder build(String... build) { build(Arrays.asList(build)); return this; } - public final void setBuild(Collection build) { - this.build = ListOfStringsCopier.copy(build); - } - public final Collection getSuperValue() { if (superValue instanceof SdkAutoConstructList) { return null; @@ -399,23 +402,25 @@ public final Collection getSuperValue() { return superValue; } + public final void setSuperValue(Collection superValue) { + this.superValue = ListOfStringsCopier.copy(superValue); + } + @Override + @Transient public final Builder superValue(Collection superValue) { this.superValue = ListOfStringsCopier.copy(superValue); return this; } @Override + @Transient @SafeVarargs public final Builder superValue(String... superValue) { superValue(Arrays.asList(superValue)); return this; } - public final void setSuperValue(Collection superValue) { - this.superValue = ListOfStringsCopier.copy(superValue); - } - public final Map getToStringValue() { if (toStringValue instanceof SdkAutoConstructMap) { return null; @@ -423,14 +428,15 @@ public final Map getToStringValue() { return toStringValue; } - @Override - public final Builder toStringValue(Map toStringValue) { + public final void setToStringValue(Map toStringValue) { this.toStringValue = MapOfStringToStringCopier.copy(toStringValue); - return this; } - public final void setToStringValue(Map toStringValue) { + @Override + @Transient + public final Builder toStringValue(Map toStringValue) { this.toStringValue = MapOfStringToStringCopier.copy(toStringValue); + return this; } public final Map getEqualsValue() { @@ -440,14 +446,15 @@ public final Map getEqualsValue() { return equalsValue; } - @Override - public final Builder equalsValue(Map equalsValue) { + public final void setEqualsValue(Map equalsValue) { this.equalsValue = MapOfStringToStringCopier.copy(equalsValue); - return this; } - public final void setEqualsValue(Map equalsValue) { + @Override + @Transient + public final Builder equalsValue(Map equalsValue) { this.equalsValue = MapOfStringToStringCopier.copy(equalsValue); + return this; } @Override @@ -473,4 +480,3 @@ public List> sdkFields() { } } } - diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/existencechecknamingresponse.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/existencechecknamingresponse.java index 7432ab65d384..42154d91c8d9 100644 --- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/existencechecknamingresponse.java +++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/existencechecknamingresponse.java @@ -1,5 +1,6 @@ package software.amazon.awssdk.services.jsonprotocoltests.model; +import java.beans.Transient; import java.util.Arrays; import java.util.Collection; import java.util.Collections; @@ -29,65 +30,65 @@ */ @Generated("software.amazon.awssdk:codegen") public final class ExistenceCheckNamingResponse extends JsonProtocolTestsResponse implements - ToCopyableBuilder { + ToCopyableBuilder { private static final SdkField> BUILD_FIELD = SdkField - .> builder(MarshallingType.LIST) - .memberName("Build") - .getter(getter(ExistenceCheckNamingResponse::build)) - .setter(setter(Builder::build)) - .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("Build").build(), - ListTrait - .builder() - .memberLocationName(null) - .memberFieldInfo( - SdkField. builder(MarshallingType.STRING) - .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD) - .locationName("member").build()).build()).build()).build(); + .> builder(MarshallingType.LIST) + .memberName("Build") + .getter(getter(ExistenceCheckNamingResponse::build)) + .setter(setter(Builder::build)) + .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("Build").build(), + ListTrait + .builder() + .memberLocationName(null) + .memberFieldInfo( + SdkField. builder(MarshallingType.STRING) + .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD) + .locationName("member").build()).build()).build()).build(); private static final SdkField> SUPER_FIELD = SdkField - .> builder(MarshallingType.LIST) - .memberName("super") - .getter(getter(ExistenceCheckNamingResponse::superValue)) - .setter(setter(Builder::superValue)) - .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("super").build(), - ListTrait - .builder() - .memberLocationName(null) - .memberFieldInfo( - SdkField. builder(MarshallingType.STRING) - .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD) - .locationName("member").build()).build()).build()).build(); + .> builder(MarshallingType.LIST) + .memberName("super") + .getter(getter(ExistenceCheckNamingResponse::superValue)) + .setter(setter(Builder::superValue)) + .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("super").build(), + ListTrait + .builder() + .memberLocationName(null) + .memberFieldInfo( + SdkField. builder(MarshallingType.STRING) + .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD) + .locationName("member").build()).build()).build()).build(); private static final SdkField> TO_STRING_FIELD = SdkField - .> builder(MarshallingType.MAP) - .memberName("toString") - .getter(getter(ExistenceCheckNamingResponse::toStringValue)) - .setter(setter(Builder::toStringValue)) - .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("toString").build(), - MapTrait.builder() - .keyLocationName("key") - .valueLocationName("value") - .valueFieldInfo( - SdkField. builder(MarshallingType.STRING) - .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD) - .locationName("value").build()).build()).build()).build(); + .> builder(MarshallingType.MAP) + .memberName("toString") + .getter(getter(ExistenceCheckNamingResponse::toStringValue)) + .setter(setter(Builder::toStringValue)) + .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("toString").build(), + MapTrait.builder() + .keyLocationName("key") + .valueLocationName("value") + .valueFieldInfo( + SdkField. builder(MarshallingType.STRING) + .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD) + .locationName("value").build()).build()).build()).build(); private static final SdkField> EQUALS_FIELD = SdkField - .> builder(MarshallingType.MAP) - .memberName("equals") - .getter(getter(ExistenceCheckNamingResponse::equalsValue)) - .setter(setter(Builder::equalsValue)) - .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("equals").build(), - MapTrait.builder() - .keyLocationName("key") - .valueLocationName("value") - .valueFieldInfo( - SdkField. builder(MarshallingType.STRING) - .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD) - .locationName("value").build()).build()).build()).build(); + .> builder(MarshallingType.MAP) + .memberName("equals") + .getter(getter(ExistenceCheckNamingResponse::equalsValue)) + .setter(setter(Builder::equalsValue)) + .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("equals").build(), + MapTrait.builder() + .keyLocationName("key") + .valueLocationName("value") + .valueFieldInfo( + SdkField. builder(MarshallingType.STRING) + .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD) + .locationName("value").build()).build()).build()).build(); private static final List> SDK_FIELDS = Collections.unmodifiableList(Arrays.asList(BUILD_FIELD, SUPER_FIELD, - TO_STRING_FIELD, EQUALS_FIELD)); + TO_STRING_FIELD, EQUALS_FIELD)); private final List build; @@ -121,7 +122,7 @@ public final boolean hasBuild() { *

* You can use {@link #hasBuild()} to see if a value was sent in this field. *

- * + * * @return The value of the Build property for this object. */ public final List build() { @@ -144,7 +145,7 @@ public final boolean hasSuperValue() { *

* You can use {@link #hasSuperValue()} to see if a value was sent in this field. *

- * + * * @return The value of the Super property for this object. */ public final List superValue() { @@ -167,7 +168,7 @@ public final boolean hasToStringValue() { *

* You can use {@link #hasToStringValue()} to see if a value was sent in this field. *

- * + * * @return The value of the ToString property for this object. */ public final Map toStringValue() { @@ -190,7 +191,7 @@ public final boolean hasEqualsValue() { *

* You can use {@link #hasEqualsValue()} to see if a value was sent in this field. *

- * + * * @return The value of the Equals property for this object. */ public final Map equalsValue() { @@ -239,9 +240,9 @@ public final boolean equalsBySdkFields(Object obj) { } ExistenceCheckNamingResponse other = (ExistenceCheckNamingResponse) obj; return hasBuild() == other.hasBuild() && Objects.equals(build(), other.build()) - && hasSuperValue() == other.hasSuperValue() && Objects.equals(superValue(), other.superValue()) - && hasToStringValue() == other.hasToStringValue() && Objects.equals(toStringValue(), other.toStringValue()) - && hasEqualsValue() == other.hasEqualsValue() && Objects.equals(equalsValue(), other.equalsValue()); + && hasSuperValue() == other.hasSuperValue() && Objects.equals(superValue(), other.superValue()) + && hasToStringValue() == other.hasToStringValue() && Objects.equals(toStringValue(), other.toStringValue()) + && hasEqualsValue() == other.hasEqualsValue() && Objects.equals(equalsValue(), other.equalsValue()); } /** @@ -251,22 +252,22 @@ && hasToStringValue() == other.hasToStringValue() && Objects.equals(toStringValu @Override public final String toString() { return ToString.builder("ExistenceCheckNamingResponse").add("Build", hasBuild() ? build() : null) - .add("Super", hasSuperValue() ? superValue() : null).add("ToString", hasToStringValue() ? toStringValue() : null) - .add("Equals", hasEqualsValue() ? equalsValue() : null).build(); + .add("Super", hasSuperValue() ? superValue() : null).add("ToString", hasToStringValue() ? toStringValue() : null) + .add("Equals", hasEqualsValue() ? equalsValue() : null).build(); } public final Optional getValueForField(String fieldName, Class clazz) { switch (fieldName) { - case "Build": - return Optional.ofNullable(clazz.cast(build())); - case "super": - return Optional.ofNullable(clazz.cast(superValue())); - case "toString": - return Optional.ofNullable(clazz.cast(toStringValue())); - case "equals": - return Optional.ofNullable(clazz.cast(equalsValue())); - default: - return Optional.empty(); + case "Build": + return Optional.ofNullable(clazz.cast(build())); + case "super": + return Optional.ofNullable(clazz.cast(superValue())); + case "toString": + return Optional.ofNullable(clazz.cast(toStringValue())); + case "equals": + return Optional.ofNullable(clazz.cast(equalsValue())); + default: + return Optional.empty(); } } @@ -284,7 +285,7 @@ private static BiConsumer setter(BiConsumer s) { } public interface Builder extends JsonProtocolTestsResponse.Builder, SdkPojo, - CopyableBuilder { + CopyableBuilder { /** * Sets the value of the Build property for this object. * @@ -367,23 +368,25 @@ public final Collection getBuild() { return build; } + public final void setBuild(Collection build) { + this.build = ListOfStringsCopier.copy(build); + } + @Override + @Transient public final Builder build(Collection build) { this.build = ListOfStringsCopier.copy(build); return this; } @Override + @Transient @SafeVarargs public final Builder build(String... build) { build(Arrays.asList(build)); return this; } - public final void setBuild(Collection build) { - this.build = ListOfStringsCopier.copy(build); - } - public final Collection getSuperValue() { if (superValue instanceof SdkAutoConstructList) { return null; @@ -391,23 +394,25 @@ public final Collection getSuperValue() { return superValue; } + public final void setSuperValue(Collection superValue) { + this.superValue = ListOfStringsCopier.copy(superValue); + } + @Override + @Transient public final Builder superValue(Collection superValue) { this.superValue = ListOfStringsCopier.copy(superValue); return this; } @Override + @Transient @SafeVarargs public final Builder superValue(String... superValue) { superValue(Arrays.asList(superValue)); return this; } - public final void setSuperValue(Collection superValue) { - this.superValue = ListOfStringsCopier.copy(superValue); - } - public final Map getToStringValue() { if (toStringValue instanceof SdkAutoConstructMap) { return null; @@ -415,14 +420,15 @@ public final Map getToStringValue() { return toStringValue; } - @Override - public final Builder toStringValue(Map toStringValue) { + public final void setToStringValue(Map toStringValue) { this.toStringValue = MapOfStringToStringCopier.copy(toStringValue); - return this; } - public final void setToStringValue(Map toStringValue) { + @Override + @Transient + public final Builder toStringValue(Map toStringValue) { this.toStringValue = MapOfStringToStringCopier.copy(toStringValue); + return this; } public final Map getEqualsValue() { @@ -432,14 +438,15 @@ public final Map getEqualsValue() { return equalsValue; } - @Override - public final Builder equalsValue(Map equalsValue) { + public final void setEqualsValue(Map equalsValue) { this.equalsValue = MapOfStringToStringCopier.copy(equalsValue); - return this; } - public final void setEqualsValue(Map equalsValue) { + @Override + @Transient + public final Builder equalsValue(Map equalsValue) { this.equalsValue = MapOfStringToStringCopier.copy(equalsValue); + return this; } @Override @@ -453,4 +460,3 @@ public List> sdkFields() { } } } - diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/inputevent.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/inputevent.java index a1dee9f6070a..20c10aa3a12b 100644 --- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/inputevent.java +++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/inputevent.java @@ -1,5 +1,6 @@ package software.amazon.awssdk.services.jsonprotocoltests.model; +import java.beans.Transient; import java.io.Serializable; import java.nio.ByteBuffer; import java.util.Arrays; @@ -155,16 +156,17 @@ public final ByteBuffer getExplicitPayloadMember() { return explicitPayloadMember == null ? null : explicitPayloadMember.asByteBuffer(); } + public final void setExplicitPayloadMember(ByteBuffer explicitPayloadMember) { + explicitPayloadMember(explicitPayloadMember == null ? null : SdkBytes.fromByteBuffer(explicitPayloadMember)); + } + @Override + @Transient public final Builder explicitPayloadMember(SdkBytes explicitPayloadMember) { this.explicitPayloadMember = explicitPayloadMember; return this; } - public final void setExplicitPayloadMember(ByteBuffer explicitPayloadMember) { - explicitPayloadMember(explicitPayloadMember == null ? null : SdkBytes.fromByteBuffer(explicitPayloadMember)); - } - @Override public InputEvent build() { return new InputEvent(this); diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/inputeventtwo.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/inputeventtwo.java index 9976d1457f24..4a7da0677171 100644 --- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/inputeventtwo.java +++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/inputeventtwo.java @@ -1,5 +1,6 @@ package software.amazon.awssdk.services.jsonprotocoltests.model; +import java.beans.Transient; import java.io.Serializable; import java.nio.ByteBuffer; import java.util.Arrays; @@ -222,42 +223,45 @@ public final ByteBuffer getImplicitPayloadMemberOne() { return implicitPayloadMemberOne == null ? null : implicitPayloadMemberOne.asByteBuffer(); } + public final void setImplicitPayloadMemberOne(ByteBuffer implicitPayloadMemberOne) { + implicitPayloadMemberOne(implicitPayloadMemberOne == null ? null : SdkBytes.fromByteBuffer(implicitPayloadMemberOne)); + } + @Override + @Transient public final Builder implicitPayloadMemberOne(SdkBytes implicitPayloadMemberOne) { this.implicitPayloadMemberOne = implicitPayloadMemberOne; return this; } - public final void setImplicitPayloadMemberOne(ByteBuffer implicitPayloadMemberOne) { - implicitPayloadMemberOne(implicitPayloadMemberOne == null ? null : SdkBytes.fromByteBuffer(implicitPayloadMemberOne)); - } - public final String getImplicitPayloadMemberTwo() { return implicitPayloadMemberTwo; } - @Override - public final Builder implicitPayloadMemberTwo(String implicitPayloadMemberTwo) { + public final void setImplicitPayloadMemberTwo(String implicitPayloadMemberTwo) { this.implicitPayloadMemberTwo = implicitPayloadMemberTwo; - return this; } - public final void setImplicitPayloadMemberTwo(String implicitPayloadMemberTwo) { + @Override + @Transient + public final Builder implicitPayloadMemberTwo(String implicitPayloadMemberTwo) { this.implicitPayloadMemberTwo = implicitPayloadMemberTwo; + return this; } public final String getEventHeaderMember() { return eventHeaderMember; } - @Override - public final Builder eventHeaderMember(String eventHeaderMember) { + public final void setEventHeaderMember(String eventHeaderMember) { this.eventHeaderMember = eventHeaderMember; - return this; } - public final void setEventHeaderMember(String eventHeaderMember) { + @Override + @Transient + public final Builder eventHeaderMember(String eventHeaderMember) { this.eventHeaderMember = eventHeaderMember; + return this; } @Override diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/nestedcontainersrequest.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/nestedcontainersrequest.java index 7b68fc584031..bbe32e25d168 100644 --- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/nestedcontainersrequest.java +++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/nestedcontainersrequest.java @@ -1,5 +1,6 @@ package software.amazon.awssdk.services.jsonprotocoltests.model; +import java.beans.Transient; import java.util.Arrays; import java.util.Collection; import java.util.Collections; @@ -31,107 +32,107 @@ */ @Generated("software.amazon.awssdk:codegen") public final class NestedContainersRequest extends JsonProtocolTestsRequest implements - ToCopyableBuilder { + ToCopyableBuilder { private static final SdkField>> LIST_OF_LIST_OF_STRINGS_FIELD = SdkField - .>> builder(MarshallingType.LIST) - .memberName("ListOfListOfStrings") - .getter(getter(NestedContainersRequest::listOfListOfStrings)) - .setter(setter(Builder::listOfListOfStrings)) - .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("ListOfListOfStrings").build(), - ListTrait - .builder() - .memberLocationName(null) - .memberFieldInfo( - SdkField.> builder(MarshallingType.LIST) - .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD) - .locationName("member").build(), - ListTrait - .builder() - .memberLocationName(null) - .memberFieldInfo( - SdkField. builder(MarshallingType.STRING) - .traits(LocationTrait.builder() - .location(MarshallLocation.PAYLOAD) - .locationName("member").build()).build()) - .build()).build()).build()).build(); + .>> builder(MarshallingType.LIST) + .memberName("ListOfListOfStrings") + .getter(getter(NestedContainersRequest::listOfListOfStrings)) + .setter(setter(Builder::listOfListOfStrings)) + .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("ListOfListOfStrings").build(), + ListTrait + .builder() + .memberLocationName(null) + .memberFieldInfo( + SdkField.> builder(MarshallingType.LIST) + .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD) + .locationName("member").build(), + ListTrait + .builder() + .memberLocationName(null) + .memberFieldInfo( + SdkField. builder(MarshallingType.STRING) + .traits(LocationTrait.builder() + .location(MarshallLocation.PAYLOAD) + .locationName("member").build()).build()) + .build()).build()).build()).build(); private static final SdkField>>> LIST_OF_LIST_OF_LIST_OF_STRINGS_FIELD = SdkField - .>>> builder(MarshallingType.LIST) - .memberName("ListOfListOfListOfStrings") - .getter(getter(NestedContainersRequest::listOfListOfListOfStrings)) - .setter(setter(Builder::listOfListOfListOfStrings)) - .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("ListOfListOfListOfStrings").build(), - ListTrait - .builder() - .memberLocationName(null) - .memberFieldInfo( - SdkField.>> builder(MarshallingType.LIST) - .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD) - .locationName("member").build(), - ListTrait - .builder() - .memberLocationName(null) - .memberFieldInfo( - SdkField.> builder(MarshallingType.LIST) - .traits(LocationTrait.builder() - .location(MarshallLocation.PAYLOAD) - .locationName("member").build(), - ListTrait + .>>> builder(MarshallingType.LIST) + .memberName("ListOfListOfListOfStrings") + .getter(getter(NestedContainersRequest::listOfListOfListOfStrings)) + .setter(setter(Builder::listOfListOfListOfStrings)) + .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("ListOfListOfListOfStrings").build(), + ListTrait + .builder() + .memberLocationName(null) + .memberFieldInfo( + SdkField.>> builder(MarshallingType.LIST) + .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD) + .locationName("member").build(), + ListTrait + .builder() + .memberLocationName(null) + .memberFieldInfo( + SdkField.> builder(MarshallingType.LIST) + .traits(LocationTrait.builder() + .location(MarshallLocation.PAYLOAD) + .locationName("member").build(), + ListTrait + .builder() + .memberLocationName(null) + .memberFieldInfo( + SdkField. builder( + MarshallingType.STRING) + .traits(LocationTrait .builder() - .memberLocationName(null) - .memberFieldInfo( - SdkField. builder( - MarshallingType.STRING) - .traits(LocationTrait - .builder() - .location( - MarshallLocation.PAYLOAD) - .locationName( - "member") - .build()) - .build()).build()) - .build()).build()).build()).build()).build(); + .location( + MarshallLocation.PAYLOAD) + .locationName( + "member") + .build()) + .build()).build()) + .build()).build()).build()).build()).build(); private static final SdkField>>> MAP_OF_STRING_TO_LIST_OF_LIST_OF_STRINGS_FIELD = SdkField - .>>> builder(MarshallingType.MAP) - .memberName("MapOfStringToListOfListOfStrings") - .getter(getter(NestedContainersRequest::mapOfStringToListOfListOfStrings)) - .setter(setter(Builder::mapOfStringToListOfListOfStrings)) - .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfStringToListOfListOfStrings") - .build(), - MapTrait.builder() - .keyLocationName("key") - .valueLocationName("value") - .valueFieldInfo( - SdkField.>> builder(MarshallingType.LIST) - .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD) - .locationName("value").build(), - ListTrait - .builder() - .memberLocationName(null) - .memberFieldInfo( - SdkField.> builder(MarshallingType.LIST) - .traits(LocationTrait.builder() - .location(MarshallLocation.PAYLOAD) - .locationName("member").build(), - ListTrait - .builder() - .memberLocationName(null) - .memberFieldInfo( - SdkField. builder( - MarshallingType.STRING) - .traits(LocationTrait - .builder() - .location( - MarshallLocation.PAYLOAD) - .locationName( - "member") - .build()) - .build()).build()) - .build()).build()).build()).build()).build(); + .>>> builder(MarshallingType.MAP) + .memberName("MapOfStringToListOfListOfStrings") + .getter(getter(NestedContainersRequest::mapOfStringToListOfListOfStrings)) + .setter(setter(Builder::mapOfStringToListOfListOfStrings)) + .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfStringToListOfListOfStrings") + .build(), + MapTrait.builder() + .keyLocationName("key") + .valueLocationName("value") + .valueFieldInfo( + SdkField.>> builder(MarshallingType.LIST) + .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD) + .locationName("value").build(), + ListTrait + .builder() + .memberLocationName(null) + .memberFieldInfo( + SdkField.> builder(MarshallingType.LIST) + .traits(LocationTrait.builder() + .location(MarshallLocation.PAYLOAD) + .locationName("member").build(), + ListTrait + .builder() + .memberLocationName(null) + .memberFieldInfo( + SdkField. builder( + MarshallingType.STRING) + .traits(LocationTrait + .builder() + .location( + MarshallLocation.PAYLOAD) + .locationName( + "member") + .build()) + .build()).build()) + .build()).build()).build()).build()).build(); private static final List> SDK_FIELDS = Collections.unmodifiableList(Arrays.asList(LIST_OF_LIST_OF_STRINGS_FIELD, - LIST_OF_LIST_OF_LIST_OF_STRINGS_FIELD, MAP_OF_STRING_TO_LIST_OF_LIST_OF_STRINGS_FIELD)); + LIST_OF_LIST_OF_LIST_OF_STRINGS_FIELD, MAP_OF_STRING_TO_LIST_OF_LIST_OF_STRINGS_FIELD)); private final List> listOfListOfStrings; @@ -163,7 +164,7 @@ public final boolean hasListOfListOfStrings() { *

* You can use {@link #hasListOfListOfStrings()} to see if a value was sent in this field. *

- * + * * @return The value of the ListOfListOfStrings property for this object. */ public final List> listOfListOfStrings() { @@ -187,7 +188,7 @@ public final boolean hasListOfListOfListOfStrings() { *

* You can use {@link #hasListOfListOfListOfStrings()} to see if a value was sent in this field. *

- * + * * @return The value of the ListOfListOfListOfStrings property for this object. */ public final List>> listOfListOfListOfStrings() { @@ -211,7 +212,7 @@ public final boolean hasMapOfStringToListOfListOfStrings() { *

* You can use {@link #hasMapOfStringToListOfListOfStrings()} to see if a value was sent in this field. *

- * + * * @return The value of the MapOfStringToListOfListOfStrings property for this object. */ public final Map>> mapOfStringToListOfListOfStrings() { @@ -238,7 +239,7 @@ public final int hashCode() { hashCode = 31 * hashCode + Objects.hashCode(hasListOfListOfStrings() ? listOfListOfStrings() : null); hashCode = 31 * hashCode + Objects.hashCode(hasListOfListOfListOfStrings() ? listOfListOfListOfStrings() : null); hashCode = 31 * hashCode - + Objects.hashCode(hasMapOfStringToListOfListOfStrings() ? mapOfStringToListOfListOfStrings() : null); + + Objects.hashCode(hasMapOfStringToListOfListOfStrings() ? mapOfStringToListOfListOfStrings() : null); return hashCode; } @@ -260,11 +261,11 @@ public final boolean equalsBySdkFields(Object obj) { } NestedContainersRequest other = (NestedContainersRequest) obj; return hasListOfListOfStrings() == other.hasListOfListOfStrings() - && Objects.equals(listOfListOfStrings(), other.listOfListOfStrings()) - && hasListOfListOfListOfStrings() == other.hasListOfListOfListOfStrings() - && Objects.equals(listOfListOfListOfStrings(), other.listOfListOfListOfStrings()) - && hasMapOfStringToListOfListOfStrings() == other.hasMapOfStringToListOfListOfStrings() - && Objects.equals(mapOfStringToListOfListOfStrings(), other.mapOfStringToListOfListOfStrings()); + && Objects.equals(listOfListOfStrings(), other.listOfListOfStrings()) + && hasListOfListOfListOfStrings() == other.hasListOfListOfListOfStrings() + && Objects.equals(listOfListOfListOfStrings(), other.listOfListOfListOfStrings()) + && hasMapOfStringToListOfListOfStrings() == other.hasMapOfStringToListOfListOfStrings() + && Objects.equals(mapOfStringToListOfListOfStrings(), other.mapOfStringToListOfListOfStrings()); } /** @@ -274,23 +275,23 @@ && hasMapOfStringToListOfListOfStrings() == other.hasMapOfStringToListOfListOfSt @Override public final String toString() { return ToString - .builder("NestedContainersRequest") - .add("ListOfListOfStrings", hasListOfListOfStrings() ? listOfListOfStrings() : null) - .add("ListOfListOfListOfStrings", hasListOfListOfListOfStrings() ? listOfListOfListOfStrings() : null) - .add("MapOfStringToListOfListOfStrings", - hasMapOfStringToListOfListOfStrings() ? mapOfStringToListOfListOfStrings() : null).build(); + .builder("NestedContainersRequest") + .add("ListOfListOfStrings", hasListOfListOfStrings() ? listOfListOfStrings() : null) + .add("ListOfListOfListOfStrings", hasListOfListOfListOfStrings() ? listOfListOfListOfStrings() : null) + .add("MapOfStringToListOfListOfStrings", + hasMapOfStringToListOfListOfStrings() ? mapOfStringToListOfListOfStrings() : null).build(); } public final Optional getValueForField(String fieldName, Class clazz) { switch (fieldName) { - case "ListOfListOfStrings": - return Optional.ofNullable(clazz.cast(listOfListOfStrings())); - case "ListOfListOfListOfStrings": - return Optional.ofNullable(clazz.cast(listOfListOfListOfStrings())); - case "MapOfStringToListOfListOfStrings": - return Optional.ofNullable(clazz.cast(mapOfStringToListOfListOfStrings())); - default: - return Optional.empty(); + case "ListOfListOfStrings": + return Optional.ofNullable(clazz.cast(listOfListOfStrings())); + case "ListOfListOfListOfStrings": + return Optional.ofNullable(clazz.cast(listOfListOfListOfStrings())); + case "MapOfStringToListOfListOfStrings": + return Optional.ofNullable(clazz.cast(mapOfStringToListOfListOfStrings())); + default: + return Optional.empty(); } } @@ -352,7 +353,7 @@ public interface Builder extends JsonProtocolTestsRequest.Builder, SdkPojo, Copy * @return Returns a reference to this object so that method calls can be chained together. */ Builder mapOfStringToListOfListOfStrings( - Map>> mapOfStringToListOfListOfStrings); + Map>> mapOfStringToListOfListOfStrings); @Override Builder overrideConfiguration(AwsRequestOverrideConfiguration overrideConfiguration); @@ -385,23 +386,25 @@ public final Collection> getListOfListOfStrings() { return listOfListOfStrings; } + public final void setListOfListOfStrings(Collection> listOfListOfStrings) { + this.listOfListOfStrings = ListOfListOfStringsCopier.copy(listOfListOfStrings); + } + @Override + @Transient public final Builder listOfListOfStrings(Collection> listOfListOfStrings) { this.listOfListOfStrings = ListOfListOfStringsCopier.copy(listOfListOfStrings); return this; } @Override + @Transient @SafeVarargs public final Builder listOfListOfStrings(Collection... listOfListOfStrings) { listOfListOfStrings(Arrays.asList(listOfListOfStrings)); return this; } - public final void setListOfListOfStrings(Collection> listOfListOfStrings) { - this.listOfListOfStrings = ListOfListOfStringsCopier.copy(listOfListOfStrings); - } - public final Collection>> getListOfListOfListOfStrings() { if (listOfListOfListOfStrings instanceof SdkAutoConstructList) { return null; @@ -409,25 +412,27 @@ public final Collection>> getL return listOfListOfListOfStrings; } + public final void setListOfListOfListOfStrings( + Collection>> listOfListOfListOfStrings) { + this.listOfListOfListOfStrings = ListOfListOfListOfStringsCopier.copy(listOfListOfListOfStrings); + } + @Override + @Transient public final Builder listOfListOfListOfStrings( - Collection>> listOfListOfListOfStrings) { + Collection>> listOfListOfListOfStrings) { this.listOfListOfListOfStrings = ListOfListOfListOfStringsCopier.copy(listOfListOfListOfStrings); return this; } @Override + @Transient @SafeVarargs public final Builder listOfListOfListOfStrings(Collection>... listOfListOfListOfStrings) { listOfListOfListOfStrings(Arrays.asList(listOfListOfListOfStrings)); return this; } - public final void setListOfListOfListOfStrings( - Collection>> listOfListOfListOfStrings) { - this.listOfListOfListOfStrings = ListOfListOfListOfStringsCopier.copy(listOfListOfListOfStrings); - } - public final Map>> getMapOfStringToListOfListOfStrings() { if (mapOfStringToListOfListOfStrings instanceof SdkAutoConstructMap) { return null; @@ -435,16 +440,17 @@ public final void setListOfListOfListOfStrings( return mapOfStringToListOfListOfStrings; } - @Override - public final Builder mapOfStringToListOfListOfStrings( - Map>> mapOfStringToListOfListOfStrings) { + public final void setMapOfStringToListOfListOfStrings( + Map>> mapOfStringToListOfListOfStrings) { this.mapOfStringToListOfListOfStrings = MapOfStringToListOfListOfStringsCopier.copy(mapOfStringToListOfListOfStrings); - return this; } - public final void setMapOfStringToListOfListOfStrings( - Map>> mapOfStringToListOfListOfStrings) { + @Override + @Transient + public final Builder mapOfStringToListOfListOfStrings( + Map>> mapOfStringToListOfListOfStrings) { this.mapOfStringToListOfListOfStrings = MapOfStringToListOfListOfStringsCopier.copy(mapOfStringToListOfListOfStrings); + return this; } @Override @@ -470,4 +476,3 @@ public List> sdkFields() { } } } - diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/nestedcontainersresponse.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/nestedcontainersresponse.java index 6ff648142973..f61d2f29d6c9 100644 --- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/nestedcontainersresponse.java +++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/nestedcontainersresponse.java @@ -1,5 +1,6 @@ package software.amazon.awssdk.services.jsonprotocoltests.model; +import java.beans.Transient; import java.util.Arrays; import java.util.Collection; import java.util.Collections; @@ -29,107 +30,107 @@ */ @Generated("software.amazon.awssdk:codegen") public final class NestedContainersResponse extends JsonProtocolTestsResponse implements - ToCopyableBuilder { + ToCopyableBuilder { private static final SdkField>> LIST_OF_LIST_OF_STRINGS_FIELD = SdkField - .>> builder(MarshallingType.LIST) - .memberName("ListOfListOfStrings") - .getter(getter(NestedContainersResponse::listOfListOfStrings)) - .setter(setter(Builder::listOfListOfStrings)) - .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("ListOfListOfStrings").build(), - ListTrait - .builder() - .memberLocationName(null) - .memberFieldInfo( - SdkField.> builder(MarshallingType.LIST) - .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD) - .locationName("member").build(), - ListTrait - .builder() - .memberLocationName(null) - .memberFieldInfo( - SdkField. builder(MarshallingType.STRING) - .traits(LocationTrait.builder() - .location(MarshallLocation.PAYLOAD) - .locationName("member").build()).build()) - .build()).build()).build()).build(); + .>> builder(MarshallingType.LIST) + .memberName("ListOfListOfStrings") + .getter(getter(NestedContainersResponse::listOfListOfStrings)) + .setter(setter(Builder::listOfListOfStrings)) + .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("ListOfListOfStrings").build(), + ListTrait + .builder() + .memberLocationName(null) + .memberFieldInfo( + SdkField.> builder(MarshallingType.LIST) + .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD) + .locationName("member").build(), + ListTrait + .builder() + .memberLocationName(null) + .memberFieldInfo( + SdkField. builder(MarshallingType.STRING) + .traits(LocationTrait.builder() + .location(MarshallLocation.PAYLOAD) + .locationName("member").build()).build()) + .build()).build()).build()).build(); private static final SdkField>>> LIST_OF_LIST_OF_LIST_OF_STRINGS_FIELD = SdkField - .>>> builder(MarshallingType.LIST) - .memberName("ListOfListOfListOfStrings") - .getter(getter(NestedContainersResponse::listOfListOfListOfStrings)) - .setter(setter(Builder::listOfListOfListOfStrings)) - .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("ListOfListOfListOfStrings").build(), - ListTrait - .builder() - .memberLocationName(null) - .memberFieldInfo( - SdkField.>> builder(MarshallingType.LIST) - .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD) - .locationName("member").build(), - ListTrait - .builder() - .memberLocationName(null) - .memberFieldInfo( - SdkField.> builder(MarshallingType.LIST) - .traits(LocationTrait.builder() - .location(MarshallLocation.PAYLOAD) - .locationName("member").build(), - ListTrait + .>>> builder(MarshallingType.LIST) + .memberName("ListOfListOfListOfStrings") + .getter(getter(NestedContainersResponse::listOfListOfListOfStrings)) + .setter(setter(Builder::listOfListOfListOfStrings)) + .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("ListOfListOfListOfStrings").build(), + ListTrait + .builder() + .memberLocationName(null) + .memberFieldInfo( + SdkField.>> builder(MarshallingType.LIST) + .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD) + .locationName("member").build(), + ListTrait + .builder() + .memberLocationName(null) + .memberFieldInfo( + SdkField.> builder(MarshallingType.LIST) + .traits(LocationTrait.builder() + .location(MarshallLocation.PAYLOAD) + .locationName("member").build(), + ListTrait + .builder() + .memberLocationName(null) + .memberFieldInfo( + SdkField. builder( + MarshallingType.STRING) + .traits(LocationTrait .builder() - .memberLocationName(null) - .memberFieldInfo( - SdkField. builder( - MarshallingType.STRING) - .traits(LocationTrait - .builder() - .location( - MarshallLocation.PAYLOAD) - .locationName( - "member") - .build()) - .build()).build()) - .build()).build()).build()).build()).build(); + .location( + MarshallLocation.PAYLOAD) + .locationName( + "member") + .build()) + .build()).build()) + .build()).build()).build()).build()).build(); private static final SdkField>>> MAP_OF_STRING_TO_LIST_OF_LIST_OF_STRINGS_FIELD = SdkField - .>>> builder(MarshallingType.MAP) - .memberName("MapOfStringToListOfListOfStrings") - .getter(getter(NestedContainersResponse::mapOfStringToListOfListOfStrings)) - .setter(setter(Builder::mapOfStringToListOfListOfStrings)) - .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfStringToListOfListOfStrings") - .build(), - MapTrait.builder() - .keyLocationName("key") - .valueLocationName("value") - .valueFieldInfo( - SdkField.>> builder(MarshallingType.LIST) - .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD) - .locationName("value").build(), - ListTrait - .builder() - .memberLocationName(null) - .memberFieldInfo( - SdkField.> builder(MarshallingType.LIST) - .traits(LocationTrait.builder() - .location(MarshallLocation.PAYLOAD) - .locationName("member").build(), - ListTrait - .builder() - .memberLocationName(null) - .memberFieldInfo( - SdkField. builder( - MarshallingType.STRING) - .traits(LocationTrait - .builder() - .location( - MarshallLocation.PAYLOAD) - .locationName( - "member") - .build()) - .build()).build()) - .build()).build()).build()).build()).build(); + .>>> builder(MarshallingType.MAP) + .memberName("MapOfStringToListOfListOfStrings") + .getter(getter(NestedContainersResponse::mapOfStringToListOfListOfStrings)) + .setter(setter(Builder::mapOfStringToListOfListOfStrings)) + .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfStringToListOfListOfStrings") + .build(), + MapTrait.builder() + .keyLocationName("key") + .valueLocationName("value") + .valueFieldInfo( + SdkField.>> builder(MarshallingType.LIST) + .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD) + .locationName("value").build(), + ListTrait + .builder() + .memberLocationName(null) + .memberFieldInfo( + SdkField.> builder(MarshallingType.LIST) + .traits(LocationTrait.builder() + .location(MarshallLocation.PAYLOAD) + .locationName("member").build(), + ListTrait + .builder() + .memberLocationName(null) + .memberFieldInfo( + SdkField. builder( + MarshallingType.STRING) + .traits(LocationTrait + .builder() + .location( + MarshallLocation.PAYLOAD) + .locationName( + "member") + .build()) + .build()).build()) + .build()).build()).build()).build()).build(); private static final List> SDK_FIELDS = Collections.unmodifiableList(Arrays.asList(LIST_OF_LIST_OF_STRINGS_FIELD, - LIST_OF_LIST_OF_LIST_OF_STRINGS_FIELD, MAP_OF_STRING_TO_LIST_OF_LIST_OF_STRINGS_FIELD)); + LIST_OF_LIST_OF_LIST_OF_STRINGS_FIELD, MAP_OF_STRING_TO_LIST_OF_LIST_OF_STRINGS_FIELD)); private final List> listOfListOfStrings; @@ -161,7 +162,7 @@ public final boolean hasListOfListOfStrings() { *

* You can use {@link #hasListOfListOfStrings()} to see if a value was sent in this field. *

- * + * * @return The value of the ListOfListOfStrings property for this object. */ public final List> listOfListOfStrings() { @@ -185,7 +186,7 @@ public final boolean hasListOfListOfListOfStrings() { *

* You can use {@link #hasListOfListOfListOfStrings()} to see if a value was sent in this field. *

- * + * * @return The value of the ListOfListOfListOfStrings property for this object. */ public final List>> listOfListOfListOfStrings() { @@ -209,7 +210,7 @@ public final boolean hasMapOfStringToListOfListOfStrings() { *

* You can use {@link #hasMapOfStringToListOfListOfStrings()} to see if a value was sent in this field. *

- * + * * @return The value of the MapOfStringToListOfListOfStrings property for this object. */ public final Map>> mapOfStringToListOfListOfStrings() { @@ -236,7 +237,7 @@ public final int hashCode() { hashCode = 31 * hashCode + Objects.hashCode(hasListOfListOfStrings() ? listOfListOfStrings() : null); hashCode = 31 * hashCode + Objects.hashCode(hasListOfListOfListOfStrings() ? listOfListOfListOfStrings() : null); hashCode = 31 * hashCode - + Objects.hashCode(hasMapOfStringToListOfListOfStrings() ? mapOfStringToListOfListOfStrings() : null); + + Objects.hashCode(hasMapOfStringToListOfListOfStrings() ? mapOfStringToListOfListOfStrings() : null); return hashCode; } @@ -258,11 +259,11 @@ public final boolean equalsBySdkFields(Object obj) { } NestedContainersResponse other = (NestedContainersResponse) obj; return hasListOfListOfStrings() == other.hasListOfListOfStrings() - && Objects.equals(listOfListOfStrings(), other.listOfListOfStrings()) - && hasListOfListOfListOfStrings() == other.hasListOfListOfListOfStrings() - && Objects.equals(listOfListOfListOfStrings(), other.listOfListOfListOfStrings()) - && hasMapOfStringToListOfListOfStrings() == other.hasMapOfStringToListOfListOfStrings() - && Objects.equals(mapOfStringToListOfListOfStrings(), other.mapOfStringToListOfListOfStrings()); + && Objects.equals(listOfListOfStrings(), other.listOfListOfStrings()) + && hasListOfListOfListOfStrings() == other.hasListOfListOfListOfStrings() + && Objects.equals(listOfListOfListOfStrings(), other.listOfListOfListOfStrings()) + && hasMapOfStringToListOfListOfStrings() == other.hasMapOfStringToListOfListOfStrings() + && Objects.equals(mapOfStringToListOfListOfStrings(), other.mapOfStringToListOfListOfStrings()); } /** @@ -272,23 +273,23 @@ && hasMapOfStringToListOfListOfStrings() == other.hasMapOfStringToListOfListOfSt @Override public final String toString() { return ToString - .builder("NestedContainersResponse") - .add("ListOfListOfStrings", hasListOfListOfStrings() ? listOfListOfStrings() : null) - .add("ListOfListOfListOfStrings", hasListOfListOfListOfStrings() ? listOfListOfListOfStrings() : null) - .add("MapOfStringToListOfListOfStrings", - hasMapOfStringToListOfListOfStrings() ? mapOfStringToListOfListOfStrings() : null).build(); + .builder("NestedContainersResponse") + .add("ListOfListOfStrings", hasListOfListOfStrings() ? listOfListOfStrings() : null) + .add("ListOfListOfListOfStrings", hasListOfListOfListOfStrings() ? listOfListOfListOfStrings() : null) + .add("MapOfStringToListOfListOfStrings", + hasMapOfStringToListOfListOfStrings() ? mapOfStringToListOfListOfStrings() : null).build(); } public final Optional getValueForField(String fieldName, Class clazz) { switch (fieldName) { - case "ListOfListOfStrings": - return Optional.ofNullable(clazz.cast(listOfListOfStrings())); - case "ListOfListOfListOfStrings": - return Optional.ofNullable(clazz.cast(listOfListOfListOfStrings())); - case "MapOfStringToListOfListOfStrings": - return Optional.ofNullable(clazz.cast(mapOfStringToListOfListOfStrings())); - default: - return Optional.empty(); + case "ListOfListOfStrings": + return Optional.ofNullable(clazz.cast(listOfListOfStrings())); + case "ListOfListOfListOfStrings": + return Optional.ofNullable(clazz.cast(listOfListOfListOfStrings())); + case "MapOfStringToListOfListOfStrings": + return Optional.ofNullable(clazz.cast(mapOfStringToListOfListOfStrings())); + default: + return Optional.empty(); } } @@ -306,7 +307,7 @@ private static BiConsumer setter(BiConsumer s) { } public interface Builder extends JsonProtocolTestsResponse.Builder, SdkPojo, - CopyableBuilder { + CopyableBuilder { /** * Sets the value of the ListOfListOfStrings property for this object. * @@ -351,7 +352,7 @@ public interface Builder extends JsonProtocolTestsResponse.Builder, SdkPojo, * @return Returns a reference to this object so that method calls can be chained together. */ Builder mapOfStringToListOfListOfStrings( - Map>> mapOfStringToListOfListOfStrings); + Map>> mapOfStringToListOfListOfStrings); } static final class BuilderImpl extends JsonProtocolTestsResponse.BuilderImpl implements Builder { @@ -378,23 +379,25 @@ public final Collection> getListOfListOfStrings() { return listOfListOfStrings; } + public final void setListOfListOfStrings(Collection> listOfListOfStrings) { + this.listOfListOfStrings = ListOfListOfStringsCopier.copy(listOfListOfStrings); + } + @Override + @Transient public final Builder listOfListOfStrings(Collection> listOfListOfStrings) { this.listOfListOfStrings = ListOfListOfStringsCopier.copy(listOfListOfStrings); return this; } @Override + @Transient @SafeVarargs public final Builder listOfListOfStrings(Collection... listOfListOfStrings) { listOfListOfStrings(Arrays.asList(listOfListOfStrings)); return this; } - public final void setListOfListOfStrings(Collection> listOfListOfStrings) { - this.listOfListOfStrings = ListOfListOfStringsCopier.copy(listOfListOfStrings); - } - public final Collection>> getListOfListOfListOfStrings() { if (listOfListOfListOfStrings instanceof SdkAutoConstructList) { return null; @@ -402,25 +405,27 @@ public final Collection>> getL return listOfListOfListOfStrings; } + public final void setListOfListOfListOfStrings( + Collection>> listOfListOfListOfStrings) { + this.listOfListOfListOfStrings = ListOfListOfListOfStringsCopier.copy(listOfListOfListOfStrings); + } + @Override + @Transient public final Builder listOfListOfListOfStrings( - Collection>> listOfListOfListOfStrings) { + Collection>> listOfListOfListOfStrings) { this.listOfListOfListOfStrings = ListOfListOfListOfStringsCopier.copy(listOfListOfListOfStrings); return this; } @Override + @Transient @SafeVarargs public final Builder listOfListOfListOfStrings(Collection>... listOfListOfListOfStrings) { listOfListOfListOfStrings(Arrays.asList(listOfListOfListOfStrings)); return this; } - public final void setListOfListOfListOfStrings( - Collection>> listOfListOfListOfStrings) { - this.listOfListOfListOfStrings = ListOfListOfListOfStringsCopier.copy(listOfListOfListOfStrings); - } - public final Map>> getMapOfStringToListOfListOfStrings() { if (mapOfStringToListOfListOfStrings instanceof SdkAutoConstructMap) { return null; @@ -428,16 +433,17 @@ public final void setListOfListOfListOfStrings( return mapOfStringToListOfListOfStrings; } - @Override - public final Builder mapOfStringToListOfListOfStrings( - Map>> mapOfStringToListOfListOfStrings) { + public final void setMapOfStringToListOfListOfStrings( + Map>> mapOfStringToListOfListOfStrings) { this.mapOfStringToListOfListOfStrings = MapOfStringToListOfListOfStringsCopier.copy(mapOfStringToListOfListOfStrings); - return this; } - public final void setMapOfStringToListOfListOfStrings( - Map>> mapOfStringToListOfListOfStrings) { + @Override + @Transient + public final Builder mapOfStringToListOfListOfStrings( + Map>> mapOfStringToListOfListOfStrings) { this.mapOfStringToListOfListOfStrings = MapOfStringToListOfListOfStringsCopier.copy(mapOfStringToListOfListOfStrings); + return this; } @Override @@ -451,4 +457,3 @@ public List> sdkFields() { } } } - diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/operationwithdeprecatedmemberrequest.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/operationwithdeprecatedmemberrequest.java index d5da94126bc3..b23bb0971067 100644 --- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/operationwithdeprecatedmemberrequest.java +++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/operationwithdeprecatedmemberrequest.java @@ -1,5 +1,6 @@ package software.amazon.awssdk.services.jsonprotocoltests.model; +import java.beans.Transient; import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -23,24 +24,27 @@ */ @Generated("software.amazon.awssdk:codegen") public final class OperationWithDeprecatedMemberRequest extends JsonProtocolTestsRequest implements - ToCopyableBuilder { + ToCopyableBuilder { private static final SdkField MEMBER_MODELED_AS_DEPRECATED_FIELD = SdkField. builder(MarshallingType.STRING) - .memberName("MemberModeledAsDeprecated").getter(getter(OperationWithDeprecatedMemberRequest::memberModeledAsDeprecated)) - .setter(setter(Builder::memberModeledAsDeprecated)) - .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MemberModeledAsDeprecated").build()) - .build(); - - private static final SdkField MEMBER_MODIFIED_AS_DEPRECATED_FIELD = SdkField. builder(MarshallingType.STRING) - .memberName("MemberModifiedAsDeprecated").getter(getter(OperationWithDeprecatedMemberRequest::memberModifiedAsDeprecated)) - .setter(setter(Builder::memberModifiedAsDeprecated)) - .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MemberModifiedAsDeprecated").build()) - .build(); + .memberName("MemberModeledAsDeprecated") + .getter(getter(OperationWithDeprecatedMemberRequest::memberModeledAsDeprecated)) + .setter(setter(Builder::memberModeledAsDeprecated)) + .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MemberModeledAsDeprecated").build()) + .build(); + + private static final SdkField MEMBER_MODIFIED_AS_DEPRECATED_FIELD = SdkField + . builder(MarshallingType.STRING) + .memberName("MemberModifiedAsDeprecated") + .getter(getter(OperationWithDeprecatedMemberRequest::memberModifiedAsDeprecated)) + .setter(setter(Builder::memberModifiedAsDeprecated)) + .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MemberModifiedAsDeprecated").build()) + .build(); private static final SdkField UNDEPRECATED_MEMBER_FIELD = SdkField. builder(MarshallingType.STRING) - .memberName("UndeprecatedMember").getter(getter(OperationWithDeprecatedMemberRequest::undeprecatedMember)) - .setter(setter(Builder::undeprecatedMember)) - .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("UndeprecatedMember").build()) - .build(); + .memberName("UndeprecatedMember").getter(getter(OperationWithDeprecatedMemberRequest::undeprecatedMember)) + .setter(setter(Builder::undeprecatedMember)) + .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("UndeprecatedMember").build()) + .build(); private static final List> SDK_FIELDS = Collections.unmodifiableList(Arrays.asList( MEMBER_MODELED_AS_DEPRECATED_FIELD, MEMBER_MODIFIED_AS_DEPRECATED_FIELD, UNDEPRECATED_MEMBER_FIELD)); @@ -60,7 +64,7 @@ private OperationWithDeprecatedMemberRequest(BuilderImpl builder) { /** * Returns the value of the MemberModeledAsDeprecated property for this object. - * + * * @return The value of the MemberModeledAsDeprecated property for this object. * @deprecated This field is modeled as deprecated. */ @@ -68,10 +72,10 @@ private OperationWithDeprecatedMemberRequest(BuilderImpl builder) { public final String memberModeledAsDeprecated() { return memberModeledAsDeprecated; } - + /** * Returns the value of the MemberModifiedAsDeprecated property for this object. - * + * * @return The value of the MemberModifiedAsDeprecated property for this object. * @deprecated This field is modified as deprecated. */ @@ -82,7 +86,7 @@ public final String memberModifiedAsDeprecated() { /** * Returns the value of the UndeprecatedMember property for this object. - * + * * @return The value of the UndeprecatedMember property for this object. */ public final String undeprecatedMember() { @@ -172,7 +176,8 @@ private static BiConsumer setter(BiConsumer s) { return (obj, val) -> s.accept((Builder) obj, val); } - public interface Builder extends JsonProtocolTestsRequest.Builder, SdkPojo, CopyableBuilder { + public interface Builder extends JsonProtocolTestsRequest.Builder, SdkPojo, + CopyableBuilder { /** * Sets the value of the MemberModeledAsDeprecated property for this object. * @@ -183,7 +188,7 @@ public interface Builder extends JsonProtocolTestsRequest.Builder, SdkPojo, Copy */ @Deprecated Builder memberModeledAsDeprecated(String memberModeledAsDeprecated); - + /** * Sets the value of the MemberModifiedAsDeprecated property for this object. * @@ -213,7 +218,7 @@ public interface Builder extends JsonProtocolTestsRequest.Builder, SdkPojo, Copy static final class BuilderImpl extends JsonProtocolTestsRequest.BuilderImpl implements Builder { private String memberModeledAsDeprecated; - + private String memberModifiedAsDeprecated; private String undeprecatedMember; @@ -227,54 +232,57 @@ private BuilderImpl(OperationWithDeprecatedMemberRequest model) { memberModifiedAsDeprecated(model.memberModifiedAsDeprecated); undeprecatedMember(model.undeprecatedMember); } - + @Deprecated public final String getMemberModeledAsDeprecated() { return memberModeledAsDeprecated; } - @Override @Deprecated - public final Builder memberModeledAsDeprecated(String memberModeledAsDeprecated) { + public final void setMemberModeledAsDeprecated(String memberModeledAsDeprecated) { this.memberModeledAsDeprecated = memberModeledAsDeprecated; - return this; } - + + @Override + @Transient @Deprecated - public final void setMemberModeledAsDeprecated(String memberModeledAsDeprecated) { + public final Builder memberModeledAsDeprecated(String memberModeledAsDeprecated) { this.memberModeledAsDeprecated = memberModeledAsDeprecated; + return this; } - + @Deprecated public final String getMemberModifiedAsDeprecated() { return memberModifiedAsDeprecated; } - - @Override + @Deprecated - public final Builder memberModifiedAsDeprecated(String memberModifiedAsDeprecated) { + public final void setMemberModifiedAsDeprecated(String memberModifiedAsDeprecated) { this.memberModifiedAsDeprecated = memberModifiedAsDeprecated; - return this; } - + + @Override + @Transient @Deprecated - public final void setMemberModifiedAsDeprecated(String memberModifiedAsDeprecated) { + public final Builder memberModifiedAsDeprecated(String memberModifiedAsDeprecated) { this.memberModifiedAsDeprecated = memberModifiedAsDeprecated; + return this; } public final String getUndeprecatedMember() { return undeprecatedMember; } + public final void setUndeprecatedMember(String undeprecatedMember) { + this.undeprecatedMember = undeprecatedMember; + } + @Override + @Transient public final Builder undeprecatedMember(String undeprecatedMember) { this.undeprecatedMember = undeprecatedMember; return this; } - - public final void setUndeprecatedMember(String undeprecatedMember) { - this.undeprecatedMember = undeprecatedMember; - } @Override public Builder overrideConfiguration(AwsRequestOverrideConfiguration overrideConfiguration) { @@ -299,4 +307,3 @@ public List> sdkFields() { } } } - diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/operationwithdeprecatedmemberresponse.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/operationwithdeprecatedmemberresponse.java index 4ff13d9b8222..d9e598b9b93a 100644 --- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/operationwithdeprecatedmemberresponse.java +++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/operationwithdeprecatedmemberresponse.java @@ -1,5 +1,6 @@ package software.amazon.awssdk.services.jsonprotocoltests.model; +import java.beans.Transient; import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -225,44 +226,47 @@ public final String getMemberModeledAsDeprecated() { return memberModeledAsDeprecated; } - @Override @Deprecated - public final Builder memberModeledAsDeprecated(String memberModeledAsDeprecated) { + public final void setMemberModeledAsDeprecated(String memberModeledAsDeprecated) { this.memberModeledAsDeprecated = memberModeledAsDeprecated; - return this; } + @Override + @Transient @Deprecated - public final void setMemberModeledAsDeprecated(String memberModeledAsDeprecated) { + public final Builder memberModeledAsDeprecated(String memberModeledAsDeprecated) { this.memberModeledAsDeprecated = memberModeledAsDeprecated; + return this; } public final String getMemberModifiedAsDeprecated() { return memberModifiedAsDeprecated; } - @Override - public final Builder memberModifiedAsDeprecated(String memberModifiedAsDeprecated) { + public final void setMemberModifiedAsDeprecated(String memberModifiedAsDeprecated) { this.memberModifiedAsDeprecated = memberModifiedAsDeprecated; - return this; } - public final void setMemberModifiedAsDeprecated(String memberModifiedAsDeprecated) { + @Override + @Transient + public final Builder memberModifiedAsDeprecated(String memberModifiedAsDeprecated) { this.memberModifiedAsDeprecated = memberModifiedAsDeprecated; + return this; } public final String getUndeprecatedMember() { return undeprecatedMember; } - @Override - public final Builder undeprecatedMember(String undeprecatedMember) { + public final void setUndeprecatedMember(String undeprecatedMember) { this.undeprecatedMember = undeprecatedMember; - return this; } - public final void setUndeprecatedMember(String undeprecatedMember) { + @Override + @Transient + public final Builder undeprecatedMember(String undeprecatedMember) { this.undeprecatedMember = undeprecatedMember; + return this; } @Override diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/recursivestructtype.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/recursivestructtype.java index 8cffc78d21c3..1ab7ca362428 100644 --- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/recursivestructtype.java +++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/recursivestructtype.java @@ -1,5 +1,6 @@ package software.amazon.awssdk.services.jsonprotocoltests.model; +import java.beans.Transient; import java.io.Serializable; import java.util.Arrays; import java.util.Collection; @@ -346,30 +347,32 @@ public final String getNoRecurse() { return noRecurse; } - @Override - public final Builder noRecurse(String noRecurse) { + public final void setNoRecurse(String noRecurse) { this.noRecurse = noRecurse; - return this; } - public final void setNoRecurse(String noRecurse) { + @Override + @Transient + public final Builder noRecurse(String noRecurse) { this.noRecurse = noRecurse; + return this; } public final Builder getRecursiveStruct() { return recursiveStruct != null ? recursiveStruct.toBuilder() : null; } + public final void setRecursiveStruct(BuilderImpl recursiveStruct) { + this.recursiveStruct = recursiveStruct != null ? recursiveStruct.build() : null; + } + @Override + @Transient public final Builder recursiveStruct(RecursiveStructType recursiveStruct) { this.recursiveStruct = recursiveStruct; return this; } - public final void setRecursiveStruct(BuilderImpl recursiveStruct) { - this.recursiveStruct = recursiveStruct != null ? recursiveStruct.build() : null; - } - public final List getRecursiveList() { List result = RecursiveListTypeCopier.copyToBuilder(this.recursiveList); if (result instanceof SdkAutoConstructList) { @@ -378,13 +381,19 @@ public final List getRecursiveList() { return result; } + public final void setRecursiveList(Collection recursiveList) { + this.recursiveList = RecursiveListTypeCopier.copyFromBuilder(recursiveList); + } + @Override + @Transient public final Builder recursiveList(Collection recursiveList) { this.recursiveList = RecursiveListTypeCopier.copy(recursiveList); return this; } @Override + @Transient @SafeVarargs public final Builder recursiveList(RecursiveStructType... recursiveList) { recursiveList(Arrays.asList(recursiveList)); @@ -392,6 +401,7 @@ public final Builder recursiveList(RecursiveStructType... recursiveList) { } @Override + @Transient @SafeVarargs public final Builder recursiveList(Consumer... recursiveList) { recursiveList(Stream.of(recursiveList).map(c -> RecursiveStructType.builder().applyMutation(c).build()) @@ -399,10 +409,6 @@ public final Builder recursiveList(Consumer... recursiveList) { return this; } - public final void setRecursiveList(Collection recursiveList) { - this.recursiveList = RecursiveListTypeCopier.copyFromBuilder(recursiveList); - } - public final Map getRecursiveMap() { Map result = RecursiveMapTypeCopier.copyToBuilder(this.recursiveMap); if (result instanceof SdkAutoConstructMap) { @@ -411,16 +417,17 @@ public final Map getRecursiveMap() { return result; } + public final void setRecursiveMap(Map recursiveMap) { + this.recursiveMap = RecursiveMapTypeCopier.copyFromBuilder(recursiveMap); + } + @Override + @Transient public final Builder recursiveMap(Map recursiveMap) { this.recursiveMap = RecursiveMapTypeCopier.copy(recursiveMap); return this; } - public final void setRecursiveMap(Map recursiveMap) { - this.recursiveMap = RecursiveMapTypeCopier.copyFromBuilder(recursiveMap); - } - @Override public RecursiveStructType build() { return new RecursiveStructType(this); diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/sharedstream/getrandompersonresponse.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/sharedstream/getrandompersonresponse.java index a37e7b6b73bb..4fe4d7f604c8 100644 --- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/sharedstream/getrandompersonresponse.java +++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/sharedstream/getrandompersonresponse.java @@ -1,5 +1,6 @@ package software.amazon.awssdk.services.sharedeventstream.model; +import java.beans.Transient; import java.time.Instant; import java.util.Arrays; import java.util.Collections; @@ -23,14 +24,14 @@ */ @Generated("software.amazon.awssdk:codegen") public class GetRandomPersonResponse extends SharedEventStreamResponse implements - ToCopyableBuilder { + ToCopyableBuilder { private static final SdkField NAME_FIELD = SdkField. builder(MarshallingType.STRING).memberName("Name") - .getter(getter(GetRandomPersonResponse::name)).setter(setter(Builder::name)) - .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("Name").build()).build(); + .getter(getter(GetRandomPersonResponse::name)).setter(setter(Builder::name)) + .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("Name").build()).build(); private static final SdkField BIRTHDAY_FIELD = SdkField. builder(MarshallingType.INSTANT) - .memberName("Birthday").getter(getter(GetRandomPersonResponse::birthday)).setter(setter(Builder::birthday)) - .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("Birthday").build()).build(); + .memberName("Birthday").getter(getter(GetRandomPersonResponse::birthday)).setter(setter(Builder::birthday)) + .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("Birthday").build()).build(); private static final List> SDK_FIELDS = Collections.unmodifiableList(Arrays.asList(NAME_FIELD, BIRTHDAY_FIELD)); @@ -46,7 +47,7 @@ protected GetRandomPersonResponse(BuilderImpl builder) { /** * Returns the value of the Name property for this object. - * + * * @return The value of the Name property for this object. */ public final String name() { @@ -55,7 +56,7 @@ public final String name() { /** * Returns the value of the Birthday property for this object. - * + * * @return The value of the Birthday property for this object. */ public final Instant birthday() { @@ -115,12 +116,12 @@ public final String toString() { public final Optional getValueForField(String fieldName, Class clazz) { switch (fieldName) { - case "Name": - return Optional.ofNullable(clazz.cast(name())); - case "Birthday": - return Optional.ofNullable(clazz.cast(birthday())); - default: - return Optional.empty(); + case "Name": + return Optional.ofNullable(clazz.cast(name())); + case "Birthday": + return Optional.ofNullable(clazz.cast(birthday())); + default: + return Optional.empty(); } } @@ -143,7 +144,7 @@ private static BiConsumer setter(BiConsumer s) { } public interface Builder extends SharedEventStreamResponse.Builder, SdkPojo, - CopyableBuilder { + CopyableBuilder { /** * Sets the value of the Name property for this object. * @@ -181,28 +182,30 @@ public final String getName() { return name; } - @Override - public final Builder name(String name) { + public final void setName(String name) { this.name = name; - return this; } - public final void setName(String name) { + @Override + @Transient + public final Builder name(String name) { this.name = name; + return this; } public final Instant getBirthday() { return birthday; } - @Override - public final Builder birthday(Instant birthday) { + public final void setBirthday(Instant birthday) { this.birthday = birthday; - return this; } - public final void setBirthday(Instant birthday) { + @Override + @Transient + public final Builder birthday(Instant birthday) { this.birthday = birthday; + return this; } @Override @@ -216,4 +219,3 @@ public List> sdkFields() { } } } - diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/sharedstream/person.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/sharedstream/person.java index ef1a7c98673e..9e774466bb74 100644 --- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/sharedstream/person.java +++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/sharedstream/person.java @@ -1,5 +1,6 @@ package software.amazon.awssdk.services.sharedeventstream.model; +import java.beans.Transient; import java.io.Serializable; import java.time.Instant; import java.util.Arrays; @@ -25,12 +26,12 @@ @Generated("software.amazon.awssdk:codegen") public class Person implements SdkPojo, Serializable, ToCopyableBuilder, EventStream { private static final SdkField NAME_FIELD = SdkField. builder(MarshallingType.STRING).memberName("Name") - .getter(getter(Person::name)).setter(setter(Builder::name)) - .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("Name").build()).build(); + .getter(getter(Person::name)).setter(setter(Builder::name)) + .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("Name").build()).build(); private static final SdkField BIRTHDAY_FIELD = SdkField. builder(MarshallingType.INSTANT) - .memberName("Birthday").getter(getter(Person::birthday)).setter(setter(Builder::birthday)) - .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("Birthday").build()).build(); + .memberName("Birthday").getter(getter(Person::birthday)).setter(setter(Builder::birthday)) + .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("Birthday").build()).build(); private static final List> SDK_FIELDS = Collections.unmodifiableList(Arrays.asList(NAME_FIELD, BIRTHDAY_FIELD)); @@ -47,7 +48,7 @@ protected Person(BuilderImpl builder) { /** * Returns the value of the Name property for this object. - * + * * @return The value of the Name property for this object. */ public final String name() { @@ -56,7 +57,7 @@ public final String name() { /** * Returns the value of the Birthday property for this object. - * + * * @return The value of the Birthday property for this object. */ public final Instant birthday() { @@ -115,12 +116,12 @@ public final String toString() { public final Optional getValueForField(String fieldName, Class clazz) { switch (fieldName) { - case "Name": - return Optional.ofNullable(clazz.cast(name())); - case "Birthday": - return Optional.ofNullable(clazz.cast(birthday())); - default: - return Optional.empty(); + case "Name": + return Optional.ofNullable(clazz.cast(name())); + case "Birthday": + return Optional.ofNullable(clazz.cast(birthday())); + default: + return Optional.empty(); } } @@ -201,28 +202,30 @@ public final String getName() { return name; } - @Override - public final Builder name(String name) { + public final void setName(String name) { this.name = name; - return this; } - public final void setName(String name) { + @Override + @Transient + public final Builder name(String name) { this.name = name; + return this; } public final Instant getBirthday() { return birthday; } - @Override - public final Builder birthday(Instant birthday) { + public final void setBirthday(Instant birthday) { this.birthday = birthday; - return this; } - public final void setBirthday(Instant birthday) { + @Override + @Transient + public final Builder birthday(Instant birthday) { this.birthday = birthday; + return this; } @Override @@ -236,4 +239,3 @@ public List> sdkFields() { } } } - diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/simplestruct.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/simplestruct.java index 131406dee962..f611640b997a 100644 --- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/simplestruct.java +++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/simplestruct.java @@ -1,5 +1,6 @@ package software.amazon.awssdk.services.jsonprotocoltests.model; +import java.beans.Transient; import java.io.Serializable; import java.util.Arrays; import java.util.Collections; @@ -23,8 +24,8 @@ @Generated("software.amazon.awssdk:codegen") public final class SimpleStruct implements SdkPojo, Serializable, ToCopyableBuilder { private static final SdkField STRING_MEMBER_FIELD = SdkField. builder(MarshallingType.STRING) - .memberName("StringMember").getter(getter(SimpleStruct::stringMember)).setter(setter(Builder::stringMember)) - .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("StringMember").build()).build(); + .memberName("StringMember").getter(getter(SimpleStruct::stringMember)).setter(setter(Builder::stringMember)) + .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("StringMember").build()).build(); private static final List> SDK_FIELDS = Collections.unmodifiableList(Arrays.asList(STRING_MEMBER_FIELD)); @@ -38,7 +39,7 @@ private SimpleStruct(BuilderImpl builder) { /** * Returns the value of the StringMember property for this object. - * + * * @return The value of the StringMember property for this object. */ public final String stringMember() { @@ -96,10 +97,10 @@ public final String toString() { public final Optional getValueForField(String fieldName, Class clazz) { switch (fieldName) { - case "StringMember": - return Optional.ofNullable(clazz.cast(stringMember())); - default: - return Optional.empty(); + case "StringMember": + return Optional.ofNullable(clazz.cast(stringMember())); + default: + return Optional.empty(); } } @@ -141,14 +142,15 @@ public final String getStringMember() { return stringMember; } - @Override - public final Builder stringMember(String stringMember) { + public final void setStringMember(String stringMember) { this.stringMember = stringMember; - return this; } - public final void setStringMember(String stringMember) { + @Override + @Transient + public final Builder stringMember(String stringMember) { this.stringMember = stringMember; + return this; } @Override @@ -162,4 +164,3 @@ public List> sdkFields() { } } } - diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/structwithnestedblobtype.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/structwithnestedblobtype.java index 3f781ce6274c..0d0200566f94 100644 --- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/structwithnestedblobtype.java +++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/structwithnestedblobtype.java @@ -1,5 +1,6 @@ package software.amazon.awssdk.services.jsonprotocoltests.model; +import java.beans.Transient; import java.io.Serializable; import java.nio.ByteBuffer; import java.util.Arrays; @@ -144,16 +145,17 @@ public final ByteBuffer getNestedBlob() { return nestedBlob == null ? null : nestedBlob.asByteBuffer(); } + public final void setNestedBlob(ByteBuffer nestedBlob) { + nestedBlob(nestedBlob == null ? null : SdkBytes.fromByteBuffer(nestedBlob)); + } + @Override + @Transient public final Builder nestedBlob(SdkBytes nestedBlob) { this.nestedBlob = nestedBlob; return this; } - public final void setNestedBlob(ByteBuffer nestedBlob) { - nestedBlob(nestedBlob == null ? null : SdkBytes.fromByteBuffer(nestedBlob)); - } - @Override public StructWithNestedBlobType build() { return new StructWithNestedBlobType(this); diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/structwithtimestamp.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/structwithtimestamp.java index fbaff383cca4..8f4ee6dad727 100644 --- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/structwithtimestamp.java +++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/structwithtimestamp.java @@ -1,5 +1,6 @@ package software.amazon.awssdk.services.jsonprotocoltests.model; +import java.beans.Transient; import java.io.Serializable; import java.time.Instant; import java.util.Arrays; @@ -23,11 +24,11 @@ */ @Generated("software.amazon.awssdk:codegen") public final class StructWithTimestamp implements SdkPojo, Serializable, - ToCopyableBuilder { + ToCopyableBuilder { private static final SdkField NESTED_TIMESTAMP_FIELD = SdkField. builder(MarshallingType.INSTANT) - .memberName("NestedTimestamp").getter(getter(StructWithTimestamp::nestedTimestamp)) - .setter(setter(Builder::nestedTimestamp)) - .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("NestedTimestamp").build()).build(); + .memberName("NestedTimestamp").getter(getter(StructWithTimestamp::nestedTimestamp)) + .setter(setter(Builder::nestedTimestamp)) + .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("NestedTimestamp").build()).build(); private static final List> SDK_FIELDS = Collections.unmodifiableList(Arrays.asList(NESTED_TIMESTAMP_FIELD)); @@ -41,7 +42,7 @@ private StructWithTimestamp(BuilderImpl builder) { /** * Returns the value of the NestedTimestamp property for this object. - * + * * @return The value of the NestedTimestamp property for this object. */ public final Instant nestedTimestamp() { @@ -99,10 +100,10 @@ public final String toString() { public final Optional getValueForField(String fieldName, Class clazz) { switch (fieldName) { - case "NestedTimestamp": - return Optional.ofNullable(clazz.cast(nestedTimestamp())); - default: - return Optional.empty(); + case "NestedTimestamp": + return Optional.ofNullable(clazz.cast(nestedTimestamp())); + default: + return Optional.empty(); } } @@ -144,14 +145,15 @@ public final Instant getNestedTimestamp() { return nestedTimestamp; } - @Override - public final Builder nestedTimestamp(Instant nestedTimestamp) { + public final void setNestedTimestamp(Instant nestedTimestamp) { this.nestedTimestamp = nestedTimestamp; - return this; } - public final void setNestedTimestamp(Instant nestedTimestamp) { + @Override + @Transient + public final Builder nestedTimestamp(Instant nestedTimestamp) { this.nestedTimestamp = nestedTimestamp; + return this; } @Override @@ -165,4 +167,3 @@ public List> sdkFields() { } } } - diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/subtypeone.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/subtypeone.java index 4dcbc2f7a0db..8b6e70958f77 100644 --- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/subtypeone.java +++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/subtypeone.java @@ -1,5 +1,6 @@ package software.amazon.awssdk.services.jsonprotocoltests.model; +import java.beans.Transient; import java.io.Serializable; import java.util.Arrays; import java.util.Collections; @@ -23,9 +24,9 @@ @Generated("software.amazon.awssdk:codegen") public final class SubTypeOne implements SdkPojo, Serializable, ToCopyableBuilder { private static final SdkField SUB_TYPE_ONE_MEMBER_FIELD = SdkField. builder(MarshallingType.STRING) - .memberName("SubTypeOneMember").getter(getter(SubTypeOne::subTypeOneMember)) - .setter(setter(Builder::subTypeOneMember)) - .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("SubTypeOneMember").build()).build(); + .memberName("SubTypeOneMember").getter(getter(SubTypeOne::subTypeOneMember)) + .setter(setter(Builder::subTypeOneMember)) + .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("SubTypeOneMember").build()).build(); private static final List> SDK_FIELDS = Collections.unmodifiableList(Arrays.asList(SUB_TYPE_ONE_MEMBER_FIELD)); @@ -39,7 +40,7 @@ private SubTypeOne(BuilderImpl builder) { /** * Returns the value of the SubTypeOneMember property for this object. - * + * * @return The value of the SubTypeOneMember property for this object. */ public final String subTypeOneMember() { @@ -97,10 +98,10 @@ public final String toString() { public final Optional getValueForField(String fieldName, Class clazz) { switch (fieldName) { - case "SubTypeOneMember": - return Optional.ofNullable(clazz.cast(subTypeOneMember())); - default: - return Optional.empty(); + case "SubTypeOneMember": + return Optional.ofNullable(clazz.cast(subTypeOneMember())); + default: + return Optional.empty(); } } @@ -142,14 +143,15 @@ public final String getSubTypeOneMember() { return subTypeOneMember; } - @Override - public final Builder subTypeOneMember(String subTypeOneMember) { + public final void setSubTypeOneMember(String subTypeOneMember) { this.subTypeOneMember = subTypeOneMember; - return this; } - public final void setSubTypeOneMember(String subTypeOneMember) { + @Override + @Transient + public final Builder subTypeOneMember(String subTypeOneMember) { this.subTypeOneMember = subTypeOneMember; + return this; } @Override @@ -163,4 +165,3 @@ public List> sdkFields() { } } } - diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/xmlnamespace/testxmlnamespacerequest.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/xmlnamespace/testxmlnamespacerequest.java index 3954c5488d9c..dd6cdd07bf1d 100644 --- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/xmlnamespace/testxmlnamespacerequest.java +++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/xmlnamespace/testxmlnamespacerequest.java @@ -1,5 +1,6 @@ package software.amazon.awssdk.services.protocolrestxml.model; +import java.beans.Transient; import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -25,41 +26,41 @@ */ @Generated("software.amazon.awssdk:codegen") public final class TestXmlNamespaceRequest extends ProtocolRestXmlRequest implements - ToCopyableBuilder { + ToCopyableBuilder { private static final SdkField STRING_MEMBER_FIELD = SdkField - . builder(MarshallingType.STRING) - .memberName("stringMember") - .getter(getter(TestXmlNamespaceRequest::stringMember)) - .setter(setter(Builder::stringMember)) - .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("stringMember") - .unmarshallLocationName("stringMember").build()).build(); + . builder(MarshallingType.STRING) + .memberName("stringMember") + .getter(getter(TestXmlNamespaceRequest::stringMember)) + .setter(setter(Builder::stringMember)) + .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("stringMember") + .unmarshallLocationName("stringMember").build()).build(); private static final SdkField INTEGER_MEMBER_FIELD = SdkField - . builder(MarshallingType.INTEGER) - .memberName("integerMember") - .getter(getter(TestXmlNamespaceRequest::integerMember)) - .setter(setter(Builder::integerMember)) - .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("integerMember") - .unmarshallLocationName("integerMember").build()).build(); + . builder(MarshallingType.INTEGER) + .memberName("integerMember") + .getter(getter(TestXmlNamespaceRequest::integerMember)) + .setter(setter(Builder::integerMember)) + .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("integerMember") + .unmarshallLocationName("integerMember").build()).build(); private static final SdkField XML_NAMESPACE_MEMBER_FIELD = SdkField - . builder(MarshallingType.SDK_POJO) - .memberName("xmlNamespaceMember") - .getter(getter(TestXmlNamespaceRequest::xmlNamespaceMember)) - .setter(setter(Builder::xmlNamespaceMember)) - .constructor(XmlNamespaceMember::builder) - .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("xmlNamespaceMember") - .unmarshallLocationName("xmlNamespaceMember").build(), - XmlAttributesTrait.create( - Pair.of("xmlns:foo", - XmlAttributesTrait.AttributeAccessors.builder().attributeGetter((ignore) -> "http://bar") - .build()), - Pair.of("foo:type", - XmlAttributesTrait.AttributeAccessors.builder() - .attributeGetter(t -> ((XmlNamespaceMember) t).type()).build()))).build(); + . builder(MarshallingType.SDK_POJO) + .memberName("xmlNamespaceMember") + .getter(getter(TestXmlNamespaceRequest::xmlNamespaceMember)) + .setter(setter(Builder::xmlNamespaceMember)) + .constructor(XmlNamespaceMember::builder) + .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("xmlNamespaceMember") + .unmarshallLocationName("xmlNamespaceMember").build(), + XmlAttributesTrait.create( + Pair.of("xmlns:foo", + XmlAttributesTrait.AttributeAccessors.builder().attributeGetter((ignore) -> "http://bar") + .build()), + Pair.of("foo:type", + XmlAttributesTrait.AttributeAccessors.builder() + .attributeGetter(t -> ((XmlNamespaceMember) t).type()).build()))).build(); private static final List> SDK_FIELDS = Collections.unmodifiableList(Arrays.asList(STRING_MEMBER_FIELD, - INTEGER_MEMBER_FIELD, XML_NAMESPACE_MEMBER_FIELD)); + INTEGER_MEMBER_FIELD, XML_NAMESPACE_MEMBER_FIELD)); private final String stringMember; @@ -76,7 +77,7 @@ private TestXmlNamespaceRequest(BuilderImpl builder) { /** * Returns the value of the StringMember property for this object. - * + * * @return The value of the StringMember property for this object. */ public final String stringMember() { @@ -85,7 +86,7 @@ public final String stringMember() { /** * Returns the value of the IntegerMember property for this object. - * + * * @return The value of the IntegerMember property for this object. */ public final Integer integerMember() { @@ -94,7 +95,7 @@ public final Integer integerMember() { /** * Returns the value of the XmlNamespaceMember property for this object. - * + * * @return The value of the XmlNamespaceMember property for this object. */ public final XmlNamespaceMember xmlNamespaceMember() { @@ -142,7 +143,7 @@ public final boolean equalsBySdkFields(Object obj) { } TestXmlNamespaceRequest other = (TestXmlNamespaceRequest) obj; return Objects.equals(stringMember(), other.stringMember()) && Objects.equals(integerMember(), other.integerMember()) - && Objects.equals(xmlNamespaceMember(), other.xmlNamespaceMember()); + && Objects.equals(xmlNamespaceMember(), other.xmlNamespaceMember()); } /** @@ -152,19 +153,19 @@ public final boolean equalsBySdkFields(Object obj) { @Override public final String toString() { return ToString.builder("TestXmlNamespaceRequest").add("StringMember", stringMember()) - .add("IntegerMember", integerMember()).add("XmlNamespaceMember", xmlNamespaceMember()).build(); + .add("IntegerMember", integerMember()).add("XmlNamespaceMember", xmlNamespaceMember()).build(); } public final Optional getValueForField(String fieldName, Class clazz) { switch (fieldName) { - case "stringMember": - return Optional.ofNullable(clazz.cast(stringMember())); - case "integerMember": - return Optional.ofNullable(clazz.cast(integerMember())); - case "xmlNamespaceMember": - return Optional.ofNullable(clazz.cast(xmlNamespaceMember())); - default: - return Optional.empty(); + case "stringMember": + return Optional.ofNullable(clazz.cast(stringMember())); + case "integerMember": + return Optional.ofNullable(clazz.cast(integerMember())); + case "xmlNamespaceMember": + return Optional.ofNullable(clazz.cast(xmlNamespaceMember())); + default: + return Optional.empty(); } } @@ -217,7 +218,7 @@ public interface Builder extends ProtocolRestXmlRequest.Builder, SdkPojo, Copyab * * When the {@link Consumer} completes, {@link XmlNamespaceMember.Builder#build()} is called immediately and its * result is passed to {@link #xmlNamespaceMember(XmlNamespaceMember)}. - * + * * @param xmlNamespaceMember * a consumer that will call methods on {@link XmlNamespaceMember.Builder} * @return Returns a reference to this object so that method calls can be chained together. @@ -255,44 +256,47 @@ public final String getStringMember() { return stringMember; } - @Override - public final Builder stringMember(String stringMember) { + public final void setStringMember(String stringMember) { this.stringMember = stringMember; - return this; } - public final void setStringMember(String stringMember) { + @Override + @Transient + public final Builder stringMember(String stringMember) { this.stringMember = stringMember; + return this; } public final Integer getIntegerMember() { return integerMember; } - @Override - public final Builder integerMember(Integer integerMember) { + public final void setIntegerMember(Integer integerMember) { this.integerMember = integerMember; - return this; } - public final void setIntegerMember(Integer integerMember) { + @Override + @Transient + public final Builder integerMember(Integer integerMember) { this.integerMember = integerMember; + return this; } public final XmlNamespaceMember.Builder getXmlNamespaceMember() { return xmlNamespaceMember != null ? xmlNamespaceMember.toBuilder() : null; } + public final void setXmlNamespaceMember(XmlNamespaceMember.BuilderImpl xmlNamespaceMember) { + this.xmlNamespaceMember = xmlNamespaceMember != null ? xmlNamespaceMember.build() : null; + } + @Override + @Transient public final Builder xmlNamespaceMember(XmlNamespaceMember xmlNamespaceMember) { this.xmlNamespaceMember = xmlNamespaceMember; return this; } - public final void setXmlNamespaceMember(XmlNamespaceMember.BuilderImpl xmlNamespaceMember) { - this.xmlNamespaceMember = xmlNamespaceMember != null ? xmlNamespaceMember.build() : null; - } - @Override public Builder overrideConfiguration(AwsRequestOverrideConfiguration overrideConfiguration) { super.overrideConfiguration(overrideConfiguration); @@ -316,4 +320,3 @@ public List> sdkFields() { } } } - diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/xmlnamespace/testxmlnamespaceresponse.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/xmlnamespace/testxmlnamespaceresponse.java index d6792f9109c2..16d71e9765ca 100644 --- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/xmlnamespace/testxmlnamespaceresponse.java +++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/xmlnamespace/testxmlnamespaceresponse.java @@ -1,5 +1,6 @@ package software.amazon.awssdk.services.protocolrestxml.model; +import java.beans.Transient; import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -24,41 +25,41 @@ */ @Generated("software.amazon.awssdk:codegen") public final class TestXmlNamespaceResponse extends ProtocolRestXmlResponse implements - ToCopyableBuilder { + ToCopyableBuilder { private static final SdkField STRING_MEMBER_FIELD = SdkField - . builder(MarshallingType.STRING) - .memberName("stringMember") - .getter(getter(TestXmlNamespaceResponse::stringMember)) - .setter(setter(Builder::stringMember)) - .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("stringMember") - .unmarshallLocationName("stringMember").build()).build(); + . builder(MarshallingType.STRING) + .memberName("stringMember") + .getter(getter(TestXmlNamespaceResponse::stringMember)) + .setter(setter(Builder::stringMember)) + .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("stringMember") + .unmarshallLocationName("stringMember").build()).build(); private static final SdkField INTEGER_MEMBER_FIELD = SdkField - . builder(MarshallingType.INTEGER) - .memberName("integerMember") - .getter(getter(TestXmlNamespaceResponse::integerMember)) - .setter(setter(Builder::integerMember)) - .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("integerMember") - .unmarshallLocationName("integerMember").build()).build(); + . builder(MarshallingType.INTEGER) + .memberName("integerMember") + .getter(getter(TestXmlNamespaceResponse::integerMember)) + .setter(setter(Builder::integerMember)) + .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("integerMember") + .unmarshallLocationName("integerMember").build()).build(); private static final SdkField XML_NAMESPACE_MEMBER_FIELD = SdkField - . builder(MarshallingType.SDK_POJO) - .memberName("xmlNamespaceMember") - .getter(getter(TestXmlNamespaceResponse::xmlNamespaceMember)) - .setter(setter(Builder::xmlNamespaceMember)) - .constructor(XmlNamespaceMember::builder) - .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("xmlNamespaceMember") - .unmarshallLocationName("xmlNamespaceMember").build(), - XmlAttributesTrait.create( - Pair.of("xmlns:foo", - XmlAttributesTrait.AttributeAccessors.builder().attributeGetter((ignore) -> "http://bar") - .build()), - Pair.of("foo:type", - XmlAttributesTrait.AttributeAccessors.builder() - .attributeGetter(t -> ((XmlNamespaceMember) t).type()).build()))).build(); + . builder(MarshallingType.SDK_POJO) + .memberName("xmlNamespaceMember") + .getter(getter(TestXmlNamespaceResponse::xmlNamespaceMember)) + .setter(setter(Builder::xmlNamespaceMember)) + .constructor(XmlNamespaceMember::builder) + .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("xmlNamespaceMember") + .unmarshallLocationName("xmlNamespaceMember").build(), + XmlAttributesTrait.create( + Pair.of("xmlns:foo", + XmlAttributesTrait.AttributeAccessors.builder().attributeGetter((ignore) -> "http://bar") + .build()), + Pair.of("foo:type", + XmlAttributesTrait.AttributeAccessors.builder() + .attributeGetter(t -> ((XmlNamespaceMember) t).type()).build()))).build(); private static final List> SDK_FIELDS = Collections.unmodifiableList(Arrays.asList(STRING_MEMBER_FIELD, - INTEGER_MEMBER_FIELD, XML_NAMESPACE_MEMBER_FIELD)); + INTEGER_MEMBER_FIELD, XML_NAMESPACE_MEMBER_FIELD)); private final String stringMember; @@ -75,7 +76,7 @@ private TestXmlNamespaceResponse(BuilderImpl builder) { /** * Returns the value of the StringMember property for this object. - * + * * @return The value of the StringMember property for this object. */ public final String stringMember() { @@ -84,7 +85,7 @@ public final String stringMember() { /** * Returns the value of the IntegerMember property for this object. - * + * * @return The value of the IntegerMember property for this object. */ public final Integer integerMember() { @@ -93,7 +94,7 @@ public final Integer integerMember() { /** * Returns the value of the XmlNamespaceMember property for this object. - * + * * @return The value of the XmlNamespaceMember property for this object. */ public final XmlNamespaceMember xmlNamespaceMember() { @@ -141,7 +142,7 @@ public final boolean equalsBySdkFields(Object obj) { } TestXmlNamespaceResponse other = (TestXmlNamespaceResponse) obj; return Objects.equals(stringMember(), other.stringMember()) && Objects.equals(integerMember(), other.integerMember()) - && Objects.equals(xmlNamespaceMember(), other.xmlNamespaceMember()); + && Objects.equals(xmlNamespaceMember(), other.xmlNamespaceMember()); } /** @@ -151,19 +152,19 @@ public final boolean equalsBySdkFields(Object obj) { @Override public final String toString() { return ToString.builder("TestXmlNamespaceResponse").add("StringMember", stringMember()) - .add("IntegerMember", integerMember()).add("XmlNamespaceMember", xmlNamespaceMember()).build(); + .add("IntegerMember", integerMember()).add("XmlNamespaceMember", xmlNamespaceMember()).build(); } public final Optional getValueForField(String fieldName, Class clazz) { switch (fieldName) { - case "stringMember": - return Optional.ofNullable(clazz.cast(stringMember())); - case "integerMember": - return Optional.ofNullable(clazz.cast(integerMember())); - case "xmlNamespaceMember": - return Optional.ofNullable(clazz.cast(xmlNamespaceMember())); - default: - return Optional.empty(); + case "stringMember": + return Optional.ofNullable(clazz.cast(stringMember())); + case "integerMember": + return Optional.ofNullable(clazz.cast(integerMember())); + case "xmlNamespaceMember": + return Optional.ofNullable(clazz.cast(xmlNamespaceMember())); + default: + return Optional.empty(); } } @@ -216,7 +217,7 @@ public interface Builder extends ProtocolRestXmlResponse.Builder, SdkPojo, Copya * * When the {@link Consumer} completes, {@link XmlNamespaceMember.Builder#build()} is called immediately and its * result is passed to {@link #xmlNamespaceMember(XmlNamespaceMember)}. - * + * * @param xmlNamespaceMember * a consumer that will call methods on {@link XmlNamespaceMember.Builder} * @return Returns a reference to this object so that method calls can be chained together. @@ -248,44 +249,47 @@ public final String getStringMember() { return stringMember; } - @Override - public final Builder stringMember(String stringMember) { + public final void setStringMember(String stringMember) { this.stringMember = stringMember; - return this; } - public final void setStringMember(String stringMember) { + @Override + @Transient + public final Builder stringMember(String stringMember) { this.stringMember = stringMember; + return this; } public final Integer getIntegerMember() { return integerMember; } - @Override - public final Builder integerMember(Integer integerMember) { + public final void setIntegerMember(Integer integerMember) { this.integerMember = integerMember; - return this; } - public final void setIntegerMember(Integer integerMember) { + @Override + @Transient + public final Builder integerMember(Integer integerMember) { this.integerMember = integerMember; + return this; } public final XmlNamespaceMember.Builder getXmlNamespaceMember() { return xmlNamespaceMember != null ? xmlNamespaceMember.toBuilder() : null; } + public final void setXmlNamespaceMember(XmlNamespaceMember.BuilderImpl xmlNamespaceMember) { + this.xmlNamespaceMember = xmlNamespaceMember != null ? xmlNamespaceMember.build() : null; + } + @Override + @Transient public final Builder xmlNamespaceMember(XmlNamespaceMember xmlNamespaceMember) { this.xmlNamespaceMember = xmlNamespaceMember; return this; } - public final void setXmlNamespaceMember(XmlNamespaceMember.BuilderImpl xmlNamespaceMember) { - this.xmlNamespaceMember = xmlNamespaceMember != null ? xmlNamespaceMember.build() : null; - } - @Override public TestXmlNamespaceResponse build() { return new TestXmlNamespaceResponse(this); @@ -297,4 +301,3 @@ public List> sdkFields() { } } } - diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/xmlnamespace/xmlnamespacemember.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/xmlnamespace/xmlnamespacemember.java index 16392316565e..f6ee31ea8d47 100644 --- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/xmlnamespace/xmlnamespacemember.java +++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/xmlnamespace/xmlnamespacemember.java @@ -1,5 +1,6 @@ package software.amazon.awssdk.services.protocolrestxml.model; +import java.beans.Transient; import java.io.Serializable; import java.util.Arrays; import java.util.Collections; @@ -23,25 +24,25 @@ */ @Generated("software.amazon.awssdk:codegen") public final class XmlNamespaceMember implements SdkPojo, Serializable, - ToCopyableBuilder { + ToCopyableBuilder { private static final SdkField TYPE_FIELD = SdkField - . builder(MarshallingType.STRING) - .memberName("Type") - .getter(getter(XmlNamespaceMember::type)) - .setter(setter(Builder::type)) - .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("foo:type") - .unmarshallLocationName("foo:type").build(), XmlAttributeTrait.create()).build(); + . builder(MarshallingType.STRING) + .memberName("Type") + .getter(getter(XmlNamespaceMember::type)) + .setter(setter(Builder::type)) + .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("foo:type") + .unmarshallLocationName("foo:type").build(), XmlAttributeTrait.create()).build(); private static final SdkField STRING_MEMBER_FIELD = SdkField - . builder(MarshallingType.STRING) - .memberName("stringMember") - .getter(getter(XmlNamespaceMember::stringMember)) - .setter(setter(Builder::stringMember)) - .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("stringMember") - .unmarshallLocationName("stringMember").build()).build(); + . builder(MarshallingType.STRING) + .memberName("stringMember") + .getter(getter(XmlNamespaceMember::stringMember)) + .setter(setter(Builder::stringMember)) + .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("stringMember") + .unmarshallLocationName("stringMember").build()).build(); private static final List> SDK_FIELDS = Collections.unmodifiableList(Arrays.asList(TYPE_FIELD, - STRING_MEMBER_FIELD)); + STRING_MEMBER_FIELD)); private static final long serialVersionUID = 1L; @@ -56,7 +57,7 @@ private XmlNamespaceMember(BuilderImpl builder) { /** * Returns the value of the Type property for this object. - * + * * @return The value of the Type property for this object. */ public final String type() { @@ -65,7 +66,7 @@ public final String type() { /** * Returns the value of the StringMember property for this object. - * + * * @return The value of the StringMember property for this object. */ public final String stringMember() { @@ -124,12 +125,12 @@ public final String toString() { public final Optional getValueForField(String fieldName, Class clazz) { switch (fieldName) { - case "Type": - return Optional.ofNullable(clazz.cast(type())); - case "stringMember": - return Optional.ofNullable(clazz.cast(stringMember())); - default: - return Optional.empty(); + case "Type": + return Optional.ofNullable(clazz.cast(type())); + case "stringMember": + return Optional.ofNullable(clazz.cast(stringMember())); + default: + return Optional.empty(); } } @@ -183,28 +184,30 @@ public final String getType() { return type; } - @Override - public final Builder type(String type) { + public final void setType(String type) { this.type = type; - return this; } - public final void setType(String type) { + @Override + @Transient + public final Builder type(String type) { this.type = type; + return this; } public final String getStringMember() { return stringMember; } - @Override - public final Builder stringMember(String stringMember) { + public final void setStringMember(String stringMember) { this.stringMember = stringMember; - return this; } - public final void setStringMember(String stringMember) { + @Override + @Transient + public final Builder stringMember(String stringMember) { this.stringMember = stringMember; + return this; } @Override @@ -218,4 +221,3 @@ public List> sdkFields() { } } } - diff --git a/test/codegen-generated-classes-test/src/main/resources/codegen-resources/customresponsemetadata/service-2.json b/test/codegen-generated-classes-test/src/main/resources/codegen-resources/customresponsemetadata/service-2.json index 63a6d17e22d3..2e34a85c17d1 100644 --- a/test/codegen-generated-classes-test/src/main/resources/codegen-resources/customresponsemetadata/service-2.json +++ b/test/codegen-generated-classes-test/src/main/resources/codegen-resources/customresponsemetadata/service-2.json @@ -244,7 +244,8 @@ "ListOfBlobs":{"shape":"ListOfBlobsType"}, "RecursiveStruct":{"shape":"RecursiveStructType"}, "PolymorphicTypeWithSubTypes":{"shape":"BaseType"}, - "PolymorphicTypeWithoutSubTypes":{"shape":"SubTypeOne"} + "PolymorphicTypeWithoutSubTypes":{"shape":"SubTypeOne"}, + "SetPrefixedMember":{"shape":"String"} } }, "BaseType":{