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

Xsd import to handle type names with underscore #849

Merged
merged 6 commits into from
Sep 25, 2024
Merged

Xsd import to handle type names with underscore #849

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bc7952e
Xsd import to handle empty string
hugohills-regnosys Sep 25, 2024
610331a
formatting
hugohills-regnosys Sep 25, 2024
6c46b7c
Add _ to regex
hugohills-regnosys Sep 25, 2024
a32311a
Tidy up
hugohills-regnosys Sep 25, 2024
9f02ff7
Rename
hugohills-regnosys Sep 25, 2024
389b9f8
update test
hugohills-regnosys Sep 25, 2024
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
Prev Previous commit
update test
  • Loading branch information
@hugohills-regnosys
hugohills-regnosys committed Sep 25, 2024
commit 389b9f81f4c121b7233afcdba7a1e4d089a3891c
4 changes: 2 additions & 2 deletions rosetta-tools/src/test/resources/model-import/data-and-enum/expected/ns-type.rosetta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ typeAlias Max500Text: <"Specifies a character string with a maximum length of 50
typeAlias Max3Number: <"Number (max 999) of objects represented as an integer.">
int(digits: 3)

type Bar: <"Bar definition.">
type Bar__1: <"Bar definition.">

barStrAttr string (1..1) <"Bar string attribute definition.">

Expand All @@ -20,4 +20,4 @@ type Foo: <"Foo definition.">
fooDecimalWithRestrictionAttr Max3Number (0..1) <"FooDecimalWithRestrictionAttr definition.">
fooEnumAttr FooEnum (1..1) <"FooEnumAttr definition.">
fooStrListAttr string (0..*) <"FooStrListAttr definition.">
fooBarListAttr Bar (1..2) <"FooBarListAttr definition.">
fooBarListAttr Bar__1 (1..2) <"FooBarListAttr definition.">
4 changes: 2 additions & 2 deletions rosetta-tools/src/test/resources/model-import/data-and-enum/schema.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
</xs:enumeration>
</xs:restriction>
</xs:simpleType>
<xs:complexType name="Bar">
<xs:complexType name="Bar__1">
<xs:annotation>
<xs:documentation source="Name" xml:lang="EN">BarName</xs:documentation>
<xs:documentation source="Definition" xml:lang="EN">Bar definition.</xs:documentation>
Expand Down Expand Up @@ -124,7 +124,7 @@
<xs:documentation source="Definition" xml:lang="EN">FooStrListAttr definition.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="FooBarListAttr" type="Bar" minOccurs="1" maxOccurs="2">
<xs:element name="FooBarListAttr" type="Bar__1" minOccurs="1" maxOccurs="2">
<xs:annotation>
<xs:documentation source="Name" xml:lang="EN">FooBarListAttrName</xs:documentation>
<xs:documentation source="Definition" xml:lang="EN">FooBarListAttr definition.</xs:documentation>
Expand Down