Skip to content

Commit 872005b

Browse files
pniedzielskipniedzielski
committed
Style[bmqstm]: Migrate to implicit XML Schema namespace
bmqstm.xsd is the only XSD file that qualifies every element with an `xs:` namespace prefix, and that does not specify its target namespace (or give it a prefix `tns:`). This may have been because of its history in the MWC package rather than being purely BMQ like the others. This patch brings it into line with the rest of the XSD files by making the XML Schema namespace implicit, and making the target namespace explicit. Signed-off-by: Patrick M. Niedzielski <pniedzielski@bloomberg.net>
1 parent 589339f commit 872005b

1 file changed

Lines changed: 127 additions & 125 deletions

File tree

‎src/groups/bmq/bmqstm/bmqstm.xsd‎

Lines changed: 127 additions & 125 deletions
Original file line numberDiff line numberDiff line change
@@ -1,173 +1,175 @@
11
<?xml version='1.0' encoding='UTF-8'?>
2-
<xs:schema xmlns:xs='http://www.w3.org/2001/XMLSchema'
3-
xmlns:bdem='http://bloomberg.com/schemas/bdem'
4-
bdem:package='bmqstm'>
2+
<schema xmlns='http://www.w3.org/2001/XMLSchema'
3+
xmlns:bdem='http://bloomberg.com/schemas/bdem'
4+
xmlns:tns='http://bloomberg.com/schemas/bmqstm'
5+
targetNamespace='http://bloomberg.com/schemas/bmqstm'
6+
bdem:package='bmqstm'>
57

6-
<xs:element name='statContext' type='StatContextUpdate'/>
7-
<xs:element name='statContextList' type='StatContextUpdateList'/>
8+
<element name='statContext' type='tns:StatContextUpdate'/>
9+
<element name='statContextList' type='tns:StatContextUpdateList'/>
810

9-
<xs:complexType name='StatContextUpdate'>
10-
<xs:annotation>
11-
<xs:documentation>
11+
<complexType name='StatContextUpdate'>
12+
<annotation>
13+
<documentation>
1214
This type represents an externalizable 'StatContext', having an integer
1315
'id' distinct from all sibling contexts, a set of 'flags' denoting if
1416
this is a new or deleted context, an optional 'configuration' that
1517
describes the context structure that is excluded if redundant, a set of
1618
'directValues' and 'expiredValues', and a set of 'subcontexts'.
17-
</xs:documentation>
18-
</xs:annotation>
19-
<xs:sequence>
20-
<xs:element name='id' type='xs:int'/>
21-
<xs:element name='flags' type='xs:unsignedInt'/>
22-
<xs:element name='timeStamp' type='xs:long'/>
23-
<xs:element name='configuration' type='StatContextConfiguration'
24-
minOccurs='0'/>
25-
<xs:element name='directValues' type='StatValueUpdate'
26-
minOccurs='0'
27-
maxOccurs='unbounded'/>
28-
<xs:element name='expiredValues' type='StatValueUpdate'
29-
minOccurs='0'
30-
maxOccurs='unbounded'/>
31-
<xs:element name='subcontexts' type='StatContextUpdate'
19+
</documentation>
20+
</annotation>
21+
<sequence>
22+
<element name='id' type='int'/>
23+
<element name='flags' type='unsignedInt'/>
24+
<element name='timeStamp' type='long'/>
25+
<element name='configuration' type='tns:StatContextConfiguration'
26+
minOccurs='0'/>
27+
<element name='directValues' type='tns:StatValueUpdate'
28+
minOccurs='0'
29+
maxOccurs='unbounded'/>
30+
<element name='expiredValues' type='tns:StatValueUpdate'
3231
minOccurs='0'
3332
maxOccurs='unbounded'/>
34-
</xs:sequence>
35-
</xs:complexType>
36-
37-
<xs:complexType name='StatContextUpdateList'>
38-
<xs:annotation>
39-
<xs:documentation>
40-
This type represents a sequence of 'StatContext' objects.
41-
</xs:documentation>
42-
</xs:annotation>
43-
<xs:sequence>
44-
<xs:element name='contexts' type='StatContextUpdate'
33+
<element name='subcontexts' type='tns:StatContextUpdate'
4534
minOccurs='0'
4635
maxOccurs='unbounded'/>
47-
</xs:sequence>
48-
</xs:complexType>
36+
</sequence>
37+
</complexType>
38+
39+
<complexType name='StatContextUpdateList'>
40+
<annotation>
41+
<documentation>
42+
This type represents a sequence of 'StatContext' objects.
43+
</documentation>
44+
</annotation>
45+
<sequence>
46+
<element name='contexts' type='tns:StatContextUpdate'
47+
minOccurs='0'
48+
maxOccurs='unbounded'/>
49+
</sequence>
50+
</complexType>
4951

50-
<xs:simpleType name='StatContextUpdateFlags'>
51-
<xs:annotation>
52-
<xs:documentation>
52+
<simpleType name='StatContextUpdateFlags'>
53+
<annotation>
54+
<documentation>
5355
This type enumerates the flags that can be set on a 'StatContext'. A
5456
context having the 'CONTEXT_CREATED' flag indicates that the context
5557
was just created, and the 'CONTEXT_DELETED' flag indicates that it was
5658
deleted.
57-
</xs:documentation>
58-
</xs:annotation>
59-
<xs:restriction base='xs:string'>
60-
<xs:enumeration value='E_CONTEXT_CREATED' bdem:id='0'/>
61-
<xs:enumeration value='E_CONTEXT_DELETED' bdem:id='1'/>
62-
</xs:restriction>
63-
</xs:simpleType>
59+
</documentation>
60+
</annotation>
61+
<restriction base='string'>
62+
<enumeration value='E_CONTEXT_CREATED' bdem:id='0'/>
63+
<enumeration value='E_CONTEXT_DELETED' bdem:id='1'/>
64+
</restriction>
65+
</simpleType>
6466

65-
<xs:complexType name='StatContextConfiguration'>
66-
<xs:annotation>
67-
<xs:documentation>
67+
<complexType name='StatContextConfiguration'>
68+
<annotation>
69+
<documentation>
6870
This type represents the configuration of a stat context, having some
6971
configuration 'flags', a user supplied 'userId' that may either be a
7072
long integer 'id' or a string 'name', and a set of 'values' to track.
7173
Note that 'values' may be omitted if this configuration is for a
7274
subcontext of a table context.
73-
</xs:documentation>
74-
</xs:annotation>
75-
<xs:sequence>
76-
<xs:element name='flags' type='xs:unsignedInt'/>
77-
<xs:choice>
78-
<xs:element name='id' type='xs:long'/>
79-
<xs:element name='name' type='xs:string'/>
80-
</xs:choice>
81-
<xs:element name='values' type='StatValueDefinition'
82-
minOccurs='0'
83-
maxOccurs='unbounded'/>
84-
</xs:sequence>
85-
</xs:complexType>
75+
</documentation>
76+
</annotation>
77+
<sequence>
78+
<element name='flags' type='unsignedInt'/>
79+
<choice>
80+
<element name='id' type='long'/>
81+
<element name='name' type='string'/>
82+
</choice>
83+
<element name='values' type='tns:StatValueDefinition'
84+
minOccurs='0'
85+
maxOccurs='unbounded'/>
86+
</sequence>
87+
</complexType>
8688

87-
<xs:simpleType name='StatContextConfigurationFlags'>
88-
<xs:annotation>
89-
<xs:documentation>
89+
<simpleType name='StatContextConfigurationFlags'>
90+
<annotation>
91+
<documentation>
9092
This type enumerates the flags that can be set on a
9193
'StatContextConfiguration'. A configuration having the 'IS_TABLE' flag
9294
denotes that it is a table context, and 'STORE_EXPIRED_VALUES'
9395
indicates it should remember the values of expired subcontexts.
94-
</xs:documentation>
95-
</xs:annotation>
96-
<xs:restriction base='xs:string'>
97-
<xs:enumeration value='E_IS_TABLE' bdem:id='0'/>
98-
<xs:enumeration value='E_STORE_EXPIRED_VALUES' bdem:id='1'/>
99-
</xs:restriction>
100-
</xs:simpleType>
96+
</documentation>
97+
</annotation>
98+
<restriction base='string'>
99+
<enumeration value='E_IS_TABLE' bdem:id='0'/>
100+
<enumeration value='E_STORE_EXPIRED_VALUES' bdem:id='1'/>
101+
</restriction>
102+
</simpleType>
101103

102-
<xs:complexType name='StatValueDefinition'>
103-
<xs:annotation>
104-
<xs:documentation>
104+
<complexType name='StatValueDefinition'>
105+
<annotation>
106+
<documentation>
105107
This type represents the definition of a stat collecting value, having
106108
a 'name', a 'type' and an array of 'historySizes' indicating the number
107109
of snapshots and levels of snapshots to keep.
108-
</xs:documentation>
109-
</xs:annotation>
110-
<xs:sequence>
111-
<xs:element name='name' type='xs:string'/>
112-
<xs:element name='type' type='StatValueType'/>
113-
<xs:element name='historySizes' type='xs:unsignedInt'
114-
minOccurs='0'
115-
maxOccurs='unbounded'/>
116-
</xs:sequence>
117-
</xs:complexType>
110+
</documentation>
111+
</annotation>
112+
<sequence>
113+
<element name='name' type='string'/>
114+
<element name='type' type='tns:StatValueType'/>
115+
<element name='historySizes' type='unsignedInt'
116+
minOccurs='0'
117+
maxOccurs='unbounded'/>
118+
</sequence>
119+
</complexType>
118120

119-
<xs:simpleType name='StatValueType'>
120-
<xs:annotation>
121-
<xs:documentation>
121+
<simpleType name='StatValueType'>
122+
<annotation>
123+
<documentation>
122124
This type enumerates the different types of stat values, specifically
123125
'CONTINUOUS' and 'DISCRETE' values.
124-
</xs:documentation>
125-
</xs:annotation>
126-
<xs:restriction base='xs:string'>
127-
<xs:enumeration value='E_CONTINUOUS' bdem:id='0'/>
128-
<xs:enumeration value='E_DISCRETE' bdem:id='1'/>
129-
</xs:restriction>
130-
</xs:simpleType>
126+
</documentation>
127+
</annotation>
128+
<restriction base='string'>
129+
<enumeration value='E_CONTINUOUS' bdem:id='0'/>
130+
<enumeration value='E_DISCRETE' bdem:id='1'/>
131+
</restriction>
132+
</simpleType>
131133

132-
<xs:complexType name='StatValueUpdate'>
133-
<xs:annotation>
134-
<xs:documentation>
134+
<complexType name='StatValueUpdate'>
135+
<annotation>
136+
<documentation>
135137
This type represents changes made to a particular state value. The
136138
bits of the 'fieldMask' indicate which actual fields in a stat value
137139
the elements of 'fields' are updating. For instance, if the value in
138140
question is a continuous value, and 'fieldMask' is 0b001100, then
139141
'fields' should contain two elements, with 'fields[0]' being the update
140142
to the 'min' value, and 'fields[1]' being the update to the 'max'
141143
value.
142-
</xs:documentation>
143-
</xs:annotation>
144-
<xs:sequence>
145-
<xs:element name='fieldMask' type='xs:unsignedInt'/>
146-
<xs:element name='fields' type='xs:long'
147-
minOccurs='0'
148-
maxOccurs='unbounded'/>
149-
</xs:sequence>
150-
</xs:complexType>
144+
</documentation>
145+
</annotation>
146+
<sequence>
147+
<element name='fieldMask' type='unsignedInt'/>
148+
<element name='fields' type='long'
149+
minOccurs='0'
150+
maxOccurs='unbounded'/>
151+
</sequence>
152+
</complexType>
151153

152-
<xs:simpleType name='StatValueFields'>
153-
<xs:annotation>
154-
<xs:documentation>
154+
<simpleType name='StatValueFields'>
155+
<annotation>
156+
<documentation>
155157
This type enumerates the different bit indices corresponding to fields
156158
in a stat value.
157-
</xs:documentation>
158-
</xs:annotation>
159-
<xs:restriction base='xs:string'>
160-
<xs:enumeration value='E_ABSOLUTE_MIN' bdem:id='0'/>
161-
<xs:enumeration value='E_ABSOLUTE_MAX' bdem:id='1'/>
162-
<xs:enumeration value='E_MIN' bdem:id='2'/>
163-
<xs:enumeration value='E_MAX' bdem:id='3'/>
164-
<xs:enumeration value='E_EVENTS' bdem:id='4'/>
165-
<xs:enumeration value='E_SUM' bdem:id='5'/>
166-
<xs:enumeration value='E_VALUE' bdem:id='6'/>
167-
<xs:enumeration value='E_INCREMENTS' bdem:id='7'/>
168-
<xs:enumeration value='E_DECREMENTS' bdem:id='8'/>
169-
</xs:restriction>
170-
</xs:simpleType>
159+
</documentation>
160+
</annotation>
161+
<restriction base='string'>
162+
<enumeration value='E_ABSOLUTE_MIN' bdem:id='0'/>
163+
<enumeration value='E_ABSOLUTE_MAX' bdem:id='1'/>
164+
<enumeration value='E_MIN' bdem:id='2'/>
165+
<enumeration value='E_MAX' bdem:id='3'/>
166+
<enumeration value='E_EVENTS' bdem:id='4'/>
167+
<enumeration value='E_SUM' bdem:id='5'/>
168+
<enumeration value='E_VALUE' bdem:id='6'/>
169+
<enumeration value='E_INCREMENTS' bdem:id='7'/>
170+
<enumeration value='E_DECREMENTS' bdem:id='8'/>
171+
</restriction>
172+
</simpleType>
171173

172-
</xs:schema>
174+
</schema>
173175
<!-- vim:set syntax=xml tabstop=2 shiftwidth=2 expandtab: -->

0 commit comments

Comments
 (0)