Skip to content

Commit 1e6ba63

Browse files
soennekersoenneker
committed
misc
1 parent 78049fa commit 1e6ba63

File tree

4 files changed

+38
-30
lines changed

4 files changed

+38
-30
lines changed

‎src/AsyncSingleton.cs‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
using System;
2-
using System.Threading;
3-
using System.Threading.Tasks;
4-
using Nito.AsyncEx;
1+
using Nito.AsyncEx;
52
using Soenneker.Extensions.ValueTask;
63
using Soenneker.Utils.AsyncSingleton.Abstract;
4+
using Soenneker.Utils.AsyncSingleton.Constants;
75
using Soenneker.Utils.AsyncSingleton.Enums;
6+
using System;
7+
using System.Threading;
8+
using System.Threading.Tasks;
89

910
namespace Soenneker.Utils.AsyncSingleton;
1011

@@ -102,40 +103,40 @@ private async ValueTask<object> InitInternal(CancellationToken cancellationToken
102103
{
103104
case InitializationType.AsyncObject:
104105
if (_asyncObjectFunc is null)
105-
throw new NullReferenceException(Constants.InitializationFuncError);
106+
throw new NullReferenceException(AsyncSingletonConstants.InitializationFuncError);
106107

107108
return await _asyncObjectFunc(objects)
108109
.NoSync();
109110

110111
case InitializationType.AsyncObjectToken:
111112
if (_asyncObjectTokenFunc is null)
112-
throw new NullReferenceException(Constants.InitializationFuncError);
113+
throw new NullReferenceException(AsyncSingletonConstants.InitializationFuncError);
113114

114115
return await _asyncObjectTokenFunc(cancellationToken, objects)
115116
.NoSync();
116117

117118
case InitializationType.Async:
118119
if (_asyncFunc is null)
119-
throw new NullReferenceException(Constants.InitializationFuncError);
120+
throw new NullReferenceException(AsyncSingletonConstants.InitializationFuncError);
120121

121122
return await _asyncFunc()
122123
.NoSync();
123124

124125
case InitializationType.SyncObject:
125126
if (_objectFunc is null)
126-
throw new NullReferenceException(Constants.InitializationFuncError);
127+
throw new NullReferenceException(AsyncSingletonConstants.InitializationFuncError);
127128

128129
return _objectFunc(objects);
129130

130131
case InitializationType.SyncObjectToken:
131132
if (_objectTokenFunc is null)
132-
throw new NullReferenceException(Constants.InitializationFuncError);
133+
throw new NullReferenceException(AsyncSingletonConstants.InitializationFuncError);
133134

134135
return _objectTokenFunc(cancellationToken, objects);
135136

136137
case InitializationType.Sync:
137138
if (_func is null)
138-
throw new NullReferenceException(Constants.InitializationFuncError);
139+
throw new NullReferenceException(AsyncSingletonConstants.InitializationFuncError);
139140

140141
return _func();
141142

@@ -168,35 +169,35 @@ private object InitSyncInternal(params object[] objects)
168169
{
169170
case InitializationType.AsyncObject:
170171
if (_asyncObjectFunc is null)
171-
throw new NullReferenceException(Constants.InitializationFuncError);
172+
throw new NullReferenceException(AsyncSingletonConstants.InitializationFuncError);
172173
return _asyncObjectFunc(objects)
173174
.AwaitSync();
174175

175176
case InitializationType.AsyncObjectToken:
176177
if (_asyncObjectTokenFunc is null)
177-
throw new NullReferenceException(Constants.InitializationFuncError);
178+
throw new NullReferenceException(AsyncSingletonConstants.InitializationFuncError);
178179
return _asyncObjectTokenFunc(CancellationToken.None, objects)
179180
.AwaitSync();
180181

181182
case InitializationType.Async:
182183
if (_asyncFunc is null)
183-
throw new NullReferenceException(Constants.InitializationFuncError);
184+
throw new NullReferenceException(AsyncSingletonConstants.InitializationFuncError);
184185
return _asyncFunc()
185186
.AwaitSync();
186187

187188
case InitializationType.SyncObject:
188189
if (_objectFunc is null)
189-
throw new NullReferenceException(Constants.InitializationFuncError);
190+
throw new NullReferenceException(AsyncSingletonConstants.InitializationFuncError);
190191
return _objectFunc(objects);
191192

192193
case InitializationType.SyncObjectToken:
193194
if (_objectTokenFunc is null)
194-
throw new NullReferenceException(Constants.InitializationFuncError);
195+
throw new NullReferenceException(AsyncSingletonConstants.InitializationFuncError);
195196
return _objectTokenFunc(CancellationToken.None, objects);
196197

197198
case InitializationType.Sync:
198199
if (_func is null)
199-
throw new NullReferenceException(Constants.InitializationFuncError);
200+
throw new NullReferenceException(AsyncSingletonConstants.InitializationFuncError);
200201
return _func();
201202

202203
default:

‎src/AsyncSingleton{T}.cs‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using Soenneker.Atomics.Bools;
33
using Soenneker.Extensions.ValueTask;
44
using Soenneker.Utils.AsyncSingleton.Abstract;
5+
using Soenneker.Utils.AsyncSingleton.Constants;
56
using Soenneker.Utils.AsyncSingleton.Enums;
67
using System;
78
using System.Threading;
@@ -109,32 +110,32 @@ private async ValueTask<T> GetInternal(CancellationToken cancellationToken, para
109110
{
110111
case InitializationType.AsyncObject:
111112
return _asyncObjectFunc is null
112-
? throw new NullReferenceException(Constants.InitializationFuncError)
113+
? throw new NullReferenceException(AsyncSingletonConstants.InitializationFuncError)
113114
: await _asyncObjectFunc(objects).NoSync();
114115

115116
case InitializationType.AsyncObjectToken:
116117
return _asyncObjectTokenFunc is null
117-
? throw new NullReferenceException(Constants.InitializationFuncError)
118+
? throw new NullReferenceException(AsyncSingletonConstants.InitializationFuncError)
118119
: await _asyncObjectTokenFunc(cancellationToken, objects).NoSync();
119120

120121
case InitializationType.Async:
121122
return _asyncFunc is null
122-
? throw new NullReferenceException(Constants.InitializationFuncError)
123+
? throw new NullReferenceException(AsyncSingletonConstants.InitializationFuncError)
123124
: await _asyncFunc().NoSync();
124125

125126
case InitializationType.SyncObject:
126127
return _objectFunc is null
127-
? throw new NullReferenceException(Constants.InitializationFuncError)
128+
? throw new NullReferenceException(AsyncSingletonConstants.InitializationFuncError)
128129
: _objectFunc(objects);
129130

130131
case InitializationType.SyncObjectToken:
131132
return _objectTokenFunc is null
132-
? throw new NullReferenceException(Constants.InitializationFuncError)
133+
? throw new NullReferenceException(AsyncSingletonConstants.InitializationFuncError)
133134
: _objectTokenFunc(cancellationToken, objects);
134135

135136
case InitializationType.Sync:
136137
return _func is null
137-
? throw new NullReferenceException(Constants.InitializationFuncError)
138+
? throw new NullReferenceException(AsyncSingletonConstants.InitializationFuncError)
138139
: _func();
139140

140141
default:
@@ -170,32 +171,32 @@ private T GetSyncInternal(params object[] objects)
170171
{
171172
case InitializationType.AsyncObject:
172173
return _asyncObjectFunc is null
173-
? throw new NullReferenceException(Constants.InitializationFuncError)
174+
? throw new NullReferenceException(AsyncSingletonConstants.InitializationFuncError)
174175
: _asyncObjectFunc(objects).AwaitSync();
175176

176177
case InitializationType.AsyncObjectToken:
177178
return _asyncObjectTokenFunc is null
178-
? throw new NullReferenceException(Constants.InitializationFuncError)
179+
? throw new NullReferenceException(AsyncSingletonConstants.InitializationFuncError)
179180
: _asyncObjectTokenFunc(CancellationToken.None, objects).AwaitSync();
180181

181182
case InitializationType.Async:
182183
return _asyncFunc is null
183-
? throw new NullReferenceException(Constants.InitializationFuncError)
184+
? throw new NullReferenceException(AsyncSingletonConstants.InitializationFuncError)
184185
: _asyncFunc().AwaitSync();
185186

186187
case InitializationType.SyncObject:
187188
return _objectFunc is null
188-
? throw new NullReferenceException(Constants.InitializationFuncError)
189+
? throw new NullReferenceException(AsyncSingletonConstants.InitializationFuncError)
189190
: _objectFunc(objects);
190191

191192
case InitializationType.SyncObjectToken:
192193
return _objectTokenFunc is null
193-
? throw new NullReferenceException(Constants.InitializationFuncError)
194+
? throw new NullReferenceException(AsyncSingletonConstants.InitializationFuncError)
194195
: _objectTokenFunc(CancellationToken.None, objects);
195196

196197
case InitializationType.Sync:
197198
return _func is null
198-
? throw new NullReferenceException(Constants.InitializationFuncError)
199+
? throw new NullReferenceException(AsyncSingletonConstants.InitializationFuncError)
199200
: _func();
200201

201202
default:

src/Constants.cs renamed to src/Constants/AsyncSingletonConstants.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
namespace Soenneker.Utils.AsyncSingleton;
1+
namespace Soenneker.Utils.AsyncSingleton.Constants;
22

3-
internal static class Constants
3+
internal static class AsyncSingletonConstants
44
{
55
internal const string InitializationFuncError = "Initialization func for AsyncSingleton cannot be null";
66
}

‎src/Soenneker.Utils.AsyncSingleton.csproj‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,12 @@
3131
<PackageReadmeFile>README.md</PackageReadmeFile>
3232
<PackageIcon>icon.png</PackageIcon>
3333
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild></PropertyGroup>
34+
35+
<ItemGroup>
36+
<Compile Remove="NewFolder\**" />
37+
<EmbeddedResource Remove="NewFolder\**" />
38+
<None Remove="NewFolder\**" />
39+
</ItemGroup>
3440

3541
<ItemGroup>
3642
<None Include="..\README.md" Pack="true" PackagePath="\" />

0 commit comments

Comments
 (0)