Repository: reef Updated Branches: refs/heads/master 0fed7af80 -> a95e2ed66
[REEF-1090] Pass through O.A.R.Driver to hide unnecessarily public APIs JIRA: [REEF-1090](https://issues.apache.org/jira/browse/REEF-1090) Pull Request This closes #743 Project: http://git-wip-us.apache.org/repos/asf/reef/repo Commit: http://git-wip-us.apache.org/repos/asf/reef/commit/a95e2ed6 Tree: http://git-wip-us.apache.org/repos/asf/reef/tree/a95e2ed6 Diff: http://git-wip-us.apache.org/repos/asf/reef/diff/a95e2ed6 Branch: refs/heads/master Commit: a95e2ed664a73d30bf261dc1d863b14c9737842b Parents: 0fed7af Author: Andrew Chung <[email protected]> Authored: Wed Dec 16 14:03:46 2015 -0800 Committer: Markus Weimer <[email protected]> Committed: Mon Jan 4 10:58:40 2016 -0800 ---------------------------------------------------------------------- lang/cs/Org.Apache.REEF.Driver/Bridge/BridgeLogger.cs | 4 +++- .../Bridge/Clr2java/IActiveContextClr2Java.cs | 2 ++ .../Bridge/Clr2java/IAllocatedEvaluatorClr2Java.cs | 2 ++ .../Bridge/Clr2java/IClosedContextClr2Java.cs | 2 ++ lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IClr2Java.cs | 3 +++ .../Bridge/Clr2java/IClr2JavaTaskMessage.cs | 3 +++ .../Bridge/Clr2java/ICompletedEvaluatorClr2Java.cs | 3 +++ .../Bridge/Clr2java/ICompletedTaskClr2Java.cs | 3 +++ .../Bridge/Clr2java/IContextMessageClr2Java.cs | 3 +++ .../Bridge/Clr2java/IDriverRestartCompletedClr2Java.cs | 2 ++ .../Bridge/Clr2java/IDriverRestartedClr2Java.cs | 2 ++ .../Bridge/Clr2java/IEvaluatorRequestorClr2Java.cs | 2 ++ .../Bridge/Clr2java/IFailedContextClr2Java.cs | 2 ++ .../Bridge/Clr2java/IFailedEvaluatorClr2Java.cs | 3 +++ .../Bridge/Clr2java/IFailedTaskClr2Java.cs | 3 +++ .../Bridge/Clr2java/IHttpServerBridgeClr2Java.cs | 3 +++ .../Bridge/Clr2java/IRunningTaskClr2Java.cs | 3 +++ .../Bridge/Clr2java/ISuspendedTaskClr2Java.cs | 3 +++ .../Bridge/Clr2java/ITaskMessageClr2Java.cs | 3 +++ lang/cs/Org.Apache.REEF.Driver/Bridge/ClrClientHelper.cs | 2 +- lang/cs/Org.Apache.REEF.Driver/Bridge/ClrHandlerHelper.cs | 2 +- lang/cs/Org.Apache.REEF.Driver/Bridge/ClrSystemHandler.cs | 2 +- .../Org.Apache.REEF.Driver/Bridge/ClrSystemHandlerWrapper.cs | 4 +++- lang/cs/Org.Apache.REEF.Driver/Bridge/DriverBridge.cs | 2 +- lang/cs/Org.Apache.REEF.Driver/Bridge/Events/ContextMessage.cs | 2 +- lang/cs/Org.Apache.REEF.Driver/Bridge/Events/FailedContext.cs | 2 +- lang/cs/Org.Apache.REEF.Driver/Bridge/Events/FailedTask.cs | 2 +- lang/cs/Org.Apache.REEF.Driver/Bridge/Events/RunningTask.cs | 2 +- lang/cs/Org.Apache.REEF.Driver/Bridge/Events/SuspendedTask.cs | 2 +- lang/cs/Org.Apache.REEF.Driver/Bridge/Events/TaskMessage.cs | 2 +- lang/cs/Org.Apache.REEF.Driver/Bridge/HttpMessage.cs | 2 +- lang/cs/Org.Apache.REEF.Driver/Bridge/HttpServerHandler.cs | 4 ++-- lang/cs/Org.Apache.REEF.Driver/Bridge/HttpServerPort.cs | 4 ++-- lang/cs/Org.Apache.REEF.Driver/Bridge/ReefHttpRequest.cs | 6 +++++- lang/cs/Org.Apache.REEF.Driver/Bridge/ReefHttpResponse.cs | 6 +++++- lang/cs/Org.Apache.REEF.Driver/Constants.cs | 2 +- lang/cs/Org.Apache.REEF.Driver/Context/ContextConfiguration.cs | 4 +++- .../Context/ContextConfigurationOptions.cs | 4 +++- lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultHttpHandler.cs | 4 ++-- lang/cs/Org.Apache.REEF.Driver/DriverConfigGenerator.cs | 4 +++- lang/cs/Org.Apache.REEF.Driver/DriverConfiguration.cs | 2 ++ lang/cs/Org.Apache.REEF.Driver/DriverConfigurationSettings.cs | 4 +++- .../Evaluator/EvaluatorDescriptorImpl.cs | 2 ++ .../Org.Apache.REEF.Examples.AllHandlers/HelloHttpHandler.cs | 2 +- lang/cs/Org.Apache.REEF.IMRU/OnREEF/Client/REEFIMRUClient.cs | 3 +-- .../Org.Apache.REEF.Utilities/Attributes/InteropAttribute.cs | 2 +- 46 files changed, 100 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/reef/blob/a95e2ed6/lang/cs/Org.Apache.REEF.Driver/Bridge/BridgeLogger.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Driver/Bridge/BridgeLogger.cs b/lang/cs/Org.Apache.REEF.Driver/Bridge/BridgeLogger.cs index bdbb80a..1370b70 100644 --- a/lang/cs/Org.Apache.REEF.Driver/Bridge/BridgeLogger.cs +++ b/lang/cs/Org.Apache.REEF.Driver/Bridge/BridgeLogger.cs @@ -18,6 +18,7 @@ */ using System; +using Org.Apache.REEF.Utilities.Attributes; using Org.Apache.REEF.Utilities.Logging; namespace Org.Apache.REEF.Driver.Bridge @@ -27,7 +28,8 @@ namespace Org.Apache.REEF.Driver.Bridge /// logging in CPP bridge code. /// This is enabled when trace leve is above Level.Info (included) /// </summary> - public class BridgeLogger + [Private] + public sealed class BridgeLogger { private readonly Logger _logger; http://git-wip-us.apache.org/repos/asf/reef/blob/a95e2ed6/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IActiveContextClr2Java.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IActiveContextClr2Java.cs b/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IActiveContextClr2Java.cs index a4ea330..2f15c17 100644 --- a/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IActiveContextClr2Java.cs +++ b/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IActiveContextClr2Java.cs @@ -18,9 +18,11 @@ */ using Org.Apache.REEF.Driver.Evaluator; +using Org.Apache.REEF.Utilities.Attributes; namespace Org.Apache.REEF.Driver.Bridge.Clr2java { + [Private, Interop("ActiveContextClr2Java.cpp", "Clr2JavaImpl.h")] public interface IActiveContextClr2Java : IClr2Java { void SubmitTask(string taskConfigStr); http://git-wip-us.apache.org/repos/asf/reef/blob/a95e2ed6/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IAllocatedEvaluatorClr2Java.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IAllocatedEvaluatorClr2Java.cs b/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IAllocatedEvaluatorClr2Java.cs index 8bfc8c7..04294bc 100644 --- a/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IAllocatedEvaluatorClr2Java.cs +++ b/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IAllocatedEvaluatorClr2Java.cs @@ -18,9 +18,11 @@ */ using Org.Apache.REEF.Driver.Evaluator; +using Org.Apache.REEF.Utilities.Attributes; namespace Org.Apache.REEF.Driver.Bridge.Clr2java { + [Private, Interop("AllocatedEvaluatorClr2Java.cpp", "Clr2JavaImpl.h")] public interface IAllocatedEvaluatorClr2Java : IClr2Java { void SubmitContextAndTask(string contextConfigStr, string taskConfigStr); http://git-wip-us.apache.org/repos/asf/reef/blob/a95e2ed6/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IClosedContextClr2Java.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IClosedContextClr2Java.cs b/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IClosedContextClr2Java.cs index 06c46c4..0159d90 100644 --- a/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IClosedContextClr2Java.cs +++ b/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IClosedContextClr2Java.cs @@ -18,12 +18,14 @@ */ using Org.Apache.REEF.Driver.Evaluator; +using Org.Apache.REEF.Utilities.Attributes; namespace Org.Apache.REEF.Driver.Bridge.Clr2java { /// <summary> /// A closed context event from Java. /// </summary> + [Private, Interop("ClosedContextClr2Java.cpp", "Clr2JavaImpl.h")] public interface IClosedContextClr2Java : IClr2Java { /// <summary> http://git-wip-us.apache.org/repos/asf/reef/blob/a95e2ed6/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IClr2Java.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IClr2Java.cs b/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IClr2Java.cs index b6c9154..1c0403d 100644 --- a/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IClr2Java.cs +++ b/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IClr2Java.cs @@ -17,8 +17,11 @@ * under the License. */ +using Org.Apache.REEF.Utilities.Attributes; + namespace Org.Apache.REEF.Driver.Bridge.Clr2java { + [Private, Interop] public interface IClr2Java { void OnError(string message); http://git-wip-us.apache.org/repos/asf/reef/blob/a95e2ed6/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IClr2JavaTaskMessage.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IClr2JavaTaskMessage.cs b/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IClr2JavaTaskMessage.cs index e1d1513..e744d11 100644 --- a/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IClr2JavaTaskMessage.cs +++ b/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IClr2JavaTaskMessage.cs @@ -17,11 +17,14 @@ * under the License. */ +using Org.Apache.REEF.Utilities.Attributes; + namespace Org.Apache.REEF.Driver.Bridge.Clr2java { /// <summary> /// An message sent from a Task to a Driver. /// </summary> + [Private, Interop] public interface IClr2JavaTaskMessage { /// <summary> http://git-wip-us.apache.org/repos/asf/reef/blob/a95e2ed6/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/ICompletedEvaluatorClr2Java.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/ICompletedEvaluatorClr2Java.cs b/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/ICompletedEvaluatorClr2Java.cs index 99e37d7..ea3dd8d 100644 --- a/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/ICompletedEvaluatorClr2Java.cs +++ b/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/ICompletedEvaluatorClr2Java.cs @@ -17,8 +17,11 @@ * under the License. */ +using Org.Apache.REEF.Utilities.Attributes; + namespace Org.Apache.REEF.Driver.Bridge.Clr2java { + [Private, Interop("CompletedEvaluatorClr2Java.cpp", "Clr2JavaImpl.h")] public interface ICompletedEvaluatorClr2Java : IClr2Java { /// <summary> http://git-wip-us.apache.org/repos/asf/reef/blob/a95e2ed6/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/ICompletedTaskClr2Java.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/ICompletedTaskClr2Java.cs b/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/ICompletedTaskClr2Java.cs index 049bf30..281b33f 100644 --- a/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/ICompletedTaskClr2Java.cs +++ b/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/ICompletedTaskClr2Java.cs @@ -17,8 +17,11 @@ * under the License. */ +using Org.Apache.REEF.Utilities.Attributes; + namespace Org.Apache.REEF.Driver.Bridge.Clr2java { + [Private, Interop("CompletedTaskClr2Java.cpp", "Clr2JavaImpl.h")] public interface ICompletedTaskClr2Java : IClr2Java, IClr2JavaTaskMessage { IActiveContextClr2Java GetActiveContext(); http://git-wip-us.apache.org/repos/asf/reef/blob/a95e2ed6/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IContextMessageClr2Java.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IContextMessageClr2Java.cs b/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IContextMessageClr2Java.cs index 9af42b7..2aa3fb5 100644 --- a/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IContextMessageClr2Java.cs +++ b/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IContextMessageClr2Java.cs @@ -17,8 +17,11 @@ * under the License. */ +using Org.Apache.REEF.Utilities.Attributes; + namespace Org.Apache.REEF.Driver.Bridge.Clr2java { + [Private, Interop("ContextMessageClr2Java.cpp", "Clr2JavaImpl.h")] public interface IContextMessageClr2Java : IClr2Java { byte[] Get(); http://git-wip-us.apache.org/repos/asf/reef/blob/a95e2ed6/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IDriverRestartCompletedClr2Java.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IDriverRestartCompletedClr2Java.cs b/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IDriverRestartCompletedClr2Java.cs index 223fde6..eb290cc 100644 --- a/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IDriverRestartCompletedClr2Java.cs +++ b/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IDriverRestartCompletedClr2Java.cs @@ -17,9 +17,11 @@ * under the License. */ using System; +using Org.Apache.REEF.Utilities.Attributes; namespace Org.Apache.REEF.Driver.Bridge.Clr2java { + [Private, Interop("DriverRestartCompletedClr2Java.cpp", "Clr2JavaImpl.h")] public interface IDriverRestartCompletedClr2Java { /// <summary> http://git-wip-us.apache.org/repos/asf/reef/blob/a95e2ed6/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IDriverRestartedClr2Java.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IDriverRestartedClr2Java.cs b/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IDriverRestartedClr2Java.cs index 036b903..ee16ed4 100644 --- a/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IDriverRestartedClr2Java.cs +++ b/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IDriverRestartedClr2Java.cs @@ -18,9 +18,11 @@ */ using System; +using Org.Apache.REEF.Utilities.Attributes; namespace Org.Apache.REEF.Driver.Bridge.Clr2java { + [Private, Interop("DriverRestartedClr2Java.cpp", "Clr2JavaImpl.h")] public interface IDriverRestartedClr2Java : IClr2Java { /// <summary> http://git-wip-us.apache.org/repos/asf/reef/blob/a95e2ed6/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IEvaluatorRequestorClr2Java.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IEvaluatorRequestorClr2Java.cs b/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IEvaluatorRequestorClr2Java.cs index 940ed43..11ad9d5 100644 --- a/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IEvaluatorRequestorClr2Java.cs +++ b/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IEvaluatorRequestorClr2Java.cs @@ -18,9 +18,11 @@ */ using Org.Apache.REEF.Driver.Evaluator; +using Org.Apache.REEF.Utilities.Attributes; namespace Org.Apache.REEF.Driver.Bridge.Clr2java { + [Private, Interop("EvaluatorRequestorClr2Java.cpp", "Clr2JavaImpl.h")] public interface IEvaluatorRequestorClr2Java : IClr2Java { void Submit(IEvaluatorRequest evaluatorRequest); http://git-wip-us.apache.org/repos/asf/reef/blob/a95e2ed6/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IFailedContextClr2Java.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IFailedContextClr2Java.cs b/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IFailedContextClr2Java.cs index 1b22645..c618200 100644 --- a/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IFailedContextClr2Java.cs +++ b/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IFailedContextClr2Java.cs @@ -18,9 +18,11 @@ */ using Org.Apache.REEF.Driver.Evaluator; +using Org.Apache.REEF.Utilities.Attributes; namespace Org.Apache.REEF.Driver.Bridge.Clr2java { + [Private, Interop("FailedContextClr2Java.cpp", "Clr2JavaImpl.h")] public interface IFailedContextClr2Java : IClr2Java { string GetId(); http://git-wip-us.apache.org/repos/asf/reef/blob/a95e2ed6/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IFailedEvaluatorClr2Java.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IFailedEvaluatorClr2Java.cs b/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IFailedEvaluatorClr2Java.cs index 12b007d..ac58366 100644 --- a/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IFailedEvaluatorClr2Java.cs +++ b/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IFailedEvaluatorClr2Java.cs @@ -17,8 +17,11 @@ * under the License. */ +using Org.Apache.REEF.Utilities.Attributes; + namespace Org.Apache.REEF.Driver.Bridge.Clr2java { + [Private, Interop("FailedEvaluatorClr2Java.cpp", "Clr2JavaImpl.h")] public interface IFailedEvaluatorClr2Java { IEvaluatorRequestorClr2Java GetEvaluatorRequestor(); http://git-wip-us.apache.org/repos/asf/reef/blob/a95e2ed6/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IFailedTaskClr2Java.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IFailedTaskClr2Java.cs b/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IFailedTaskClr2Java.cs index 384502e..ed15cd6 100644 --- a/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IFailedTaskClr2Java.cs +++ b/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IFailedTaskClr2Java.cs @@ -17,8 +17,11 @@ * under the License. */ +using Org.Apache.REEF.Utilities.Attributes; + namespace Org.Apache.REEF.Driver.Bridge.Clr2java { + [Private, Interop("FailedTaskClr2Java.cpp", "Clr2JavaImpl.h")] public interface IFailedTaskClr2Java : IClr2Java { IActiveContextClr2Java GetActiveContext(); http://git-wip-us.apache.org/repos/asf/reef/blob/a95e2ed6/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IHttpServerBridgeClr2Java.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IHttpServerBridgeClr2Java.cs b/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IHttpServerBridgeClr2Java.cs index 3b13aed..6e5519f 100644 --- a/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IHttpServerBridgeClr2Java.cs +++ b/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IHttpServerBridgeClr2Java.cs @@ -17,8 +17,11 @@ * under the License. */ +using Org.Apache.REEF.Utilities.Attributes; + namespace Org.Apache.REEF.Driver.Bridge.Clr2java { + [Private, Interop("HttpServerClr2Java.cpp", "Clr2JavaImpl.h")] public interface IHttpServerBridgeClr2Java : IClr2Java { string GetQueryString(); http://git-wip-us.apache.org/repos/asf/reef/blob/a95e2ed6/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IRunningTaskClr2Java.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IRunningTaskClr2Java.cs b/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IRunningTaskClr2Java.cs index e807e04..7538b80 100644 --- a/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IRunningTaskClr2Java.cs +++ b/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/IRunningTaskClr2Java.cs @@ -17,8 +17,11 @@ * under the License. */ +using Org.Apache.REEF.Utilities.Attributes; + namespace Org.Apache.REEF.Driver.Bridge.Clr2java { + [Private, Interop("RunningTaskClr2Java.cpp", "Clr2JavaImpl.h")] public interface IRunningTaskClr2Java : IClr2Java { IActiveContextClr2Java GetActiveContext(); http://git-wip-us.apache.org/repos/asf/reef/blob/a95e2ed6/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/ISuspendedTaskClr2Java.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/ISuspendedTaskClr2Java.cs b/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/ISuspendedTaskClr2Java.cs index 7e146f4..99a6b51 100644 --- a/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/ISuspendedTaskClr2Java.cs +++ b/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/ISuspendedTaskClr2Java.cs @@ -17,8 +17,11 @@ * under the License. */ +using Org.Apache.REEF.Utilities.Attributes; + namespace Org.Apache.REEF.Driver.Bridge.Clr2java { + [Private, Interop("SuspendedTaskClr2Java.cpp", "Clr2JavaImpl.h")] public interface ISuspendedTaskClr2Java : IClr2Java, IClr2JavaTaskMessage { /// <summary> http://git-wip-us.apache.org/repos/asf/reef/blob/a95e2ed6/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/ITaskMessageClr2Java.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/ITaskMessageClr2Java.cs b/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/ITaskMessageClr2Java.cs index 3e3abb3..18652e9 100644 --- a/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/ITaskMessageClr2Java.cs +++ b/lang/cs/Org.Apache.REEF.Driver/Bridge/Clr2java/ITaskMessageClr2Java.cs @@ -17,8 +17,11 @@ * under the License. */ +using Org.Apache.REEF.Utilities.Attributes; + namespace Org.Apache.REEF.Driver.Bridge.Clr2java { + [Private, Interop("TaskMessageClr2Java.cpp", "Clr2JavaImpl.h")] public interface ITaskMessageClr2Java : IClr2Java { string GetId(); http://git-wip-us.apache.org/repos/asf/reef/blob/a95e2ed6/lang/cs/Org.Apache.REEF.Driver/Bridge/ClrClientHelper.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Driver/Bridge/ClrClientHelper.cs b/lang/cs/Org.Apache.REEF.Driver/Bridge/ClrClientHelper.cs index c0f90a9..3e4e6dd 100644 --- a/lang/cs/Org.Apache.REEF.Driver/Bridge/ClrClientHelper.cs +++ b/lang/cs/Org.Apache.REEF.Driver/Bridge/ClrClientHelper.cs @@ -28,7 +28,7 @@ using Org.Apache.REEF.Utilities.Logging; namespace Org.Apache.REEF.Driver.Bridge { - public class ClrClientHelper + public static class ClrClientHelper { private static readonly Logger LOGGER = Logger.GetLogger(typeof(ClrClientHelper)); http://git-wip-us.apache.org/repos/asf/reef/blob/a95e2ed6/lang/cs/Org.Apache.REEF.Driver/Bridge/ClrHandlerHelper.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Driver/Bridge/ClrHandlerHelper.cs b/lang/cs/Org.Apache.REEF.Driver/Bridge/ClrHandlerHelper.cs index 0c66158..23c3260 100644 --- a/lang/cs/Org.Apache.REEF.Driver/Bridge/ClrHandlerHelper.cs +++ b/lang/cs/Org.Apache.REEF.Driver/Bridge/ClrHandlerHelper.cs @@ -32,7 +32,7 @@ using Org.Apache.REEF.Utilities.Logging; namespace Org.Apache.REEF.Driver.Bridge { - public class ClrHandlerHelper + public static class ClrHandlerHelper { private const string DllExtension = ".dll"; private static readonly Logger LOGGER = Logger.GetLogger(typeof(ClrHandlerHelper)); http://git-wip-us.apache.org/repos/asf/reef/blob/a95e2ed6/lang/cs/Org.Apache.REEF.Driver/Bridge/ClrSystemHandler.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Driver/Bridge/ClrSystemHandler.cs b/lang/cs/Org.Apache.REEF.Driver/Bridge/ClrSystemHandler.cs index 10e93c6..2cb85ee 100644 --- a/lang/cs/Org.Apache.REEF.Driver/Bridge/ClrSystemHandler.cs +++ b/lang/cs/Org.Apache.REEF.Driver/Bridge/ClrSystemHandler.cs @@ -22,7 +22,7 @@ using System.Collections.Generic; namespace Org.Apache.REEF.Driver.Bridge { - public class ClrSystemHandler<T> : IObserver<T>, IObservable<T> + internal sealed class ClrSystemHandler<T> : IObserver<T>, IObservable<T> { readonly List<IObserver<T>> userHandlers = new List<IObserver<T>>(); http://git-wip-us.apache.org/repos/asf/reef/blob/a95e2ed6/lang/cs/Org.Apache.REEF.Driver/Bridge/ClrSystemHandlerWrapper.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Driver/Bridge/ClrSystemHandlerWrapper.cs b/lang/cs/Org.Apache.REEF.Driver/Bridge/ClrSystemHandlerWrapper.cs index 4e3edc1..549370c 100644 --- a/lang/cs/Org.Apache.REEF.Driver/Bridge/ClrSystemHandlerWrapper.cs +++ b/lang/cs/Org.Apache.REEF.Driver/Bridge/ClrSystemHandlerWrapper.cs @@ -26,13 +26,15 @@ using Org.Apache.REEF.Driver.Bridge.Events; using Org.Apache.REEF.Driver.Context; using Org.Apache.REEF.Driver.Evaluator; using Org.Apache.REEF.Driver.Task; +using Org.Apache.REEF.Utilities.Attributes; using Org.Apache.REEF.Utilities.Diagnostics; using Org.Apache.REEF.Utilities.Logging; using ContextMessage = Org.Apache.REEF.Driver.Bridge.Events.ContextMessage; namespace Org.Apache.REEF.Driver.Bridge { - public class ClrSystemHandlerWrapper + [Private] + public static class ClrSystemHandlerWrapper { private static readonly Logger LOGGER = Logger.GetLogger(typeof(ClrSystemHandlerWrapper)); http://git-wip-us.apache.org/repos/asf/reef/blob/a95e2ed6/lang/cs/Org.Apache.REEF.Driver/Bridge/DriverBridge.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Driver/Bridge/DriverBridge.cs b/lang/cs/Org.Apache.REEF.Driver/Bridge/DriverBridge.cs index bbae302..7b8b461 100644 --- a/lang/cs/Org.Apache.REEF.Driver/Bridge/DriverBridge.cs +++ b/lang/cs/Org.Apache.REEF.Driver/Bridge/DriverBridge.cs @@ -35,7 +35,7 @@ using Org.Apache.REEF.Driver.Defaults; namespace Org.Apache.REEF.Driver.Bridge { - public class DriverBridge + internal sealed class DriverBridge { private static Logger _logger; http://git-wip-us.apache.org/repos/asf/reef/blob/a95e2ed6/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/ContextMessage.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/ContextMessage.cs b/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/ContextMessage.cs index d776bf7..f7f4b6a 100644 --- a/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/ContextMessage.cs +++ b/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/ContextMessage.cs @@ -22,7 +22,7 @@ using Org.Apache.REEF.Driver.Bridge.Clr2java; namespace Org.Apache.REEF.Driver.Bridge.Events { - public class ContextMessage : IContextMessage + internal sealed class ContextMessage : IContextMessage { private readonly string _messageSourcId; private readonly byte[] _bytes; http://git-wip-us.apache.org/repos/asf/reef/blob/a95e2ed6/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/FailedContext.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/FailedContext.cs b/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/FailedContext.cs index e7ddc17..0f67830 100644 --- a/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/FailedContext.cs +++ b/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/FailedContext.cs @@ -24,7 +24,7 @@ using Org.Apache.REEF.Utilities; namespace Org.Apache.REEF.Driver.Bridge.Events { - internal class FailedContext : IFailedContext + internal sealed class FailedContext : IFailedContext { private readonly string _evaluatorId; private readonly string _id; http://git-wip-us.apache.org/repos/asf/reef/blob/a95e2ed6/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/FailedTask.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/FailedTask.cs b/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/FailedTask.cs index 28be1af..e470640 100644 --- a/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/FailedTask.cs +++ b/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/FailedTask.cs @@ -29,7 +29,7 @@ using Org.Apache.REEF.Utilities.Logging; namespace Org.Apache.REEF.Driver.Bridge.Events { - public class FailedTask : IFailedTask + internal sealed class FailedTask : IFailedTask { private static readonly Logger LOGGER = Logger.GetLogger(typeof(FailedTask)); http://git-wip-us.apache.org/repos/asf/reef/blob/a95e2ed6/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/RunningTask.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/RunningTask.cs b/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/RunningTask.cs index 7e9901b..b942bfa 100644 --- a/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/RunningTask.cs +++ b/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/RunningTask.cs @@ -24,7 +24,7 @@ using Org.Apache.REEF.Utilities.Logging; namespace Org.Apache.REEF.Driver.Bridge.Events { - public class RunningTask : IRunningTask + internal sealed class RunningTask : IRunningTask { private static readonly Logger LOGGER = Logger.GetLogger(typeof(RunningTask)); private readonly IRunningTaskClr2Java _runningTaskClr2Java; http://git-wip-us.apache.org/repos/asf/reef/blob/a95e2ed6/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/SuspendedTask.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/SuspendedTask.cs b/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/SuspendedTask.cs index a29eec6..2316a53 100644 --- a/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/SuspendedTask.cs +++ b/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/SuspendedTask.cs @@ -26,7 +26,7 @@ using Org.Apache.REEF.Driver.Task; namespace Org.Apache.REEF.Driver.Bridge.Events { [DataContract] - internal class SuspendedTask : ISuspendedTask + internal sealed class SuspendedTask : ISuspendedTask { internal SuspendedTask(ISuspendedTaskClr2Java suspendedTaskClr2Java) { http://git-wip-us.apache.org/repos/asf/reef/blob/a95e2ed6/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/TaskMessage.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/TaskMessage.cs b/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/TaskMessage.cs index b8f3fba..513097a 100644 --- a/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/TaskMessage.cs +++ b/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/TaskMessage.cs @@ -27,7 +27,7 @@ namespace Org.Apache.REEF.Driver.Bridge.Events /// TaskMessage which wraps ITaskMessageClr2Java /// </summary> [DataContract] - internal class TaskMessage : ITaskMessage + internal sealed class TaskMessage : ITaskMessage { private readonly byte[] _message; private readonly ITaskMessageClr2Java _taskMessageClr2Java; http://git-wip-us.apache.org/repos/asf/reef/blob/a95e2ed6/lang/cs/Org.Apache.REEF.Driver/Bridge/HttpMessage.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Driver/Bridge/HttpMessage.cs b/lang/cs/Org.Apache.REEF.Driver/Bridge/HttpMessage.cs index 2a64852..9b25c53 100644 --- a/lang/cs/Org.Apache.REEF.Driver/Bridge/HttpMessage.cs +++ b/lang/cs/Org.Apache.REEF.Driver/Bridge/HttpMessage.cs @@ -23,7 +23,7 @@ using Org.Apache.REEF.Driver.Bridge.Clr2java; namespace Org.Apache.REEF.Driver.Bridge { [DataContract] - public class HttpMessage : IHttpMessage + internal sealed class HttpMessage : IHttpMessage { public HttpMessage(IHttpServerBridgeClr2Java httpServerBridgeClr2Java) { http://git-wip-us.apache.org/repos/asf/reef/blob/a95e2ed6/lang/cs/Org.Apache.REEF.Driver/Bridge/HttpServerHandler.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Driver/Bridge/HttpServerHandler.cs b/lang/cs/Org.Apache.REEF.Driver/Bridge/HttpServerHandler.cs index c757001..b5af4fe 100644 --- a/lang/cs/Org.Apache.REEF.Driver/Bridge/HttpServerHandler.cs +++ b/lang/cs/Org.Apache.REEF.Driver/Bridge/HttpServerHandler.cs @@ -32,7 +32,7 @@ namespace Org.Apache.REEF.Driver.Bridge /// <summary> /// HttpServerHandler, the handler for all CLR http events /// </summary> - public class HttpServerHandler : IObserver<IHttpMessage> + internal sealed class HttpServerHandler : IObserver<IHttpMessage> { private static readonly Logger LOGGER = Logger.GetLogger(typeof(HttpServerHandler)); @@ -48,7 +48,7 @@ namespace Org.Apache.REEF.Driver.Bridge /// <param name="httpEventHandlers">The HTTP event handlers.</param> /// <param name="httpServerPort">The HTTP server port.</param> [Inject] - public HttpServerHandler([Parameter(Value = typeof(DriverBridgeConfigurationOptions.HttpEventHandlers))] ISet<IHttpHandler> httpEventHandlers, + private HttpServerHandler([Parameter(Value = typeof(DriverBridgeConfigurationOptions.HttpEventHandlers))] ISet<IHttpHandler> httpEventHandlers, HttpServerPort httpServerPort) { LOGGER.Log(Level.Info, "Constructing HttpServerHandler"); http://git-wip-us.apache.org/repos/asf/reef/blob/a95e2ed6/lang/cs/Org.Apache.REEF.Driver/Bridge/HttpServerPort.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Driver/Bridge/HttpServerPort.cs b/lang/cs/Org.Apache.REEF.Driver/Bridge/HttpServerPort.cs index d0067e7..ab45232 100644 --- a/lang/cs/Org.Apache.REEF.Driver/Bridge/HttpServerPort.cs +++ b/lang/cs/Org.Apache.REEF.Driver/Bridge/HttpServerPort.cs @@ -21,10 +21,10 @@ using Org.Apache.REEF.Tang.Annotations; namespace Org.Apache.REEF.Driver.Bridge { - public class HttpServerPort + public sealed class HttpServerPort { [Inject] - public HttpServerPort() + private HttpServerPort() { } http://git-wip-us.apache.org/repos/asf/reef/blob/a95e2ed6/lang/cs/Org.Apache.REEF.Driver/Bridge/ReefHttpRequest.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Driver/Bridge/ReefHttpRequest.cs b/lang/cs/Org.Apache.REEF.Driver/Bridge/ReefHttpRequest.cs index 478e887..ebb9e4a 100644 --- a/lang/cs/Org.Apache.REEF.Driver/Bridge/ReefHttpRequest.cs +++ b/lang/cs/Org.Apache.REEF.Driver/Bridge/ReefHttpRequest.cs @@ -31,8 +31,12 @@ namespace Org.Apache.REEF.Driver.Bridge Delete } - public class ReefHttpRequest + public sealed class ReefHttpRequest { + internal ReefHttpRequest() + { + } + public HttpMethod Method { get; set; } public string Url { get; set; } http://git-wip-us.apache.org/repos/asf/reef/blob/a95e2ed6/lang/cs/Org.Apache.REEF.Driver/Bridge/ReefHttpResponse.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Driver/Bridge/ReefHttpResponse.cs b/lang/cs/Org.Apache.REEF.Driver/Bridge/ReefHttpResponse.cs index 73b64cc..c221f99 100644 --- a/lang/cs/Org.Apache.REEF.Driver/Bridge/ReefHttpResponse.cs +++ b/lang/cs/Org.Apache.REEF.Driver/Bridge/ReefHttpResponse.cs @@ -21,8 +21,12 @@ using System.Net; namespace Org.Apache.REEF.Driver.Bridge { - public class ReefHttpResponse + public sealed class ReefHttpResponse { + internal ReefHttpResponse() + { + } + public byte[] OutputStream { get; set; } public HttpStatusCode Status { get; set; } http://git-wip-us.apache.org/repos/asf/reef/blob/a95e2ed6/lang/cs/Org.Apache.REEF.Driver/Constants.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Driver/Constants.cs b/lang/cs/Org.Apache.REEF.Driver/Constants.cs index bb0fac8..7f787b6 100644 --- a/lang/cs/Org.Apache.REEF.Driver/Constants.cs +++ b/lang/cs/Org.Apache.REEF.Driver/Constants.cs @@ -22,7 +22,7 @@ using System; namespace Org.Apache.REEF.Driver { // TODO[REEF-842] Act on the obsoletes - public class Constants + public static class Constants { /// <summary> /// Null handler that is not used on Java side. http://git-wip-us.apache.org/repos/asf/reef/blob/a95e2ed6/lang/cs/Org.Apache.REEF.Driver/Context/ContextConfiguration.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Driver/Context/ContextConfiguration.cs b/lang/cs/Org.Apache.REEF.Driver/Context/ContextConfiguration.cs index 8c6a0d5..91faaab 100644 --- a/lang/cs/Org.Apache.REEF.Driver/Context/ContextConfiguration.cs +++ b/lang/cs/Org.Apache.REEF.Driver/Context/ContextConfiguration.cs @@ -25,12 +25,14 @@ using Org.Apache.REEF.Common.Tasks; using Org.Apache.REEF.Common.Tasks.Events; using Org.Apache.REEF.Tang.Formats; using Org.Apache.REEF.Tang.Util; +using Org.Apache.REEF.Utilities.Attributes; [module: SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1401:FieldsMustBePrivate", Justification = "static field, typical usage in configurations")] namespace Org.Apache.REEF.Driver.Context { - public class ContextConfiguration : ConfigurationModuleBuilder + [ClientSide] + public sealed class ContextConfiguration : ConfigurationModuleBuilder { /// <summary> /// The identifier of the context. http://git-wip-us.apache.org/repos/asf/reef/blob/a95e2ed6/lang/cs/Org.Apache.REEF.Driver/Context/ContextConfigurationOptions.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Driver/Context/ContextConfigurationOptions.cs b/lang/cs/Org.Apache.REEF.Driver/Context/ContextConfigurationOptions.cs index ffe06fb..9aa987f 100644 --- a/lang/cs/Org.Apache.REEF.Driver/Context/ContextConfigurationOptions.cs +++ b/lang/cs/Org.Apache.REEF.Driver/Context/ContextConfigurationOptions.cs @@ -24,13 +24,15 @@ using Org.Apache.REEF.Common.Events; using Org.Apache.REEF.Driver.Context.Defaults; using Org.Apache.REEF.Tang.Annotations; using Org.Apache.REEF.Tang.Formats; +using Org.Apache.REEF.Utilities.Attributes; namespace Org.Apache.REEF.Driver.Context { /// <summary> /// Configuration parameters for ContextConfiguration module. /// </summary> - public class ContextConfigurationOptions : ConfigurationModuleBuilder + [ClientSide] + public sealed class ContextConfigurationOptions : ConfigurationModuleBuilder { [NamedParameter(documentation: "The identifier for the context.")] public class ContextIdentifier : Name<string> http://git-wip-us.apache.org/repos/asf/reef/blob/a95e2ed6/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultHttpHandler.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultHttpHandler.cs b/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultHttpHandler.cs index 37653b1..dcc516e 100644 --- a/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultHttpHandler.cs +++ b/lang/cs/Org.Apache.REEF.Driver/Defaults/DefaultHttpHandler.cs @@ -25,12 +25,12 @@ using Org.Apache.REEF.Utilities.Logging; namespace Org.Apache.REEF.Driver.Defaults { - public class DefaultHttpHandler : IHttpHandler + public sealed class DefaultHttpHandler : IHttpHandler { private static readonly Logger LOGGER = Logger.GetLogger(typeof(DefaultHttpHandler)); [Inject] - public DefaultHttpHandler() + private DefaultHttpHandler() { } http://git-wip-us.apache.org/repos/asf/reef/blob/a95e2ed6/lang/cs/Org.Apache.REEF.Driver/DriverConfigGenerator.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Driver/DriverConfigGenerator.cs b/lang/cs/Org.Apache.REEF.Driver/DriverConfigGenerator.cs index c9ade09..995b710 100644 --- a/lang/cs/Org.Apache.REEF.Driver/DriverConfigGenerator.cs +++ b/lang/cs/Org.Apache.REEF.Driver/DriverConfigGenerator.cs @@ -26,11 +26,13 @@ using Org.Apache.REEF.Tang.Formats.AvroConfigurationDataContract; using Org.Apache.REEF.Tang.Implementations.Configuration; using Org.Apache.REEF.Tang.Interface; using Org.Apache.REEF.Tang.Protobuf; +using Org.Apache.REEF.Utilities.Attributes; using Org.Apache.REEF.Utilities.Logging; namespace Org.Apache.REEF.Driver { - public class DriverConfigGenerator + [ClientSide] + public static class DriverConfigGenerator { public const string DriverConfigFile = "driver.config"; public const string JobDriverConfigFile = "jobDriver.config"; http://git-wip-us.apache.org/repos/asf/reef/blob/a95e2ed6/lang/cs/Org.Apache.REEF.Driver/DriverConfiguration.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Driver/DriverConfiguration.cs b/lang/cs/Org.Apache.REEF.Driver/DriverConfiguration.cs index a055dc1..77d8e64 100644 --- a/lang/cs/Org.Apache.REEF.Driver/DriverConfiguration.cs +++ b/lang/cs/Org.Apache.REEF.Driver/DriverConfiguration.cs @@ -27,12 +27,14 @@ using Org.Apache.REEF.Driver.Evaluator; using Org.Apache.REEF.Driver.Task; using Org.Apache.REEF.Tang.Formats; using Org.Apache.REEF.Tang.Util; +using Org.Apache.REEF.Utilities.Attributes; namespace Org.Apache.REEF.Driver { /// <summary> /// Fill this out to configure a Driver. /// </summary> + [ClientSide] public sealed class DriverConfiguration : ConfigurationModuleBuilder { /// <summary> http://git-wip-us.apache.org/repos/asf/reef/blob/a95e2ed6/lang/cs/Org.Apache.REEF.Driver/DriverConfigurationSettings.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Driver/DriverConfigurationSettings.cs b/lang/cs/Org.Apache.REEF.Driver/DriverConfigurationSettings.cs index 68c10f6..63e7a24 100644 --- a/lang/cs/Org.Apache.REEF.Driver/DriverConfigurationSettings.cs +++ b/lang/cs/Org.Apache.REEF.Driver/DriverConfigurationSettings.cs @@ -18,10 +18,12 @@ */ using System; +using Org.Apache.REEF.Utilities.Attributes; namespace Org.Apache.REEF.Driver { - public class DriverConfigurationSettings + [ClientSide] + public sealed class DriverConfigurationSettings { // default to "ReefDevClrBridge" private string _driverIdentifier = "ReefDevClrBridge"; http://git-wip-us.apache.org/repos/asf/reef/blob/a95e2ed6/lang/cs/Org.Apache.REEF.Driver/Evaluator/EvaluatorDescriptorImpl.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Driver/Evaluator/EvaluatorDescriptorImpl.cs b/lang/cs/Org.Apache.REEF.Driver/Evaluator/EvaluatorDescriptorImpl.cs index 543dd9c..cfe302d 100644 --- a/lang/cs/Org.Apache.REEF.Driver/Evaluator/EvaluatorDescriptorImpl.cs +++ b/lang/cs/Org.Apache.REEF.Driver/Evaluator/EvaluatorDescriptorImpl.cs @@ -24,12 +24,14 @@ using System.Net; using Org.Apache.REEF.Common.Catalog; using Org.Apache.REEF.Common.Evaluator; using Org.Apache.REEF.Driver.Bridge; +using Org.Apache.REEF.Utilities.Attributes; using Org.Apache.REEF.Utilities.Diagnostics; using Org.Apache.REEF.Utilities.Logging; namespace Org.Apache.REEF.Driver.Evaluator { // This class is `public` because it is called from C++ code. + [Private] public sealed class EvaluatorDescriptorImpl : IEvaluatorDescriptor { private const string DefaultRackName = "default_rack"; http://git-wip-us.apache.org/repos/asf/reef/blob/a95e2ed6/lang/cs/Org.Apache.REEF.Examples.AllHandlers/HelloHttpHandler.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Examples.AllHandlers/HelloHttpHandler.cs b/lang/cs/Org.Apache.REEF.Examples.AllHandlers/HelloHttpHandler.cs index be05902..d7a37d5 100644 --- a/lang/cs/Org.Apache.REEF.Examples.AllHandlers/HelloHttpHandler.cs +++ b/lang/cs/Org.Apache.REEF.Examples.AllHandlers/HelloHttpHandler.cs @@ -31,7 +31,7 @@ namespace Org.Apache.REEF.Examples.AllHandlers /// </summary> public class HelloHttpHandler : IHttpHandler { - private static readonly Logger Logger = Logger.GetLogger(typeof(HttpServerHandler)); + private static readonly Logger Logger = Logger.GetLogger(typeof(HelloHttpHandler)); [Inject] private HelloHttpHandler() http://git-wip-us.apache.org/repos/asf/reef/blob/a95e2ed6/lang/cs/Org.Apache.REEF.IMRU/OnREEF/Client/REEFIMRUClient.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.IMRU/OnREEF/Client/REEFIMRUClient.cs b/lang/cs/Org.Apache.REEF.IMRU/OnREEF/Client/REEFIMRUClient.cs index 6201d89..8e33c82 100644 --- a/lang/cs/Org.Apache.REEF.IMRU/OnREEF/Client/REEFIMRUClient.cs +++ b/lang/cs/Org.Apache.REEF.IMRU/OnREEF/Client/REEFIMRUClient.cs @@ -17,14 +17,12 @@ using System; using System.Collections.Generic; -using System.Data; using System.Globalization; using System.Linq; using Org.Apache.REEF.Client.API; using Org.Apache.REEF.Client.Common; using Org.Apache.REEF.Driver; using Org.Apache.REEF.IMRU.API; -using Org.Apache.REEF.Driver.Bridge; using Org.Apache.REEF.IMRU.OnREEF.Driver; using Org.Apache.REEF.IMRU.OnREEF.Parameters; using Org.Apache.REEF.Network.Group.Config; @@ -38,6 +36,7 @@ using Org.Apache.REEF.Tang.Interface; using Org.Apache.REEF.Tang.Util; using Org.Apache.REEF.Utilities.Diagnostics; using Org.Apache.REEF.Utilities.Logging; +using TraceLevel = System.Diagnostics.TraceLevel; namespace Org.Apache.REEF.IMRU.OnREEF.Client { http://git-wip-us.apache.org/repos/asf/reef/blob/a95e2ed6/lang/cs/Org.Apache.REEF.Utilities/Attributes/InteropAttribute.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Utilities/Attributes/InteropAttribute.cs b/lang/cs/Org.Apache.REEF.Utilities/Attributes/InteropAttribute.cs index 6fd5578..93e28ef 100644 --- a/lang/cs/Org.Apache.REEF.Utilities/Attributes/InteropAttribute.cs +++ b/lang/cs/Org.Apache.REEF.Utilities/Attributes/InteropAttribute.cs @@ -29,7 +29,7 @@ namespace Org.Apache.REEF.Utilities.Attributes { private readonly ISet<string> _cppFiles; - public InteropAttribute(ISet<string> cppFiles = null) + public InteropAttribute(params string[] cppFiles) { _cppFiles = cppFiles == null ? new HashSet<string>() : new HashSet<string>(cppFiles); }
