Repository: reef Updated Branches: refs/heads/master 9bf549458 -> e5a11f3bd
[REEF-1050] Make Evaluator and Common friend assemblies and make classes internal sealed JIRA: [REEF-1050](https://issues.apache.org/jira/browse/REEF-1050) This closes #714 Project: http://git-wip-us.apache.org/repos/asf/reef/repo Commit: http://git-wip-us.apache.org/repos/asf/reef/commit/e5a11f3b Tree: http://git-wip-us.apache.org/repos/asf/reef/tree/e5a11f3b Diff: http://git-wip-us.apache.org/repos/asf/reef/diff/e5a11f3b Branch: refs/heads/master Commit: e5a11f3bdbde6b7d4892b7f5b8cc81f78d61fcb4 Parents: 9bf5494 Author: Andrew Chung <[email protected]> Authored: Mon Dec 7 17:52:44 2015 -0800 Committer: Julia Wang <[email protected]> Committed: Fri Dec 11 17:05:50 2015 -0800 ---------------------------------------------------------------------- .../Org.Apache.REEF.Common.csproj | 21 ++++++++-------- .../Properties/AssemblyInfo.cs | 12 ++++++++++ .../Runtime/Evaluator/Constants.cs | 2 +- .../Context/ContextClientCodeException.cs | 2 +- .../Evaluator/Context/ContextConfiguration.cs | 2 +- .../Evaluator/Context/ContextLifeCycle.cs | 2 +- .../Runtime/Evaluator/Context/ContextManager.cs | 2 +- .../Evaluator/Context/ContextStartImpl.cs | 2 +- .../Evaluator/Context/ContextStopImpl.cs | 2 +- .../Evaluator/Context/RootContextLauncher.cs | 2 +- .../Runtime/Evaluator/EvaluatorRuntime.cs | 2 +- .../Runtime/Evaluator/EvaluatorSettings.cs | 2 +- .../Runtime/Evaluator/HeartBeatManager.cs | 2 +- .../Evaluator/ReefMessageProtoObserver.cs | 2 +- .../Runtime/Evaluator/Task/CloseEventImpl.cs | 2 +- .../Runtime/Evaluator/Task/DriverMessageImpl.cs | 2 +- .../Runtime/Evaluator/Task/SuspendEventImpl.cs | 2 +- .../Evaluator/Task/TaskClientCodeException.cs | 2 +- .../Runtime/Evaluator/Task/TaskLifeCycle.cs | 2 +- .../Runtime/Evaluator/Task/TaskStartImpl.cs | 2 +- .../Runtime/Evaluator/Task/TaskState.cs | 2 +- .../Runtime/Evaluator/Task/TaskStatus.cs | 2 +- .../Runtime/Evaluator/Task/TaskStopImpl.cs | 2 +- .../Evaluator/Utils/EvaluatorConfigurations.cs | 2 +- .../Evaluator/Utils/NamedparameterAlias.cs | 18 +++++++------- .../Runtime/Evaluator/Utils/RemoteManager.cs | 25 -------------------- .../Properties/AssemblyInfo.cs | 5 ++++ 27 files changed, 57 insertions(+), 68 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/reef/blob/e5a11f3b/lang/cs/Org.Apache.REEF.Common/Org.Apache.REEF.Common.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Common/Org.Apache.REEF.Common.csproj b/lang/cs/Org.Apache.REEF.Common/Org.Apache.REEF.Common.csproj index 7f63053..e911aa0 100644 --- a/lang/cs/Org.Apache.REEF.Common/Org.Apache.REEF.Common.csproj +++ b/lang/cs/Org.Apache.REEF.Common/Org.Apache.REEF.Common.csproj @@ -56,18 +56,18 @@ under the License. <Compile Include="Api\IFailure.cs" /> <Compile Include="Attributes\UnstableAttribute.cs" /> <Compile Include="Avro\AvroDriverInfo.cs"> - <ExcludeFromStyleCop>true</ExcludeFromStyleCop> + <ExcludeFromStyleCop>true</ExcludeFromStyleCop> </Compile> <Compile Include="Avro\AvroHttpRequest.cs"> - <ExcludeFromStyleCop>true</ExcludeFromStyleCop> + <ExcludeFromStyleCop>true</ExcludeFromStyleCop> </Compile> <Compile Include="Avro\AvroHttpSerializer.cs" /> <Compile Include="Avro\AvroJsonSerializer.cs" /> <Compile Include="Avro\AvroReefServiceInfo.cs"> - <ExcludeFromStyleCop>true</ExcludeFromStyleCop> + <ExcludeFromStyleCop>true</ExcludeFromStyleCop> </Compile> <Compile Include="Avro\HeaderEntry.cs"> - <ExcludeFromStyleCop>true</ExcludeFromStyleCop> + <ExcludeFromStyleCop>true</ExcludeFromStyleCop> </Compile> <Compile Include="Catalog\Capabilities\CPU.cs" /> <Compile Include="Catalog\Capabilities\ICapability.cs" /> @@ -107,21 +107,21 @@ under the License. <Compile Include="Client\Parameters\DriverConfigurationProviders.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Protobuf\ReefProtocol\ClientRuntime.pb.cs"> - <ExcludeFromStyleCop>true</ExcludeFromStyleCop> + <ExcludeFromStyleCop>true</ExcludeFromStyleCop> </Compile> <Compile Include="Protobuf\ReefProtocol\DriverRuntime.pb.cs"> - <ExcludeFromStyleCop>true</ExcludeFromStyleCop> + <ExcludeFromStyleCop>true</ExcludeFromStyleCop> </Compile> <Compile Include="Protobuf\ReefProtocol\EvaluatorHeartbeatProtoCodec.cs" /> <Compile Include="Protobuf\ReefProtocol\EvaluatorRunTime.pb.cs"> - <ExcludeFromStyleCop>true</ExcludeFromStyleCop> + <ExcludeFromStyleCop>true</ExcludeFromStyleCop> </Compile> <Compile Include="Protobuf\ReefProtocol\REEFMessageCodec.cs" /> <Compile Include="Protobuf\ReefProtocol\ReefProtocol.pb.cs"> - <ExcludeFromStyleCop>true</ExcludeFromStyleCop> + <ExcludeFromStyleCop>true</ExcludeFromStyleCop> </Compile> <Compile Include="Protobuf\ReefProtocol\ReefService.pb.cs"> - <ExcludeFromStyleCop>true</ExcludeFromStyleCop> + <ExcludeFromStyleCop>true</ExcludeFromStyleCop> </Compile> <Compile Include="Protobuf\ReefProtocol\Serializer.cs" /> <Compile Include="Files\REEFFileNames.cs" /> @@ -150,7 +150,6 @@ under the License. <Compile Include="Runtime\Evaluator\Task\TaskStopImpl.cs" /> <Compile Include="Runtime\Evaluator\Utils\EvaluatorConfigurations.cs" /> <Compile Include="Runtime\Evaluator\Utils\NamedparameterAlias.cs" /> - <Compile Include="Runtime\Evaluator\Utils\RemoteManager.cs" /> <Compile Include="runtime\MachineStatus.cs" /> <Compile Include="Services\IService.cs" /> <Compile Include="Services\ServiceConfiguration.cs" /> @@ -206,4 +205,4 @@ under the License. <Target Name="AfterBuild"> </Target> --> -</Project> +</Project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/reef/blob/e5a11f3b/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 ab15847..0a12df2 100644 --- a/lang/cs/Org.Apache.REEF.Common/Properties/AssemblyInfo.cs +++ b/lang/cs/Org.Apache.REEF.Common/Properties/AssemblyInfo.cs @@ -54,9 +54,21 @@ 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 +[assembly: InternalsVisibleTo("Org.Apache.REEF.Evaluator, publickey=" + + "00240000048000009400000006020000002400005253413100040000010001005df3e621d886a9" + + "9c03469d0f93a9f5d45aa2c883f50cd158759e93673f759ec4657fd84cc79d2db38ef1a2d914cc" + + "b7c717846a897e11dd22eb260a7ce2da2dccf0263ea63e2b3f7dac24f28882aa568ef544341d17" + + "618392a1095f4049ad079d4f4f0b429bb535699155fd6a7652ec7d6c1f1ba2b560f11ef3a86b5945d288cf")] + // Allow the tests access to `internal` APIs [assembly: InternalsVisibleTo("Org.Apache.REEF.Common.Tests, publickey=" + "00240000048000009400000006020000002400005253413100040000010001005df3e621d886a9" + "9c03469d0f93a9f5d45aa2c883f50cd158759e93673f759ec4657fd84cc79d2db38ef1a2d914cc" + "b7c717846a897e11dd22eb260a7ce2da2dccf0263ea63e2b3f7dac24f28882aa568ef544341d17" + + "618392a1095f4049ad079d4f4f0b429bb535699155fd6a7652ec7d6c1f1ba2b560f11ef3a86b5945d288cf")] +[assembly: InternalsVisibleTo("Org.Apache.REEF.Evaluator.Tests, publickey=" + + "00240000048000009400000006020000002400005253413100040000010001005df3e621d886a9" + + "9c03469d0f93a9f5d45aa2c883f50cd158759e93673f759ec4657fd84cc79d2db38ef1a2d914cc" + + "b7c717846a897e11dd22eb260a7ce2da2dccf0263ea63e2b3f7dac24f28882aa568ef544341d17" + "618392a1095f4049ad079d4f4f0b429bb535699155fd6a7652ec7d6c1f1ba2b560f11ef3a86b5945d288cf")] \ No newline at end of file http://git-wip-us.apache.org/repos/asf/reef/blob/e5a11f3b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Constants.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Constants.cs b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Constants.cs index 1583367..d1b8884 100644 --- a/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Constants.cs +++ b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Constants.cs @@ -19,7 +19,7 @@ namespace Org.Apache.REEF.Common.Runtime.Evaluator { - public class Constants + internal static class Constants { public const string RootContextConfiguration = "RootContextConfiguration"; http://git-wip-us.apache.org/repos/asf/reef/blob/e5a11f3b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Context/ContextClientCodeException.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Context/ContextClientCodeException.cs b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Context/ContextClientCodeException.cs index 16375a1..45753b2 100644 --- a/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Context/ContextClientCodeException.cs +++ b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Context/ContextClientCodeException.cs @@ -23,7 +23,7 @@ using Org.Apache.REEF.Utilities; namespace Org.Apache.REEF.Common.Runtime.Evaluator.Context { - public class ContextClientCodeException : Exception + internal sealed class ContextClientCodeException : Exception { private readonly string _contextId; private readonly Optional<string> _parentId; http://git-wip-us.apache.org/repos/asf/reef/blob/e5a11f3b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Context/ContextConfiguration.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Context/ContextConfiguration.cs b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Context/ContextConfiguration.cs index 20c4d44..b1ab115 100644 --- a/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Context/ContextConfiguration.cs +++ b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Context/ContextConfiguration.cs @@ -28,7 +28,7 @@ using Org.Apache.REEF.Utilities.Logging; namespace Org.Apache.REEF.Common.Runtime.Evaluator.Context { - public class ContextConfiguration : IConfiguration + internal sealed class ContextConfiguration : IConfiguration { private static readonly Logger LOGGER = Logger.GetLogger(typeof(ContextConfiguration)); http://git-wip-us.apache.org/repos/asf/reef/blob/e5a11f3b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Context/ContextLifeCycle.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Context/ContextLifeCycle.cs b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Context/ContextLifeCycle.cs index 210f452..d6156cc 100644 --- a/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Context/ContextLifeCycle.cs +++ b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Context/ContextLifeCycle.cs @@ -27,7 +27,7 @@ namespace Org.Apache.REEF.Common.Runtime.Evaluator.Context /// <summary> /// This class is used to trigger all the context life-cycle dependent events. /// </summary> - class ContextLifeCycle + internal sealed class ContextLifeCycle { private HashSet<IObserver<IContextStart>> _contextStartHandlers; http://git-wip-us.apache.org/repos/asf/reef/blob/e5a11f3b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Context/ContextManager.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Context/ContextManager.cs b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Context/ContextManager.cs index 13f1235..f227c90 100644 --- a/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Context/ContextManager.cs +++ b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Context/ContextManager.cs @@ -31,7 +31,7 @@ using Org.Apache.REEF.Utilities.Logging; namespace Org.Apache.REEF.Common.Runtime.Evaluator.Context { - public sealed class ContextManager : IDisposable + internal sealed class ContextManager : IDisposable { private static readonly Logger LOGGER = Logger.GetLogger(typeof(ContextManager)); private readonly HeartBeatManager _heartBeatManager; http://git-wip-us.apache.org/repos/asf/reef/blob/e5a11f3b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Context/ContextStartImpl.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Context/ContextStartImpl.cs b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Context/ContextStartImpl.cs index be23398..b8dec6e 100644 --- a/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Context/ContextStartImpl.cs +++ b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Context/ContextStartImpl.cs @@ -21,7 +21,7 @@ using Org.Apache.REEF.Common.Events; namespace Org.Apache.REEF.Common.Runtime.Evaluator.Context { - class ContextStartImpl : IContextStart + internal sealed class ContextStartImpl : IContextStart { public ContextStartImpl(string id) { http://git-wip-us.apache.org/repos/asf/reef/blob/e5a11f3b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Context/ContextStopImpl.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Context/ContextStopImpl.cs b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Context/ContextStopImpl.cs index 95634d2..b430ef3 100644 --- a/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Context/ContextStopImpl.cs +++ b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Context/ContextStopImpl.cs @@ -21,7 +21,7 @@ using Org.Apache.REEF.Common.Events; namespace Org.Apache.REEF.Common.Runtime.Evaluator.Context { - class ContextStopImpl : IContextStop + internal sealed class ContextStopImpl : IContextStop { public ContextStopImpl(string id) { http://git-wip-us.apache.org/repos/asf/reef/blob/e5a11f3b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Context/RootContextLauncher.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Context/RootContextLauncher.cs b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Context/RootContextLauncher.cs index 8fd52eb..13cb0bb 100644 --- a/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Context/RootContextLauncher.cs +++ b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Context/RootContextLauncher.cs @@ -31,7 +31,7 @@ namespace Org.Apache.REEF.Common.Runtime.Evaluator.Context /// <summary> /// Helper class that encapsulates the root context configuration: With or without services and an initial task. /// </summary> - public sealed class RootContextLauncher + internal sealed class RootContextLauncher { private static readonly Logger LOGGER = Logger.GetLogger(typeof(RootContextLauncher)); http://git-wip-us.apache.org/repos/asf/reef/blob/e5a11f3b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/EvaluatorRuntime.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/EvaluatorRuntime.cs b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/EvaluatorRuntime.cs index a076e5d..be0acea 100644 --- a/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/EvaluatorRuntime.cs +++ b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/EvaluatorRuntime.cs @@ -29,7 +29,7 @@ using Org.Apache.REEF.Wake.Time.Runtime.Event; namespace Org.Apache.REEF.Common.Runtime.Evaluator { - public sealed class EvaluatorRuntime : IObserver<RuntimeStart>, IObserver<RuntimeStop>, IObserver<REEFMessage> + internal sealed class EvaluatorRuntime : IObserver<RuntimeStart>, IObserver<RuntimeStop>, IObserver<REEFMessage> { private static readonly Logger Logger = Logger.GetLogger(typeof(EvaluatorRuntime)); http://git-wip-us.apache.org/repos/asf/reef/blob/e5a11f3b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/EvaluatorSettings.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/EvaluatorSettings.cs b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/EvaluatorSettings.cs index afc520f..73991d6 100644 --- a/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/EvaluatorSettings.cs +++ b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/EvaluatorSettings.cs @@ -29,7 +29,7 @@ using Org.Apache.REEF.Wake.Time; namespace Org.Apache.REEF.Common.Runtime.Evaluator { // TODO: merge with EvaluatorConfigurations class - public class EvaluatorSettings + internal sealed class EvaluatorSettings { private readonly string _applicationId; http://git-wip-us.apache.org/repos/asf/reef/blob/e5a11f3b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/HeartBeatManager.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/HeartBeatManager.cs b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/HeartBeatManager.cs index 355877f..7822d7d 100644 --- a/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/HeartBeatManager.cs +++ b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/HeartBeatManager.cs @@ -37,7 +37,7 @@ using Org.Apache.REEF.Wake.Time.Event; namespace Org.Apache.REEF.Common.Runtime.Evaluator { - public class HeartBeatManager : IObserver<Alarm> + internal sealed class HeartBeatManager : IObserver<Alarm> { private static readonly Logger LOGGER = Logger.GetLogger(typeof(HeartBeatManager)); http://git-wip-us.apache.org/repos/asf/reef/blob/e5a11f3b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/ReefMessageProtoObserver.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/ReefMessageProtoObserver.cs b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/ReefMessageProtoObserver.cs index 66e925c..b29ea98 100644 --- a/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/ReefMessageProtoObserver.cs +++ b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/ReefMessageProtoObserver.cs @@ -27,7 +27,7 @@ using Org.Apache.REEF.Wake.Remote; namespace Org.Apache.REEF.Common.Runtime.Evaluator { - public class ReefMessageProtoObserver : + internal sealed class ReefMessageProtoObserver : IObserver<IRemoteMessage<REEFMessage>>, IObservable<IRemoteMessage<REEFMessage>>, IDisposable http://git-wip-us.apache.org/repos/asf/reef/blob/e5a11f3b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Task/CloseEventImpl.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Task/CloseEventImpl.cs b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Task/CloseEventImpl.cs index 39bda77..727b8e0 100644 --- a/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Task/CloseEventImpl.cs +++ b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Task/CloseEventImpl.cs @@ -22,7 +22,7 @@ using Org.Apache.REEF.Utilities; namespace Org.Apache.REEF.Common.Runtime.Evaluator.Task { - public class CloseEventImpl : ICloseEvent + internal sealed class CloseEventImpl : ICloseEvent { public CloseEventImpl() { http://git-wip-us.apache.org/repos/asf/reef/blob/e5a11f3b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Task/DriverMessageImpl.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Task/DriverMessageImpl.cs b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Task/DriverMessageImpl.cs index a2377de..1624f99 100644 --- a/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Task/DriverMessageImpl.cs +++ b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Task/DriverMessageImpl.cs @@ -22,7 +22,7 @@ using Org.Apache.REEF.Utilities; namespace Org.Apache.REEF.Common.Runtime.Evaluator.Task { - public class DriverMessageImpl : IDriverMessage + internal sealed class DriverMessageImpl : IDriverMessage { private readonly Optional<byte[]> _value; http://git-wip-us.apache.org/repos/asf/reef/blob/e5a11f3b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Task/SuspendEventImpl.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Task/SuspendEventImpl.cs b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Task/SuspendEventImpl.cs index 0a19106..40977ec 100644 --- a/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Task/SuspendEventImpl.cs +++ b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Task/SuspendEventImpl.cs @@ -22,7 +22,7 @@ using Org.Apache.REEF.Utilities; namespace Org.Apache.REEF.Common.Runtime.Evaluator.Task { - public class SuspendEventImpl : ICloseEvent + internal sealed class SuspendEventImpl : ICloseEvent { public SuspendEventImpl() { http://git-wip-us.apache.org/repos/asf/reef/blob/e5a11f3b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Task/TaskClientCodeException.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Task/TaskClientCodeException.cs b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Task/TaskClientCodeException.cs index da83300..b37375f 100644 --- a/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Task/TaskClientCodeException.cs +++ b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Task/TaskClientCodeException.cs @@ -22,7 +22,7 @@ using Org.Apache.REEF.Tang.Interface; namespace Org.Apache.REEF.Common.Runtime.Evaluator.Task { - public class TaskClientCodeException : Exception + internal sealed class TaskClientCodeException : Exception { private readonly string _taskId; http://git-wip-us.apache.org/repos/asf/reef/blob/e5a11f3b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Task/TaskLifeCycle.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Task/TaskLifeCycle.cs b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Task/TaskLifeCycle.cs index 74fc320..6363400 100644 --- a/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Task/TaskLifeCycle.cs +++ b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Task/TaskLifeCycle.cs @@ -23,7 +23,7 @@ using Org.Apache.REEF.Common.Tasks.Events; namespace Org.Apache.REEF.Common.Runtime.Evaluator.Task { - public class TaskLifeCycle + internal sealed class TaskLifeCycle { private readonly HashSet<IObserver<ITaskStop>> _taskStopHandlers; private readonly HashSet<IObserver<ITaskStart>> _taskStartHandlers; http://git-wip-us.apache.org/repos/asf/reef/blob/e5a11f3b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Task/TaskStartImpl.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Task/TaskStartImpl.cs b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Task/TaskStartImpl.cs index ea1c4e3..bfd1c3f 100644 --- a/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Task/TaskStartImpl.cs +++ b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Task/TaskStartImpl.cs @@ -21,7 +21,7 @@ using Org.Apache.REEF.Common.Tasks.Events; namespace Org.Apache.REEF.Common.Runtime.Evaluator.Task { - public class TaskStartImpl : ITaskStart + internal sealed class TaskStartImpl : ITaskStart { // INJECT public TaskStartImpl(string id) http://git-wip-us.apache.org/repos/asf/reef/blob/e5a11f3b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Task/TaskState.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Task/TaskState.cs b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Task/TaskState.cs index 7829364..be9c044 100644 --- a/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Task/TaskState.cs +++ b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Task/TaskState.cs @@ -19,7 +19,7 @@ namespace Org.Apache.REEF.Common.Runtime.Evaluator.Task { - public enum TaskState + internal enum TaskState { Init = 0, http://git-wip-us.apache.org/repos/asf/reef/blob/e5a11f3b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Task/TaskStatus.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Task/TaskStatus.cs b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Task/TaskStatus.cs index 507219b..c0c19da 100644 --- a/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Task/TaskStatus.cs +++ b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Task/TaskStatus.cs @@ -27,7 +27,7 @@ using Org.Apache.REEF.Utilities.Logging; namespace Org.Apache.REEF.Common.Runtime.Evaluator.Task { - public class TaskStatus + internal sealed class TaskStatus { private static readonly Logger LOGGER = Logger.GetLogger(typeof(TaskStatus)); private readonly TaskLifeCycle _taskLifeCycle; http://git-wip-us.apache.org/repos/asf/reef/blob/e5a11f3b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Task/TaskStopImpl.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Task/TaskStopImpl.cs b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Task/TaskStopImpl.cs index f459324..72c7ad9 100644 --- a/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Task/TaskStopImpl.cs +++ b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Task/TaskStopImpl.cs @@ -21,7 +21,7 @@ using Org.Apache.REEF.Common.Tasks.Events; namespace Org.Apache.REEF.Common.Runtime.Evaluator.Task { - public class TaskStopImpl : ITaskStop + internal sealed class TaskStopImpl : ITaskStop { // INJECT public TaskStopImpl(string id) http://git-wip-us.apache.org/repos/asf/reef/blob/e5a11f3b/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 01c6a96..06b47b4 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,7 @@ using Org.Apache.REEF.Utilities.Logging; namespace Org.Apache.REEF.Common.Runtime.Evaluator.Utils { - public class EvaluatorConfigurations + internal sealed class EvaluatorConfigurations { private static readonly Logger LOGGER = Logger.GetLogger(typeof(EvaluatorConfigurations)); http://git-wip-us.apache.org/repos/asf/reef/blob/e5a11f3b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Utils/NamedparameterAlias.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Utils/NamedparameterAlias.cs b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Utils/NamedparameterAlias.cs index 25c010b..0b6055e 100644 --- a/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Utils/NamedparameterAlias.cs +++ b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Utils/NamedparameterAlias.cs @@ -18,49 +18,47 @@ */ using Org.Apache.REEF.Tang.Annotations; -using Org.Apache.REEF.Tang.Formats; -using Org.Apache.REEF.Tang.Types; using Org.Apache.REEF.Tang.Util; namespace Org.Apache.REEF.Common.Runtime.Evaluator.Utils { [NamedParameter(alias: "org.apache.reef.runtime.common.evaluator.parameters.ApplicationIdentifier", aliasLanguage: Language.Java)] - public sealed class ApplicationIdentifier : Name<string> + internal sealed class ApplicationIdentifier : Name<string> { } [NamedParameter(alias: "org.apache.reef.runtime.common.evaluator.parameters.DriverRemoteIdentifier", aliasLanguage: Language.Java)] - public sealed class DriverRemoteIdentifier : Name<string> + internal sealed class DriverRemoteIdentifier : Name<string> { } [NamedParameter(alias: "org.apache.reef.runtime.common.evaluator.parameters.EvaluatorIdentifier", aliasLanguage: Language.Java)] - public sealed class EvaluatorIdentifier : Name<string> + internal sealed class EvaluatorIdentifier : Name<string> { } [NamedParameter(alias: "org.apache.reef.runtime.common.evaluator.parameters.InitialTaskConfiguration", aliasLanguage: Language.Java)] - public sealed class InitialTaskConfiguration : Name<string> + internal sealed class InitialTaskConfiguration : Name<string> { } [NamedParameter(alias: "org.apache.reef.runtime.common.evaluator.parameters.RootContextConfiguration", aliasLanguage: Language.Java)] - public sealed class RootContextConfiguration : Name<string> + internal sealed class RootContextConfiguration : Name<string> { } [NamedParameter(alias: "org.apache.reef.runtime.common.evaluator.parameters.RootServiceConfiguration", aliasLanguage: Language.Java)] - public sealed class RootServiceConfiguration : Name<string> + internal sealed class RootServiceConfiguration : Name<string> { } [NamedParameter(alias: "org.apache.reef.runtime.common.launch.parameters.ErrorHandlerRID", aliasLanguage: Language.Java)] - public sealed class ErrorHandlerRid : Name<string> + internal sealed class ErrorHandlerRid : Name<string> { } [NamedParameter(alias: "org.apache.reef.runtime.common.launch.parameters.LaunchID", aliasLanguage: Language.Java)] - public sealed class LaunchId : Name<string> + internal sealed class LaunchId : Name<string> { } } http://git-wip-us.apache.org/repos/asf/reef/blob/e5a11f3b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Utils/RemoteManager.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Utils/RemoteManager.cs b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Utils/RemoteManager.cs deleted file mode 100644 index c129d04..0000000 --- a/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Utils/RemoteManager.cs +++ /dev/null @@ -1,25 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -namespace Org.Apache.REEF.Common.Runtime.Evaluator.Utils -{ - public class RemoteManager - { - } -} http://git-wip-us.apache.org/repos/asf/reef/blob/e5a11f3b/lang/cs/Org.Apache.REEF.Evaluator/Properties/AssemblyInfo.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Evaluator/Properties/AssemblyInfo.cs b/lang/cs/Org.Apache.REEF.Evaluator/Properties/AssemblyInfo.cs index 96d1132..9175669 100644 --- a/lang/cs/Org.Apache.REEF.Evaluator/Properties/AssemblyInfo.cs +++ b/lang/cs/Org.Apache.REEF.Evaluator/Properties/AssemblyInfo.cs @@ -59,4 +59,9 @@ using System.Runtime.InteropServices; "00240000048000009400000006020000002400005253413100040000010001005df3e621d886a9" + "9c03469d0f93a9f5d45aa2c883f50cd158759e93673f759ec4657fd84cc79d2db38ef1a2d914cc" + "b7c717846a897e11dd22eb260a7ce2da2dccf0263ea63e2b3f7dac24f28882aa568ef544341d17" + + "618392a1095f4049ad079d4f4f0b429bb535699155fd6a7652ec7d6c1f1ba2b560f11ef3a86b5945d288cf")] +[assembly: InternalsVisibleTo("Org.Apache.REEF.Evaluator.Tests, publickey=" + + "00240000048000009400000006020000002400005253413100040000010001005df3e621d886a9" + + "9c03469d0f93a9f5d45aa2c883f50cd158759e93673f759ec4657fd84cc79d2db38ef1a2d914cc" + + "b7c717846a897e11dd22eb260a7ce2da2dccf0263ea63e2b3f7dac24f28882aa568ef544341d17" + "618392a1095f4049ad079d4f4f0b429bb535699155fd6a7652ec7d6c1f1ba2b560f11ef3a86b5945d288cf")] \ No newline at end of file
