Merge pull request #28 from sharwell/UserAgentGenerator

Simplify UserAgentGenerator, only execute string.Format once

Author: alanquillin

src/corelib/Core/UserAgentGenerator.cs

@@ -1,18 +1,18 @@
 using System;
-using System.Reflection;
 
 namespace net.openstack.Core
 {
-    public class UserAgentGenerator
+    public static class UserAgentGenerator
     {
-        private static Version _currentVersion;
+        private static readonly Version _currentVersion = typeof(UserAgentGenerator).Assembly.GetName().Version;
+        private static readonly string _userAgent = string.Format("openstack.net/{0}", _currentVersion);
 
-        public static string Generate()
+        public static string UserAgent
         {
-            if (_currentVersion == null)
-                _currentVersion = Assembly.GetExecutingAssembly().GetName().Version;
-
-            return string.Format("openstack.net/{0}", _currentVersion.ToString());
+            get
+            {
+                return _userAgent;
+            }
         }
     }
 }

src/corelib/Providers/Rackspace/GeographicalCloudIdentityProvider.cs

@@ -447,7 +447,7 @@ protected T ExecuteRESTRequest<T>(CloudIdentity identity, string urlPath, HttpMe
                                    RetryCount = retryCount,
                                    RetryDelay = retryDelay,
                                    Non200SuccessCodes = new[] {HttpStatusCode.Unauthorized, HttpStatusCode.Conflict},
-                                   UserAgent = UserAgentGenerator.Generate()
+                                   UserAgent = UserAgentGenerator.UserAgent
                                };
 
             var response = callback(url, method, bodyStr, headers, queryStringParameter, settings);

src/corelib/Providers/Rackspace/ProviderBase.cs

@@ -207,7 +207,7 @@ internal void CheckResponse(Response response)
 
         internal static string GetUserAgentHeaderValue()
         {
-            return UserAgentGenerator.Generate();
+            return UserAgentGenerator.UserAgent;
         }
 
         protected T BuildCloudServersProviderAwareObject<T>(T input, string region, CloudIdentity identity) where T : ProviderStateBase<TProvider>