Skip to content

Commit ba6fe9a

Browse files
committed
Refactor ContentstackException usage to streamline error handling across multiple models, enhancing clarity by directly passing error messages during instantiation.
1 parent a080634 commit ba6fe9a

11 files changed

Lines changed: 13 additions & 115 deletions

File tree

Contentstack.Core.Tests/ContentTypeTest.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System;
22
using Xunit;
33
using Contentstack.Core.Models;
4+
using Contentstack.Core.Internals;
45
using System.Threading.Tasks;
56
using System.Collections.Generic;
67
using Newtonsoft.Json.Linq;
@@ -143,7 +144,7 @@ public async Task FetchGlobalFieldSchema_NullParameters_Succeeds()
143144
[Fact]
144145
public void GlobalField_EmptyUid_Throws()
145146
{
146-
Assert.Throws<ArgumentNullException>(() => {
147+
Assert.Throws<GlobalFieldException>(() => {
147148
GlobalField globalField = client.GlobalField("");
148149
});
149150
}

Contentstack.Core/ContentstackClient.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -239,10 +239,9 @@ internal static ContentstackException GetContentstackError(Exception ex)
239239
errorMessage = ex.Message;
240240
}
241241

242-
contentstackError = new ContentstackException()
242+
contentstackError = new ContentstackException(errorMessage)
243243
{
244244
ErrorCode = errorCode,
245-
ErrorMessage = errorMessage,
246245
StatusCode = statusCode,
247246
Errors = errors
248247
};
@@ -338,7 +337,7 @@ public async Task<IList> GetContentTypes(Dictionary<string, object> param = null
338337
}
339338
catch (Exception ex)
340339
{
341-
throw new GetContentstackError(string.Format(ErrorMessages.ContentstackClientRequestError, ex.Message), ex);
340+
throw GetContentstackError(ex);
342341
}
343342
}
344343

@@ -873,7 +872,7 @@ private async Task<SyncStack> GetResultAsync(string Init = "false", SyncType Syn
873872
}
874873
catch (Exception ex)
875874
{
876-
throw new GetContentstackError(string.Format(ErrorMessages.ContentstackSyncRequestError, ex.Message), ex);
875+
throw GetContentstackError(ex);
877876
}
878877
}
879878
#endregion

Contentstack.Core/Internals/ContentStackError.cs

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

Contentstack.Core/Models/Asset.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -517,10 +517,9 @@ internal static ContentstackException GetContentstackError(Exception ex)
517517
}
518518
}
519519

520-
ContentstackException contentstackError = new ContentstackException()
520+
ContentstackException contentstackError = new ContentstackException(errorMessage)
521521
{
522522
ErrorCode = errorCode,
523-
ErrorMessage = errorMessage,
524523
StatusCode = statusCode,
525524
Errors = errors
526525
};

Contentstack.Core/Models/AssetLibrary.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -594,10 +594,9 @@ internal static ContentstackException GetContentstackError(Exception ex)
594594
errorMessage = ex.Message;
595595
}
596596

597-
contentstackError = new ContentstackException()
597+
contentstackError = new ContentstackException(errorMessage)
598598
{
599599
ErrorCode = errorCode,
600-
ErrorMessage = errorMessage,
601600
StatusCode = statusCode,
602601
Errors = errors
603602
};

Contentstack.Core/Models/ContentType.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,9 @@ internal static ContentstackException GetContentstackError(Exception ex)
106106
errorMessage = ex.Message;
107107
}
108108

109-
contentstackError = new ContentstackException()
109+
contentstackError = new ContentstackException(errorMessage)
110110
{
111111
ErrorCode = errorCode,
112-
ErrorMessage = errorMessage,
113112
StatusCode = statusCode,
114113
Errors = errors
115114
};

Contentstack.Core/Models/Entry.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,10 +214,9 @@ internal static ContentstackException GetContentstackError(Exception ex)
214214
errorMessage = ex.Message;
215215
}
216216

217-
contentstackError = new ContentstackException()
217+
contentstackError = new ContentstackException(errorMessage)
218218
{
219219
ErrorCode = errorCode,
220-
ErrorMessage = errorMessage,
221220
StatusCode = statusCode,
222221
Errors = errors
223222
};

Contentstack.Core/Models/GlobalField.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,9 @@ internal static ContentstackException GetContentstackError(Exception ex)
120120
errorMessage = ex.Message;
121121
}
122122

123-
contentstackError = new ContentstackException()
123+
contentstackError = new ContentstackException(errorMessage)
124124
{
125125
ErrorCode = errorCode,
126-
ErrorMessage = errorMessage,
127126
StatusCode = statusCode,
128127
Errors = errors
129128
};

Contentstack.Core/Models/GlobalFieldQuery.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,9 @@ internal static ContentstackException GetContentstackError(Exception ex)
9090
errorMessage = ex.Message;
9191
}
9292

93-
contentstackError = new ContentstackException()
93+
contentstackError = new ContentstackException(errorMessage)
9494
{
9595
ErrorCode = errorCode,
96-
ErrorMessage = errorMessage,
9796
StatusCode = statusCode,
9897
Errors = errors
9998
};

Contentstack.Core/Models/Query.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,9 @@ internal static ContentstackException GetContentstackError(Exception ex)
117117
errorMessage = ex.Message;
118118
}
119119

120-
contentstackError = new ContentstackException()
120+
contentstackError = new ContentstackException(errorMessage)
121121
{
122122
ErrorCode = errorCode,
123-
ErrorMessage = errorMessage,
124123
StatusCode = statusCode,
125124
Errors = errors
126125
};

0 commit comments

Comments
 (0)