Skip to content

Commit 7306b41

Browse files
peterrsonggpeterrsongg
authored
Generate ListObjects (#4205)
* Generate ListObjects stack-info: PR: #4205, branch: peterrsongg/petesong/phase-3-pr5-rebased-2/2 * Generate UpdateBucketMetadataTableConfiguration (#4206) * Generate UpdateBucketMetadataTableConfiguration stack-info: PR: #4206, branch: peterrsongg/petesong/phase-3-pr5-rebased-2/3 * generate ListMultipartUploads (#4207) stack-info: PR: #4207, branch: peterrsongg/petesong/phase-3-pr5-rebased-2/4
1 parent 241693e commit 7306b41

26 files changed

+2099
-1364
lines changed

‎generator/ServiceClientGeneratorLib/ServiceModel.cs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -575,8 +575,10 @@ public List<Operation> S3AllowListOperations
575575
new Operation(this,"PutBucketRequestPayment", DocumentRoot[OperationsKey]["PutBucketRequestPayment"]),
576576
new Operation(this, "CreateBucketMetadataConfiguration",DocumentRoot[OperationsKey]["CreateBucketMetadataConfiguration"]),
577577
new Operation(this, "GetBucketMetadataConfiguration", DocumentRoot[OperationsKey]["GetBucketMetadataConfiguration"]),
578-
new Operation(this, "DeleteBucketMetadataConfiguration", DocumentRoot[OperationsKey]["DeleteBucketMetadataConfiguration"])
579-
578+
new Operation(this, "DeleteBucketMetadataConfiguration", DocumentRoot[OperationsKey]["DeleteBucketMetadataConfiguration"]),
579+
new Operation(this, "ListObjects", DocumentRoot[OperationsKey]["ListObjects"]),
580+
new Operation(this,"UpdateBucketMetadataJournalTableConfiguration", DocumentRoot[OperationsKey]["UpdateBucketMetadataJournalTableConfiguration"]),
581+
new Operation(this, "ListMultipartUploads", DocumentRoot[OperationsKey]["ListMultipartUploads"])
580582
};
581583
}
582584
return _s3AllowListOperations.Where(operation => operation.data != null).ToList();

‎generator/ServiceModels/s3/s3.customizations.json‎

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1222,6 +1222,73 @@
12221222
"modify":[
12231223
{
12241224
"ExpectedBucketOwner":{"injectXmlIsSet":["return !String.IsNullOrEmpty(this._expectedBucketOwner);"]}
1225+
}
1226+
]
1227+
},
1228+
"ListObjectsRequest":{
1229+
"modify":[
1230+
{
1231+
"EncodingType":{"emitPropertyName":"Encoding"}
1232+
},
1233+
{
1234+
"ExpectedBucketOwner":{"injectXmlIsSet":["return !String.IsNullOrEmpty(this._expectedBucketOwner);"]}
1235+
}
1236+
]
1237+
},
1238+
"ListObjectsOutput":{
1239+
"modify":[
1240+
{
1241+
"Contents":{
1242+
"emitPropertyName":"S3Objects"
1243+
}
1244+
},
1245+
{
1246+
"S3Objects":{
1247+
"injectXmlUnmarshallCode":["ContentsCustomUnmarshall(context, response);"],
1248+
"skipContextTestExpressionUnmarshallingLogic" : true
1249+
}
1250+
},
1251+
{
1252+
"NextMarker":{"injectXmlPropertyGetter":["get { return NextMarkerCustomGetter(); }"]}
1253+
},
1254+
{
1255+
"EncodingType":{"emitPropertyName":"Encoding"}
1256+
}
1257+
]
1258+
},
1259+
"UpdateBucketMetadataJournalTableConfigurationRequest":{
1260+
"modify":[
1261+
{
1262+
"ContentMD5":{"injectXmlIsSet":["return !String.IsNullOrEmpty(this._contentMD5);"]}
1263+
},
1264+
{
1265+
"ExpectedBucketOwner":{"injectXmlIsSet":["return !String.IsNullOrEmpty(this._expectedBucketOwner);"]}
1266+
}
1267+
1268+
]
1269+
},
1270+
"ListMultipartUploadsRequest":{
1271+
"modify":[
1272+
{
1273+
"EncodingType":{"emitPropertyName":"Encoding"}
1274+
},
1275+
{
1276+
"ExpectedBucketOwner":{"injectXmlIsSet":["return !String.IsNullOrEmpty(this._expectedBucketOwner);"]}
1277+
}
1278+
]
1279+
},
1280+
"ListMultipartUploadsOutput":{
1281+
"modify":[
1282+
{
1283+
"CommonPrefixes":{
1284+
"injectXmlUnmarshallCode":["CommonPrefixesCustomUnmarshall(context, response);"],
1285+
"skipContextTestExpressionUnmarshallingLogic" : true
1286+
}
1287+
},
1288+
{
1289+
"Uploads":{"emitPropertyName":"MultipartUploads"}
1290+
1291+
12251292
}
12261293
]
12271294
}
@@ -1521,6 +1588,27 @@
15211588
"Marshaller": "StringUtils.FromString",
15221589
"Unmarshaller": "StringUnmarshaller"
15231590
}
1591+
},
1592+
"ListObjectsOutput": {
1593+
"CommonPrefixes" : {
1594+
"Type": "List<string>",
1595+
"Marshaller": "StringUtils.FromString",
1596+
"Unmarshaller" : "CommonPrefixesItemUnmarshaller"
1597+
}
1598+
},
1599+
"ListMultipartUploadsRequest":{
1600+
"CommonPrefixes" : {
1601+
"Type": "List<string>",
1602+
"Marshaller": "StringUtils.FromString",
1603+
"Unmarshaller" : "CommonPrefixesItemUnmarshaller"
1604+
}
1605+
},
1606+
"ListMultipartUploadsOutput":{
1607+
"CommonPrefixes" : {
1608+
"Type": "List<string>",
1609+
"Marshaller": "StringUtils.FromString",
1610+
"Unmarshaller" : "CommonPrefixesItemUnmarshaller"
1611+
}
15241612
}
15251613
},
15261614
"excludeMembers":{

‎sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ListMultipartUploadsRequestMarshaller.cs‎

Lines changed: 0 additions & 89 deletions
This file was deleted.

‎sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ListMultipartUploadsResponseUnmarshaller.cs‎

Lines changed: 9 additions & 138 deletions
Original file line numberDiff line numberDiff line change
@@ -26,150 +26,21 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
2626
/// <summary>
2727
/// Response Unmarshaller for ListMultipartUploads operation
2828
/// </summary>
29-
public class ListMultipartUploadsResponseUnmarshaller : S3ReponseUnmarshaller
30-
{
31-
/// <summary>
32-
/// Unmarshaller the response from the service to the response class.
33-
/// </summary>
34-
/// <param name="context"></param>
35-
/// <returns></returns>
36-
public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext context)
37-
{
38-
ListMultipartUploadsResponse response = new ListMultipartUploadsResponse();
39-
40-
while (context.Read())
41-
{
42-
if (context.IsStartElement)
43-
{
44-
UnmarshallResult(context,response);
45-
continue;
46-
}
47-
}
48-
49-
IWebResponseData responseData = context.ResponseData;
50-
if (responseData.IsHeaderPresent(S3Constants.AmzHeaderRequestCharged))
51-
response.RequestCharged = RequestCharged.FindValue(responseData.GetHeaderValue(S3Constants.AmzHeaderRequestCharged));
52-
53-
return response;
54-
}
55-
56-
private static void UnmarshallResult(XmlUnmarshallerContext context,ListMultipartUploadsResponse response)
29+
public partial class ListMultipartUploadsResponseUnmarshaller : S3ReponseUnmarshaller
30+
{
31+
private static void CommonPrefixesCustomUnmarshall(XmlUnmarshallerContext context, ListMultipartUploadsResponse response)
5732
{
58-
59-
int originalDepth = context.CurrentDepth;
60-
int targetDepth = originalDepth + 1;
61-
62-
if (context.IsStartOfDocument)
63-
targetDepth += 2;
64-
65-
while (context.Read())
66-
{
67-
if (context.IsStartElement || context.IsAttribute)
68-
{
69-
if (context.TestExpression("Bucket", targetDepth))
70-
{
71-
response.BucketName = StringUnmarshaller.GetInstance().Unmarshall(context);
72-
73-
continue;
74-
}
75-
if (context.TestExpression("KeyMarker", targetDepth))
76-
{
77-
response.KeyMarker = StringUnmarshaller.GetInstance().Unmarshall(context);
78-
79-
continue;
80-
}
81-
if (context.TestExpression("UploadIdMarker", targetDepth))
82-
{
83-
response.UploadIdMarker = StringUnmarshaller.GetInstance().Unmarshall(context);
84-
85-
continue;
86-
}
87-
if (context.TestExpression("NextKeyMarker", targetDepth))
88-
{
89-
response.NextKeyMarker = StringUnmarshaller.GetInstance().Unmarshall(context);
90-
91-
continue;
92-
}
93-
if (context.TestExpression("NextUploadIdMarker", targetDepth))
94-
{
95-
response.NextUploadIdMarker = StringUnmarshaller.GetInstance().Unmarshall(context);
96-
97-
continue;
98-
}
99-
if (context.TestExpression("MaxUploads", targetDepth))
100-
{
101-
response.MaxUploads = IntUnmarshaller.GetInstance().Unmarshall(context);
102-
103-
continue;
104-
}
105-
if (context.TestExpression("IsTruncated", targetDepth))
106-
{
107-
response.IsTruncated = BoolUnmarshaller.GetInstance().Unmarshall(context);
108-
109-
continue;
110-
}
111-
if (context.TestExpression("Upload", targetDepth))
112-
{
113-
if (response.MultipartUploads == null)
114-
{
115-
response.MultipartUploads = new List<MultipartUpload>();
116-
}
117-
118-
response.MultipartUploads.Add(MultipartUploadUnmarshaller.Instance.Unmarshall(context));
119-
continue;
120-
}
121-
if (context.TestExpression("Delimiter", targetDepth))
122-
{
123-
response.Delimiter = StringUnmarshaller.GetInstance().Unmarshall(context);
124-
125-
continue;
126-
}
127-
if (context.TestExpression("Prefix", targetDepth))
128-
{
129-
response.Prefix = StringUnmarshaller.GetInstance().Unmarshall(context);
130-
131-
continue;
132-
}
133-
if (context.TestExpression("CommonPrefixes", targetDepth))
134-
{
135-
var prefix = CommonPrefixesItemUnmarshaller.Instance.Unmarshall(context);
136-
137-
if (prefix != null)
138-
{
139-
if (response.CommonPrefixes == null)
140-
{
141-
response.CommonPrefixes = new List<string>();
142-
}
143-
response.CommonPrefixes.Add(prefix);
144-
}
33+
var prefix = CommonPrefixesItemUnmarshaller.Instance.Unmarshall(context);
14534

146-
continue;
147-
}
148-
}
149-
else if (context.IsEndElement && context.CurrentDepth < originalDepth)
150-
{
151-
return;
152-
}
153-
}
154-
155-
return;
156-
}
157-
158-
private static ListMultipartUploadsResponseUnmarshaller _instance;
159-
160-
/// <summary>
161-
/// Singleton for the unmarshaller
162-
/// </summary>
163-
public static ListMultipartUploadsResponseUnmarshaller Instance
164-
{
165-
get
35+
if (prefix != null)
16636
{
167-
if (_instance == null)
37+
if (response.CommonPrefixes == null)
16838
{
169-
_instance = new ListMultipartUploadsResponseUnmarshaller();
39+
response.CommonPrefixes = new List<string>();
17040
}
171-
return _instance;
41+
response.CommonPrefixes.Add(prefix);
17242
}
43+
return;
17344
}
17445
}
17546
}

0 commit comments

Comments
 (0)