Skip to content

Commit 7a11190

Browse files
committed
Apply suggestions from static analysis
1 parent ba32a51 commit 7a11190

7 files changed

Lines changed: 13 additions & 32 deletions

File tree

‎RDFSharp/Query/Mirella/Algebra/Expressions/RDFExistsExpression.cs‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,7 @@ public RDFExistsExpression(RDFSelectQuery subSelect)
7878
/// <exception cref="RDFQueryException"></exception>
7979
public RDFExistsExpression(RDFPatternGroup patternGroup)
8080
{
81-
#region Guards
82-
if (patternGroup == null)
83-
throw new RDFQueryException("Cannot create RDFExistsExpression because given \"patternGroup\" parameter is null.");
84-
#endregion
85-
86-
GroupGraphPattern = patternGroup;
81+
GroupGraphPattern = patternGroup ?? throw new RDFQueryException("Cannot create RDFExistsExpression because given \"patternGroup\" parameter is null.");
8782
}
8883
#endregion
8984

‎RDFSharp/Query/Mirella/Algebra/RDFService.cs‎

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -91,16 +91,9 @@ internal bool IsSilent
9191
/// <exception cref="RDFQueryException">When the endpoint or the inner pattern is null.</exception>
9292
public RDFService(RDFSPARQLEndpoint endpoint, RDFQueryMember innerPattern, RDFSPARQLEndpointQueryOptions queryOptions=null)
9393
{
94-
#region Guards
95-
if (endpoint == null)
96-
throw new RDFQueryException("Cannot create RDFService because given \"endpoint\" parameter is null.");
97-
if (innerPattern == null)
98-
throw new RDFQueryException("Cannot create RDFService because given \"innerPattern\" parameter is null.");
99-
#endregion
100-
101-
Endpoint = endpoint;
94+
Endpoint = endpoint ?? throw new RDFQueryException("Cannot create RDFService because given \"endpoint\" parameter is null.");
10295
EndpointVariable = null;
103-
InnerPattern = innerPattern;
96+
InnerPattern = innerPattern ?? throw new RDFQueryException("Cannot create RDFService because given \"innerPattern\" parameter is null.");
10497
QueryOptions = queryOptions ?? new RDFSPARQLEndpointQueryOptions();
10598
IsEvaluable = true;
10699
}
@@ -113,16 +106,9 @@ public RDFService(RDFSPARQLEndpoint endpoint, RDFQueryMember innerPattern, RDFSP
113106
/// <exception cref="RDFQueryException">When the variable or the inner pattern is null.</exception>
114107
public RDFService(RDFVariable endpointVariable, RDFQueryMember innerPattern, RDFSPARQLEndpointQueryOptions queryOptions=null)
115108
{
116-
#region Guards
117-
if (endpointVariable == null)
118-
throw new RDFQueryException("Cannot create RDFService because given \"endpointVariable\" parameter is null.");
119-
if (innerPattern == null)
120-
throw new RDFQueryException("Cannot create RDFService because given \"innerPattern\" parameter is null.");
121-
#endregion
122-
123109
Endpoint = new RDFSPARQLEndpoint(VariableEndpointPlaceholder);
124-
EndpointVariable = endpointVariable;
125-
InnerPattern = innerPattern;
110+
EndpointVariable = endpointVariable ?? throw new RDFQueryException("Cannot create RDFService because given \"endpointVariable\" parameter is null.");
111+
InnerPattern = innerPattern ?? throw new RDFQueryException("Cannot create RDFService because given \"innerPattern\" parameter is null.");
126112
QueryOptions = queryOptions ?? new RDFSPARQLEndpointQueryOptions();
127113
IsEvaluable = true;
128114
}

‎RDFSharp/Query/Mirella/Engines/RDFQueryEngine.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1548,8 +1548,8 @@ private static IEnumerable<RDFExpression> CollectQueryLevelExpressions(RDFQuery
15481548
private void PreEvaluateExistsInFilters(IEnumerable<RDFFilter> filters, RDFDataSource dataSource)
15491549
{
15501550
foreach (RDFFilter filter in filters)
1551-
if (filter is RDFFilter expressionFilter)
1552-
PreEvaluateNestedExistsExpressions(new[] { expressionFilter.Expression }, dataSource);
1551+
if (filter is RDFFilter)
1552+
PreEvaluateNestedExistsExpressions(new[] { filter.Expression }, dataSource);
15531553
}
15541554

15551555
/// <summary>

‎RDFSharp/Query/Mirella/RDFOperationPrinter.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ internal static string PrintOperationSet(RDFOperationSet operationSet)
324324
{
325325
if (operationIndex > 0)
326326
sb.AppendLine().Append(';').AppendLine();
327-
sb.Append(operationSet.Operations[operationIndex].ToString());
327+
sb.Append(operationSet.Operations[operationIndex]);
328328
}
329329
}
330330

‎RDFSharp/Query/RDFQueryUtilities.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public static RDFPatternMember ParseRDFPatternMember(string pMember)
5050

5151
#region Plain Literal
5252
//Detect presence of semantically valid datatype indicator ("^^")
53-
int lastIndexOfDatatype = pMember.LastIndexOf("^^", StringComparison.OrdinalIgnoreCase);
53+
int lastIndexOfDatatype = pMember.LastIndexOf("^^", StringComparison.Ordinal);
5454
if (lastIndexOfDatatype == -1
5555
|| lastIndexOfDatatype == pMember.Length - 2 //EndsWith "^^"
5656
|| RDFModelUtilities.GetUriFromString(pMember.Substring(lastIndexOfDatatype + 2)) == null)

‎RDFSharp/Store/RDFQuadruple.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,8 @@ public bool Equals(RDFQuadruple other)
167167
/// <summary>
168168
/// Performs the equality comparison between two quadruples
169169
/// </summary>
170-
public override bool Equals(object other)
171-
=> other is RDFQuadruple q && QuadrupleID == q.QuadrupleID;
170+
public override bool Equals(object obj)
171+
=> obj is RDFQuadruple q && QuadrupleID == q.QuadrupleID;
172172

173173
/// <summary>
174174
/// Calculates the hashcode of this quadruple

‎RDFSharp/Store/RDFStoreUtilities.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public static RDFQuadruple ParseQuadruple(IDataReader fetchedQuadruples)
4242
RDFResource qPredicate = new RDFResource(fetchedQuadruples["Predicate"].ToString());
4343

4444
//SPO-flavour quadruple
45-
if (string.Equals(fetchedQuadruples["TripleFlavor"].ToString(), "1"))
45+
if (string.Equals(fetchedQuadruples["TripleFlavor"].ToString(), "1", StringComparison.Ordinal))
4646
{
4747
RDFResource qObject = new RDFResource(fetchedQuadruples["Object"].ToString());
4848
return new RDFQuadruple(qContext, qSubject, qPredicate, qObject);
@@ -53,7 +53,7 @@ public static RDFQuadruple ParseQuadruple(IDataReader fetchedQuadruples)
5353

5454
//PlainLiteral
5555
//Detect presence of semantically valid datatype indicator ("^^")
56-
int lastIndexOfDatatype = literal.LastIndexOf("^^", StringComparison.OrdinalIgnoreCase);
56+
int lastIndexOfDatatype = literal.LastIndexOf("^^", StringComparison.Ordinal);
5757
if (lastIndexOfDatatype == -1
5858
|| lastIndexOfDatatype == literal.Length - 2 //EndsWith "^^"
5959
|| RDFModelUtilities.GetUriFromString(literal.Substring(lastIndexOfDatatype + 2)) == null)

0 commit comments

Comments
 (0)