Skip to content

Commit 10b0221

Browse files
committed
OpenStackNet.ResetDefaults removes configuration only
Do not apply the default config in this method, its purpose is to reset everything that Configure does so that it may be called again.
1 parent 00cf947 commit 10b0221

File tree

2 files changed

+22
-7
lines changed

2 files changed

+22
-7
lines changed

src/corelib/OpenStackNet.cs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,9 @@ public static void ResetDefaults()
5959
{
6060
lock (ConfigureLock)
6161
{
62-
if (!_isConfigured)
63-
return;
64-
6562
Configuration.ResetDefaults();
66-
67-
ConfigureJson();
68-
63+
JsonConvert.DefaultSettings = () => new JsonSerializerSettings();
6964
FlurlHttp.Configuration.ResetDefaults();
70-
ConfigureFlurl();
7165

7266
_isConfigured = false;
7367
}

src/testing/unit/OpenStackNetTests.cs

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
using System;
22
using System.Net.Http.Headers;
33
using Flurl.Http;
4+
using Newtonsoft.Json;
5+
using Newtonsoft.Json.Serialization;
6+
using OpenStack.Serialization;
47
using OpenStack.Testing;
58
using Xunit;
69

@@ -18,6 +21,24 @@ public void Dispose()
1821
OpenStackNet.ResetDefaults();
1922
}
2023

24+
[Fact]
25+
public void ResetDefaults_ResetsJsonNetConfiguration()
26+
{
27+
OpenStackNet.Configure();
28+
Assert.IsType<OpenStackContractResolver>(JsonSerializer.CreateDefault().ContractResolver);
29+
OpenStackNet.ResetDefaults();
30+
Assert.IsType<DefaultContractResolver>(JsonSerializer.CreateDefault().ContractResolver);
31+
}
32+
33+
[Fact]
34+
public void ResetDefaults_ResetsFlurlConfiguration()
35+
{
36+
OpenStackNet.Configure();
37+
Assert.NotNull(FlurlHttp.Configuration.BeforeCall);
38+
OpenStackNet.ResetDefaults();
39+
Assert.Null(FlurlHttp.Configuration.BeforeCall);
40+
}
41+
2142
[Fact]
2243
public async void UserAgentTest()
2344
{

0 commit comments

Comments
 (0)