Repository: reef Updated Branches: refs/heads/master a95e2ed66 -> 9ed4f4f7d
[REEF-1089] Pass through O.A.R.Common to hide unnecessarily public APIs JIRA: [REEF-1089](https://issues.apache.org/jira/browse/REEF-1089) Pull Request: This closes #747 Project: http://git-wip-us.apache.org/repos/asf/reef/repo Commit: http://git-wip-us.apache.org/repos/asf/reef/commit/9ed4f4f7 Tree: http://git-wip-us.apache.org/repos/asf/reef/tree/9ed4f4f7 Diff: http://git-wip-us.apache.org/repos/asf/reef/diff/9ed4f4f7 Branch: refs/heads/master Commit: 9ed4f4f7dd43e1a82e03099f6ba03249ead2afa2 Parents: a95e2ed Author: Andrew Chung <[email protected]> Authored: Fri Dec 18 16:01:14 2015 -0800 Committer: Markus Weimer <[email protected]> Committed: Mon Jan 4 11:15:49 2016 -0800 ---------------------------------------------------------------------- .../Org.Apache.REEF.Common/Api/AbstractFailure.cs | 12 ++++-------- .../Org.Apache.REEF.Common/Avro/AvroDriverInfo.cs | 4 +++- .../Org.Apache.REEF.Common/Avro/AvroHttpRequest.cs | 12 ++++++------ .../Avro/AvroHttpSerializer.cs | 15 +-------------- .../Avro/AvroJsonSerializer.cs | 4 +++- .../Avro/AvroReefServiceInfo.cs | 4 +++- lang/cs/Org.Apache.REEF.Common/Avro/HeaderEntry.cs | 12 ++++++------ .../Catalog/Capabilities/CPU.cs | 2 +- .../Catalog/Capabilities/RAM.cs | 2 +- .../Catalog/NodeDescriptorImpl.cs | 4 +++- .../Catalog/RackDescriptorImpl.cs | 2 +- .../Catalog/ResourceCatalogImpl.cs | 2 +- .../Context/ContextMessage.cs | 2 +- .../Evaluator/DriverInformation.cs | 3 +-- .../Evaluator/EvaluatorOperationState.cs | 2 +- .../Evaluator/EvaluatorRuntimeState.cs | 2 +- .../Evaluator/IDriverConnection.cs | 3 +++ .../Exceptions/JobException.cs | 2 +- .../Org.Apache.REEF.Common/Files/PathUtilities.cs | 2 +- lang/cs/Org.Apache.REEF.Common/Io/NameAssignment.cs | 2 +- .../Io/NamingConfiguration.cs | 2 +- .../Io/NamingConfigurationOptions.cs | 3 +-- .../Io/TcpPortConfigurationProvider.cs | 2 +- .../Properties/AssemblyInfo.cs | 16 +++++++++++++++- .../Evaluator/Utils/EvaluatorConfigurations.cs | 1 - 25 files changed, 61 insertions(+), 56 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/reef/blob/9ed4f4f7/lang/cs/Org.Apache.REEF.Common/Api/AbstractFailure.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Common/Api/AbstractFailure.cs b/lang/cs/Org.Apache.REEF.Common/Api/AbstractFailure.cs index cb1ac2a..0b01281 100644 --- a/lang/cs/Org.Apache.REEF.Common/Api/AbstractFailure.cs +++ b/lang/cs/Org.Apache.REEF.Common/Api/AbstractFailure.cs @@ -28,10 +28,6 @@ namespace Org.Apache.REEF.Common.Api { private static readonly Logger LOGGER = Logger.GetLogger(typeof(AbstractFailure)); - public AbstractFailure() - { - } - /// <summary> /// Most detailed error message constructor that takes all parameters possible. /// </summary> @@ -40,7 +36,7 @@ namespace Org.Apache.REEF.Common.Api /// <param name="description">Long error description. Can be null.</param> /// <param name="cause">Exception that caused the error. Can be null.</param> /// <param name="data">byte array that contains serialized version of the error. Can be null.</param> - public AbstractFailure(string id, string message, string description, Exception cause, byte[] data) + protected AbstractFailure(string id, string message, string description, Exception cause, byte[] data) { if (string.IsNullOrEmpty(id)) { @@ -62,7 +58,7 @@ namespace Org.Apache.REEF.Common.Api /// </summary> /// <param name="id"></param> /// <param name="message"></param> - public AbstractFailure(string id, string message) + protected AbstractFailure(string id, string message) : this(id, message, null, null, null) { } @@ -74,7 +70,7 @@ namespace Org.Apache.REEF.Common.Api /// </summary> /// <param name="id"></param> /// <param name="cause"></param> - public AbstractFailure(string id, Exception cause) + protected AbstractFailure(string id, Exception cause) { if (string.IsNullOrEmpty(id)) { @@ -93,7 +89,7 @@ namespace Org.Apache.REEF.Common.Api /// <param name="id"></param> /// <param name="message"></param> /// <param name="description"></param> - public AbstractFailure(string id, string message, string description) + protected AbstractFailure(string id, string message, string description) : this(id, message, description, null, null) { } http://git-wip-us.apache.org/repos/asf/reef/blob/9ed4f4f7/lang/cs/Org.Apache.REEF.Common/Avro/AvroDriverInfo.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Common/Avro/AvroDriverInfo.cs b/lang/cs/Org.Apache.REEF.Common/Avro/AvroDriverInfo.cs index 5eafc10..ed3b106 100644 --- a/lang/cs/Org.Apache.REEF.Common/Avro/AvroDriverInfo.cs +++ b/lang/cs/Org.Apache.REEF.Common/Avro/AvroDriverInfo.cs @@ -2,15 +2,17 @@ using System.Collections.Generic; using System.Runtime.Serialization; +using Org.Apache.REEF.Utilities.Attributes; namespace Org.Apache.REEF.Common.Avro { /// <summary> /// Used to serialize and deserialize Avro record org.apache.reef.webserver.AvroDriverInfo. /// </summary> + [Private] [DataContract(Namespace = "org.apache.reef.webserver")] [KnownType(typeof(List<Org.Apache.REEF.Common.Avro.AvroReefServiceInfo>))] - public partial class AvroDriverInfo + public class AvroDriverInfo { private const string JsonSchema = @"{""type"":""record"",""name"":""org.apache.reef.webserver.AvroDriverInfo"",""fields"":[{""name"":""remoteId"",""type"":""string""},{""name"":""startTime"",""type"":""string""},{""name"":""services"",""type"":{""type"":""array"",""items"":{""type"":""record"",""name"":""org.apache.reef.webserver.AvroReefServiceInfo"",""fields"":[{""name"":""serviceName"",""type"":""string""},{""name"":""serviceInfo"",""type"":""string""}]}}}]}"; http://git-wip-us.apache.org/repos/asf/reef/blob/9ed4f4f7/lang/cs/Org.Apache.REEF.Common/Avro/AvroHttpRequest.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Common/Avro/AvroHttpRequest.cs b/lang/cs/Org.Apache.REEF.Common/Avro/AvroHttpRequest.cs index 182992e..09f5336 100644 --- a/lang/cs/Org.Apache.REEF.Common/Avro/AvroHttpRequest.cs +++ b/lang/cs/Org.Apache.REEF.Common/Avro/AvroHttpRequest.cs @@ -1,17 +1,17 @@ //<auto-generated /> +using System.Collections.Generic; +using System.Runtime.Serialization; +using Org.Apache.REEF.Utilities.Attributes; + namespace Org.Apache.REEF.Common.Avro { - using System; - using System.Collections.Generic; - using System.Runtime.Serialization; - using Microsoft.Hadoop.Avro; - /// <summary> /// Used to serialize and deserialize Avro record org.apache.reef.webserver.AvroHttpRequest. /// </summary> + [Private] [DataContract(Namespace = "org.apache.reef.webserver")] [KnownType(typeof(List<Org.Apache.REEF.Common.Avro.HeaderEntry>))] - public partial class AvroHttpRequest + public class AvroHttpRequest { private const string JsonSchema = @"{""type"":""record"",""name"":""org.apache.reef.webserver.AvroHttpRequest"",""fields"":[{""name"":""header"",""type"":{""type"":""array"",""items"":{""type"":""record"",""name"":""org.apache.reef.webserver.HeaderEntry"",""fields"":[{""name"":""key"",""type"":""string""},{""name"":""value"",""type"":""string""}]}}},{""name"":""requestUrl"",""type"":""string""},{""name"":""pathInfo"",""type"":""string""},{""name"":""queryString"",""type"":""string""},{""name"":""httpMethod"",""type"":""string""},{""name"":""inputStream"",""type"":""bytes""}]}"; http://git-wip-us.apache.org/repos/asf/reef/blob/9ed4f4f7/lang/cs/Org.Apache.REEF.Common/Avro/AvroHttpSerializer.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Common/Avro/AvroHttpSerializer.cs b/lang/cs/Org.Apache.REEF.Common/Avro/AvroHttpSerializer.cs index c643096..60ca7cc 100644 --- a/lang/cs/Org.Apache.REEF.Common/Avro/AvroHttpSerializer.cs +++ b/lang/cs/Org.Apache.REEF.Common/Avro/AvroHttpSerializer.cs @@ -17,7 +17,6 @@ * under the License. */ -using System; using System.IO; using Microsoft.Hadoop.Avro; using Newtonsoft.Json; @@ -28,8 +27,7 @@ namespace Org.Apache.REEF.Common.Avro /// <summary> /// Class AvroHttpSerializer. Provides methods to serialize and deserialize HttpRequest /// </summary> - //// TODO[REEF-842] Act on the obsoletes - public class AvroHttpSerializer + internal static class AvroHttpSerializer { public static AvroHttpRequest FromBytes(byte[] serializedBytes) { @@ -45,17 +43,6 @@ namespace Org.Apache.REEF.Common.Avro /// </summary> /// <param name="serializedBytes">The serialized bytes.</param> /// <returns>AvroHttpRequest.</returns> - [Obsolete("Deprecated in 0.14, please use FromBytesWithJson instead.")] - public static AvroHttpRequest FromBytesWithJoson(byte[] serializedBytes) - { - return FromBytesWithJson(serializedBytes); - } - - /// <summary> - /// Convert bytes which contains Json string into AvroHttpRequest object - /// </summary> - /// <param name="serializedBytes">The serialized bytes.</param> - /// <returns>AvroHttpRequest.</returns> public static AvroHttpRequest FromBytesWithJson(byte[] serializedBytes) { string s = ByteUtilities.ByteArraysToString(serializedBytes); http://git-wip-us.apache.org/repos/asf/reef/blob/9ed4f4f7/lang/cs/Org.Apache.REEF.Common/Avro/AvroJsonSerializer.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Common/Avro/AvroJsonSerializer.cs b/lang/cs/Org.Apache.REEF.Common/Avro/AvroJsonSerializer.cs index 4a86177..82f4194 100644 --- a/lang/cs/Org.Apache.REEF.Common/Avro/AvroJsonSerializer.cs +++ b/lang/cs/Org.Apache.REEF.Common/Avro/AvroJsonSerializer.cs @@ -19,6 +19,7 @@ using Newtonsoft.Json; using Org.Apache.REEF.Utilities; +using Org.Apache.REEF.Utilities.Attributes; namespace Org.Apache.REEF.Common.Avro { @@ -26,7 +27,8 @@ namespace Org.Apache.REEF.Common.Avro /// Wrapper class for serialize/deserialize Avro json. This avoids having to reference Avro dll in every project /// </summary> /// <typeparam name="T"> the deserialized type</typeparam> - public class AvroJsonSerializer<T> + [Private] + public sealed class AvroJsonSerializer<T> { public static T FromString(string str) { http://git-wip-us.apache.org/repos/asf/reef/blob/9ed4f4f7/lang/cs/Org.Apache.REEF.Common/Avro/AvroReefServiceInfo.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Common/Avro/AvroReefServiceInfo.cs b/lang/cs/Org.Apache.REEF.Common/Avro/AvroReefServiceInfo.cs index d7da473..35beaf5 100644 --- a/lang/cs/Org.Apache.REEF.Common/Avro/AvroReefServiceInfo.cs +++ b/lang/cs/Org.Apache.REEF.Common/Avro/AvroReefServiceInfo.cs @@ -1,14 +1,16 @@ //<auto-generated /> using System.Runtime.Serialization; +using Org.Apache.REEF.Utilities.Attributes; namespace Org.Apache.REEF.Common.Avro { /// <summary> /// Used to serialize and deserialize Avro record org.apache.reef.webserver.AvroReefServiceInfo. /// </summary> + [Private] [DataContract(Namespace = "org.apache.reef.webserver")] - public partial class AvroReefServiceInfo + public class AvroReefServiceInfo { private const string JsonSchema = @"{""type"":""record"",""name"":""org.apache.reef.webserver.AvroReefServiceInfo"",""fields"":[{""name"":""serviceName"",""type"":""string""},{""name"":""serviceInfo"",""type"":""string""}]}"; http://git-wip-us.apache.org/repos/asf/reef/blob/9ed4f4f7/lang/cs/Org.Apache.REEF.Common/Avro/HeaderEntry.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Common/Avro/HeaderEntry.cs b/lang/cs/Org.Apache.REEF.Common/Avro/HeaderEntry.cs index 6645f32..b108c02 100644 --- a/lang/cs/Org.Apache.REEF.Common/Avro/HeaderEntry.cs +++ b/lang/cs/Org.Apache.REEF.Common/Avro/HeaderEntry.cs @@ -1,16 +1,16 @@ //<auto-generated /> + +using System.Runtime.Serialization; +using Org.Apache.REEF.Utilities.Attributes; + namespace Org.Apache.REEF.Common.Avro { - using System; - using System.Collections.Generic; - using System.Runtime.Serialization; - using Microsoft.Hadoop.Avro; - /// <summary> /// Used to serialize and deserialize Avro record org.apache.reef.webserver.HeaderEntry. /// </summary> + [Private] [DataContract(Namespace = "org.apache.reef.webserver")] - public partial class HeaderEntry + public class HeaderEntry { private const string JsonSchema = @"{""type"":""record"",""name"":""org.apache.reef.webserver.HeaderEntry"",""fields"":[{""name"":""key"",""type"":""string""},{""name"":""value"",""type"":""string""}]}"; http://git-wip-us.apache.org/repos/asf/reef/blob/9ed4f4f7/lang/cs/Org.Apache.REEF.Common/Catalog/Capabilities/CPU.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Common/Catalog/Capabilities/CPU.cs b/lang/cs/Org.Apache.REEF.Common/Catalog/Capabilities/CPU.cs index 9f64a05..191d48d 100644 --- a/lang/cs/Org.Apache.REEF.Common/Catalog/Capabilities/CPU.cs +++ b/lang/cs/Org.Apache.REEF.Common/Catalog/Capabilities/CPU.cs @@ -23,7 +23,7 @@ using Org.Apache.REEF.Utilities.Logging; namespace Org.Apache.REEF.Common.Catalog.Capabilities { - public class CPU : ICapability + public sealed class CPU : ICapability { private static readonly Logger LOGGER = Logger.GetLogger(typeof(CPU)); http://git-wip-us.apache.org/repos/asf/reef/blob/9ed4f4f7/lang/cs/Org.Apache.REEF.Common/Catalog/Capabilities/RAM.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Common/Catalog/Capabilities/RAM.cs b/lang/cs/Org.Apache.REEF.Common/Catalog/Capabilities/RAM.cs index 1183072..f7c25a9 100644 --- a/lang/cs/Org.Apache.REEF.Common/Catalog/Capabilities/RAM.cs +++ b/lang/cs/Org.Apache.REEF.Common/Catalog/Capabilities/RAM.cs @@ -21,7 +21,7 @@ using System.Globalization; namespace Org.Apache.REEF.Common.Catalog.Capabilities { - public class RAM : ICapability + public sealed class RAM : ICapability { private readonly int _megaBytes; http://git-wip-us.apache.org/repos/asf/reef/blob/9ed4f4f7/lang/cs/Org.Apache.REEF.Common/Catalog/NodeDescriptorImpl.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Common/Catalog/NodeDescriptorImpl.cs b/lang/cs/Org.Apache.REEF.Common/Catalog/NodeDescriptorImpl.cs index a04d2b4..31f2d5e 100644 --- a/lang/cs/Org.Apache.REEF.Common/Catalog/NodeDescriptorImpl.cs +++ b/lang/cs/Org.Apache.REEF.Common/Catalog/NodeDescriptorImpl.cs @@ -20,10 +20,12 @@ using System.Collections.Generic; using System.Net; using Org.Apache.REEF.Common.Catalog.Capabilities; +using Org.Apache.REEF.Utilities.Attributes; namespace Org.Apache.REEF.Common.Catalog { - public class NodeDescriptorImpl : INodeDescriptor + [Private] + internal sealed class NodeDescriptorImpl : INodeDescriptor { private readonly RackDescriptorImpl _rack; http://git-wip-us.apache.org/repos/asf/reef/blob/9ed4f4f7/lang/cs/Org.Apache.REEF.Common/Catalog/RackDescriptorImpl.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Common/Catalog/RackDescriptorImpl.cs b/lang/cs/Org.Apache.REEF.Common/Catalog/RackDescriptorImpl.cs index 02a3715..a188749 100644 --- a/lang/cs/Org.Apache.REEF.Common/Catalog/RackDescriptorImpl.cs +++ b/lang/cs/Org.Apache.REEF.Common/Catalog/RackDescriptorImpl.cs @@ -24,7 +24,7 @@ using Org.Apache.REEF.Common.Catalog.Capabilities; namespace Org.Apache.REEF.Common.Catalog { - public class RackDescriptorImpl : IRackDescriptor + internal sealed class RackDescriptorImpl : IRackDescriptor { public RackDescriptorImpl(string name) { http://git-wip-us.apache.org/repos/asf/reef/blob/9ed4f4f7/lang/cs/Org.Apache.REEF.Common/Catalog/ResourceCatalogImpl.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Common/Catalog/ResourceCatalogImpl.cs b/lang/cs/Org.Apache.REEF.Common/Catalog/ResourceCatalogImpl.cs index 6989c3c..5032fc2 100644 --- a/lang/cs/Org.Apache.REEF.Common/Catalog/ResourceCatalogImpl.cs +++ b/lang/cs/Org.Apache.REEF.Common/Catalog/ResourceCatalogImpl.cs @@ -28,7 +28,7 @@ using Org.Apache.REEF.Utilities.Logging; namespace Org.Apache.REEF.Common.Catalog { - public class ResourceCatalogImpl : IResourceCatalog + internal sealed class ResourceCatalogImpl : IResourceCatalog { private static readonly Logger LOGGER = Logger.GetLogger(typeof(ResourceCatalogImpl)); http://git-wip-us.apache.org/repos/asf/reef/blob/9ed4f4f7/lang/cs/Org.Apache.REEF.Common/Context/ContextMessage.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Common/Context/ContextMessage.cs b/lang/cs/Org.Apache.REEF.Common/Context/ContextMessage.cs index 7f9b226..448974c 100644 --- a/lang/cs/Org.Apache.REEF.Common/Context/ContextMessage.cs +++ b/lang/cs/Org.Apache.REEF.Common/Context/ContextMessage.cs @@ -22,7 +22,7 @@ using Org.Apache.REEF.Utilities.Logging; namespace Org.Apache.REEF.Common.Context { - public class ContextMessage + public sealed class ContextMessage { private static readonly Logger LOGGER = Logger.GetLogger(typeof(ContextMessage)); private readonly string _messageSourcId; http://git-wip-us.apache.org/repos/asf/reef/blob/9ed4f4f7/lang/cs/Org.Apache.REEF.Common/Evaluator/DriverInformation.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Common/Evaluator/DriverInformation.cs b/lang/cs/Org.Apache.REEF.Common/Evaluator/DriverInformation.cs index a49f58d..4c2459c 100644 --- a/lang/cs/Org.Apache.REEF.Common/Evaluator/DriverInformation.cs +++ b/lang/cs/Org.Apache.REEF.Common/Evaluator/DriverInformation.cs @@ -24,13 +24,12 @@ using System.IO; using System.Linq; using System.Net; using System.Text; -using System.Threading; using Org.Apache.REEF.Common.Avro; using Org.Apache.REEF.Utilities.Logging; namespace Org.Apache.REEF.Common.Evaluator { - public class DriverInformation + public sealed class DriverInformation { private static readonly Logger LOGGER = Logger.GetLogger(typeof(DriverInformation)); http://git-wip-us.apache.org/repos/asf/reef/blob/9ed4f4f7/lang/cs/Org.Apache.REEF.Common/Evaluator/EvaluatorOperationState.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Common/Evaluator/EvaluatorOperationState.cs b/lang/cs/Org.Apache.REEF.Common/Evaluator/EvaluatorOperationState.cs index 22ffa67..831b682 100644 --- a/lang/cs/Org.Apache.REEF.Common/Evaluator/EvaluatorOperationState.cs +++ b/lang/cs/Org.Apache.REEF.Common/Evaluator/EvaluatorOperationState.cs @@ -19,7 +19,7 @@ namespace Org.Apache.REEF.Common.Evaluator { - public enum EvaluatorOperationState + internal enum EvaluatorOperationState { /// <summary> /// default state http://git-wip-us.apache.org/repos/asf/reef/blob/9ed4f4f7/lang/cs/Org.Apache.REEF.Common/Evaluator/EvaluatorRuntimeState.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Common/Evaluator/EvaluatorRuntimeState.cs b/lang/cs/Org.Apache.REEF.Common/Evaluator/EvaluatorRuntimeState.cs index cc879bb..7065e9c 100644 --- a/lang/cs/Org.Apache.REEF.Common/Evaluator/EvaluatorRuntimeState.cs +++ b/lang/cs/Org.Apache.REEF.Common/Evaluator/EvaluatorRuntimeState.cs @@ -19,7 +19,7 @@ namespace Org.Apache.REEF.Common.Evaluator { - public enum EvaluatorRuntimeState + internal enum EvaluatorRuntimeState { /// <summary> /// default state http://git-wip-us.apache.org/repos/asf/reef/blob/9ed4f4f7/lang/cs/Org.Apache.REEF.Common/Evaluator/IDriverConnection.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Common/Evaluator/IDriverConnection.cs b/lang/cs/Org.Apache.REEF.Common/Evaluator/IDriverConnection.cs index bfceeca..4ad9a00 100644 --- a/lang/cs/Org.Apache.REEF.Common/Evaluator/IDriverConnection.cs +++ b/lang/cs/Org.Apache.REEF.Common/Evaluator/IDriverConnection.cs @@ -17,10 +17,13 @@ * under the License. */ +using Org.Apache.REEF.Utilities.Attributes; + namespace Org.Apache.REEF.Common.Evaluator { public interface IDriverConnection { + [Private] DriverInformation GetDriverInformation(); } } http://git-wip-us.apache.org/repos/asf/reef/blob/9ed4f4f7/lang/cs/Org.Apache.REEF.Common/Exceptions/JobException.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Common/Exceptions/JobException.cs b/lang/cs/Org.Apache.REEF.Common/Exceptions/JobException.cs index 8675be3..d8f1be6 100644 --- a/lang/cs/Org.Apache.REEF.Common/Exceptions/JobException.cs +++ b/lang/cs/Org.Apache.REEF.Common/Exceptions/JobException.cs @@ -22,7 +22,7 @@ using Org.Apache.REEF.Utilities; namespace Org.Apache.REEF.Common.Exceptions { - public class JobException : Exception, IIdentifiable + public sealed class JobException : Exception, IIdentifiable { private readonly string _jobId; http://git-wip-us.apache.org/repos/asf/reef/blob/9ed4f4f7/lang/cs/Org.Apache.REEF.Common/Files/PathUtilities.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Common/Files/PathUtilities.cs b/lang/cs/Org.Apache.REEF.Common/Files/PathUtilities.cs index 863226d..ecd1124 100644 --- a/lang/cs/Org.Apache.REEF.Common/Files/PathUtilities.cs +++ b/lang/cs/Org.Apache.REEF.Common/Files/PathUtilities.cs @@ -22,7 +22,7 @@ namespace Org.Apache.REEF.Common.Files /// <summary> /// Utility class for dealing with Paths /// </summary> - public static class PathUtilities + internal static class PathUtilities { /// <summary> /// Normalizes a path for easy comparison. http://git-wip-us.apache.org/repos/asf/reef/blob/9ed4f4f7/lang/cs/Org.Apache.REEF.Common/Io/NameAssignment.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Common/Io/NameAssignment.cs b/lang/cs/Org.Apache.REEF.Common/Io/NameAssignment.cs index bfd97a2..84bec5a 100644 --- a/lang/cs/Org.Apache.REEF.Common/Io/NameAssignment.cs +++ b/lang/cs/Org.Apache.REEF.Common/Io/NameAssignment.cs @@ -26,7 +26,7 @@ namespace Org.Apache.REEF.Common.Io /// Tuple containing the string identifier and IPEndpoint. /// Used by NameServer and NameClient /// </summary> - public class NameAssignment + public sealed class NameAssignment { public NameAssignment(string id, IPEndPoint endpoint) { http://git-wip-us.apache.org/repos/asf/reef/blob/9ed4f4f7/lang/cs/Org.Apache.REEF.Common/Io/NamingConfiguration.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Common/Io/NamingConfiguration.cs b/lang/cs/Org.Apache.REEF.Common/Io/NamingConfiguration.cs index 0f922dd..039ec4b 100644 --- a/lang/cs/Org.Apache.REEF.Common/Io/NamingConfiguration.cs +++ b/lang/cs/Org.Apache.REEF.Common/Io/NamingConfiguration.cs @@ -23,7 +23,7 @@ using Org.Apache.REEF.Tang.Util; namespace Org.Apache.REEF.Common.Io { - public class NamingConfiguration : ConfigurationModuleBuilder + public sealed class NamingConfiguration : ConfigurationModuleBuilder { [SuppressMessage("Microsoft.Security", "CA2104:Do not declare read only mutable reference types", Justification = "not applicable")] public static readonly RequiredParameter<string> NameServerAddress = new RequiredParameter<string>(); http://git-wip-us.apache.org/repos/asf/reef/blob/9ed4f4f7/lang/cs/Org.Apache.REEF.Common/Io/NamingConfigurationOptions.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Common/Io/NamingConfigurationOptions.cs b/lang/cs/Org.Apache.REEF.Common/Io/NamingConfigurationOptions.cs index 6f396eb..1336ac8 100644 --- a/lang/cs/Org.Apache.REEF.Common/Io/NamingConfigurationOptions.cs +++ b/lang/cs/Org.Apache.REEF.Common/Io/NamingConfigurationOptions.cs @@ -17,12 +17,11 @@ * under the License. */ -using System.ComponentModel; using Org.Apache.REEF.Tang.Annotations; namespace Org.Apache.REEF.Common.Io { - public class NamingConfigurationOptions + public sealed class NamingConfigurationOptions { [NamedParameter("IP address of NameServer")] public class NameServerAddress : Name<string> http://git-wip-us.apache.org/repos/asf/reef/blob/9ed4f4f7/lang/cs/Org.Apache.REEF.Common/Io/TcpPortConfigurationProvider.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Common/Io/TcpPortConfigurationProvider.cs b/lang/cs/Org.Apache.REEF.Common/Io/TcpPortConfigurationProvider.cs index ec1c0f4..e1a6e75 100644 --- a/lang/cs/Org.Apache.REEF.Common/Io/TcpPortConfigurationProvider.cs +++ b/lang/cs/Org.Apache.REEF.Common/Io/TcpPortConfigurationProvider.cs @@ -25,7 +25,7 @@ using Org.Apache.REEF.Wake.Remote.Parameters; namespace Org.Apache.REEF.Common.Io { - public class TcpPortConfigurationProvider : IConfigurationProvider + public sealed class TcpPortConfigurationProvider : IConfigurationProvider { private readonly IConfiguration _configuration; [Inject] http://git-wip-us.apache.org/repos/asf/reef/blob/9ed4f4f7/lang/cs/Org.Apache.REEF.Common/Properties/AssemblyInfo.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Common/Properties/AssemblyInfo.cs b/lang/cs/Org.Apache.REEF.Common/Properties/AssemblyInfo.cs index 0a12df2..c26d379 100644 --- a/lang/cs/Org.Apache.REEF.Common/Properties/AssemblyInfo.cs +++ b/lang/cs/Org.Apache.REEF.Common/Properties/AssemblyInfo.cs @@ -54,13 +54,27 @@ using System.Runtime.InteropServices; [assembly: AssemblyVersion("0.14.0.0")] [assembly: AssemblyFileVersion("0.14.0.0")] -// Common and Evaluator share functions that should not be exposed to the user +// Common and Evaluator share APIs that should not be exposed to the user [assembly: InternalsVisibleTo("Org.Apache.REEF.Evaluator, publickey=" + "00240000048000009400000006020000002400005253413100040000010001005df3e621d886a9" + "9c03469d0f93a9f5d45aa2c883f50cd158759e93673f759ec4657fd84cc79d2db38ef1a2d914cc" + "b7c717846a897e11dd22eb260a7ce2da2dccf0263ea63e2b3f7dac24f28882aa568ef544341d17" + "618392a1095f4049ad079d4f4f0b429bb535699155fd6a7652ec7d6c1f1ba2b560f11ef3a86b5945d288cf")] +// Common and Driver share APIs that should not be exposed to the user +[assembly: InternalsVisibleTo("Org.Apache.REEF.Driver, publickey=" + + "00240000048000009400000006020000002400005253413100040000010001005df3e621d886a9" + + "9c03469d0f93a9f5d45aa2c883f50cd158759e93673f759ec4657fd84cc79d2db38ef1a2d914cc" + + "b7c717846a897e11dd22eb260a7ce2da2dccf0263ea63e2b3f7dac24f28882aa568ef544341d17" + + "618392a1095f4049ad079d4f4f0b429bb535699155fd6a7652ec7d6c1f1ba2b560f11ef3a86b5945d288cf")] + +// Common and IO share APIs that should not be exposed to the user +[assembly: InternalsVisibleTo("Org.Apache.REEF.IO, publickey=" + + "00240000048000009400000006020000002400005253413100040000010001005df3e621d886a9" + + "9c03469d0f93a9f5d45aa2c883f50cd158759e93673f759ec4657fd84cc79d2db38ef1a2d914cc" + + "b7c717846a897e11dd22eb260a7ce2da2dccf0263ea63e2b3f7dac24f28882aa568ef544341d17" + + "618392a1095f4049ad079d4f4f0b429bb535699155fd6a7652ec7d6c1f1ba2b560f11ef3a86b5945d288cf")] + // Allow the tests access to `internal` APIs [assembly: InternalsVisibleTo("Org.Apache.REEF.Common.Tests, publickey=" + "00240000048000009400000006020000002400005253413100040000010001005df3e621d886a9" + http://git-wip-us.apache.org/repos/asf/reef/blob/9ed4f4f7/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Utils/EvaluatorConfigurations.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Utils/EvaluatorConfigurations.cs b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Utils/EvaluatorConfigurations.cs index bd8cb78..2183f93 100644 --- a/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Utils/EvaluatorConfigurations.cs +++ b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Utils/EvaluatorConfigurations.cs @@ -32,7 +32,6 @@ using Org.Apache.REEF.Utilities.Logging; namespace Org.Apache.REEF.Common.Runtime.Evaluator.Utils { - [Obsolete("Deprecated in 0.14, please use EvaluatorSettings.")] internal sealed class EvaluatorConfigurations { private static readonly Logger LOGGER = Logger.GetLogger(typeof(EvaluatorConfigurations));
