Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit a683cf6

Browse filesBrowse files
niemyjskiniemyjski
committed
Resolved some warnings around virtual calls in constructors
1 parent 01afbe7 commit a683cf6
Copy full SHA for a683cf6

File tree

Expand file treeCollapse file tree

7 files changed

+24
-39
lines changed
Filter options
Expand file treeCollapse file tree

7 files changed

+24
-39
lines changed

‎src/Exceptionless/Logging/FileExceptionlessLog.cs

Copy file name to clipboardExpand all lines: src/Exceptionless/Logging/FileExceptionlessLog.cs
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ public FileExceptionlessLog(string filePath, bool append = false) {
2323
MinimumLogLevel = LogLevel.Trace;
2424
_append = append;
2525

26-
Init();
26+
Initialize();
2727

2828
// flush the log every 3 seconds instead of on every write
2929
_flushTimer = new Timer(OnFlushTimer, null, TimeSpan.FromSeconds(3), TimeSpan.FromSeconds(3));
3030
}
3131

32-
protected virtual void Init() {
32+
protected virtual void Initialize() {
3333
if (!Path.IsPathRooted(FilePath))
3434
FilePath = Path.GetFullPath(FilePath);
3535

‎src/Exceptionless/Logging/IsolatedStorageFileExceptionlessLog.cs

Copy file name to clipboardExpand all lines: src/Exceptionless/Logging/IsolatedStorageFileExceptionlessLog.cs
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace Exceptionless.Logging {
99
public class IsolatedStorageFileExceptionlessLog : FileExceptionlessLog {
1010
public IsolatedStorageFileExceptionlessLog(string filePath, bool append = false) : base(filePath, append) {}
1111

12-
protected override void Init() {}
12+
protected override void Initialize() {}
1313

1414
private IsolatedStorageFile GetStore() {
1515
#if NETSTANDARD

‎src/Platforms/Exceptionless.NLog/ExceptionlessTarget.cs

Copy file name to clipboardExpand all lines: src/Platforms/Exceptionless.NLog/ExceptionlessTarget.cs
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
namespace Exceptionless.NLog {
1111
[Target("Exceptionless")]
12-
public class ExceptionlessTarget : TargetWithLayout {
12+
public sealed class ExceptionlessTarget : TargetWithLayout {
1313
private ExceptionlessClient _client = ExceptionlessClient.Default;
1414

1515
public Layout ApiKey { get; set; }

‎test/Exceptionless.MessagePack.Tests/MessagePackStorageSerializerTests.cs

Copy file name to clipboardExpand all lines: test/Exceptionless.MessagePack.Tests/MessagePackStorageSerializerTests.cs
+2-7Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,8 @@
55

66
namespace Exceptionless.MessagePack.Tests {
77
public class MessagePackStorageSerializerTests : StorageSerializerTestBase {
8-
protected override void Initialize(IDependencyResolver resolver) {
9-
base.Initialize(resolver);
10-
resolver.Register<IStorageSerializer>(new MessagePackStorageSerializer(resolver));
11-
}
12-
13-
protected override IStorageSerializer GetSerializer(IDependencyResolver resolver) {
14-
return resolver.Resolve<IStorageSerializer>();
8+
public MessagePackStorageSerializerTests() {
9+
Resolver.Register<IStorageSerializer>(new MessagePackStorageSerializer(Resolver));
1510
}
1611

1712
[Fact]

‎test/Exceptionless.TestHarness/Serializer/StorageSerializerTestBase.cs

Copy file name to clipboardExpand all lines: test/Exceptionless.TestHarness/Serializer/StorageSerializerTestBase.cs
+15-20Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,16 @@
1313

1414
namespace Exceptionless.Tests.Serializer {
1515
public abstract class StorageSerializerTestBase {
16-
private readonly IDependencyResolver _resolver;
16+
protected readonly IDependencyResolver Resolver = new DefaultDependencyResolver();
17+
1718
public StorageSerializerTestBase() {
18-
_resolver = new DefaultDependencyResolver();
19-
_resolver.Register<IObjectStorage, InMemoryObjectStorage>();
20-
_resolver.Register<IJsonSerializer, DefaultJsonSerializer>();
21-
_resolver.Register<IExceptionlessLog, InMemoryExceptionlessLog>();
22-
_resolver.Register<IEnvironmentInfoCollector, DefaultEnvironmentInfoCollector>();
23-
_resolver.Register<ExceptionlessConfiguration>(new ExceptionlessConfiguration(_resolver));
24-
Initialize(_resolver);
19+
Resolver.Register<IObjectStorage, InMemoryObjectStorage>();
20+
Resolver.Register<IJsonSerializer, DefaultJsonSerializer>();
21+
Resolver.Register<IExceptionlessLog, InMemoryExceptionlessLog>();
22+
Resolver.Register<IEnvironmentInfoCollector, DefaultEnvironmentInfoCollector>();
23+
Resolver.Register<ExceptionlessConfiguration>(new ExceptionlessConfiguration(Resolver));
2524
}
2625

27-
protected virtual void Initialize(IDependencyResolver resolver) { }
28-
29-
protected abstract IStorageSerializer GetSerializer(IDependencyResolver resolver);
30-
3126
private Event CreateSimpleEvent() {
3227
var ev= new Event {
3328
Date = DateTime.Now,
@@ -47,17 +42,17 @@ private Event CreateSimpleEvent() {
4742
}
4843

4944
private void AssertEventSerialize(Event evt) {
50-
var serializer = GetSerializer(_resolver);
45+
var serializer = Resolver.Resolve<IStorageSerializer>();
5146
Event newEvent;
5247
using (var memory = new MemoryStream()) {
5348
serializer.Serialize(evt, memory);
5449
memory.Position = 0;
5550
newEvent = serializer.Deserialize<Event>(memory);
5651
}
5752

58-
var jsonSerializer = _resolver.GetJsonSerializer();
59-
var expected = jsonSerializer.Serialize(evt);
60-
var actual = jsonSerializer.Serialize(newEvent);
53+
var jsonSerializer = Resolver.GetJsonSerializer();
54+
string expected = jsonSerializer.Serialize(evt);
55+
string actual = jsonSerializer.Serialize(newEvent);
6156

6257
Assert.Equal(expected, actual);
6358
}
@@ -78,13 +73,13 @@ public virtual void CanSerializeSimpleDataValues() {
7873

7974
public virtual void CanSerializeTags() {
8075
var evt = CreateSimpleEvent();
81-
evt.AddTags("Critial", "Startup", "AspNetCore");
76+
evt.AddTags("Critical", "Startup", "AspNetCore");
8277
AssertEventSerialize(evt);
8378
}
8479

8580
public virtual void CanSerializeEnvironmentInfo() {
8681
var evt = CreateSimpleEvent();
87-
evt.Data[Event.KnownDataKeys.EnvironmentInfo] = _resolver.Resolve<IEnvironmentInfoCollector>().GetEnvironmentInfo();
82+
evt.Data[Event.KnownDataKeys.EnvironmentInfo] = Resolver.Resolve<IEnvironmentInfoCollector>().GetEnvironmentInfo();
8883
AssertEventSerialize(evt);
8984
}
9085

@@ -142,7 +137,7 @@ public virtual void CanSerializeManualStackingInfo() {
142137
}
143138

144139
public virtual void CanSerializeSimpleError() {
145-
var client = new ExceptionlessClient(new ExceptionlessConfiguration(_resolver));
140+
var client = new ExceptionlessClient(new ExceptionlessConfiguration(Resolver));
146141
var exception = new ArgumentException("The argument cannot be null or empty", "value");
147142

148143
var evt = CreateSimpleEvent();
@@ -151,7 +146,7 @@ public virtual void CanSerializeSimpleError() {
151146
}
152147

153148
public virtual void CanSerializeError() {
154-
var client = new ExceptionlessClient(new ExceptionlessConfiguration(_resolver));
149+
var client = new ExceptionlessClient(new ExceptionlessConfiguration(Resolver));
155150
var exception = new ArgumentException("The argument cannot be null or empty", "value");
156151

157152
var evt = CreateSimpleEvent();

‎test/Exceptionless.Tests/Plugins/PluginTestBase.cs

Copy file name to clipboardExpand all lines: test/Exceptionless.Tests/Plugins/PluginTestBase.cs
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ protected struct TestStruct {
5959
public int Id { get; set; }
6060
}
6161

62-
public class MyApplicationException : Exception {
62+
public sealed class MyApplicationException : Exception {
6363
public MyApplicationException(string message) : base(message) {
6464
SetsDataProperty = Data;
6565
}

‎test/Exceptionless.Tests/Serializer/JsonStorageSerializerTests.cs

Copy file name to clipboardExpand all lines: test/Exceptionless.Tests/Serializer/JsonStorageSerializerTests.cs
+2-7Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,8 @@
44

55
namespace Exceptionless.Tests.Serializer {
66
public class JsonStorageSerializerTests : StorageSerializerTestBase {
7-
protected override void Initialize(IDependencyResolver resolver) {
8-
base.Initialize(resolver);
9-
resolver.Register<IStorageSerializer, DefaultJsonSerializer>();
10-
}
11-
12-
protected override IStorageSerializer GetSerializer(IDependencyResolver resolver) {
13-
return resolver.Resolve<IStorageSerializer>();
7+
public JsonStorageSerializerTests() {
8+
Resolver.Register<IStorageSerializer, DefaultJsonSerializer>();
149
}
1510

1611
[Fact(Skip = "The json serializer deserialize anonymous(object) types as dictionary.")]

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.