You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@reef.apache.org by ma...@apache.org on 2015/11/24 20:31:35 UTC
[3/6] incubator-reef git commit: [REEF-979] Enable
StyleCop.CSharp.SpacingRules and fix violations
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/dd07dc3e/lang/cs/Org.Apache.REEF.Tang.Tests/Injection/TestMultipleConstructors.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/Injection/TestMultipleConstructors.cs b/lang/cs/Org.Apache.REEF.Tang.Tests/Injection/TestMultipleConstructors.cs
index 4b32d0a..3f1b093 100644
--- a/lang/cs/Org.Apache.REEF.Tang.Tests/Injection/TestMultipleConstructors.cs
+++ b/lang/cs/Org.Apache.REEF.Tang.Tests/Injection/TestMultipleConstructors.cs
@@ -37,26 +37,25 @@ namespace Org.Apache.REEF.Tang.Tests.Injection
[TestMethod]
public void TestMissingAllParameters()
{
- //Multiple infeasible plans: Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest
- //, Org.Apache.REEF.Tang.Test
- //, Version=1.0.0.0
- //, Culture=neutral
- //, PublicKeyToken=null:
-
- // [ Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest = new Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest
- // ( System.Boolean Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest+NamedBool =
- // , System.Int32 Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest+NamedInt =
- // )
- // | new Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest
- // ( System.String Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest+NamedString =
- // , System.Int32 Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest+NamedInt =
- // )
- // | new Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest
- // ( System.Boolean Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest+NamedBool =
- // , System.String Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest+NamedString =
- // , System.Int32 Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest+NamedInt =
- // )
- // ]
+ // Multiple infeasible plans: Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest
+ // , Org.Apache.REEF.Tang.Test
+ // , Version=1.0.0.0
+ // , Culture=neutral
+ // , PublicKeyToken=null:
+ // [ Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest = new Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest
+ // ( System.Boolean Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest+NamedBool =
+ // , System.Int32 Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest+NamedInt =
+ // )
+ // | new Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest
+ // ( System.String Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest+NamedString =
+ // , System.Int32 Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest+NamedInt =
+ // )
+ // | new Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest
+ // ( System.Boolean Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest+NamedBool =
+ // , System.String Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest+NamedString =
+ // , System.Int32 Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest+NamedInt =
+ // )
+ // ]
MultiConstructorTest obj = null;
try
{
@@ -73,25 +72,25 @@ namespace Org.Apache.REEF.Tang.Tests.Injection
[TestMethod]
public void TestMissingIntParameter()
{
- //Multiple infeasible plans: Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest
- //, Org.Apache.REEF.Tang.Test
- //, Version=1.0.0.0
- //, Culture=neutral
- //, PublicKeyToken=null:
- // [ Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest = new Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest
- // ( System.Boolean Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest+NamedBool = False
- // , System.Int32 Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest+NamedInt =
- // )
- // | new Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest
- // ( System.String Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest+NamedString = foo
- // , System.Int32 Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest+NamedInt =
- // )
- // | new Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest
- // ( System.Boolean Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest+NamedBool = False
- // , System.String Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest+NamedString = foo
- // , System.Int32 Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest+NamedInt =
- // )
- // ]
+ // Multiple infeasible plans: Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest
+ // , Org.Apache.REEF.Tang.Test
+ // , Version=1.0.0.0
+ // , Culture=neutral
+ // , PublicKeyToken=null:
+ // [ Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest = new Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest
+ // ( System.Boolean Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest+NamedBool = False
+ // , System.Int32 Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest+NamedInt =
+ // )
+ // | new Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest
+ // ( System.String Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest+NamedString = foo
+ // , System.Int32 Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest+NamedInt =
+ // )
+ // | new Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest
+ // ( System.Boolean Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest+NamedBool = False
+ // , System.String Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest+NamedString = foo
+ // , System.Int32 Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest+NamedInt =
+ // )
+ // ]
MultiConstructorTest obj = null;
try
{
@@ -110,25 +109,25 @@ namespace Org.Apache.REEF.Tang.Tests.Injection
[TestMethod]
public void TestOnlyBoolParameter()
{
- //Multiple infeasible plans: Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest
- //, Org.Apache.REEF.Tang.Test
- //, Version=1.0.0.0
- //, Culture=neutral
- //, PublicKeyToken=null:
- // [ Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest = new Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest
- // ( System.Boolean Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest+NamedBool = False
- // , System.Int32 Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest+NamedInt =
- // )
- // | new Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest
- // ( System.String Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest+NamedString =
- // , System.Int32 Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest+NamedInt =
- // )
- // | new Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest
- // ( System.Boolean Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest+NamedBool = False
- // , System.String Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest+NamedString =
- // , System.Int32 Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest+NamedInt =
- // )
- // ]
+ // Multiple infeasible plans: Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest
+ // , Org.Apache.REEF.Tang.Test
+ // , Version=1.0.0.0
+ // , Culture=neutral
+ // , PublicKeyToken=null:
+ // [ Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest = new Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest
+ // ( System.Boolean Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest+NamedBool = False
+ // , System.Int32 Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest+NamedInt =
+ // )
+ // | new Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest
+ // ( System.String Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest+NamedString =
+ // , System.Int32 Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest+NamedInt =
+ // )
+ // | new Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest
+ // ( System.Boolean Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest+NamedBool = False
+ // , System.String Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest+NamedString =
+ // , System.Int32 Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest+NamedInt =
+ // )
+ // ]
MultiConstructorTest obj = null;
try
{
@@ -146,25 +145,25 @@ namespace Org.Apache.REEF.Tang.Tests.Injection
[TestMethod]
public void TestOnlyIntParameter()
{
- //Multiple infeasible plans: Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest
- //, Org.Apache.REEF.Tang.Test
- //, Version=1.0.0.0
- //, Culture=neutral
- //, PublicKeyToken=null:
+ // Multiple infeasible plans: Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest
+ // , Org.Apache.REEF.Tang.Test
+ // , Version=1.0.0.0
+ // , Culture=neutral
+ // , PublicKeyToken=null:
// [ Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest = new Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest
- // ( System.Boolean Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest+NamedBool =
- // , System.Int32 Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest+NamedInt = 8
- // )
- // | new Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest
- // ( System.String Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest+NamedString =
- // , System.Int32 Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest+NamedInt = 8
- // )
- // | new Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest
- // ( System.Boolean Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest+NamedBool =
- // , System.String Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest+NamedString =
- // , System.Int32 Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest+NamedInt = 8
- // )
- // ]
+ // ( System.Boolean Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest+NamedBool =
+ // , System.Int32 Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest+NamedInt = 8
+ // )
+ // | new Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest
+ // ( System.String Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest+NamedString =
+ // , System.Int32 Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest+NamedInt = 8
+ // )
+ // | new Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest
+ // ( System.Boolean Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest+NamedBool =
+ // , System.String Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest+NamedString =
+ // , System.Int32 Org.Apache.REEF.Tang.Tests.Injection.MultiConstructorTest+NamedInt = 8
+ // )
+ // ]
MultiConstructorTest obj = null;
try
{
@@ -238,7 +237,7 @@ namespace Org.Apache.REEF.Tang.Tests.Injection
ICsConfigurationBuilder cb2 = TangFactory.GetTang().NewConfigurationBuilder();
cb2.BindImplementation(typeof(IH), typeof(M));
- cb2.BindImplementation(typeof(M), typeof(L)); //construcotr of L is explicitly bound
+ cb2.BindImplementation(typeof(M), typeof(L)); // constructor of L is explicitly bound
IInjector i2 = TangFactory.GetTang().NewInjector(cb2.Build());
var o2 = i2.GetInstance<IH>();
Assert.IsTrue(o2 is L);
@@ -256,7 +255,7 @@ namespace Org.Apache.REEF.Tang.Tests.Injection
Assert.IsNotNull(o);
ICsConfigurationBuilder cb2 = TangFactory.GetTang().NewConfigurationBuilder();
- cb2.BindImplementation(typeof(IH), typeof(M1)); //M1 doesn't have injectable default constructor, no implementation L1 is bound to M1
+ cb2.BindImplementation(typeof(IH), typeof(M1)); // M1 doesn't have injectable default constructor, no implementation L1 is bound to M1
IInjector i2 = TangFactory.GetTang().NewInjector(cb2.Build());
string msg = null;
try
@@ -266,8 +265,8 @@ namespace Org.Apache.REEF.Tang.Tests.Injection
}
catch (Exception e)
{
- //Cannot inject Org.Apache.REEF.Tang.Tests.Injection.IH, Org.Apache.REEF.Tang.Test, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null:
- //No known implementations / injectable constructors for Org.Apache.REEF.Tang.Tests.Injection.M1, Org.Apache.REEF.Tang.Test, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ // Cannot inject Org.Apache.REEF.Tang.Tests.Injection.IH, Org.Apache.REEF.Tang.Test, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null:
+ // No known implementations / injectable constructors for Org.Apache.REEF.Tang.Tests.Injection.M1, Org.Apache.REEF.Tang.Test, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
msg = e.Message;
}
Assert.IsNotNull(msg);
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/dd07dc3e/lang/cs/Org.Apache.REEF.Tang.Tests/Injection/TestSetInjection.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/Injection/TestSetInjection.cs b/lang/cs/Org.Apache.REEF.Tang.Tests/Injection/TestSetInjection.cs
index 7101bf9..633e20f 100644
--- a/lang/cs/Org.Apache.REEF.Tang.Tests/Injection/TestSetInjection.cs
+++ b/lang/cs/Org.Apache.REEF.Tang.Tests/Injection/TestSetInjection.cs
@@ -172,8 +172,8 @@ namespace Org.Apache.REEF.Tang.Tests.Injection
public void TestSetOfClassBound()
{
ICsConfigurationBuilder cb = TangFactory.GetTang().NewConfigurationBuilder();
- cb.BindSetEntry<SetOfClasses, Integer1, INumber>(GenericType<SetOfClasses>.Class, GenericType<Integer1>.Class) //bind an impl to the interface of the set
- .BindNamedParameter<Integer1.NamedInt, int>(GenericType<Integer1.NamedInt>.Class, "4"); //bind parameter for the impl
+ cb.BindSetEntry<SetOfClasses, Integer1, INumber>(GenericType<SetOfClasses>.Class, GenericType<Integer1>.Class) // bind an impl to the interface of the set
+ .BindNamedParameter<Integer1.NamedInt, int>(GenericType<Integer1.NamedInt>.Class, "4"); // bind parameter for the impl
IInjector i = TangFactory.GetTang().NewInjector(cb.Build());
@@ -214,7 +214,7 @@ namespace Org.Apache.REEF.Tang.Tests.Injection
{
ICsConfigurationBuilder cb = TangFactory.GetTang().NewConfigurationBuilder();
- //when adding another Timeshift into the set for named parameter SetOfTimeshifts, it ends up the same entry.
+ // when adding another Timeshift into the set for named parameter SetOfTimeshifts, it ends up the same entry.
cb.BindSetEntry<SetOfTimeshifts, Timeshift, ITimeshift>(GenericType<SetOfTimeshifts>.Class, GenericType<Timeshift>.Class);
cb.BindSetEntry<SetOfTimeshifts, Timeshift, ITimeshift>(GenericType<SetOfTimeshifts>.Class, GenericType<Timeshift>.Class);
cb.BindNamedParameter<Timeshift.TimeshiftLinkId, string>(GenericType<Timeshift.TimeshiftLinkId>.Class, "123")
@@ -231,7 +231,7 @@ namespace Org.Apache.REEF.Tang.Tests.Injection
{
ICsConfigurationBuilder cb = TangFactory.GetTang().NewConfigurationBuilder();
- //Adding implementations from different subclasses
+ // Adding implementations from different subclasses
cb.BindSetEntry<SetOfTimeshifts, Timeshift, ITimeshift>(GenericType<SetOfTimeshifts>.Class, GenericType<Timeshift>.Class);
cb.BindSetEntry<SetOfTimeshifts, Timeshift1, ITimeshift>(GenericType<SetOfTimeshifts>.Class, GenericType<Timeshift1>.Class);
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/dd07dc3e/lang/cs/Org.Apache.REEF.Tang.Tests/Org.Apache.REEF.Tang.Tests.csproj
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/Org.Apache.REEF.Tang.Tests.csproj b/lang/cs/Org.Apache.REEF.Tang.Tests/Org.Apache.REEF.Tang.Tests.csproj
index d9ad057..25135d4 100644
--- a/lang/cs/Org.Apache.REEF.Tang.Tests/Org.Apache.REEF.Tang.Tests.csproj
+++ b/lang/cs/Org.Apache.REEF.Tang.Tests/Org.Apache.REEF.Tang.Tests.csproj
@@ -168,6 +168,7 @@ under the License.
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+ <Import Project="$(PackagesDir)\StyleCop.MSBuild.4.7.49.1\build\StyleCop.MSBuild.Targets" Condition="Exists('$(PackagesDir)\StyleCop.MSBuild.4.7.49.1\build\StyleCop.MSBuild.Targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
@@ -182,4 +183,4 @@ under the License.
<Target Name="AfterBuild">
</Target>
-->
-</Project>
\ No newline at end of file
+</Project>
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/dd07dc3e/lang/cs/Org.Apache.REEF.Tang.Tests/ScenarioTest/JettyHandler.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/ScenarioTest/JettyHandler.cs b/lang/cs/Org.Apache.REEF.Tang.Tests/ScenarioTest/JettyHandler.cs
index d70f289..ca663c6 100644
--- a/lang/cs/Org.Apache.REEF.Tang.Tests/ScenarioTest/JettyHandler.cs
+++ b/lang/cs/Org.Apache.REEF.Tang.Tests/ScenarioTest/JettyHandler.cs
@@ -27,7 +27,7 @@ namespace Org.Apache.REEF.Tang.Tests.ScenarioTest
{
}
- public class JettyHandler //: AbstractHandler
+ public class JettyHandler // : AbstractHandler
{
[Inject]
public JettyHandler([Parameter(typeof(HttpEventHandlers))] ISet<IHttpHandler> httpEventHandlers)
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/dd07dc3e/lang/cs/Org.Apache.REEF.Tang.Tests/ScenarioTest/TestHttpService.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/ScenarioTest/TestHttpService.cs b/lang/cs/Org.Apache.REEF.Tang.Tests/ScenarioTest/TestHttpService.cs
index 94a78c7..9674b77 100644
--- a/lang/cs/Org.Apache.REEF.Tang.Tests/ScenarioTest/TestHttpService.cs
+++ b/lang/cs/Org.Apache.REEF.Tang.Tests/ScenarioTest/TestHttpService.cs
@@ -148,7 +148,7 @@ namespace Org.Apache.REEF.Tang.Tests.ScenarioTest
public void OnHttpRequest(HttpRequest request, Httpresponse response)
{
- //handle the event
+ // handle the event
}
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/dd07dc3e/lang/cs/Org.Apache.REEF.Tang.Tests/SmokeTest/RootImplementation.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/SmokeTest/RootImplementation.cs b/lang/cs/Org.Apache.REEF.Tang.Tests/SmokeTest/RootImplementation.cs
index 5153eb2..90cf89b 100644
--- a/lang/cs/Org.Apache.REEF.Tang.Tests/SmokeTest/RootImplementation.cs
+++ b/lang/cs/Org.Apache.REEF.Tang.Tests/SmokeTest/RootImplementation.cs
@@ -31,7 +31,7 @@ namespace Org.Apache.REEF.Tang.Tests.SmokeTest
private readonly InjectableClass injectableClass;
private readonly SetOfImplementations setOfImplementations;
private readonly SetOfBaseTypes setOfBaseTypes;
- //private readonly ListOfBaseTypes listOfBaseTypes; //TODO: to recover once Avro NuGet support it
+ // private readonly ListOfBaseTypes listOfBaseTypes; // TODO: to recover once Avro NuGet support it
private readonly CyclicDependency cyclicDependency;
[Inject]
@@ -43,7 +43,7 @@ namespace Org.Apache.REEF.Tang.Tests.SmokeTest
InjectableClass injectableClass,
SetOfImplementations setOfImplementations,
SetOfBaseTypes setOfBaseTypes,
- //ListOfBaseTypes listOfBaseTypes, //TODO: to recover once Avro NuGet support it
+ // ListOfBaseTypes listOfBaseTypes, // TODO: to recover once Avro NuGet support it
CyclicDependency cyclicDependency)
{
this.requiredString = requiredString;
@@ -54,7 +54,7 @@ namespace Org.Apache.REEF.Tang.Tests.SmokeTest
this.injectableClass = injectableClass;
this.setOfImplementations = setOfImplementations;
this.setOfBaseTypes = setOfBaseTypes;
- //this.listOfBaseTypes = listOfBaseTypes; //TODO: to recover once Avro NuGet support it
+ // this.listOfBaseTypes = listOfBaseTypes; // TODO: to recover once Avro NuGet support it
this.cyclicDependency = cyclicDependency;
}
@@ -149,11 +149,11 @@ namespace Org.Apache.REEF.Tang.Tests.SmokeTest
return false;
}
- //TODO: to recover once Avro NuGet support it
- //if (listOfBaseTypes != null ? !listOfBaseTypes.Equals(that.listOfBaseTypes) : that.listOfBaseTypes != null)
- //{
- // return false;
- //}
+ ////TODO: to recover once Avro NuGet support it
+ ////if (listOfBaseTypes != null ? !listOfBaseTypes.Equals(that.listOfBaseTypes) : that.listOfBaseTypes != null)
+ ////{
+ //// return false;
+ ////}
if (cyclicDependency != null
? !cyclicDependency.Equals(that.cyclicDependency)
: that.cyclicDependency != null)
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/dd07dc3e/lang/cs/Org.Apache.REEF.Tang.Tests/Tang/TestLegacyConstructors.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/Tang/TestLegacyConstructors.cs b/lang/cs/Org.Apache.REEF.Tang.Tests/Tang/TestLegacyConstructors.cs
index e7ddcd7..bbadb8a 100644
--- a/lang/cs/Org.Apache.REEF.Tang.Tests/Tang/TestLegacyConstructors.cs
+++ b/lang/cs/Org.Apache.REEF.Tang.Tests/Tang/TestLegacyConstructors.cs
@@ -45,7 +45,7 @@ namespace Org.Apache.REEF.Tang.Tests.Tang
constructorArg.Add(ReflectionUtilities.GetAssemblyQualifiedName(typeof(int)));
constructorArg.Add(ReflectionUtilities.GetAssemblyQualifiedName(typeof(string)));
cb.RegisterLegacyConstructor(ReflectionUtilities.GetAssemblyQualifiedName(typeof(LegacyConstructor)), constructorArg);
- //cb.Bind(typeof(LegacyConstructor), typeof(LegacyConstructor));
+ // cb.Bind(typeof(LegacyConstructor), typeof(LegacyConstructor));
cb.BindImplementation(GenericType<LegacyConstructor>.Class, GenericType<LegacyConstructor>.Class);
IInjector i = tang.NewInjector(cb.Build());
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/dd07dc3e/lang/cs/Org.Apache.REEF.Tang.Tests/Tang/TestTang.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/Tang/TestTang.cs b/lang/cs/Org.Apache.REEF.Tang.Tests/Tang/TestTang.cs
index 202b911..c0b7a39 100644
--- a/lang/cs/Org.Apache.REEF.Tang.Tests/Tang/TestTang.cs
+++ b/lang/cs/Org.Apache.REEF.Tang.Tests/Tang/TestTang.cs
@@ -66,18 +66,18 @@ namespace Org.Apache.REEF.Tang.Tests.Tang
public void TestSingleton()
{
IInjector injector = tang.NewInjector();
- Assert.IsNotNull(injector.GetInstance(typeof (TwoSingletons)));
- Assert.IsNotNull(injector.GetInstance(typeof (TwoSingletons)));
+ Assert.IsNotNull(injector.GetInstance(typeof(TwoSingletons)));
+ Assert.IsNotNull(injector.GetInstance(typeof(TwoSingletons)));
}
[TestMethod]
public void TestNotSingleton()
{
TwoSingletons obj = null;
- Assert.IsNotNull(tang.NewInjector().GetInstance(typeof (TwoSingletons)));
+ Assert.IsNotNull(tang.NewInjector().GetInstance(typeof(TwoSingletons)));
try
{
- obj = (TwoSingletons) tang.NewInjector().GetInstance(typeof (TwoSingletons));
+ obj = (TwoSingletons)tang.NewInjector().GetInstance(typeof(TwoSingletons));
}
catch (InjectionException)
{
@@ -95,7 +95,7 @@ namespace Org.Apache.REEF.Tang.Tests.Tang
ICsConfigurationBuilder t = tang.NewConfigurationBuilder();
node =
t.GetClassHierarchy()
- .GetNode(ReflectionUtilities.GetAssemblyQualifiedName(typeof (RepeatedAmbiguousArgs)));
+ .GetNode(ReflectionUtilities.GetAssemblyQualifiedName(typeof(RepeatedAmbiguousArgs)));
}
catch (ClassHierarchyException)
{
@@ -111,7 +111,7 @@ namespace Org.Apache.REEF.Tang.Tests.Tang
cb.BindNamedParameter<RepeatedNamedArgs.B, Int32>(GenericType<RepeatedNamedArgs.B>.Class, "2");
IInjector injector = tang.NewInjector(cb.Build());
- injector.GetInstance(typeof (RepeatedNamedArgs));
+ injector.GetInstance(typeof(RepeatedNamedArgs));
}
// NamedParameter A has no default_value, so this should throw.
@@ -147,10 +147,10 @@ namespace Org.Apache.REEF.Tang.Tests.Tang
{
IInjector i = tang.NewInjector();
i.BindVolatileParameter(GenericType<RepeatedNamedSingletonArgs.A>.Class,
- (MustBeSingleton) i.GetInstance(typeof (MustBeSingleton)));
+ (MustBeSingleton)i.GetInstance(typeof(MustBeSingleton)));
i.BindVolatileParameter(GenericType<RepeatedNamedSingletonArgs.B>.Class,
- (MustBeSingleton) i.GetInstance(typeof (MustBeSingleton)));
- i.GetInstance(typeof (RepeatedNamedSingletonArgs));
+ (MustBeSingleton)i.GetInstance(typeof(MustBeSingleton)));
+ i.GetInstance(typeof(RepeatedNamedSingletonArgs));
}
[TestMethod]
@@ -158,7 +158,7 @@ namespace Org.Apache.REEF.Tang.Tests.Tang
{
ICsConfigurationBuilder cb = tang.NewConfigurationBuilder();
cb.BindImplementation(GenericType<Interf>.Class, GenericType<Impl>.Class);
- tang.NewInjector(cb.Build()).GetInstance(typeof (Interf));
+ tang.NewInjector(cb.Build()).GetInstance(typeof(Interf));
}
[TestMethod]
@@ -166,11 +166,11 @@ namespace Org.Apache.REEF.Tang.Tests.Tang
{
ICsConfigurationBuilder cb = tang.NewConfigurationBuilder();
OneNamedStringArg a =
- (OneNamedStringArg) tang.NewInjector(cb.Build()).GetInstance(typeof (OneNamedStringArg));
+ (OneNamedStringArg)tang.NewInjector(cb.Build()).GetInstance(typeof(OneNamedStringArg));
Assert.AreEqual("default", a.s);
cb.BindNamedParameter<OneNamedStringArg.A, string>(GenericType<OneNamedStringArg.A>.Class, "not default");
IInjector i = tang.NewInjector(cb.Build());
- Assert.AreEqual("not default", ((OneNamedStringArg) i.GetInstance(typeof (OneNamedStringArg))).s);
+ Assert.AreEqual("not default", ((OneNamedStringArg)i.GetInstance(typeof(OneNamedStringArg))).s);
string msg = null;
try
{
@@ -278,10 +278,10 @@ namespace Org.Apache.REEF.Tang.Tests.Tang
cb.BindNamedParameter<BImplName, Bimpl, INamedImplA>(GenericType<BImplName>.Class, GenericType<Bimpl>.Class);
IInjector i = TangFactory.GetTang().NewInjector(cb.Build());
- Aimpl a1 = (Aimpl) i.GetNamedInstance<AImplName, INamedImplA>(GenericType<AImplName>.Class);
- Aimpl a2 = (Aimpl) i.GetNamedInstance<AImplName, INamedImplA>(GenericType<AImplName>.Class);
- Bimpl b1 = (Bimpl) i.GetNamedInstance<BImplName, INamedImplA>(GenericType<BImplName>.Class);
- Bimpl b2 = (Bimpl) i.GetNamedInstance<BImplName, INamedImplA>(GenericType<BImplName>.Class);
+ Aimpl a1 = (Aimpl)i.GetNamedInstance<AImplName, INamedImplA>(GenericType<AImplName>.Class);
+ Aimpl a2 = (Aimpl)i.GetNamedInstance<AImplName, INamedImplA>(GenericType<AImplName>.Class);
+ Bimpl b1 = (Bimpl)i.GetNamedInstance<BImplName, INamedImplA>(GenericType<BImplName>.Class);
+ Bimpl b2 = (Bimpl)i.GetNamedInstance<BImplName, INamedImplA>(GenericType<BImplName>.Class);
Assert.AreSame(a1, a2);
Assert.AreSame(b1, b2);
}
@@ -352,7 +352,7 @@ namespace Org.Apache.REEF.Tang.Tests.Tang
cb.BindNamedParameter<TwoConstructors.TCInt, Int32>(GenericType<TwoConstructors.TCInt>.Class, "1");
cb.BindNamedParameter<ThreeConstructors.TCString, string>(GenericType<ThreeConstructors.TCString>.Class, "s");
tang.NewInjector(cb.Build()).GetInstance<TwoConstructors>();
- msg = @"Cannot inject Org.Apache.REEF.Tang.Tests.Tang.TwoConstructors, Org.Apache.REEF.Tang.Test, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null "+
+ msg = @"Cannot inject Org.Apache.REEF.Tang.Tests.Tang.TwoConstructors, Org.Apache.REEF.Tang.Test, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null " +
"Ambiguous subplan Org.Apache.REEF.Tang.Tests.Tang.TwoConstructors, Org.Apache.REEF.Tang.Test, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" +
"new Org.Apache.REEF.Tang.Tests.Tang.TwoConstructors(System.Int32 Org.Apache.REEF.Tang.Tests.Tang.TwoConstructors+TCInt = 1, System.String Org.Apache.REEF.Tang.Tests.Tang.TwoConstructors+TCString = s)" +
"new Org.Apache.REEF.Tang.Tests.Tang.TwoConstructors(System.String Org.Apache.REEF.Tang.Tests.Tang.TwoConstructors+TCString = s, System.Int32 Org.Apache.REEF.Tang.Tests.Tang.TwoConstructors+TCInt = 1)";
@@ -391,8 +391,8 @@ namespace Org.Apache.REEF.Tang.Tests.Tang
public void TestInjectInjector()
{
IInjector i = TangFactory.GetTang().NewInjector();
- var ii = (InjectInjector) i.GetInstance(typeof(InjectInjector));
- //Assert.IsTrue(ii.i is IInjector);
+ var ii = (InjectInjector)i.GetInstance(typeof(InjectInjector));
+ // Assert.IsTrue(ii.i is IInjector);
Assert.AreNotSame(i, ii.i);
}
@@ -621,7 +621,7 @@ namespace Org.Apache.REEF.Tang.Tests.Tang
}
[Inject]
- public RepeatedNamedArgs([Parameter(typeof (A))] int x, [Parameter(Value = typeof (B))] int y)
+ public RepeatedNamedArgs([Parameter(typeof(A))] int x, [Parameter(Value = typeof(B))] int y)
{
}
}
@@ -639,8 +639,8 @@ namespace Org.Apache.REEF.Tang.Tests.Tang
}
[Inject]
- public RepeatedNamedSingletonArgs([Parameter(typeof (A))] MustBeSingleton a,
- [Parameter(typeof (B))] MustBeSingleton b)
+ public RepeatedNamedSingletonArgs([Parameter(typeof(A))] MustBeSingleton a,
+ [Parameter(typeof(B))] MustBeSingleton b)
{
}
}
@@ -658,7 +658,7 @@ namespace Org.Apache.REEF.Tang.Tests.Tang
}
[Inject]
- public OneNamedSingletonArgs([Parameter(typeof (A))] MustBeSingleton a)
+ public OneNamedSingletonArgs([Parameter(typeof(A))] MustBeSingleton a)
{
}
}
@@ -675,7 +675,7 @@ namespace Org.Apache.REEF.Tang.Tests.Tang
internal class Impl : Interf
{
[Inject]
- private Impl([Parameter(Value = typeof (Param))] int p)
+ private Impl([Parameter(Value = typeof(Param))] int p)
{
}
}
@@ -690,7 +690,7 @@ namespace Org.Apache.REEF.Tang.Tests.Tang
public string s;
[Inject]
- private OneNamedStringArg([Parameter(typeof (A))] string s)
+ private OneNamedStringArg([Parameter(typeof(A))] string s)
{
this.s = s;
}
@@ -712,7 +712,7 @@ namespace Org.Apache.REEF.Tang.Tests.Tang
public string b;
[Inject]
- private TwoNamedStringArgs([Parameter(typeof (A))] string a, [Parameter(typeof (B))] String b)
+ private TwoNamedStringArgs([Parameter(typeof(A))] string a, [Parameter(typeof(B))] String b)
{
this.a = a;
this.b = b;
@@ -833,10 +833,10 @@ namespace Org.Apache.REEF.Tang.Tests.Tang
public class ABtaker
{
[Inject]
- private ABtaker([Parameter(typeof (AImplName))] INamedImplA a, [Parameter(typeof (BImplName))] INamedImplA b)
+ private ABtaker([Parameter(typeof(AImplName))] INamedImplA a, [Parameter(typeof(BImplName))] INamedImplA b)
{
- //Assert.IsTrue(a is Aimpl, "AImplName must be instance of Aimpl");
- //Assert.IsTrue(b is Bimpl, "BImplName must be instance of Bimpl");
+ // Assert.IsTrue(a is Aimpl, "AImplName must be instance of Aimpl");
+ // Assert.IsTrue(b is Bimpl, "BImplName must be instance of Bimpl");
}
}
}
@@ -876,13 +876,13 @@ namespace Org.Apache.REEF.Tang.Tests.Tang
public float f;
[NamedParameter]
- public class TCInt : Name<Int32> {}
+ public class TCInt : Name<Int32> { }
[NamedParameter]
public class TCString : Name<string> { }
[NamedParameter]
- public class TCFloat : Name<float> {}
+ public class TCFloat : Name<float> { }
[Inject]
public ThreeConstructors([Parameter(typeof(TCInt))] int i, [Parameter(typeof(TCString))] string s)
@@ -966,25 +966,25 @@ namespace Org.Apache.REEF.Tang.Tests.Tang
{
}
- //[NamedParameter(DefaultClass = typeof(XAA))]
- //public class XNameDA : Name<X<BB>>
- //{
- //}
+ // [NamedParameter(DefaultClass = typeof(XAA))]
+ // public class XNameDA : Name<X<BB>>
+ // {
+ // }
[NamedParameter(DefaultClass = typeof(XBB))]
public class XNameDB : Name<X<BB>>
{
}
- //[NamedParameter(DefaultClass = typeof(XCC))]
- //public class XNameDC : Name<X<BB>>
- //{
- //}
+ // [NamedParameter(DefaultClass = typeof(XCC))]
+ // public class XNameDC : Name<X<BB>>
+ // {
+ // }
- //[NamedParameter(DefaultClass = typeof(XCC))]
- //public class XNameDAA : Name<XBB>
- //{
- //}
+ // [NamedParameter(DefaultClass = typeof(XCC))]
+ // public class XNameDAA : Name<XBB>
+ // {
+ // }
[NamedParameter(DefaultClass = typeof(XXBB))]
public class XNameDDAA : Name<XBB>
@@ -1062,17 +1062,17 @@ namespace Org.Apache.REEF.Tang.Tests.Tang
class GasCan : Bottle<Gas>
{
}
- class Water {}
- class Gas {}
+ class Water { }
+ class Gas { }
- [NamedParameter(DefaultClass=typeof(GasCan))]
+ [NamedParameter(DefaultClass = typeof(GasCan))]
class WaterBottleName : Name<Bottle<Water>> { }
- interface IEventHandler <T> { }
+ interface IEventHandler<T> { }
class MyEventHandler<T> : IEventHandler<T>
{
[Inject]
- MyEventHandler () { }
+ MyEventHandler() { }
}
[DefaultImplementation(typeof(MyEventHandler<Foo>))]
@@ -1092,12 +1092,12 @@ namespace Org.Apache.REEF.Tang.Tests.Tang
class AH
{
[Inject]
- AH() {}
+ AH() { }
}
class BH
{
[Inject]
- BH() {}
+ BH() { }
}
[DefaultImplementation(typeof(AHandlerImpl))]
@@ -1138,8 +1138,8 @@ namespace Org.Apache.REEF.Tang.Tests.Tang
{
[Inject]
WantSomeFutureHandlersName(
- [Parameter(typeof (AHandlerName))] IInjectionFuture<IEventHandler<AH>> a,
- [Parameter(typeof (BHandlerName))] IInjectionFuture<IEventHandler<BH>> b)
+ [Parameter(typeof(AHandlerName))] IInjectionFuture<IEventHandler<AH>> a,
+ [Parameter(typeof(BHandlerName))] IInjectionFuture<IEventHandler<BH>> b)
{
}
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/dd07dc3e/lang/cs/Org.Apache.REEF.Tang.Tests/Utilities/AssemblyLoaderTests.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/Utilities/AssemblyLoaderTests.cs b/lang/cs/Org.Apache.REEF.Tang.Tests/Utilities/AssemblyLoaderTests.cs
index 50278dd..0ce2057 100644
--- a/lang/cs/Org.Apache.REEF.Tang.Tests/Utilities/AssemblyLoaderTests.cs
+++ b/lang/cs/Org.Apache.REEF.Tang.Tests/Utilities/AssemblyLoaderTests.cs
@@ -28,13 +28,13 @@ namespace Org.Apache.REEF.Tang.Tests.Utilities
[TestMethod]
public void AssemblyLoadingFailsNoException()
{
- var notUsed = new AssemblyLoader(new []{"DoesNotExist.dll"});
+ var notUsed = new AssemblyLoader(new[] { "DoesNotExist.dll" });
}
[TestMethod]
public void AssemblyLoadingSomeSucceedFailuresAreIgnored()
{
- var loader = new AssemblyLoader(new []{"DoesNotExist.dll", FileNames.Examples});
+ var loader = new AssemblyLoader(new[] { "DoesNotExist.dll", FileNames.Examples });
Assert.AreEqual(1, loader.Assemblies.Count);
Assert.IsTrue(loader.Assemblies.First().GetName().Name == FileNames.Examples);
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/dd07dc3e/lang/cs/Org.Apache.REEF.Tang.Tests/Utilities/TestUtilities.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/Utilities/TestUtilities.cs b/lang/cs/Org.Apache.REEF.Tang.Tests/Utilities/TestUtilities.cs
index c284c38..41102ec 100644
--- a/lang/cs/Org.Apache.REEF.Tang.Tests/Utilities/TestUtilities.cs
+++ b/lang/cs/Org.Apache.REEF.Tang.Tests/Utilities/TestUtilities.cs
@@ -177,7 +177,7 @@ namespace Org.Apache.REEF.Tang.Tests.Utilities
Type iface = typeof(ISet<>);
Type type = typeof(MySet<string>);
Type p = ReflectionUtilities.GetInterfaceTarget(iface, type);
- Assert.IsTrue(p.Equals(typeof (string)));
+ Assert.IsTrue(p.Equals(typeof(string)));
}
[TestMethod]
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/dd07dc3e/lang/cs/Org.Apache.REEF.Tang.Tools/Org.Apache.REEF.Tang.Tools.csproj
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang.Tools/Org.Apache.REEF.Tang.Tools.csproj b/lang/cs/Org.Apache.REEF.Tang.Tools/Org.Apache.REEF.Tang.Tools.csproj
index d9a998d..8d92a33 100644
--- a/lang/cs/Org.Apache.REEF.Tang.Tools/Org.Apache.REEF.Tang.Tools.csproj
+++ b/lang/cs/Org.Apache.REEF.Tang.Tools/Org.Apache.REEF.Tang.Tools.csproj
@@ -56,6 +56,7 @@ under the License.
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+ <Import Project="$(PackagesDir)\StyleCop.MSBuild.4.7.49.1\build\StyleCop.MSBuild.Targets" Condition="Exists('$(PackagesDir)\StyleCop.MSBuild.4.7.49.1\build\StyleCop.MSBuild.Targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
@@ -69,4 +70,4 @@ under the License.
<Target Name="AfterBuild">
</Target>
-->
-</Project>
\ No newline at end of file
+</Project>
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/dd07dc3e/lang/cs/Org.Apache.REEF.Tang/Exceptions/BindException.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Exceptions/BindException.cs b/lang/cs/Org.Apache.REEF.Tang/Exceptions/BindException.cs
index 22ee144..70f1742 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Exceptions/BindException.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Exceptions/BindException.cs
@@ -23,7 +23,7 @@ namespace Org.Apache.REEF.Tang.Exceptions
{
public class BindException : SystemException
{
- //private static readonly long serialVersionUID = 1L;
+ // private static readonly long serialVersionUID = 1L;
public BindException(String message)
: base(message)
{
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/dd07dc3e/lang/cs/Org.Apache.REEF.Tang/Exceptions/ClassHierarchyException.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Exceptions/ClassHierarchyException.cs b/lang/cs/Org.Apache.REEF.Tang/Exceptions/ClassHierarchyException.cs
index 496aea6..091e326 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Exceptions/ClassHierarchyException.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Exceptions/ClassHierarchyException.cs
@@ -23,7 +23,7 @@ namespace Org.Apache.REEF.Tang.Exceptions
{
public class ClassHierarchyException : SystemException
{
- public ClassHierarchyException(String msg) : base(msg)
+ public ClassHierarchyException(String msg) : base(msg)
{
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/dd07dc3e/lang/cs/Org.Apache.REEF.Tang/Exceptions/NameResolutionException.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Exceptions/NameResolutionException.cs b/lang/cs/Org.Apache.REEF.Tang/Exceptions/NameResolutionException.cs
index e023f68..2bdbedc 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Exceptions/NameResolutionException.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Exceptions/NameResolutionException.cs
@@ -23,7 +23,7 @@ namespace Org.Apache.REEF.Tang.Exceptions
{
public class NameResolutionException : BindException
{
- //private static readonly long serialVersionUID = 1L;
+ // private static readonly long serialVersionUID = 1L;
public NameResolutionException(String name, String longestPrefix) :
base(string.Format("Could not resolve {0}. Search ended at prefix {1}. This can happen due to typos in class names that are passed as strings, or because Tang uses Assembly loader other than the one that generated the class reference ((make sure you use the full name of a class)",
name, longestPrefix))
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/dd07dc3e/lang/cs/Org.Apache.REEF.Tang/Formats/AvroConfigurationSerializer.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Formats/AvroConfigurationSerializer.cs b/lang/cs/Org.Apache.REEF.Tang/Formats/AvroConfigurationSerializer.cs
index fe1d7e6..e43d751 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Formats/AvroConfigurationSerializer.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Formats/AvroConfigurationSerializer.cs
@@ -180,9 +180,6 @@ namespace Org.Apache.REEF.Tang.Formats
}
buffer.Seek(0, SeekOrigin.Begin);
- //AvroSerializerSettings settings = new AvroSerializerSettings();
- //settings.Resolver = new AvroConfigurationResolver();
- //using (var reader = new SequentialReader<AvroConfiguration>(AvroContainer.CreateReader<AvroConfiguration>(buffer, true, settings, new CodecFactory())))
using (var reader = new SequentialReader<AvroConfiguration>(AvroContainer.CreateReader<AvroConfiguration>(buffer, true)))
{
var results = reader.Objects;
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/dd07dc3e/lang/cs/Org.Apache.REEF.Tang/Formats/ConfigurationFile.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Formats/ConfigurationFile.cs b/lang/cs/Org.Apache.REEF.Tang/Formats/ConfigurationFile.cs
index f0c0157..ae8f66e 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Formats/ConfigurationFile.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Formats/ConfigurationFile.cs
@@ -78,7 +78,7 @@ namespace Org.Apache.REEF.Tang.Formats
catch (ApplicationException e)
{
Org.Apache.REEF.Utilities.Diagnostics.Exceptions.Caught(e, Level.Warning, LOGGER);
- return name;//if name is not a type, return as it was
+ return name; // if name is not a type, return as it was
}
}
@@ -93,13 +93,13 @@ namespace Org.Apache.REEF.Tang.Formats
catch (ApplicationException e)
{
Org.Apache.REEF.Utilities.Diagnostics.Exceptions.Caught(e, Level.Warning, LOGGER);
- return s;//if name is not a type, return as it was
+ return s; // if name is not a type, return as it was
}
}
public static HashSet<String> ToConfigurationStringList(IConfiguration c)
{
- ConfigurationImpl conf = (ConfigurationImpl) c;
+ ConfigurationImpl conf = (ConfigurationImpl)c;
HashSet<string> l = new HashSet<string>();
foreach (IClassNode opt in conf.GetBoundImplementations())
{
@@ -289,7 +289,7 @@ namespace Org.Apache.REEF.Tang.Formats
*/
private static string Escape(string str)
{
- return str; //TODO
+ return str; // TODO
// After regexp escaping \\\\ = 1 slash, \\\\\\\\ = 2 slashes.
// Also, the second args of replaceAll are neither strings nor regexps, and
@@ -297,7 +297,7 @@ namespace Org.Apache.REEF.Tang.Formats
// escape slashes (4 slashes) and quotes (3 slashes + ") in those strings.
// Since we need to write \\ and \", we end up with 8 and 7 slashes,
// respectively.
- //return in.ReplaceAll("\\\\", "\\\\\\\\").replaceAll("\"", "\\\\\\\"");
+ // return in.ReplaceAll("\\\\", "\\\\\\\\").replaceAll("\"", "\\\\\\\"");
}
public static StringBuilder Join(StringBuilder sb, String sep, IConstructorArg[] types)
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/dd07dc3e/lang/cs/Org.Apache.REEF.Tang/Formats/ConfigurationModule.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Formats/ConfigurationModule.cs b/lang/cs/Org.Apache.REEF.Tang/Formats/ConfigurationModule.cs
index 5fda89d..346112a 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Formats/ConfigurationModule.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Formats/ConfigurationModule.cs
@@ -57,7 +57,6 @@ namespace Org.Apache.REEF.Tang.Formats
this.Builder = builder.DeepCopy();
}
- //public final <T> ConfigurationModule set(Impl<T> opt, Class<? extends T> impl)
public ConfigurationModule Set<T, U>(IImpl<T> opt, GenericType<U> impl)
where U : T
{
@@ -107,12 +106,11 @@ namespace Org.Apache.REEF.Tang.Formats
////TODO
////public readonly ConfigurationModule set(Param<? extends Number> opt, Number val)
////{
- //// return set(opt, val);
+ //// return set(opt, val);
////}
public ConfigurationModule Set<T>(IParam<T> opt, string val)
{
- //var o = (IParam<object>)opt;
ConfigurationModule c = DeepCopy();
c.ProcessSet(opt);
if (c.Builder.SetOpts.Contains(opt))
@@ -186,18 +184,18 @@ namespace Org.Apache.REEF.Tang.Formats
{
foreach (Type clz in c.setImplSets.GetValuesForKey(i))
{
- ICsInternalConfigurationBuilder b = (ICsInternalConfigurationBuilder) c.Builder.B;
+ ICsInternalConfigurationBuilder b = (ICsInternalConfigurationBuilder)c.Builder.B;
b.BindSetEntry(clazz, clz);
}
foreach (string s in c.setLateImplSets.GetValuesForKey(i))
{
- ICsInternalConfigurationBuilder b = (ICsInternalConfigurationBuilder) c.Builder.B;
+ ICsInternalConfigurationBuilder b = (ICsInternalConfigurationBuilder)c.Builder.B;
b.BindSetEntry(clazz, s);
}
}
else if (c.setImplLists.ContainsKey(i))
{
- ICsConfigurationBuilder b = (ICsConfigurationBuilder) c.Builder.B;
+ ICsConfigurationBuilder b = (ICsConfigurationBuilder)c.Builder.B;
b.BindList(clazz, setImplLists.Get(i));
}
else if (c.setLateImplLists.ContainsKey(i))
@@ -207,7 +205,6 @@ namespace Org.Apache.REEF.Tang.Formats
}
}
- //for (Class<? extends Name<?>> clazz : c.builder.freeParams.Keys) {
foreach (Type clazz in c.Builder.FreeParams.Keys)
{
object p = c.Builder.FreeParams.Get(clazz);
@@ -237,7 +234,6 @@ namespace Org.Apache.REEF.Tang.Formats
if (!foundOne)
{
- //if (!(p is OptionalParameter<object>)) //p: OptionalParameter<int>, "is" doesn't work here for generic type object
if (!ReflectionUtilities.IsInstanceOfGeneric(p, typeof(OptionalParameter<>)))
{
Org.Apache.REEF.Utilities.Diagnostics.Exceptions.Throw(new IllegalStateException(), LOGGER);
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/dd07dc3e/lang/cs/Org.Apache.REEF.Tang/Formats/ConfigurationModuleBuilder.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Formats/ConfigurationModuleBuilder.cs b/lang/cs/Org.Apache.REEF.Tang/Formats/ConfigurationModuleBuilder.cs
index 03571ea..47e1179 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Formats/ConfigurationModuleBuilder.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Formats/ConfigurationModuleBuilder.cs
@@ -38,7 +38,7 @@ namespace Org.Apache.REEF.Tang.Formats
public readonly MonotonicHashSet<object> SetOpts = new MonotonicHashSet<object>();
public readonly MonotonicHashMap<object, FieldInfo> Map = new MonotonicHashMap<object, FieldInfo>();
public readonly MonotonicHashMap<Type, object> FreeImpls = new MonotonicHashMap<Type, object>();
- public readonly MonotonicHashMap<Type, object> FreeParams = new MonotonicHashMap<Type, object>(); //Type must extends from Name<>
+ public readonly MonotonicHashMap<Type, object> FreeParams = new MonotonicHashMap<Type, object>(); // Type must extends from Name<>
private static readonly Logger LOGGER = Logger.GetLogger(typeof(ConfigurationModuleBuilder));
private static readonly ISet<Type> ParamBlacklist = new MonotonicHashSet<Type>(new Type[] { typeof(IParam<>), typeof(IImpl<>) });
@@ -172,7 +172,7 @@ namespace Org.Apache.REEF.Tang.Formats
c.reqUsed.AddAll(d.Builder.reqUsed);
c.optUsed.AddAll(d.Builder.optUsed);
c.SetOpts.AddAll(d.Builder.SetOpts);
- //c.ListOpts.AddAll(d.Builder.ListOpts);
+ // c.ListOpts.AddAll(d.Builder.ListOpts);
c.Map.AddAll(d.Builder.Map);
c.FreeImpls.AddAll(d.Builder.FreeImpls);
c.FreeParams.AddAll(d.Builder.FreeParams);
@@ -346,8 +346,8 @@ namespace Org.Apache.REEF.Tang.Formats
return c;
}
- //public final <T> ConfigurationModuleBuilder bindNamedParameter(Class<? extends Name<T>> iface, Class<? extends T> impl)
- //if V is T, you'd better to use public ConfigurationModuleBuilder BindNamedParameter<U, T>(GenericType<U> iface, GenericType<T> impl) defined below
+ // public final <T> ConfigurationModuleBuilder bindNamedParameter(Class<? extends Name<T>> iface, Class<? extends T> impl)
+ // if V is T, you'd better to use public ConfigurationModuleBuilder BindNamedParameter<U, T>(GenericType<U> iface, GenericType<T> impl) defined below
public ConfigurationModuleBuilder BindNamedParameter<U, V, T>(GenericType<U> iface, GenericType<V> impl)
where U : Name<T>
where V : T
@@ -382,7 +382,7 @@ namespace Org.Apache.REEF.Tang.Formats
}
// public final <T> ConfigurationModuleBuilder bindNamedParameter(Class<? extends Name<T>> iface, Impl<? extends T> opt)
- //if ValueType is T, you would better to use public ConfigurationModuleBuilder BindNamedParameter<U, T>(GenericType<U> iface, IImpl<T> opt)
+ // if ValueType is T, you would better to use public ConfigurationModuleBuilder BindNamedParameter<U, T>(GenericType<U> iface, IImpl<T> opt)
public ConfigurationModuleBuilder BindNamedParameter<U, V, T>(GenericType<U> iface, IImpl<V> opt)
where U : Name<T>
where V : T
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/dd07dc3e/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/AbstractNode.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/AbstractNode.cs b/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/AbstractNode.cs
index 5eedaea..f6b9c06 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/AbstractNode.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/AbstractNode.cs
@@ -33,12 +33,12 @@ namespace Org.Apache.REEF.Tang.Implementations.ClassHierarchy
/// It is from Type.AssemblyQualifiedName. THis name is used as full name in a Node
/// It is unique for a generic type with different type of arguments.
- private readonly String fullName; //it comes from
+ private readonly String fullName;
- //parent node in the class hierarchy
+ // parent node in the class hierarchy
private readonly INode parent;
- //children in the class hierarchy
+ // children in the class hierarchy
protected IDictionary<String, INode> children = new MonotonicTreeMap<string, INode>();
public AbstractNode(INode parent, String name, String fullName)
@@ -94,10 +94,10 @@ namespace Org.Apache.REEF.Tang.Implementations.ClassHierarchy
public override bool Equals(Object o)
{
- if(o == null) return false;
- if(o == this) return true;
+ if (o == null) return false;
+ if (o == this) return true;
- AbstractNode n = (AbstractNode) o;
+ AbstractNode n = (AbstractNode)o;
bool parentsEqual;
if (n.parent == this.parent) {
parentsEqual = true;
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/dd07dc3e/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/AvroClassHierarchySerializer.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/AvroClassHierarchySerializer.cs b/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/AvroClassHierarchySerializer.cs
index bb16e1c..f5409f2 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/AvroClassHierarchySerializer.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/AvroClassHierarchySerializer.cs
@@ -205,7 +205,7 @@ namespace Org.Apache.REEF.Tang.Implementations.ClassHierarchy
if (n is IClassNode)
{
- IClassNode cn = (IClassNode) n;
+ IClassNode cn = (IClassNode)n;
IList<IConstructorDef> injectable = cn.GetInjectableConstructors();
IList<IConstructorDef> all = cn.GetAllConstructors();
IList<IConstructorDef> others = new List<IConstructorDef>(all);
@@ -230,7 +230,7 @@ namespace Org.Apache.REEF.Tang.Implementations.ClassHierarchy
List<string> implFullNames = new List<string>();
foreach (IClassNode impl in cn.GetKnownImplementations())
{
- implFullNames.Add(impl.GetFullName()); //we use class fully qualified name
+ implFullNames.Add(impl.GetFullName()); // we use class fully qualified name
}
return NewClassNode(cn.GetName(), cn.GetFullName(),
@@ -240,7 +240,7 @@ namespace Org.Apache.REEF.Tang.Implementations.ClassHierarchy
if (n is INamedParameterNode)
{
- INamedParameterNode np = (INamedParameterNode) n;
+ INamedParameterNode np = (INamedParameterNode)n;
return NewNamedParameterNode(np.GetName(), np.GetFullName(),
np.GetSimpleArgName(), np.GetFullArgName(), np.IsSet(), np.IsList(), np.GetDocumentation(),
np.GetShortName(), np.GetDefaultInstanceAsStrings(), children);
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/dd07dc3e/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/ClassHierarchyImpl.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/ClassHierarchyImpl.cs b/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/ClassHierarchyImpl.cs
index ae2ac31..8e2ff59 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/ClassHierarchyImpl.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/ClassHierarchyImpl.cs
@@ -35,7 +35,7 @@ namespace Org.Apache.REEF.Tang.Implementations.ClassHierarchy
{
public class ClassHierarchyImpl : ICsClassHierarchy
{
- private static readonly Logger LOGGER = Logger.GetLogger(typeof (ClassHierarchyImpl));
+ private static readonly Logger LOGGER = Logger.GetLogger(typeof(ClassHierarchyImpl));
private readonly INode rootNode;
private readonly MonotonicTreeMap<string, INamedParameterNode> shortNames = new MonotonicTreeMap<string, INamedParameterNode>();
private readonly IList<string> assemblies;
@@ -44,7 +44,7 @@ namespace Org.Apache.REEF.Tang.Implementations.ClassHierarchy
private object _mergeLock = new object();
private object _implLock = new object();
- //alias is indexed by language, for each language, a mapping between alias and corresponding name kept in a Dictionary
+ // alias is indexed by language, for each language, a mapping between alias and corresponding name kept in a Dictionary
private readonly IDictionary<string, IDictionary<string, string>> _aliasLookupTable = new Dictionary<string, IDictionary<string, string>>();
@@ -58,14 +58,14 @@ namespace Org.Apache.REEF.Tang.Implementations.ClassHierarchy
{
}
- //parameterParsers are classes that extends from IExternalConstructor
+ // parameterParsers are classes that extends from IExternalConstructor
public ClassHierarchyImpl(string[] assemblies, Type[] parameterParsers)
{
this.assemblies = assemblies;
rootNode = NodeFactory.CreateRootPackageNode();
loader = new AssemblyLoader(assemblies);
- foreach (Type p in parameterParsers) //p must be extend from IExternalConstructor
+ foreach (Type p in parameterParsers) // p must be extend from IExternalConstructor
{
try
{
@@ -166,7 +166,7 @@ namespace Org.Apache.REEF.Tang.Implementations.ClassHierarchy
{
Org.Apache.REEF.Utilities.Diagnostics.Exceptions.Throw(new ArgumentException("not type in arg"), LOGGER);
}
- RegisterType(constructorArg.Gettype()); //Gettype returns param's Type.fullname
+ RegisterType(constructorArg.Gettype()); // Gettype returns param's Type.fullname
if (constructorArg.GetNamedParameterName() != null)
{
INamedParameterNode np = (INamedParameterNode)RegisterType(constructorArg.GetNamedParameterName());
@@ -174,7 +174,7 @@ namespace Org.Apache.REEF.Tang.Implementations.ClassHierarchy
{
if (np.IsSet() || np.IsList())
{
- //throw new NotImplementedException();
+ // throw new NotImplementedException();
}
else
{
@@ -226,7 +226,7 @@ namespace Org.Apache.REEF.Tang.Implementations.ClassHierarchy
Type baseType = type.BaseType;
if (baseType != null)
{
- IClassNode n = (IClassNode) GetAlreadyBoundNode(baseType);
+ IClassNode n = (IClassNode)GetAlreadyBoundNode(baseType);
if (n != null)
{
n.PutImpl(classNode);
@@ -265,8 +265,8 @@ namespace Org.Apache.REEF.Tang.Implementations.ClassHierarchy
}
INamedParameterNode np = NodeFactory.CreateNamedParameterNode(parent, type, argType);
- if(Parameterparser.CanParse(ReflectionUtilities.GetAssemblyQualifiedName(argType))) {
- if(type.GetCustomAttribute<NamedParameterAttribute>().DefaultClass != null)
+ if (Parameterparser.CanParse(ReflectionUtilities.GetAssemblyQualifiedName(argType))) {
+ if (type.GetCustomAttribute<NamedParameterAttribute>().DefaultClass != null)
{
var e = new ClassHierarchyException("Named parameter " + ReflectionUtilities.GetAssemblyQualifiedName(type) + " defines default implementation for parsable type " + ReflectionUtilities.GetAssemblyQualifiedName(argType));
Org.Apache.REEF.Utilities.Diagnostics.Exceptions.Throw(e, LOGGER);
@@ -279,7 +279,7 @@ namespace Org.Apache.REEF.Tang.Implementations.ClassHierarchy
_aliasLookupTable.TryGetValue(np.GetAliasLanguage().ToString(), out mapping);
if (null == mapping)
{
- mapping= new Dictionary<string, string>();
+ mapping = new Dictionary<string, string>();
_aliasLookupTable.Add(np.GetAliasLanguage().ToString(), mapping);
}
try
@@ -317,12 +317,12 @@ namespace Org.Apache.REEF.Tang.Implementations.ClassHierarchy
return np;
}
- //return Type T if type implements Name<T>, null otherwise
- //e.g. [NamedParameter(typeof(System.String), "Number of seconds to sleep", "10", "sec")]
- //class Seconds : Name<Int32> { }
- //return Int32
+ // return Type T if type implements Name<T>, null otherwise
+ // e.g. [NamedParameter(typeof(System.String), "Number of seconds to sleep", "10", "sec")]
+ // class Seconds : Name<Int32> { }
+ // return Int32
- //TODO add error handlings
+ // TODO add error handlings
public Type GetNamedParameterTargetOrNull(Type type)
{
var npAnnotation = type.GetCustomAttribute<NamedParameterAttribute>();
@@ -347,7 +347,7 @@ namespace Org.Apache.REEF.Tang.Implementations.ClassHierarchy
private INode GetAlreadyBoundNode(Type t)
{
- //get outclass names including itsself
+ // get outclass names including itsself
string[] outerClassNames = ReflectionUtilities.GetEnclosingClassNames(t);
INode current = rootNode;
@@ -366,21 +366,21 @@ namespace Org.Apache.REEF.Tang.Implementations.ClassHierarchy
}
}
return null;
- //throw new NameResolutionException(t.FullName, sb.ToString());
+ // throw new NameResolutionException(t.FullName, sb.ToString());
}
}
return current;
}
- //starting from the root, get child for each eclosing class excluding the type itsself
- //all enclosing classes should be already in the hierarchy
- //Type B2 = asm.GetType(@"Org.Apache.REEF.Tang.Examples.B+B1+B2");
- //string[] pathB2 = ClassNameParser.GetEnclosingClassShortNames(B2);
- //Assert.AreEqual(pathB2[0], "B");
- //Assert.AreEqual(pathB2[1], "B1");
- //Assert.AreEqual(pathB2[2], "B2");
- //return INode for B1
+ // starting from the root, get child for each eclosing class excluding the type itsself
+ // all enclosing classes should be already in the hierarchy
+ // Type B2 = asm.GetType(@"Org.Apache.REEF.Tang.Examples.B+B1+B2");
+ // string[] pathB2 = ClassNameParser.GetEnclosingClassShortNames(B2);
+ // Assert.AreEqual(pathB2[0], "B");
+ // Assert.AreEqual(pathB2[1], "B1");
+ // Assert.AreEqual(pathB2[2], "B2");
+ // return INode for B1
private INode GetParentNode(Type type)
{
INode current = rootNode;
@@ -487,14 +487,14 @@ namespace Org.Apache.REEF.Tang.Implementations.ClassHierarchy
Utilities.Diagnostics.Exceptions.Throw(new NotSupportedException("Can't merge java and non-java class hierarchies yet!"), LOGGER);
}
- if(this.assemblies.Count == 0)
+ if (this.assemblies.Count == 0)
{
return ch;
}
lock (_mergeLock)
{
- ClassHierarchyImpl chi = (ClassHierarchyImpl) ch;
+ ClassHierarchyImpl chi = (ClassHierarchyImpl)ch;
MonotonicHashSet<string> otherJars = new MonotonicHashSet<string>();
otherJars.AddAll(chi.assemblies);
MonotonicHashSet<string> myJars = new MonotonicHashSet<string>();
@@ -519,7 +519,7 @@ namespace Org.Apache.REEF.Tang.Implementations.ClassHierarchy
{
iface = (IClassNode)GetNode(np.GetFullArgName());
}
- catch(NameResolutionException e)
+ catch (NameResolutionException e)
{
Utilities.Diagnostics.Exceptions.Caught(e, Level.Error, LOGGER);
var ex = new IllegalStateException("Could not parse validated named parameter argument type. NamedParameter is " + np.GetFullName() + " argument type is " + np.GetFullArgName(), e);
@@ -532,7 +532,7 @@ namespace Org.Apache.REEF.Tang.Implementations.ClassHierarchy
clazz = (Type)ClassForName(iface.GetFullName());
fullName = null;
}
- catch(TypeLoadException e)
+ catch (TypeLoadException e)
{
Org.Apache.REEF.Utilities.Diagnostics.Exceptions.Caught(e, Level.Warning, LOGGER);
clazz = null;
@@ -556,7 +556,7 @@ namespace Org.Apache.REEF.Tang.Implementations.ClassHierarchy
INode impl = GetNode(value);
if (impl is IClassNode)
{
- if (IsImplementation(iface, (IClassNode) impl))
+ if (IsImplementation(iface, (IClassNode)impl))
{
return impl;
}
@@ -616,7 +616,7 @@ namespace Org.Apache.REEF.Tang.Implementations.ClassHierarchy
}
var ec = new IllegalStateException("Multiple defaults for non-set named parameter! " + name.GetFullName());
Org.Apache.REEF.Utilities.Diagnostics.Exceptions.Throw(ec, LOGGER);
- return null; //this line would be never reached as Throw will throw an exception
+ return null; // this line would be never reached as Throw will throw an exception
}
public Type ClassForName(string name)
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/dd07dc3e/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/ConstructorArgImpl.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/ConstructorArgImpl.cs b/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/ConstructorArgImpl.cs
index a8a41b5..052f0e1 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/ConstructorArgImpl.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/ConstructorArgImpl.cs
@@ -30,15 +30,11 @@ namespace Org.Apache.REEF.Tang.Implementations.ClassHierarchy
public ConstructorArgImpl(String type, String namedParameterName, bool isInjectionFuture)
{
- if (type == null)
- {
- ;
- }
this.type = type;
this.name = namedParameterName;
- //if (name != null && name.Contains(','))
- // throw new ApplicationException("Name contains comma : " + name);
+ ////if (name != null && name.Contains(','))
+ //// throw new ApplicationException("Name contains comma : " + name);
this.isInjectionFuture = isInjectionFuture;
}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/dd07dc3e/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/ConstructorDefImpl.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/ConstructorDefImpl.cs b/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/ConstructorDefImpl.cs
index 8d8c77a..61d17df 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/ConstructorDefImpl.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/ConstructorDefImpl.cs
@@ -157,7 +157,7 @@ namespace Org.Apache.REEF.Tang.Implementations.ClassHierarchy
return 0;
}
- //A(int i, string j) vs. A(string i, int j) is Ambiguous in injection
+ // A(int i, string j) vs. A(string i, int j) is Ambiguous in injection
private bool EqualsIgnoreOrder(IConstructorDef def)
{
if (GetArgs().Count != def.GetArgs().Count)
@@ -188,7 +188,7 @@ namespace Org.Apache.REEF.Tang.Implementations.ClassHierarchy
return ToString().CompareTo(o.ToString());
}
- public bool IsInList(IList<IConstructorDef> list )
+ public bool IsInList(IList<IConstructorDef> list)
{
foreach (IConstructorDef def in list)
{
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/dd07dc3e/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/NodeFactory.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/NodeFactory.cs b/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/NodeFactory.cs
index 725babd..b3810b3 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/NodeFactory.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/NodeFactory.cs
@@ -41,24 +41,24 @@ namespace Org.Apache.REEF.Tang.Implementations.ClassHierarchy
public static INode CreateClassNode(INode parent, Type clazz)
{
- //var namedParameter = clazz.GetCustomAttribute<NamedParameterAttribute>();
+ // var namedParameter = clazz.GetCustomAttribute<NamedParameterAttribute>();
var unit = null != clazz.GetCustomAttribute<UnitAttribute>();
string simpleName = ReflectionUtilities.GetName(clazz);
string fullName = ReflectionUtilities.GetAssemblyQualifiedName(clazz);
- //bool isStatic = true; // clazz.IsSealed && clazz.IsAbstract; always true in C# for Java static class
- //bool injectable = true; // always true in C#
+ // bool isStatic = true; // clazz.IsSealed && clazz.IsAbstract; always true in C# for Java static class
+ // bool injectable = true; // always true in C#
bool isAssignableFromExternalConstructor = ReflectionUtilities.IsAssignableFromIgnoreGeneric(typeof(IExternalConstructor<>), clazz);
- //bool parentIsUnit = false;
+ // bool parentIsUnit = false;
- //No such thing in C#, should be false
- //bool foundNonStaticInnerClass = false;
- //foreach (Type c in clazz.getNestedTypes()) {
- // if (!Modifier.isStatic(c.getModifiers())) {
- // foundNonStaticInnerClass = true;
- // }
- //}
+ ////No such thing in C#, should be false
+ ////bool foundNonStaticInnerClass = false;
+ ////foreach (Type c in clazz.getNestedTypes()) {
+ //// if (!Modifier.isStatic(c.getModifiers())) {
+ //// foundNonStaticInnerClass = true;
+ //// }
+ ////}
var injectableConstructors = new List<IConstructorDef>();
var allConstructors = new List<IConstructorDef>();
@@ -73,7 +73,7 @@ namespace Org.Apache.REEF.Tang.Implementations.ClassHierarchy
if (constructorInjectable)
{
-// if (injectableConstructors.Contains(constructorDef))
+ // if (injectableConstructors.Contains(constructorDef))
if (constructorDef.IsInList(injectableConstructors))
{
var e = new ClassHierarchyException(
@@ -122,7 +122,7 @@ namespace Org.Apache.REEF.Tang.Implementations.ClassHierarchy
injectableConstructors, allConstructors, defaultImplementation);
}
- //TODO
+ // TODO
private static ConstructorDefImpl CreateConstructorDef(ConstructorInfo constructor, bool injectable)
{
var parameters = constructor.GetParameters();
@@ -131,16 +131,16 @@ namespace Org.Apache.REEF.Tang.Implementations.ClassHierarchy
for (int i = 0; i < parameters.Length; i++)
{
- //TODO for getInterfaceTarget() call
+ // TODO for getInterfaceTarget() call
Type type = parameters[i].ParameterType;
type = ReflectionUtilities.EnsureInterfaceType(type);
- //if (type.IsGenericType && type.FullName == null)
- //{
- // type = type.GetGenericTypeDefinition();
- //}
+ ////if (type.IsGenericType && type.FullName == null)
+ ////{
+ //// type = type.GetGenericTypeDefinition();
+ ////}
bool isFuture;
- if(ReflectionUtilities.IsAssignableFromIgnoreGeneric(typeof(IInjectionFuture<>), type))
+ if (ReflectionUtilities.IsAssignableFromIgnoreGeneric(typeof(IInjectionFuture<>), type))
{
type = ReflectionUtilities.GetInterfaceTarget(typeof(IInjectionFuture<>), type);
isFuture = true;
@@ -175,11 +175,11 @@ namespace Org.Apache.REEF.Tang.Implementations.ClassHierarchy
{
Type setRawArgType = ReflectionUtilities.GetInterfaceTarget(typeof(ISet<>), argClass);
bool isSet = setRawArgType != null;
- if(isSet) {
+ if (isSet) {
argClass = setRawArgType;
}
- Type listRawArgType = ReflectionUtilities.GetInterfaceTargetForType(typeof (IList<>), argClass);
+ Type listRawArgType = ReflectionUtilities.GetInterfaceTargetForType(typeof(IList<>), argClass);
bool isList = listRawArgType != null;
if (isList)
{
@@ -246,7 +246,7 @@ namespace Org.Apache.REEF.Tang.Implementations.ClassHierarchy
Org.Apache.REEF.Utilities.Diagnostics.Exceptions.Throw(e, LOGGER);
}
- string[] defaultInstanceAsStrings = new string[]{};
+ string[] defaultInstanceAsStrings = new string[] { };
if (default_count == 0)
{
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/dd07dc3e/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/ParameterParser.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/ParameterParser.cs b/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/ParameterParser.cs
index 5d6569f..4e750dc 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/ParameterParser.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Implementations/ClassHierarchy/ParameterParser.cs
@@ -33,21 +33,21 @@ namespace Org.Apache.REEF.Tang.Implementations.ClassHierarchy
readonly MonotonicTreeMap<String, ConstructorInfo> parsers = new MonotonicTreeMap<String, ConstructorInfo>();
- //ec: ACons, tc: A
+ // ec: ACons, tc: A
public void AddParser(Type ec)
{
Type tc = (Type)ReflectionUtilities.GetInterfaceTarget(typeof(IExternalConstructor<>), ec);
AddParser(tc, ec);
}
- //TODO
- //public <T, U extends T> void AddParser(Class<U> clazz, Class<? extends ExternalConstructor<T>> ec) throws BindException {
- //public void AddParser<T, U, V>(GenericType<U> clazz, GenericType<V> ec)
+ // TODO
+ // public <T, U extends T> void AddParser(Class<U> clazz, Class<? extends ExternalConstructor<T>> ec) throws BindException {
+ // public void AddParser<T, U, V>(GenericType<U> clazz, GenericType<V> ec)
// where U : T
// where V: IExternalConstructor<T>
- //{
+ // {
- //clazz: A, ec: ACons
+ // clazz: A, ec: ACons
private void AddParser(Type clazz, Type ec)
{
ConstructorInfo c = ec.GetConstructor(BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance, null, new Type[] { typeof(string) }, null);
@@ -58,7 +58,7 @@ namespace Org.Apache.REEF.Tang.Implementations.ClassHierarchy
Org.Apache.REEF.Utilities.Diagnostics.Exceptions.Throw(e, LOGGER);
}
- //c.setAccessible(true); //set as public
+ // c.setAccessible(true); // set as public
parsers.Add(ReflectionUtilities.GetAssemblyQualifiedName(clazz), c);
}
@@ -91,7 +91,7 @@ namespace Org.Apache.REEF.Tang.Implementations.ClassHierarchy
}
}
- //(Integer, "3") return object of new Integer(3)
+ // (Integer, "3") return object of new Integer(3)
public object Parse(Type c, String s)
{
Type d = ReflectionUtilities.BoxClass(c);
@@ -101,7 +101,7 @@ namespace Org.Apache.REEF.Tang.Implementations.ClassHierarchy
if (parsers.ContainsKey(name))
{
object ret = Parse(name, s);
- if (c.IsAssignableFrom(ret.GetType())) //check if ret can be cast as c
+ if (c.IsAssignableFrom(ret.GetType())) // check if ret can be cast as c
{
return ret;
}
@@ -115,7 +115,7 @@ namespace Org.Apache.REEF.Tang.Implementations.ClassHierarchy
return Parse(d.Name, s);
}
- //name: "Integer", value: "12"
+ // name: "Integer", value: "12"
public object Parse(string name, string value)
{
if (parsers.ContainsKey(name))
@@ -126,7 +126,7 @@ namespace Org.Apache.REEF.Tang.Implementations.ClassHierarchy
parsers.TryGetValue(name, out c);
var o = c.Invoke(new object[] { value });
var m = o.GetType().GetMethod("NewInstance", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
- return m.Invoke(o, new object[] {});
+ return m.Invoke(o, new object[] { });
}
catch (TargetInvocationException e)
{
@@ -190,7 +190,7 @@ namespace Org.Apache.REEF.Tang.Implementations.ClassHierarchy
typeof(float).AssemblyQualifiedName,
typeof(double).AssemblyQualifiedName,
typeof(bool).AssemblyQualifiedName
- } );
+ });
public bool CanParse(string name)
{
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/dd07dc3e/lang/cs/Org.Apache.REEF.Tang/Implementations/Configuration/ConfigurationBuilderImpl.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tang/Implementations/Configuration/ConfigurationBuilderImpl.cs b/lang/cs/Org.Apache.REEF.Tang/Implementations/Configuration/ConfigurationBuilderImpl.cs
index 7b148cd..8bb1a02 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Implementations/Configuration/ConfigurationBuilderImpl.cs
+++ b/lang/cs/Org.Apache.REEF.Tang/Implementations/Configuration/ConfigurationBuilderImpl.cs
@@ -61,7 +61,7 @@ namespace Org.Apache.REEF.Tang.Implementations.Configuration
this.ClassHierarchy = TangFactory.GetTang().GetDefaultClassHierarchy(assemblies, parsers);
foreach (IConfiguration tc in confs)
{
- AddConfiguration(((ConfigurationImpl) tc));
+ AddConfiguration(((ConfigurationImpl)tc));
}
}
@@ -95,11 +95,11 @@ namespace Org.Apache.REEF.Tang.Implementations.Configuration
{
this.ClassHierarchy = this.ClassHierarchy.Merge(ns);
- if((ClassHierarchy is ClassHierarchyImpl || builder.ClassHierarchy is ClassHierarchyImpl))
+ if ((ClassHierarchy is ClassHierarchyImpl || builder.ClassHierarchy is ClassHierarchyImpl))
{
- if((ClassHierarchy is ClassHierarchyImpl && builder.ClassHierarchy is ClassHierarchyImpl))
+ if ((ClassHierarchy is ClassHierarchyImpl && builder.ClassHierarchy is ClassHierarchyImpl))
{
- ((ClassHierarchyImpl) ClassHierarchy).Parameterparser.MergeIn(((ClassHierarchyImpl) builder.ClassHierarchy).Parameterparser);
+ ((ClassHierarchyImpl)ClassHierarchy).Parameterparser.MergeIn(((ClassHierarchyImpl)builder.ClassHierarchy).Parameterparser);
}
else
{
@@ -147,7 +147,7 @@ namespace Org.Apache.REEF.Tang.Implementations.Configuration
foreach (KeyValuePair<INamedParameterNode, object> e in builder.BoundSetEntries)
{
String name = ((INamedParameterNode)e.Key).GetFullName();
- if(e.Value is INode)
+ if (e.Value is INode)
{
BindSetEntry(name, (INode)e.Value);
}
@@ -265,7 +265,7 @@ namespace Org.Apache.REEF.Tang.Implementations.Configuration
((ICsClassHierarchy)ClassHierarchy).Parse(name, value);
}
- if(name.IsSet())
+ if (name.IsSet())
{
BindSetEntry((INamedParameterNode)name, value);
}