diff --git a/src/DataStreamSuite/DataStream/Offloading/CloudStreamManager.cs b/src/DataStreamSuite/DataStream/Offloading/CloudStreamManager.cs index 7c2b536cd..ae4bfca6a 100644 --- a/src/DataStreamSuite/DataStream/Offloading/CloudStreamManager.cs +++ b/src/DataStreamSuite/DataStream/Offloading/CloudStreamManager.cs @@ -1,13 +1,7 @@ -using BCG; - using System; using System.Collections.Generic; -using mbts.config; -using bts.utils; -using System.Threading.Tasks; using Bts.DataStreamExpressions; -using System.Collections.Generic; using BCG.Utilities.General; namespace BCG @@ -33,7 +27,7 @@ namespace BCG view_publisher = view_publisher_; } } - static ViewStream build_stream(string stream_expression) + static ViewStream? build_stream(string stream_expression) { try { @@ -60,7 +54,9 @@ namespace BCG } private void _on_str(object obj) { - DataPacket dp = obj as DataPacket; + if (obj is not DataPacket dp) { + return; + } foreach (IBlueRow r in dp.newRows) { string name = r.get("name"); @@ -97,4 +93,4 @@ namespace BCG } } -} \ No newline at end of file +} diff --git a/src/DataStreamSuite/DataStream/Primitives/Join/JoinNameResolver.cs b/src/DataStreamSuite/DataStream/Primitives/Join/JoinNameResolver.cs index 56dd56a6f..b56d4c5ed 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Join/JoinNameResolver.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Join/JoinNameResolver.cs @@ -27,7 +27,8 @@ namespace BCG string prependString = isLeft ? "left" : "right"; return String.Concat (prependString, colName).GetHashCode (); } - public override bool Equals (object obj) {return GetHashCode () == obj.GetHashCode ();} + public override bool Equals (object? obj) => + GetHashCode() == obj?.GetHashCode(); } diff --git a/src/DataStreamSuite/DataStream/Primitives/Join/JoinStream.cs b/src/DataStreamSuite/DataStream/Primitives/Join/JoinStream.cs index 7d05eeefa..5a72e617a 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Join/JoinStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Join/JoinStream.cs @@ -10,9 +10,9 @@ namespace BCG { public class JoinStream : ViewStream { - protected InternalJoinStream myIjs; - protected ProjectStream myPs; - protected ColumnMap myLeftCm, myRightCm; + protected InternalJoinStream? myIjs; + protected ProjectStream? myPs; + protected ColumnMap? myLeftCm, myRightCm; protected bool myIsProject = true; private bool myUseSuperJoin = DataStreamLoadFileConfig.instance.useNewJoin; diff --git a/src/DataStreamSuite/DataStream/Primitives/Join/SuperJoinStream.cs b/src/DataStreamSuite/DataStream/Primitives/Join/SuperJoinStream.cs index bb2bbf1f9..35690b29a 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Join/SuperJoinStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Join/SuperJoinStream.cs @@ -226,7 +226,8 @@ namespace BCG #region IDictionary Members - public void Add(object key, object value) { { throw new NotSupportedException("IBlueRow is readonly"); } } + public void Add(object key, object? value) => + throw new NotSupportedException("IBlueRow is readonly"); public void Clear() { throw new NotSupportedException("IBlueRow is readonly"); } @@ -256,10 +257,9 @@ namespace BCG } } - public object this[object key] - { - get { return key is string ? this[key.ToString()] : this[(int)key]; } - set { throw new NotSupportedException("IBlueRow is readonly"); } + public object? this[object key] { + get => key is string str ? this[str] : this[(int)key]; + set => throw new NotSupportedException("IBlueRow is readonly"); } #endregion diff --git a/src/DataStreamSuite/DataStream/Primitives/LightJoinStreams/LightForeignJoinRow.cs b/src/DataStreamSuite/DataStream/Primitives/LightJoinStreams/LightForeignJoinRow.cs index 598d8d6bc..7e02ff7ec 100644 --- a/src/DataStreamSuite/DataStream/Primitives/LightJoinStreams/LightForeignJoinRow.cs +++ b/src/DataStreamSuite/DataStream/Primitives/LightJoinStreams/LightForeignJoinRow.cs @@ -91,7 +91,8 @@ namespace BCG } } - public void Add (object key, object value) {throw new NotSupportedException ("The IBlueRow is readonly");} + public void Add (object key, object? value) => + throw new NotSupportedException ("The IBlueRow is readonly"); public void Clear () {throw new NotSupportedException ("The IBlueRow is readonly");} diff --git a/src/DataStreamSuite/DataStream/Primitives/Misc/TestStream.cs b/src/DataStreamSuite/DataStream/Primitives/Misc/TestStream.cs index acae94eaa..71f44e8ca 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Misc/TestStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Misc/TestStream.cs @@ -1,17 +1,8 @@ - - -using Amazon.Runtime.Internal; - using bts; -using DnsClient.Protocol; - using System; using System.Collections.Generic; using System.IO; -using System; -using Microsoft.VisualBasic; -using Spark.Core.Collections; using System.Reflection; namespace BCG { @@ -37,7 +28,8 @@ namespace BCG { private IBlueTableSchema _schema; class TestResult { - public string test_name = MethodBase.GetCurrentMethod().Name; + public string test_name = MethodBase.GetCurrentMethod()?.Name + ?? throw new InvalidOperationException("Failed to get test name from method"); public bool test_result; } private List> _tests = new @@ -795,4 +787,4 @@ namespace BCG { } -} \ No newline at end of file +} diff --git a/src/DataStreamSuite/DataStream/Primitives/Sort/SortRow.cs b/src/DataStreamSuite/DataStream/Primitives/Sort/SortRow.cs index a6a5b2758..ef778eecb 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Sort/SortRow.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Sort/SortRow.cs @@ -69,18 +69,14 @@ public class SortRow : IComparable, IBlueRow { /// The key can either be the string corrsponding to the column name or /// the order of the column /// - public object this[object key] { - get { - if (key is string) - return this[(string)key]; - return this[(int)key]; - } - set { throw new NotSupportedException("The IBlueRow is readonly"); } + public object? this[object key] { + get => key is string str ? this[str] : this[(int)key]; + set => throw new NotSupportedException("The IBlueRow is readonly"); } - public object this[int index] => row[index]; + public object? this[int index] => row[index]; - public object this[string colName] => row[colName]; + public object? this[string colName] => row[colName]; public ICollection Keys => row.Keys; diff --git a/src/DataStreamSuite/DataStream/Primitives/StaticCollectionStream/MutableStream.cs b/src/DataStreamSuite/DataStream/Primitives/StaticCollectionStream/MutableStream.cs index 4dcd8e6c6..17c5a42dd 100644 --- a/src/DataStreamSuite/DataStream/Primitives/StaticCollectionStream/MutableStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/StaticCollectionStream/MutableStream.cs @@ -22,9 +22,12 @@ namespace BCG /// public void loadCollection (IBlueRowCollection rows) { - myFireEvent (new DataPacket (rows, new BlueTable(rows), - myLastValue != null ? - new BlueTable((myLastValue as DataPacket).newRows) : new BlueTable (rows.schema))); + myFireEvent(new DataPacket( + rows, + new BlueTable(rows), + myLastValue is DataPacket dp + ? new BlueTable(dp.newRows) + : new BlueTable(rows.schema))); } /// diff --git a/src/DataStreamSuite/DataStream/Primitives/ThreadSafe/VSDBMarshallerStream.cs b/src/DataStreamSuite/DataStream/Primitives/ThreadSafe/VSDBMarshallerStream.cs index 887c07ac3..4bce8e362 100644 --- a/src/DataStreamSuite/DataStream/Primitives/ThreadSafe/VSDBMarshallerStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/ThreadSafe/VSDBMarshallerStream.cs @@ -123,7 +123,7 @@ namespace BCG public Guid subscription; } private ThreadSafeQueue _queued_updates; - TargetDoWorkRelay _do_work_relay; + TargetDoWorkRelay? _do_work_relay; Guid _current_source_subscription; Guid _current_target_subscription; int _source_thread; diff --git a/src/DataStreamSuite/DataStreamExpressions/DataStreamExpression.cs b/src/DataStreamSuite/DataStreamExpressions/DataStreamExpression.cs index 438bc04ea..7f84a8fad 100644 --- a/src/DataStreamSuite/DataStreamExpressions/DataStreamExpression.cs +++ b/src/DataStreamSuite/DataStreamExpressions/DataStreamExpression.cs @@ -31,7 +31,7 @@ public class DataStreamExpression { return sb.ToString(); } - public ViewStream getView(IDictionary env) { + public ViewStream? getView(IDictionary env) { for (int i = 0; i < Statements.Count - 1; i++) { Statements[i].getView(env); } diff --git a/src/DataStreamSuite/DataStreamExpressions/PrimitiveExpression.cs b/src/DataStreamSuite/DataStreamExpressions/PrimitiveExpression.cs index 357664ae2..1b90cd17e 100644 --- a/src/DataStreamSuite/DataStreamExpressions/PrimitiveExpression.cs +++ b/src/DataStreamSuite/DataStreamExpressions/PrimitiveExpression.cs @@ -104,21 +104,19 @@ public class PrimitiveExpression : StatementExpression { } string myPrintSingleViewArg(int atColumn, object o) { - if (o is StatementExpression) - return new string(' ', atColumn) + (o as StatementExpression).printView(atColumn); - else { - string result = new string(' ', atColumn); - - if (o is string) - result += new CSharpString((string)o).ToString(); - else if (o is QuotedView) - result += "[" + ((QuotedView)o).Value + "]"; - else if (o is bool) - result += o.Equals(true) ? "true" : "false"; - else - result += o.ToString(); - - return result; + if (o is StatementExpression exp) { + return new string(' ', atColumn) + exp.printView(atColumn); } + var result = new string(' ', atColumn); + if (o is string str) { + result += new CSharpString(str).ToString(); + } else if (o is QuotedView quotedView) { + result += "[" + quotedView.Value + "]"; + } else if (o is bool b) { + result += b ? "true" : "false"; + } else { + result += o.ToString(); + } + return result; } }