MAINTENANCE: code cleanup

jslachta · Oct 17, 2022 · 7a40ab6 · 7a40ab6
1 parent 46107bb
commit 7a40ab6
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 40 deletions.
diff --git a/src/LocaleNames.Test/FindCountryCodeTests.cs b/src/LocaleNames.Test/FindCountryCodeTests.cs
@@ -15,7 +15,7 @@ public void LocaleNames_All_Country_Codes_Should_Not_Provide_Variants_And_Contin
         {
             var localeNames = LocaleNamesFactory.ForLanguageCode("en-US");
 
-            var countryCodes = localeNames.AllCountryCodes;
+            var countryCodes = localeNames.GetAllCountryCodes();
 
             Assert.IsTrue(countryCodes.Any(), "Testing on empty collection does not make sense.");
 

diff --git a/src/LocaleNames.Test/FindLanguageCodeTests.cs b/src/LocaleNames.Test/FindLanguageCodeTests.cs
@@ -14,7 +14,7 @@ public void LocaleNames_All_Language_Codes_Should_Not_Provide_Variants()
         {
             var localeNames = LocaleNamesFactory.ForLanguageCode("en-US");
 
-            var languageCodes = localeNames.AllLanguageCodes;
+            var languageCodes = localeNames.GetAllLanguageCodes();
 
             Assert.IsTrue(languageCodes.Any(), "Testing on empty collection does not make sense.");
 

diff --git a/src/LocaleNames/LocaleNames.cs b/src/LocaleNames/LocaleNames.cs
@@ -22,12 +22,12 @@ public class LocaleNames
         /// <summary>
         /// Gets a value indicating whether are language translations empty.
         /// </summary>
-        public bool AreLanguageTranslationsEmpty => !(LanguageNames.Value.Keys.Count > 0);
+        public bool AreLanguageTranslationsEmpty => LanguageNames.Value.Keys.Count <= 0;
 
         /// <summary>
         /// Gets a value indicating whether are countryname translations empty.
         /// </summary>
-        public bool AreCountryNameTranslationsEmpty => !(CountryNames.Value.Keys.Count > 0);
+        public bool AreCountryNameTranslationsEmpty => CountryNames.Value.Keys.Count <= 0;
 
         /// <summary>
         /// Gets a value indicating whether this instance is from cache.
@@ -51,15 +51,15 @@ public class LocaleNames
         /// <value>
         /// The language names.
         /// </value>
-        private Lazy<ReadOnlyDictionary<string, string>> LanguageNames;
+        private readonly Lazy<ReadOnlyDictionary<string, string>> LanguageNames;
 
         /// <summary>
         /// Gets the language names.
         /// </summary>
         /// <value>
         /// The language names.
         /// </value>
-        private Lazy<ReadOnlyDictionary<string, string>> CountryNames;
+        private readonly Lazy<ReadOnlyDictionary<string, string>> CountryNames;
 
         #endregion PROPERTIES
 
@@ -160,7 +160,7 @@ private bool LoadDictionary(string key, string postfix, ref IDictionary<string,
         /// <summary>
         /// Provides all language codes.
         /// </summary>
-        public IReadOnlyCollection<string> AllLanguageCodes
+        public IReadOnlyCollection<string> GetAllLanguageCodes()
             => new ReadOnlyCollection<string>(LanguageNames.Value.Select(i => i.Key.StripLocaleVariants()).Distinct().ToList());
 
         /// <summary>
@@ -235,7 +235,7 @@ public string FindLanguageCode(string countryName)
         /// <summary>
         /// Provides all country codes.
         /// </summary>
-        public IReadOnlyCollection<string> AllCountryCodes
+        public IReadOnlyCollection<string> GetAllCountryCodes()
             => new ReadOnlyCollection<string>(
                 CountryNames
                 .Value

diff --git a/src/LocaleNames/Utils/GzipUtils.cs b/src/LocaleNames/Utils/GzipUtils.cs
@@ -12,27 +12,50 @@ namespace LocaleNames.Utils
     public static class GzipUtils
     {
         /// <summary>
-        /// Decompresses the specified input.
+        /// Compresses the specified input.
         /// </summary>
         /// <param name="input">The input.</param>
         /// <returns></returns>
-        public static string Decompress(string input)
+        public static string Compress(string input)
         {
-            byte[] compressed = Convert.FromBase64String(input);
-            byte[] decompressed = Decompress(compressed);
-            return Encoding.UTF8.GetString(decompressed);
+            byte[] encoded = Encoding.UTF8.GetBytes(input);
+            byte[] compressed = Compress(encoded);
+            return Convert.ToBase64String(compressed);
         }
 
         /// <summary>
         /// Compresses the specified input.
         /// </summary>
         /// <param name="input">The input.</param>
         /// <returns></returns>
-        public static string Compress(string input)
+        public static byte[] Compress(byte[] input)
         {
-            byte[] encoded = Encoding.UTF8.GetBytes(input);
-            byte[] compressed = Compress(encoded);
-            return Convert.ToBase64String(compressed);
+            using (var result = new MemoryStream())
+            {
+                var lengthBytes = BitConverter.GetBytes(input.Length);
+                result.Write(lengthBytes, 0, 4);
+
+                using (var compressionStream = new GZipStream(result,
+                    CompressionMode.Compress))
+                {
+                    compressionStream.Write(input, 0, input.Length);
+                    compressionStream.Flush();
+                }
+
+                return result.ToArray();
+            }
+        }
+
+        /// <summary>
+        /// Decompresses the specified input.
+        /// </summary>
+        /// <param name="input">The input.</param>
+        /// <returns></returns>
+        public static string Decompress(string input)
+        {
+            byte[] compressed = Convert.FromBase64String(input);
+            byte[] decompressed = Decompress(compressed);
+            return Encoding.UTF8.GetString(decompressed);
         }
 
         /// <summary>
@@ -58,28 +81,5 @@ public static byte[] Decompress(byte[] input)
                 }
             }
         }
-
-        /// <summary>
-        /// Compresses the specified input.
-        /// </summary>
-        /// <param name="input">The input.</param>
-        /// <returns></returns>
-        public static byte[] Compress(byte[] input)
-        {
-            using (var result = new MemoryStream())
-            {
-                var lengthBytes = BitConverter.GetBytes(input.Length);
-                result.Write(lengthBytes, 0, 4);
-
-                using (var compressionStream = new GZipStream(result,
-                    CompressionMode.Compress))
-                {
-                    compressionStream.Write(input, 0, input.Length);
-                    compressionStream.Flush();
-                }
-
-                return result.ToArray();
-            }
-        }
     }
 }