Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions generator/.DevConfigs/e2fd4917-66af-4f7a-a019-8c8fec7a1899.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@


{
"services": [
{
"serviceName": "Account",
"type": "patch",
"changeLogMessages": [
"Rename internal exception property to avoid hiding inherited AmazonServiceException member."
]
}
]
}
4 changes: 4 additions & 0 deletions generator/ServiceClientGeneratorLib/Member.cs
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,10 @@ public string BasePropertyName
}
}

// Rename ErrorType exception properties to avoid hiding AmazonServiceException.ErrorType inherited member.
if (OwningShape.IsException && _name.ToUpperFirstCharacter() == "ErrorType")
return "RequestErrorType";

return _name.ToUpperFirstCharacter();
}
}
Expand Down
13 changes: 0 additions & 13 deletions generator/ServiceModels/account/account.customizations.json

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ namespace Amazon.Account.Model
#endif
public partial class AccessDeniedException : AmazonAccountException
{
private string _requestErrorType;
private string _errorType;

/// <summary>
/// Constructs a new AccessDeniedException with the specified error
Expand Down Expand Up @@ -133,14 +133,14 @@ public override void GetObjectData(System.Runtime.Serialization.SerializationInf
/// </summary>
public string RequestErrorType
{
get { return this._requestErrorType; }
set { this._requestErrorType = value; }
get { return this._errorType; }
set { this._errorType = value; }
}

// Check to see if RequestErrorType property is set
internal bool IsSetRequestErrorType()
{
return !string.IsNullOrEmpty(this._requestErrorType);
return !string.IsNullOrEmpty(this._errorType);
}

}
Expand Down
8 changes: 4 additions & 4 deletions sdk/src/Services/Account/Generated/Model/ConflictException.cs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ namespace Amazon.Account.Model
#endif
public partial class ConflictException : AmazonAccountException
{
private string _requestErrorType;
private string _errorType;

/// <summary>
/// Constructs a new ConflictException with the specified error
Expand Down Expand Up @@ -135,14 +135,14 @@ public override void GetObjectData(System.Runtime.Serialization.SerializationInf
/// </summary>
public string RequestErrorType
{
get { return this._requestErrorType; }
set { this._requestErrorType = value; }
get { return this._errorType; }
set { this._errorType = value; }
}

// Check to see if RequestErrorType property is set
internal bool IsSetRequestErrorType()
{
return !string.IsNullOrEmpty(this._requestErrorType);
return !string.IsNullOrEmpty(this._errorType);
}

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ namespace Amazon.Account.Model
#endif
public partial class InternalServerException : AmazonAccountException
{
private string _requestErrorType;
private string _errorType;

private RetryableDetails _retryableDetails = new RetryableDetails(false);

Expand Down Expand Up @@ -135,14 +135,14 @@ public override void GetObjectData(System.Runtime.Serialization.SerializationInf
/// </summary>
public string RequestErrorType
{
get { return this._requestErrorType; }
set { this._requestErrorType = value; }
get { return this._errorType; }
set { this._errorType = value; }
}

// Check to see if RequestErrorType property is set
internal bool IsSetRequestErrorType()
{
return !string.IsNullOrEmpty(this._requestErrorType);
return !string.IsNullOrEmpty(this._errorType);
}

/// <summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ namespace Amazon.Account.Model
#endif
public partial class ResourceNotFoundException : AmazonAccountException
{
private string _requestErrorType;
private string _errorType;

/// <summary>
/// Constructs a new ResourceNotFoundException with the specified error
Expand Down Expand Up @@ -132,14 +132,14 @@ public override void GetObjectData(System.Runtime.Serialization.SerializationInf
/// </summary>
public string RequestErrorType
{
get { return this._requestErrorType; }
set { this._requestErrorType = value; }
get { return this._errorType; }
set { this._errorType = value; }
}

// Check to see if RequestErrorType property is set
internal bool IsSetRequestErrorType()
{
return !string.IsNullOrEmpty(this._requestErrorType);
return !string.IsNullOrEmpty(this._errorType);
}

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ namespace Amazon.Account.Model
#endif
public partial class TooManyRequestsException : AmazonAccountException
{
private string _requestErrorType;
private string _errorType;

private RetryableDetails _retryableDetails = new RetryableDetails(true);

Expand Down Expand Up @@ -135,14 +135,14 @@ public override void GetObjectData(System.Runtime.Serialization.SerializationInf
/// </summary>
public string RequestErrorType
{
get { return this._requestErrorType; }
set { this._requestErrorType = value; }
get { return this._errorType; }
set { this._errorType = value; }
}

// Check to see if RequestErrorType property is set
internal bool IsSetRequestErrorType()
{
return !string.IsNullOrEmpty(this._requestErrorType);
return !string.IsNullOrEmpty(this._errorType);
}

/// <summary>
Expand Down