Code review fixes

dotnet · Jun 14, 2020 · 2a41afe · 2a41afe
1 parent 4f5cdbf
commit 2a41afe
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/src/EFCore.Cosmos/Infrastructure/Internal/CosmosDbOptionExtension.cs b/src/EFCore.Cosmos/Infrastructure/Internal/CosmosDbOptionExtension.cs
@@ -278,21 +278,20 @@ public override long GetServiceProviderHashCode()
             {
                 if (_serviceProviderHash == null)
                 {
+                    int hashCode;
                     if (!string.IsNullOrEmpty(Extension._connectionString))
                     {
-                        var hashCode = Extension._connectionString.GetHashCode();
-                        hashCode = (hashCode * 397) ^ (Extension._region?.GetHashCode() ?? 0);
-                        hashCode = (hashCode * 397) ^ (Extension._connectionMode?.GetHashCode() ?? 0);
-                        _serviceProviderHash = hashCode;
+                        hashCode = Extension._connectionString.GetHashCode();
                     }
                     else
                     {
-                        var hashCode = Extension._accountEndpoint.GetHashCode();
+                        hashCode = Extension._accountEndpoint.GetHashCode();
                         hashCode = (hashCode * 397) ^ Extension._accountKey.GetHashCode();
-                        hashCode = (hashCode * 397) ^ (Extension._region?.GetHashCode() ?? 0);
-                        hashCode = (hashCode * 397) ^ (Extension._connectionMode?.GetHashCode() ?? 0);
-                        _serviceProviderHash = hashCode;
                     }
+
+                    hashCode = (hashCode * 397) ^ (Extension._region?.GetHashCode() ?? 0);
+                    hashCode = (hashCode * 397) ^ (Extension._connectionMode?.GetHashCode() ?? 0);
+                    _serviceProviderHash = hashCode;
                 }
 
                 return _serviceProviderHash.Value;

diff --git a/test/EFCore.Cosmos.FunctionalTests/config.json b/test/EFCore.Cosmos.FunctionalTests/config.json
@@ -2,8 +2,7 @@
   "Test": {
     "Cosmos": {
       "DefaultConnection": "https://localhost:8081",
-      "AuthToken": "C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==",
-      "ConnectionString": "AccountEndpoint=https://localhost:8081/;AccountKey=C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw=="
+      "AuthToken": "C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw=="
     }
   }
 }