Skip to content

Commit 1fdb493

Browse files
author
Jayson Maxson
committed
Simplify change
1 parent 5d8ff9c commit 1fdb493

File tree

11 files changed

+40
-213
lines changed

11 files changed

+40
-213
lines changed

‎src/Microsoft.Performance.SDK.Runtime.NetCoreApp/Plugins/PluginsLoader.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public PluginsLoader(
109109
// The constructor for this object hooks up the repository to the extension provider
110110
// (the ExtensionDiscovery in this case). We do not need to hold onto this object
111111
// explicitly, only call its constructor.
112-
new DataExtensionReflector(this.extensionDiscovery, extensionRepository, logger);
112+
new DataExtensionReflector(this.extensionDiscovery, extensionRepository);
113113

114114
this.isDisposed = false;
115115
this.logger = logger;
@@ -254,7 +254,7 @@ public bool TryLoadPlugins(IEnumerable<string> directories, out IDictionary<stri
254254
{
255255
Guard.NotNull(dir, nameof(directories));
256256
}
257-
257+
258258
failed = new Dictionary<string, ErrorInfo>();
259259

260260
if (!directories.Any())
@@ -280,21 +280,21 @@ public bool TryLoadPlugins(IEnumerable<string> directories, out IDictionary<stri
280280
failed.Add(dir, emptyErrorInfo);
281281
continue;
282282
}
283-
283+
284284
if (!this.extensionDiscovery.ProcessAssemblies(dir, out var error))
285285
{
286286
failed.Add(dir, error);
287287
continue;
288288
}
289289
}
290-
290+
291291
// If nothing was able to be loaded above, skip finalizing
292292
if (this.extensionRoot.IsLoaded)
293293
{
294294
// TODO (#223): this does redundant work re-finalizing processing sources
295295
// loaded by previous calls to this method. The extension repository
296296
// should get refactored to avoid this redundant work.
297-
297+
298298
this.extensionRoot.FinalizeDataExtensions();
299299
}
300300

‎src/Microsoft.Performance.SDK.Runtime.Tests/Extensibility/TableExtensionReferenceTests.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ public void WhenDisposed_EverthingThrows()
2222
{
2323
var result = TableExtensionReference.TryCreateReference(
2424
typeof(TestTableExtension),
25-
Logger.Null,
2625
out sut);
2726

2827
Assert.IsTrue(result);
@@ -52,7 +51,6 @@ public void CanDisposeMultipleTimes()
5251
{
5352
var result = TableExtensionReference.TryCreateReference(
5453
typeof(TestTableExtension),
55-
Logger.Null,
5654
out sut);
5755

5856
Assert.IsTrue(result);

‎src/Microsoft.Performance.SDK.Runtime/Extensibility/DataExtensions/DataCookers/CompositeDataCookerReference.cs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// Licensed under the MIT License.
33

44
using System;
5-
using System.Diagnostics;
65
using Microsoft.Performance.SDK.Extensibility;
76
using Microsoft.Performance.SDK.Extensibility.DataCooking;
87
using Microsoft.Performance.SDK.Processing;
@@ -42,8 +41,8 @@ private CompositeDataCookerReference(Type type, ILogger logger)
4241
{
4342
this.InitializeDescriptorData(instance);
4443
}
45-
}
46-
44+
}
45+
4746
/// <summary>
4847
/// Tries to create an instance of <see cref="ICompositeDataCookerReference"/> based on the
4948
/// <paramref name="candidateType"/>.
@@ -72,7 +71,7 @@ internal static bool TryCreateReference(
7271
{
7372
return TryCreateReference(
7473
candidateType,
75-
Microsoft.Performance.SDK.Runtime.Logger.Null,
74+
Runtime.Logger.Create<CompositeDataCookerReference>(),
7675
out reference);
7776
}
7877

@@ -106,8 +105,8 @@ internal static bool TryCreateReference(
106105
ILogger logger,
107106
out ICompositeDataCookerReference reference)
108107
{
109-
Debug.Assert(candidateType != null, $"{nameof(candidateType)} cannot be null.");
110-
Debug.Assert(logger != null, $"{nameof(logger)} cannot be null.");
108+
Guard.NotNull(candidateType, nameof(candidateType));
109+
Guard.NotNull(logger, nameof(logger));
111110

112111
reference = null;
113112

‎src/Microsoft.Performance.SDK.Runtime/Extensibility/DataExtensions/DataCookers/SourceDataCookerReference.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
using Microsoft.Performance.SDK.Extensibility.DataCooking;
1111
using Microsoft.Performance.SDK.Extensibility.DataCooking.SourceDataCooking;
1212
using Microsoft.Performance.SDK.Processing;
13+
using Microsoft.Performance.SDK.Runtime.Extensibility.DataExtensions.DataProcessors;
1314
using Microsoft.Performance.SDK.Runtime.Extensibility.DataExtensions.Dependency;
1415

1516
namespace Microsoft.Performance.SDK.Runtime.Extensibility.DataExtensions.DataCookers
@@ -140,7 +141,7 @@ internal static bool TryCreateReference(
140141
{
141142
return TryCreateReference(
142143
candidateType,
143-
Runtime.Logger.Null,
144+
Runtime.Logger.Create<SourceDataCookerReference>(),
144145
out reference);
145146
}
146147

@@ -175,8 +176,7 @@ internal static bool TryCreateReference(
175176
ILogger logger,
176177
out ISourceDataCookerReference reference)
177178
{
178-
Debug.Assert(candidateType != null, $"{nameof(candidateType)} cannot be null.");
179-
Debug.Assert(logger != null, $"{nameof(logger)} cannot be null.");
179+
Guard.NotNull(candidateType, nameof(candidateType));
180180

181181
reference = null;
182182

@@ -202,7 +202,7 @@ internal static bool TryCreateReference(
202202
// There must be an empty, public constructor
203203
if (!candidateType.TryGetEmptyPublicConstructor(out var constructor))
204204
{
205-
logger.Error(
205+
Console.Error.WriteLine(
206206
$"Warning: type {candidateType} seems to be a data cooker, but is missing an empty public " +
207207
"constructor.");
208208
return false;

‎src/Microsoft.Performance.SDK.Runtime/Extensibility/DataExtensions/DataExtensionFactory.cs

Lines changed: 6 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
using Microsoft.Performance.SDK.Extensibility.SourceParsing;
88
using Microsoft.Performance.SDK.Processing;
99
using Microsoft.Performance.SDK.Runtime.Extensibility.DataExtensions.DataCookers;
10+
using Microsoft.Performance.SDK.Runtime.Extensibility.DataExtensions.DataProcessors;
1011
using Microsoft.Performance.SDK.Runtime.Extensibility.DataExtensions.Repository;
1112
using Microsoft.Performance.SDK.Runtime.Extensibility.DataExtensions.Tables;
1213

@@ -18,13 +19,13 @@ namespace Microsoft.Performance.SDK.Runtime.Extensibility.DataExtensions
1819
public class DataExtensionFactory
1920
: IDataExtensionFactory
2021
{
21-
private static readonly DataExtensionRepository SingletonRepository
22+
private static readonly DataExtensionRepository SingletonRepository
2223
= new DataExtensionRepository();
2324

2425
/// <summary>
2526
/// Gets a singleton instance of this class.
2627
/// </summary>
27-
public IDataExtensionRepositoryBuilder SingletonDataExtensionRepository
28+
public IDataExtensionRepositoryBuilder SingletonDataExtensionRepository
2829
=> DataExtensionFactory.SingletonRepository;
2930

3031
/// <summary>
@@ -42,34 +43,10 @@ public IDataExtensionRepositoryBuilder SingletonDataExtensionRepository
4243
public bool TryCreateSourceDataCookerReference(
4344
Type candidateType,
4445
out ISourceDataCookerReference reference)
45-
{
46-
return TryCreateSourceDataCookerReference(candidateType, Logger.Null, out reference);
47-
}
48-
49-
/// <summary>
50-
/// Generate a source data cooker reference from a given type.
51-
/// </summary>
52-
/// <param name="candidateType">
53-
/// Data extension type.
54-
/// </param>
55-
/// <param name="reference">
56-
/// Data extension reference.
57-
/// </param>
58-
/// <param name="logger">
59-
/// Logs messages during reference creation.
60-
/// </param>
61-
/// <returns>
62-
/// <c>true</c> if succeeded, <c>false</c> otherwise.
63-
/// </returns>
64-
public bool TryCreateSourceDataCookerReference(
65-
Type candidateType,
66-
ILogger logger,
67-
out ISourceDataCookerReference reference)
6846
{
6947
Guard.NotNull(candidateType, nameof(candidateType));
70-
Guard.NotNull(logger, nameof(logger));
7148

72-
return SourceDataCookerReference.TryCreateReference(candidateType, logger, out reference);
49+
return SourceDataCookerReference.TryCreateReference(candidateType, out reference);
7350
}
7451

7552
/// <summary>
@@ -87,34 +64,10 @@ public bool TryCreateSourceDataCookerReference(
8764
public bool TryCreateCompositeDataCookerReference(
8865
Type candidateType,
8966
out ICompositeDataCookerReference reference)
90-
{
91-
return TryCreateCompositeDataCookerReference(candidateType, Logger.Null, out reference);
92-
}
93-
94-
/// <summary>
95-
/// Generate a composite data cooker reference from a given type.
96-
/// </summary>
97-
/// <param name="candidateType">
98-
/// Data extension type.
99-
/// </param>
100-
/// <param name="logger">
101-
/// Logs messages during reference creation.
102-
/// </param>
103-
/// <param name="reference">
104-
/// Data extension reference.
105-
/// </param>
106-
/// <returns>
107-
/// <c>true</c> if succeeded, <c>false</c> otherwise.
108-
/// </returns>
109-
public bool TryCreateCompositeDataCookerReference(
110-
Type candidateType,
111-
ILogger logger,
112-
out ICompositeDataCookerReference reference)
11367
{
11468
Guard.NotNull(candidateType, nameof(candidateType));
115-
Guard.NotNull(logger, nameof(logger));
11669

117-
return CompositeDataCookerReference.TryCreateReference(candidateType, logger, out reference);
70+
return CompositeDataCookerReference.TryCreateReference(candidateType, out reference);
11871
}
11972

12073
// TODO: __SDK_DP__
@@ -155,34 +108,10 @@ public bool TryCreateCompositeDataCookerReference(
155108
public bool TryCreateTableReference(
156109
Type candidateType,
157110
out ITableExtensionReference reference)
158-
{
159-
return TryCreateTableReference(candidateType, Logger.Null, out reference);
160-
}
161-
162-
/// <summary>
163-
/// Generate a table reference from a given type.
164-
/// </summary>
165-
/// <param name="candidateType">
166-
/// Data extension type.
167-
/// </param>
168-
/// <param name="logger">
169-
/// Logs messages during reference creation.
170-
/// </param>
171-
/// <param name="reference">
172-
/// Data extension reference.
173-
/// </param>
174-
/// <returns>
175-
/// <c>true</c> if succeeded, <c>false</c> otherwise.
176-
/// </returns>
177-
public bool TryCreateTableReference(
178-
Type candidateType,
179-
ILogger logger,
180-
out ITableExtensionReference reference)
181111
{
182112
Guard.NotNull(candidateType, nameof(candidateType));
183-
Guard.NotNull(logger, nameof(logger));
184113

185-
return TableExtensionReference.TryCreateReference(candidateType, logger, out reference);
114+
return TableExtensionReference.TryCreateReference(candidateType, out reference);
186115
}
187116

188117
/// <summary>

‎src/Microsoft.Performance.SDK.Runtime/Extensibility/DataExtensions/DataExtensionReflector.cs

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
// Copyright (c) Microsoft Corporation.
22
// Licensed under the MIT License.
33

4-
using System;
5-
using System.Diagnostics;
6-
using Microsoft.Performance.SDK.Processing;
74
using Microsoft.Performance.SDK.Runtime.Discovery;
85
using Microsoft.Performance.SDK.Runtime.Extensibility.DataExtensions.DataCookers;
6+
using Microsoft.Performance.SDK.Runtime.Extensibility.DataExtensions.DataProcessors;
97
using Microsoft.Performance.SDK.Runtime.Extensibility.DataExtensions.Repository;
108
using Microsoft.Performance.SDK.Runtime.Extensibility.DataExtensions.Tables;
9+
using System;
10+
using System.Diagnostics;
1111

1212
namespace Microsoft.Performance.SDK.Runtime.Extensibility.DataExtensions
1313
{
@@ -18,7 +18,6 @@ public class DataExtensionReflector
1818
: IExtensionTypeObserver
1919
{
2020
private readonly IDataExtensionRepositoryBuilder repoBuilder;
21-
private readonly ILogger logger;
2221

2322
/// <summary>
2423
/// Initializes a new instance of the DataExtensionReflector class.
@@ -29,41 +28,33 @@ public class DataExtensionReflector
2928
/// <param name="repoBuilder">
3029
/// Provides an output to store discovered extensions.
3130
/// </param>
32-
/// <param name="logger">
33-
/// Logs messages during reference creation.
34-
/// </param>
3531
public DataExtensionReflector(
3632
IExtensionTypeProvider extensionProvider,
37-
IDataExtensionRepositoryBuilder repoBuilder,
38-
ILogger logger)
33+
IDataExtensionRepositoryBuilder repoBuilder)
3934
{
40-
Guard.NotNull(logger, nameof(logger));
41-
4235
this.repoBuilder = repoBuilder;
43-
this.logger = logger;
44-
4536
extensionProvider.RegisterTypeConsumer(this);
4637
}
4738

4839
/// <inheritdoc />
4940
public void ProcessType(Type type, string sourceName)
5041
{
5142
// Find source data cookers
52-
if (SourceDataCookerReference.TryCreateReference(type, this.logger, out var sourceDataCookerReference))
43+
if (SourceDataCookerReference.TryCreateReference(type, out var sourceDataCookerReference))
5344
{
5445
Debug.Assert(sourceDataCookerReference != null);
5546
this.repoBuilder.AddSourceDataCookerReference(sourceDataCookerReference);
5647
}
5748

5849
// Find composite data cookers
59-
if (CompositeDataCookerReference.TryCreateReference(type, this.logger, out var compositeDataCookerReference))
50+
if (CompositeDataCookerReference.TryCreateReference(type, out var compositeDataCookerReference))
6051
{
6152
Debug.Assert(compositeDataCookerReference != null);
6253
this.repoBuilder.AddCompositeDataCookerReference(compositeDataCookerReference);
6354
}
6455

6556
// Find tables
66-
if (TableExtensionReference.TryCreateReference(type, this.logger, out var dataExtensionReference))
57+
if (TableExtensionReference.TryCreateReference(type, out var dataExtensionReference))
6758
{
6859
Debug.Assert(dataExtensionReference != null);
6960
this.repoBuilder.AddTableExtensionReference(dataExtensionReference);

0 commit comments

Comments
 (0)