Skip to content

Commit e154341

Browse files
magento-engcom-teammagento-engcom-team
committed
ENGCOM-6306: magento/magento2#: Remove redundant use=“optional” from INDEXER XSD schema #25673
- Merge Pull Request #25673 from atwixfirster/magento2:xsd-indexer-remove-redundant-code - Merged commits: 1. ca0e709
2 parents 36ea828 + ca0e709 commit e154341

File tree

1 file changed

+40
-40
lines changed

1 file changed

+40
-40
lines changed

‎lib/internal/Magento/Framework/Indexer/etc/indexer.xsd‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,19 @@
1414
</xs:annotation>
1515
<xs:sequence>
1616
<xs:choice minOccurs="0" maxOccurs="unbounded">
17-
<xs:element name="title" type="translatableType" />
18-
<xs:element name="description" type="translatableType" />
19-
<xs:element name="saveHandler" type="saveHandlerType" />
20-
<xs:element name="structure" type="structureType" />
17+
<xs:element name="title" type="translatableType"/>
18+
<xs:element name="description" type="translatableType"/>
19+
<xs:element name="saveHandler" type="saveHandlerType"/>
20+
<xs:element name="structure" type="structureType"/>
2121
<xs:group ref="fieldset"/>
2222
</xs:choice>
2323
<xs:group ref="dependencies"/>
2424
</xs:sequence>
25-
<xs:attribute name="id" type="xs:string" use="required" />
26-
<xs:attribute name="primary" type="nameType" use="optional" />
27-
<xs:attribute name="view_id" type="viewIdType" use="optional" />
28-
<xs:attribute name="class" type="classType" use="optional" />
29-
<xs:attribute name="shared_index" type="xs:string" use="optional" />
25+
<xs:attribute name="id" type="xs:string" use="required"/>
26+
<xs:attribute name="primary" type="nameType"/>
27+
<xs:attribute name="view_id" type="viewIdType"/>
28+
<xs:attribute name="class" type="classType"/>
29+
<xs:attribute name="shared_index" type="xs:string"/>
3030
</xs:complexType>
3131

3232
<xs:group name="fieldset">
@@ -48,7 +48,7 @@
4848
<xs:complexType name="translatableType">
4949
<xs:simpleContent>
5050
<xs:extension base="xs:string">
51-
<xs:attribute name="translate" use="optional" fixed="true" type="xs:boolean"/>
51+
<xs:attribute name="translate" fixed="true" type="xs:boolean"/>
5252
</xs:extension>
5353
</xs:simpleContent>
5454
</xs:complexType>
@@ -60,7 +60,7 @@
6060
</xs:documentation>
6161
</xs:annotation>
6262
<xs:restriction base="xs:string">
63-
<xs:pattern value="[a-zA-Z0-9_]+" />
63+
<xs:pattern value="[a-zA-Z0-9_]+"/>
6464
</xs:restriction>
6565
</xs:simpleType>
6666

@@ -71,7 +71,7 @@
7171
</xs:documentation>
7272
</xs:annotation>
7373
<xs:restriction base="xs:string">
74-
<xs:pattern value="[a-zA-Z|\\]+[a-zA-Z0-9\\]+" />
74+
<xs:pattern value="[a-zA-Z|\\]+[a-zA-Z0-9\\]+"/>
7575
</xs:restriction>
7676
</xs:simpleType>
7777

@@ -82,7 +82,7 @@
8282
</xs:documentation>
8383
</xs:annotation>
8484
<xs:restriction base="xs:string">
85-
<xs:pattern value="[a-zA-Z0-9_]+" />
85+
<xs:pattern value="[a-zA-Z0-9_]+"/>
8686
</xs:restriction>
8787
</xs:simpleType>
8888

@@ -93,7 +93,7 @@
9393
</xs:documentation>
9494
</xs:annotation>
9595
<xs:restriction base="xs:string">
96-
<xs:pattern value="[a-zA-Z0-9_]+" />
96+
<xs:pattern value="[a-zA-Z0-9_]+"/>
9797
</xs:restriction>
9898
</xs:simpleType>
9999

@@ -104,7 +104,7 @@
104104
</xs:documentation>
105105
</xs:annotation>
106106
<xs:restriction base="xs:string">
107-
<xs:pattern value="[a-zA-Z0-9_]+" />
107+
<xs:pattern value="[a-zA-Z0-9_]+"/>
108108
</xs:restriction>
109109
</xs:simpleType>
110110

@@ -115,7 +115,7 @@
115115
</xs:documentation>
116116
</xs:annotation>
117117
<xs:restriction base="xs:string">
118-
<xs:pattern value="[a-zA-Z0-9_]+" />
118+
<xs:pattern value="[a-zA-Z0-9_]+"/>
119119
</xs:restriction>
120120
</xs:simpleType>
121121

@@ -126,8 +126,8 @@
126126
</xs:documentation>
127127
</xs:annotation>
128128
<xs:attribute name="name" type="nameType" use="required"/>
129-
<xs:attribute name="handler" type="classType" use="optional"/>
130-
<xs:attribute name="origin" type="originType" use="optional"/>
129+
<xs:attribute name="handler" type="classType"/>
130+
<xs:attribute name="origin" type="originType"/>
131131
</xs:complexType>
132132

133133
<xs:complexType name="fieldsetType" mixed="true">
@@ -137,21 +137,21 @@
137137
</xs:documentation>
138138
</xs:annotation>
139139
<xs:sequence>
140-
<xs:element type="referenceType" name="reference" minOccurs="0" maxOccurs="unbounded" />
140+
<xs:element type="referenceType" name="reference" minOccurs="0" maxOccurs="unbounded"/>
141141
<xs:element name="field" type="fieldType" minOccurs="0" maxOccurs="unbounded"/>
142142
</xs:sequence>
143-
<xs:attribute name="source" type="classType" use="optional"/>
144-
<xs:attribute name="provider" type="classType" use="optional"/>
143+
<xs:attribute name="source" type="classType"/>
144+
<xs:attribute name="provider" type="classType"/>
145145
<xs:attribute name="name" type="nameType" use="required"/>
146146
</xs:complexType>
147147

148148
<xs:complexType name="fieldType">
149149
<xs:complexContent>
150150
<xs:extension base="fieldTypeAbstract">
151151
<xs:choice>
152-
<xs:element type="filterType" name="filter" minOccurs="0" maxOccurs="1" />
152+
<xs:element type="filterType" name="filter" minOccurs="0" maxOccurs="1"/>
153153
</xs:choice>
154-
<xs:attribute type="dataType" name="dataType" use="optional" />
154+
<xs:attribute type="dataType" name="dataType"/>
155155
</xs:extension>
156156
</xs:complexContent>
157157
</xs:complexType>
@@ -190,20 +190,20 @@
190190
</xs:documentation>
191191
</xs:annotation>
192192
<xs:attribute name="fieldset" type="nameType" use="required"/>
193-
<xs:attribute name="from" type="fromType" use="optional"/>
194-
<xs:attribute name="to" type="toType" use="optional"/>
193+
<xs:attribute name="from" type="fromType"/>
194+
<xs:attribute name="to" type="toType"/>
195195
</xs:complexType>
196196

197197
<xs:simpleType name="dataType">
198198
<xs:restriction base="xs:string">
199-
<xs:enumeration value="int" />
200-
<xs:enumeration value="float" />
201-
<xs:enumeration value="varchar" />
202-
<xs:enumeration value="text" />
203-
<xs:enumeration value="mediumtext" />
204-
<xs:enumeration value="timestamp" />
205-
<xs:enumeration value="datetime" />
206-
<xs:enumeration value="date" />
199+
<xs:enumeration value="int"/>
200+
<xs:enumeration value="float"/>
201+
<xs:enumeration value="varchar"/>
202+
<xs:enumeration value="text"/>
203+
<xs:enumeration value="mediumtext"/>
204+
<xs:enumeration value="timestamp"/>
205+
<xs:enumeration value="datetime"/>
206+
<xs:enumeration value="date"/>
207207
</xs:restriction>
208208
</xs:simpleType>
209209

@@ -226,17 +226,17 @@
226226
Indexer Id must be unique.
227227
</xs:documentation>
228228
</xs:annotation>
229-
<xs:selector xpath="indexer" />
230-
<xs:field xpath="@id" />
229+
<xs:selector xpath="indexer"/>
230+
<xs:field xpath="@id"/>
231231
</xs:unique>
232232
<xs:unique name="uniqueViewId">
233233
<xs:annotation>
234234
<xs:documentation>
235235
Indexer Id must be unique.
236236
</xs:documentation>
237237
</xs:annotation>
238-
<xs:selector xpath="indexer" />
239-
<xs:field xpath="@view_id" />
238+
<xs:selector xpath="indexer"/>
239+
<xs:field xpath="@view_id"/>
240240
</xs:unique>
241241
</xs:element>
242242
<xs:complexType name="configType">
@@ -266,8 +266,8 @@
266266
Related indexer id must be unique.
267267
</xs:documentation>
268268
</xs:annotation>
269-
<xs:selector xpath="indexer" />
270-
<xs:field xpath="@id" />
269+
<xs:selector xpath="indexer"/>
270+
<xs:field xpath="@id"/>
271271
</xs:unique>
272272
</xs:element>
273273
</xs:choice>
@@ -287,7 +287,7 @@
287287
Indexer dependency that represents another indexer.
288288
</xs:documentation>
289289
</xs:annotation>
290-
<xs:attribute name="id" type="xs:string" use="required" />
290+
<xs:attribute name="id" type="xs:string" use="required"/>
291291
</xs:complexType>
292292
</xs:element>
293293
</xs:sequence>

0 commit comments

Comments
 (0)