Skip to content

Commit 4da8c72

Browse files
committed
Fix warnings
Signed-off-by: Victor Chang <[email protected]>
1 parent 6178378 commit 4da8c72

File tree

73 files changed

+254
-253
lines changed

Some content is hidden

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

73 files changed

+254
-253
lines changed

src/Api/Rest/InferenceRequest.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ private bool Validate(out string details)
219219

220220
private void ValidateOUtputResources(List<string> errors)
221221
{
222-
Guard.Against.Null(errors, nameof(errors));
222+
Guard.Against.Null(errors);
223223

224224
if (InputMetadata.Inputs.IsNullOrEmpty())
225225
{
@@ -236,7 +236,7 @@ private void ValidateOUtputResources(List<string> errors)
236236

237237
private void ValidateInputMetadata(List<string> errors)
238238
{
239-
Guard.Against.Null(errors, nameof(errors));
239+
Guard.Against.Null(errors);
240240

241241
foreach (var output in OutputResources)
242242
{
@@ -253,7 +253,7 @@ private void ValidateInputMetadata(List<string> errors)
253253

254254
private void ValidateInputResources(List<string> errors)
255255
{
256-
Guard.Against.Null(errors, nameof(errors));
256+
Guard.Against.Null(errors);
257257

258258
if (InputResources.IsNullOrEmpty() ||
259259
!InputResources.Any(predicate => predicate.Interface != InputInterfaceType.Algorithm))
@@ -308,8 +308,8 @@ private static void CheckInputMetadataDetails(InferenceRequestDetails details, L
308308

309309
private static void CheckInputMetadataWithTypeFhirResource(InferenceRequestDetails details, List<string> errors)
310310
{
311-
Guard.Against.Null(details, nameof(details));
312-
Guard.Against.Null(errors, nameof(errors));
311+
Guard.Against.Null(details);
312+
Guard.Against.Null(errors);
313313

314314
if (details.Resources.IsNullOrEmpty())
315315
{
@@ -323,8 +323,8 @@ private static void CheckInputMetadataWithTypeFhirResource(InferenceRequestDetai
323323

324324
private static void CheckInputMetadataWithTypDicomUid(InferenceRequestDetails details, List<string> errors)
325325
{
326-
Guard.Against.Null(details, nameof(details));
327-
Guard.Against.Null(errors, nameof(errors));
326+
Guard.Against.Null(details);
327+
Guard.Against.Null(errors);
328328

329329
if (details.Studies.IsNullOrEmpty())
330330
{

src/Api/Storage/DicomFileStorageMetadata.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,11 @@ public DicomFileStorageMetadata() { }
9898
public DicomFileStorageMetadata(string associationId, string identifier, string studyInstanceUid, string seriesInstanceUid, string sopInstanceUid)
9999
: base(associationId.ToString(), identifier)
100100
{
101-
Guard.Against.NullOrWhiteSpace(associationId, nameof(associationId));
102-
Guard.Against.NullOrWhiteSpace(identifier, nameof(identifier));
103-
Guard.Against.NullOrWhiteSpace(studyInstanceUid, nameof(studyInstanceUid));
104-
Guard.Against.NullOrWhiteSpace(seriesInstanceUid, nameof(seriesInstanceUid));
105-
Guard.Against.NullOrWhiteSpace(sopInstanceUid, nameof(sopInstanceUid));
101+
Guard.Against.NullOrWhiteSpace(associationId);
102+
Guard.Against.NullOrWhiteSpace(identifier);
103+
Guard.Against.NullOrWhiteSpace(studyInstanceUid);
104+
Guard.Against.NullOrWhiteSpace(seriesInstanceUid);
105+
Guard.Against.NullOrWhiteSpace(sopInstanceUid);
106106

107107
StudyInstanceUid = studyInstanceUid;
108108
SeriesInstanceUid = seriesInstanceUid;

src/Api/Storage/FhirFileStorageMetadata.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@ public FhirFileStorageMetadata() { }
6969
public FhirFileStorageMetadata(string transactionId, string resourceType, string resourceId, FhirStorageFormat fhirFileFormat)
7070
: base(transactionId, $"{resourceType}{PathSeparator}{resourceId}")
7171
{
72-
Guard.Against.NullOrWhiteSpace(transactionId, nameof(transactionId));
73-
Guard.Against.NullOrWhiteSpace(resourceType, nameof(resourceType));
74-
Guard.Against.NullOrWhiteSpace(resourceId, nameof(resourceId));
72+
Guard.Against.NullOrWhiteSpace(transactionId);
73+
Guard.Against.NullOrWhiteSpace(resourceType);
74+
Guard.Against.NullOrWhiteSpace(resourceId);
7575

7676
Source = transactionId;
7777
ResourceType = resourceType;

src/Api/Storage/FileStorageMetadata.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ protected FileStorageMetadata() { }
9292

9393
protected FileStorageMetadata(string correlationId, string identifier)
9494
{
95-
Guard.Against.NullOrWhiteSpace(correlationId, nameof(correlationId));
96-
Guard.Against.NullOrWhiteSpace(identifier, nameof(identifier));
95+
Guard.Against.NullOrWhiteSpace(correlationId);
96+
Guard.Against.NullOrWhiteSpace(identifier);
9797

9898
CorrelationId = correlationId;
9999
Id = identifier;
@@ -107,7 +107,7 @@ protected FileStorageMetadata(string correlationId, string identifier)
107107
/// <param name="workflows">List of workflows.</param>
108108
public void SetWorkflows(params string[] workflows)
109109
{
110-
Guard.Against.NullOrEmpty(workflows, nameof(workflows));
110+
Guard.Against.NullOrEmpty(workflows);
111111

112112
Workflows.AddRange(workflows);
113113
}

src/Api/Storage/Hl7FileStorageMetadata.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public Hl7FileStorageMetadata() { }
4848
public Hl7FileStorageMetadata(string connectionId)
4949
: base(connectionId, Guid.NewGuid().ToString())
5050
{
51-
Guard.Against.NullOrWhiteSpace(connectionId, nameof(connectionId));
51+
Guard.Against.NullOrWhiteSpace(connectionId);
5252

5353
Source = connectionId;
5454

src/Api/Storage/StorageObjectMetadata.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public class StorageObjectMetadata
9090

9191
public StorageObjectMetadata(string fileExtension)
9292
{
93-
Guard.Against.NullOrWhiteSpace(fileExtension, nameof(fileExtension));
93+
Guard.Against.NullOrWhiteSpace(fileExtension);
9494

9595
if (fileExtension[0] != '.')
9696
{
@@ -103,20 +103,20 @@ public StorageObjectMetadata(string fileExtension)
103103

104104
public string GetTempStoragPath(string rootPath)
105105
{
106-
Guard.Against.NullOrWhiteSpace(rootPath, nameof(rootPath));
106+
Guard.Against.NullOrWhiteSpace(rootPath);
107107
return $"{rootPath}{FileStorageMetadata.PathSeparator}{TemporaryPath}";
108108
}
109109

110110
public string GetPayloadPath(Guid payloadId)
111111
{
112-
Guard.Against.Null(payloadId, nameof(payloadId));
112+
Guard.Against.Null(payloadId);
113113

114114
return $"{payloadId}{FileStorageMetadata.PathSeparator}{UploadPath}";
115115
}
116116

117117
public void SetUploaded(string bucketName)
118118
{
119-
Guard.Against.NullOrWhiteSpace(bucketName, nameof(bucketName));
119+
Guard.Against.NullOrWhiteSpace(bucketName);
120120

121121
TemporaryBucketName = bucketName;
122122
DateUploaded = DateTime.UtcNow;
@@ -155,7 +155,7 @@ public void SetFailed()
155155

156156
public void SetMoved(string bucketName)
157157
{
158-
Guard.Against.NullOrEmpty(bucketName, nameof(bucketName));
158+
Guard.Against.NullOrEmpty(bucketName);
159159

160160
PayloadBucketName = bucketName;
161161
DateMoved = DateTime.UtcNow;

src/CLI/Commands/AetCommand.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ private void SetupAddAetCommand()
102102

103103
private async Task<int> ListAeTitlehandlerAsync(IHost host, bool verbose, CancellationToken cancellationToken)
104104
{
105-
Guard.Against.Null(host, nameof(host));
105+
Guard.Against.Null(host);
106106

107107
LogVerbose(verbose, host, "Configuring services...");
108108

@@ -170,8 +170,8 @@ private async Task<int> ListAeTitlehandlerAsync(IHost host, bool verbose, Cancel
170170

171171
private async Task<int> RemoveAeTitlehandlerAsync(string name, IHost host, bool verbose, CancellationToken cancellationToken)
172172
{
173-
Guard.Against.NullOrWhiteSpace(name, nameof(name));
174-
Guard.Against.Null(host, nameof(host));
173+
Guard.Against.NullOrWhiteSpace(name);
174+
Guard.Against.Null(host);
175175

176176
LogVerbose(verbose, host, "Configuring services...");
177177
var configService = host.Services.GetRequiredService<IConfigurationService>();
@@ -206,8 +206,8 @@ private async Task<int> RemoveAeTitlehandlerAsync(string name, IHost host, bool
206206

207207
private async Task<int> AddAeTitlehandlerAsync(MonaiApplicationEntity entity, IHost host, bool verbose, CancellationToken cancellationToken)
208208
{
209-
Guard.Against.Null(entity, nameof(entity));
210-
Guard.Against.Null(host, nameof(host));
209+
Guard.Against.Null(entity);
210+
Guard.Against.Null(host);
211211

212212
LogVerbose(verbose, host, "Configuring services...");
213213
var configService = host.Services.GetRequiredService<IConfigurationService>();

src/CLI/Commands/CommandBase.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,16 @@ public CommandBase(string name, string description) : base(name, description)
3333

3434
protected static ILogger CreateLogger<T>(IHost host)
3535
{
36-
Guard.Against.Null(host, nameof(host));
36+
Guard.Against.Null(host);
3737

3838
var loggerFactory = host.Services.GetService<ILoggerFactory>();
3939
return loggerFactory?.CreateLogger<T>();
4040
}
4141

4242
protected static void LogVerbose(bool verbose, IHost host, string message)
4343
{
44-
Guard.Against.Null(host, nameof(host));
45-
Guard.Against.NullOrWhiteSpace(message, nameof(message));
44+
Guard.Against.Null(host);
45+
Guard.Against.NullOrWhiteSpace(message);
4646

4747
if (verbose)
4848
{
@@ -62,15 +62,15 @@ protected static void LogVerbose(bool verbose, IHost host, string message)
6262

6363
protected static void AddConfirmationOption(Command command)
6464
{
65-
Guard.Against.Null(command, nameof(command));
65+
Guard.Against.Null(command);
6666

6767
var confirmationOption = new Option<bool>(new[] { "-y", "--yes" }, "Automatic yes to prompts");
6868
command.AddOption(confirmationOption);
6969
}
7070

7171
protected static void CheckConfiguration(IConfigurationService configService)
7272
{
73-
Guard.Against.Null(configService, nameof(configService));
73+
Guard.Against.Null(configService);
7474

7575
if (!configService.IsInitialized)
7676
{

src/CLI/Commands/ConfigCommand.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ private void SetupShowConfigCommand()
8484

8585
private int ShowConfigurationHandler(IHost host, bool verbose, CancellationToken cancellationToken)
8686
{
87-
Guard.Against.Null(host, nameof(host));
87+
Guard.Against.Null(host);
8888

8989
LogVerbose(verbose, host, "Configuring services...");
9090
var logger = CreateLogger<ConfigCommand>(host);
@@ -114,8 +114,8 @@ private int ShowConfigurationHandler(IHost host, bool verbose, CancellationToken
114114

115115
private static int ConfigUpdateHandler(IHost host, Action<IConfigurationService> updater)
116116
{
117-
Guard.Against.Null(host, nameof(host));
118-
Guard.Against.Null(updater, nameof(updater));
117+
Guard.Against.Null(host);
118+
Guard.Against.Null(updater);
119119

120120
var logger = CreateLogger<ConfigCommand>(host);
121121
var config = host.Services.GetRequiredService<IConfigurationService>();
@@ -143,7 +143,7 @@ private static int ConfigUpdateHandler(IHost host, Action<IConfigurationService>
143143

144144
private async Task<int> InitHandlerAsync(IHost host, bool verbose, bool yes, CancellationToken cancellationToken)
145145
{
146-
Guard.Against.Null(host, nameof(host));
146+
Guard.Against.Null(host);
147147

148148
var logger = CreateLogger<ConfigCommand>(host);
149149
var configService = host.Services.GetRequiredService<IConfigurationService>();

src/CLI/Commands/DestinationCommand.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,8 @@ private void SetupAddDestinationCommand()
116116

117117
private async Task<int> ListDestinationHandlerAsync(DestinationApplicationEntity entity, IHost host, bool verbose, CancellationToken cancellationToken)
118118
{
119-
Guard.Against.Null(entity, nameof(entity));
120-
Guard.Against.Null(host, nameof(host));
119+
Guard.Against.Null(entity);
120+
Guard.Against.Null(host);
121121

122122
LogVerbose(verbose, host, "Configuring services...");
123123

@@ -182,8 +182,8 @@ private async Task<int> ListDestinationHandlerAsync(DestinationApplicationEntity
182182

183183
private async Task<int> CEchoDestinationHandlerAsync(string name, IHost host, bool verbose, CancellationToken cancellationToken)
184184
{
185-
Guard.Against.NullOrWhiteSpace(name, nameof(name));
186-
Guard.Against.Null(host, nameof(host));
185+
Guard.Against.NullOrWhiteSpace(name);
186+
Guard.Against.Null(host);
187187

188188
LogVerbose(verbose, host, "Configuring services...");
189189
var configService = host.Services.GetRequiredService<IConfigurationService>();
@@ -218,8 +218,8 @@ private async Task<int> CEchoDestinationHandlerAsync(string name, IHost host, bo
218218

219219
private async Task<int> RemoveDestinationHandlerAsync(string name, IHost host, bool verbose, CancellationToken cancellationToken)
220220
{
221-
Guard.Against.NullOrWhiteSpace(name, nameof(name));
222-
Guard.Against.Null(host, nameof(host));
221+
Guard.Against.NullOrWhiteSpace(name);
222+
Guard.Against.Null(host);
223223

224224
LogVerbose(verbose, host, "Configuring services...");
225225
var configService = host.Services.GetRequiredService<IConfigurationService>();
@@ -254,8 +254,8 @@ private async Task<int> RemoveDestinationHandlerAsync(string name, IHost host, b
254254

255255
private async Task<int> EditDestinationHandlerAsync(DestinationApplicationEntity entity, IHost host, bool verbose, CancellationToken cancellationToken)
256256
{
257-
Guard.Against.Null(entity, nameof(entity));
258-
Guard.Against.Null(host, nameof(host));
257+
Guard.Against.Null(entity);
258+
Guard.Against.Null(host);
259259

260260
LogVerbose(verbose, host, "Configuring services...");
261261
var configService = host.Services.GetRequiredService<IConfigurationService>();
@@ -292,8 +292,8 @@ private async Task<int> EditDestinationHandlerAsync(DestinationApplicationEntity
292292

293293
private async Task<int> AddDestinationHandlerAsync(DestinationApplicationEntity entity, IHost host, bool verbose, CancellationToken cancellationToken)
294294
{
295-
Guard.Against.Null(entity, nameof(entity));
296-
Guard.Against.Null(host, nameof(host));
295+
Guard.Against.Null(entity);
296+
Guard.Against.Null(host);
297297

298298
LogVerbose(verbose, host, "Configuring services...");
299299
var configService = host.Services.GetRequiredService<IConfigurationService>();

src/CLI/Commands/RestartCommand.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public RestartCommand() : base("restart", $"Restart the {Strings.ApplicationName
3535

3636
private async Task<int> RestartCommandHandler(IHost host, bool yes, bool verbose, CancellationToken cancellationToken)
3737
{
38-
Guard.Against.Null(host, nameof(host));
38+
Guard.Against.Null(host);
3939

4040
var service = host.Services.GetRequiredService<IControlService>();
4141
var confirmation = host.Services.GetRequiredService<IConfirmationPrompt>();

src/CLI/Commands/SourceCommand.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ private void SetupUpdateSourceCommand()
9898

9999
private async Task<int> ListSourceHandlerAsync(SourceApplicationEntity entity, IHost host, bool verbose, CancellationToken cancellationTokena)
100100
{
101-
Guard.Against.Null(entity, nameof(entity));
102-
Guard.Against.Null(host, nameof(host));
101+
Guard.Against.Null(entity);
102+
Guard.Against.Null(host);
103103

104104
LogVerbose(verbose, host, "Configuring services...");
105105

@@ -163,8 +163,8 @@ private async Task<int> ListSourceHandlerAsync(SourceApplicationEntity entity, I
163163

164164
private async Task<int> RemoveSourceHandlerAsync(string name, IHost host, bool verbose, CancellationToken cancellationTokena)
165165
{
166-
Guard.Against.NullOrWhiteSpace(name, nameof(name));
167-
Guard.Against.Null(host, nameof(host));
166+
Guard.Against.NullOrWhiteSpace(name);
167+
Guard.Against.Null(host);
168168

169169
LogVerbose(verbose, host, "Configuring services...");
170170
var configService = host.Services.GetRequiredService<IConfigurationService>();
@@ -199,8 +199,8 @@ private async Task<int> RemoveSourceHandlerAsync(string name, IHost host, bool v
199199

200200
private async Task<int> AddSourceHandlerAsync(SourceApplicationEntity entity, IHost host, bool verbose, CancellationToken cancellationTokena)
201201
{
202-
Guard.Against.Null(entity, nameof(entity));
203-
Guard.Against.Null(host, nameof(host));
202+
Guard.Against.Null(entity);
203+
Guard.Against.Null(host);
204204

205205
LogVerbose(verbose, host, "Configuring services...");
206206
var configService = host.Services.GetRequiredService<IConfigurationService>();
@@ -235,8 +235,8 @@ private async Task<int> AddSourceHandlerAsync(SourceApplicationEntity entity, IH
235235
}
236236
private async Task<int> UpdateSourceHandlerAsync(SourceApplicationEntity entity, IHost host, bool verbose, CancellationToken cancellationTokena)
237237
{
238-
Guard.Against.Null(entity, nameof(entity));
239-
Guard.Against.Null(host, nameof(host));
238+
Guard.Against.Null(entity);
239+
Guard.Against.Null(host);
240240

241241
LogVerbose(verbose, host, "Configuring services...");
242242
var configService = host.Services.GetRequiredService<IConfigurationService>();

src/CLI/Commands/StartCommand.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public StartCommand() : base("start", $"Start the {Strings.ApplicationName} serv
3535

3636
private async Task<int> StartCommandHandler(IHost host, bool verbose, CancellationToken cancellationToken)
3737
{
38-
Guard.Against.Null(host, nameof(host));
38+
Guard.Against.Null(host);
3939

4040
var service = host.Services.GetRequiredService<IControlService>();
4141
var confirmation = host.Services.GetRequiredService<IConfirmationPrompt>();

src/CLI/Commands/StatusCommand.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public StatusCommand() : base("status", $"{Strings.ApplicationName} service stat
3636

3737
private async Task<int> StatusCommandHandlerAsync(IHost host, bool verbose, CancellationToken cancellationToken)
3838
{
39-
Guard.Against.Null(host, nameof(host));
39+
Guard.Against.Null(host);
4040

4141
LogVerbose(verbose, host, "Configuring services...");
4242

src/CLI/Commands/StopCommand.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public StopCommand() : base("stop", $"Stop the {Strings.ApplicationName} service
3535

3636
private async Task<int> StopCommandHandler(IHost host, bool yes, bool verbose, CancellationToken cancellationToken)
3737
{
38-
Guard.Against.Null(host, nameof(host));
38+
Guard.Against.Null(host);
3939

4040
var service = host.Services.GetRequiredService<IControlService>();
4141
var confirmation = host.Services.GetRequiredService<IConfirmationPrompt>();

src/CLI/ControlException.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ protected ControlException(SerializationInfo info, StreamingContext context) : b
4949

5050
public override void GetObjectData(SerializationInfo info, StreamingContext context)
5151
{
52-
Guard.Against.Null(info, nameof(info));
52+
Guard.Against.Null(info);
5353

5454
info.AddValue(nameof(ErrorCode), ErrorCode);
5555

0 commit comments

Comments
 (0)