Sync to latest developments (#320)

Author: mdesalvo

RDFSharp.Test/RDFSharp.Test.csproj

@@ -14,7 +14,7 @@
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
 		<PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
 		<PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
-		<PackageReference Include="WireMock.Net" Version="1.5.35" />
+		<PackageReference Include="WireMock.Net" Version="1.5.36" />
 		<PackageReference Include="coverlet.collector" Version="6.0.0">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

RDFSharp/Query/Mirella/Algebra/Aggregators/RDFAvgAggregator.cs

@@ -40,7 +40,7 @@ public RDFAvgAggregator(RDFVariable aggrVariable, RDFVariable projVariable) : ba
         /// </summary>
         public override string ToString()
             => IsDistinct ? string.Format("(AVG(DISTINCT {0}) AS {1})", AggregatorVariable, ProjectionVariable)
-                               : string.Format("(AVG({0}) AS {1})", AggregatorVariable, ProjectionVariable);
+                          : string.Format("(AVG({0}) AS {1})", AggregatorVariable, ProjectionVariable);
         #endregion
 
         #region Methods

RDFSharp/Query/Mirella/Algebra/Aggregators/RDFCountAggregator.cs

@@ -40,7 +40,7 @@ public RDFCountAggregator(RDFVariable aggrVariable, RDFVariable projVariable) :
         /// </summary>
         public override string ToString()
             => IsDistinct ? string.Format("(COUNT(DISTINCT {0}) AS {1})", AggregatorVariable, ProjectionVariable)
-                               : string.Format("(COUNT({0}) AS {1})", AggregatorVariable, ProjectionVariable);
+                          : string.Format("(COUNT({0}) AS {1})", AggregatorVariable, ProjectionVariable);
         #endregion
 
         #region Methods

RDFSharp/Query/Mirella/Algebra/Aggregators/RDFMaxAggregator.cs

@@ -48,7 +48,7 @@ public RDFMaxAggregator(RDFVariable aggrVariable, RDFVariable projVariable, RDFQ
         /// </summary>
         public override string ToString()
             => IsDistinct ? string.Format("(MAX(DISTINCT {0}) AS {1})", AggregatorVariable, ProjectionVariable)
-                               : string.Format("(MAX({0}) AS {1})", AggregatorVariable, ProjectionVariable);
+                          : string.Format("(MAX({0}) AS {1})", AggregatorVariable, ProjectionVariable);
         #endregion
 
         #region Methods

RDFSharp/Query/Mirella/Algebra/Aggregators/RDFMinAggregator.cs

@@ -48,7 +48,7 @@ public RDFMinAggregator(RDFVariable aggrVariable, RDFVariable projVariable, RDFQ
         /// </summary>
         public override string ToString()
             => IsDistinct ? string.Format("(MIN(DISTINCT {0}) AS {1})", AggregatorVariable, ProjectionVariable)
-                               : string.Format("(MIN({0}) AS {1})", AggregatorVariable, ProjectionVariable);
+                          : string.Format("(MIN({0}) AS {1})", AggregatorVariable, ProjectionVariable);
         #endregion
 
         #region Methods

RDFSharp/Query/Mirella/Algebra/Aggregators/RDFSampleAggregator.cs

@@ -38,7 +38,7 @@ public RDFSampleAggregator(RDFVariable aggrVariable, RDFVariable projVariable) :
         /// </summary>
         public override string ToString()
             => IsDistinct ? string.Format("(SAMPLE(DISTINCT {0}) AS {1})", AggregatorVariable, ProjectionVariable)
-                               : string.Format("(SAMPLE({0}) AS {1})", AggregatorVariable, ProjectionVariable);
+                          : string.Format("(SAMPLE({0}) AS {1})", AggregatorVariable, ProjectionVariable);
         #endregion
 
         #region Methods

RDFSharp/Query/Mirella/Algebra/Aggregators/RDFSumAggregator.cs

@@ -41,7 +41,7 @@ public RDFSumAggregator(RDFVariable aggrVariable, RDFVariable projVariable) : ba
         /// </summary>
         public override string ToString()
             => IsDistinct ? string.Format("(SUM(DISTINCT {0}) AS {1})", AggregatorVariable, ProjectionVariable)
-                               : string.Format("(SUM({0}) AS {1})", AggregatorVariable, ProjectionVariable);
+                          : string.Format("(SUM({0}) AS {1})", AggregatorVariable, ProjectionVariable);
         #endregion
 
         #region Methods

RDFSharp/Query/Mirella/Algebra/Filters/RDFBooleanAndFilter.cs

@@ -43,6 +43,7 @@ public class RDFBooleanAndFilter : RDFFilter
         /// </summary>
         public RDFBooleanAndFilter(RDFFilter leftFilter, RDFFilter rightFilter)
         {
+            #region Guards
             if (leftFilter == null)
                 throw new RDFQueryException("Cannot create RDFBooleanAndFilter because given \"leftFilter\" parameter is null.");
             if (leftFilter is RDFExistsFilter)
@@ -51,6 +52,7 @@ public RDFBooleanAndFilter(RDFFilter leftFilter, RDFFilter rightFilter)
                 throw new RDFQueryException("Cannot create RDFBooleanAndFilter because given \"rightFilter\" parameter is null.");
             if (rightFilter is RDFExistsFilter)
                 throw new RDFQueryException("Cannot create RDFBooleanAndFilter because given \"rightFilter\" parameter is of type RDFExistsFilter: this is not allowed.");
+            #endregion
 
             LeftFilter = leftFilter;
             RightFilter = rightFilter;

RDFSharp/Query/Mirella/Algebra/Filters/RDFBooleanNotFilter.cs

@@ -38,10 +38,12 @@ public class RDFBooleanNotFilter : RDFFilter
         /// </summary>
         public RDFBooleanNotFilter(RDFFilter filter)
         {
+            #region Guards
             if (filter == null)
                 throw new RDFQueryException("Cannot create RDFBooleanNotFilter because given \"filter\" parameter is null.");
             if (filter is RDFExistsFilter)
                 throw new RDFQueryException("Cannot create RDFBooleanNotFilter because given \"filter\" parameter is of type RDFExistsFilter: this is not allowed.");
+            #endregion
 
             Filter = filter;
         }

RDFSharp/Query/Mirella/Algebra/Filters/RDFBooleanOrFilter.cs

@@ -43,6 +43,7 @@ public class RDFBooleanOrFilter : RDFFilter
         /// </summary>
         public RDFBooleanOrFilter(RDFFilter leftFilter, RDFFilter rightFilter)
         {
+            #region Guards
             if (leftFilter == null)
                 throw new RDFQueryException("Cannot create RDFBooleanOrFilter because given \"leftFilter\" parameter is null.");
             if (leftFilter is RDFExistsFilter)
@@ -51,7 +52,8 @@ public RDFBooleanOrFilter(RDFFilter leftFilter, RDFFilter rightFilter)
                 throw new RDFQueryException("Cannot create RDFBooleanOrFilter because given \"rightFilter\" parameter is null.");
             if (rightFilter is RDFExistsFilter)
                 throw new RDFQueryException("Cannot create RDFBooleanOrFilter because given \"rightFilter\" parameter is of type RDFExistsFilter: this is not allowed.");
-                
+            #endregion
+
             LeftFilter = leftFilter;
             RightFilter = rightFilter;
         }

RDFSharp/Query/Mirella/Algebra/Filters/RDFBoundFilter.cs

@@ -38,9 +38,11 @@ public class RDFBoundFilter : RDFFilter
         /// </summary>
         public RDFBoundFilter(RDFVariable variable)
         {
+            #region Guards
             if (variable == null)
                 throw new RDFQueryException("Cannot create RDFBoundFilter because given \"variable\" parameter is null.");
-            
+            #endregion
+
             VariableName = variable.ToString();
         }
         #endregion

RDFSharp/Query/Mirella/Algebra/Filters/RDFComparisonFilter.cs

@@ -50,10 +50,12 @@ public class RDFComparisonFilter : RDFFilter
         /// </summary>
         public RDFComparisonFilter(RDFQueryEnums.RDFComparisonFlavors comparisonFlavor, RDFPatternMember leftMember, RDFPatternMember rightMember)
         {
+            #region Guards
             if (leftMember == null)
                 throw new RDFQueryException("Cannot create RDFComparisonFilter because given \"leftMember\" parameter is null.");
             if (rightMember == null)
                 throw new RDFQueryException("Cannot create RDFComparisonFilter because given \"rightMember\" parameter is null.");
+            #endregion
 
             ComparisonFlavor = comparisonFlavor;
             LeftMember = leftMember;

RDFSharp/Query/Mirella/Algebra/Filters/RDFDatatypeFilter.cs

@@ -49,8 +49,10 @@ public class RDFDatatypeFilter : RDFFilter
         /// </summary>
         public RDFDatatypeFilter(RDFVariable variable, RDFModelEnums.RDFDatatypes datatype)
         {
+            #region Guards
             if (variable == null)
                 throw new RDFQueryException("Cannot create RDFDatatypeFilter because given \"variable\" parameter is null.");
+            #endregion
 
             VariableName = variable.ToString();
             Datatype = datatype;
@@ -67,7 +69,9 @@ public override string ToString()
         internal override string ToString(List<RDFNamespace> prefixes)
             => string.Concat(
                 "FILTER ( DATATYPE(", VariableName, ") = ",
-                RDFQueryPrinter.PrintPatternMember(RDFQueryUtilities.ParseRDFPatternMember(RDFModelUtilities.GetDatatypeFromEnum(Datatype)), prefixes), " )");
+                RDFQueryPrinter.PrintPatternMember(
+                    RDFQueryUtilities.ParseRDFPatternMember(
+                        RDFModelUtilities.GetDatatypeFromEnum(Datatype)), prefixes), " )");
         #endregion
 
         #region Methods

RDFSharp/Query/Mirella/Algebra/Filters/RDFExistsFilter.cs

@@ -44,10 +44,12 @@ public class RDFExistsFilter : RDFFilter
         /// </summary>
         public RDFExistsFilter(RDFPattern pattern)
         {
+            #region Guards
             if (pattern == null)
                 throw new RDFQueryException("Cannot create RDFExistsFilter because given \"pattern\" parameter is null.");
             if (pattern.Variables.Count == 0)
                 throw new RDFQueryException("Cannot create RDFExistsFilter because given \"pattern\" parameter is a ground pattern.");
+            #endregion
 
             Pattern = pattern;
             IsEvaluable = true;

RDFSharp/Query/Mirella/Algebra/Filters/RDFInFilter.cs

@@ -44,8 +44,10 @@ public class RDFInFilter : RDFFilter
         /// </summary>
         public RDFInFilter(RDFPatternMember termToSearch, List<RDFPatternMember> inTerms)
         {
+            #region Guards
             if (termToSearch == null)
                 throw new RDFQueryException("Cannot create RDFInFilter because given \"termToSearch\" parameter is null.");
+            #endregion
 
             TermToSearch = termToSearch;
             InTerms = inTerms ?? new List<RDFPatternMember>();

RDFSharp/Query/Mirella/Algebra/Filters/RDFIsBlankFilter.cs

@@ -39,8 +39,10 @@ public class RDFIsBlankFilter : RDFFilter
         /// </summary>
         public RDFIsBlankFilter(RDFVariable variable)
         {
+            #region Guards
             if (variable == null)
                 throw new RDFQueryException("Cannot create RDFIsBlankFilter because given \"variable\" parameter is null.");
+            #endregion
 
             VariableName = variable.ToString();
         }

RDFSharp/Query/Mirella/Algebra/Filters/RDFIsLiteralFilter.cs

@@ -40,8 +40,10 @@ public class RDFIsLiteralFilter : RDFFilter
         /// </summary>
         public RDFIsLiteralFilter(RDFVariable variable)
         {
+            #region Guards
             if (variable == null)
                 throw new RDFQueryException("Cannot create RDFIsLiteralFilter because given \"variable\" parameter is null.");
+            #endregion
 
             VariableName = variable.ToString();
         }

RDFSharp/Query/Mirella/Algebra/Filters/RDFIsNumericFilter.cs

@@ -39,8 +39,10 @@ public class RDFIsNumericFilter : RDFFilter
         /// </summary>
         public RDFIsNumericFilter(RDFVariable variable)
         {
+            #region Guards
             if (variable == null)
                 throw new RDFQueryException("Cannot create RDFIsNumericFilter because given \"variable\" parameter is null.");
+            #endregion
 
             VariableName = variable.ToString();
         }

RDFSharp/Query/Mirella/Algebra/Filters/RDFIsUriFilter.cs

@@ -39,8 +39,10 @@ public class RDFIsUriFilter : RDFFilter
         /// </summary>
         public RDFIsUriFilter(RDFVariable variable)
         {
+            #region Guards
             if (variable == null)
                 throw new RDFQueryException("Cannot create RDFIsUriFilter because given \"variable\" parameter is null.");
+            #endregion
 
             VariableName = variable.ToString();
         }

RDFSharp/Query/Mirella/Algebra/Filters/RDFLangMatchesFilter.cs

@@ -55,8 +55,10 @@ public class RDFLangMatchesFilter : RDFFilter
         /// </summary>
         public RDFLangMatchesFilter(RDFVariable variable, string language)
         {
+            #region Guards
             if (variable == null)
                 throw new RDFQueryException("Cannot create RDFLangMatchesFilter because given \"variable\" parameter is null.");
+            #endregion
 
             bool acceptsNoneOrAnyLanguageTag = (string.IsNullOrEmpty(language) || language == "*");
             if (acceptsNoneOrAnyLanguageTag || RDFPlainLiteral.LangTag.Value.Match(language).Success)

RDFSharp/Query/Mirella/Algebra/Filters/RDFRegexFilter.cs

@@ -45,10 +45,12 @@ public class RDFRegexFilter : RDFFilter
         /// </summary>
         public RDFRegexFilter(RDFVariable variable, Regex regex)
         {
+            #region Guards
             if (variable == null)
                 throw new RDFQueryException("Cannot create RDFRegexFilter because given \"variable\" parameter is null.");
             if (regex == null)
                 throw new RDFQueryException("Cannot create RDFRegexFilter because given \"regex\" parameter is null.");
+            #endregion
 
             VariableName = variable.ToString();
             RegEx = regex;

RDFSharp/Query/Mirella/Algebra/Filters/RDFSameTermFilter.cs

@@ -45,10 +45,12 @@ public class RDFSameTermFilter : RDFFilter
         /// </summary>
         public RDFSameTermFilter(RDFVariable variable, RDFPatternMember rdfTerm)
         {
+            #region Guards
             if (variable == null)
                 throw new RDFQueryException("Cannot create RDFSameTermFilter because given \"variable\" parameter is null.");
             if (rdfTerm == null)
                 throw new RDFQueryException("Cannot create RDFSameTermFilter because given \"rdfTerm\" parameter is null.");
+            #endregion
 
             VariableName = variable.ToString();
             RDFTerm = rdfTerm;

RDFSharp/Query/Mirella/Algebra/Filters/RDFValuesFilter.cs

@@ -80,7 +80,8 @@ internal override bool ApplyFilter(DataRow row, bool applyNegation)
                     string filterColumnValue = row[filterColumn].ToString();
 
                     //Filter the enumerable representation of the filter table
-                    valuesTableEnumerable = valuesTableEnumerable.Where(binding => binding.IsNull(filterColumn) || binding[filterColumn].ToString().Equals(filterColumnValue, StringComparison.Ordinal));
+                    valuesTableEnumerable = valuesTableEnumerable.Where(binding => 
+                        binding.IsNull(filterColumn) || binding[filterColumn].ToString().Equals(filterColumnValue, StringComparison.Ordinal));
                 });
 
                 //Analyze the response of the check

RDFSharp/Query/Mirella/Algebra/Modifiers/RDFGroupByModifier.cs

@@ -44,10 +44,12 @@ public class RDFGroupByModifier : RDFModifier
         /// </summary>
         public RDFGroupByModifier(List<RDFVariable> partitionVariables)
         {
+            #region Guards
             if (partitionVariables == null || partitionVariables.Count == 0)
                 throw new RDFQueryException("Cannot create RDFGroupByModifier because given \"partitionVariables\" parameter is null or empty.");
             if (partitionVariables.Any(pv => pv == null))
                 throw new RDFQueryException("Cannot create RDFGroupByModifier because given \"partitionVariables\" parameter contains null elements.");
+            #endregion
 
             PartitionVariables = new List<RDFVariable>();
             Aggregators = new List<RDFAggregator>();
@@ -116,19 +118,19 @@ private void ConsistencyChecks(DataTable table)
         {
             //Every partition variable must be found in the working table as a column
             IEnumerable<string> unavailablePartitionVariables = PartitionVariables.Where(pv => !table.Columns.Contains(pv.ToString()))
-                                                                                       .Select(pv => pv.ToString());
+                                                                                  .Select(pv => pv.ToString());
             if (unavailablePartitionVariables.Any())
                 throw new RDFQueryException(string.Format("Cannot apply GroupBy modifier because the working table does not contain the following columns needed for partitioning: {0}", string.Join(",", unavailablePartitionVariables.Distinct())));
 
             //Every aggregator variable must be found in the working table as a column
             IEnumerable<string> unavailableAggregatorVariables = Aggregators.Where(ag => !table.Columns.Contains(ag.AggregatorVariable.ToString()))
-                                                                                 .Select(ag => ag.AggregatorVariable.ToString());
+                                                                            .Select(ag => ag.AggregatorVariable.ToString());
             if (unavailableAggregatorVariables.Any())
                 throw new RDFQueryException(string.Format("Cannot apply GroupBy modifier because the working table does not contain the following columns needed for aggregation: {0}", string.Join(",", unavailableAggregatorVariables.Distinct())));
 
             //There should NOT be intersection between partition variables (GroupBy) and projection variables (Aggregators)
             IEnumerable<string> commonPartitionProjectionVariables = PartitionVariables.Where(pv => Aggregators.Any(ag => (!(ag is RDFPartitionAggregator)) && pv.Equals(ag.ProjectionVariable)))
-                                                                                            .Select(pav => pav.ToString());
+                                                                                       .Select(pav => pav.ToString());
             if (commonPartitionProjectionVariables.Any())
                 throw new RDFQueryException(string.Format("Cannot apply GroupBy modifier because the following variables have been specified both for partitioning (in GroupBy) and projection (in Aggregator): {0}", string.Join(",", commonPartitionProjectionVariables.Distinct())));
         }
@@ -170,9 +172,7 @@ private DataTable ExecuteFilterAlgorythm(DataTable resultTable)
                 DataTable filteredTable = resultTable.Clone();
                 IEnumerator rowsEnum = resultTable.Rows.GetEnumerator();
                 IEnumerable<RDFComparisonFilter> havingFilters = Aggregators.Where(ag => ag.HavingClause.Item1)
-                                                                                 .Select(ag => new RDFComparisonFilter(ag.HavingClause.Item2,
-                                                                                                                       ag.ProjectionVariable,
-                                                                                                                       ag.HavingClause.Item3));
+                                                                            .Select(ag => new RDFComparisonFilter(ag.HavingClause.Item2, ag.ProjectionVariable, ag.HavingClause.Item3));
                 #region ExecuteFilters
                 bool keepRow = false;
                 while (rowsEnum.MoveNext())

RDFSharp/Query/Mirella/Algebra/Modifiers/RDFLimitModifier.cs

@@ -37,9 +37,11 @@ public class RDFLimitModifier : RDFModifier
         /// </summary>
         public RDFLimitModifier(int limit)
         {
+            #region Guards
             if (limit < 0)
                 throw new RDFQueryException("Cannot create RDFLimitModifier because given \"limit\" parameter (" + limit + ") is negative.");
-            
+            #endregion
+
             Limit = limit;
         }
         #endregion

RDFSharp/Query/Mirella/Algebra/Modifiers/RDFOffsetModifier.cs

@@ -37,8 +37,10 @@ public class RDFOffsetModifier : RDFModifier
         /// </summary>
         public RDFOffsetModifier(int offset)
         {
+            #region Guards
             if (offset < 0)
                 throw new RDFQueryException("Cannot create RDFOffsetModifier because given \"offset\" parameter (" + offset + ") is negative.");
+            #endregion
 
             Offset = offset;
         }

RDFSharp/Query/Mirella/Algebra/Modifiers/RDFOrderByModifier.cs

@@ -41,9 +41,11 @@ public class RDFOrderByModifier : RDFModifier
         /// </summary>
         public RDFOrderByModifier(RDFVariable variable, RDFQueryEnums.RDFOrderByFlavors orderbyFlavor)
         {
+            #region Guards
             if (variable == null)
                 throw new RDFQueryException("Cannot create RDFOrderByModifier because given \"variable\" parameter is null.");
-            
+            #endregion
+
             OrderByFlavor = orderbyFlavor;
             Variable = variable;
         }