Merge pull request #11 from SamSmithNZ-dotcom/feature/codegardening

samsmithnz · web-flow · commit 9d5ad929c028 · 2021-08-07T13:27:10.000-04:00
Fixed some code analysis warnings and cleaned up usings
diff --git a/MandMCounter/MandMCounter.Core/Calculator.cs b/MandMCounter/MandMCounter.Core/Calculator.cs
@@ -12,19 +12,19 @@ public class Calculator
         /// <param name="unit">String Quart/Gallon/Liter</param>
         /// <param name="quantity">Any float number</param>
         /// <returns>M&M count, as an unrounded float</returns>
-        public float CountMandMs(string unit, float quantity)
+        public static float CountMandMs(string unit, float quantity)
         {
             float numberOfMandMs = GetCubicCmForVolume(unit, quantity) * Constants.MandMSDensityPercent / Constants.MandMVolumeCubicCm;
             return numberOfMandMs;
         }
 
-        public float CountPeanutMandMs(string unit, float quantity)
+        public static float CountPeanutMandMs(string unit, float quantity)
         {
             float numberOfMandMs = GetCubicCmForVolume(unit, quantity) * Constants.PeanutMandMSDensityPercent / Constants.PeanutMandMVolumeCubicCm;
             return numberOfMandMs;
         }
 
-        public float CountSkittles(string unit, float quantity)
+        public static float CountSkittles(string unit, float quantity)
         {
             float numberOfMandMs = GetCubicCmForVolume(unit, quantity) * Constants.SkittlesDensityPercent / Constants.SkittlesVolumeCubicCm;
             return numberOfMandMs;
@@ -38,19 +38,19 @@ public float CountSkittles(string unit, float quantity)
         /// <param name="width">the width of the rectangle</param>
         /// <param name="length">the length of the rectangle</param>
         /// <returns>M&M count, as an unrounded float</returns>
-        public float CountMandMs(string unit, float height, float width, float length)
+        public static float CountMandMs(string unit, float height, float width, float length)
         {
             float numberOfMandMs = GetCubicCmForRectangle(unit, height, width, length) * Constants.MandMSDensityPercent / Constants.MandMVolumeCubicCm;
             return numberOfMandMs;
         }
 
-        public float CountPeanutMandMs(string unit, float height, float width, float length)
+        public static float CountPeanutMandMs(string unit, float height, float width, float length)
         {
             float numberOfMandMs = GetCubicCmForRectangle(unit, height, width, length) * Constants.PeanutMandMSDensityPercent / Constants.PeanutMandMVolumeCubicCm;
             return numberOfMandMs;
         }
 
-        public float CountSkittles(string unit, float height, float width, float length)
+        public static float CountSkittles(string unit, float height, float width, float length)
         {
             float numberOfMandMs = GetCubicCmForRectangle(unit, height, width, length) * Constants.SkittlesDensityPercent / Constants.SkittlesVolumeCubicCm;
             return numberOfMandMs;
@@ -63,25 +63,25 @@ public float CountSkittles(string unit, float height, float width, float length)
         /// <param name="height">the height of the cylinder</param>
         /// <param name="radius">the radius of the container (half of the diameter)</param>
         /// <returns>M&M count, as an unrounded float</returns>
-        public float CountMandMs(string unit, float height, float radius)
+        public static float CountMandMs(string unit, float height, float radius)
         {
             float numberOfMandMs = GetCubicCmForCylinder(unit, height, radius) * Constants.MandMSDensityPercent / Constants.MandMVolumeCubicCm;
             return numberOfMandMs;
         }
 
-        public float CountPeanutMandMs(string unit, float height, float radius)
+        public static float CountPeanutMandMs(string unit, float height, float radius)
         {
             float numberOfMandMs = GetCubicCmForCylinder(unit, height, radius) * Constants.PeanutMandMSDensityPercent / Constants.PeanutMandMVolumeCubicCm;
             return numberOfMandMs;
         }
 
-        public float CountSkittles(string unit, float height, float radius)
+        public static float CountSkittles(string unit, float height, float radius)
         {
             float numberOfMandMs = GetCubicCmForCylinder(unit, height, radius) * Constants.SkittlesDensityPercent / Constants.SkittlesVolumeCubicCm;
             return numberOfMandMs;
         }
 
-        private float GetCubicCmForVolume(string unit, float quantity)
+        private static float GetCubicCmForVolume(string unit, float quantity)
         {
             if (string.IsNullOrEmpty(unit))
             {
@@ -120,7 +120,7 @@ private float GetCubicCmForVolume(string unit, float quantity)
             }
         }
 
-        private float GetCubicCmForRectangle(string unit, float height, float width, float length)
+        private static float GetCubicCmForRectangle(string unit, float height, float width, float length)
         {
             if (string.IsNullOrEmpty(unit))
             {
@@ -146,7 +146,7 @@ private float GetCubicCmForRectangle(string unit, float height, float width, flo
             }
         }
 
-        private float GetCubicCmForCylinder(string unit, float height, float radius)
+        private static float GetCubicCmForCylinder(string unit, float height, float radius)
         {
             if (string.IsNullOrEmpty(unit))
             {
diff --git a/MandMCounter/MandMCounter.Core/GlobalSuppressions.cs b/MandMCounter/MandMCounter.Core/GlobalSuppressions.cs
@@ -0,0 +1,10 @@
+﻿// This file is used by Code Analysis to maintain SuppressMessage
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given
+// a specific target and scoped to a namespace, type, member, etc.
+
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("Style", "IDE0066:Convert switch statement to expression", Justification = "<Pending>", Scope = "member", Target = "~M:MandMCounter.Core.Calculator.GetCubicCmForVolume(System.String,System.Single)~System.Single")]
+[assembly: SuppressMessage("Style", "IDE0066:Convert switch statement to expression", Justification = "<Pending>", Scope = "member", Target = "~M:MandMCounter.Core.Calculator.GetCubicCmForRectangle(System.String,System.Single,System.Single,System.Single)~System.Single")]
+[assembly: SuppressMessage("Style", "IDE0066:Convert switch statement to expression", Justification = "<Pending>", Scope = "member", Target = "~M:MandMCounter.Core.Calculator.GetCubicCmForCylinder(System.String,System.Single,System.Single)~System.Single")]
diff --git a/MandMCounter/MandMCounter.Core/Units.cs b/MandMCounter/MandMCounter.Core/Units.cs
@@ -1,13 +1,12 @@
-﻿using System;
-using System.Collections.Generic;
+﻿using System.Collections.Generic;
 
 namespace MandMCounter.Core
 {
     public class Units
     {
-        public List<string> GetUnitsForVolume()
+        public static List<string> GetUnitsForVolume()
         {
-            List<string> units = new List<string>
+            List<string> units = new()
             {
                 "teaspoon",
                 "tablespoon",
@@ -21,9 +20,9 @@ public List<string> GetUnitsForVolume()
             return units;
         }
 
-        public List<string> GetUnitsForContainer()
+        public static List<string> GetUnitsForContainer()
         {
-            List<string> units = new List<string>
+            List<string> units = new()
             {
                 "cm",
                 "meter",
diff --git a/MandMCounter/MandMCounter.Service/Controllers/MandMCounterController.cs b/MandMCounter/MandMCounter.Service/Controllers/MandMCounterController.cs
@@ -1,10 +1,5 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Http;
+﻿using MandMCounter.Core;
 using Microsoft.AspNetCore.Mvc;
-using MandMCounter.Core;
 
 namespace MandMCounter.Service.Controllers
 {
@@ -15,22 +10,19 @@ public class MandMCounterController : Controller
         [HttpGet("GetDataForUnit")]
         public float GetDataForUnit(string unit, float quantity)
         {
-            Calculator calc = new Calculator();
-            return calc.CountMandMs(unit, quantity);
+            return Calculator.CountMandMs(unit, quantity);
         }
 
         [HttpGet("GetDataForRectangle")]
         public float GetDataForRectangle(string unit, float height, float width, float length)
         {
-            Calculator calc = new Calculator();
-            return calc.CountMandMs(unit, height, width, length);
+            return Calculator.CountMandMs(unit, height, width, length);
         }
 
         [HttpGet("GetDataForCylinder")]
         public float GetDataForCylinder(string unit, float height, float radius)
         {
-            Calculator calc = new Calculator();
-            return calc.CountMandMs(unit, height, radius);
+            return Calculator.CountMandMs(unit, height, radius);
         }
     }
 }
diff --git a/MandMCounter/MandMCounter.Service/Controllers/PeanutMandMCounterController.cs b/MandMCounter/MandMCounter.Service/Controllers/PeanutMandMCounterController.cs
@@ -1,10 +1,5 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Http;
+﻿using MandMCounter.Core;
 using Microsoft.AspNetCore.Mvc;
-using MandMCounter.Core;
 
 namespace MandMCounter.Service.Controllers
 {
@@ -15,22 +10,19 @@ public class PeanutMandMCounterController : Controller
         [HttpGet("GetDataForUnit")]
         public float GetDataForUnit(string unit, float quantity)
         {
-            Calculator calc = new Calculator();
-            return calc.CountPeanutMandMs(unit, quantity);
+            return Calculator.CountPeanutMandMs(unit, quantity);
         }
 
         [HttpGet("GetDataForRectangle")]
         public float GetDataForRectangle(string unit, float height, float width, float length)
         {
-            Calculator calc = new Calculator();
-            return calc.CountPeanutMandMs(unit, height, width, length);
+            return Calculator.CountPeanutMandMs(unit, height, width, length);
         }
 
         [HttpGet("GetDataForCylinder")]
         public float GetDataForCylinder(string unit, float height, float radius)
         {
-            Calculator calc = new Calculator();
-            return calc.CountPeanutMandMs(unit, height, radius);
+            return Calculator.CountPeanutMandMs(unit, height, radius);
         }
     }
 }
diff --git a/MandMCounter/MandMCounter.Service/Controllers/SkittleCounterController.cs b/MandMCounter/MandMCounter.Service/Controllers/SkittleCounterController.cs
@@ -1,10 +1,5 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Http;
+﻿using MandMCounter.Core;
 using Microsoft.AspNetCore.Mvc;
-using MandMCounter.Core;
 
 namespace MandMCounter.Service.Controllers
 {
@@ -15,22 +10,19 @@ public class SkittleCounterController : Controller
         [HttpGet("GetDataForUnit")]
         public float GetDataForUnit(string unit, float quantity)
         {
-            Calculator calc = new Calculator();
-            return calc.CountSkittles(unit, quantity);
+            return Calculator.CountSkittles(unit, quantity);
         }
 
         [HttpGet("GetDataForRectangle")]
         public float GetDataForRectangle(string unit, float height, float width, float length)
         {
-            Calculator calc = new Calculator();
-            return calc.CountSkittles(unit, height, width, length);
+            return Calculator.CountSkittles(unit, height, width, length);
         }
 
         [HttpGet("GetDataForCylinder")]
         public float GetDataForCylinder(string unit, float height, float radius)
         {
-            Calculator calc = new Calculator();
-            return calc.CountSkittles(unit, height, radius);
+            return Calculator.CountSkittles(unit, height, radius);
         }
     }
 }
diff --git a/MandMCounter/MandMCounter.Service/Controllers/UnitsController.cs b/MandMCounter/MandMCounter.Service/Controllers/UnitsController.cs
@@ -1,10 +1,6 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Http;
+﻿using MandMCounter.Core;
 using Microsoft.AspNetCore.Mvc;
-using MandMCounter.Core;
+using System.Collections.Generic;
 
 namespace MandMCounter.Service.Controllers
 {
@@ -15,15 +11,13 @@ public class UnitsController : Controller
         [HttpGet("GetUnitsForVolume")]
         public List<string> GetUnitsForVolume()
         {
-            Units unit = new Units();
-            return unit.GetUnitsForVolume();
+            return Units.GetUnitsForVolume();
         }
 
         [HttpGet("GetUnitsForContainer")]
         public List<string> GetUnitsForContainer()
         {
-            Units unit = new Units();
-            return unit.GetUnitsForContainer();
+            return Units.GetUnitsForContainer();
         }
 
     }
diff --git a/MandMCounter/MandMCounter.Service/Program.cs b/MandMCounter/MandMCounter.Service/Program.cs
@@ -1,12 +1,5 @@
-﻿using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore;
+﻿using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Logging;
 
 namespace MandMCounter.Service
 {
diff --git a/MandMCounter/MandMCounter.Service/Startup.cs b/MandMCounter/MandMCounter.Service/Startup.cs
@@ -1,18 +1,12 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Builder;
+﻿using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Hosting;
-using System.Reflection;
-using System.IO;
 using Microsoft.OpenApi.Models;
+using System;
+using System.IO;
+using System.Reflection;
 
 namespace MandMCounter.Service
 {
diff --git a/MandMCounter/MandMCounter.Tests/MandMTests.cs b/MandMCounter/MandMCounter.Tests/MandMTests.cs
diff --git a/MandMCounter/MandMCounter.Tests/PeanutMandMTests.cs b/MandMCounter/MandMCounter.Tests/PeanutMandMTests.cs
diff --git a/MandMCounter/MandMCounter.Tests/SkittleTests.cs b/MandMCounter/MandMCounter.Tests/SkittleTests.cs
diff --git a/MandMCounter/MandMCounter.Tests/UnitsTests.cs b/MandMCounter/MandMCounter.Tests/UnitsTests.cs

Original file line number	Diff line number	Diff line change
`@@ -12,19 +12,19 @@ public class Calculator`
`12`	`12`	`/// <param name="unit">String Quart/Gallon/Liter</param>`
`13`	`13`	`/// <param name="quantity">Any float number</param>`
`14`	`14`	`/// <returns>M&M count, as an unrounded float</returns>`
`15`		`- public float CountMandMs(string unit, float quantity)`
	`15`	`+ public static float CountMandMs(string unit, float quantity)`
`16`	`16`	`{`
`17`	`17`	`float numberOfMandMs = GetCubicCmForVolume(unit, quantity) * Constants.MandMSDensityPercent / Constants.MandMVolumeCubicCm;`
`18`	`18`	`return numberOfMandMs;`
`19`	`19`	`}`
`20`	`20`
`21`		`- public float CountPeanutMandMs(string unit, float quantity)`
	`21`	`+ public static float CountPeanutMandMs(string unit, float quantity)`
`22`	`22`	`{`
`23`	`23`	`float numberOfMandMs = GetCubicCmForVolume(unit, quantity) * Constants.PeanutMandMSDensityPercent / Constants.PeanutMandMVolumeCubicCm;`
`24`	`24`	`return numberOfMandMs;`
`25`	`25`	`}`
`26`	`26`
`27`		`- public float CountSkittles(string unit, float quantity)`
	`27`	`+ public static float CountSkittles(string unit, float quantity)`
`28`	`28`	`{`
`29`	`29`	`float numberOfMandMs = GetCubicCmForVolume(unit, quantity) * Constants.SkittlesDensityPercent / Constants.SkittlesVolumeCubicCm;`
`30`	`30`	`return numberOfMandMs;`
`@@ -38,19 +38,19 @@ public float CountSkittles(string unit, float quantity)`
`38`	`38`	`/// <param name="width">the width of the rectangle</param>`
`39`	`39`	`/// <param name="length">the length of the rectangle</param>`
`40`	`40`	`/// <returns>M&M count, as an unrounded float</returns>`
`41`		`- public float CountMandMs(string unit, float height, float width, float length)`
	`41`	`+ public static float CountMandMs(string unit, float height, float width, float length)`
`42`	`42`	`{`
`43`	`43`	`float numberOfMandMs = GetCubicCmForRectangle(unit, height, width, length) * Constants.MandMSDensityPercent / Constants.MandMVolumeCubicCm;`
`44`	`44`	`return numberOfMandMs;`
`45`	`45`	`}`
`46`	`46`
`47`		`- public float CountPeanutMandMs(string unit, float height, float width, float length)`
	`47`	`+ public static float CountPeanutMandMs(string unit, float height, float width, float length)`
`48`	`48`	`{`
`49`	`49`	`float numberOfMandMs = GetCubicCmForRectangle(unit, height, width, length) * Constants.PeanutMandMSDensityPercent / Constants.PeanutMandMVolumeCubicCm;`
`50`	`50`	`return numberOfMandMs;`
`51`	`51`	`}`
`52`	`52`
`53`		`- public float CountSkittles(string unit, float height, float width, float length)`
	`53`	`+ public static float CountSkittles(string unit, float height, float width, float length)`
`54`	`54`	`{`
`55`	`55`	`float numberOfMandMs = GetCubicCmForRectangle(unit, height, width, length) * Constants.SkittlesDensityPercent / Constants.SkittlesVolumeCubicCm;`
`56`	`56`	`return numberOfMandMs;`
`@@ -63,25 +63,25 @@ public float CountSkittles(string unit, float height, float width, float length)`
`63`	`63`	`/// <param name="height">the height of the cylinder</param>`
`64`	`64`	`/// <param name="radius">the radius of the container (half of the diameter)</param>`
`65`	`65`	`/// <returns>M&M count, as an unrounded float</returns>`
`66`		`- public float CountMandMs(string unit, float height, float radius)`
	`66`	`+ public static float CountMandMs(string unit, float height, float radius)`
`67`	`67`	`{`
`68`	`68`	`float numberOfMandMs = GetCubicCmForCylinder(unit, height, radius) * Constants.MandMSDensityPercent / Constants.MandMVolumeCubicCm;`
`69`	`69`	`return numberOfMandMs;`
`70`	`70`	`}`
`71`	`71`
`72`		`- public float CountPeanutMandMs(string unit, float height, float radius)`
	`72`	`+ public static float CountPeanutMandMs(string unit, float height, float radius)`
`73`	`73`	`{`
`74`	`74`	`float numberOfMandMs = GetCubicCmForCylinder(unit, height, radius) * Constants.PeanutMandMSDensityPercent / Constants.PeanutMandMVolumeCubicCm;`
`75`	`75`	`return numberOfMandMs;`
`76`	`76`	`}`
`77`	`77`
`78`		`- public float CountSkittles(string unit, float height, float radius)`
	`78`	`+ public static float CountSkittles(string unit, float height, float radius)`
`79`	`79`	`{`
`80`	`80`	`float numberOfMandMs = GetCubicCmForCylinder(unit, height, radius) * Constants.SkittlesDensityPercent / Constants.SkittlesVolumeCubicCm;`
`81`	`81`	`return numberOfMandMs;`
`82`	`82`	`}`
`83`	`83`
`84`		`- private float GetCubicCmForVolume(string unit, float quantity)`
	`84`	`+ private static float GetCubicCmForVolume(string unit, float quantity)`
`85`	`85`	`{`
`86`	`86`	`if (string.IsNullOrEmpty(unit))`
`87`	`87`	`{`
`@@ -120,7 +120,7 @@ private float GetCubicCmForVolume(string unit, float quantity)`
`120`	`120`	`}`
`121`	`121`	`}`
`122`	`122`
`123`		`- private float GetCubicCmForRectangle(string unit, float height, float width, float length)`
	`123`	`+ private static float GetCubicCmForRectangle(string unit, float height, float width, float length)`
`124`	`124`	`{`
`125`	`125`	`if (string.IsNullOrEmpty(unit))`
`126`	`126`	`{`
`@@ -146,7 +146,7 @@ private float GetCubicCmForRectangle(string unit, float height, float width, flo`
`146`	`146`	`}`
`147`	`147`	`}`
`148`	`148`
`149`		`- private float GetCubicCmForCylinder(string unit, float height, float radius)`
	`149`	`+ private static float GetCubicCmForCylinder(string unit, float height, float radius)`
`150`	`150`	`{`
`151`	`151`	`if (string.IsNullOrEmpty(unit))`
`152`	`152`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,12 @@`
`1`		`-using System;`
`2`		`-using System.Collections.Generic;`
	`1`	`+using System.Collections.Generic;`
`3`	`2`
`4`	`3`	`namespace MandMCounter.Core`
`5`	`4`	`{`
`6`	`5`	`public class Units`
`7`	`6`	`{`
`8`		`- public List<string> GetUnitsForVolume()`
	`7`	`+ public static List<string> GetUnitsForVolume()`
`9`	`8`	`{`
`10`		`- List<string> units = new List<string>`
	`9`	`+ List<string> units = new()`
`11`	`10`	`{`
`12`	`11`	`"teaspoon",`
`13`	`12`	`"tablespoon",`
`@@ -21,9 +20,9 @@ public List<string> GetUnitsForVolume()`
`21`	`20`	`return units;`
`22`	`21`	`}`
`23`	`22`
`24`		`- public List<string> GetUnitsForContainer()`
	`23`	`+ public static List<string> GetUnitsForContainer()`
`25`	`24`	`{`
`26`		`- List<string> units = new List<string>`
	`25`	`+ List<string> units = new()`
`27`	`26`	`{`
`28`	`27`	`"cm",`
`29`	`28`	`"meter",`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,5 @@`
`1`		`-using System;`
`2`		`-using System.Collections.Generic;`
`3`		`-using System.Linq;`
`4`		`-using System.Threading.Tasks;`
`5`		`-using Microsoft.AspNetCore.Http;`
	`1`	`+using MandMCounter.Core;`
`6`	`2`	`using Microsoft.AspNetCore.Mvc;`
`7`		`-using MandMCounter.Core;`
`8`	`3`
`9`	`4`	`namespace MandMCounter.Service.Controllers`
`10`	`5`	`{`
`@@ -15,22 +10,19 @@ public class MandMCounterController : Controller`
`15`	`10`	`[HttpGet("GetDataForUnit")]`
`16`	`11`	`public float GetDataForUnit(string unit, float quantity)`
`17`	`12`	`{`
`18`		`- Calculator calc = new Calculator();`
`19`		`- return calc.CountMandMs(unit, quantity);`
	`13`	`+ return Calculator.CountMandMs(unit, quantity);`
`20`	`14`	`}`
`21`	`15`
`22`	`16`	`[HttpGet("GetDataForRectangle")]`
`23`	`17`	`public float GetDataForRectangle(string unit, float height, float width, float length)`
`24`	`18`	`{`
`25`		`- Calculator calc = new Calculator();`
`26`		`- return calc.CountMandMs(unit, height, width, length);`
	`19`	`+ return Calculator.CountMandMs(unit, height, width, length);`
`27`	`20`	`}`
`28`	`21`
`29`	`22`	`[HttpGet("GetDataForCylinder")]`
`30`	`23`	`public float GetDataForCylinder(string unit, float height, float radius)`
`31`	`24`	`{`
`32`		`- Calculator calc = new Calculator();`
`33`		`- return calc.CountMandMs(unit, height, radius);`
	`25`	`+ return Calculator.CountMandMs(unit, height, radius);`
`34`	`26`	`}`
`35`	`27`	`}`
`36`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,6 @@`
`1`		`-using System;`
`2`		`-using System.Collections.Generic;`
`3`		`-using System.Linq;`
`4`		`-using System.Threading.Tasks;`
`5`		`-using Microsoft.AspNetCore.Http;`
	`1`	`+using MandMCounter.Core;`
`6`	`2`	`using Microsoft.AspNetCore.Mvc;`
`7`		`-using MandMCounter.Core;`
	`3`	`+using System.Collections.Generic;`
`8`	`4`
`9`	`5`	`namespace MandMCounter.Service.Controllers`
`10`	`6`	`{`
`@@ -15,15 +11,13 @@ public class UnitsController : Controller`
`15`	`11`	`[HttpGet("GetUnitsForVolume")]`
`16`	`12`	`public List<string> GetUnitsForVolume()`
`17`	`13`	`{`
`18`		`- Units unit = new Units();`
`19`		`- return unit.GetUnitsForVolume();`
	`14`	`+ return Units.GetUnitsForVolume();`
`20`	`15`	`}`
`21`	`16`
`22`	`17`	`[HttpGet("GetUnitsForContainer")]`
`23`	`18`	`public List<string> GetUnitsForContainer()`
`24`	`19`	`{`
`25`		`- Units unit = new Units();`
`26`		`- return unit.GetUnitsForContainer();`
	`20`	`+ return Units.GetUnitsForContainer();`
`27`	`21`	`}`
`28`	`22`
`29`	`23`	`}`