Skip to content

Commit 997f2bd

Browse files
mdesalvomdesalvo
committed
Applied a bunch of code quality suggestions from Rider
1 parent 3189b0d commit 997f2bd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+1487
-1328
lines changed

‎RDFSharp/Model/RDFDatatype.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,7 @@ public RDFGraph ToRDFGraph()
104104
//Then the eventual constraining facets
105105
if (validatesTargetDatatype.Item1 && Facets.Count > 0)
106106
return (Facets.TrueForAll(facet => facet.Validate(literalValue)), literalValue);
107-
else
108-
return validatesTargetDatatype;
107+
return validatesTargetDatatype;
109108
}
110109
#endregion
111110
}

‎RDFSharp/Model/RDFModelUtilities.cs‎

Lines changed: 36 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -624,26 +624,28 @@ internal static (bool,string) ValidateTypedLiteral(string literalValue, RDFModel
624624

625625
case RDFModelEnums.RDFDatatypes.XSD_QNAME:
626626
string[] prefixedQName = literalValue.Split(':');
627-
if (prefixedQName.Length == 1)
627+
switch (prefixedQName.Length)
628628
{
629-
try
630-
{
631-
XmlConvert.VerifyNCName(prefixedQName[0]);
632-
return (true, literalValue);
633-
}
634-
catch { return (false, literalValue); }
635-
}
636-
else if (prefixedQName.Length == 2)
637-
{
638-
try
639-
{
640-
XmlConvert.VerifyNCName(prefixedQName[0]);
641-
XmlConvert.VerifyNCName(prefixedQName[1]);
642-
return (true, literalValue);
643-
}
644-
catch { return (false, literalValue); }
629+
case 1:
630+
try
631+
{
632+
XmlConvert.VerifyNCName(prefixedQName[0]);
633+
return (true, literalValue);
634+
}
635+
catch { return (false, literalValue); }
636+
637+
case 2:
638+
try
639+
{
640+
XmlConvert.VerifyNCName(prefixedQName[0]);
641+
XmlConvert.VerifyNCName(prefixedQName[1]);
642+
return (true, literalValue);
643+
}
644+
catch { return (false, literalValue); }
645+
646+
default:
647+
return (false, literalValue);
645648
}
646-
else { return (false, literalValue); }
647649

648650
case RDFModelEnums.RDFDatatypes.XSD_NCNAME:
649651
case RDFModelEnums.RDFDatatypes.XSD_ID:
@@ -856,8 +858,7 @@ internal static (bool,string) ValidateTypedLiteral(string literalValue, RDFModel
856858
case RDFModelEnums.RDFDatatypes.OWL_REAL:
857859
if (decimal.TryParse(literalValue, NumberStyles.Integer | NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out decimal outDecimal))
858860
return (true, Convert.ToString(outDecimal, CultureInfo.InvariantCulture));
859-
else
860-
return (false, literalValue);
861+
return (false, literalValue);
861862

862863
case RDFModelEnums.RDFDatatypes.OWL_RATIONAL:
863864
bool isValidOwlRational = owlRational.Value.Match(literalValue).Success;
@@ -866,76 +867,64 @@ internal static (bool,string) ValidateTypedLiteral(string literalValue, RDFModel
866867
case RDFModelEnums.RDFDatatypes.XSD_DOUBLE:
867868
if (double.TryParse(literalValue, NumberStyles.Float, CultureInfo.InvariantCulture, out double outDouble))
868869
return (true, Convert.ToString(outDouble, CultureInfo.InvariantCulture));
869-
else
870-
return (false, literalValue);
870+
return (false, literalValue);
871871

872872
case RDFModelEnums.RDFDatatypes.XSD_FLOAT:
873873
if (float.TryParse(literalValue, NumberStyles.Float, CultureInfo.InvariantCulture, out float outFloat))
874874
return (true, Convert.ToString(outFloat, CultureInfo.InvariantCulture));
875-
else
876-
return (false, literalValue);
875+
return (false, literalValue);
877876

878877
case RDFModelEnums.RDFDatatypes.XSD_INTEGER:
879878
if (decimal.TryParse(literalValue, NumberStyles.Integer, CultureInfo.InvariantCulture, out decimal outInteger))
880879
return (true, Convert.ToString(outInteger, CultureInfo.InvariantCulture));
881-
else
882-
return (false, literalValue);
880+
return (false, literalValue);
883881

884882
case RDFModelEnums.RDFDatatypes.XSD_LONG:
885883
if (long.TryParse(literalValue, NumberStyles.Integer, CultureInfo.InvariantCulture, out long outLong))
886884
return (true, Convert.ToString(outLong, CultureInfo.InvariantCulture));
887-
else
888-
return (false, literalValue);
885+
return (false, literalValue);
889886

890887
case RDFModelEnums.RDFDatatypes.XSD_INT:
891888
if (int.TryParse(literalValue, NumberStyles.Integer, CultureInfo.InvariantCulture, out int outInt))
892889
return (true, Convert.ToString(outInt, CultureInfo.InvariantCulture));
893-
else
894-
return (false, literalValue);
890+
return (false, literalValue);
895891

896892
case RDFModelEnums.RDFDatatypes.XSD_SHORT:
897893
if (short.TryParse(literalValue, NumberStyles.Integer, CultureInfo.InvariantCulture, out short outShort))
898894
return (true, Convert.ToString(outShort, CultureInfo.InvariantCulture));
899-
else
900-
return (false, literalValue);
895+
return (false, literalValue);
901896

902897
case RDFModelEnums.RDFDatatypes.XSD_BYTE:
903898
if (sbyte.TryParse(literalValue, NumberStyles.Integer, CultureInfo.InvariantCulture, out sbyte outSByte))
904899
return (true, Convert.ToString(outSByte, CultureInfo.InvariantCulture));
905-
else
906-
return (false, literalValue);
900+
return (false, literalValue);
907901

908902
case RDFModelEnums.RDFDatatypes.XSD_UNSIGNEDLONG:
909903
if (ulong.TryParse(literalValue, NumberStyles.Integer, CultureInfo.InvariantCulture, out ulong outULong))
910904
return (true, Convert.ToString(outULong, CultureInfo.InvariantCulture));
911-
else
912-
return (false, literalValue);
905+
return (false, literalValue);
913906

914907
case RDFModelEnums.RDFDatatypes.XSD_UNSIGNEDINT:
915908
if (uint.TryParse(literalValue, NumberStyles.Integer, CultureInfo.InvariantCulture, out uint outUInt))
916909
return (true, Convert.ToString(outUInt, CultureInfo.InvariantCulture));
917-
else
918-
return (false, literalValue);
910+
return (false, literalValue);
919911

920912
case RDFModelEnums.RDFDatatypes.XSD_UNSIGNEDSHORT:
921913
if (ushort.TryParse(literalValue, NumberStyles.Integer, CultureInfo.InvariantCulture, out ushort outUShort))
922914
return (true, Convert.ToString(outUShort, CultureInfo.InvariantCulture));
923-
else
924-
return (false, literalValue);
915+
return (false, literalValue);
925916

926917
case RDFModelEnums.RDFDatatypes.XSD_UNSIGNEDBYTE:
927918
if (byte.TryParse(literalValue, NumberStyles.Integer, CultureInfo.InvariantCulture, out byte outByte))
928919
return (true, Convert.ToString(outByte, CultureInfo.InvariantCulture));
929-
else
930-
return (false, literalValue);
920+
return (false, literalValue);
931921

932922
case RDFModelEnums.RDFDatatypes.XSD_NONPOSITIVEINTEGER:
933923
if (decimal.TryParse(literalValue, NumberStyles.Integer, CultureInfo.InvariantCulture, out decimal outNPInteger))
934924
{
935925
if (outNPInteger > 0)
936926
return (false, literalValue);
937-
else
938-
return (true, Convert.ToString(outNPInteger, CultureInfo.InvariantCulture));
927+
return (true, Convert.ToString(outNPInteger, CultureInfo.InvariantCulture));
939928
}
940929
return (false, literalValue);
941930

@@ -944,8 +933,7 @@ internal static (bool,string) ValidateTypedLiteral(string literalValue, RDFModel
944933
{
945934
if (outNInteger > -1)
946935
return (false, literalValue);
947-
else
948-
return (true, Convert.ToString(outNInteger, CultureInfo.InvariantCulture));
936+
return (true, Convert.ToString(outNInteger, CultureInfo.InvariantCulture));
949937
}
950938
return (false, literalValue);
951939

@@ -954,8 +942,7 @@ internal static (bool,string) ValidateTypedLiteral(string literalValue, RDFModel
954942
{
955943
if (outNNInteger < 0)
956944
return (false, literalValue);
957-
else
958-
return (true, Convert.ToString(outNNInteger, CultureInfo.InvariantCulture));
945+
return (true, Convert.ToString(outNNInteger, CultureInfo.InvariantCulture));
959946
}
960947
return (false, literalValue);
961948

@@ -964,8 +951,7 @@ internal static (bool,string) ValidateTypedLiteral(string literalValue, RDFModel
964951
{
965952
if (outPInteger < 1)
966953
return (false, literalValue);
967-
else
968-
return (true, Convert.ToString(outPInteger, CultureInfo.InvariantCulture));
954+
return (true, Convert.ToString(outPInteger, CultureInfo.InvariantCulture));
969955
}
970956
return (false, literalValue);
971957
#endregion

‎RDFSharp/Model/RDFResource.cs‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,19 +59,16 @@ internal RDFResource(string uriString, Dictionary<string, long> hashContext)
5959
if (hashContext != null)
6060
{
6161
uriString = URI.ToString();
62-
LazyPatternMemberID = new Lazy<long>(() =>
62+
LazyPatternMemberID = new Lazy<long>(() =>
6363
{
6464
//Cache-Hit
6565
if (hashContext.TryGetValue(uriString, out long hashValue))
6666
return hashValue;
6767

6868
//Cache-Miss
69-
else
70-
{
71-
hashValue = RDFModelUtilities.CreateHash(uriString);
72-
hashContext.Add(uriString, hashValue);
73-
return hashValue;
74-
}
69+
hashValue = RDFModelUtilities.CreateHash(uriString);
70+
hashContext.Add(uriString, hashValue);
71+
return hashValue;
7572
});
7673
}
7774
}

0 commit comments

Comments
 (0)