http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Network/Group/Operators/Impl/ScatterReceiver.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Network/Group/Operators/Impl/ScatterReceiver.cs b/lang/cs/Org.Apache.REEF.Network/Group/Operators/Impl/ScatterReceiver.cs index 85b5c13..8037f6f 100644 --- a/lang/cs/Org.Apache.REEF.Network/Group/Operators/Impl/ScatterReceiver.cs +++ b/lang/cs/Org.Apache.REEF.Network/Group/Operators/Impl/ScatterReceiver.cs @@ -17,12 +17,8 @@ * under the License. */ -using System; using System.Collections.Generic; -using System.Linq; using System.Reactive; -using System.Text; -using System.Threading.Tasks; using Org.Apache.REEF.Network.Group.Config; using Org.Apache.REEF.Network.Group.Driver.Impl; using Org.Apache.REEF.Network.Group.Task; @@ -40,8 +36,8 @@ namespace Org.Apache.REEF.Network.Group.Operators.Impl { private const int DefaultVersion = 1; - private ICommunicationGroupNetworkObserver _networkHandler; - private OperatorTopology<T> _topology; + private readonly ICommunicationGroupNetworkObserver _networkHandler; + private readonly OperatorTopology<T> _topology; /// <summary> /// Creates a new ScatterReceiver.
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Network/Group/Operators/Impl/ScatterSender.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Network/Group/Operators/Impl/ScatterSender.cs b/lang/cs/Org.Apache.REEF.Network/Group/Operators/Impl/ScatterSender.cs index ee9e683..6b4852a 100644 --- a/lang/cs/Org.Apache.REEF.Network/Group/Operators/Impl/ScatterSender.cs +++ b/lang/cs/Org.Apache.REEF.Network/Group/Operators/Impl/ScatterSender.cs @@ -17,12 +17,8 @@ * under the License. */ -using System; using System.Collections.Generic; -using System.Linq; using System.Reactive; -using System.Text; -using System.Threading.Tasks; using Org.Apache.REEF.Network.Group.Config; using Org.Apache.REEF.Network.Group.Driver.Impl; using Org.Apache.REEF.Network.Group.Task; @@ -40,8 +36,8 @@ namespace Org.Apache.REEF.Network.Group.Operators.Impl { private const int DefaultVersion = 1; - private ICommunicationGroupNetworkObserver _networkHandler; - private OperatorTopology<T> _topology; + private readonly ICommunicationGroupNetworkObserver _networkHandler; + private readonly OperatorTopology<T> _topology; /// <summary> /// Creates a new ScatterSender. http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Network/Group/Operators/Impl/Sender.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Network/Group/Operators/Impl/Sender.cs b/lang/cs/Org.Apache.REEF.Network/Group/Operators/Impl/Sender.cs index c5ca60f..2f03a7a 100644 --- a/lang/cs/Org.Apache.REEF.Network/Group/Operators/Impl/Sender.cs +++ b/lang/cs/Org.Apache.REEF.Network/Group/Operators/Impl/Sender.cs @@ -18,12 +18,10 @@ */ using System; -using Org.Apache.REEF.Network.Group.Driver; using Org.Apache.REEF.Network.Group.Driver.Impl; using Org.Apache.REEF.Network.NetworkService; using Org.Apache.REEF.Tang.Annotations; using Org.Apache.REEF.Wake; -using Org.Apache.REEF.Wake.Remote.Impl; namespace Org.Apache.REEF.Network.Group.Operators.Impl { @@ -32,8 +30,8 @@ namespace Org.Apache.REEF.Network.Group.Operators.Impl /// </summary> public class Sender { - private INetworkService<GroupCommunicationMessage> _networkService; - private IIdentifierFactory _idFactory; + private readonly INetworkService<GroupCommunicationMessage> _networkService; + private readonly IIdentifierFactory _idFactory; /// <summary> /// Creates a new Sender. http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Network/Group/Task/ICommunicationGroupClient.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Network/Group/Task/ICommunicationGroupClient.cs b/lang/cs/Org.Apache.REEF.Network/Group/Task/ICommunicationGroupClient.cs index 9b96a9a..3630070 100644 --- a/lang/cs/Org.Apache.REEF.Network/Group/Task/ICommunicationGroupClient.cs +++ b/lang/cs/Org.Apache.REEF.Network/Group/Task/ICommunicationGroupClient.cs @@ -20,11 +20,6 @@ using Org.Apache.REEF.Network.Group.Operators; using Org.Apache.REEF.Network.Group.Task.Impl; using Org.Apache.REEF.Tang.Annotations; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Org.Apache.REEF.Network.Group.Task { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Network/Group/Task/ICommunicationGroupNetworkObserver.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Network/Group/Task/ICommunicationGroupNetworkObserver.cs b/lang/cs/Org.Apache.REEF.Network/Group/Task/ICommunicationGroupNetworkObserver.cs index d3034fc..e4f5b40 100644 --- a/lang/cs/Org.Apache.REEF.Network/Group/Task/ICommunicationGroupNetworkObserver.cs +++ b/lang/cs/Org.Apache.REEF.Network/Group/Task/ICommunicationGroupNetworkObserver.cs @@ -17,15 +17,10 @@ * under the License. */ -using Org.Apache.REEF.Network.Group.Driver; +using System; using Org.Apache.REEF.Network.Group.Driver.Impl; using Org.Apache.REEF.Network.Group.Task.Impl; using Org.Apache.REEF.Tang.Annotations; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Org.Apache.REEF.Network.Group.Task { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Network/Group/Task/IMpiClient.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Network/Group/Task/IMpiClient.cs b/lang/cs/Org.Apache.REEF.Network/Group/Task/IMpiClient.cs index 2592b04..159605d 100644 --- a/lang/cs/Org.Apache.REEF.Network/Group/Task/IMpiClient.cs +++ b/lang/cs/Org.Apache.REEF.Network/Group/Task/IMpiClient.cs @@ -17,14 +17,9 @@ * under the License. */ -using Org.Apache.REEF.Network.Group.Operators; +using System; using Org.Apache.REEF.Network.Group.Task.Impl; using Org.Apache.REEF.Tang.Annotations; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Org.Apache.REEF.Network.Group.Task { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Network/Group/Task/IMpiNetworkObserver.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Network/Group/Task/IMpiNetworkObserver.cs b/lang/cs/Org.Apache.REEF.Network/Group/Task/IMpiNetworkObserver.cs index 5fe948c..f0c1b3a 100644 --- a/lang/cs/Org.Apache.REEF.Network/Group/Task/IMpiNetworkObserver.cs +++ b/lang/cs/Org.Apache.REEF.Network/Group/Task/IMpiNetworkObserver.cs @@ -17,17 +17,11 @@ * under the License. */ -using Org.Apache.REEF.Network.Group.Driver; +using System; using Org.Apache.REEF.Network.Group.Driver.Impl; using Org.Apache.REEF.Network.Group.Task.Impl; using Org.Apache.REEF.Network.NetworkService; using Org.Apache.REEF.Tang.Annotations; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Org.Apache.REEF.Network.Group.Codec; namespace Org.Apache.REEF.Network.Group.Task { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Network/Group/Task/Impl/CommunicationGroupClient.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Network/Group/Task/Impl/CommunicationGroupClient.cs b/lang/cs/Org.Apache.REEF.Network/Group/Task/Impl/CommunicationGroupClient.cs index e6d653d..3dcce76 100644 --- a/lang/cs/Org.Apache.REEF.Network/Group/Task/Impl/CommunicationGroupClient.cs +++ b/lang/cs/Org.Apache.REEF.Network/Group/Task/Impl/CommunicationGroupClient.cs @@ -17,22 +17,21 @@ * under the License. */ +using System; +using System.Collections.Generic; +using Org.Apache.REEF.Common.Tasks; using Org.Apache.REEF.Network.Group.Config; -using Org.Apache.REEF.Network.Group.Driver; using Org.Apache.REEF.Network.Group.Driver.Impl; using Org.Apache.REEF.Network.Group.Operators; using Org.Apache.REEF.Network.Group.Operators.Impl; using Org.Apache.REEF.Network.NetworkService; -using Org.Apache.REEF.Utilities.Logging; using Org.Apache.REEF.Tang.Annotations; using Org.Apache.REEF.Tang.Exceptions; using Org.Apache.REEF.Tang.Formats; +using Org.Apache.REEF.Tang.Implementations.Tang; using Org.Apache.REEF.Tang.Interface; using Org.Apache.REEF.Tang.Util; -using System; -using System.Collections.Generic; -using Org.Apache.REEF.Common.Tasks; -using Org.Apache.REEF.Tang.Implementations.Tang; +using Org.Apache.REEF.Utilities.Logging; namespace Org.Apache.REEF.Network.Group.Task.Impl { @@ -43,14 +42,14 @@ namespace Org.Apache.REEF.Network.Group.Task.Impl { private readonly Logger LOGGER = Logger.GetLogger(typeof(CommunicationGroupClient)); - private string _taskId; + private readonly string _taskId; private string _driverId; - private Dictionary<string, IInjector> _operatorInjectors; - private Dictionary<string, object> _operators; - private NetworkService<GroupCommunicationMessage> _networkService; - private IMpiNetworkObserver _mpiNetworkHandler; - private ICommunicationGroupNetworkObserver _commGroupNetworkHandler; + private readonly Dictionary<string, IInjector> _operatorInjectors; + private readonly Dictionary<string, object> _operators; + private readonly NetworkService<GroupCommunicationMessage> _networkService; + private readonly IMpiNetworkObserver _mpiNetworkHandler; + private readonly ICommunicationGroupNetworkObserver _commGroupNetworkHandler; /// <summary> /// Creates a new CommunicationGroupClient. http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Network/Group/Task/Impl/CommunicationGroupNetworkObserver.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Network/Group/Task/Impl/CommunicationGroupNetworkObserver.cs b/lang/cs/Org.Apache.REEF.Network/Group/Task/Impl/CommunicationGroupNetworkObserver.cs index 97ab082..e61e14b 100644 --- a/lang/cs/Org.Apache.REEF.Network/Group/Task/Impl/CommunicationGroupNetworkObserver.cs +++ b/lang/cs/Org.Apache.REEF.Network/Group/Task/Impl/CommunicationGroupNetworkObserver.cs @@ -17,11 +17,10 @@ * under the License. */ -using Org.Apache.REEF.Network.Group.Driver; -using Org.Apache.REEF.Network.Group.Driver.Impl; -using Org.Apache.REEF.Tang.Annotations; using System; using System.Collections.Generic; +using Org.Apache.REEF.Network.Group.Driver.Impl; +using Org.Apache.REEF.Tang.Annotations; namespace Org.Apache.REEF.Network.Group.Task.Impl { @@ -30,7 +29,7 @@ namespace Org.Apache.REEF.Network.Group.Task.Impl /// </summary> public class CommunicationGroupNetworkObserver : ICommunicationGroupNetworkObserver { - private Dictionary<string, IObserver<GroupCommunicationMessage>> _handlers; + private readonly Dictionary<string, IObserver<GroupCommunicationMessage>> _handlers; /// <summary> /// Creates a new CommunicationGroupNetworkObserver. http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Network/Group/Task/Impl/MpiClient.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Network/Group/Task/Impl/MpiClient.cs b/lang/cs/Org.Apache.REEF.Network/Group/Task/Impl/MpiClient.cs index 7cec022..97a43ea 100644 --- a/lang/cs/Org.Apache.REEF.Network/Group/Task/Impl/MpiClient.cs +++ b/lang/cs/Org.Apache.REEF.Network/Group/Task/Impl/MpiClient.cs @@ -17,19 +17,18 @@ * under the License. */ +using System; +using System.Collections.Generic; +using Org.Apache.REEF.Common.Tasks; using Org.Apache.REEF.Network.Group.Config; -using Org.Apache.REEF.Network.Group.Driver; using Org.Apache.REEF.Network.Group.Driver.Impl; using Org.Apache.REEF.Network.NetworkService; using Org.Apache.REEF.Tang.Annotations; using Org.Apache.REEF.Tang.Formats; +using Org.Apache.REEF.Tang.Implementations.Tang; using Org.Apache.REEF.Tang.Interface; using Org.Apache.REEF.Tang.Util; using Org.Apache.REEF.Wake.Remote.Impl; -using System; -using System.Collections.Generic; -using Org.Apache.REEF.Common.Tasks; -using Org.Apache.REEF.Tang.Implementations.Tang; namespace Org.Apache.REEF.Network.Group.Task.Impl { @@ -38,9 +37,9 @@ namespace Org.Apache.REEF.Network.Group.Task.Impl /// </summary> public class MpiClient : IMpiClient { - private Dictionary<string, ICommunicationGroupClient> _commGroups; + private readonly Dictionary<string, ICommunicationGroupClient> _commGroups; - private INetworkService<GroupCommunicationMessage> _networkService; + private readonly INetworkService<GroupCommunicationMessage> _networkService; /// <summary> /// Creates a new MpiClient and registers the task ID with the Name Server. http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Network/Group/Task/Impl/MpiNetworkObserver.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Network/Group/Task/Impl/MpiNetworkObserver.cs b/lang/cs/Org.Apache.REEF.Network/Group/Task/Impl/MpiNetworkObserver.cs index baa2e5e..10a2ba5 100644 --- a/lang/cs/Org.Apache.REEF.Network/Group/Task/Impl/MpiNetworkObserver.cs +++ b/lang/cs/Org.Apache.REEF.Network/Group/Task/Impl/MpiNetworkObserver.cs @@ -17,14 +17,13 @@ * under the License. */ -using Org.Apache.REEF.Network.Group.Driver; -using Org.Apache.REEF.Network.Group.Driver.Impl; -using Org.Apache.REEF.Network.NetworkService; -using Org.Apache.REEF.Utilities.Logging; -using Org.Apache.REEF.Tang.Annotations; using System; using System.Collections.Generic; using System.Linq; +using Org.Apache.REEF.Network.Group.Driver.Impl; +using Org.Apache.REEF.Network.NetworkService; +using Org.Apache.REEF.Tang.Annotations; +using Org.Apache.REEF.Utilities.Logging; namespace Org.Apache.REEF.Network.Group.Task.Impl { @@ -33,9 +32,9 @@ namespace Org.Apache.REEF.Network.Group.Task.Impl /// </summary> public class MpiNetworkObserver : IMpiNetworkObserver { - private static Logger LOGGER = Logger.GetLogger(typeof(MpiNetworkObserver)); + private static readonly Logger LOGGER = Logger.GetLogger(typeof(MpiNetworkObserver)); - private Dictionary<string, IObserver<GroupCommunicationMessage>> _commGroupHandlers; + private readonly Dictionary<string, IObserver<GroupCommunicationMessage>> _commGroupHandlers; /// <summary> /// Creates a new MpiNetworkObserver. http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Network/Group/Task/Impl/NodeStruct.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Network/Group/Task/Impl/NodeStruct.cs b/lang/cs/Org.Apache.REEF.Network/Group/Task/Impl/NodeStruct.cs index f4c7a60..2766f4f 100644 --- a/lang/cs/Org.Apache.REEF.Network/Group/Task/Impl/NodeStruct.cs +++ b/lang/cs/Org.Apache.REEF.Network/Group/Task/Impl/NodeStruct.cs @@ -17,7 +17,6 @@ * under the License. */ -using Org.Apache.REEF.Network.Group.Driver; using System.Collections.Concurrent; using Org.Apache.REEF.Network.Group.Driver.Impl; @@ -28,7 +27,7 @@ namespace Org.Apache.REEF.Network.Group.Task.Impl /// </summary> internal class NodeStruct { - private BlockingCollection<GroupCommunicationMessage> _messageQueue; + private readonly BlockingCollection<GroupCommunicationMessage> _messageQueue; /// <summary> /// Creates a new NodeStruct. http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Network/Group/Task/Impl/OperatorTopology.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Network/Group/Task/Impl/OperatorTopology.cs b/lang/cs/Org.Apache.REEF.Network/Group/Task/Impl/OperatorTopology.cs index 8752203..d8e732f 100644 --- a/lang/cs/Org.Apache.REEF.Network/Group/Task/Impl/OperatorTopology.cs +++ b/lang/cs/Org.Apache.REEF.Network/Group/Task/Impl/OperatorTopology.cs @@ -17,24 +17,23 @@ * under the License. */ +using System; +using System.Collections.Concurrent; +using System.Collections.Generic; +using System.Linq; +using System.Threading; +using Org.Apache.REEF.Common.Io; +using Org.Apache.REEF.Common.Tasks; using Org.Apache.REEF.Network.Group.Config; -using Org.Apache.REEF.Network.Group.Driver; using Org.Apache.REEF.Network.Group.Driver.Impl; using Org.Apache.REEF.Network.Group.Operators; using Org.Apache.REEF.Network.Group.Operators.Impl; using Org.Apache.REEF.Network.NetworkService; using Org.Apache.REEF.Network.Utilities; -using Org.Apache.REEF.Utilities.Logging; using Org.Apache.REEF.Tang.Annotations; using Org.Apache.REEF.Tang.Exceptions; +using Org.Apache.REEF.Utilities.Logging; using Org.Apache.REEF.Wake.Remote; -using System; -using System.Collections.Concurrent; -using System.Collections.Generic; -using System.Linq; -using System.Threading; -using Org.Apache.REEF.Common.Io; -using Org.Apache.REEF.Common.Tasks; namespace Org.Apache.REEF.Network.Group.Task.Impl { @@ -49,20 +48,20 @@ namespace Org.Apache.REEF.Network.Group.Task.Impl private const int DefaultTimeout = 10000; private const int RetryCount = 5; - private static Logger LOGGER = Logger.GetLogger(typeof(OperatorTopology<>)); + private static readonly Logger LOGGER = Logger.GetLogger(typeof(OperatorTopology<>)); - private string _groupName; - private string _operatorName; - private string _selfId; + private readonly string _groupName; + private readonly string _operatorName; + private readonly string _selfId; private string _driverId; - private NodeStruct _parent; - private List<NodeStruct> _children; - private Dictionary<string, NodeStruct> _idToNodeMap; - private ICodec<T> _codec; - private INameClient _nameClient; - private Sender _sender; - private BlockingCollection<NodeStruct> _nodesWithData; + private readonly NodeStruct _parent; + private readonly List<NodeStruct> _children; + private readonly Dictionary<string, NodeStruct> _idToNodeMap; + private readonly ICodec<T> _codec; + private readonly INameClient _nameClient; + private readonly Sender _sender; + private readonly BlockingCollection<NodeStruct> _nodesWithData; /// <summary> /// Creates a new OperatorTopology object. http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Network/Group/Topology/FlatTopology.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Network/Group/Topology/FlatTopology.cs b/lang/cs/Org.Apache.REEF.Network/Group/Topology/FlatTopology.cs index 5342410..39b5a99 100644 --- a/lang/cs/Org.Apache.REEF.Network/Group/Topology/FlatTopology.cs +++ b/lang/cs/Org.Apache.REEF.Network/Group/Topology/FlatTopology.cs @@ -17,20 +17,15 @@ * under the License. */ +using System; +using System.Collections.Generic; using Org.Apache.REEF.Network.Group.Config; using Org.Apache.REEF.Network.Group.Operators; using Org.Apache.REEF.Network.Group.Operators.Impl; -using Org.Apache.REEF.Tang.Annotations; -using Org.Apache.REEF.Tang.Implementations; +using Org.Apache.REEF.Tang.Implementations.Tang; using Org.Apache.REEF.Tang.Interface; using Org.Apache.REEF.Tang.Util; using Org.Apache.REEF.Wake.Remote; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Org.Apache.REEF.Tang.Implementations.Tang; namespace Org.Apache.REEF.Network.Group.Topology { @@ -41,13 +36,13 @@ namespace Org.Apache.REEF.Network.Group.Topology /// <typeparam name="T">The message type</typeparam> public class FlatTopology<T> : ITopology<T> { - private string _groupName; - private string _operatorName; + private readonly string _groupName; + private readonly string _operatorName; - private string _rootId; - private string _driverId; + private readonly string _rootId; + private readonly string _driverId; - private Dictionary<string, TaskNode> _nodes; + private readonly Dictionary<string, TaskNode> _nodes; private TaskNode _root; /// <summary> http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Network/Group/Topology/ITopology.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Network/Group/Topology/ITopology.cs b/lang/cs/Org.Apache.REEF.Network/Group/Topology/ITopology.cs index c4dc9e6..32fe5cc 100644 --- a/lang/cs/Org.Apache.REEF.Network/Group/Topology/ITopology.cs +++ b/lang/cs/Org.Apache.REEF.Network/Group/Topology/ITopology.cs @@ -19,11 +19,6 @@ using Org.Apache.REEF.Network.Group.Operators; using Org.Apache.REEF.Tang.Interface; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Org.Apache.REEF.Network.Group.Topology { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Network/Group/Topology/TaskNode.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Network/Group/Topology/TaskNode.cs b/lang/cs/Org.Apache.REEF.Network/Group/Topology/TaskNode.cs index 54a46a1..65cdb5e 100644 --- a/lang/cs/Org.Apache.REEF.Network/Group/Topology/TaskNode.cs +++ b/lang/cs/Org.Apache.REEF.Network/Group/Topology/TaskNode.cs @@ -17,13 +17,7 @@ * under the License. */ -using Org.Apache.REEF.Tang.Annotations; -using Org.Apache.REEF.Tang.Util; -using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Org.Apache.REEF.Network.Group.Topology { @@ -38,7 +32,7 @@ namespace Org.Apache.REEF.Network.Group.Topology private string _driverId; private TaskNode _parent; - private List<TaskNode> _children; + private readonly List<TaskNode> _children; public TaskNode( string groupName, http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Network/Naming/Codec/NamingLookupRequestCodec.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Network/Naming/Codec/NamingLookupRequestCodec.cs b/lang/cs/Org.Apache.REEF.Network/Naming/Codec/NamingLookupRequestCodec.cs index e411013..f68750b 100644 --- a/lang/cs/Org.Apache.REEF.Network/Naming/Codec/NamingLookupRequestCodec.cs +++ b/lang/cs/Org.Apache.REEF.Network/Naming/Codec/NamingLookupRequestCodec.cs @@ -17,10 +17,10 @@ * under the License. */ +using Org.Apache.REEF.Network.Naming.Contracts; using Org.Apache.REEF.Network.Naming.Events; using Org.Apache.REEF.Utilities; using Org.Apache.REEF.Wake.Remote; -using Org.Apache.REEF.Network.Naming.Contracts; namespace Org.Apache.REEF.Network.Naming.Codec { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Network/Naming/Codec/NamingLookupResponseCodec.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Network/Naming/Codec/NamingLookupResponseCodec.cs b/lang/cs/Org.Apache.REEF.Network/Naming/Codec/NamingLookupResponseCodec.cs index 8b44ded..d8a6cca 100644 --- a/lang/cs/Org.Apache.REEF.Network/Naming/Codec/NamingLookupResponseCodec.cs +++ b/lang/cs/Org.Apache.REEF.Network/Naming/Codec/NamingLookupResponseCodec.cs @@ -17,13 +17,13 @@ * under the License. */ +using System.Collections.Generic; +using System.Linq; using Org.Apache.REEF.Common.Io; +using Org.Apache.REEF.Network.Naming.Contracts; using Org.Apache.REEF.Network.Naming.Events; using Org.Apache.REEF.Utilities; using Org.Apache.REEF.Wake.Remote; -using System.Collections.Generic; -using System.Linq; -using Org.Apache.REEF.Network.Naming.Contracts; namespace Org.Apache.REEF.Network.Naming.Codec { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Network/Naming/Codec/NamingRegisterRequestCodec.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Network/Naming/Codec/NamingRegisterRequestCodec.cs b/lang/cs/Org.Apache.REEF.Network/Naming/Codec/NamingRegisterRequestCodec.cs index 966b884..d64025d 100644 --- a/lang/cs/Org.Apache.REEF.Network/Naming/Codec/NamingRegisterRequestCodec.cs +++ b/lang/cs/Org.Apache.REEF.Network/Naming/Codec/NamingRegisterRequestCodec.cs @@ -18,10 +18,10 @@ */ using Org.Apache.REEF.Common.Io; +using Org.Apache.REEF.Network.Naming.Contracts; using Org.Apache.REEF.Network.Naming.Events; using Org.Apache.REEF.Utilities; using Org.Apache.REEF.Wake.Remote; -using Org.Apache.REEF.Network.Naming.Contracts; namespace Org.Apache.REEF.Network.Naming.Codec { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Network/Naming/Codec/NamingRegisterResponseCodec.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Network/Naming/Codec/NamingRegisterResponseCodec.cs b/lang/cs/Org.Apache.REEF.Network/Naming/Codec/NamingRegisterResponseCodec.cs index 8749d96..8a8a6e5 100644 --- a/lang/cs/Org.Apache.REEF.Network/Naming/Codec/NamingRegisterResponseCodec.cs +++ b/lang/cs/Org.Apache.REEF.Network/Naming/Codec/NamingRegisterResponseCodec.cs @@ -24,7 +24,7 @@ namespace Org.Apache.REEF.Network.Naming.Codec { internal class NamingRegisterResponseCodec : ICodec<NamingRegisterResponse> { - private NamingRegisterRequestCodec _codec; + private readonly NamingRegisterRequestCodec _codec; public NamingRegisterResponseCodec(NamingRegisterRequestCodec codec) { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Network/Naming/Codec/NamingUnregisterRequestCodec.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Network/Naming/Codec/NamingUnregisterRequestCodec.cs b/lang/cs/Org.Apache.REEF.Network/Naming/Codec/NamingUnregisterRequestCodec.cs index 44fd08b..f6e31b6 100644 --- a/lang/cs/Org.Apache.REEF.Network/Naming/Codec/NamingUnregisterRequestCodec.cs +++ b/lang/cs/Org.Apache.REEF.Network/Naming/Codec/NamingUnregisterRequestCodec.cs @@ -17,10 +17,10 @@ * under the License. */ +using Org.Apache.REEF.Network.Naming.Contracts; using Org.Apache.REEF.Network.Naming.Events; using Org.Apache.REEF.Utilities; using Org.Apache.REEF.Wake.Remote; -using Org.Apache.REEF.Network.Naming.Contracts; namespace Org.Apache.REEF.Network.Naming.Codec { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Network/Naming/INameServer.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Network/Naming/INameServer.cs b/lang/cs/Org.Apache.REEF.Network/Naming/INameServer.cs index 984e919..4cf47c0 100644 --- a/lang/cs/Org.Apache.REEF.Network/Naming/INameServer.cs +++ b/lang/cs/Org.Apache.REEF.Network/Naming/INameServer.cs @@ -21,7 +21,6 @@ using System; using System.Collections.Generic; using System.Net; using Org.Apache.REEF.Common.Io; -using Org.Apache.REEF.Network.Naming.Events; using Org.Apache.REEF.Tang.Annotations; namespace Org.Apache.REEF.Network.Naming http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Network/Naming/NameClient.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Network/Naming/NameClient.cs b/lang/cs/Org.Apache.REEF.Network/Naming/NameClient.cs index 9e0acac..a858879 100644 --- a/lang/cs/Org.Apache.REEF.Network/Naming/NameClient.cs +++ b/lang/cs/Org.Apache.REEF.Network/Naming/NameClient.cs @@ -17,23 +17,23 @@ * under the License. */ +using System; +using System.Collections.Concurrent; +using System.Collections.Generic; +using System.Linq; +using System.Net; +using System.Reactive; using Org.Apache.REEF.Common.Io; using Org.Apache.REEF.Network.Naming.Codec; using Org.Apache.REEF.Network.Naming.Events; +using Org.Apache.REEF.Tang.Annotations; using Org.Apache.REEF.Utilities.Diagnostics; using Org.Apache.REEF.Utilities.Logging; -using Org.Apache.REEF.Tang.Annotations; using Org.Apache.REEF.Wake; using Org.Apache.REEF.Wake.Remote; using Org.Apache.REEF.Wake.Remote.Impl; using Org.Apache.REEF.Wake.RX; using Org.Apache.REEF.Wake.RX.Impl; -using System; -using System.Collections.Concurrent; -using System.Collections.Generic; -using System.Linq; -using System.Net; -using System.Reactive; namespace Org.Apache.REEF.Network.Naming { @@ -43,7 +43,7 @@ namespace Org.Apache.REEF.Network.Naming /// </summary> public class NameClient : INameClient { - private static Logger _logger = Logger.GetLogger(typeof(NameClient)); + private static readonly Logger _logger = Logger.GetLogger(typeof(NameClient)); private BlockingCollection<NamingLookupResponse> _lookupResponseQueue; private BlockingCollection<NamingGetAllResponse> _getAllResponseQueue; @@ -261,7 +261,7 @@ namespace Org.Apache.REEF.Network.Naming /// </summary> private class ClientObserver : AbstractObserver<TransportEvent<NamingEvent>> { - private IObserver<NamingEvent> _handler; + private readonly IObserver<NamingEvent> _handler; public ClientObserver(IObserver<NamingEvent> handler) { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Network/Naming/NameLookupClient.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Network/Naming/NameLookupClient.cs b/lang/cs/Org.Apache.REEF.Network/Naming/NameLookupClient.cs index 7ca29c5..013aec8 100644 --- a/lang/cs/Org.Apache.REEF.Network/Naming/NameLookupClient.cs +++ b/lang/cs/Org.Apache.REEF.Network/Naming/NameLookupClient.cs @@ -33,9 +33,9 @@ namespace Org.Apache.REEF.Network.Naming /// </summary> internal class NameLookupClient { - private TransportClient<NamingEvent> _client; - private BlockingCollection<NamingLookupResponse> _lookupResponseQueue; - private BlockingCollection<NamingGetAllResponse> _getAllResponseQueue; + private readonly TransportClient<NamingEvent> _client; + private readonly BlockingCollection<NamingLookupResponse> _lookupResponseQueue; + private readonly BlockingCollection<NamingGetAllResponse> _getAllResponseQueue; /// <summary> /// Constructs a new NameLookupClient. http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Network/Naming/NameRegisterClient.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Network/Naming/NameRegisterClient.cs b/lang/cs/Org.Apache.REEF.Network/Naming/NameRegisterClient.cs index 2709819..95de43c 100644 --- a/lang/cs/Org.Apache.REEF.Network/Naming/NameRegisterClient.cs +++ b/lang/cs/Org.Apache.REEF.Network/Naming/NameRegisterClient.cs @@ -30,8 +30,8 @@ namespace Org.Apache.REEF.Network.Naming /// </summary> internal class NameRegisterClient { - private TransportClient<NamingEvent> _client; - private BlockingCollection<NamingRegisterResponse> _registerResponseQueue; + private readonly TransportClient<NamingEvent> _client; + private readonly BlockingCollection<NamingRegisterResponse> _registerResponseQueue; private BlockingCollection<NamingUnregisterResponse> _unregisterResponseQueue; public NameRegisterClient(TransportClient<NamingEvent> client, http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Network/Naming/NameServer.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Network/Naming/NameServer.cs b/lang/cs/Org.Apache.REEF.Network/Naming/NameServer.cs index c42de7e..0175e1b 100644 --- a/lang/cs/Org.Apache.REEF.Network/Naming/NameServer.cs +++ b/lang/cs/Org.Apache.REEF.Network/Naming/NameServer.cs @@ -17,21 +17,21 @@ * under the License. */ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Net; using Org.Apache.REEF.Common.Io; using Org.Apache.REEF.Network.Naming.Codec; using Org.Apache.REEF.Network.Naming.Events; using Org.Apache.REEF.Network.Naming.Observers; +using Org.Apache.REEF.Tang.Annotations; using Org.Apache.REEF.Utilities.Diagnostics; using Org.Apache.REEF.Utilities.Logging; -using Org.Apache.REEF.Tang.Annotations; using Org.Apache.REEF.Wake.Remote; using Org.Apache.REEF.Wake.Remote.Impl; using Org.Apache.REEF.Wake.RX; using Org.Apache.REEF.Wake.RX.Impl; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Net; namespace Org.Apache.REEF.Network.Naming { @@ -41,10 +41,10 @@ namespace Org.Apache.REEF.Network.Naming /// </summary> public class NameServer : INameServer { - private static Logger _logger = Logger.GetLogger(typeof(NameServer)); + private static readonly Logger _logger = Logger.GetLogger(typeof(NameServer)); - private TransportServer<NamingEvent> _server; - private Dictionary<string, IPEndPoint> _idToAddrMap; + private readonly TransportServer<NamingEvent> _server; + private readonly Dictionary<string, IPEndPoint> _idToAddrMap; /// <summary> /// Create a new NameServer to run on the specified port. @@ -178,7 +178,7 @@ namespace Org.Apache.REEF.Network.Naming /// </summary> private class ServerHandler : AbstractObserver<TransportEvent<NamingEvent>> { - private IObserver<NamingEvent> _handler; + private readonly IObserver<NamingEvent> _handler; public ServerHandler(IObserver<NamingEvent> handler) { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Network/Naming/Observers/NamingGetAllRequestObserver.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Network/Naming/Observers/NamingGetAllRequestObserver.cs b/lang/cs/Org.Apache.REEF.Network/Naming/Observers/NamingGetAllRequestObserver.cs index dfc8db0..d510bca 100644 --- a/lang/cs/Org.Apache.REEF.Network/Naming/Observers/NamingGetAllRequestObserver.cs +++ b/lang/cs/Org.Apache.REEF.Network/Naming/Observers/NamingGetAllRequestObserver.cs @@ -31,7 +31,7 @@ namespace Org.Apache.REEF.Network.Naming.Observers /// </summary> internal class NamingGetAllRequestObserver : AbstractObserver<NamingGetAllRequest> { - private NameServer _server; + private readonly NameServer _server; public NamingGetAllRequestObserver(NameServer server) { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Network/Naming/Observers/NamingLookupRequestObserver.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Network/Naming/Observers/NamingLookupRequestObserver.cs b/lang/cs/Org.Apache.REEF.Network/Naming/Observers/NamingLookupRequestObserver.cs index c31db7f..bf6780e 100644 --- a/lang/cs/Org.Apache.REEF.Network/Naming/Observers/NamingLookupRequestObserver.cs +++ b/lang/cs/Org.Apache.REEF.Network/Naming/Observers/NamingLookupRequestObserver.cs @@ -17,10 +17,10 @@ * under the License. */ +using System.Collections.Generic; using Org.Apache.REEF.Common.Io; using Org.Apache.REEF.Network.Naming.Events; using Org.Apache.REEF.Wake.RX; -using System.Collections.Generic; namespace Org.Apache.REEF.Network.Naming.Observers { @@ -29,7 +29,7 @@ namespace Org.Apache.REEF.Network.Naming.Observers /// </summary> internal class NamingLookupRequestObserver : AbstractObserver<NamingLookupRequest> { - private NameServer _server; + private readonly NameServer _server; public NamingLookupRequestObserver(NameServer server) { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Network/Naming/Observers/NamingRegisterRequestObserver.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Network/Naming/Observers/NamingRegisterRequestObserver.cs b/lang/cs/Org.Apache.REEF.Network/Naming/Observers/NamingRegisterRequestObserver.cs index 5add16b..b679962 100644 --- a/lang/cs/Org.Apache.REEF.Network/Naming/Observers/NamingRegisterRequestObserver.cs +++ b/lang/cs/Org.Apache.REEF.Network/Naming/Observers/NamingRegisterRequestObserver.cs @@ -28,7 +28,7 @@ namespace Org.Apache.REEF.Network.Naming.Observers /// </summary> internal class NamingRegisterRequestObserver : AbstractObserver<NamingRegisterRequest> { - private NameServer _server; + private readonly NameServer _server; public NamingRegisterRequestObserver(NameServer server) { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Network/Naming/Observers/NamingUnregisterRequestObserver.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Network/Naming/Observers/NamingUnregisterRequestObserver.cs b/lang/cs/Org.Apache.REEF.Network/Naming/Observers/NamingUnregisterRequestObserver.cs index 6127a4d..7ec0501 100644 --- a/lang/cs/Org.Apache.REEF.Network/Naming/Observers/NamingUnregisterRequestObserver.cs +++ b/lang/cs/Org.Apache.REEF.Network/Naming/Observers/NamingUnregisterRequestObserver.cs @@ -27,7 +27,7 @@ namespace Org.Apache.REEF.Network.Naming.Observers /// </summary> internal class NamingUnregisterRequestObserver : AbstractObserver<NamingUnregisterRequest> { - private NameServer _server; + private readonly NameServer _server; public NamingUnregisterRequestObserver(NameServer server) { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Network/NetworkService/Codec/NsMessageCodec.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Network/NetworkService/Codec/NsMessageCodec.cs b/lang/cs/Org.Apache.REEF.Network/NetworkService/Codec/NsMessageCodec.cs index d01a7ae..cc37310 100644 --- a/lang/cs/Org.Apache.REEF.Network/NetworkService/Codec/NsMessageCodec.cs +++ b/lang/cs/Org.Apache.REEF.Network/NetworkService/Codec/NsMessageCodec.cs @@ -17,12 +17,11 @@ * under the License. */ +using System.IO; +using System.Linq; using Org.Apache.REEF.Wake; using Org.Apache.REEF.Wake.Remote; using ProtoBuf; -using System; -using System.IO; -using System.Linq; namespace Org.Apache.REEF.Network.NetworkService.Codec { @@ -32,8 +31,8 @@ namespace Org.Apache.REEF.Network.NetworkService.Codec /// <typeparam name="T">The message type</typeparam> public class NsMessageCodec<T> : ICodec<NsMessage<T>> { - private ICodec<T> _codec; - private IIdentifierFactory _idFactory; + private readonly ICodec<T> _codec; + private readonly IIdentifierFactory _idFactory; /// <summary> /// Create new NsMessageCodec. http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Network/NetworkService/Codec/NsMessageProto.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Network/NetworkService/Codec/NsMessageProto.cs b/lang/cs/Org.Apache.REEF.Network/NetworkService/Codec/NsMessageProto.cs index 0de8be1..1ef148d 100644 --- a/lang/cs/Org.Apache.REEF.Network/NetworkService/Codec/NsMessageProto.cs +++ b/lang/cs/Org.Apache.REEF.Network/NetworkService/Codec/NsMessageProto.cs @@ -17,12 +17,7 @@ * under the License. */ -using System; using System.Collections.Generic; -using System.Linq; -using System.Runtime.Serialization; -using System.Text; -using System.Threading.Tasks; using Org.Apache.REEF.Wake.Remote; using ProtoBuf; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Network/NetworkService/INetworkService.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Network/NetworkService/INetworkService.cs b/lang/cs/Org.Apache.REEF.Network/NetworkService/INetworkService.cs index b34f94c..f950bfd 100644 --- a/lang/cs/Org.Apache.REEF.Network/NetworkService/INetworkService.cs +++ b/lang/cs/Org.Apache.REEF.Network/NetworkService/INetworkService.cs @@ -20,7 +20,6 @@ using System; using Org.Apache.REEF.Common.Io; using Org.Apache.REEF.Common.Services; -using Org.Apache.REEF.Tang.Annotations; using Org.Apache.REEF.Wake; namespace Org.Apache.REEF.Network.NetworkService http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Network/NetworkService/NetworkService.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Network/NetworkService/NetworkService.cs b/lang/cs/Org.Apache.REEF.Network/NetworkService/NetworkService.cs index aa365c5..3f4ded6 100644 --- a/lang/cs/Org.Apache.REEF.Network/NetworkService/NetworkService.cs +++ b/lang/cs/Org.Apache.REEF.Network/NetworkService/NetworkService.cs @@ -19,15 +19,13 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Net; -using System.Reactive; using Org.Apache.REEF.Common.Io; using Org.Apache.REEF.Network.Naming; using Org.Apache.REEF.Network.NetworkService.Codec; -using Org.Apache.REEF.Utilities.Logging; using Org.Apache.REEF.Tang.Annotations; using Org.Apache.REEF.Tang.Exceptions; +using Org.Apache.REEF.Utilities.Logging; using Org.Apache.REEF.Wake; using Org.Apache.REEF.Wake.Remote; using Org.Apache.REEF.Wake.Remote.Impl; @@ -41,14 +39,14 @@ namespace Org.Apache.REEF.Network.NetworkService /// <typeparam name="T">The message type</typeparam> public class NetworkService<T> : INetworkService<T> { - private Logger LOGGER = Logger.GetLogger(typeof(NetworkService<>)); + private readonly Logger LOGGER = Logger.GetLogger(typeof(NetworkService<>)); - private IRemoteManager<NsMessage<T>> _remoteManager; - private IObserver<NsMessage<T>> _messageHandler; - private ICodec<NsMessage<T>> _codec; + private readonly IRemoteManager<NsMessage<T>> _remoteManager; + private readonly IObserver<NsMessage<T>> _messageHandler; + private readonly ICodec<NsMessage<T>> _codec; private IIdentifier _localIdentifier; private IDisposable _messageHandlerDisposable; - private Dictionary<IIdentifier, IConnection<T>> _connectionMap; + private readonly Dictionary<IIdentifier, IConnection<T>> _connectionMap; /// <summary> /// Create a new NetworkFactory. http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Network/NetworkService/NetworkServiceConfiguration.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Network/NetworkService/NetworkServiceConfiguration.cs b/lang/cs/Org.Apache.REEF.Network/NetworkService/NetworkServiceConfiguration.cs index 9c26913..f9f5618 100644 --- a/lang/cs/Org.Apache.REEF.Network/NetworkService/NetworkServiceConfiguration.cs +++ b/lang/cs/Org.Apache.REEF.Network/NetworkService/NetworkServiceConfiguration.cs @@ -17,14 +17,8 @@ * under the License. */ -using System; -using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using Org.Apache.REEF.Common.Io; -using Org.Apache.REEF.Network.Naming; using Org.Apache.REEF.Tang.Formats; using Org.Apache.REEF.Tang.Util; using Org.Apache.REEF.Wake.Remote; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Network/NetworkService/NetworkServiceOptions.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Network/NetworkService/NetworkServiceOptions.cs b/lang/cs/Org.Apache.REEF.Network/NetworkService/NetworkServiceOptions.cs index 008751d..dbd9915 100644 --- a/lang/cs/Org.Apache.REEF.Network/NetworkService/NetworkServiceOptions.cs +++ b/lang/cs/Org.Apache.REEF.Network/NetworkService/NetworkServiceOptions.cs @@ -18,8 +18,6 @@ */ using Org.Apache.REEF.Tang.Annotations; -using Org.Apache.REEF.Wake; -using Org.Apache.REEF.Wake.Remote; namespace Org.Apache.REEF.Network.NetworkService { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Network/NetworkService/NsConnection.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Network/NetworkService/NsConnection.cs b/lang/cs/Org.Apache.REEF.Network/NetworkService/NsConnection.cs index bbf27d7..1cb47d3 100644 --- a/lang/cs/Org.Apache.REEF.Network/NetworkService/NsConnection.cs +++ b/lang/cs/Org.Apache.REEF.Network/NetworkService/NsConnection.cs @@ -18,16 +18,14 @@ */ using System; -using System.Collections.Concurrent; using System.Collections.Generic; -using System.Globalization; using System.IO; using System.Net; using System.Net.Sockets; using System.Runtime.Remoting; using Org.Apache.REEF.Common.Io; -using Org.Apache.REEF.Utilities.Logging; using Org.Apache.REEF.Tang.Exceptions; +using Org.Apache.REEF.Utilities.Logging; using Org.Apache.REEF.Wake; using Org.Apache.REEF.Wake.Remote; @@ -40,11 +38,11 @@ namespace Org.Apache.REEF.Network.NetworkService { private static readonly Logger LOGGER = Logger.GetLogger(typeof(NsConnection<T>)); - private IIdentifier _sourceId; - private IIdentifier _destId; - private INameClient _nameClient; - private IRemoteManager<NsMessage<T>> _remoteManager; - private Dictionary<IIdentifier, IConnection<T>> _connectionMap; + private readonly IIdentifier _sourceId; + private readonly IIdentifier _destId; + private readonly INameClient _nameClient; + private readonly IRemoteManager<NsMessage<T>> _remoteManager; + private readonly Dictionary<IIdentifier, IConnection<T>> _connectionMap; private IObserver<NsMessage<T>> _remoteSender; /// <summary> http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Network/Org.Apache.REEF.Network.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Network/Org.Apache.REEF.Network.csproj b/lang/cs/Org.Apache.REEF.Network/Org.Apache.REEF.Network.csproj index a564a7c..e7aebdb 100644 --- a/lang/cs/Org.Apache.REEF.Network/Org.Apache.REEF.Network.csproj +++ b/lang/cs/Org.Apache.REEF.Network/Org.Apache.REEF.Network.csproj @@ -35,9 +35,6 @@ under the License. <Reference Include="Microsoft.Hadoop.Avro"> <HintPath>$(PackagesDir)\Microsoft.Hadoop.Avro.$(AvroVersion)\lib\net40\Microsoft.Hadoop.Avro.dll</HintPath> </Reference> - <Reference Include="Newtonsoft.Json"> - <HintPath>$(PackagesDir)\Newtonsoft.Json.$(NewtonsoftJsonVersion)\lib\net45\Newtonsoft.Json.dll</HintPath> - </Reference> <Reference Include="protobuf-net"> <HintPath>$(PackagesDir)\protobuf-net.$(ProtobufVersion)\lib\net40\protobuf-net.dll</HintPath> </Reference> @@ -50,10 +47,6 @@ under the License. <Reference Include="System" /> <Reference Include="System.Core" /> <Reference Include="System.Runtime.Serialization" /> - <Reference Include="System.Xml.Linq" /> - <Reference Include="System.Data.DataSetExtensions" /> - <Reference Include="Microsoft.CSharp" /> - <Reference Include="System.Data" /> <Reference Include="System.Xml" /> </ItemGroup> <ItemGroup> @@ -180,4 +173,4 @@ under the License. <Target Name="AfterBuild"> </Target> --> -</Project> +</Project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Network/Properties/AssemblyInfo.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Network/Properties/AssemblyInfo.cs b/lang/cs/Org.Apache.REEF.Network/Properties/AssemblyInfo.cs index 536e986..148af39 100644 --- a/lang/cs/Org.Apache.REEF.Network/Properties/AssemblyInfo.cs +++ b/lang/cs/Org.Apache.REEF.Network/Properties/AssemblyInfo.cs @@ -18,7 +18,6 @@ */ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Network/Utilities/Utils.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Network/Utilities/Utils.cs b/lang/cs/Org.Apache.REEF.Network/Utilities/Utils.cs index cfa61b0..84338f1 100644 --- a/lang/cs/Org.Apache.REEF.Network/Utilities/Utils.cs +++ b/lang/cs/Org.Apache.REEF.Network/Utilities/Utils.cs @@ -17,21 +17,19 @@ * under the License. */ -using System.IO; -using Microsoft.Hadoop.Avro; using Org.Apache.REEF.Common.Tasks; using Org.Apache.REEF.Driver.Context; -using Org.Apache.REEF.Utilities.Logging; using Org.Apache.REEF.Tang.Exceptions; +using Org.Apache.REEF.Tang.Implementations.Tang; using Org.Apache.REEF.Tang.Interface; using Org.Apache.REEF.Tang.Util; -using Org.Apache.REEF.Tang.Implementations.Tang; +using Org.Apache.REEF.Utilities.Logging; namespace Org.Apache.REEF.Network.Utilities { internal class Utils { - private static Logger LOGGER = Logger.GetLogger(typeof(Utils)); + private static readonly Logger LOGGER = Logger.GetLogger(typeof(Utils)); /// <summary> /// Returns the TaskIdentifier from the Configuration. http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang.Examples/AnonymousType.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tang.Examples/AnonymousType.cs b/lang/cs/Org.Apache.REEF.Tang.Examples/AnonymousType.cs index ad5bd26..1d9595a 100644 --- a/lang/cs/Org.Apache.REEF.Tang.Examples/AnonymousType.cs +++ b/lang/cs/Org.Apache.REEF.Tang.Examples/AnonymousType.cs @@ -33,7 +33,7 @@ namespace Org.Apache.REEF.Tang.Examples public class AnonymousType { - private Dictionary<string, MyEventStreamDefinition> d = new Dictionary<string, MyEventStreamDefinition>(); + private readonly Dictionary<string, MyEventStreamDefinition> d = new Dictionary<string, MyEventStreamDefinition>(); private Dictionary<string, int> d2; //Anonymous class in injectable constructor http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang.Examples/CheckChild.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tang.Examples/CheckChild.cs b/lang/cs/Org.Apache.REEF.Tang.Examples/CheckChild.cs index c925c36..785ba2d 100644 --- a/lang/cs/Org.Apache.REEF.Tang.Examples/CheckChild.cs +++ b/lang/cs/Org.Apache.REEF.Tang.Examples/CheckChild.cs @@ -1,4 +1,4 @@ -/** +/** * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,11 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; + using Org.Apache.REEF.Tang.Annotations; namespace Org.Apache.REEF.Tang.Examples http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang.Examples/DocumentedLocalNamedParameter.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tang.Examples/DocumentedLocalNamedParameter.cs b/lang/cs/Org.Apache.REEF.Tang.Examples/DocumentedLocalNamedParameter.cs index 3a2b88e..0b3b820 100644 --- a/lang/cs/Org.Apache.REEF.Tang.Examples/DocumentedLocalNamedParameter.cs +++ b/lang/cs/Org.Apache.REEF.Tang.Examples/DocumentedLocalNamedParameter.cs @@ -1,4 +1,4 @@ -/** +/** * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,14 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -using System; + +using System; using Org.Apache.REEF.Tang.Annotations; namespace Org.Apache.REEF.Tang.Examples { public class DocumentedLocalNamedParameter { - string value; + readonly string value; [NamedParameter(Documentation = "doc stuff", ShortName = "DocFoo", DefaultValue = "some value")] public sealed class Foo : Name<String> { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang.Examples/FileNames.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tang.Examples/FileNames.cs b/lang/cs/Org.Apache.REEF.Tang.Examples/FileNames.cs index 0263a66..96de3a9 100644 --- a/lang/cs/Org.Apache.REEF.Tang.Examples/FileNames.cs +++ b/lang/cs/Org.Apache.REEF.Tang.Examples/FileNames.cs @@ -17,12 +17,6 @@ * under the License. */ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - namespace Org.Apache.REEF.Tang.Examples { public class FileNames http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/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 20c2091..801b76f 100644 --- a/lang/cs/Org.Apache.REEF.Tang.Examples/ForksInjectorInConstructor.cs +++ b/lang/cs/Org.Apache.REEF.Tang.Examples/ForksInjectorInConstructor.cs @@ -1,4 +1,4 @@ -/** +/** * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,8 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -using System; -using System.Collections.Generic; + +using Org.Apache.REEF.Tang.Annotations; +using Org.Apache.REEF.Tang.Implementations.Tang; +using Org.Apache.REEF.Tang.Interface; /** * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -37,14 +39,6 @@ using System.Collections.Generic; * under the License. */ -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Org.Apache.REEF.Tang.Annotations; -using Org.Apache.REEF.Tang.Implementations; -using Org.Apache.REEF.Tang.Interface; -using Org.Apache.REEF.Tang.Implementations.Tang; - namespace Org.Apache.REEF.Tang.Examples { public class ForksInjectorInConstructor http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang.Examples/NamedParameterConstructors.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tang.Examples/NamedParameterConstructors.cs b/lang/cs/Org.Apache.REEF.Tang.Examples/NamedParameterConstructors.cs index d3e784e..e7aeb5a 100644 --- a/lang/cs/Org.Apache.REEF.Tang.Examples/NamedParameterConstructors.cs +++ b/lang/cs/Org.Apache.REEF.Tang.Examples/NamedParameterConstructors.cs @@ -1,4 +1,4 @@ -/** +/** * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,11 +16,8 @@ * specific language governing permissions and limitations * under the License. */ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; + +using System; using Org.Apache.REEF.Tang.Annotations; namespace Org.Apache.REEF.Tang.Examples http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang.Examples/Org.Apache.REEF.Tang.Examples.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tang.Examples/Org.Apache.REEF.Tang.Examples.csproj b/lang/cs/Org.Apache.REEF.Tang.Examples/Org.Apache.REEF.Tang.Examples.csproj index c8066a7..07ce338 100644 --- a/lang/cs/Org.Apache.REEF.Tang.Examples/Org.Apache.REEF.Tang.Examples.csproj +++ b/lang/cs/Org.Apache.REEF.Tang.Examples/Org.Apache.REEF.Tang.Examples.csproj @@ -37,11 +37,6 @@ under the License. <ItemGroup> <Reference Include="System" /> <Reference Include="System.Core" /> - <Reference Include="System.Xml.Linq" /> - <Reference Include="System.Data.DataSetExtensions" /> - <Reference Include="Microsoft.CSharp" /> - <Reference Include="System.Data" /> - <Reference Include="System.Xml" /> </ItemGroup> <ItemGroup> <Compile Include="AnonymousType.cs" /> @@ -64,10 +59,6 @@ under the License. <Project>{97dbb573-3994-417a-9f69-ffa25f00d2a6}</Project> <Name>Org.Apache.REEF.Tang</Name> </ProjectReference> - <ProjectReference Include="$(SolutionDir)\Org.Apache.REEF.Utilities\Org.Apache.REEF.Utilities.csproj"> - <Project>{79e7f89a-1dfb-45e1-8d43-d71a954aeb98}</Project> - <Name>Org.Apache.REEF.Utilities</Name> - </ProjectReference> <ProjectReference Include="$(SolutionDir)\Org.Apache.REEF.Wake\Org.Apache.REEF.Wake.csproj"> <Project>{cdfb3464-4041-42b1-9271-83af24cd5008}</Project> <Name>Org.Apache.REEF.Wake</Name> @@ -81,4 +72,4 @@ under the License. <Target Name="AfterBuild"> </Target> --> -</Project> +</Project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang.Examples/Properties/AssemblyInfo.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tang.Examples/Properties/AssemblyInfo.cs b/lang/cs/Org.Apache.REEF.Tang.Examples/Properties/AssemblyInfo.cs index efe60ce..2b1cde5 100644 --- a/lang/cs/Org.Apache.REEF.Tang.Examples/Properties/AssemblyInfo.cs +++ b/lang/cs/Org.Apache.REEF.Tang.Examples/Properties/AssemblyInfo.cs @@ -18,7 +18,6 @@ */ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang.Examples/ShortNameFooAB.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tang.Examples/ShortNameFooAB.cs b/lang/cs/Org.Apache.REEF.Tang.Examples/ShortNameFooAB.cs index fbbdf6b..1529004 100644 --- a/lang/cs/Org.Apache.REEF.Tang.Examples/ShortNameFooAB.cs +++ b/lang/cs/Org.Apache.REEF.Tang.Examples/ShortNameFooAB.cs @@ -1,4 +1,4 @@ -/** +/** * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,11 +16,8 @@ * specific language governing permissions and limitations * under the License. */ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; + +using System; using Org.Apache.REEF.Tang.Annotations; namespace Org.Apache.REEF.Tang.Examples http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang.Examples/SimpleConstructors.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tang.Examples/SimpleConstructors.cs b/lang/cs/Org.Apache.REEF.Tang.Examples/SimpleConstructors.cs index b1acc7e..dd8c176 100644 --- a/lang/cs/Org.Apache.REEF.Tang.Examples/SimpleConstructors.cs +++ b/lang/cs/Org.Apache.REEF.Tang.Examples/SimpleConstructors.cs @@ -1,4 +1,4 @@ -/** +/** * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,7 +16,8 @@ * specific language governing permissions and limitations * under the License. */ -using System; + +using System; using Org.Apache.REEF.Tang.Annotations; namespace Org.Apache.REEF.Tang.Examples http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang.Examples/TestClasses.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tang.Examples/TestClasses.cs b/lang/cs/Org.Apache.REEF.Tang.Examples/TestClasses.cs index 9cdaa0c..d67ccfd 100644 --- a/lang/cs/Org.Apache.REEF.Tang.Examples/TestClasses.cs +++ b/lang/cs/Org.Apache.REEF.Tang.Examples/TestClasses.cs @@ -1,4 +1,4 @@ -/** +/** * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,11 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; + using Org.Apache.REEF.Tang.Annotations; namespace Org.Apache.REEF.Tang.Examples http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang.Examples/Timer.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tang.Examples/Timer.cs b/lang/cs/Org.Apache.REEF.Tang.Examples/Timer.cs index 85886c3..e1ffe9d 100644 --- a/lang/cs/Org.Apache.REEF.Tang.Examples/Timer.cs +++ b/lang/cs/Org.Apache.REEF.Tang.Examples/Timer.cs @@ -1,4 +1,4 @@ -/** +/** * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,7 +16,8 @@ * specific language governing permissions and limitations * under the License. */ -using System; + +using System; using System.Threading; using Org.Apache.REEF.Tang.Annotations; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang.Examples/TweetExample.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tang.Examples/TweetExample.cs b/lang/cs/Org.Apache.REEF.Tang.Examples/TweetExample.cs index 5053069..d72636d 100644 --- a/lang/cs/Org.Apache.REEF.Tang.Examples/TweetExample.cs +++ b/lang/cs/Org.Apache.REEF.Tang.Examples/TweetExample.cs @@ -1,4 +1,4 @@ -/** +/** * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,7 +16,8 @@ * specific language governing permissions and limitations * under the License. */ -using System; + +using System; using Org.Apache.REEF.Tang.Annotations; namespace Org.Apache.REEF.Tang.Examples @@ -62,9 +63,9 @@ namespace Org.Apache.REEF.Tang.Examples public class Tweeter { - ITweetFactory tw; - ISMS sms; - long phoneNumber; + readonly ITweetFactory tw; + readonly ISMS sms; + readonly long phoneNumber; [NamedParameter(Documentation="Phone number", ShortName="number", DefaultValue="1800")] public class PhoneNumber : Name<long> { } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang.Tests/ClassHierarchy/TestAnonymousType.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/ClassHierarchy/TestAnonymousType.cs b/lang/cs/Org.Apache.REEF.Tang.Tests/ClassHierarchy/TestAnonymousType.cs index fb12c1b..14dac67 100644 --- a/lang/cs/Org.Apache.REEF.Tang.Tests/ClassHierarchy/TestAnonymousType.cs +++ b/lang/cs/Org.Apache.REEF.Tang.Tests/ClassHierarchy/TestAnonymousType.cs @@ -20,12 +20,11 @@ using System; using System.Collections.Generic; using System.IO; +using Microsoft.VisualStudio.TestTools.UnitTesting; using Org.Apache.REEF.Tang.Examples; -using Org.Apache.REEF.Tang.Implementations; +using Org.Apache.REEF.Tang.Implementations.Tang; using Org.Apache.REEF.Tang.Interface; using Org.Apache.REEF.Tang.Protobuf; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Org.Apache.REEF.Tang.Implementations.Tang; namespace Org.Apache.REEF.Tang.Tests.ClassHierarchy { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang.Tests/ClassHierarchy/TestClassHierarchy.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/ClassHierarchy/TestClassHierarchy.cs b/lang/cs/Org.Apache.REEF.Tang.Tests/ClassHierarchy/TestClassHierarchy.cs index a71b973..af3c4aa 100644 --- a/lang/cs/Org.Apache.REEF.Tang.Tests/ClassHierarchy/TestClassHierarchy.cs +++ b/lang/cs/Org.Apache.REEF.Tang.Tests/ClassHierarchy/TestClassHierarchy.cs @@ -17,19 +17,18 @@ * under the License. */ +using System; +using System.Collections.Generic; using Microsoft.VisualStudio.TestTools.UnitTesting; +using Org.Apache.REEF.Common.Tasks; +using Org.Apache.REEF.Examples.Tasks.HelloTask; using Org.Apache.REEF.Tang.Annotations; using Org.Apache.REEF.Tang.Examples; using Org.Apache.REEF.Tang.Exceptions; -using Org.Apache.REEF.Tang.Implementations; using Org.Apache.REEF.Tang.Implementations.Tang; using Org.Apache.REEF.Tang.Interface; using Org.Apache.REEF.Tang.Types; using Org.Apache.REEF.Tang.Util; -using System; -using System.Collections.Generic; -using Org.Apache.REEF.Common.Tasks; -using Org.Apache.REEF.Examples.Tasks.HelloTask; namespace Org.Apache.REEF.Tang.Tests.ClassHierarchy { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang.Tests/ClassHierarchy/TestClassHierarchyRoundTrip.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/ClassHierarchy/TestClassHierarchyRoundTrip.cs b/lang/cs/Org.Apache.REEF.Tang.Tests/ClassHierarchy/TestClassHierarchyRoundTrip.cs index a2dd2fc..bebc739 100644 --- a/lang/cs/Org.Apache.REEF.Tang.Tests/ClassHierarchy/TestClassHierarchyRoundTrip.cs +++ b/lang/cs/Org.Apache.REEF.Tang.Tests/ClassHierarchy/TestClassHierarchyRoundTrip.cs @@ -19,11 +19,10 @@ using System.Globalization; using System.IO; -using Org.Apache.REEF.Tang.Implementations; -using Org.Apache.REEF.Tang.Protobuf; using Microsoft.VisualStudio.TestTools.UnitTesting; using Org.Apache.REEF.Tang.Examples; using Org.Apache.REEF.Tang.Implementations.Tang; +using Org.Apache.REEF.Tang.Protobuf; namespace Org.Apache.REEF.Tang.Tests.ClassHierarchy { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang.Tests/ClassHierarchy/TestGeneric.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/ClassHierarchy/TestGeneric.cs b/lang/cs/Org.Apache.REEF.Tang.Tests/ClassHierarchy/TestGeneric.cs index 23cc28b..0e53847 100644 --- a/lang/cs/Org.Apache.REEF.Tang.Tests/ClassHierarchy/TestGeneric.cs +++ b/lang/cs/Org.Apache.REEF.Tang.Tests/ClassHierarchy/TestGeneric.cs @@ -18,11 +18,10 @@ */ using System.Collections.Generic; -using Org.Apache.REEF.Tang.Examples; -using Org.Apache.REEF.Tang.Implementations; using Microsoft.VisualStudio.TestTools.UnitTesting; -using Org.Apache.REEF.Wake.RX; +using Org.Apache.REEF.Tang.Examples; using Org.Apache.REEF.Tang.Implementations.Tang; +using Org.Apache.REEF.Wake.RX; namespace Org.Apache.REEF.Tang.Tests.ClassHierarchy { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang.Tests/ClassHierarchy/TestMultipleInterface.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/ClassHierarchy/TestMultipleInterface.cs b/lang/cs/Org.Apache.REEF.Tang.Tests/ClassHierarchy/TestMultipleInterface.cs index e687ef8..a92e366 100644 --- a/lang/cs/Org.Apache.REEF.Tang.Tests/ClassHierarchy/TestMultipleInterface.cs +++ b/lang/cs/Org.Apache.REEF.Tang.Tests/ClassHierarchy/TestMultipleInterface.cs @@ -18,9 +18,8 @@ */ using System; -using Org.Apache.REEF.Tang.Annotations; -using Org.Apache.REEF.Tang.Implementations; using Microsoft.VisualStudio.TestTools.UnitTesting; +using Org.Apache.REEF.Tang.Annotations; using Org.Apache.REEF.Tang.Implementations.Tang; namespace Org.Apache.REEF.Tang.Tests.ClassHierarchy http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang.Tests/ClassHierarchy/TestParameterParser.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/ClassHierarchy/TestParameterParser.cs b/lang/cs/Org.Apache.REEF.Tang.Tests/ClassHierarchy/TestParameterParser.cs index 3a335ef..bf8a11e 100644 --- a/lang/cs/Org.Apache.REEF.Tang.Tests/ClassHierarchy/TestParameterParser.cs +++ b/lang/cs/Org.Apache.REEF.Tang.Tests/ClassHierarchy/TestParameterParser.cs @@ -1,4 +1,4 @@ -/** +/** * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -using System; + +using System; +using Microsoft.VisualStudio.TestTools.UnitTesting; using Org.Apache.REEF.Tang.Annotations; using Org.Apache.REEF.Tang.Implementations.ClassHierarchy; +using Org.Apache.REEF.Tang.Implementations.Tang; using Org.Apache.REEF.Tang.Interface; using Org.Apache.REEF.Tang.Util; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Org.Apache.REEF.Tang.Implementations; -using Org.Apache.REEF.Tang.Implementations.Tang; namespace Org.Apache.REEF.Tang.Tests.ClassHierarchy { @@ -211,7 +211,7 @@ namespace Org.Apache.REEF.Tang.Tests.ClassHierarchy class FooParser : IExternalConstructor<Foo> { - private Foo foo; + private readonly Foo foo; [Inject] public FooParser(string s) { @@ -226,7 +226,7 @@ namespace Org.Apache.REEF.Tang.Tests.ClassHierarchy class BarParser : IExternalConstructor<Foo> { - private Bar bar; + private readonly Bar bar; [Inject] public BarParser(String s) { @@ -275,7 +275,7 @@ namespace Org.Apache.REEF.Tang.Tests.ClassHierarchy class TypeParser : IExternalConstructor<ParseableType> { - ParseableType instance; + readonly ParseableType instance; [Inject] public TypeParser(String s) { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang.Tests/ClassHierarchy/TestSerilization.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/ClassHierarchy/TestSerilization.cs b/lang/cs/Org.Apache.REEF.Tang.Tests/ClassHierarchy/TestSerilization.cs index 15e6beb..477d876 100644 --- a/lang/cs/Org.Apache.REEF.Tang.Tests/ClassHierarchy/TestSerilization.cs +++ b/lang/cs/Org.Apache.REEF.Tang.Tests/ClassHierarchy/TestSerilization.cs @@ -16,21 +16,20 @@ * specific language governing permissions and limitations * under the License. */ - using System; + +using System; using System.Collections.Generic; using System.Reflection; - using Org.Apache.REEF.Tang.Implementations; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using Org.Apache.REEF.Common.Tasks; +using Org.Apache.REEF.Examples.Tasks.HelloTask; +using Org.Apache.REEF.Examples.Tasks.StreamingTasks; +using Org.Apache.REEF.Tang.Examples; +using Org.Apache.REEF.Tang.Implementations.Tang; using Org.Apache.REEF.Tang.Interface; using Org.Apache.REEF.Tang.Protobuf; using Org.Apache.REEF.Tang.Types; using Org.Apache.REEF.Tang.Util; -using Microsoft.VisualStudio.TestTools.UnitTesting; - using Org.Apache.REEF.Common.Tasks; - using Org.Apache.REEF.Examples.Tasks.HelloTask; - using Org.Apache.REEF.Examples.Tasks.StreamingTasks; - using Org.Apache.REEF.Tang.Examples; -using Org.Apache.REEF.Tang.Implementations.InjectionPlan; -using Org.Apache.REEF.Tang.Implementations.Tang; namespace Org.Apache.REEF.Tang.Tests.ClassHierarchy { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang.Tests/Configuration/TestAvroConfiguration.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/Configuration/TestAvroConfiguration.cs b/lang/cs/Org.Apache.REEF.Tang.Tests/Configuration/TestAvroConfiguration.cs index 00900af..17e4575 100644 --- a/lang/cs/Org.Apache.REEF.Tang.Tests/Configuration/TestAvroConfiguration.cs +++ b/lang/cs/Org.Apache.REEF.Tang.Tests/Configuration/TestAvroConfiguration.cs @@ -18,15 +18,14 @@ */ using System.Collections.Generic; -using Org.Apache.REEF.Tang.Formats; -using Org.Apache.REEF.Tang.Implementations; -using Org.Apache.REEF.Tang.Interface; -using Org.Apache.REEF.Tang.Util; using Microsoft.VisualStudio.TestTools.UnitTesting; using Org.Apache.REEF.Common.Tasks; using Org.Apache.REEF.Examples.Tasks.HelloTask; +using Org.Apache.REEF.Tang.Formats; using Org.Apache.REEF.Tang.Formats.AvroConfigurationDataContract; using Org.Apache.REEF.Tang.Implementations.Tang; +using Org.Apache.REEF.Tang.Interface; +using Org.Apache.REEF.Tang.Util; namespace Org.Apache.REEF.Tang.Tests.Configuration { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang.Tests/Configuration/TestAvroSerializerRoundTrip.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/Configuration/TestAvroSerializerRoundTrip.cs b/lang/cs/Org.Apache.REEF.Tang.Tests/Configuration/TestAvroSerializerRoundTrip.cs index 64547d7..9c75910 100644 --- a/lang/cs/Org.Apache.REEF.Tang.Tests/Configuration/TestAvroSerializerRoundTrip.cs +++ b/lang/cs/Org.Apache.REEF.Tang.Tests/Configuration/TestAvroSerializerRoundTrip.cs @@ -17,11 +17,11 @@ * under the License. */ +using Microsoft.VisualStudio.TestTools.UnitTesting; using Org.Apache.REEF.Tang.Formats; +using Org.Apache.REEF.Tang.Formats.AvroConfigurationDataContract; using Org.Apache.REEF.Tang.Interface; using Org.Apache.REEF.Tang.Tests.SmokeTest; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Org.Apache.REEF.Tang.Formats.AvroConfigurationDataContract; namespace Org.Apache.REEF.Tang.Tests.Configuration { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang.Tests/Configuration/TestConfiguration.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/Configuration/TestConfiguration.cs b/lang/cs/Org.Apache.REEF.Tang.Tests/Configuration/TestConfiguration.cs index 6517e2a..59503bb 100644 --- a/lang/cs/Org.Apache.REEF.Tang.Tests/Configuration/TestConfiguration.cs +++ b/lang/cs/Org.Apache.REEF.Tang.Tests/Configuration/TestConfiguration.cs @@ -16,25 +16,24 @@ * specific language governing permissions and limitations * under the License. */ - using System; + +using System; using System.Collections.Generic; -using System.Reflection; - using Org.Apache.REEF.Tang.Annotations; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using Org.Apache.REEF.Common.Tasks; +using Org.Apache.REEF.Examples.Tasks.HelloTask; +using Org.Apache.REEF.Tang.Annotations; using Org.Apache.REEF.Tang.Examples; -using Org.Apache.REEF.Tang.Exceptions; -using Org.Apache.REEF.Tang.Formats; -using Org.Apache.REEF.Tang.Implementations; -using Org.Apache.REEF.Tang.Implementations.Configuration; -using Org.Apache.REEF.Tang.Interface; +using Org.Apache.REEF.Tang.Exceptions; +using Org.Apache.REEF.Tang.Formats; +using Org.Apache.REEF.Tang.Formats.AvroConfigurationDataContract; +using Org.Apache.REEF.Tang.Implementations.ClassHierarchy; +using Org.Apache.REEF.Tang.Implementations.Configuration; +using Org.Apache.REEF.Tang.Implementations.Tang; +using Org.Apache.REEF.Tang.Interface; using Org.Apache.REEF.Tang.Protobuf; +using Org.Apache.REEF.Tang.Tests.ScenarioTest; using Org.Apache.REEF.Tang.Util; -using Org.Apache.REEF.Tang.Tests.ScenarioTest; -using Microsoft.VisualStudio.TestTools.UnitTesting; - using Org.Apache.REEF.Common.Tasks; - using Org.Apache.REEF.Examples.Tasks.HelloTask; - using Org.Apache.REEF.Tang.Formats.AvroConfigurationDataContract; - using Org.Apache.REEF.Tang.Implementations.ClassHierarchy; -using Org.Apache.REEF.Tang.Implementations.Tang; namespace Org.Apache.REEF.Tang.Tests.Configuration { @@ -549,7 +548,7 @@ namespace Org.Apache.REEF.Tang.Tests.Configuration class NamedParamterNoDefault { - private string str; + private readonly string str; [NamedParameter] public class NamedString : Name<string> http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang.Tests/Configuration/TestCsConfigurationBuilderExtension.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/Configuration/TestCsConfigurationBuilderExtension.cs b/lang/cs/Org.Apache.REEF.Tang.Tests/Configuration/TestCsConfigurationBuilderExtension.cs index 0f01208..ef9adfa 100644 --- a/lang/cs/Org.Apache.REEF.Tang.Tests/Configuration/TestCsConfigurationBuilderExtension.cs +++ b/lang/cs/Org.Apache.REEF.Tang.Tests/Configuration/TestCsConfigurationBuilderExtension.cs @@ -18,13 +18,12 @@ */ using System.Collections.Generic; -using Org.Apache.REEF.Tang.Implementations; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using Org.Apache.REEF.Tang.Implementations.Tang; using Org.Apache.REEF.Tang.Interface; -using Org.Apache.REEF.Tang.Util; using Org.Apache.REEF.Tang.Tests.Injection; using Org.Apache.REEF.Tang.Tests.Tang; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Org.Apache.REEF.Tang.Implementations.Tang; +using Org.Apache.REEF.Tang.Util; namespace Org.Apache.REEF.Tang.Tests.Configuration { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang.Tests/Format/TestConfigurationModule.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/Format/TestConfigurationModule.cs b/lang/cs/Org.Apache.REEF.Tang.Tests/Format/TestConfigurationModule.cs index 5c56b96..4ac2c85 100644 --- a/lang/cs/Org.Apache.REEF.Tang.Tests/Format/TestConfigurationModule.cs +++ b/lang/cs/Org.Apache.REEF.Tang.Tests/Format/TestConfigurationModule.cs @@ -19,14 +19,13 @@ using System; using System.Collections.Generic; +using Microsoft.VisualStudio.TestTools.UnitTesting; using Org.Apache.REEF.Tang.Annotations; using Org.Apache.REEF.Tang.Exceptions; using Org.Apache.REEF.Tang.Formats; -using Org.Apache.REEF.Tang.Implementations; +using Org.Apache.REEF.Tang.Implementations.Tang; using Org.Apache.REEF.Tang.Interface; using Org.Apache.REEF.Tang.Util; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Org.Apache.REEF.Tang.Implementations.Tang; namespace Org.Apache.REEF.Tang.Tests.Format { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang.Tests/Format/TestConfigurationModuleForList.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/Format/TestConfigurationModuleForList.cs b/lang/cs/Org.Apache.REEF.Tang.Tests/Format/TestConfigurationModuleForList.cs index 94e3f03..509c4d5 100644 --- a/lang/cs/Org.Apache.REEF.Tang.Tests/Format/TestConfigurationModuleForList.cs +++ b/lang/cs/Org.Apache.REEF.Tang.Tests/Format/TestConfigurationModuleForList.cs @@ -19,13 +19,12 @@ using System; using System.Collections.Generic; +using Microsoft.VisualStudio.TestTools.UnitTesting; using Org.Apache.REEF.Tang.Annotations; using Org.Apache.REEF.Tang.Formats; -using Org.Apache.REEF.Tang.Implementations; +using Org.Apache.REEF.Tang.Implementations.Tang; using Org.Apache.REEF.Tang.Interface; using Org.Apache.REEF.Tang.Util; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Org.Apache.REEF.Tang.Implementations.Tang; namespace Org.Apache.REEF.Tang.Tests.Format { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang.Tests/Format/TestTaskConfiguration.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/Format/TestTaskConfiguration.cs b/lang/cs/Org.Apache.REEF.Tang.Tests/Format/TestTaskConfiguration.cs index ee50e20..14cc1ce 100644 --- a/lang/cs/Org.Apache.REEF.Tang.Tests/Format/TestTaskConfiguration.cs +++ b/lang/cs/Org.Apache.REEF.Tang.Tests/Format/TestTaskConfiguration.cs @@ -19,15 +19,14 @@ using System; using System.Collections.Generic; -using Org.Apache.REEF.Tang.Annotations; -using Org.Apache.REEF.Tang.Formats; -using Org.Apache.REEF.Tang.Implementations; -using Org.Apache.REEF.Tang.Interface; -using Org.Apache.REEF.Tang.Util; using Microsoft.VisualStudio.TestTools.UnitTesting; using Org.Apache.REEF.Common.Tasks; using Org.Apache.REEF.Examples.Tasks.HelloTask; +using Org.Apache.REEF.Tang.Annotations; +using Org.Apache.REEF.Tang.Formats; using Org.Apache.REEF.Tang.Implementations.Tang; +using Org.Apache.REEF.Tang.Interface; +using Org.Apache.REEF.Tang.Util; namespace Org.Apache.REEF.Tang.Tests.Format { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang.Tests/Injection/TestAmbigousConstructors.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/Injection/TestAmbigousConstructors.cs b/lang/cs/Org.Apache.REEF.Tang.Tests/Injection/TestAmbigousConstructors.cs index 57ac1ea..53c3fd9 100644 --- a/lang/cs/Org.Apache.REEF.Tang.Tests/Injection/TestAmbigousConstructors.cs +++ b/lang/cs/Org.Apache.REEF.Tang.Tests/Injection/TestAmbigousConstructors.cs @@ -17,14 +17,12 @@ * under the License. */ -using System; +using Microsoft.VisualStudio.TestTools.UnitTesting; using Org.Apache.REEF.Tang.Annotations; using Org.Apache.REEF.Tang.Exceptions; -using Org.Apache.REEF.Tang.Implementations; +using Org.Apache.REEF.Tang.Implementations.Tang; using Org.Apache.REEF.Tang.Interface; using Org.Apache.REEF.Tang.Util; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Org.Apache.REEF.Tang.Implementations.Tang; namespace Org.Apache.REEF.Tang.Tests.Injection { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang.Tests/Injection/TestForkInjection.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/Injection/TestForkInjection.cs b/lang/cs/Org.Apache.REEF.Tang.Tests/Injection/TestForkInjection.cs index 485ca23..3b49eab 100644 --- a/lang/cs/Org.Apache.REEF.Tang.Tests/Injection/TestForkInjection.cs +++ b/lang/cs/Org.Apache.REEF.Tang.Tests/Injection/TestForkInjection.cs @@ -17,14 +17,13 @@ * under the License. */ +using System; +using System.Reflection; using Microsoft.VisualStudio.TestTools.UnitTesting; using Org.Apache.REEF.Tang.Examples; -using Org.Apache.REEF.Tang.Implementations; using Org.Apache.REEF.Tang.Implementations.Tang; using Org.Apache.REEF.Tang.Interface; using Org.Apache.REEF.Tang.Util; -using System; -using System.Reflection; namespace Org.Apache.REEF.Tang.Tests.Injection { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang.Tests/Injection/TestInjection.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/Injection/TestInjection.cs b/lang/cs/Org.Apache.REEF.Tang.Tests/Injection/TestInjection.cs index bb57ad1..3fbb173 100644 --- a/lang/cs/Org.Apache.REEF.Tang.Tests/Injection/TestInjection.cs +++ b/lang/cs/Org.Apache.REEF.Tang.Tests/Injection/TestInjection.cs @@ -17,19 +17,18 @@ * under the License. */ +using System; +using System.Reflection; using Microsoft.VisualStudio.TestTools.UnitTesting; +using Org.Apache.REEF.Common.Tasks; +using Org.Apache.REEF.Examples.Tasks.HelloTask; +using Org.Apache.REEF.Examples.Tasks.StreamingTasks; using Org.Apache.REEF.Tang.Annotations; using Org.Apache.REEF.Tang.Examples; -using Org.Apache.REEF.Tang.Implementations; using Org.Apache.REEF.Tang.Implementations.ClassHierarchy; using Org.Apache.REEF.Tang.Implementations.Tang; using Org.Apache.REEF.Tang.Interface; using Org.Apache.REEF.Tang.Util; -using System; -using System.Reflection; -using Org.Apache.REEF.Common.Tasks; -using Org.Apache.REEF.Examples.Tasks.HelloTask; -using Org.Apache.REEF.Examples.Tasks.StreamingTasks; namespace Org.Apache.REEF.Tang.Tests.Injection { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1d6563e5/lang/cs/Org.Apache.REEF.Tang.Tests/Injection/TestInjectionFuture.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/Injection/TestInjectionFuture.cs b/lang/cs/Org.Apache.REEF.Tang.Tests/Injection/TestInjectionFuture.cs index d9f81f7..b079af1 100644 --- a/lang/cs/Org.Apache.REEF.Tang.Tests/Injection/TestInjectionFuture.cs +++ b/lang/cs/Org.Apache.REEF.Tang.Tests/Injection/TestInjectionFuture.cs @@ -17,13 +17,12 @@ * under the License. */ -using Org.Apache.REEF.Tang.Annotations; -using Org.Apache.REEF.Tang.Implementations; -using Org.Apache.REEF.Tang.Interface; -using Org.Apache.REEF.Tang.Util; using Microsoft.VisualStudio.TestTools.UnitTesting; +using Org.Apache.REEF.Tang.Annotations; using Org.Apache.REEF.Tang.Implementations.InjectionPlan; using Org.Apache.REEF.Tang.Implementations.Tang; +using Org.Apache.REEF.Tang.Interface; +using Org.Apache.REEF.Tang.Util; namespace Org.Apache.REEF.Tang.Tests.Injection { @@ -135,7 +134,7 @@ namespace Org.Apache.REEF.Tang.Tests.Injection [DefaultImplementation(typeof(Futurist), "Futurist")] public class Futurist { - private IInjectionFuture<FlyingCar> fcar; + private readonly IInjectionFuture<FlyingCar> fcar; [Inject] public Futurist(IInjectionFuture<FlyingCar> car) { @@ -151,7 +150,7 @@ namespace Org.Apache.REEF.Tang.Tests.Injection public class PickyFuturist : Futurist { - private IInjectionFuture<FlyingCar> fCar; + private readonly IInjectionFuture<FlyingCar> fCar; [Inject] public PickyFuturist([Parameter(typeof(MyFlyingCar))] IInjectionFuture<FlyingCar> myFlyingCar) : base(myFlyingCar) { @@ -168,8 +167,8 @@ namespace Org.Apache.REEF.Tang.Tests.Injection [DefaultImplementation(typeof(FlyingCar), "")] public class FlyingCar { - private string color; - private Futurist driver; + private readonly string color; + private readonly Futurist driver; [Inject] public FlyingCar([Parameter(typeof(Color))] string color, Futurist driver)
