Skip to content

Commit 6e848bd

Browse files
shoreashorea
committed
Fixes and removing some unused classes
1 parent 339daa8 commit 6e848bd

File tree

57 files changed

+598
-2740
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+598
-2740
lines changed

‎codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/ShapeModelSpec.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,10 @@ private CodeBlock createTimestampFormatTrait(MemberModel m) {
188188
private CodeBlock createLocationTrait(MemberModel m) {
189189
return CodeBlock.builder()
190190
// TODO will marshall and unmarshall location name ever differ?
191-
.add("$T.create($T.$L, $S)", ClassName.get(LocationTrait.class), ClassName.get(MarshallLocation.class),
191+
.add("$T.builder()\n"
192+
+ ".location($T.$L)"
193+
+ ".locationName($S)"
194+
+ ".build()", ClassName.get(LocationTrait.class), ClassName.get(MarshallLocation.class),
192195
m.getHttp().getMarshallLocation(), m.getHttp().getMarshallLocationName())
193196
.build();
194197
}

‎codegen/src/main/java/software/amazon/awssdk/codegen/poet/transform/protocols/JsonMarshallerSpec.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,10 @@
2828
import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
2929
import software.amazon.awssdk.codegen.model.intermediate.Metadata;
3030
import software.amazon.awssdk.codegen.model.intermediate.ShapeModel;
31+
import software.amazon.awssdk.core.Request;
3132
import software.amazon.awssdk.core.http.HttpMethodName;
3233
import software.amazon.awssdk.core.protocol.OperationInfo;
33-
import software.amazon.awssdk.core.protocol.ProtocolRequestMarshaller;
34+
import software.amazon.awssdk.core.protocol.ProtocolMarshaller;
3435
import software.amazon.awssdk.utils.StringUtils;
3536

3637
/**
@@ -64,9 +65,9 @@ public Optional<MethodSpec> constructor() {
6465
public CodeBlock marshalCodeBlock(ClassName requestClassName) {
6566
String variableName = shapeModel.getVariable().getVariableName();
6667
return CodeBlock.builder()
67-
.addStatement("$T<$T> protocolMarshaller = protocolFactory.createProtocolMarshaller"
68+
.addStatement("$T<$T<$T>> protocolMarshaller = protocolFactory.createProtocolMarshaller"
6869
+ "(SDK_OPERATION_BINDING, $L)",
69-
ProtocolRequestMarshaller.class,
70+
ProtocolMarshaller.class, Request.class,
7071
requestClassName, variableName)
7172
.addStatement("return protocolMarshaller.marshall($L)", variableName)
7273
.build();

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/alltypesrequest.java

Lines changed: 79 additions & 63 deletions
Large diffs are not rendered by default.

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/alltypesresponse.java

Lines changed: 79 additions & 63 deletions
Large diffs are not rendered by default.

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/basetype.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
public final class BaseType implements SdkPojo, ToCopyableBuilder<BaseType.Builder, BaseType> {
2424
private static final SdkField<String> BASE_MEMBER_FIELD = SdkField.<String> builder(MarshallingType.STRING)
2525
.getter(getter(BaseType::baseMember)).setter(setter(Builder::baseMember))
26-
.traits(LocationTrait.create(MarshallLocation.PAYLOAD, "BaseMember")).build();
26+
.traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("BaseMember").build()).build();
2727

2828
private static final List<SdkField<?>> SDK_FIELDS = Collections.unmodifiableList(Arrays.asList(BASE_MEMBER_FIELD));
2929

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/eventone.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
public final class EventOne implements SdkPojo, ToCopyableBuilder<EventOne.Builder, EventOne>, EventStream {
2424
private static final SdkField<String> FOO_FIELD = SdkField.<String> builder(MarshallingType.STRING)
2525
.getter(getter(EventOne::foo)).setter(setter(Builder::foo))
26-
.traits(LocationTrait.create(MarshallLocation.PAYLOAD, "Foo")).build();
26+
.traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("Foo").build()).build();
2727

2828
private static final List<SdkField<?>> SDK_FIELDS = Collections.unmodifiableList(Arrays.asList(FOO_FIELD));
2929

@@ -161,3 +161,4 @@ public List<SdkField<?>> sdkFields() {
161161
}
162162
}
163163
}
164+

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/eventtwo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
public final class EventTwo implements SdkPojo, ToCopyableBuilder<EventTwo.Builder, EventTwo>, EventStream {
2424
private static final SdkField<String> BAR_FIELD = SdkField.<String> builder(MarshallingType.STRING)
2525
.getter(getter(EventTwo::bar)).setter(setter(Builder::bar))
26-
.traits(LocationTrait.create(MarshallLocation.PAYLOAD, "Bar")).build();
26+
.traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("Bar").build()).build();
2727

2828
private static final List<SdkField<?>> SDK_FIELDS = Collections.unmodifiableList(Arrays.asList(BAR_FIELD));
2929

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/inputevent.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ public final class InputEvent implements SdkPojo, ToCopyableBuilder<InputEvent.B
2727
private static final SdkField<SdkBytes> EXPLICIT_PAYLOAD_MEMBER_FIELD = SdkField
2828
.<SdkBytes> builder(MarshallingType.SDK_BYTES).getter(getter(InputEvent::explicitPayloadMember))
2929
.setter(setter(Builder::explicitPayloadMember))
30-
.traits(LocationTrait.create(MarshallLocation.PAYLOAD, "ExplicitPayloadMember")).build();
30+
.traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("ExplicitPayloadMember").build())
31+
.build();
3132

3233
private static final List<SdkField<?>> SDK_FIELDS = Collections
3334
.unmodifiableList(Arrays.asList(EXPLICIT_PAYLOAD_MEMBER_FIELD));

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/inputeventtwo.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,17 @@ public final class InputEventTwo implements SdkPojo, ToCopyableBuilder<InputEven
2727
private static final SdkField<SdkBytes> IMPLICIT_PAYLOAD_MEMBER_ONE_FIELD = SdkField
2828
.<SdkBytes> builder(MarshallingType.SDK_BYTES).getter(getter(InputEventTwo::implicitPayloadMemberOne))
2929
.setter(setter(Builder::implicitPayloadMemberOne))
30-
.traits(LocationTrait.create(MarshallLocation.PAYLOAD, "ImplicitPayloadMemberOne")).build();
30+
.traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("ImplicitPayloadMemberOne").build())
31+
.build();
3132

3233
private static final SdkField<String> IMPLICIT_PAYLOAD_MEMBER_TWO_FIELD = SdkField.<String> builder(MarshallingType.STRING)
3334
.getter(getter(InputEventTwo::implicitPayloadMemberTwo)).setter(setter(Builder::implicitPayloadMemberTwo))
34-
.traits(LocationTrait.create(MarshallLocation.PAYLOAD, "ImplicitPayloadMemberTwo")).build();
35+
.traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("ImplicitPayloadMemberTwo").build())
36+
.build();
3537

3638
private static final SdkField<String> EVENT_HEADER_MEMBER_FIELD = SdkField.<String> builder(MarshallingType.STRING)
3739
.getter(getter(InputEventTwo::eventHeaderMember)).setter(setter(Builder::eventHeaderMember))
38-
.traits(LocationTrait.create(MarshallLocation.PAYLOAD, "EventHeaderMember")).build();
40+
.traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("EventHeaderMember").build()).build();
3941

4042
private static final List<SdkField<?>> SDK_FIELDS = Collections.unmodifiableList(Arrays.asList(
4143
IMPLICIT_PAYLOAD_MEMBER_ONE_FIELD, IMPLICIT_PAYLOAD_MEMBER_TWO_FIELD, EVENT_HEADER_MEMBER_FIELD));

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/nestedcontainersrequest.java

Lines changed: 31 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -34,79 +34,94 @@ public final class NestedContainersRequest extends JsonProtocolTestsRequest impl
3434
.<List<List<String>>> builder(MarshallingType.LIST)
3535
.getter(getter(NestedContainersRequest::listOfListOfStrings))
3636
.setter(setter(Builder::listOfListOfStrings))
37-
.traits(LocationTrait.create(MarshallLocation.PAYLOAD, "ListOfListOfStrings"),
37+
.traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("ListOfListOfStrings").build(),
3838
ListTrait
3939
.builder()
4040
.memberLocationName(null)
4141
.memberFieldInfo(
4242
SdkField.<List<String>> builder(MarshallingType.LIST)
43-
.traits(LocationTrait.create(MarshallLocation.PAYLOAD, "member"),
43+
.traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
44+
.locationName("member").build(),
4445
ListTrait
4546
.builder()
4647
.memberLocationName(null)
4748
.memberFieldInfo(
4849
SdkField.<String> builder(MarshallingType.STRING)
49-
.traits(LocationTrait.create(
50-
MarshallLocation.PAYLOAD, "member")).build())
50+
.traits(LocationTrait.builder()
51+
.location(MarshallLocation.PAYLOAD)
52+
.locationName("member").build()).build())
5153
.build()).build()).build()).build();
5254

5355
private static final SdkField<List<List<List<String>>>> LIST_OF_LIST_OF_LIST_OF_STRINGS_FIELD = SdkField
5456
.<List<List<List<String>>>> builder(MarshallingType.LIST)
5557
.getter(getter(NestedContainersRequest::listOfListOfListOfStrings))
5658
.setter(setter(Builder::listOfListOfListOfStrings))
57-
.traits(LocationTrait.create(MarshallLocation.PAYLOAD, "ListOfListOfListOfStrings"),
59+
.traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("ListOfListOfListOfStrings").build(),
5860
ListTrait
5961
.builder()
6062
.memberLocationName(null)
6163
.memberFieldInfo(
6264
SdkField.<List<List<String>>> builder(MarshallingType.LIST)
63-
.traits(LocationTrait.create(MarshallLocation.PAYLOAD, "member"),
65+
.traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
66+
.locationName("member").build(),
6467
ListTrait
6568
.builder()
6669
.memberLocationName(null)
6770
.memberFieldInfo(
6871
SdkField.<List<String>> builder(MarshallingType.LIST)
69-
.traits(LocationTrait.create(
70-
MarshallLocation.PAYLOAD, "member"),
72+
.traits(LocationTrait.builder()
73+
.location(MarshallLocation.PAYLOAD)
74+
.locationName("member").build(),
7175
ListTrait
7276
.builder()
7377
.memberLocationName(null)
7478
.memberFieldInfo(
7579
SdkField.<String> builder(
7680
MarshallingType.STRING)
7781
.traits(LocationTrait
78-
.create(MarshallLocation.PAYLOAD,
79-
"member"))
82+
.builder()
83+
.location(
84+
MarshallLocation.PAYLOAD)
85+
.locationName(
86+
"member")
87+
.build())
8088
.build()).build())
8189
.build()).build()).build()).build()).build();
8290

8391
private static final SdkField<Map<String, List<List<String>>>> MAP_OF_STRING_TO_LIST_OF_LIST_OF_STRINGS_FIELD = SdkField
8492
.<Map<String, List<List<String>>>> builder(MarshallingType.MAP)
8593
.getter(getter(NestedContainersRequest::mapOfStringToListOfListOfStrings))
8694
.setter(setter(Builder::mapOfStringToListOfListOfStrings))
87-
.traits(LocationTrait.create(MarshallLocation.PAYLOAD, "MapOfStringToListOfListOfStrings"),
95+
.traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfStringToListOfListOfStrings")
96+
.build(),
8897
MapTrait.builder()
8998
.keyLocationName("key")
9099
.valueLocationName("value")
91100
.valueFieldInfo(
92101
SdkField.<List<List<String>>> builder(MarshallingType.LIST)
93-
.traits(LocationTrait.create(MarshallLocation.PAYLOAD, "value"),
102+
.traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
103+
.locationName("value").build(),
94104
ListTrait
95105
.builder()
96106
.memberLocationName(null)
97107
.memberFieldInfo(
98108
SdkField.<List<String>> builder(MarshallingType.LIST)
99-
.traits(LocationTrait.create(
100-
MarshallLocation.PAYLOAD, "member"),
109+
.traits(LocationTrait.builder()
110+
.location(MarshallLocation.PAYLOAD)
111+
.locationName("member").build(),
101112
ListTrait
102113
.builder()
103114
.memberLocationName(null)
104115
.memberFieldInfo(
105116
SdkField.<String> builder(
106117
MarshallingType.STRING)
107118
.traits(LocationTrait
108-
.create(MarshallLocation.PAYLOAD,
109-
"member"))
119+
.builder()
120+
.location(
121+
MarshallLocation.PAYLOAD)
122+
.locationName(
123+
"member")
124+
.build())
110125
.build()).build())
111126
.build()).build()).build()).build()).build();
112127

0 commit comments

Comments
 (0)