File tree Expand file tree Collapse file tree 26 files changed +75
-40
lines changed
main/java/software/amazon/awssdk/codegen/poet/model
test/resources/software/amazon/awssdk/codegen/poet/model
nonautoconstructcontainers
auth/src/test/java/software/amazon/awssdk/auth/credentials
aws-core/src/test/java/software/amazon/awssdk/awscore/client/http
main/java/software/amazon/awssdk/core
test/java/software/amazon/awssdk/core/http Expand file tree Collapse file tree 26 files changed +75
-40
lines changed Original file line number Diff line number Diff line change @@ -245,11 +245,13 @@ private ClassName builderClassName() {
245
245
private List <TypeName > modelSuperInterfaces () {
246
246
List <TypeName > interfaces = new ArrayList <>();
247
247
248
- interfaces .add (ClassName .get (SdkPojo .class ));
249
248
250
249
switch (shapeModel .getShapeType ()) {
251
250
case Exception :
252
251
case Model :
252
+ interfaces .add (ClassName .get (SdkPojo .class ));
253
+ interfaces .add (toCopyableBuilderInterface ());
254
+ break ;
253
255
case Request :
254
256
case Response :
255
257
interfaces .add (toCopyableBuilderInterface ());
Original file line number Diff line number Diff line change 37
37
/**
38
38
*/
39
39
@ Generated ("software.amazon.awssdk:codegen" )
40
- public final class AllTypesRequest extends JsonProtocolTestsRequest implements SdkPojo ,
41
- ToCopyableBuilder <AllTypesRequest .Builder , AllTypesRequest > {
40
+ public final class AllTypesRequest extends JsonProtocolTestsRequest implements
41
+ ToCopyableBuilder <AllTypesRequest .Builder , AllTypesRequest > {
42
42
private static final SdkField <String > STRING_MEMBER_FIELD = SdkField .<String > builder (MarshallingType .STRING )
43
43
.getter (getter (AllTypesRequest ::stringMember )).setter (setter (Builder ::stringMember ))
44
44
.traits (LocationTrait .create (MarshallLocation .PAYLOAD , "StringMember" )).build ();
Original file line number Diff line number Diff line change 36
36
/**
37
37
*/
38
38
@ Generated ("software.amazon.awssdk:codegen" )
39
- public final class AllTypesResponse extends JsonProtocolTestsResponse implements SdkPojo ,
40
- ToCopyableBuilder <AllTypesResponse .Builder , AllTypesResponse > {
39
+ public final class AllTypesResponse extends JsonProtocolTestsResponse implements
40
+ ToCopyableBuilder <AllTypesResponse .Builder , AllTypesResponse > {
41
41
private static final SdkField <String > STRING_MEMBER_FIELD = SdkField .<String > builder (MarshallingType .STRING )
42
42
.getter (getter (AllTypesResponse ::stringMember )).setter (setter (Builder ::stringMember ))
43
43
.traits (LocationTrait .create (MarshallLocation .PAYLOAD , "StringMember" )).build ();
Original file line number Diff line number Diff line change 6
6
import java .util .Optional ;
7
7
import software .amazon .awssdk .annotations .Generated ;
8
8
import software .amazon .awssdk .core .protocol .SdkField ;
9
- import software .amazon .awssdk .core .protocol .SdkPojo ;
10
9
import software .amazon .awssdk .utils .ToString ;
11
10
12
11
/**
13
12
*/
14
13
@ Generated ("software.amazon.awssdk:codegen" )
15
- public final class EnumType implements SdkPojo {
14
+ public final class EnumType {
16
15
private static final List <SdkField <?>> SDK_FIELDS = Collections .unmodifiableList (Arrays .asList ());
17
16
18
17
private EnumType (EnumType .BuilderImpl builder ) {
Original file line number Diff line number Diff line change 16
16
/**
17
17
*/
18
18
@ Generated ("software.amazon.awssdk:codegen" )
19
- public final class EventStreamOperationRequest extends JsonProtocolTestsRequest implements SdkPojo ,
20
- ToCopyableBuilder <EventStreamOperationRequest .Builder , EventStreamOperationRequest > {
19
+ public final class EventStreamOperationRequest extends JsonProtocolTestsRequest implements
20
+ ToCopyableBuilder <EventStreamOperationRequest .Builder , EventStreamOperationRequest > {
21
21
private static final List <SdkField <?>> SDK_FIELDS = Collections .unmodifiableList (Arrays .asList ());
22
22
23
23
private EventStreamOperationRequest (BuilderImpl builder ) {
Original file line number Diff line number Diff line change 14
14
/**
15
15
*/
16
16
@ Generated ("software.amazon.awssdk:codegen" )
17
- public final class EventStreamOperationResponse extends JsonProtocolTestsResponse implements SdkPojo ,
18
- ToCopyableBuilder <EventStreamOperationResponse .Builder , EventStreamOperationResponse > {
17
+ public final class EventStreamOperationResponse extends JsonProtocolTestsResponse implements
18
+ ToCopyableBuilder <EventStreamOperationResponse .Builder , EventStreamOperationResponse > {
19
19
private static final List <SdkField <?>> SDK_FIELDS = Collections .unmodifiableList (Arrays .asList ());
20
20
21
21
private EventStreamOperationResponse (BuilderImpl builder ) {
Original file line number Diff line number Diff line change 16
16
/**
17
17
*/
18
18
@ Generated ("software.amazon.awssdk:codegen" )
19
- public final class EventStreamOperationWithOnlyInputRequest extends JsonProtocolTestsRequest implements SdkPojo ,
20
- ToCopyableBuilder <EventStreamOperationWithOnlyInputRequest .Builder , EventStreamOperationWithOnlyInputRequest > {
19
+ public final class EventStreamOperationWithOnlyInputRequest extends JsonProtocolTestsRequest implements
20
+ ToCopyableBuilder <EventStreamOperationWithOnlyInputRequest .Builder , EventStreamOperationWithOnlyInputRequest > {
21
21
private static final List <SdkField <?>> SDK_FIELDS = Collections .unmodifiableList (Arrays .asList ());
22
22
23
23
private EventStreamOperationWithOnlyInputRequest (BuilderImpl builder ) {
Original file line number Diff line number Diff line change 12
12
import software .amazon .awssdk .utils .builder .ToCopyableBuilder ;
13
13
14
14
@ Generated ("software.amazon.awssdk:codegen" )
15
- public final class EventStreamOperationWithOnlyInputResponse extends JsonProtocolTestsResponse implements SdkPojo ,
16
- ToCopyableBuilder <EventStreamOperationWithOnlyInputResponse .Builder , EventStreamOperationWithOnlyInputResponse > {
15
+ public final class EventStreamOperationWithOnlyInputResponse extends JsonProtocolTestsResponse implements
16
+ ToCopyableBuilder <EventStreamOperationWithOnlyInputResponse .Builder , EventStreamOperationWithOnlyInputResponse > {
17
17
private static final List <SdkField <?>> SDK_FIELDS = Collections .unmodifiableList (Arrays .asList ());
18
18
19
19
private EventStreamOperationWithOnlyInputResponse (BuilderImpl builder ) {
Original file line number Diff line number Diff line change 28
28
/**
29
29
*/
30
30
@ Generated ("software.amazon.awssdk:codegen" )
31
- public final class NestedContainersRequest extends JsonProtocolTestsRequest implements SdkPojo ,
32
- ToCopyableBuilder <NestedContainersRequest .Builder , NestedContainersRequest > {
31
+ public final class NestedContainersRequest extends JsonProtocolTestsRequest implements
32
+ ToCopyableBuilder <NestedContainersRequest .Builder , NestedContainersRequest > {
33
33
private static final SdkField <List <List <String >>> LIST_OF_LIST_OF_STRINGS_FIELD = SdkField
34
34
.<List <List <String >>> builder (MarshallingType .LIST )
35
35
.getter (getter (NestedContainersRequest ::listOfListOfStrings ))
Original file line number Diff line number Diff line change 26
26
/**
27
27
*/
28
28
@ Generated ("software.amazon.awssdk:codegen" )
29
- public final class NestedContainersResponse extends JsonProtocolTestsResponse implements SdkPojo ,
30
- ToCopyableBuilder <NestedContainersResponse .Builder , NestedContainersResponse > {
29
+ public final class NestedContainersResponse extends JsonProtocolTestsResponse implements
30
+ ToCopyableBuilder <NestedContainersResponse .Builder , NestedContainersResponse > {
31
31
private static final SdkField <List <List <String >>> LIST_OF_LIST_OF_STRINGS_FIELD = SdkField
32
32
.<List <List <String >>> builder (MarshallingType .LIST )
33
33
.getter (getter (NestedContainersResponse ::listOfListOfStrings ))
Original file line number Diff line number Diff line change 35
35
/**
36
36
*/
37
37
@ Generated ("software.amazon.awssdk:codegen" )
38
- public final class AllTypesRequest extends JsonProtocolTestsRequest implements SdkPojo ,
39
- ToCopyableBuilder <AllTypesRequest .Builder , AllTypesRequest > {
38
+ public final class AllTypesRequest extends JsonProtocolTestsRequest implements
39
+ ToCopyableBuilder <AllTypesRequest .Builder , AllTypesRequest > {
40
40
private static final SdkField <String > STRING_MEMBER_FIELD = SdkField .<String > builder (MarshallingType .STRING )
41
41
.getter (getter (AllTypesRequest ::stringMember )).setter (setter (Builder ::stringMember ))
42
42
.traits (LocationTrait .create (MarshallLocation .PAYLOAD , "StringMember" )).build ();
Original file line number Diff line number Diff line change 34
34
/**
35
35
*/
36
36
@ Generated ("software.amazon.awssdk:codegen" )
37
- public final class AllTypesResponse extends JsonProtocolTestsResponse implements SdkPojo ,
38
- ToCopyableBuilder <AllTypesResponse .Builder , AllTypesResponse > {
37
+ public final class AllTypesResponse extends JsonProtocolTestsResponse implements
38
+ ToCopyableBuilder <AllTypesResponse .Builder , AllTypesResponse > {
39
39
private static final SdkField <String > STRING_MEMBER_FIELD = SdkField .<String > builder (MarshallingType .STRING )
40
40
.getter (getter (AllTypesResponse ::stringMember )).setter (setter (Builder ::stringMember ))
41
41
.traits (LocationTrait .create (MarshallLocation .PAYLOAD , "StringMember" )).build ();
Original file line number Diff line number Diff line change 26
26
/**
27
27
*/
28
28
@ Generated ("software.amazon.awssdk:codegen" )
29
- public final class NestedContainersRequest extends JsonProtocolTestsRequest implements SdkPojo ,
30
- ToCopyableBuilder <NestedContainersRequest .Builder , NestedContainersRequest > {
29
+ public final class NestedContainersRequest extends JsonProtocolTestsRequest implements
30
+ ToCopyableBuilder <NestedContainersRequest .Builder , NestedContainersRequest > {
31
31
private static final SdkField <List <List <String >>> LIST_OF_LIST_OF_STRINGS_FIELD = SdkField
32
32
.<List <List <String >>> builder (MarshallingType .LIST )
33
33
.getter (getter (NestedContainersRequest ::listOfListOfStrings ))
Original file line number Diff line number Diff line change 24
24
/**
25
25
*/
26
26
@ Generated ("software.amazon.awssdk:codegen" )
27
- public final class NestedContainersResponse extends JsonProtocolTestsResponse implements SdkPojo ,
28
- ToCopyableBuilder <NestedContainersResponse .Builder , NestedContainersResponse > {
27
+ public final class NestedContainersResponse extends JsonProtocolTestsResponse implements
28
+ ToCopyableBuilder <NestedContainersResponse .Builder , NestedContainersResponse > {
29
29
private static final SdkField <List <List <String >>> LIST_OF_LIST_OF_STRINGS_FIELD = SdkField
30
30
.<List <List <String >>> builder (MarshallingType .LIST )
31
31
.getter (getter (NestedContainersResponse ::listOfListOfStrings ))
Original file line number Diff line number Diff line change 14
14
import software .amazon .awssdk .utils .builder .ToCopyableBuilder ;
15
15
16
16
@ Generated ("software.amazon.awssdk:codegen" )
17
- public final class OperationWithNoInputOrOutputRequest extends JsonProtocolTestsRequest implements SdkPojo ,
18
- ToCopyableBuilder <OperationWithNoInputOrOutputRequest .Builder , OperationWithNoInputOrOutputRequest > {
17
+ public final class OperationWithNoInputOrOutputRequest extends JsonProtocolTestsRequest implements
18
+ ToCopyableBuilder <OperationWithNoInputOrOutputRequest .Builder , OperationWithNoInputOrOutputRequest > {
19
19
private static final List <SdkField <?>> SDK_FIELDS = Collections .unmodifiableList (Arrays .asList ());
20
20
21
21
private OperationWithNoInputOrOutputRequest (BuilderImpl builder ) {
Original file line number Diff line number Diff line change 12
12
import software .amazon .awssdk .utils .builder .ToCopyableBuilder ;
13
13
14
14
@ Generated ("software.amazon.awssdk:codegen" )
15
- public final class OperationWithNoInputOrOutputResponse extends JsonProtocolTestsResponse implements SdkPojo ,
16
- ToCopyableBuilder <OperationWithNoInputOrOutputResponse .Builder , OperationWithNoInputOrOutputResponse > {
15
+ public final class OperationWithNoInputOrOutputResponse extends JsonProtocolTestsResponse implements
16
+ ToCopyableBuilder <OperationWithNoInputOrOutputResponse .Builder , OperationWithNoInputOrOutputResponse > {
17
17
private static final List <SdkField <?>> SDK_FIELDS = Collections .unmodifiableList (Arrays .asList ());
18
18
19
19
private OperationWithNoInputOrOutputResponse (BuilderImpl builder ) {
Original file line number Diff line number Diff line change 16
16
/**
17
17
*/
18
18
@ Generated ("software.amazon.awssdk:codegen" )
19
- public final class StreamingInputOperationRequest extends JsonProtocolTestsRequest implements SdkPojo ,
20
- ToCopyableBuilder <StreamingInputOperationRequest .Builder , StreamingInputOperationRequest > {
19
+ public final class StreamingInputOperationRequest extends JsonProtocolTestsRequest implements
20
+ ToCopyableBuilder <StreamingInputOperationRequest .Builder , StreamingInputOperationRequest > {
21
21
private static final List <SdkField <?>> SDK_FIELDS = Collections .unmodifiableList (Arrays .asList ());
22
22
23
23
private StreamingInputOperationRequest (BuilderImpl builder ) {
Original file line number Diff line number Diff line change 12
12
import software .amazon .awssdk .utils .builder .ToCopyableBuilder ;
13
13
14
14
@ Generated ("software.amazon.awssdk:codegen" )
15
- public final class StreamingInputOperationResponse extends JsonProtocolTestsResponse implements SdkPojo ,
16
- ToCopyableBuilder <StreamingInputOperationResponse .Builder , StreamingInputOperationResponse > {
15
+ public final class StreamingInputOperationResponse extends JsonProtocolTestsResponse implements
16
+ ToCopyableBuilder <StreamingInputOperationResponse .Builder , StreamingInputOperationResponse > {
17
17
private static final List <SdkField <?>> SDK_FIELDS = Collections .unmodifiableList (Arrays .asList ());
18
18
19
19
private StreamingInputOperationResponse (BuilderImpl builder ) {
Original file line number Diff line number Diff line change 14
14
import software .amazon .awssdk .utils .builder .ToCopyableBuilder ;
15
15
16
16
@ Generated ("software.amazon.awssdk:codegen" )
17
- public final class StreamingOutputOperationRequest extends JsonProtocolTestsRequest implements SdkPojo ,
18
- ToCopyableBuilder <StreamingOutputOperationRequest .Builder , StreamingOutputOperationRequest > {
17
+ public final class StreamingOutputOperationRequest extends JsonProtocolTestsRequest implements
18
+ ToCopyableBuilder <StreamingOutputOperationRequest .Builder , StreamingOutputOperationRequest > {
19
19
private static final List <SdkField <?>> SDK_FIELDS = Collections .unmodifiableList (Arrays .asList ());
20
20
21
21
private StreamingOutputOperationRequest (BuilderImpl builder ) {
Original file line number Diff line number Diff line change 14
14
/**
15
15
*/
16
16
@ Generated ("software.amazon.awssdk:codegen" )
17
- public final class StreamingOutputOperationResponse extends JsonProtocolTestsResponse implements SdkPojo ,
18
- ToCopyableBuilder <StreamingOutputOperationResponse .Builder , StreamingOutputOperationResponse > {
17
+ public final class StreamingOutputOperationResponse extends JsonProtocolTestsResponse implements
18
+ ToCopyableBuilder <StreamingOutputOperationResponse .Builder , StreamingOutputOperationResponse > {
19
19
private static final List <SdkField <?>> SDK_FIELDS = Collections .unmodifiableList (Arrays .asList ());
20
20
21
21
private StreamingOutputOperationResponse (BuilderImpl builder ) {
Original file line number Diff line number Diff line change 15
15
16
16
package software .amazon .awssdk .auth .credentials ;
17
17
18
+ import java .util .Collections ;
19
+ import java .util .List ;
18
20
import java .util .Optional ;
19
21
import software .amazon .awssdk .core .RequestOverrideConfiguration ;
20
22
import software .amazon .awssdk .core .SdkRequest ;
23
+ import software .amazon .awssdk .core .protocol .SdkField ;
21
24
22
25
public class NoopTestRequest extends SdkRequest {
23
26
private NoopTestRequest () {
@@ -38,6 +41,11 @@ public static Builder builder() {
38
41
return new BuilderImpl ();
39
42
}
40
43
44
+ @ Override
45
+ public List <SdkField <?>> sdkFields () {
46
+ return Collections .emptyList ();
47
+ }
48
+
41
49
public interface Builder extends SdkRequest .Builder {
42
50
@ Override
43
51
NoopTestRequest build ();
Original file line number Diff line number Diff line change 16
16
package software .amazon .awssdk .awscore .client .http ;
17
17
18
18
19
+ import java .util .Collections ;
20
+ import java .util .List ;
19
21
import software .amazon .awssdk .awscore .AwsResponse ;
22
+ import software .amazon .awssdk .core .protocol .SdkField ;
20
23
21
24
public class EmptyAwsResponse extends AwsResponse {
22
25
public EmptyAwsResponse (Builder builder ) {
@@ -31,6 +34,11 @@ public static Builder builder() {
31
34
return new BuilderImpl ();
32
35
}
33
36
37
+ @ Override
38
+ public List <SdkField <?>> sdkFields () {
39
+ return Collections .emptyList ();
40
+ }
41
+
34
42
public interface Builder extends AwsResponse .Builder {
35
43
@ Override
36
44
EmptyAwsResponse build ();
Original file line number Diff line number Diff line change 15
15
16
16
package software .amazon .awssdk .awscore .client .http ;
17
17
18
+ import java .util .Collections ;
19
+ import java .util .List ;
18
20
import software .amazon .awssdk .awscore .AwsRequest ;
19
21
import software .amazon .awssdk .awscore .AwsRequestOverrideConfiguration ;
22
+ import software .amazon .awssdk .core .protocol .SdkField ;
20
23
21
24
public class NoopTestAwsRequest extends AwsRequest {
22
25
private NoopTestAwsRequest (Builder builder ) {
@@ -32,6 +35,11 @@ public static Builder builder() {
32
35
return new BuilderImpl ();
33
36
}
34
37
38
+ @ Override
39
+ public List <SdkField <?>> sdkFields () {
40
+ return Collections .emptyList ();
41
+ }
42
+
35
43
public interface Builder extends AwsRequest .Builder {
36
44
@ Override
37
45
NoopTestAwsRequest build ();
Original file line number Diff line number Diff line change 18
18
import java .util .Optional ;
19
19
import software .amazon .awssdk .annotations .Immutable ;
20
20
import software .amazon .awssdk .annotations .SdkPublicApi ;
21
+ import software .amazon .awssdk .core .protocol .SdkPojo ;
21
22
22
23
/**
23
24
* The base class for all SDK requests.
28
29
*/
29
30
@ Immutable
30
31
@ SdkPublicApi
31
- public abstract class SdkRequest {
32
+ public abstract class SdkRequest implements SdkPojo {
32
33
/**
33
34
* @return The optional client configuration overrides for this request.
34
35
*/
Original file line number Diff line number Diff line change 15
15
16
16
package software .amazon .awssdk .core .http ;
17
17
18
+ import java .util .Collections ;
19
+ import java .util .List ;
18
20
import java .util .Optional ;
19
21
import software .amazon .awssdk .core .SdkRequest ;
20
22
import software .amazon .awssdk .core .SdkRequestOverrideConfiguration ;
23
+ import software .amazon .awssdk .core .protocol .SdkField ;
21
24
22
25
public class NoopTestRequest extends SdkRequest {
23
26
@@ -42,6 +45,11 @@ public static Builder builder() {
42
45
return new BuilderImpl ();
43
46
}
44
47
48
+ @ Override
49
+ public List <SdkField <?>> sdkFields () {
50
+ return Collections .emptyList ();
51
+ }
52
+
45
53
public interface Builder extends SdkRequest .Builder {
46
54
@ Override
47
55
NoopTestRequest build ();
Original file line number Diff line number Diff line change 167
167
</executions >
168
168
</plugin >
169
169
</plugins >
170
+
170
171
</build >
171
172
172
173
</project >
You can’t perform that action at this time.
0 commit comments