Using String.Equals for string equality comparison

Closes-Bug: 1306227
Change-Id: Ifa40d5330813a9d67de9d65460356a21ed1a17e0
This commit is contained in:
Wayne Foley
2014-04-10 14:17:06 -07:00
parent 11eb6f0b75
commit 969d30ff36
11 changed files with 20 additions and 20 deletions

View File

@@ -47,9 +47,9 @@ namespace OpenStack.Test.Storage
Assert.AreEqual(2, containers.Count()); Assert.AreEqual(2, containers.Count());
var obj1 = var obj1 =
containers.First(o => string.Compare(o.Name, "TestContainer", StringComparison.InvariantCultureIgnoreCase) == 0); containers.First(o => string.Equals(o.Name, "TestContainer", StringComparison.InvariantCultureIgnoreCase));
var obj2 = var obj2 =
containers.First(o => string.Compare(o.Name, "OtherTestContainer", StringComparison.InvariantCultureIgnoreCase) == 0); containers.First(o => string.Equals(o.Name, "OtherTestContainer", StringComparison.InvariantCultureIgnoreCase));
Assert.IsNotNull(obj1); Assert.IsNotNull(obj1);
Assert.IsNotNull(obj2); Assert.IsNotNull(obj2);
@@ -77,7 +77,7 @@ namespace OpenStack.Test.Storage
Assert.AreEqual(1, containers.Count()); Assert.AreEqual(1, containers.Count());
var obj1 = var obj1 =
containers.First(o => string.Compare(o.Name, "TestContainer", StringComparison.InvariantCultureIgnoreCase) == 0); containers.First(o => string.Equals(o.Name, "TestContainer", StringComparison.InvariantCultureIgnoreCase));
Assert.IsNotNull(obj1); Assert.IsNotNull(obj1);
Assert.AreEqual(7, obj1.TotalBytesUsed); Assert.AreEqual(7, obj1.TotalBytesUsed);

View File

@@ -53,9 +53,9 @@ namespace OpenStack.Test.Storage
Assert.AreEqual(2,objects.Count()); Assert.AreEqual(2,objects.Count());
var obj1 = var obj1 =
objects.First(o => string.Compare(o.Name, "BLAH", StringComparison.InvariantCultureIgnoreCase) == 0); objects.First(o => string.Equals(o.Name, "BLAH", StringComparison.InvariantCultureIgnoreCase));
var obj2 = var obj2 =
objects.First(o => string.Compare(o.Name, "LargeFile.bin", StringComparison.InvariantCultureIgnoreCase) == 0); objects.First(o => string.Equals(o.Name, "LargeFile.bin", StringComparison.InvariantCultureIgnoreCase));
Assert.IsNotNull(obj1); Assert.IsNotNull(obj1);
Assert.IsNotNull(obj2); Assert.IsNotNull(obj2);
@@ -91,7 +91,7 @@ namespace OpenStack.Test.Storage
Assert.AreEqual(1, objects.Count()); Assert.AreEqual(1, objects.Count());
var obj1 = var obj1 =
objects.First(o => string.Compare(o.Name, "BLAH", StringComparison.InvariantCultureIgnoreCase) == 0); objects.First(o => string.Equals(o.Name, "BLAH", StringComparison.InvariantCultureIgnoreCase));
Assert.IsNotNull(obj1); Assert.IsNotNull(obj1);
Assert.AreEqual(0, obj1.Length); Assert.AreEqual(0, obj1.Length);

View File

@@ -54,7 +54,7 @@ namespace OpenStack.Identity
{ {
//https://someidentityendpoint:35357/v2.0/tokens //https://someidentityendpoint:35357/v2.0/tokens
var endpointSegs = credential.AuthenticationEndpoint.Segments; var endpointSegs = credential.AuthenticationEndpoint.Segments;
if (endpointSegs.Count() == 3 && string.Compare(endpointSegs[1].Trim('/'), "v2.0", StringComparison.Ordinal) == 0) if (endpointSegs.Count() == 3 && string.Equals(endpointSegs[1].Trim('/'), "v2.0", StringComparison.Ordinal))
{ {
return true; return true;
} }

View File

@@ -31,7 +31,7 @@ namespace OpenStack.Identity
var ret = string.Empty; var ret = string.Empty;
var identService = catalog.FirstOrDefault(s => string.Compare(s.Name, serviceName, StringComparison.OrdinalIgnoreCase) == 0); var identService = catalog.FirstOrDefault(s => string.Equals(s.Name, serviceName, StringComparison.OrdinalIgnoreCase));
if (identService == null) if (identService == null)
{ {

View File

@@ -34,7 +34,7 @@ namespace OpenStack.Identity
/// <inheritdoc/> /// <inheritdoc/>
public bool Exists(string serviceName) public bool Exists(string serviceName)
{ {
return this.Any(s => string.Compare(s.Name, serviceName, StringComparison.OrdinalIgnoreCase) == 0); return this.Any(s => string.Equals(s.Name, serviceName, StringComparison.OrdinalIgnoreCase));
} }
/// <inheritdoc/> /// <inheritdoc/>

View File

@@ -31,19 +31,19 @@ namespace OpenStack.Identity
serviceName.AssertIsNotNullOrEmpty("serviceName", "Cannot resolve the public endpoint of a service with a null or empty service name."); serviceName.AssertIsNotNullOrEmpty("serviceName", "Cannot resolve the public endpoint of a service with a null or empty service name.");
serviceName.AssertIsNotNullOrEmpty("region", "Cannot resolve the public endpoint of a service with a null or empty region."); serviceName.AssertIsNotNullOrEmpty("region", "Cannot resolve the public endpoint of a service with a null or empty region.");
if (catalog.All(s => string.Compare(s.Name, serviceName, StringComparison.OrdinalIgnoreCase) != 0)) if (catalog.All(s => !string.Equals(s.Name, serviceName, StringComparison.OrdinalIgnoreCase)))
{ {
throw new InvalidOperationException(string.Format("Service catalog does not contain an entry for the '{0}' service. The request could not be completed.", serviceName)); throw new InvalidOperationException(string.Format("Service catalog does not contain an entry for the '{0}' service. The request could not be completed.", serviceName));
} }
var service = catalog.First(s => string.Compare(s.Name, serviceName, StringComparison.OrdinalIgnoreCase) == 0); var service = catalog.First(s => string.Equals(s.Name, serviceName, StringComparison.OrdinalIgnoreCase));
if (service.Endpoints.All(e => string.Compare(e.Region, region, StringComparison.OrdinalIgnoreCase) != 0)) if (service.Endpoints.All(e => !string.Equals(e.Region, region, StringComparison.OrdinalIgnoreCase)))
{ {
throw new InvalidOperationException(string.Format("Service catalog does not contain an endpoint for the '{0}' service in the requested region. Region: '{1}'", serviceName, region)); throw new InvalidOperationException(string.Format("Service catalog does not contain an endpoint for the '{0}' service in the requested region. Region: '{1}'", serviceName, region));
} }
var endpoint = service.Endpoints.First(e => string.Compare(e.Region, region, StringComparison.OrdinalIgnoreCase) == 0); var endpoint = service.Endpoints.First(e => string.Equals(e.Region, region, StringComparison.OrdinalIgnoreCase));
return endpoint.PublicUri; return endpoint.PublicUri;
} }

View File

@@ -191,7 +191,7 @@ namespace OpenStack.Storage
var segmentFolder = var segmentFolder =
container.Folders.FirstOrDefault( container.Folders.FirstOrDefault(
f => string.Compare(f.FullName, objectName, StringComparison.Ordinal) == 0); f => string.Equals(f.FullName, objectName, StringComparison.Ordinal));
if (segmentFolder == null) if (segmentFolder == null)
{ {

View File

@@ -58,7 +58,7 @@ namespace OpenStack.Storage
continue; continue;
} }
var currentRoot = folders.FirstOrDefault(f => string.Compare(f.Name, folderParts[0], StringComparison.Ordinal) == 0); var currentRoot = folders.FirstOrDefault(f => string.Equals(f.Name, folderParts[0], StringComparison.Ordinal));
if (currentRoot == null) if (currentRoot == null)
{ {
//if the root folder does not exist, create it. //if the root folder does not exist, create it.
@@ -71,7 +71,7 @@ namespace OpenStack.Storage
foreach (var part in folderParts.Skip(1)) foreach (var part in folderParts.Skip(1))
{ {
currentPath += "/" + part; currentPath += "/" + part;
var newRoot = currentRoot.Folders.FirstOrDefault(f => string.Compare(f.Name, part, StringComparison.Ordinal) == 0); var newRoot = currentRoot.Folders.FirstOrDefault(f => string.Equals(f.Name, part, StringComparison.Ordinal));
if (newRoot == null) if (newRoot == null)
{ {
newRoot = new StorageFolder(currentPath, new List<StorageFolder>()); newRoot = new StorageFolder(currentPath, new List<StorageFolder>());
@@ -111,7 +111,7 @@ namespace OpenStack.Storage
var objectConverter = ServiceLocator.Instance.Locate<IStorageObjectPayloadConverter>(); var objectConverter = ServiceLocator.Instance.Locate<IStorageObjectPayloadConverter>();
var objects = rawObjects.Select(t => objectConverter.ConvertSingle(t,containerName)).ToList(); var objects = rawObjects.Select(t => objectConverter.ConvertSingle(t,containerName)).ToList();
objects.RemoveAll(o => string.Compare(o.FullName, folderName, StringComparison.Ordinal) == 0); objects.RemoveAll(o => string.Equals(o.FullName, folderName, StringComparison.Ordinal));
return new StorageFolder(folderName, subFolders.Select(ParseSubFolder), objects); return new StorageFolder(folderName, subFolders.Select(ParseSubFolder), objects);

View File

@@ -144,7 +144,7 @@ namespace OpenStack.Storage
IEnumerable<string> values; IEnumerable<string> values;
if (headers.TryGetValue("X-Static-Large-Object", out values)) if (headers.TryGetValue("X-Static-Large-Object", out values))
{ {
if (values.Any(v => string.Compare(v, "true", StringComparison.OrdinalIgnoreCase) == 0)) if (values.Any(v => string.Equals(v, "true", StringComparison.OrdinalIgnoreCase)))
{ {
return new StaticLargeObjectManifest(objectName, containerName, lastModified, eTag, length, contentType, metadata); return new StaticLargeObjectManifest(objectName, containerName, lastModified, eTag, length, contentType, metadata);
} }

View File

@@ -57,7 +57,7 @@ namespace OpenStack.Storage
return return
catalog.Any( catalog.Any(
s => s =>
string.Compare(s.Name, StorageServiceClient.StorageServiceName, StringComparison.OrdinalIgnoreCase) == 0 && string.Equals(s.Name, StorageServiceClient.StorageServiceName, StringComparison.OrdinalIgnoreCase) &&
s.Endpoints.Any(e => this.ListSupportedVersions().Contains(e.Version))); s.Endpoints.Any(e => this.ListSupportedVersions().Contains(e.Version)));
} }
return false; return false;

View File

@@ -137,7 +137,7 @@ namespace OpenStack.Storage
var client = this.GetHttpClient(this.context); var client = this.GetHttpClient(this.context);
var baseUri = CreateRequestUri(GetServiceEndpoint(this.context), containerName); var baseUri = CreateRequestUri(GetServiceEndpoint(this.context), containerName);
var prefix = string.Compare("/", folderName, StringComparison.Ordinal) == 0 var prefix = string.Equals("/", folderName, StringComparison.Ordinal)
? string.Empty ? string.Empty
: string.Format("&prefix={0}", folderName); : string.Format("&prefix={0}", folderName);