Skip to content
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

[WIP] Исправление замечаний сонара и рефакторинг #1355

Merged
merged 7 commits into from
Oct 7, 2023
Merged

[WIP] Исправление замечаний сонара и рефакторинг #1355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e897c3e
Исправление бесконечной рекурсии при получении разрешенной схемы
yukon39 Sep 23, 2023
0d188d8
Исправление замечаний Сонара
yukon39 Sep 23, 2023
7aa25f0
Упрощены методы объекта согласно рекомендациям Сонара
yukon39 Sep 27, 2023
f59e417
Для классов библиотеки запрещаем наследование
yukon39 Sep 27, 2023
65131a5
Унифицированы объекты определения типов
yukon39 Sep 28, 2023
f704ddc
fix: Исправлена инициализация пустого объекта
yukon39 Sep 28, 2023
dbe9f5c
build: Добавлено принудительное использование UTF-8 при сборке
yukon39 Sep 28, 2023
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
21 changes: 12 additions & 9 deletions Build_Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
ItemName="BuildVariant"/>
</CreateItem>

<Exec Command="dotnet publish &quot;src/%(BuildVariant.Identity)/%(BuildVariant.ProjectFile)&quot; -f %(BuildVariant.Framework) -c $(Configuration) -p:Platform=%(BuildVariant.Platform) -p:UseAppHost=false -o &quot;$(ArtifactsRoot)/fdd-%(BuildVariant.Suffix)/bin&quot;"/>
<Exec Command="dotnet publish &quot;src/%(BuildVariant.Identity)/%(BuildVariant.ProjectFile)&quot; -f %(BuildVariant.Framework) -c $(Configuration) -p:Platform=%(BuildVariant.Platform) -p:UseAppHost=false -o &quot;$(ArtifactsRoot)/fdd-%(BuildVariant.Suffix)/bin&quot;" UseUtf8Encoding="Always"/>

<PropertyGroup>
<CppBinPrefix>$(MSBuildProjectDirectory)/src/ScriptEngine.NativeApi/bin/$(Configuration)</CppBinPrefix>
Expand Down Expand Up @@ -105,9 +105,9 @@
<RuntimeID Include="osx-arm64"/>
</ItemGroup>

<Exec Command="dotnet publish &quot;src/oscript/oscript.csproj&quot; -r %(RuntimeID.Identity) --self-contained -c $(Configuration) -o &quot;$(ArtifactsRoot)/%(RuntimeID.Identity)/bin&quot;"/>
<Exec Command="dotnet publish &quot;src/oscript/oscript.csproj&quot; -r %(RuntimeID.Identity) --self-contained -c $(Configuration) -o &quot;$(ArtifactsRoot)/%(RuntimeID.Identity)/bin&quot;" UseUtf8Encoding="Always"/>

<PropertyGroup>
<PropertyGroup>
<CppBinPrefix>$(MSBuildProjectDirectory)/src/ScriptEngine.NativeApi/bin/$(Configuration)</CppBinPrefix>
</PropertyGroup>

Expand Down Expand Up @@ -183,8 +183,8 @@
<Output TaskParameter="FirstItem" PropertyName="Runner"/>
</GetFirstItem>

<Exec Command="dotnet &quot;$(Runner)&quot; &quot;$(MSBuildProjectDirectory)/install/unicode-zipper.os&quot; unpack &quot;$(MSBuildProjectDirectory)/install/opm.ospx&quot; &quot;$(LibDir)/tmp&quot;"/>
<Exec Command="dotnet &quot;$(Runner)&quot; &quot;$(MSBuildProjectDirectory)/install/unicode-zipper.os&quot; unpack &quot;$(LibDir)/tmp/content.zip&quot; &quot;$(LibDir)/opm&quot;"/>
<Exec Command="dotnet &quot;$(Runner)&quot; &quot;$(MSBuildProjectDirectory)/install/unicode-zipper.os&quot; unpack &quot;$(MSBuildProjectDirectory)/install/opm.ospx&quot; &quot;$(LibDir)/tmp&quot;" UseUtf8Encoding="Always"/>
<Exec Command="dotnet &quot;$(Runner)&quot; &quot;$(MSBuildProjectDirectory)/install/unicode-zipper.os&quot; unpack &quot;$(LibDir)/tmp/content.zip&quot; &quot;$(LibDir)/opm&quot;" UseUtf8Encoding="Always"/>

<Copy SourceFiles="$(MSBuildProjectDirectory)\install\package-loader.os" DestinationFolder="$(LibDir)"/>
<RemoveDir Directories="$(LibDir)/tmp"/>
Expand All @@ -206,7 +206,8 @@
<Exec Command="$(OpmLaunch) install -d &quot;$(LibDir)&quot; %(CoreLibraries.Identity)"
IgnoreExitCode="false"
EnvironmentVariables="@(ConfigEnv)"
Condition="'$(SkipLibraryDownload)' == ''"/>
Condition="'$(SkipLibraryDownload)' == ''"
UseUtf8Encoding="Always"/>

</Target>

Expand Down Expand Up @@ -258,6 +259,7 @@
WorkingDirectory="$(TestsRoot)/%(TestAssemblies.Identity)"
Command="dotnet test --logger:&quot;junit;LogFilePath=$(MSBuildProjectDirectory)/tests/%(TestAssemblies.Identity).xml&quot;"
IgnoreExitCode="true"
UseUtf8Encoding="Always"
/>

</Target>
Expand All @@ -278,7 +280,8 @@
WorkingDirectory="$(MSBuildProjectDirectory)\tests"
Command="dotnet &quot;$(Runner)&quot; &quot;$(MSBuildProjectDirectory)\tests\testrunner.os&quot; -runall . xddReportPath ."
IgnoreExitCode="true"
ContinueOnError="true">
ContinueOnError="true"
UseUtf8Encoding="Always">
<Output TaskParameter="ExitCode" PropertyName="TestsExitCode"/>
</Exec>

Expand Down Expand Up @@ -309,7 +312,7 @@
<Output TaskParameter="FirstItem" PropertyName="Runner"/>
</GetFirstItem>

<Exec Command="dotnet &quot;$(Runner)&quot; &quot;$(MSBuildProjectDirectory)\install\unicode-zipper.os&quot; pack &quot;$(ArtifactsRoot)/%(RuntimeID.Identity)/*&quot; &quot;$(ArtifactsRoot)/OneScript-$(ReleaseNumber)-%(RuntimeID.Identity).zip&quot;"/>
<Exec Command="dotnet &quot;$(Runner)&quot; &quot;$(MSBuildProjectDirectory)\install\unicode-zipper.os&quot; pack &quot;$(ArtifactsRoot)/%(RuntimeID.Identity)/*&quot; &quot;$(ArtifactsRoot)/OneScript-$(ReleaseNumber)-%(RuntimeID.Identity).zip&quot;" UseUtf8Encoding="Always"/>
<RemoveDir Directories="$(ArtifactsRoot)/%(RuntimeID.Identity)" />
</Target>

Expand Down Expand Up @@ -348,7 +351,7 @@

<Error Text="No nuget token (/p:NugetToken=) specified" Condition="'$(NugetToken)' == ''" />
<Exec WorkingDirectory="$(MSBuildProjectDirectory)\built\nuget"
Command="dotnet nuget push %(NugetAbleProject.Identity).$(ReleaseNumber).nupkg -k $(NugetToken) -s https://api.nuget.org/v3/index.json"/>
Command="dotnet nuget push %(NugetAbleProject.Identity).$(ReleaseNumber).nupkg -k $(NugetToken) -s https://api.nuget.org/v3/index.json" UseUtf8Encoding="Always"/>

</Target>

Expand Down
4 changes: 2 additions & 2 deletions src/OneScript.StandardLibrary/XDTO/XDTOSerializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ This Source Code Form is subject to the terms of the
namespace OneScript.StandardLibrary.XDTO
{
[ContextClass("СериализаторXDTO", "XDTOSerializer")]
public class XDTOSerializer : AutoContext<XDTOSerializer>
public sealed class XDTOSerializer : AutoContext<XDTOSerializer>
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

А чего ради тут sealed? Чем сонар это мотивирует?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Наверное тем же, зачем в java сонар рекомендует ставить final. Вырубил в бсл лс эту проверку нахер х)

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Типа если класс поддерживает расширение, то это должно быть прописано с умом, а так - the most restrictive action по Все поля

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

в дотнете расширяемость метода по умолчанию отсутствует (в отличие от Явы), поэтому ставить финал, чтобы кто-то не перекрыл неконтролируемо твой метод не надо, ты и так в базовом классе явно определяешь, что у тебя переопределяемое

{
private readonly ITypeManager _typeManager;
private readonly XmlGlobalFunctions _xmlGlobalFunctions;
Expand Down Expand Up @@ -223,7 +223,7 @@ public IValue ReadXML(XmlReaderImpl xmlReader, IValue valueType = null)
}
else if (xsiNil.SystemType == BasicTypes.String)
typeValue = new BslTypeValue(BasicTypes.Undefined);
};
}

if (typeValue == null)
throw RuntimeException.InvalidArgumentValue();
Expand Down
2 changes: 1 addition & 1 deletion src/OneScript.StandardLibrary/XMLSchema/Collections/XMLSchemaSet.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ This Source Code Form is subject to the terms of the
namespace OneScript.StandardLibrary.XMLSchema.Collections
{
[ContextClass("НаборСхемXML", "XMLSchemaSet")]
public class XMLSchemaSet : AutoCollectionContext<XMLSchemaSet, Objects.XMLSchema>
public sealed class XMLSchemaSet : AutoCollectionContext<XMLSchemaSet, Objects.XMLSchema>
{
private readonly XmlSchemaSet _schemaSet;
private readonly List<Objects.XMLSchema> _items;
Expand Down
2 changes: 1 addition & 1 deletion src/OneScript.StandardLibrary/XMLSchema/Collections/XSComplexFinalUnion.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ This Source Code Form is subject to the terms of the
namespace OneScript.StandardLibrary.XMLSchema.Collections
{
[ContextClass("ОбъединениеЗавершенностиСоставногоТипаXS", "XSComplexFinalUnion")]
public class XSComplexFinalUnion : AutoContext<XSComplexFinalUnion>
public sealed class XSComplexFinalUnion : AutoContext<XSComplexFinalUnion>
{
private readonly ArrayImpl _values;

Expand Down
4 changes: 3 additions & 1 deletion src/OneScript.StandardLibrary/XMLSchema/Collections/XSComponentFixedList.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,15 @@ This Source Code Form is subject to the terms of the
namespace OneScript.StandardLibrary.XMLSchema.Collections
{
[ContextClass("ФиксированныйСписокКомпонентXS", "XSComponentFixedList")]
public class XSComponentFixedList : AutoCollectionContext<XSComponentFixedList, IXSComponent>
public sealed class XSComponentFixedList : AutoCollectionContext<XSComponentFixedList, IXSComponent>
{

private readonly List<IXSComponent> _items;

public XSComponentFixedList() => _items = new List<IXSComponent>();

public static XSComponentFixedList EmptyList() => new XSComponentFixedList();

public void Add(IXSComponent value) => _items.Add(value);
public void Remove(IXSComponent value) => _items.Remove(value);
public void Clear() => _items.Clear();
Expand Down
2 changes: 1 addition & 1 deletion src/OneScript.StandardLibrary/XMLSchema/Collections/XSComponentList.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ This Source Code Form is subject to the terms of the
namespace OneScript.StandardLibrary.XMLSchema.Collections
{
[ContextClass("СписокКомпонентXS", "XSComponentList")]
public class XSComponentList : AutoCollectionContext<XSComponentList, IXSComponent>
public sealed class XSComponentList : AutoCollectionContext<XSComponentList, IXSComponent>
{
private readonly List<IXSComponent> _items;

Expand Down
9 changes: 4 additions & 5 deletions src/OneScript.StandardLibrary/XMLSchema/Collections/XSDisallowedSubstitutionsUnion.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,19 @@ This Source Code Form is subject to the terms of the
using OneScript.StandardLibrary.Collections;
using OneScript.StandardLibrary.XMLSchema.Enumerations;
using OneScript.Types;
using ScriptEngine.Machine;
using ScriptEngine.Machine.Contexts;

namespace OneScript.StandardLibrary.XMLSchema.Collections
{
[ContextClass("ОбъединениеНедопустимыхПодстановкиXS", "XSDisallowedSubstitutionsUnion")]
public class XsDisallowedSubstitutionsUnion : AutoContext<XsDisallowedSubstitutionsUnion>
public sealed class XsDisallowedSubstitutionsUnion : AutoContext<XsDisallowedSubstitutionsUnion>
{
private ArrayImpl _values;
private readonly ArrayImpl _values;

private bool Contains(XmlSchemaDerivationMethod value)
{
XSDisallowedSubstitutions enumValue = EnumerationXSDisallowedSubstitutions.FromNativeValue(value);
IValue idx = _values.Find(enumValue);
var enumValue = EnumerationXSDisallowedSubstitutions.FromNativeValue(value);
var idx = _values.Find(enumValue);
return (idx.SystemType != BasicTypes.Undefined);
}

Expand Down
2 changes: 1 addition & 1 deletion src/OneScript.StandardLibrary/XMLSchema/Collections/XSNamedComponentMap.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ This Source Code Form is subject to the terms of the
namespace OneScript.StandardLibrary.XMLSchema.Collections
{
[ContextClass("КоллекцияИменованныхКомпонентXS", "XSNamedComponentMap")]
public class XSNamedComponentMap : AutoCollectionContext<XSNamedComponentMap, IXSNamedComponent>
public sealed class XSNamedComponentMap : AutoCollectionContext<XSNamedComponentMap, IXSNamedComponent>
{
private readonly List<IXSNamedComponent> _items;

Expand Down
2 changes: 1 addition & 1 deletion src/OneScript.StandardLibrary/XMLSchema/Collections/XSProhibitedSubstitutionsUnion.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ This Source Code Form is subject to the terms of the
namespace OneScript.StandardLibrary.XMLSchema.Collections
{
[ContextClass("ОбъединениеЗапрещенныхПодстановокXS", "XSProhibitedSubstitutionsUnion")]
public class XsProhibitedSubstitutionsUnion : AutoContext<XsProhibitedSubstitutionsUnion>
public sealed class XsProhibitedSubstitutionsUnion : AutoContext<XsProhibitedSubstitutionsUnion>
{
private readonly ArrayImpl _values;

Expand Down
7 changes: 3 additions & 4 deletions src/OneScript.StandardLibrary/XMLSchema/Collections/XSSchemaFinalUnion.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,19 @@ This Source Code Form is subject to the terms of the
using OneScript.StandardLibrary.Collections;
using OneScript.StandardLibrary.XMLSchema.Enumerations;
using OneScript.Types;
using ScriptEngine.Machine;
using ScriptEngine.Machine.Contexts;

namespace OneScript.StandardLibrary.XMLSchema.Collections
{
[ContextClass("ОбъединениеЗавершенностиСхемыXS", "XSSchemaFinalUnion")]
public class XSSchemaFinalUnion : AutoContext<XSSchemaFinalUnion>
public sealed class XSSchemaFinalUnion : AutoContext<XSSchemaFinalUnion>
{
private ArrayImpl _values;
private readonly ArrayImpl _values;

private bool Contains(XmlSchemaDerivationMethod value)
{
var enumValue = EnumerationXSSchemaFinal.Instance.FromNativeValue(value);
IValue idx = _values.Find(enumValue);
var idx = _values.Find(enumValue);
return (idx.SystemType != BasicTypes.Undefined);
}

Expand Down
7 changes: 3 additions & 4 deletions src/OneScript.StandardLibrary/XMLSchema/Collections/XSSimpleFinalUnion.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,19 @@ This Source Code Form is subject to the terms of the
using OneScript.StandardLibrary.Collections;
using OneScript.StandardLibrary.XMLSchema.Enumerations;
using OneScript.Types;
using ScriptEngine.Machine;
using ScriptEngine.Machine.Contexts;

namespace OneScript.StandardLibrary.XMLSchema.Collections
{
[ContextClass("ОбъединениеЗавершенностиПростогоТипаXS", "XSSimpleFinalUnion")]
public class XSSimpleFinalUnion : AutoContext<XSSimpleFinalUnion>
public sealed class XSSimpleFinalUnion : AutoContext<XSSimpleFinalUnion>
{
private ArrayImpl _values;

private bool Contains(XmlSchemaDerivationMethod _value)
{
XSSimpleFinal enumValue = EnumerationXSSimpleFinal.FromNativeValue(_value);
IValue idx = _values.Find(enumValue);
var enumValue = EnumerationXSSimpleFinal.FromNativeValue(_value);
var idx = _values.Find(enumValue);
return idx.SystemType != BasicTypes.Undefined;
}

Expand Down
2 changes: 1 addition & 1 deletion src/OneScript.StandardLibrary/XMLSchema/Collections/XSSubstitutionGroupExclusionsUnion.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ This Source Code Form is subject to the terms of the
namespace OneScript.StandardLibrary.XMLSchema.Collections
{
[ContextClass("ОбъединениеИсключенийГруппПодстановкиXS", "XSSubstitutionGroupExclusionsUnion")]
public class XsSubstitutionGroupExclusionsUnion : AutoContext<XsSubstitutionGroupExclusionsUnion>
public sealed class XsSubstitutionGroupExclusionsUnion : AutoContext<XsSubstitutionGroupExclusionsUnion>
{
private readonly ArrayImpl _values;
private bool Contains(XmlSchemaDerivationMethod value)
Expand Down
8 changes: 3 additions & 5 deletions src/OneScript.StandardLibrary/XMLSchema/Enumerations/XSComplexFinal.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ This Source Code Form is subject to the terms of the

namespace OneScript.StandardLibrary.XMLSchema.Enumerations
{
public class XSComplexFinal : EnumerationValue
public sealed class XSComplexFinal : EnumerationValue
{
private readonly XmlSchemaDerivationMethod _derivationMethod;
public XSComplexFinal(EnumerationContext owner, XmlSchemaDerivationMethod derivationMethod)
Expand All @@ -28,7 +28,7 @@ public static XmlSchemaDerivationMethod ToNativeValue(XSComplexFinal wrapper)
}

[SystemEnum("ЗавершенностьСоставногоТипаXS", "XSComplexFinal")]
public class EnumerationXSComplexFinal : EnumerationContext
public sealed class EnumerationXSComplexFinal : EnumerationContext
{
private readonly Dictionary<XmlSchemaDerivationMethod, XSComplexFinal> _valuesCache;

Expand Down Expand Up @@ -70,6 +70,4 @@ public static EnumerationXSComplexFinal CreateInstance(ITypeManager typeManager)
}
}



}
}
6 changes: 6 additions & 0 deletions src/OneScript.StandardLibrary/XMLSchema/Enumerations/XSContentModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,15 @@ public enum XSContentModel
[EnumValue("EmptyRef", "ПустаяСсылка")]
EmptyRef,

/// <summary>
/// Простая модель содержания.
/// </summary>
[EnumValue("Simple", "Простая")]
Simple,

/// <summary>
/// Составная модель содержания.
/// </summary>
[EnumValue("Complex", "Составная")]
Complex
}
Expand Down
4 changes: 2 additions & 2 deletions src/OneScript.StandardLibrary/XMLSchema/Enumerations/XSDisallowedSubstitutions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ This Source Code Form is subject to the terms of the

namespace OneScript.StandardLibrary.XMLSchema.Enumerations
{
public class XSDisallowedSubstitutions : ClrEnumValueWrapper<XmlSchemaDerivationMethod>
public sealed class XSDisallowedSubstitutions : ClrEnumValueWrapper<XmlSchemaDerivationMethod>
{
internal XSDisallowedSubstitutions(EnumerationXSDisallowedSubstitutions instance, XmlSchemaDerivationMethod realValue)
: base(instance, realValue)
Expand All @@ -29,7 +29,7 @@ public static XmlSchemaDerivationMethod ToNativeValue(XSDisallowedSubstitutions
}

[SystemEnum("НедопустимыеПодстановкиXS", "XSDisallowedSubstitutions")]
public class EnumerationXSDisallowedSubstitutions : EnumerationContext
public sealed class EnumerationXSDisallowedSubstitutions : EnumerationContext
{

private readonly Dictionary<XmlSchemaDerivationMethod, XSDisallowedSubstitutions> _valuesCache;
Expand Down
4 changes: 2 additions & 2 deletions src/OneScript.StandardLibrary/XMLSchema/Enumerations/XSForm.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ This Source Code Form is subject to the terms of the

namespace OneScript.StandardLibrary.XMLSchema.Enumerations
{
public class XSForm : ClrEnumValueWrapper<XmlSchemaForm>
public sealed class XSForm : ClrEnumValueWrapper<XmlSchemaForm>
{
internal XSForm(EnumerationXSForm instance, XmlSchemaForm realValue) : base(instance, realValue )
{
Expand All @@ -26,7 +26,7 @@ internal XSForm(EnumerationXSForm instance, XmlSchemaForm realValue) : base(inst
}

[SystemEnum("ФормаПредставленияXS", "XSForm")]
public class EnumerationXSForm : EnumerationContext
public sealed class EnumerationXSForm : EnumerationContext
{
private readonly Dictionary<XmlSchemaForm, XSForm> _valuesCache;

Expand Down
4 changes: 2 additions & 2 deletions src/OneScript.StandardLibrary/XMLSchema/Enumerations/XSProhibitedSubstitutions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ This Source Code Form is subject to the terms of the

namespace OneScript.StandardLibrary.XMLSchema.Enumerations
{
public class XSProhibitedSubstitutions : ClrEnumValueWrapper<XmlSchemaDerivationMethod>
public sealed class XSProhibitedSubstitutions : ClrEnumValueWrapper<XmlSchemaDerivationMethod>
{
internal XSProhibitedSubstitutions(EnumerationXSProhibitedSubstitutions instance, XmlSchemaDerivationMethod realValue)
: base(instance, realValue)
Expand All @@ -29,7 +29,7 @@ public static XmlSchemaDerivationMethod ToNativeValue(XSProhibitedSubstitutions
}

[SystemEnum("ЗапрещенныеПодстановкиXS", "EnumerationXSProhibitedSubstitutions")]
public class EnumerationXSProhibitedSubstitutions : EnumerationContext
public sealed class EnumerationXSProhibitedSubstitutions : EnumerationContext
{

private readonly Dictionary<XmlSchemaDerivationMethod, XSProhibitedSubstitutions> _valuesCache;
Expand Down
4 changes: 2 additions & 2 deletions src/OneScript.StandardLibrary/XMLSchema/Enumerations/XSSchemaFinal.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ This Source Code Form is subject to the terms of the

namespace OneScript.StandardLibrary.XMLSchema.Enumerations
{
public class XSSchemaFinal : ClrEnumValueWrapper<XmlSchemaDerivationMethod>
public sealed class XSSchemaFinal : ClrEnumValueWrapper<XmlSchemaDerivationMethod>
{
internal XSSchemaFinal(EnumerationXSSchemaFinal instance, XmlSchemaDerivationMethod realValue)
: base(instance, realValue)
Expand All @@ -22,7 +22,7 @@ internal XSSchemaFinal(EnumerationXSSchemaFinal instance, XmlSchemaDerivationMet
}

[SystemEnum("ЗавершенностьСхемыXS", "XSSchemaFinal")]
public class EnumerationXSSchemaFinal : ClrEnumWrapper<XmlSchemaDerivationMethod>
public sealed class EnumerationXSSchemaFinal : ClrEnumWrapper<XmlSchemaDerivationMethod>
{
private readonly Dictionary<XmlSchemaDerivationMethod, XSSchemaFinal> _valuesCache;

Expand Down
4 changes: 2 additions & 2 deletions src/OneScript.StandardLibrary/XMLSchema/Enumerations/XSSimpleFinal.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ This Source Code Form is subject to the terms of the

namespace OneScript.StandardLibrary.XMLSchema.Enumerations
{
public class XSSimpleFinal : ClrEnumValueWrapper<XmlSchemaDerivationMethod>
public sealed class XSSimpleFinal : ClrEnumValueWrapper<XmlSchemaDerivationMethod>
{
internal XSSimpleFinal(EnumerationXSSimpleFinal instance, XmlSchemaDerivationMethod realValue)
: base(instance, realValue)
Expand All @@ -29,7 +29,7 @@ public static XmlSchemaDerivationMethod ToNativeValue(XSSimpleFinal wrapper)
}

[SystemEnum("ЗавершенностьПростогоТипаXS", "XSSimpleFinal")]
public class EnumerationXSSimpleFinal : EnumerationContext
public sealed class EnumerationXSSimpleFinal : EnumerationContext
{
private readonly Dictionary<XmlSchemaDerivationMethod, XSSimpleFinal> _valuesCache;

Expand Down
4 changes: 2 additions & 2 deletions src/OneScript.StandardLibrary/XMLSchema/Enumerations/XSSubstitutionGroupExclusions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ This Source Code Form is subject to the terms of the

namespace OneScript.StandardLibrary.XMLSchema.Enumerations
{
public class XSSubstitutionGroupExclusions : ClrEnumValueWrapper<XmlSchemaDerivationMethod>
public sealed class XSSubstitutionGroupExclusions : ClrEnumValueWrapper<XmlSchemaDerivationMethod>
{
internal XSSubstitutionGroupExclusions(EnumerationXSSubstitutionGroupExclusions instance, XmlSchemaDerivationMethod realValue)
: base(instance, realValue)
Expand All @@ -29,7 +29,7 @@ public static XmlSchemaDerivationMethod ToNativeValue(XSSubstitutionGroupExclusi
}

[SystemEnum("ИсключенияГруппПодстановкиXS", "XSSubstitutionGroupExclusions")]
public class EnumerationXSSubstitutionGroupExclusions : EnumerationContext
public sealed class EnumerationXSSubstitutionGroupExclusions : EnumerationContext
{

private readonly Dictionary<XmlSchemaDerivationMethod, XSSubstitutionGroupExclusions> _valuesCache;
Expand Down
Loading