Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Code cleanup.

Removed the obsolete Port&Credentials members from the configuration and got rid of some compiler warnings.
  • Loading branch information...
commit 4d55b6b95575ec66ce2eb9954e84feb71aee1dc3 1 parent 66675b4
Attila Kiskó enyim authored
1  Enyim.Caching/Memcached/Protocol/Binary/SaslStep.cs
View
@@ -25,7 +25,6 @@ protected internal override bool ReadResponse(PooledSocket socket)
return retval;
}
- public int StatusCode { get; private set; }
public byte[] Data { get; private set; }
}
}
4 Enyim.Caching/Memcached/Transcoders/ITranscoder.cs
View
@@ -10,9 +10,9 @@ public interface ITranscoder
/// <summary>
/// Serializes an object for storing in the cache.
/// </summary>
- /// <param name="o">The object to serialize</param>
+ /// <param name="value">The object to serialize</param>
/// <returns>The serialized object</returns>
- CacheItem Serialize(Object o);
+ CacheItem Serialize(object value);
/// <summary>
/// Deserializes the <see cref="T:CacheItem"/> into an object.
11 Membase/Configuration/IMembaseClientConfiguration.cs
View
@@ -49,17 +49,6 @@ public interface IMembaseClientConfiguration
/// </summary>
IPerformanceMonitor CreatePerformanceMonitor();
- /// <summary>
- /// Gets the credentials used to connect to the REST API of the cluster.
- /// </summary>
- NetworkCredential Credentials { get; }
-
- /// <summary>
- /// Determines which port the client should use to connect to the nodes
- /// </summary>
- [Obsolete]
- BucketPortType Port { get; }
-
TimeSpan RetryTimeout { get; }
int RetryCount { get; }
}
32 Membase/Configuration/MembaseClientConfiguration.cs
View
@@ -23,7 +23,6 @@ public class MembaseClientConfiguration : IMembaseClientConfiguration
public MembaseClientConfiguration()
{
this.Urls = new List<Uri>();
- this.Port = BucketPortType.Direct;
this.SocketPool = new SocketPoolConfiguration();
}
@@ -95,27 +94,16 @@ public ITranscoder Transcoder
/// </summary>
public IMembasePerformanceMonitorFactory PerformanceMonitorFactory { get; set; }
- /// <summary>
- /// Determines which port the client should use to connect to the nodes
- /// </summary>
- [Obsolete]
- public BucketPortType Port { get; set; }
-
public int RetryCount { get; set; }
public TimeSpan RetryTimeout { get; set; }
#region [ interface ]
+
IList<Uri> IMembaseClientConfiguration.Urls
{
get { return this.Urls; }
}
- [Obsolete("The bucket name&password will be used for authentication. This property will be removed in the next version.")]
- NetworkCredential IMembaseClientConfiguration.Credentials
- {
- get { throw new NotImplementedException(); }
- }
-
ISocketPoolConfiguration IMembaseClientConfiguration.SocketPool
{
get { return this.SocketPool; }
@@ -146,12 +134,6 @@ string IMembaseClientConfiguration.Bucket
get { return this.Bucket; }
}
- [Obsolete]
- BucketPortType IMembaseClientConfiguration.Port
- {
- get { return this.Port; }
- }
-
int IMembaseClientConfiguration.RetryCount
{
get { return this.RetryCount; }
@@ -182,7 +164,6 @@ internal class ReadOnlyConfig : IMembaseClientConfiguration
private string bucket;
private string bucketPassword;
private Uri[] urls;
- private BucketPortType port;
private TimeSpan retryTimeout;
private int retryCount;
private ISocketPoolConfiguration spc;
@@ -195,7 +176,6 @@ public ReadOnlyConfig(IMembaseClientConfiguration original)
this.bucketPassword = original.BucketPassword;
this.urls = original.Urls.ToArray();
- this.port = BucketPortType.Direct;
this.retryCount = original.RetryCount;
this.retryTimeout = original.RetryTimeout;
@@ -250,16 +230,6 @@ IPerformanceMonitor IMembaseClientConfiguration.CreatePerformanceMonitor()
return this.original.CreatePerformanceMonitor();
}
- NetworkCredential IMembaseClientConfiguration.Credentials
- {
- get { throw new NotImplementedException("this property is obsolete"); }
- }
-
- BucketPortType IMembaseClientConfiguration.Port
- {
- get { return this.port; }
- }
-
TimeSpan IMembaseClientConfiguration.RetryTimeout
{
get { return this.retryTimeout; }
14 Membase/Configuration/MembaseClientSection.cs
View
@@ -12,7 +12,7 @@ namespace Membase.Configuration
/// <summary>
/// Configures the <see cref="T:MembaseClient"/>. This class cannot be inherited.
/// </summary>
- public sealed class MembaseClientSection : ConfigurationSection, IMembaseClientConfiguration
+ public class MembaseClientSection : ConfigurationSection, IMembaseClientConfiguration
{
[ConfigurationProperty("servers", IsRequired = true)]
public ServersElement Servers
@@ -124,12 +124,6 @@ IPerformanceMonitor IMembaseClientConfiguration.CreatePerformanceMonitor()
return null;
}
- [Obsolete("Please use the bucket name&password for specifying credentials. This property has no use now, and will be completely removed in the next version.", true)]
- NetworkCredential IMembaseClientConfiguration.Credentials
- {
- get { throw new NotImplementedException(); }
- }
-
string IMembaseClientConfiguration.Bucket
{
get { return this.Servers.Bucket; }
@@ -140,12 +134,6 @@ string IMembaseClientConfiguration.BucketPassword
get { return this.Servers.BucketPassword; }
}
- [Obsolete]
- BucketPortType IMembaseClientConfiguration.Port
- {
- get { return this.Servers.Port; }
- }
-
int IMembaseClientConfiguration.RetryCount
{
get { return this.Servers.RetryCount; }
Please sign in to comment.
Something went wrong with that request. Please try again.