Repository: reef Updated Branches: refs/heads/master 97029d2e2 -> 246ed1d60
[REEF-1092] Trivial pass through O.A.R.IMRU This makes a couple of types `internal`, adds `sealed` to some more and removes unused imports. No functional change included in here. JIRA: [REEF-1092](https://issues.apache.org/jira/browse/REEF-1092) Pull Request: This closes #826 Project: http://git-wip-us.apache.org/repos/asf/reef/repo Commit: http://git-wip-us.apache.org/repos/asf/reef/commit/246ed1d6 Tree: http://git-wip-us.apache.org/repos/asf/reef/tree/246ed1d6 Diff: http://git-wip-us.apache.org/repos/asf/reef/diff/246ed1d6 Branch: refs/heads/master Commit: 246ed1d60d0cd54415141702c52574d4ce2295bb Parents: 97029d2 Author: Markus Weimer <[email protected]> Authored: Fri Feb 5 10:14:22 2016 -0800 Committer: Dongjoon Hyun <[email protected]> Committed: Fri Feb 5 10:40:33 2016 -0800 ---------------------------------------------------------------------- lang/cs/Org.Apache.REEF.IMRU/API/IMRUJobDefinitionBuilder.cs | 8 ++------ .../API/IMRUPerMapperConfigGeneratorConfiguration.cs | 1 - .../cs/Org.Apache.REEF.IMRU/InProcess/InProcessIMRUClient.cs | 2 +- lang/cs/Org.Apache.REEF.IMRU/InProcess/InputCodecWrapper.cs | 2 +- lang/cs/Org.Apache.REEF.IMRU/InProcess/OutputCodecWrapper.cs | 2 +- .../OnREEF/Client/REEFIMRUClientConfiguration.cs | 1 - .../OnREEF/Driver/ContextAndServiceConfiguration.cs | 2 +- .../OnREEF/Driver/ServiceAndContextConfigurationProvider.cs | 3 +-- lang/cs/Org.Apache.REEF.IMRU/OnREEF/IMRUTasks/MapTaskHost.cs | 2 -- .../Org.Apache.REEF.IMRU/OnREEF/IMRUTasks/UpdateTaskHost.cs | 2 +- .../MapInputWithControlMessage/MapInputWithControlMessage.cs | 2 +- .../MapInputWithControlMessageCodec.cs | 3 +-- .../MapInputwithControlMessagePipelineDataConverter.cs | 2 +- .../OnREEF/ResultHandler/DefaultResultHandler.cs | 2 +- .../OnREEF/ResultHandler/WriteResultHandler.cs | 2 +- 15 files changed, 13 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/reef/blob/246ed1d6/lang/cs/Org.Apache.REEF.IMRU/API/IMRUJobDefinitionBuilder.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.IMRU/API/IMRUJobDefinitionBuilder.cs b/lang/cs/Org.Apache.REEF.IMRU/API/IMRUJobDefinitionBuilder.cs index 2f27622..f078c4a 100644 --- a/lang/cs/Org.Apache.REEF.IMRU/API/IMRUJobDefinitionBuilder.cs +++ b/lang/cs/Org.Apache.REEF.IMRU/API/IMRUJobDefinitionBuilder.cs @@ -17,12 +17,8 @@ using System; using System.Collections.Generic; -using Org.Apache.REEF.IMRU.OnREEF.Parameters; -using Org.Apache.REEF.Network.Group.Driver.Impl; -using Org.Apache.REEF.Tang.Formats; -using Org.Apache.REEF.Tang.Interface; using Org.Apache.REEF.Tang.Implementations.Tang; -using Org.Apache.REEF.Tang.Util; +using Org.Apache.REEF.Tang.Interface; using Org.Apache.REEF.Utilities.Diagnostics; using Org.Apache.REEF.Utilities.Logging; @@ -185,7 +181,7 @@ namespace Org.Apache.REEF.IMRU.API /// TODO: This is duplicate in a sense that it can be determined /// TODO: automatically from IPartitionedDataset. However, right now /// TODO: GroupComm. instantiated in IMRUDriver needs this parameter - /// TODO: in constructor. This will be removed once we remove it from GroupComm. + /// TODO: in constructor. This will be removed once we remove it from GroupComm. public IMRUJobDefinitionBuilder SetNumberOfMappers(int numberOfMappers) { _numberOfMappers = numberOfMappers; http://git-wip-us.apache.org/repos/asf/reef/blob/246ed1d6/lang/cs/Org.Apache.REEF.IMRU/API/IMRUPerMapperConfigGeneratorConfiguration.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.IMRU/API/IMRUPerMapperConfigGeneratorConfiguration.cs b/lang/cs/Org.Apache.REEF.IMRU/API/IMRUPerMapperConfigGeneratorConfiguration.cs index 378b294..2c50d61 100644 --- a/lang/cs/Org.Apache.REEF.IMRU/API/IMRUPerMapperConfigGeneratorConfiguration.cs +++ b/lang/cs/Org.Apache.REEF.IMRU/API/IMRUPerMapperConfigGeneratorConfiguration.cs @@ -15,7 +15,6 @@ // specific language governing permissions and limitations // under the License. -using Org.Apache.REEF.IMRU.OnREEF.Parameters; using Org.Apache.REEF.Tang.Formats; using Org.Apache.REEF.Tang.Util; http://git-wip-us.apache.org/repos/asf/reef/blob/246ed1d6/lang/cs/Org.Apache.REEF.IMRU/InProcess/InProcessIMRUClient.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.IMRU/InProcess/InProcessIMRUClient.cs b/lang/cs/Org.Apache.REEF.IMRU/InProcess/InProcessIMRUClient.cs index 9efb8c2..d79e4c4 100644 --- a/lang/cs/Org.Apache.REEF.IMRU/InProcess/InProcessIMRUClient.cs +++ b/lang/cs/Org.Apache.REEF.IMRU/InProcess/InProcessIMRUClient.cs @@ -40,7 +40,7 @@ namespace Org.Apache.REEF.IMRU.InProcess /// <remarks> /// This client assumes that all given Configurations can be merged in a conflict-free way. /// </remarks> - public class InProcessIMRUClient : IIMRUClient + public sealed class InProcessIMRUClient : IIMRUClient { private static readonly Logger Logger = Logger.GetLogger(typeof(InProcessIMRUClient)); http://git-wip-us.apache.org/repos/asf/reef/blob/246ed1d6/lang/cs/Org.Apache.REEF.IMRU/InProcess/InputCodecWrapper.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.IMRU/InProcess/InputCodecWrapper.cs b/lang/cs/Org.Apache.REEF.IMRU/InProcess/InputCodecWrapper.cs index ce80f89..895c283 100644 --- a/lang/cs/Org.Apache.REEF.IMRU/InProcess/InputCodecWrapper.cs +++ b/lang/cs/Org.Apache.REEF.IMRU/InProcess/InputCodecWrapper.cs @@ -20,7 +20,7 @@ using Org.Apache.REEF.Wake.StreamingCodec; namespace Org.Apache.REEF.IMRU.InProcess { - internal class InputCodecWrapper<T> + internal sealed class InputCodecWrapper<T> { [Inject] private InputCodecWrapper(IStreamingCodec<T> codec) http://git-wip-us.apache.org/repos/asf/reef/blob/246ed1d6/lang/cs/Org.Apache.REEF.IMRU/InProcess/OutputCodecWrapper.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.IMRU/InProcess/OutputCodecWrapper.cs b/lang/cs/Org.Apache.REEF.IMRU/InProcess/OutputCodecWrapper.cs index bf49952..86a1555 100644 --- a/lang/cs/Org.Apache.REEF.IMRU/InProcess/OutputCodecWrapper.cs +++ b/lang/cs/Org.Apache.REEF.IMRU/InProcess/OutputCodecWrapper.cs @@ -20,7 +20,7 @@ using Org.Apache.REEF.Wake.StreamingCodec; namespace Org.Apache.REEF.IMRU.InProcess { - internal class OutputCodecWrapper<T> + internal sealed class OutputCodecWrapper<T> { [Inject] private OutputCodecWrapper(IStreamingCodec<T> codec) http://git-wip-us.apache.org/repos/asf/reef/blob/246ed1d6/lang/cs/Org.Apache.REEF.IMRU/OnREEF/Client/REEFIMRUClientConfiguration.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.IMRU/OnREEF/Client/REEFIMRUClientConfiguration.cs b/lang/cs/Org.Apache.REEF.IMRU/OnREEF/Client/REEFIMRUClientConfiguration.cs index 5373d6f..4a14798 100644 --- a/lang/cs/Org.Apache.REEF.IMRU/OnREEF/Client/REEFIMRUClientConfiguration.cs +++ b/lang/cs/Org.Apache.REEF.IMRU/OnREEF/Client/REEFIMRUClientConfiguration.cs @@ -15,7 +15,6 @@ // specific language governing permissions and limitations // under the License. -using Org.Apache.REEF.Client.API; using Org.Apache.REEF.IMRU.API; using Org.Apache.REEF.Tang.Formats; using Org.Apache.REEF.Tang.Util; http://git-wip-us.apache.org/repos/asf/reef/blob/246ed1d6/lang/cs/Org.Apache.REEF.IMRU/OnREEF/Driver/ContextAndServiceConfiguration.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.IMRU/OnREEF/Driver/ContextAndServiceConfiguration.cs b/lang/cs/Org.Apache.REEF.IMRU/OnREEF/Driver/ContextAndServiceConfiguration.cs index 5e0f7fd..70c6194 100644 --- a/lang/cs/Org.Apache.REEF.IMRU/OnREEF/Driver/ContextAndServiceConfiguration.cs +++ b/lang/cs/Org.Apache.REEF.IMRU/OnREEF/Driver/ContextAndServiceConfiguration.cs @@ -19,7 +19,7 @@ using Org.Apache.REEF.Tang.Interface; namespace Org.Apache.REEF.IMRU.OnREEF.Driver { - internal class ContextAndServiceConfiguration + internal sealed class ContextAndServiceConfiguration { /// <summary> /// The context configuration http://git-wip-us.apache.org/repos/asf/reef/blob/246ed1d6/lang/cs/Org.Apache.REEF.IMRU/OnREEF/Driver/ServiceAndContextConfigurationProvider.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.IMRU/OnREEF/Driver/ServiceAndContextConfigurationProvider.cs b/lang/cs/Org.Apache.REEF.IMRU/OnREEF/Driver/ServiceAndContextConfigurationProvider.cs index f06b459..0cfeec3 100644 --- a/lang/cs/Org.Apache.REEF.IMRU/OnREEF/Driver/ServiceAndContextConfigurationProvider.cs +++ b/lang/cs/Org.Apache.REEF.IMRU/OnREEF/Driver/ServiceAndContextConfigurationProvider.cs @@ -24,7 +24,6 @@ using Org.Apache.REEF.Network.Group.Config; using Org.Apache.REEF.Network.Group.Driver; using Org.Apache.REEF.Tang.Implementations.Configuration; using Org.Apache.REEF.Tang.Implementations.Tang; -using Org.Apache.REEF.Tang.Interface; using Org.Apache.REEF.Tang.Util; using Org.Apache.REEF.Utilities.Diagnostics; using Org.Apache.REEF.Utilities.Logging; @@ -37,7 +36,7 @@ namespace Org.Apache.REEF.IMRU.OnREEF.Driver /// </summary> /// <typeparam name="TMapInput"></typeparam> /// <typeparam name="TMapOutput"></typeparam> - internal class ServiceAndContextConfigurationProvider<TMapInput, TMapOutput> + internal sealed class ServiceAndContextConfigurationProvider<TMapInput, TMapOutput> { private static readonly Logger Logger = Logger.GetLogger(typeof(ServiceAndContextConfigurationProvider<TMapInput, TMapOutput>)); http://git-wip-us.apache.org/repos/asf/reef/blob/246ed1d6/lang/cs/Org.Apache.REEF.IMRU/OnREEF/IMRUTasks/MapTaskHost.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.IMRU/OnREEF/IMRUTasks/MapTaskHost.cs b/lang/cs/Org.Apache.REEF.IMRU/OnREEF/IMRUTasks/MapTaskHost.cs index 35c1050..c4a101d 100644 --- a/lang/cs/Org.Apache.REEF.IMRU/OnREEF/IMRUTasks/MapTaskHost.cs +++ b/lang/cs/Org.Apache.REEF.IMRU/OnREEF/IMRUTasks/MapTaskHost.cs @@ -16,8 +16,6 @@ // under the License. using System; -using System.Diagnostics; -using System.Runtime; using Org.Apache.REEF.Common.Tasks; using Org.Apache.REEF.IMRU.API; using Org.Apache.REEF.IMRU.OnREEF.Driver; http://git-wip-us.apache.org/repos/asf/reef/blob/246ed1d6/lang/cs/Org.Apache.REEF.IMRU/OnREEF/IMRUTasks/UpdateTaskHost.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.IMRU/OnREEF/IMRUTasks/UpdateTaskHost.cs b/lang/cs/Org.Apache.REEF.IMRU/OnREEF/IMRUTasks/UpdateTaskHost.cs index 7eddd26..f03a8e1 100644 --- a/lang/cs/Org.Apache.REEF.IMRU/OnREEF/IMRUTasks/UpdateTaskHost.cs +++ b/lang/cs/Org.Apache.REEF.IMRU/OnREEF/IMRUTasks/UpdateTaskHost.cs @@ -34,7 +34,7 @@ namespace Org.Apache.REEF.IMRU.OnREEF.IMRUTasks /// <typeparam name="TMapInput">Map input</typeparam> /// <typeparam name="TMapOutput">Map output</typeparam> /// <typeparam name="TResult">Final result</typeparam> - public sealed class UpdateTaskHost<TMapInput, TMapOutput, TResult> : ITask + internal sealed class UpdateTaskHost<TMapInput, TMapOutput, TResult> : ITask { private static readonly Logger Logger = Logger.GetLogger(typeof(UpdateTaskHost<TMapInput, TMapOutput, TResult>)); http://git-wip-us.apache.org/repos/asf/reef/blob/246ed1d6/lang/cs/Org.Apache.REEF.IMRU/OnREEF/MapInputWithControlMessage/MapInputWithControlMessage.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.IMRU/OnREEF/MapInputWithControlMessage/MapInputWithControlMessage.cs b/lang/cs/Org.Apache.REEF.IMRU/OnREEF/MapInputWithControlMessage/MapInputWithControlMessage.cs index dd43612..4e3eb15 100644 --- a/lang/cs/Org.Apache.REEF.IMRU/OnREEF/MapInputWithControlMessage/MapInputWithControlMessage.cs +++ b/lang/cs/Org.Apache.REEF.IMRU/OnREEF/MapInputWithControlMessage/MapInputWithControlMessage.cs @@ -25,7 +25,7 @@ namespace Org.Apache.REEF.IMRU.OnREEF.MapInputWithControlMessage /// message from UpdateTask /// </summary> /// <typeparam name="TMapInput"></typeparam> - internal class MapInputWithControlMessage<TMapInput> : IDisposable + internal sealed class MapInputWithControlMessage<TMapInput> : IDisposable { /// <summary> /// Internal constructor http://git-wip-us.apache.org/repos/asf/reef/blob/246ed1d6/lang/cs/Org.Apache.REEF.IMRU/OnREEF/MapInputWithControlMessage/MapInputWithControlMessageCodec.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.IMRU/OnREEF/MapInputWithControlMessage/MapInputWithControlMessageCodec.cs b/lang/cs/Org.Apache.REEF.IMRU/OnREEF/MapInputWithControlMessage/MapInputWithControlMessageCodec.cs index 3a6f384..b02925a 100644 --- a/lang/cs/Org.Apache.REEF.IMRU/OnREEF/MapInputWithControlMessage/MapInputWithControlMessageCodec.cs +++ b/lang/cs/Org.Apache.REEF.IMRU/OnREEF/MapInputWithControlMessage/MapInputWithControlMessageCodec.cs @@ -18,7 +18,6 @@ using System; using System.Threading; using System.Threading.Tasks; -using Org.Apache.REEF.Network.Group.Driver.Impl; using Org.Apache.REEF.Tang.Annotations; using Org.Apache.REEF.Utilities.Diagnostics; using Org.Apache.REEF.Utilities.Logging; @@ -31,7 +30,7 @@ namespace Org.Apache.REEF.IMRU.OnREEF.MapInputWithControlMessage /// Streaming codec for MapInputWithControlMessage /// </summary> /// <typeparam name="TMapInput"></typeparam> - internal class MapInputWithControlMessageCodec<TMapInput> : IStreamingCodec<MapInputWithControlMessage<TMapInput>> + internal sealed class MapInputWithControlMessageCodec<TMapInput> : IStreamingCodec<MapInputWithControlMessage<TMapInput>> { private static Logger Logger = Logger.GetLogger(typeof(MapInputWithControlMessage<>)); private readonly IStreamingCodec<TMapInput> _baseCodec; http://git-wip-us.apache.org/repos/asf/reef/blob/246ed1d6/lang/cs/Org.Apache.REEF.IMRU/OnREEF/MapInputWithControlMessage/MapInputwithControlMessagePipelineDataConverter.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.IMRU/OnREEF/MapInputWithControlMessage/MapInputwithControlMessagePipelineDataConverter.cs b/lang/cs/Org.Apache.REEF.IMRU/OnREEF/MapInputWithControlMessage/MapInputwithControlMessagePipelineDataConverter.cs index a8a1c47..03c1ad5 100644 --- a/lang/cs/Org.Apache.REEF.IMRU/OnREEF/MapInputWithControlMessage/MapInputwithControlMessagePipelineDataConverter.cs +++ b/lang/cs/Org.Apache.REEF.IMRU/OnREEF/MapInputWithControlMessage/MapInputwithControlMessagePipelineDataConverter.cs @@ -26,7 +26,7 @@ namespace Org.Apache.REEF.IMRU.OnREEF.MapInputWithControlMessage /// Pipeline Data Converter for MapInputwithControlMessage to chunk and dechunk the message for communication /// </summary> /// <typeparam name="TMapInput"></typeparam> - internal class MapInputwithControlMessagePipelineDataConverter<TMapInput> : + internal sealed class MapInputwithControlMessagePipelineDataConverter<TMapInput> : IPipelineDataConverter<MapInputWithControlMessage<TMapInput>> { private readonly IPipelineDataConverter<TMapInput> _basePipelineDataConverter; http://git-wip-us.apache.org/repos/asf/reef/blob/246ed1d6/lang/cs/Org.Apache.REEF.IMRU/OnREEF/ResultHandler/DefaultResultHandler.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.IMRU/OnREEF/ResultHandler/DefaultResultHandler.cs b/lang/cs/Org.Apache.REEF.IMRU/OnREEF/ResultHandler/DefaultResultHandler.cs index d885424..b05c139 100644 --- a/lang/cs/Org.Apache.REEF.IMRU/OnREEF/ResultHandler/DefaultResultHandler.cs +++ b/lang/cs/Org.Apache.REEF.IMRU/OnREEF/ResultHandler/DefaultResultHandler.cs @@ -23,7 +23,7 @@ using Org.Apache.REEF.Utilities.Attributes; namespace Org.Apache.REEF.IMRU.OnREEF.ResultHandler { [Unstable("0.14", "This API will change after introducing proper API for output in REEF.IO")] - internal class DefaultResultHandler<TResult> : IIMRUResultHandler<TResult> + internal sealed class DefaultResultHandler<TResult> : IIMRUResultHandler<TResult> { [Inject] private DefaultResultHandler() http://git-wip-us.apache.org/repos/asf/reef/blob/246ed1d6/lang/cs/Org.Apache.REEF.IMRU/OnREEF/ResultHandler/WriteResultHandler.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.IMRU/OnREEF/ResultHandler/WriteResultHandler.cs b/lang/cs/Org.Apache.REEF.IMRU/OnREEF/ResultHandler/WriteResultHandler.cs index 7de3225..3a10e89 100644 --- a/lang/cs/Org.Apache.REEF.IMRU/OnREEF/ResultHandler/WriteResultHandler.cs +++ b/lang/cs/Org.Apache.REEF.IMRU/OnREEF/ResultHandler/WriteResultHandler.cs @@ -33,7 +33,7 @@ namespace Org.Apache.REEF.IMRU.OnREEF.ResultHandler /// </summary> /// <typeparam name="TResult"></typeparam> [Unstable("0.14", "This API will change after introducing proper API for output in REEF.IO")] - public class WriteResultHandler<TResult> : IIMRUResultHandler<TResult> + public sealed class WriteResultHandler<TResult> : IIMRUResultHandler<TResult> { private static readonly Logger Logger = Logger.GetLogger(typeof(WriteResultHandler<>));
