You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@reef.apache.org by ju...@apache.org on 2015/03/28 01:35:32 UTC
incubator-reef git commit: [REEF-169] Add ForkINjector with only one
parameter
Repository: incubator-reef
Updated Branches:
refs/heads/master 6e8c4c89a -> 748794599
[REEF-169] Add ForkINjector with only one parameter
This PR changes the the parameter of `ForkInjector()` from
`IConfiguration[]` to `param IConfiguration[]`. That way it can be
called with only a single parameter.
This also changes all the callsites that created an array with only one
element to just pass the one `IConfiguration`
JIRA:
[REEF-169](https://issues.apache.org/jira/browse/REEF-169)
Pull Request:
This closes #124
Author: Markus Weimer <we...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-reef/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-reef/commit/74879459
Tree: http://git-wip-us.apache.org/repos/asf/incubator-reef/tree/74879459
Diff: http://git-wip-us.apache.org/repos/asf/incubator-reef/diff/74879459
Branch: refs/heads/master
Commit: 7487945993e4103afe71fa8579a351f81d245f36
Parents: 6e8c4c8
Author: Markus Weimer <we...@apache.org>
Authored: Fri Mar 27 13:30:42 2015 -0700
Committer: Julia Wang <jw...@yahoo.com>
Committed: Fri Mar 27 17:32:02 2015 -0700
----------------------------------------------------------------------
.../Runtime/Evaluator/Context/ContextRuntime.cs | 4 ++--
.../Org.Apache.REEF.Tang.Examples/ForksInjectorInConstructor.cs | 2 +-
.../Implementations/InjectionPlan/InjectorImpl.cs | 2 +-
lang/cs/Org.Apache.REEF.Tang/Interface/IInjector.cs | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/74879459/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Context/ContextRuntime.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Context/ContextRuntime.cs b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Context/ContextRuntime.cs
index b27061c..5006a66 100644
--- a/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Context/ContextRuntime.cs
+++ b/lang/cs/Org.Apache.REEF.Common/Runtime/Evaluator/Context/ContextRuntime.cs
@@ -139,7 +139,7 @@ namespace Org.Apache.REEF.Common.Runtime.Evaluator.Context
}
try
{
- IInjector childServiceInjector = _serviceInjector.ForkInjector(new IConfiguration[] { serviceConfiguration });
+ IInjector childServiceInjector = _serviceInjector.ForkInjector(serviceConfiguration);
childContext = new ContextRuntime(childServiceInjector, contextConfiguration, Optional<ContextRuntime>.Of(this));
_childContext = Optional<ContextRuntime>.Of(childContext);
return childContext;
@@ -226,7 +226,7 @@ namespace Org.Apache.REEF.Common.Runtime.Evaluator.Context
}
try
{
- IInjector taskInjector = _contextInjector.ForkInjector(new IConfiguration[] { taskConfiguration.TangConfig });
+ IInjector taskInjector = _contextInjector.ForkInjector(taskConfiguration.TangConfig);
LOGGER.Log(Level.Info, "Trying to inject task with configuration" + taskConfiguration.ToString());
TaskRuntime taskRuntime = new TaskRuntime(taskInjector, contextId, taskConfiguration.TaskId, heartBeatManager); // taskInjector.getInstance(TaskRuntime.class);
taskRuntime.Initialize();
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/74879459/lang/cs/Org.Apache.REEF.Tang.Examples/ForksInjectorInConstructor.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang.Examples/ForksInjectorInConstructor.cs b/lang/cs/Org.Apache.REEF.Tang.Examples/ForksInjectorInConstructor.cs
index 801b76f..7661791 100644
--- a/lang/cs/Org.Apache.REEF.Tang.Examples/ForksInjectorInConstructor.cs
+++ b/lang/cs/Org.Apache.REEF.Tang.Examples/ForksInjectorInConstructor.cs
@@ -48,7 +48,7 @@ namespace Org.Apache.REEF.Tang.Examples
{
ICsConfigurationBuilder cb = TangFactory.GetTang().NewConfigurationBuilder(new string[] { @"Org.Apache.REEF.Tang.Examples" });
//cb.BindImplementation(Number.class, typeof(Int32));
- i.ForkInjector(new IConfiguration[] { cb.Build() });
+ i.ForkInjector(cb.Build());
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/74879459/lang/cs/Org.Apache.REEF.Tang/Implementations/InjectionPlan/InjectorImpl.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Implementations/InjectionPlan/InjectorImpl.cs b/lang/cs/Org.Apache.REEF.Tang/Implementations/InjectionPlan/InjectorImpl.cs
index bf622df..3956762 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Implementations/InjectionPlan/InjectorImpl.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Implementations/InjectionPlan/InjectorImpl.cs
@@ -905,7 +905,7 @@ namespace Org.Apache.REEF.Tang.Implementations.InjectionPlan
}
}
- public IInjector ForkInjector(IConfiguration[] configurations)
+ public IInjector ForkInjector(params IConfiguration[] configurations)
{
InjectorImpl ret;
ret = Copy(this, configurations);
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/74879459/lang/cs/Org.Apache.REEF.Tang/Interface/IInjector.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Interface/IInjector.cs b/lang/cs/Org.Apache.REEF.Tang/Interface/IInjector.cs
index 0df3ee7..cca1538 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Interface/IInjector.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Interface/IInjector.cs
@@ -136,7 +136,7 @@ namespace Org.Apache.REEF.Tang.Interface
/// </summary>
/// <param name="configurations">The configurations.</param>
/// <returns></returns>
- IInjector ForkInjector(IConfiguration[] configurations);
+ IInjector ForkInjector(params IConfiguration[] configurations);
/// <summary>
/// Binds the volatile instance.