Applied code style & cleanup

Author: pergerch

src/SpatialFocus.MethodCache.Fody/CecilExtension.cs

@@ -12,6 +12,11 @@ public static class CecilExtension
 	{
 		public static MethodReference MakeGeneric(this MethodReference method, params TypeReference[] arguments)
 		{
+			if (method == null)
+			{
+				throw new ArgumentNullException(nameof(method));
+			}
+
 			if (method.GenericParameters.Count != arguments.Length)
 			{
 				throw new ArgumentException("Invalid number of generic type arguments supplied");
@@ -34,6 +39,11 @@ public static MethodReference MakeGeneric(this MethodReference method, params Ty
 
 		public static MethodReference MakeHostInstanceGeneric(this MethodReference self, params TypeReference[] args)
 		{
+			if (self == null)
+			{
+				throw new ArgumentNullException(nameof(self));
+			}
+
 			MethodReference reference = new MethodReference(self.Name, self.ReturnType, self.DeclaringType.MakeGenericInstanceType(args))
 			{
 				HasThis = self.HasThis, ExplicitThis = self.ExplicitThis, CallingConvention = self.CallingConvention,

src/SpatialFocus.MethodCache.Fody/ILProcessorContext.cs

@@ -22,6 +22,11 @@ public ILProcessorContext(ILProcessor processor, Instruction currentInstruction)
 
 		public ILProcessorContext Append(Func<ILProcessor, Instruction> action)
 		{
+			if (action == null)
+			{
+				throw new ArgumentNullException(nameof(action));
+			}
+
 			Instruction instruction = action(Processor);
 
 			if (CurrentInstruction == null)

src/SpatialFocus.MethodCache.Fody/MemoryCache.cs

@@ -129,6 +129,11 @@ public static ILProcessorContext WeaveCreateKey(MethodWeavingContext methodWeavi
 
 		public static void WeaveSetBeforeReturns(MethodWeavingContext methodWeavingContext)
 		{
+			if (methodWeavingContext == null)
+			{
+				throw new ArgumentNullException(nameof(methodWeavingContext));
+			}
+
 			MethodBody methodDefinitionBody = methodWeavingContext.MethodDefinition.Body;
 
 			List<Instruction> returns = methodDefinitionBody.Instructions.Where(x => x.OpCode == OpCodes.Ret).ToList();

…ache.Sample.Library/BasisSampleWeaved.cs …ache.Sample.Library/BasicSampleWeaved.cssrc/SpatialFocus.MethodCache.Sample.Library/BasisSampleWeaved.cs renamed to src/SpatialFocus.MethodCache.Sample.Library/BasicSampleWeaved.cs src/SpatialFocus.MethodCache.Sample.Library/BasisSampleWeaved.cs renamed to src/SpatialFocus.MethodCache.Sample.Library/BasicSampleWeaved.cs

@@ -1,4 +1,4 @@
-// <copyright file="BasisSampleWeaved.cs" company="Spatial Focus GmbH">
+// <copyright file="BasicSampleWeaved.cs" company="Spatial Focus GmbH">
 // Copyright (c) Spatial Focus GmbH. All rights reserved.
 // </copyright>
 
@@ -18,14 +18,12 @@ public BasicSampleWeaved(IMemoryCache memoryCache)
 
 		public int Add(int a, int b)
 		{
-			int value;
-
 			// Create a unique cache key, based on namespace, class name and method name as first parameter and corresponding
 			// generic class parameters,generic method parameters and method parameters
 			Tuple<string, int, int> key = new Tuple<string, int, int>("SpatialFocus.MethodCache.Sample.Library.BasicSample.Add", a, b);
 
 			// Check and return if a cached value exists for key
-			if (MemoryCache.TryGetValue(key, out value))
+			if (MemoryCache.TryGetValue(key, out int value))
 			{
 				return value;
 			}

src/SpatialFocus.MethodCache.Sample/MyMemoryCache.cs

@@ -5,21 +5,20 @@
 namespace SpatialFocus.MethodCache.Sample
 {
 	using System;
-	using System.Runtime.CompilerServices;
 	using Microsoft.Extensions.Caching.Memory;
 	using Microsoft.Extensions.Logging;
 
-	public class MyMemoryCache : IMemoryCache
+	public sealed class MyMemoryCache : IMemoryCache
 	{
 		public MyMemoryCache(IMemoryCache memoryCache, ILogger<MyMemoryCache> logger)
 		{
 			MemoryCache = memoryCache ?? throw new ArgumentNullException(nameof(memoryCache));
 			Logger = logger ?? throw new ArgumentNullException(nameof(logger));
 		}
 
-		protected ILogger<MyMemoryCache> Logger { get; }
+		private ILogger<MyMemoryCache> Logger { get; }
 
-		protected IMemoryCache MemoryCache { get; }
+		private IMemoryCache MemoryCache { get; }
 
 		public ICacheEntry CreateEntry(object key)
 		{
@@ -29,8 +28,7 @@ public ICacheEntry CreateEntry(object key)
 
 		public void Dispose()
 		{
-			Dispose(true);
-			GC.SuppressFinalize(this);
+			MemoryCache?.Dispose();
 		}
 
 		public void Remove(object key) => throw new NotImplementedException();
@@ -46,13 +44,5 @@ public bool TryGetValue(object key, out object value)
 			Logger.LogInformation("Value for {key} found: {value}", key, value);
 			return true;
 		}
-
-		protected virtual void Dispose(bool disposing)
-		{
-			if (disposing)
-			{
-				MemoryCache?.Dispose();
-			}
-		}
 	}
 }

src/SpatialFocus.MethodCache.Sample/Program.cs

@@ -12,22 +12,23 @@ namespace SpatialFocus.MethodCache.Sample
 
 	internal class Program
 	{
-		private static void Main(string[] args)
+		private static void Main()
 		{
 			ServiceCollection serviceCollection = new ServiceCollection();
 			serviceCollection.AddLogging(builder => builder.AddConsole());
 			ServiceProvider buildServiceProvider = serviceCollection.BuildServiceProvider();
 
-			BasicSample basicSample = new BasicSample(new MyMemoryCache(new MemoryCache(new MemoryCacheOptions()),
-				buildServiceProvider.GetRequiredService<ILogger<MyMemoryCache>>()));
+			using MyMemoryCache memoryCacheBasicSample = new MyMemoryCache(new MemoryCache(new MemoryCacheOptions()),
+				buildServiceProvider.GetRequiredService<ILogger<MyMemoryCache>>());
+			BasicSample basicSample = new BasicSample(memoryCacheBasicSample);
 
 			basicSample.Add(1, 2);
 			basicSample.Add(1, 2);
 			basicSample.Add(3, 4);
 
-			GenericSample<int, object> genericSample = new GenericSample<int, object>(
-				new MyMemoryCache(new MemoryCache(new MemoryCacheOptions()),
-					buildServiceProvider.GetRequiredService<ILogger<MyMemoryCache>>()));
+			using MyMemoryCache memoryCacheGenericSample = new MyMemoryCache(new MemoryCache(new MemoryCacheOptions()),
+				buildServiceProvider.GetRequiredService<ILogger<MyMemoryCache>>());
+			GenericSample<int, object> genericSample = new GenericSample<int, object>(memoryCacheGenericSample);
 
 			genericSample.Add<string, Attribute>(1, 2, 3, 4);
 			genericSample.Add<string, Attribute>(1, 2, 3, 4);

src/SpatialFocus.MethodCache.SmokeTest/Class1.cs

@@ -2,6 +2,10 @@
 // Copyright (c) Spatial Focus GmbH. All rights reserved.
 // </copyright>
 
+using System;
+
+[assembly: CLSCompliant(false)]
+
 namespace SpatialFocus.MethodCache.SmokeTest
 {
 	using System;

src/SpatialFocus.MethodCache.TestAssembly/Models/CustomObject.cs

@@ -20,7 +20,7 @@ public override bool Equals(object obj)
 		{
 			CustomObject other = (CustomObject)obj;
 
-			return Age == other.Age && Name == other.Name;
+			return other != null && Age == other.Age && Name == other.Name;
 		}
 
 		public override int GetHashCode()

src/SpatialFocus.MethodCache.Tests/Mock/MockCacheEntry.cs

@@ -9,7 +9,7 @@ namespace SpatialFocus.MethodCache.Tests.Mock
 	using Microsoft.Extensions.Caching.Memory;
 	using Microsoft.Extensions.Primitives;
 
-	public class MockCacheEntry : ICacheEntry
+	public sealed class MockCacheEntry : ICacheEntry
 	{
 		public IList<IChangeToken> ExpirationTokens { get; }
 

src/SpatialFocus.MethodCache.Tests/Mock/MockMemoryCache.cs

@@ -7,7 +7,7 @@ namespace SpatialFocus.MethodCache.Tests.Mock
 	using System.Collections.Generic;
 	using Microsoft.Extensions.Caching.Memory;
 
-	public class MockMemoryCache : IMemoryCache
+	public sealed class MockMemoryCache : IMemoryCache
 	{
 		public int CountGets { get; set; }