Skip to content

AB#16 Fixing Code Quality Notes - part 1. #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BlaiseD merged 3 commits into from
Feb 4, 2026
Merged

AB#16 Fixing Code Quality Notes - part 1. #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9a83a89
AB#16 Fixing Code Quality Notes - part 1.
BlaiseD Feb 4, 2026
781c4c1
AB#14Making catch clause less generic.
BlaiseD Feb 4, 2026
53fd66f
AB#16 simplifu any clause.
BlaiseD Feb 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
run: dotnet build --no-restore --configuration Release

- name: Run unit tests
run: dotnet test --no-build --verbosity normal --configuration Release /p:CollectCoverage=true /p:Threshold=45 /p:ThresholdType=line /p:ThresholdStat=Average /p:CoverletOutput=./TestResults/ /p:ExcludeByAttribute="GeneratedCodeAttribute"
run: dotnet test --no-build --verbosity normal --configuration Release /p:CollectCoverage=true /p:Threshold=50 /p:ThresholdType=line /p:ThresholdStat=Average /p:CoverletOutput=./TestResults/ /p:ExcludeByAttribute="GeneratedCodeAttribute"

publish-packages:
name: Publish to GitHub Packages
Expand Down
21 changes: 3 additions & 18 deletions ...orkflow.ComponentModel.Serialization/ComponentModel/Compiler/ValidationErrorCollection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;

namespace LogicBuilder.Workflow.ComponentModel.Compiler
{
Expand Down Expand Up @@ -53,31 +54,15 @@ public bool HasErrors
{
get
{
if (Count > 0)
{
foreach (ValidationError e in this)
{
if (e != null && !e.IsWarning)
return true;
}
}
return false;
return this.OfType<ValidationError>().Any(e => (e?.IsWarning != true));
}
}

public bool HasWarnings
{
get
{
if (Count > 0)
{
foreach (ValidationError e in this)
{
if (e != null && e.IsWarning)
return true;
}
}
return false;
return this.OfType<ValidationError>().Any(e => e?.IsWarning == true);
}
}

Expand Down
24 changes: 10 additions & 14 deletions ...orkflow.ComponentModel.Serialization/ComponentModel/Serialization/ExtendedPropertyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Reflection;
using System.Xml;

Expand All @@ -17,11 +18,11 @@
internal sealed class ExtendedPropertyInfo : PropertyInfo
{
#region Members and Constructors
private PropertyInfo realPropertyInfo = null;
private GetValueHandler OnGetValue;
private SetValueHandler OnSetValue;
private GetQualifiedNameHandler OnGetXmlQualifiedName;
private WorkflowMarkupSerializationManager manager = null;
private readonly PropertyInfo realPropertyInfo = null;
private readonly GetValueHandler OnGetValue;
private readonly SetValueHandler OnSetValue;
private readonly GetQualifiedNameHandler OnGetXmlQualifiedName;
private readonly WorkflowMarkupSerializationManager manager = null;

internal ExtendedPropertyInfo(PropertyInfo propertyInfo, GetValueHandler getValueHandler, SetValueHandler setValueHandler, GetQualifiedNameHandler qualifiedNameHandler)
{
Expand Down Expand Up @@ -115,11 +116,11 @@ public override void SetValue(object obj, object value, BindingFlags invokeAttr,
OnSetValue?.Invoke(this, obj, value);
}

public XmlQualifiedName GetXmlQualifiedName(WorkflowMarkupSerializationManager manager, out string prefix)
public XmlQualifiedName GetXmlQualifiedName(WorkflowMarkupSerializationManager managerLocal, out string prefix)
{
prefix = String.Empty;
if (OnGetXmlQualifiedName != null)
return OnGetXmlQualifiedName(this, manager, out prefix);
return OnGetXmlQualifiedName(this, managerLocal, out prefix);
else
return null;
}
Expand Down Expand Up @@ -195,14 +196,9 @@ internal static bool IsExtendedProperty(WorkflowMarkupSerializationManager manag
}
internal static bool IsExtendedProperty(WorkflowMarkupSerializationManager manager, IList<PropertyInfo> propInfos, XmlQualifiedName xmlQualifiedName)
{
foreach (PropertyInfo propInfo in propInfos)
foreach (ExtendedPropertyInfo extendedProperty in propInfos.OfType<ExtendedPropertyInfo>())
{
ExtendedPropertyInfo extendedProperty = propInfo as ExtendedPropertyInfo;
if (extendedProperty == null)
continue;

string prefix = String.Empty;
XmlQualifiedName qualifiedPropertyName = extendedProperty.GetXmlQualifiedName(manager, out prefix);
XmlQualifiedName qualifiedPropertyName = extendedProperty.GetXmlQualifiedName(manager, out _);
if (qualifiedPropertyName.Name.Equals(xmlQualifiedName.Name, StringComparison.Ordinal)
&& qualifiedPropertyName.Namespace.Equals(xmlQualifiedName.Namespace, StringComparison.Ordinal))
{
Expand Down
168 changes: 86 additions & 82 deletions ...ow.ComponentModel.Serialization/ComponentModel/Serialization/MarkupExtensionSerializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
using System.ComponentModel;
using System.ComponentModel.Design.Serialization;
using System.Diagnostics;
using System.Linq;
using System.Reflection;
using System.Text;
using System.Xml;
Expand Down Expand Up @@ -43,49 +44,46 @@ protected internal sealed override string SerializeToString(WorkflowMarkupSerial

Dictionary<string, string> constructorArguments = null;
InstanceDescriptor instanceDescriptor = this.GetInstanceDescriptor(serializationManager, value);
if (instanceDescriptor != null)
if (instanceDescriptor != null && instanceDescriptor.MemberInfo is ConstructorInfo ctorInfo)
{
if (instanceDescriptor.MemberInfo is ConstructorInfo ctorInfo)
ParameterInfo[] parameters = ctorInfo.GetParameters();
if (parameters != null && parameters.Length == instanceDescriptor.Arguments.Count)
{
ParameterInfo[] parameters = ctorInfo.GetParameters();
if (parameters != null && parameters.Length == instanceDescriptor.Arguments.Count)
int i = 0;
foreach (object argValue in instanceDescriptor.Arguments)
{
int i = 0;
foreach (object argValue in instanceDescriptor.Arguments)
constructorArguments ??= [];
//
if (argValue == null)
continue;
constructorArguments.Add(parameters[i].Name, parameters[i++].Name);
if (index++ > 0)
writer.WriteString(MarkupExtensionSerializer.CompactFormatPropertySeperator);
else
writer.WriteString(MarkupExtensionSerializer.CompactFormatTypeSeperator);
if (argValue.GetType() == typeof(string))
{
constructorArguments ??= [];
//
if (argValue == null)
continue;
constructorArguments.Add(parameters[i].Name, parameters[i++].Name);
if (index++ > 0)
writer.WriteString(MarkupExtensionSerializer.CompactFormatPropertySeperator);
else
writer.WriteString(MarkupExtensionSerializer.CompactFormatTypeSeperator);
if (argValue.GetType() == typeof(string))
{
writer.WriteString(CreateEscapedValue(argValue as string));
}
else if (argValue is System.Type)
writer.WriteString(CreateEscapedValue(argValue as string));
}
else if (argValue is System.Type)
{
Type argType = argValue as Type;
if (argType?.Assembly != null)
{
Type argType = argValue as Type;
if (argType?.Assembly != null)
{
XmlQualifiedName typeQualifiedName = serializationManager.GetXmlQualifiedName(argType, out _);
writer.WriteQualifiedName(XmlConvert.EncodeName(typeQualifiedName.Name), typeQualifiedName.Namespace);
}
else
{
writer.WriteString(argType?.FullName ?? string.Empty);
}
XmlQualifiedName typeQualifiedName = serializationManager.GetXmlQualifiedName(argType, out _);
writer.WriteQualifiedName(XmlConvert.EncodeName(typeQualifiedName.Name), typeQualifiedName.Namespace);
}
else
{
string stringValue = base.SerializeToString(serializationManager, argValue);
if (stringValue != null)
writer.WriteString(stringValue);
writer.WriteString(argType?.FullName ?? string.Empty);
}
}
else
{
string stringValue = base.SerializeToString(serializationManager, argValue);
if (stringValue != null)
writer.WriteString(stringValue);
}
}
}
}
Expand All @@ -95,68 +93,74 @@ protected internal sealed override string SerializeToString(WorkflowMarkupSerial
.. GetProperties(serializationManager, value),
.. serializationManager.GetExtendedProperties(value),
];
foreach (PropertyInfo serializableProperty in properties)

foreach
(
PropertyInfo serializableProperty in properties.Where
(
p => Helpers.GetSerializationVisibility(p) != DesignerSerializationVisibility.Hidden
&& p.CanRead
&& p.GetValue(value, null) != null
)
)
{
if (Helpers.GetSerializationVisibility(serializableProperty) != DesignerSerializationVisibility.Hidden && serializableProperty.CanRead && serializableProperty.GetValue(value, null) != null)
if (serializationManager.GetSerializer(serializableProperty.PropertyType, typeof(WorkflowMarkupSerializer)) is not WorkflowMarkupSerializer propSerializer)
{
if (serializationManager.GetSerializer(serializableProperty.PropertyType, typeof(WorkflowMarkupSerializer)) is not WorkflowMarkupSerializer propSerializer)
{
serializationManager.ReportError(new WorkflowMarkupSerializationException(SR.GetString(SR.Error_SerializerNotAvailable, serializableProperty.PropertyType.FullName)));
continue;
}
serializationManager.ReportError(new WorkflowMarkupSerializationException(SR.GetString(SR.Error_SerializerNotAvailable, serializableProperty.PropertyType.FullName)));
continue;
}

if (constructorArguments != null)
{
object[] attributes = serializableProperty.GetCustomAttributes(typeof(ConstructorArgumentAttribute), false);
if (attributes.Length > 0 && constructorArguments.ContainsKey((attributes[0] as ConstructorArgumentAttribute).ArgumentName))
// Skip this property, it has already been represented by a constructor parameter
continue;
}
if (constructorArguments != null)
{
object[] attributes = serializableProperty.GetCustomAttributes(typeof(ConstructorArgumentAttribute), false);
if (attributes.Length > 0 && constructorArguments.ContainsKey((attributes[0] as ConstructorArgumentAttribute).ArgumentName))
// Skip this property, it has already been represented by a constructor parameter
continue;
}

//Get the property serializer so that we can convert the bind object to string
serializationManager.Context.Push(serializableProperty);
try
//Get the property serializer so that we can convert the bind object to string
serializationManager.Context.Push(serializableProperty);
try
{
object propValue = serializableProperty.GetValue(value, null);
if (propSerializer.ShouldSerializeValue(serializationManager, propValue))
{
object propValue = serializableProperty.GetValue(value, null);
if (propSerializer.ShouldSerializeValue(serializationManager, propValue))
//We do not allow nested bind syntax
if (propSerializer.CanSerializeToString(serializationManager, propValue))
{
//We do not allow nested bind syntax
if (propSerializer.CanSerializeToString(serializationManager, propValue))
{
if (index++ > 0)
writer.WriteString(MarkupExtensionSerializer.CompactFormatPropertySeperator);
else
writer.WriteString(MarkupExtensionSerializer.CompactFormatTypeSeperator);
writer.WriteString(serializableProperty.Name);
writer.WriteString(MarkupExtensionSerializer.CompactFormatNameValueSeperator);
if (index++ > 0)
writer.WriteString(MarkupExtensionSerializer.CompactFormatPropertySeperator);
else
writer.WriteString(MarkupExtensionSerializer.CompactFormatTypeSeperator);
writer.WriteString(serializableProperty.Name);
writer.WriteString(MarkupExtensionSerializer.CompactFormatNameValueSeperator);

if (propValue.GetType() == typeof(string))
{
writer.WriteString(CreateEscapedValue(propValue as string));
}
else
{
string stringValue = propSerializer.SerializeToString(serializationManager, propValue);
if (stringValue != null)
writer.WriteString(stringValue);
}
if (propValue.GetType() == typeof(string))
{
writer.WriteString(CreateEscapedValue(propValue as string));
}
else
{
serializationManager.ReportError(new WorkflowMarkupSerializationException(SR.GetString(SR.Error_SerializerNoSerializeLogic, [serializableProperty.Name, value.GetType().FullName])));
string stringValue = propSerializer.SerializeToString(serializationManager, propValue);
if (stringValue != null)
writer.WriteString(stringValue);
}
}
else
{
serializationManager.ReportError(new WorkflowMarkupSerializationException(SR.GetString(SR.Error_SerializerNoSerializeLogic, [serializableProperty.Name, value.GetType().FullName])));
}
}
catch
{
serializationManager.ReportError(new WorkflowMarkupSerializationException(SR.GetString(SR.Error_SerializerNoSerializeLogic, [serializableProperty.Name, value.GetType().FullName])));
continue;
}
finally
{
Debug.Assert((PropertyInfo)serializationManager.Context.Current == serializableProperty, "Serializer did not remove an object it pushed into stack.");
serializationManager.Context.Pop();
}
}
catch (Exception ex)
{
serializationManager.ReportError(new WorkflowMarkupSerializationException(SR.GetString(SR.Error_SerializerNoSerializeLogic, [serializableProperty.Name, value.GetType().FullName]), ex));
continue;
}
Comment on lines +155 to +159
finally
{
Debug.Assert((PropertyInfo)serializationManager.Context.Current == serializableProperty, "Serializer did not remove an object it pushed into stack.");
serializationManager.Context.Pop();
}
}
writer.WriteString(MarkupExtensionSerializer.CompactFormatEnd);
Expand Down
Loading