Skip to content

Commit c472345

Browse files
muhammad-othmanmuhammad-othman
committed
Generate SQS & CloudWatch with improved AWS Query compatible error handling in unmarshallers
1 parent bcf5cbd commit c472345

File tree

110 files changed

+1575
-2587
lines changed

Some content is hidden

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

110 files changed

+1575
-2587
lines changed

‎sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/ConcurrentModificationExceptionUnmarshaller.cs‎

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -59,28 +59,8 @@ public ConcurrentModificationException Unmarshall(JsonUnmarshallerContext contex
5959
{
6060
context.Read();
6161

62-
var errorCode = errorResponse.Code;
63-
var errorType = errorResponse.Type;
64-
var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError;
65-
if (context.ResponseData.IsHeaderPresent(queryHeaderKey))
66-
{
67-
var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey);
68-
if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";"))
69-
{
70-
var queryErrorParts = queryError.Split(';');
71-
if (queryErrorParts.Length == 2)
72-
{
73-
errorCode = queryErrorParts[0];
74-
var errorTypeString = queryErrorParts[1];
75-
if (Enum.IsDefined(typeof(ErrorType), errorTypeString))
76-
{
77-
errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString);
78-
}
79-
}
80-
}
81-
}
8262
ConcurrentModificationException unmarshalledObject = new ConcurrentModificationException(errorResponse.Message, errorResponse.InnerException,
83-
errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode);
63+
errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode);
8464

8565
int targetDepth = context.CurrentDepth;
8666
while (context.ReadAtDepth(targetDepth))

‎sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/ConflictExceptionUnmarshaller.cs‎

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -59,28 +59,8 @@ public ConflictException Unmarshall(JsonUnmarshallerContext context, Amazon.Runt
5959
{
6060
context.Read();
6161

62-
var errorCode = errorResponse.Code;
63-
var errorType = errorResponse.Type;
64-
var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError;
65-
if (context.ResponseData.IsHeaderPresent(queryHeaderKey))
66-
{
67-
var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey);
68-
if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";"))
69-
{
70-
var queryErrorParts = queryError.Split(';');
71-
if (queryErrorParts.Length == 2)
72-
{
73-
errorCode = queryErrorParts[0];
74-
var errorTypeString = queryErrorParts[1];
75-
if (Enum.IsDefined(typeof(ErrorType), errorTypeString))
76-
{
77-
errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString);
78-
}
79-
}
80-
}
81-
}
8262
ConflictException unmarshalledObject = new ConflictException(errorResponse.Message, errorResponse.InnerException,
83-
errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode);
63+
errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode);
8464

8565
int targetDepth = context.CurrentDepth;
8666
while (context.ReadAtDepth(targetDepth))

‎sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DashboardInvalidInputErrorExceptionUnmarshaller.cs‎

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -59,28 +59,8 @@ public DashboardInvalidInputErrorException Unmarshall(JsonUnmarshallerContext co
5959
{
6060
context.Read();
6161

62-
var errorCode = errorResponse.Code;
63-
var errorType = errorResponse.Type;
64-
var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError;
65-
if (context.ResponseData.IsHeaderPresent(queryHeaderKey))
66-
{
67-
var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey);
68-
if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";"))
69-
{
70-
var queryErrorParts = queryError.Split(';');
71-
if (queryErrorParts.Length == 2)
72-
{
73-
errorCode = queryErrorParts[0];
74-
var errorTypeString = queryErrorParts[1];
75-
if (Enum.IsDefined(typeof(ErrorType), errorTypeString))
76-
{
77-
errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString);
78-
}
79-
}
80-
}
81-
}
8262
DashboardInvalidInputErrorException unmarshalledObject = new DashboardInvalidInputErrorException(errorResponse.Message, errorResponse.InnerException,
83-
errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode);
63+
errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode);
8464

8565
int targetDepth = context.CurrentDepth;
8666
while (context.ReadAtDepth(targetDepth))

‎sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DashboardNotFoundErrorExceptionUnmarshaller.cs‎

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -59,28 +59,8 @@ public DashboardNotFoundErrorException Unmarshall(JsonUnmarshallerContext contex
5959
{
6060
context.Read();
6161

62-
var errorCode = errorResponse.Code;
63-
var errorType = errorResponse.Type;
64-
var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError;
65-
if (context.ResponseData.IsHeaderPresent(queryHeaderKey))
66-
{
67-
var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey);
68-
if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";"))
69-
{
70-
var queryErrorParts = queryError.Split(';');
71-
if (queryErrorParts.Length == 2)
72-
{
73-
errorCode = queryErrorParts[0];
74-
var errorTypeString = queryErrorParts[1];
75-
if (Enum.IsDefined(typeof(ErrorType), errorTypeString))
76-
{
77-
errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString);
78-
}
79-
}
80-
}
81-
}
8262
DashboardNotFoundErrorException unmarshalledObject = new DashboardNotFoundErrorException(errorResponse.Message, errorResponse.InnerException,
83-
errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode);
63+
errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode);
8464

8565
int targetDepth = context.CurrentDepth;
8666
while (context.ReadAtDepth(targetDepth))

‎sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DeleteAlarmsResponseUnmarshaller.cs‎

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -68,35 +68,33 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte
6868
var responseBodyBytes = context.GetResponseBodyBytes();
6969

7070
using (var streamCopy = new MemoryStream(responseBodyBytes))
71-
7271
using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData))
7372
{
74-
if (errorResponse.Code != null && errorResponse.Code.Equals("ResourceNotFound"))
73+
var errorTypeName = errorResponse.Code;
74+
var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError;
75+
if (context.ResponseData.IsHeaderPresent(queryHeaderKey))
7576
{
76-
return ResourceNotFoundExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse);
77-
}
78-
}
79-
var errorCode = errorResponse.Code;
80-
var errorType = errorResponse.Type;
81-
var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError;
82-
if (context.ResponseData.IsHeaderPresent(queryHeaderKey))
83-
{
84-
var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey);
85-
if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";"))
86-
{
87-
var queryErrorParts = queryError.Split(';');
88-
if (queryErrorParts.Length == 2)
77+
var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey);
78+
if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";"))
8979
{
90-
errorCode = queryErrorParts[0];
91-
var errorTypeString = queryErrorParts[1];
92-
if (Enum.IsDefined(typeof(ErrorType), errorTypeString))
80+
var queryErrorParts = queryError.Split(';');
81+
if (queryErrorParts.Length == 2)
9382
{
94-
errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString);
83+
errorResponse.Code = queryErrorParts[0];
84+
var errorTypeString = queryErrorParts[1];
85+
if (Enum.IsDefined(typeof(ErrorType), errorTypeString))
86+
{
87+
errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString);
88+
}
9589
}
9690
}
9791
}
92+
if (errorTypeName != null && errorTypeName.Equals("ResourceNotFound"))
93+
{
94+
return ResourceNotFoundExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse);
95+
}
9896
}
99-
return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode);
97+
return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode);
10098
}
10199

102100
private static DeleteAlarmsResponseUnmarshaller _instance = new DeleteAlarmsResponseUnmarshaller();

‎sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DeleteAnomalyDetectorResponseUnmarshaller.cs‎

Lines changed: 25 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -68,51 +68,49 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte
6868
var responseBodyBytes = context.GetResponseBodyBytes();
6969

7070
using (var streamCopy = new MemoryStream(responseBodyBytes))
71-
7271
using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData))
7372
{
74-
if (errorResponse.Code != null && errorResponse.Code.Equals("InternalServiceFault"))
73+
var errorTypeName = errorResponse.Code;
74+
var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError;
75+
if (context.ResponseData.IsHeaderPresent(queryHeaderKey))
76+
{
77+
var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey);
78+
if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";"))
79+
{
80+
var queryErrorParts = queryError.Split(';');
81+
if (queryErrorParts.Length == 2)
82+
{
83+
errorResponse.Code = queryErrorParts[0];
84+
var errorTypeString = queryErrorParts[1];
85+
if (Enum.IsDefined(typeof(ErrorType), errorTypeString))
86+
{
87+
errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString);
88+
}
89+
}
90+
}
91+
}
92+
if (errorTypeName != null && errorTypeName.Equals("InternalServiceFault"))
7593
{
7694
return InternalServiceExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse);
7795
}
78-
if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidParameterCombinationException"))
96+
if (errorTypeName != null && errorTypeName.Equals("InvalidParameterCombinationException"))
7997
{
8098
return InvalidParameterCombinationExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse);
8199
}
82-
if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidParameterValueException"))
100+
if (errorTypeName != null && errorTypeName.Equals("InvalidParameterValueException"))
83101
{
84102
return InvalidParameterValueExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse);
85103
}
86-
if (errorResponse.Code != null && errorResponse.Code.Equals("MissingRequiredParameterException"))
104+
if (errorTypeName != null && errorTypeName.Equals("MissingRequiredParameterException"))
87105
{
88106
return MissingRequiredParameterExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse);
89107
}
90-
if (errorResponse.Code != null && errorResponse.Code.Equals("ResourceNotFoundException"))
108+
if (errorTypeName != null && errorTypeName.Equals("ResourceNotFoundException"))
91109
{
92110
return ResourceNotFoundExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse);
93111
}
94112
}
95-
var errorCode = errorResponse.Code;
96-
var errorType = errorResponse.Type;
97-
var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError;
98-
if (context.ResponseData.IsHeaderPresent(queryHeaderKey))
99-
{
100-
var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey);
101-
if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";"))
102-
{
103-
var queryErrorParts = queryError.Split(';');
104-
if (queryErrorParts.Length == 2)
105-
{
106-
errorCode = queryErrorParts[0];
107-
var errorTypeString = queryErrorParts[1];
108-
if (Enum.IsDefined(typeof(ErrorType), errorTypeString))
109-
{
110-
errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString);
111-
}
112-
}
113-
}
114-
}
115-
return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode);
113+
return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode);
116114
}
117115

118116
private static DeleteAnomalyDetectorResponseUnmarshaller _instance = new DeleteAnomalyDetectorResponseUnmarshaller();

‎sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DeleteDashboardsResponseUnmarshaller.cs‎

Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -68,47 +68,45 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte
6868
var responseBodyBytes = context.GetResponseBodyBytes();
6969

7070
using (var streamCopy = new MemoryStream(responseBodyBytes))
71-
7271
using (var contextCopy = new JsonUnmarshallerContext(streamCopy, true, context.ResponseData))
7372
{
74-
if (errorResponse.Code != null && errorResponse.Code.Equals("ConflictException"))
73+
var errorTypeName = errorResponse.Code;
74+
var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError;
75+
if (context.ResponseData.IsHeaderPresent(queryHeaderKey))
76+
{
77+
var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey);
78+
if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";"))
79+
{
80+
var queryErrorParts = queryError.Split(';');
81+
if (queryErrorParts.Length == 2)
82+
{
83+
errorResponse.Code = queryErrorParts[0];
84+
var errorTypeString = queryErrorParts[1];
85+
if (Enum.IsDefined(typeof(ErrorType), errorTypeString))
86+
{
87+
errorResponse.Type = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString);
88+
}
89+
}
90+
}
91+
}
92+
if (errorTypeName != null && errorTypeName.Equals("ConflictException"))
7593
{
7694
return ConflictExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse);
7795
}
78-
if (errorResponse.Code != null && errorResponse.Code.Equals("DashboardNotFoundError"))
96+
if (errorTypeName != null && errorTypeName.Equals("DashboardNotFoundError"))
7997
{
8098
return DashboardNotFoundErrorExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse);
8199
}
82-
if (errorResponse.Code != null && errorResponse.Code.Equals("InternalServiceFault"))
100+
if (errorTypeName != null && errorTypeName.Equals("InternalServiceFault"))
83101
{
84102
return InternalServiceExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse);
85103
}
86-
if (errorResponse.Code != null && errorResponse.Code.Equals("InvalidParameterValueException"))
104+
if (errorTypeName != null && errorTypeName.Equals("InvalidParameterValueException"))
87105
{
88106
return InvalidParameterValueExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse);
89107
}
90108
}
91-
var errorCode = errorResponse.Code;
92-
var errorType = errorResponse.Type;
93-
var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError;
94-
if (context.ResponseData.IsHeaderPresent(queryHeaderKey))
95-
{
96-
var queryError = context.ResponseData.GetHeaderValue(queryHeaderKey);
97-
if (!string.IsNullOrEmpty(queryError) && queryError.Contains(";"))
98-
{
99-
var queryErrorParts = queryError.Split(';');
100-
if (queryErrorParts.Length == 2)
101-
{
102-
errorCode = queryErrorParts[0];
103-
var errorTypeString = queryErrorParts[1];
104-
if (Enum.IsDefined(typeof(ErrorType), errorTypeString))
105-
{
106-
errorType = (ErrorType) Enum.Parse(typeof(ErrorType), errorTypeString);
107-
}
108-
}
109-
}
110-
}
111-
return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorType, errorCode, errorResponse.RequestId, errorResponse.StatusCode);
109+
return new AmazonCloudWatchException(errorResponse.Message, errorResponse.InnerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, errorResponse.StatusCode);
112110
}
113111

114112
private static DeleteDashboardsResponseUnmarshaller _instance = new DeleteDashboardsResponseUnmarshaller();

0 commit comments

Comments
 (0)